diff --git a/include/lol/math/private/matrix.h b/include/lol/math/private/matrix.h
index d73d2a0f..9b174ff7 100644
--- a/include/lol/math/private/matrix.h
+++ b/include/lol/math/private/matrix.h
@@ -156,7 +156,7 @@ struct [[nodiscard]] mat_t<T, 3, 3>
     explicit inline mat_t(mat_t<U,3,3> const &m)
       : m_data{ (element)m[0], (element)m[1], (element)m[2] } {}
 
-    explicit mat_t(class quat_t<T> const &q);
+    explicit mat_t(struct quat_t<T> const &q);
 
     inline vec_t<T,3>& operator[](size_t n) { return m_data[n]; }
     inline vec_t<T,3> const& operator[](size_t n) const { return m_data[n]; }
@@ -252,7 +252,7 @@ struct [[nodiscard]] mat_t<T, 4, 4>
       : m_data{ (element)m[0], (element)m[1],
                 (element)m[2], (element)m[3] } {}
 
-    explicit mat_t(class quat_t<T> const &q);
+    explicit mat_t(struct quat_t<T> const &q);
 
     inline vec_t<T,4>& operator[](size_t n) { return m_data[n]; }
     inline vec_t<T,4> const& operator[](size_t n) const { return m_data[n]; }
diff --git a/include/lol/math/private/matrix.ipp b/include/lol/math/private/matrix.ipp
index c3ab37ff..56ac4541 100644
--- a/include/lol/math/private/matrix.ipp
+++ b/include/lol/math/private/matrix.ipp
@@ -15,6 +15,13 @@
 #include <cassert>
 #include <cmath>
 
+#if _WIN32
+#   pragma push_macro("near")
+#   pragma push_macro("far")
+#   undef near
+#   undef far
+#endif
+
 namespace lol
 {
 
@@ -277,3 +284,8 @@ inline mat4 mat4::shifted_perspective(float fov_y, float screen_size,
 
 } /* namespace lol */
 
+#if _WIN32
+#   pragma pop_macro("near")
+#   pragma pop_macro("far")
+#endif
+