diff --git a/meson.build b/meson.build
index 834e47525ee..f51bc66cb1b 100644
--- a/meson.build
+++ b/meson.build
@@ -988,6 +988,7 @@ elif host_machine.system() == 'windows'
       '-D_SCL_SECURE_NO_DEPRECATE',
       '-D_ALLOW_KEYWORD_MACROS',
       '-D_HAS_EXCEPTIONS=0', # Tell C++ STL to not use exceptions
+      '-DNOMINMAX',
     ]
   else
     pre_args += ['-D__MSVCRT_VERSION__=0x0700']
diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h
index a37b9f430ea..cc13936d8e9 100644
--- a/src/gallium/drivers/swr/rasterizer/common/os.h
+++ b/src/gallium/drivers/swr/rasterizer/common/os.h
@@ -39,7 +39,9 @@
 #undef NOMINMAX
 #define UNICODE
 #else
+#undef UNICODE
 #include <windows.h>
+#define UNICODE
 #endif
 #include <intrin.h>
 #include <cstdint>