diff --git a/docs/source/call.rst b/docs/source/call.rst
index 9b473fd..60e703c 100644
--- a/docs/source/call.rst
+++ b/docs/source/call.rst
@@ -15,5 +15,6 @@ It would be duplicate documentation also it
 would be hard to sync documentation between inline and call version for me.
 
 By including **clgm/cglm.h** you include all inline versions. To get precompiled
-versions you need to include **cglm/call.h** header it also includes all
-call versions plus *clgm/cglm.h* (inline versions)
+versions you need to include **cglm/call.h** header. When using the
+precompiled versions, explicitly including **cglm/cglm.h** is still necessary
+for the inline versions to be included.
diff --git a/include/cglm/call/aabb2d.h b/include/cglm/call/aabb2d.h
index b130c27..a1f4629 100644
--- a/include/cglm/call/aabb2d.h
+++ b/include/cglm/call/aabb2d.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 /* DEPRECATED! use _diag */
 #define glmc_aabb2d_size(aabb) glmc_aabb2d_diag(aabb)
diff --git a/include/cglm/call/affine.h b/include/cglm/call/affine.h
index 59621aa..cfd35c7 100644
--- a/include/cglm/call/affine.h
+++ b/include/cglm/call/affine.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/affine2d.h b/include/cglm/call/affine2d.h
index 6db6557..7ba9001 100644
--- a/include/cglm/call/affine2d.h
+++ b/include/cglm/call/affine2d.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/bezier.h b/include/cglm/call/bezier.h
index 89a4f5a..dd089f6 100644
--- a/include/cglm/call/bezier.h
+++ b/include/cglm/call/bezier.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 float
diff --git a/include/cglm/call/box.h b/include/cglm/call/box.h
index f46255e..249af21 100644
--- a/include/cglm/call/box.h
+++ b/include/cglm/call/box.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/cam.h b/include/cglm/call/cam.h
index c370ec9..877b327 100644
--- a/include/cglm/call/cam.h
+++ b/include/cglm/call/cam.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/clipspace/ortho_lh_no.h b/include/cglm/call/clipspace/ortho_lh_no.h
index a48f4b5..f233279 100644
--- a/include/cglm/call/clipspace/ortho_lh_no.h
+++ b/include/cglm/call/clipspace/ortho_lh_no.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/clipspace/ortho_lh_zo.h b/include/cglm/call/clipspace/ortho_lh_zo.h
index 6b7979e..86e6252 100644
--- a/include/cglm/call/clipspace/ortho_lh_zo.h
+++ b/include/cglm/call/clipspace/ortho_lh_zo.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/clipspace/ortho_rh_no.h b/include/cglm/call/clipspace/ortho_rh_no.h
index 259d020..e0e9e45 100644
--- a/include/cglm/call/clipspace/ortho_rh_no.h
+++ b/include/cglm/call/clipspace/ortho_rh_no.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/clipspace/ortho_rh_zo.h b/include/cglm/call/clipspace/ortho_rh_zo.h
index 9e714e6..4a4106e 100644
--- a/include/cglm/call/clipspace/ortho_rh_zo.h
+++ b/include/cglm/call/clipspace/ortho_rh_zo.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/clipspace/persp_lh_no.h b/include/cglm/call/clipspace/persp_lh_no.h
index 42ef7ee..928f1c9 100644
--- a/include/cglm/call/clipspace/persp_lh_no.h
+++ b/include/cglm/call/clipspace/persp_lh_no.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/clipspace/persp_lh_zo.h b/include/cglm/call/clipspace/persp_lh_zo.h
index 0c0fad6..eafa217 100644
--- a/include/cglm/call/clipspace/persp_lh_zo.h
+++ b/include/cglm/call/clipspace/persp_lh_zo.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/clipspace/persp_rh_no.h b/include/cglm/call/clipspace/persp_rh_no.h
index a0e45a5..a5e31e5 100644
--- a/include/cglm/call/clipspace/persp_rh_no.h
+++ b/include/cglm/call/clipspace/persp_rh_no.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/clipspace/persp_rh_zo.h b/include/cglm/call/clipspace/persp_rh_zo.h
index b6e93ec..a25fa8b 100644
--- a/include/cglm/call/clipspace/persp_rh_zo.h
+++ b/include/cglm/call/clipspace/persp_rh_zo.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/clipspace/project_no.h b/include/cglm/call/clipspace/project_no.h
index ac3c764..1842e1a 100644
--- a/include/cglm/call/clipspace/project_no.h
+++ b/include/cglm/call/clipspace/project_no.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/clipspace/project_zo.h b/include/cglm/call/clipspace/project_zo.h
index cfef23f..da71157 100644
--- a/include/cglm/call/clipspace/project_zo.h
+++ b/include/cglm/call/clipspace/project_zo.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/clipspace/view_lh_no.h b/include/cglm/call/clipspace/view_lh_no.h
index ace491b..c601e58 100644
--- a/include/cglm/call/clipspace/view_lh_no.h
+++ b/include/cglm/call/clipspace/view_lh_no.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/clipspace/view_lh_zo.h b/include/cglm/call/clipspace/view_lh_zo.h
index 305d2bb..4de476a 100644
--- a/include/cglm/call/clipspace/view_lh_zo.h
+++ b/include/cglm/call/clipspace/view_lh_zo.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/clipspace/view_rh_no.h b/include/cglm/call/clipspace/view_rh_no.h
index 105311f..01a52f0 100644
--- a/include/cglm/call/clipspace/view_rh_no.h
+++ b/include/cglm/call/clipspace/view_rh_no.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/clipspace/view_rh_zo.h b/include/cglm/call/clipspace/view_rh_zo.h
index 13e1cf6..c3b2fea 100644
--- a/include/cglm/call/clipspace/view_rh_zo.h
+++ b/include/cglm/call/clipspace/view_rh_zo.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/curve.h b/include/cglm/call/curve.h
index f978232..eb7d4c5 100644
--- a/include/cglm/call/curve.h
+++ b/include/cglm/call/curve.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 float
diff --git a/include/cglm/call/ease.h b/include/cglm/call/ease.h
index 453b295..aba8371 100644
--- a/include/cglm/call/ease.h
+++ b/include/cglm/call/ease.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 float
diff --git a/include/cglm/call/euler.h b/include/cglm/call/euler.h
index b5b74ca..6d2af37 100644
--- a/include/cglm/call/euler.h
+++ b/include/cglm/call/euler.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/frustum.h b/include/cglm/call/frustum.h
index 979bc37..68cc77f 100644
--- a/include/cglm/call/frustum.h
+++ b/include/cglm/call/frustum.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/io.h b/include/cglm/call/io.h
index 563ed0f..0658aef 100644
--- a/include/cglm/call/io.h
+++ b/include/cglm/call/io.h
@@ -12,7 +12,8 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
+#include <stdio.h>
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/ivec2.h b/include/cglm/call/ivec2.h
index 5fdd98d..03a8039 100644
--- a/include/cglm/call/ivec2.h
+++ b/include/cglm/call/ivec2.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/ivec3.h b/include/cglm/call/ivec3.h
index dc28cc7..778093e 100644
--- a/include/cglm/call/ivec3.h
+++ b/include/cglm/call/ivec3.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/ivec4.h b/include/cglm/call/ivec4.h
index 5faf63f..3fb8575 100644
--- a/include/cglm/call/ivec4.h
+++ b/include/cglm/call/ivec4.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/mat2.h b/include/cglm/call/mat2.h
index 0e88199..5099558 100644
--- a/include/cglm/call/mat2.h
+++ b/include/cglm/call/mat2.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/mat2x3.h b/include/cglm/call/mat2x3.h
index b47f9c0..b2b3797 100644
--- a/include/cglm/call/mat2x3.h
+++ b/include/cglm/call/mat2x3.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/mat2x4.h b/include/cglm/call/mat2x4.h
index b64387e..a3f3027 100644
--- a/include/cglm/call/mat2x4.h
+++ b/include/cglm/call/mat2x4.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/mat3.h b/include/cglm/call/mat3.h
index 7e62d95..9bb36be 100644
--- a/include/cglm/call/mat3.h
+++ b/include/cglm/call/mat3.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 /* DEPRECATED! use _copy, _ucopy versions */
 #define glmc_mat3_dup(mat, dest)  glmc_mat3_copy(mat, dest)
