diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 08ddd13..1c34a9f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -39,9 +39,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="24dcf302-ac9d-40e6-8317-7203a956ad63" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tests/general/unit_test_angles.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/tests/general/unit_test_angles.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tests/general/unit_test_color.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/tests/general/unit_test_color.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/include/omath/color.hpp" beforeDir="false" afterPath="$PROJECT_DIR$/include/omath/color.hpp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -238,7 +238,7 @@
       <workItem from="1752302256186" duration="714000" />
       <workItem from="1753455801202" duration="1091000" />
       <workItem from="1755627102717" duration="301000" />
-      <workItem from="1755723773366" duration="421000" />
+      <workItem from="1755723773366" duration="852000" />
     </task>
     <servers />
   </component>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b76979..886d316 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,6 +102,11 @@ elseif (OMATH_THREAT_WARNING_AS_ERROR)
     target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Wpedantic -Werror)
 endif ()
 
+# Windows SDK redefine min/max via preprocessor and break std::min and std::max
+if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    target_compile_definitions(${PROJECT_NAME} INTERFACE NOMINMAX)
+endif ()
+
 target_include_directories(${PROJECT_NAME}
         PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>   # Use this path when building the project
diff --git a/include/omath/color.hpp b/include/omath/color.hpp
index 4172062..f620807 100644
--- a/include/omath/color.hpp
+++ b/include/omath/color.hpp
@@ -8,14 +8,6 @@
 #include "omath/vector4.hpp"
 #include <cstdint>
 
-#ifdef max
-#undef max
-#endif
-
-#ifdef min
-#undef min
-#endif
-
 namespace omath
 {
     struct Hsv