diff --git a/include/Global.hpp b/include/Global.hpp
index 2974223..e596be9 100644
--- a/include/Global.hpp
+++ b/include/Global.hpp
@@ -4,7 +4,6 @@
 #if _M_IX86_FP >= 1 || _M_X64
 #   define __SSE__ 1
 #endif
-#include <x86intrin.h>
 
 #if __SSE__
 #   include <immintrin.h>
diff --git a/include/Math.hpp b/include/Math.hpp
index 4d41ef8..f62cbce 100644
--- a/include/Math.hpp
+++ b/include/Math.hpp
@@ -1,8 +1,14 @@
 #ifndef MATH_HPP
 #define MATH_HPP
 
+#ifndef NOMINMAX
+#define NOMINMAX 1
+#endif
+#ifndef _USE_MATH_DEFINES
 #define _USE_MATH_DEFINES 1
 #include <cmath>
+#endif
+
 #include "CVector3f.hpp"
 #include "CTransform.hpp"