diff --git a/src/platform/Bitmap256.h b/src/platform/Bitmap256.h
index 5af67ba96..116cac605 100644
--- a/src/platform/Bitmap256.h
+++ b/src/platform/Bitmap256.h
@@ -25,7 +25,7 @@
 #define BITMAP256_H_INC
 
 #ifdef _WIN32
-#include <windows.h>
+#include <StdWindow.h>
 #else
 #pragma pack(push,2)
 typedef struct tagBITMAPFILEHEADER
diff --git a/src/platform/C4CrashHandlerWin32.cpp b/src/platform/C4CrashHandlerWin32.cpp
index 0e14e3738..a083b5132 100644
--- a/src/platform/C4CrashHandlerWin32.cpp
+++ b/src/platform/C4CrashHandlerWin32.cpp
@@ -30,6 +30,7 @@
 #ifdef GENERATE_MINI_DUMP
 
 // Dump generation on crash
+#include <windows.h>
 #include <dbghelp.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/src/platform/StdJoystick.h b/src/platform/StdJoystick.h
index 3394efc69..67f4eaa8a 100644
--- a/src/platform/StdJoystick.h
+++ b/src/platform/StdJoystick.h
@@ -23,7 +23,6 @@
 #ifndef INC_StdJoystick
 #define INC_StdJoystick
 
-#include <windows.h>
 #include <mmsystem.h>
 
 const int32_t PAD_Axis_POVx = 6;
diff --git a/src/platform/StdRegistry.h b/src/platform/StdRegistry.h
index 4928b3ec3..5836bea91 100644
--- a/src/platform/StdRegistry.h
+++ b/src/platform/StdRegistry.h
@@ -24,7 +24,7 @@
 #define INC_STDREGISTRY
 
 #ifdef _WIN32
-#include <windows.h>
+
 #include "StdCompiler.h"
 bool DeleteRegistryValue(HKEY hKey, const char *szSubKey,
                          const char *szValueName);
diff --git a/src/platform/StdVideo.h b/src/platform/StdVideo.h
index 1a6b21a41..f2afb905f 100644
--- a/src/platform/StdVideo.h
+++ b/src/platform/StdVideo.h
@@ -26,6 +26,7 @@
 #ifdef _WIN32
 #pragma once
 
+#include <StdWindow.h>
 #include <windows.h> // some vfw.h versions do not compile without this
 #include <mmsystem.h>
 #include <vfw.h>