diff --git a/core/hw/naomi/awcartridge.cpp b/core/hw/naomi/awcartridge.cpp
index fe39f0828..a228660a2 100644
--- a/core/hw/naomi/awcartridge.cpp
+++ b/core/hw/naomi/awcartridge.cpp
@@ -162,11 +162,6 @@ ROM board internal layouts:
 */
 #include "awcartridge.h"
 #include "awave_regs.h"
-#ifdef _MSC_VER
-#undef min
-#undef max
-#include <algorithm>
-#endif
 
 u32 AWCartridge::ReadMem(u32 address, u32 size) {
 	verify(size != 1);
diff --git a/core/hw/naomi/naomi_cart.h b/core/hw/naomi/naomi_cart.h
index 74b123fc4..fcf803ef6 100644
--- a/core/hw/naomi/naomi_cart.h
+++ b/core/hw/naomi/naomi_cart.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <algorithm>
 #include <string>
 #include "types.h"
 
diff --git a/core/reios/gdrom_hle.cpp b/core/reios/gdrom_hle.cpp
index 28b3115a3..f83a2d143 100644
--- a/core/reios/gdrom_hle.cpp
+++ b/core/reios/gdrom_hle.cpp
@@ -17,10 +17,7 @@
 #include "reios.h"
 #include "imgread/common.h"
 
-#ifdef _MSC_VER
-#undef min
 #include <algorithm>
-#endif
 
 #define SWAP32(a) ((((a) & 0xff) << 24)  | (((a) & 0xff00) << 8) | (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff))
 
diff --git a/core/stdclass.cpp b/core/stdclass.cpp
index bd3facb7c..d7f782d49 100644
--- a/core/stdclass.cpp
+++ b/core/stdclass.cpp
@@ -1,3 +1,4 @@
+#include <algorithm>
 #include <cstring>
 #include <vector>
 #include <sys/types.h>
diff --git a/core/types.h b/core/types.h
index ebce054a3..8cd42dc92 100644
--- a/core/types.h
+++ b/core/types.h
@@ -54,6 +54,8 @@
 #endif
 #define _CRT_SECURE_NO_DEPRECATE
 
+#define NOMINMAX
+
 //Do not complain when i use enum::member
 #pragma warning( disable : 4482)