diff --git a/source/build/include/windows_inc.h b/source/build/include/windows_inc.h
index 302f6511c..44041e48a 100644
--- a/source/build/include/windows_inc.h
+++ b/source/build/include/windows_inc.h
@@ -39,6 +39,16 @@
 # undef NEED_SHELLAPI_H
 #endif
 
+#ifdef NEED_SHLWAPI_H
+# include <shlwapi.h>
+# undef NEED_SHLWAPI_H
+#endif
+
+#ifdef NEED_SHLOBJ_H
+# include <shlobj.h>
+# undef NEED_SHLOBJ_H
+#endif
+
 #ifdef NEED_WS2TCPIP_H
 # include <ws2tcpip.h>
 # undef NEED_WS2TCPIP_H
diff --git a/source/build/src/compat.cpp b/source/build/src/compat.cpp
index 1c7d5df7f..ab0c97a0c 100644
--- a/source/build/src/compat.cpp
+++ b/source/build/src/compat.cpp
@@ -15,7 +15,8 @@
 #include "compat.h"
 
 #ifdef _WIN32
-# include <shlobj.h>
+# define NEED_SHLOBJ_H
+# include "windows_inc.h"
 # include <direct.h>
 #elif __APPLE__
 # include "osxbits.h"
diff --git a/source/duke3d/src/common.cpp b/source/duke3d/src/common.cpp
index a16ebfcbd..05d659991 100644
--- a/source/duke3d/src/common.cpp
+++ b/source/duke3d/src/common.cpp
@@ -10,9 +10,9 @@
 #include "grpscan.h"
 
 #ifdef _WIN32
+# define NEED_SHLWAPI_H
+# include "windows_inc.h"
 # include "winbits.h"
-# include <shlwapi.h>
-# include <winnt.h>
 # ifndef KEY_WOW64_32KEY
 #  define KEY_WOW64_32KEY 0x0200
 # endif