diff --git a/source/lib/posix_types.h b/source/lib/posix_types.h
index d35ba1d5be..2b448d063f 100644
--- a/source/lib/posix_types.h
+++ b/source/lib/posix_types.h
@@ -3,6 +3,10 @@
 // included from lib/types.h in place of posix.h; this helps avoid conflicts
 // due to incompatible winsock definitions.
 
+#include <wchar.h>
+#include <sys/types.h>
+#include <stddef.h>
+
 #ifdef _WIN32
 # include "sysdep/win/wposix_types.h"
 #else
diff --git a/source/lib/string_s.h b/source/lib/string_s.h
index cecf221bee..3ae79dc563 100644
--- a/source/lib/string_s.h
+++ b/source/lib/string_s.h
@@ -1,7 +1,7 @@
 #ifndef STRINGS_S_H__
 #define STRINGS_S_H__
 
-#include "posix.h"	// size_t
+#include "posix_types.h"	// size_t
 
 // these are already shipped with VC2005
 #if _MSC_VER < 1400
diff --git a/source/lib/sysdep/ia32.cpp b/source/lib/sysdep/ia32.cpp
index 4fe0ddddc2..eac72cfaa9 100755
--- a/source/lib/sysdep/ia32.cpp
+++ b/source/lib/sysdep/ia32.cpp
@@ -19,8 +19,9 @@
 
 #ifdef _M_IX86
 
-#include "ia32.h"
 #include "lib.h"
+#include "posix.h"
+#include "ia32.h"
 #include "detect.h"
 #include "timer.h"
 
diff --git a/source/lib/sysdep/win/waio.cpp b/source/lib/sysdep/win/waio.cpp
index a27ab9333f..9dfca72b0e 100755
--- a/source/lib/sysdep/win/waio.cpp
+++ b/source/lib/sysdep/win/waio.cpp
@@ -19,7 +19,7 @@
 #include "precompiled.h"
 
 #include "lib.h"
-#include "waio.h"
+#include "posix.h"
 #include "win_internal.h"
 
 #include <assert.h>
diff --git a/source/lib/sysdep/win/wcpu.cpp b/source/lib/sysdep/win/wcpu.cpp
index d35f5db76a..3653971b70 100755
--- a/source/lib/sysdep/win/wcpu.cpp
+++ b/source/lib/sysdep/win/wcpu.cpp
@@ -19,6 +19,7 @@
 #include "precompiled.h"
 
 #include "lib.h"
+#include "posix.h"
 #include "win_internal.h"
 
 #include "sysdep/cpu.h"
diff --git a/source/lib/sysdep/win/win.cpp b/source/lib/sysdep/win/win.cpp
index f55352bb13..8f34085af6 100755
--- a/source/lib/sysdep/win/win.cpp
+++ b/source/lib/sysdep/win/win.cpp
@@ -18,6 +18,7 @@
 #include "precompiled.h"
 
 #include "lib.h"
+#include "posix.h"
 #include "win_internal.h"
 
 #include <crtdbg.h>	// malloc debug
diff --git a/source/lib/sysdep/win/wposix.cpp b/source/lib/sysdep/win/wposix.cpp
index 50a85b8e57..f828b2053c 100755
--- a/source/lib/sysdep/win/wposix.cpp
+++ b/source/lib/sysdep/win/wposix.cpp
@@ -21,6 +21,7 @@
 #include "precompiled.h"
 
 #include "lib.h"
+#include "posix.h"
 #include "win_internal.h"
 
 #include <assert.h>
diff --git a/source/lib/sysdep/win/wposix.h b/source/lib/sysdep/win/wposix.h
index b7314eb463..dc67d74881 100755
--- a/source/lib/sysdep/win/wposix.h
+++ b/source/lib/sysdep/win/wposix.h
@@ -24,11 +24,9 @@
 #ifndef __WPOSIX_H__
 #define __WPOSIX_H__
 
-#include <wchar.h> // for the stat struct
-#include <sys/types.h>
-#include <stddef.h>
 
 // split out of this module.
+#include "wposix_types.h"
 #include "waio.h"
 #include "wsock.h"
 #include "wtime.h"
diff --git a/source/lib/sysdep/win/wpthread.cpp b/source/lib/sysdep/win/wpthread.cpp
index f523b88b9d..c9ecc132f1 100644
--- a/source/lib/sysdep/win/wpthread.cpp
+++ b/source/lib/sysdep/win/wpthread.cpp
@@ -23,8 +23,8 @@
 #include <process.h>
 
 #include "lib.h"
+#include "posix.h"
 #include "win_internal.h"
-#include "wpthread.h"
 
 
 static HANDLE pthread_t_to_HANDLE(pthread_t p)
diff --git a/source/lib/sysdep/win/wsdl.cpp b/source/lib/sysdep/win/wsdl.cpp
index deaccd7928..366e7dd963 100755
--- a/source/lib/sysdep/win/wsdl.cpp
+++ b/source/lib/sysdep/win/wsdl.cpp
@@ -31,6 +31,7 @@
 
 #include "sdl.h"
 #include "lib.h"
+#include "posix.h"
 #include "win_internal.h"
 
 #include "ogl.h"	// needed to pull in the delay-loaded opengl32.dll
diff --git a/source/lib/sysdep/win/wtime.cpp b/source/lib/sysdep/win/wtime.cpp
index ed7e608c61..4ca9391318 100755
--- a/source/lib/sysdep/win/wtime.cpp
+++ b/source/lib/sysdep/win/wtime.cpp
@@ -18,6 +18,7 @@
 #include "precompiled.h"
 
 #include "lib.h"
+#include "posix.h"
 #include "adts.h"
 #include "sysdep/ia32.h"
 #include "detect.h"
diff --git a/source/lib/timer.cpp b/source/lib/timer.cpp
index 59e5e6a2a9..f1b4942a37 100755
--- a/source/lib/timer.cpp
+++ b/source/lib/timer.cpp
@@ -19,6 +19,7 @@
 #include "precompiled.h"
 
 #include "lib.h"
+#include "posix.h"
 #include "timer.h"
 #include "adts.h"
 
diff --git a/source/ps/ThreadUtil.h b/source/ps/ThreadUtil.h
index fd743751c2..a3dfb79374 100755
--- a/source/ps/ThreadUtil.h
+++ b/source/ps/ThreadUtil.h
@@ -67,6 +67,7 @@ CLocker usage 2:
 //--------------------------------------------------------
 
 #include "lib.h"
+#include "posix.h"
 
 #ifdef DEBUG_LOCKS