diff --git a/include/omath/color.hpp b/include/omath/color.hpp
index c6a7263..48a02df 100644
--- a/include/omath/color.hpp
+++ b/include/omath/color.hpp
@@ -8,6 +8,15 @@
 #include "omath/vector3.hpp"
 #include "omath/vector4.hpp"
 
+#ifdef max
+#undef max
+#endif
+
+
+#ifdef min
+#undef min
+#endif
+
 namespace omath
 {
     struct HSV
diff --git a/include/omath/mat.hpp b/include/omath/mat.hpp
index 09252cd..2116cf7 100644
--- a/include/omath/mat.hpp
+++ b/include/omath/mat.hpp
@@ -10,6 +10,16 @@
 #include <utility>
 #include "omath/vector3.hpp"
 
+
+#ifdef near
+#undef near
+#endif
+
+
+#ifdef far
+#undef fa
+#endif
+
 namespace omath
 {
     struct MatSize