diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt
index bd574cbab..332d746e2 100644
--- a/src/libprojectM/CMakeLists.txt
+++ b/src/libprojectM/CMakeLists.txt
@@ -20,6 +20,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
     # Additional preprocessor definitions for Windows builds
     add_compile_definitions(
+            NOMINMAX
+            WIN32_LEAN_AND_MEAN
             USE_FTGL
             USE_NATIVE_GLEW
             STBI_NO_DDS
diff --git a/src/libprojectM/Renderer/SOIL2/SOIL2.c b/src/libprojectM/Renderer/SOIL2/SOIL2.c
index 3f368f14b..7ec4d81c3 100644
--- a/src/libprojectM/Renderer/SOIL2/SOIL2.c
+++ b/src/libprojectM/Renderer/SOIL2/SOIL2.c
@@ -74,7 +74,6 @@
 
 #if defined( __WIN32__ ) || defined( _WIN32 ) || defined( WIN32 )
 	#define SOIL_PLATFORM_WIN32
-	#define WIN32_LEAN_AND_MEAN
 	#include <windows.h>
 	#include <wingdi.h>
 	#include <GL/gl.h>
diff --git a/src/libprojectM/Renderer/TextureManager.cpp b/src/libprojectM/Renderer/TextureManager.cpp
index 15c80ce07..9866cfbf0 100644
--- a/src/libprojectM/Renderer/TextureManager.cpp
+++ b/src/libprojectM/Renderer/TextureManager.cpp
@@ -51,13 +51,8 @@ TextureManager::TextureManager(std::vector<std::string>& textureSearchPaths, int
         // blur5 =  64  <-  user sees this as "blur3"
         if (!(i&1) || (i<2))
         {
-#if defined WIN32 && defined max
-			w = max(16, w / 2);
-			h = max(16, h / 2);
-#else
 			w = std::max(16, w / 2);
 			h = std::max(16, h / 2);
-#endif /** WIN32 */
         }
         int w2 = ((w+3)/16)*16;
         int h2 = ((h+3)/4)*4;