diff --git a/include/cglm/clipspace/ortho_lh_no.h b/include/cglm/clipspace/ortho_lh_no.h
index 24b0568..76c7a94 100644
--- a/include/cglm/clipspace/ortho_lh_no.h
+++ b/include/cglm/clipspace/ortho_lh_no.h
@@ -30,6 +30,7 @@
 
 #include "../common.h"
 #include "../plane.h"
+#include "../mat4.h"
 
 /*!
  * @brief set up orthographic projection matrix
diff --git a/include/cglm/clipspace/ortho_lh_zo.h b/include/cglm/clipspace/ortho_lh_zo.h
index f49f8f0..e45530d 100644
--- a/include/cglm/clipspace/ortho_lh_zo.h
+++ b/include/cglm/clipspace/ortho_lh_zo.h
@@ -30,6 +30,7 @@
 
 #include "../common.h"
 #include "../plane.h"
+#include "../mat4.h"
 
 /*!
  * @brief set up orthographic projection matrix with a left-hand coordinate
diff --git a/include/cglm/clipspace/ortho_rh_no.h b/include/cglm/clipspace/ortho_rh_no.h
index 1c833c9..aa7a906 100644
--- a/include/cglm/clipspace/ortho_rh_no.h
+++ b/include/cglm/clipspace/ortho_rh_no.h
@@ -30,6 +30,7 @@
 
 #include "../common.h"
 #include "../plane.h"
+#include "../mat4.h"
 
 /*!
  * @brief set up orthographic projection matrix
diff --git a/include/cglm/clipspace/ortho_rh_zo.h b/include/cglm/clipspace/ortho_rh_zo.h
index 9d9602e..7a0876c 100644
--- a/include/cglm/clipspace/ortho_rh_zo.h
+++ b/include/cglm/clipspace/ortho_rh_zo.h
@@ -30,6 +30,7 @@
 
 #include "../common.h"
 #include "../plane.h"
+#include "../mat4.h"
 
 /*!
  * @brief set up orthographic projection matrix with a right-hand coordinate
diff --git a/include/cglm/clipspace/persp_lh_no.h b/include/cglm/clipspace/persp_lh_no.h
index 2ab8d01..703530e 100644
--- a/include/cglm/clipspace/persp_lh_no.h
+++ b/include/cglm/clipspace/persp_lh_no.h
@@ -47,7 +47,6 @@
 #define cglm_persp_lh_no_h
 
 #include "../common.h"
-#include "../plane.h"
 #include "persp.h"
 
 /*!
diff --git a/include/cglm/clipspace/persp_lh_zo.h b/include/cglm/clipspace/persp_lh_zo.h
index 52a2648..de89643 100644
--- a/include/cglm/clipspace/persp_lh_zo.h
+++ b/include/cglm/clipspace/persp_lh_zo.h
@@ -47,7 +47,6 @@
 #define cglm_persp_lh_zo_h
 
 #include "../common.h"
-#include "../plane.h"
 #include "persp.h"
 
 /*!
diff --git a/include/cglm/clipspace/persp_rh_no.h b/include/cglm/clipspace/persp_rh_no.h
index 325e17b..021b7d8 100644
--- a/include/cglm/clipspace/persp_rh_no.h
+++ b/include/cglm/clipspace/persp_rh_no.h
@@ -47,7 +47,6 @@
 #define cglm_persp_rh_no_h
 
 #include "../common.h"
-#include "../plane.h"
 #include "persp.h"
 
 /*!
diff --git a/include/cglm/clipspace/persp_rh_zo.h b/include/cglm/clipspace/persp_rh_zo.h
index 0bcc175..ce632b3 100644
--- a/include/cglm/clipspace/persp_rh_zo.h
+++ b/include/cglm/clipspace/persp_rh_zo.h
@@ -47,7 +47,6 @@
 #define cglm_persp_rh_zo_h
 
 #include "../common.h"
-#include "../plane.h"
 #include "persp.h"
 
 /*!
diff --git a/include/cglm/clipspace/view_lh_no.h b/include/cglm/clipspace/view_lh_no.h
index 9e8d59c..454d903 100644
--- a/include/cglm/clipspace/view_lh_no.h
+++ b/include/cglm/clipspace/view_lh_no.h
@@ -15,6 +15,7 @@
 #ifndef cglm_view_lh_no_h
 #define cglm_view_lh_no_h
 
+#include "../common.h"
 #include "view_lh.h"
 
 /*!
diff --git a/include/cglm/clipspace/view_lh_zo.h b/include/cglm/clipspace/view_lh_zo.h
index 0652906..6b0c4d1 100644
--- a/include/cglm/clipspace/view_lh_zo.h
+++ b/include/cglm/clipspace/view_lh_zo.h
@@ -15,6 +15,7 @@
 #ifndef cglm_view_lh_zo_h
 #define cglm_view_lh_zo_h
 
+#include "../common.h"
 #include "view_lh.h"
 
 /*!
diff --git a/include/cglm/clipspace/view_rh_no.h b/include/cglm/clipspace/view_rh_no.h
index 14b8b4c..ca36d30 100644
--- a/include/cglm/clipspace/view_rh_no.h
+++ b/include/cglm/clipspace/view_rh_no.h
@@ -15,6 +15,7 @@
 #ifndef cglm_view_rh_no_h
 #define cglm_view_rh_no_h
 
+#include "../common.h"
 #include "view_rh.h"
 
 /*!
diff --git a/include/cglm/clipspace/view_rh_zo.h b/include/cglm/clipspace/view_rh_zo.h
index cbabe64..1ad5c91 100644
--- a/include/cglm/clipspace/view_rh_zo.h
+++ b/include/cglm/clipspace/view_rh_zo.h
@@ -15,6 +15,7 @@
 #ifndef cglm_view_rh_zo_h
 #define cglm_view_rh_zo_h
 
+#include "../common.h"
 #include "view_rh.h"
 
 /*!
diff --git a/include/cglm/struct/quat.h b/include/cglm/struct/quat.h
index 68a0929..d69675b 100644
--- a/include/cglm/struct/quat.h
+++ b/include/cglm/struct/quat.h
@@ -426,7 +426,7 @@ glms_quat_lerpc(versors from, versors to, float t) {
  * @param[in]   from  from
  * @param[in]   to    to
  * @param[in]   t     interpolant (amount)
- * @param[out]  dest  result quaternion
+ * @returns result quaternion
  */
 CGLM_INLINE
 versors
