diff --git a/Makefile.am b/Makefile.am
index f755b65..8d4246e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,10 @@ cglm_HEADERS = include/cglm/version.h \
                include/cglm/io.h \
                include/cglm/mat4.h \
                include/cglm/mat3.h \
+               include/cglm/mat2.h \
                include/cglm/affine.h \
+               include/cglm/vec2.h \
+               include/cglm/vec2-ext.h \
                include/cglm/vec3.h \
                include/cglm/vec3-ext.h \
                include/cglm/vec4.h \
@@ -65,6 +68,8 @@ cglm_HEADERS = include/cglm/version.h \
 cglm_calldir=$(includedir)/cglm/call
 cglm_call_HEADERS = include/cglm/call/mat4.h \
                     include/cglm/call/mat3.h \
+                    include/cglm/call/mat2.h \
+                    include/cglm/call/vec2.h \
                     include/cglm/call/vec3.h \
                     include/cglm/call/vec4.h \
                     include/cglm/call/affine.h \
@@ -125,8 +130,10 @@ libcglm_la_SOURCES=\
     src/io.c \
     src/quat.c \
     src/cam.c \
+    src/vec2.c \
     src/vec3.c \
     src/vec4.c \
+    src/mat2.c \
     src/mat3.c \
     src/mat4.c \
     src/plane.c \
diff --git a/win/cglm-test.vcxproj b/win/cglm-test.vcxproj
index f7ccc91..1c0916d 100644
--- a/win/cglm-test.vcxproj
+++ b/win/cglm-test.vcxproj
@@ -30,11 +30,16 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\test\include\common.h" />
+    <ClInclude Include="..\test\src\test_affine.h" />
+    <ClInclude Include="..\test\src\test_affine_mat.h" />
     <ClInclude Include="..\test\src\test_common.h" />
+    <ClInclude Include="..\test\src\test_mat2.h" />
     <ClInclude Include="..\test\src\test_mat3.h" />
     <ClInclude Include="..\test\src\test_mat4.h" />
+    <ClInclude Include="..\test\src\test_plane.h" />
     <ClInclude Include="..\test\src\test_project.h" />
     <ClInclude Include="..\test\src\test_quat.h" />
+    <ClInclude Include="..\test\src\test_vec2.h" />
     <ClInclude Include="..\test\src\test_vec3.h" />
     <ClInclude Include="..\test\src\test_vec4.h" />
     <ClInclude Include="..\test\tests.h" />
diff --git a/win/cglm-test.vcxproj.filters b/win/cglm-test.vcxproj.filters
index 66691ff..c81dc11 100644
--- a/win/cglm-test.vcxproj.filters
+++ b/win/cglm-test.vcxproj.filters
@@ -64,5 +64,20 @@
     <ClInclude Include="..\test\src\test_vec4.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\test\src\test_affine.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\test\src\test_affine_mat.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\test\src\test_mat2.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\test\src\test_plane.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\test\src\test_vec2.h">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/win/cglm.vcxproj b/win/cglm.vcxproj
index dcb9a76..9b7a84b 100644
--- a/win/cglm.vcxproj
+++ b/win/cglm.vcxproj
@@ -28,18 +28,21 @@
     <ClCompile Include="..\src\euler.c" />
     <ClCompile Include="..\src\frustum.c" />
     <ClCompile Include="..\src\io.c" />
+    <ClCompile Include="..\src\mat2.c" />
     <ClCompile Include="..\src\mat3.c" />
     <ClCompile Include="..\src\mat4.c" />
     <ClCompile Include="..\src\plane.c" />
     <ClCompile Include="..\src\project.c" />
     <ClCompile Include="..\src\quat.c" />
     <ClCompile Include="..\src\sphere.c" />
+    <ClCompile Include="..\src\vec2.c" />
     <ClCompile Include="..\src\vec3.c" />
     <ClCompile Include="..\src\vec4.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\cglm\affine-mat.h" />
     <ClInclude Include="..\include\cglm\affine.h" />