diff --git a/include/cglm/call/mat3x2.h b/include/cglm/call/mat3x2.h
index 4ac2910..4cb847c 100644
--- a/include/cglm/call/mat3x2.h
+++ b/include/cglm/call/mat3x2.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/mat3x4.h b/include/cglm/call/mat3x4.h
index 59b91f7..d320ad9 100644
--- a/include/cglm/call/mat3x4.h
+++ b/include/cglm/call/mat3x4.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/mat4.h b/include/cglm/call/mat4.h
index a1d7146..5ba0495 100644
--- a/include/cglm/call/mat4.h
+++ b/include/cglm/call/mat4.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 /* DEPRECATED! use _copy, _ucopy versions */
 #define glmc_mat4_udup(mat, dest) glmc_mat4_ucopy(mat, dest)
diff --git a/include/cglm/call/mat4x2.h b/include/cglm/call/mat4x2.h
index 4645b19..e109ce4 100644
--- a/include/cglm/call/mat4x2.h
+++ b/include/cglm/call/mat4x2.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/mat4x3.h b/include/cglm/call/mat4x3.h
index aac0bb6..eb0db40 100644
--- a/include/cglm/call/mat4x3.h
+++ b/include/cglm/call/mat4x3.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/noise.h b/include/cglm/call/noise.h
index 1399991..be66ef7 100644
--- a/include/cglm/call/noise.h
+++ b/include/cglm/call/noise.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 float
diff --git a/include/cglm/call/plane.h b/include/cglm/call/plane.h
index ce820fa..c2182f7 100644
--- a/include/cglm/call/plane.h
+++ b/include/cglm/call/plane.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/project.h b/include/cglm/call/project.h
index fc1c7ad..d363b5d 100644
--- a/include/cglm/call/project.h
+++ b/include/cglm/call/project.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/quat.h b/include/cglm/call/quat.h
index 6ba980f..3f3022b 100644
--- a/include/cglm/call/quat.h
+++ b/include/cglm/call/quat.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/ray.h b/include/cglm/call/ray.h
index cc4e5b3..2a66437 100644
--- a/include/cglm/call/ray.h
+++ b/include/cglm/call/ray.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 bool
diff --git a/include/cglm/call/sphere.h b/include/cglm/call/sphere.h
index 2b9eeb4..3de43ae 100644
--- a/include/cglm/call/sphere.h
+++ b/include/cglm/call/sphere.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 float
diff --git a/include/cglm/call/vec2.h b/include/cglm/call/vec2.h
index cf37368..c0eee44 100644
--- a/include/cglm/call/vec2.h
+++ b/include/cglm/call/vec2.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void
diff --git a/include/cglm/call/vec3.h b/include/cglm/call/vec3.h
index db940f4..47ee2a5 100644
--- a/include/cglm/call/vec3.h
+++ b/include/cglm/call/vec3.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 /* DEPRECATED! use _copy, _ucopy versions */
 #define glmc_vec_dup(v, dest)          glmc_vec3_copy(v, dest)
diff --git a/include/cglm/call/vec4.h b/include/cglm/call/vec4.h
index 43b20b3..0dca9b0 100644
--- a/include/cglm/call/vec4.h
+++ b/include/cglm/call/vec4.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "cglm/common.h"
+#include "../common.h"
 
 /* DEPRECATED! use _copy, _ucopy versions */
 #define glmc_vec4_dup3(v, dest)         glmc_vec4_copy3(v, dest)