diff --git a/src/clipspace/ortho_lh_no.c b/src/clipspace/ortho_lh_no.c
index e83511d..839926a 100644
--- a/src/clipspace/ortho_lh_no.c
+++ b/src/clipspace/ortho_lh_no.c
@@ -5,8 +5,8 @@
  * Full license can be found in the LICENSE file
  */
 
-#include "../../include/cglm/cglm.h"
 #include "../../include/cglm/clipspace/ortho_lh_no.h"
+#include "../../include/cglm/call/clipspace/ortho_lh_no.h"
 
 CGLM_EXPORT
 void
diff --git a/src/clipspace/ortho_lh_zo.c b/src/clipspace/ortho_lh_zo.c
index 155d53e..88291ac 100644
--- a/src/clipspace/ortho_lh_zo.c
+++ b/src/clipspace/ortho_lh_zo.c
@@ -5,8 +5,8 @@
  * Full license can be found in the LICENSE file
  */
 
-#include "../../include/cglm/cglm.h"
 #include "../../include/cglm/clipspace/ortho_lh_zo.h"
+#include "../../include/cglm/call/clipspace/ortho_lh_zo.h"
 
 CGLM_EXPORT
 void
diff --git a/src/clipspace/ortho_rh_no.c b/src/clipspace/ortho_rh_no.c
index 7f9c02b..ca30e82 100644
--- a/src/clipspace/ortho_rh_no.c
+++ b/src/clipspace/ortho_rh_no.c
@@ -5,8 +5,8 @@
  * Full license can be found in the LICENSE file
  */
 
-#include "../../include/cglm/cglm.h"
 #include "../../include/cglm/clipspace/ortho_rh_no.h"
+#include "../../include/cglm/call/clipspace/ortho_rh_no.h"
 
 CGLM_EXPORT
 void
diff --git a/src/clipspace/ortho_rh_zo.c b/src/clipspace/ortho_rh_zo.c
index 33cb83a..06d119b 100644
--- a/src/clipspace/ortho_rh_zo.c
+++ b/src/clipspace/ortho_rh_zo.c
@@ -5,8 +5,8 @@
  * Full license can be found in the LICENSE file
  */
 
-#include "../../include/cglm/cglm.h"
 #include "../../include/cglm/clipspace/ortho_rh_zo.h"
+#include "../../include/cglm/call/clipspace/ortho_rh_zo.h"
 
 CGLM_EXPORT
 void
diff --git a/src/clipspace/persp_lh_no.c b/src/clipspace/persp_lh_no.c
index fe58385..8d6db76 100644
--- a/src/clipspace/persp_lh_no.c
+++ b/src/clipspace/persp_lh_no.c
@@ -6,6 +6,7 @@
  */
 
 #include "../../include/cglm/clipspace/persp_lh_no.h"
+#include "../../include/cglm/call/clipspace/persp_lh_no.h"
 
 CGLM_EXPORT
 void