+    <ClInclude Include="..\include\cglm\applesimd.h" />
     <ClInclude Include="..\include\cglm\bezier.h" />
     <ClInclude Include="..\include\cglm\box.h" />
     <ClInclude Include="..\include\cglm\call.h" />
@@ -52,12 +55,14 @@
     <ClInclude Include="..\include\cglm\call\euler.h" />
     <ClInclude Include="..\include\cglm\call\frustum.h" />
     <ClInclude Include="..\include\cglm\call\io.h" />
+    <ClInclude Include="..\include\cglm\call\mat2.h" />
     <ClInclude Include="..\include\cglm\call\mat3.h" />
     <ClInclude Include="..\include\cglm\call\mat4.h" />
     <ClInclude Include="..\include\cglm\call\plane.h" />
     <ClInclude Include="..\include\cglm\call\project.h" />
     <ClInclude Include="..\include\cglm\call\quat.h" />
     <ClInclude Include="..\include\cglm\call\sphere.h" />
+    <ClInclude Include="..\include\cglm\call\vec2.h" />
     <ClInclude Include="..\include\cglm\call\vec3.h" />
     <ClInclude Include="..\include\cglm\call\vec4.h" />
     <ClInclude Include="..\include\cglm\cam.h" />
@@ -69,6 +74,7 @@
     <ClInclude Include="..\include\cglm\euler.h" />
     <ClInclude Include="..\include\cglm\frustum.h" />
     <ClInclude Include="..\include\cglm\io.h" />
+    <ClInclude Include="..\include\cglm\mat2.h" />
     <ClInclude Include="..\include\cglm\mat3.h" />
     <ClInclude Include="..\include\cglm\mat4.h" />
     <ClInclude Include="..\include\cglm\plane.h" />
@@ -94,6 +100,7 @@
     <ClInclude Include="..\include\cglm\struct\euler.h" />
     <ClInclude Include="..\include\cglm\struct\frustum.h" />
     <ClInclude Include="..\include\cglm\struct\io.h" />
+    <ClInclude Include="..\include\cglm\struct\mat2.h" />
     <ClInclude Include="..\include\cglm\struct\mat3.h" />
     <ClInclude Include="..\include\cglm\struct\mat4.h" />
     <ClInclude Include="..\include\cglm\struct\plane.h" />
@@ -107,6 +114,7 @@
     <ClInclude Include="..\include\cglm\types-struct.h" />
     <ClInclude Include="..\include\cglm\types.h" />
     <ClInclude Include="..\include\cglm\util.h" />
+    <ClInclude Include="..\include\cglm\vec2-ext.h" />
     <ClInclude Include="..\include\cglm\vec2.h" />
     <ClInclude Include="..\include\cglm\vec3-ext.h" />
     <ClInclude Include="..\include\cglm\vec3.h" />
diff --git a/win/cglm.vcxproj.filters b/win/cglm.vcxproj.filters
index 917f837..cf5beb2 100644
--- a/win/cglm.vcxproj.filters
+++ b/win/cglm.vcxproj.filters
@@ -86,6 +86,12 @@
     <ClCompile Include="..\src\bezier.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\mat2.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\vec2.c">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\config.h">
@@ -254,7 +260,7 @@
       <Filter>include\cglm\call</Filter>
     </ClInclude>
     <ClInclude Include="..\include\cglm\vec2.h">
-        <Filter>include\cglm</Filter>
+      <Filter>include\cglm</Filter>
     </ClInclude>
     <ClInclude Include="..\include\cglm\struct\affine.h">
       <Filter>include\cglm\struct</Filter>
@@ -316,5 +322,23 @@
     <ClInclude Include="..\include\cglm\types-struct.h">
       <Filter>include\cglm</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\cglm\call\mat2.h">
+      <Filter>include\cglm\call</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cglm\call\vec2.h">
+      <Filter>include\cglm\call</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cglm\struct\mat2.h">
+      <Filter>include\cglm\struct</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cglm\applesimd.h">
+      <Filter>include\cglm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cglm\mat2.h">
+      <Filter>include\cglm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\cglm\vec2-ext.h">
+      <Filter>include\cglm</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file