diff --git a/src/clipspace/persp_lh_zo.c b/src/clipspace/persp_lh_zo.c
index b0d5838..d9fec0c 100644
--- a/src/clipspace/persp_lh_zo.c
+++ b/src/clipspace/persp_lh_zo.c
@@ -6,6 +6,7 @@
  */
 
 #include "../../include/cglm/clipspace/persp_lh_zo.h"
+#include "../../include/cglm/call/clipspace/persp_lh_zo.h"
 
 CGLM_EXPORT
 void
diff --git a/src/clipspace/persp_rh_no.c b/src/clipspace/persp_rh_no.c
index 56bd89b..8fc7735 100644
--- a/src/clipspace/persp_rh_no.c
+++ b/src/clipspace/persp_rh_no.c
@@ -6,6 +6,7 @@
  */
 
 #include "../../include/cglm/clipspace/persp_rh_no.h"
+#include "../../include/cglm/call/clipspace/persp_rh_no.h"
 
 CGLM_EXPORT
 void
diff --git a/src/clipspace/persp_rh_zo.c b/src/clipspace/persp_rh_zo.c
index 03d7ac6..50190f2 100644
--- a/src/clipspace/persp_rh_zo.c
+++ b/src/clipspace/persp_rh_zo.c
@@ -6,6 +6,7 @@
  */
 
 #include "../../include/cglm/clipspace/persp_rh_zo.h"
+#include "../../include/cglm/call/clipspace/persp_rh_zo.h"
 
 CGLM_EXPORT
 void
diff --git a/src/clipspace/project_no.c b/src/clipspace/project_no.c
index ceb8b0b..8352cba 100644
--- a/src/clipspace/project_no.c
+++ b/src/clipspace/project_no.c
@@ -6,6 +6,7 @@
  */
 
 #include "../../include/cglm/clipspace/project_no.h"
+#include "../../include/cglm/call/clipspace/project_no.h"
 
 CGLM_EXPORT
 void
diff --git a/src/clipspace/project_zo.c b/src/clipspace/project_zo.c
index 0d4110b..bc480a0 100644
--- a/src/clipspace/project_zo.c
+++ b/src/clipspace/project_zo.c
@@ -6,6 +6,7 @@
  */
 
 #include "../../include/cglm/clipspace/project_zo.h"
+#include "../../include/cglm/call/clipspace/project_zo.h"
 
 CGLM_EXPORT
 void
diff --git a/src/clipspace/view_lh_no.c b/src/clipspace/view_lh_no.c
index 8bed6a3..39f2a9d 100644
--- a/src/clipspace/view_lh_no.c
+++ b/src/clipspace/view_lh_no.c
@@ -5,8 +5,8 @@
  * Full license can be found in the LICENSE file
  */
 
-#include "../../include/cglm/cglm.h"
 #include "../../include/cglm/clipspace/view_lh_no.h"
+#include "../../include/cglm/call/clipspace/view_lh_no.h"
 
 CGLM_EXPORT
 void
diff --git a/src/clipspace/view_lh_zo.c b/src/clipspace/view_lh_zo.c
index cee487c..a8680d9 100644
--- a/src/clipspace/view_lh_zo.c
+++ b/src/clipspace/view_lh_zo.c
@@ -5,8 +5,8 @@
  * Full license can be found in the LICENSE file
  */
 
-#include "../../include/cglm/cglm.h"
 #include "../../include/cglm/clipspace/view_lh_zo.h"
+#include "../../include/cglm/call/clipspace/view_lh_zo.h"
 
 CGLM_EXPORT
 void
diff --git a/src/clipspace/view_rh_no.c b/src/clipspace/view_rh_no.c
index 3548ff2..6d60c08 100644
--- a/src/clipspace/view_rh_no.c
+++ b/src/clipspace/view_rh_no.c
@@ -5,8 +5,8 @@
  * Full license can be found in the LICENSE file
  */
 
-#include "../../include/cglm/cglm.h"
 #include "../../include/cglm/clipspace/view_rh_no.h"
+#include "../../include/cglm/call/clipspace/view_rh_no.h"
 
 CGLM_EXPORT
 void
diff --git a/src/clipspace/view_rh_zo.c b/src/clipspace/view_rh_zo.c
index 537daee..5133fda 100644
--- a/src/clipspace/view_rh_zo.c
+++ b/src/clipspace/view_rh_zo.c
@@ -5,8 +5,8 @@
  * Full license can be found in the LICENSE file
  */
 
-#include "../../include/cglm/cglm.h"
 #include "../../include/cglm/clipspace/view_rh_zo.h"
+#include "../../include/cglm/call/clipspace/view_rh_zo.h"
 
 CGLM_EXPORT
 void