diff --git a/panda/src/dxgsg7/dxgsg7_composite1.cxx b/panda/src/dxgsg7/dxgsg7_composite1.cxx
index 79003e66a6..f4cdcde069 100644
--- a/panda/src/dxgsg7/dxgsg7_composite1.cxx
+++ b/panda/src/dxgsg7/dxgsg7_composite1.cxx
@@ -1,5 +1,6 @@
-#include "config_dxgsg7.cxx"
+#include "dxgsg7base.h"
 #include "dxgsg7base.cxx"
+#include "config_dxgsg7.cxx"
 #include "dxSavedFrameBuffer7.cxx"
 #include "dxTextureContext7.cxx"
 #include "dxGeomNodeContext7.cxx"
diff --git a/panda/src/dxgsg7/dxgsg7base.h b/panda/src/dxgsg7/dxgsg7base.h
index fc29b16cbf..34c0773c6a 100644
--- a/panda/src/dxgsg7/dxgsg7base.h
+++ b/panda/src/dxgsg7/dxgsg7base.h
@@ -19,11 +19,9 @@
 #ifndef DXGSGBASE_H
 #define DXGSGBASE_H
 
-#include <pandabase.h>
-
-// include win32 defns for everything up to XP, and assume I'm smart enough to
+// include win32 defns for everything up to WinServer2003, and assume I'm smart enough to
 // use GetProcAddress for backward compat on w95/w98 for newer fns
-#define _WIN32_WINNT 0x0501
+#define _WIN32_WINNT 0x0502
 
 #define WIN32_LEAN_AND_MEAN   // get rid of mfc win32 hdr stuff
 #ifndef STRICT
@@ -42,6 +40,8 @@
 #error DX7 headers not available, you need to install MS Platform SDK or DirectX 8+ SDK!
 #endif
 
+#include <pandabase.h>
+
 // disable nameless struct 'warning'
 #pragma warning (disable : 4201)
 
diff --git a/panda/src/dxgsg8/dxgsg8_composite1.cxx b/panda/src/dxgsg8/dxgsg8_composite1.cxx
index 23f86b4071..59ab16290e 100644
--- a/panda/src/dxgsg8/dxgsg8_composite1.cxx
+++ b/panda/src/dxgsg8/dxgsg8_composite1.cxx
@@ -1,8 +1,8 @@
-#include "wdxGraphicsWindow8.cxx"
+#include "dxgsg8base.h"
 #include "config_dxgsg8.cxx"
 #include "dxSavedFrameBuffer8.cxx"
 #include "dxTextureContext8.cxx"
 #include "dxGeomNodeContext8.cxx"
 #include "d3dfont8.cxx"
 #include "wdxGraphicsPipe8.cxx"
-
+#include "wdxGraphicsWindow8.cxx"
diff --git a/panda/src/dxgsg8/dxgsg8base.h b/panda/src/dxgsg8/dxgsg8base.h
index 8e19322a87..7ebbdd4e8c 100644
--- a/panda/src/dxgsg8/dxgsg8base.h
+++ b/panda/src/dxgsg8/dxgsg8base.h
@@ -22,10 +22,10 @@
 #include <pandabase.h>
 #include <graphicsWindow.h>
 
-// include win32 defns for everything up to XP, and assume I'm smart enough to
+// include win32 defns for everything up to WinServer2003, and assume I'm smart enough to
 // use GetProcAddress for backward compat on newer fns
 // Note DX8 cannot be installed on w95, so OK to assume base of win98
-#define _WIN32_WINNT 0x0501
+#define _WIN32_WINNT 0x0502
 
 #define WIN32_LEAN_AND_MEAN   // get rid of mfc win32 hdr stuff
 #ifndef STRICT
diff --git a/panda/src/windisplay/winGraphicsWindow.h b/panda/src/windisplay/winGraphicsWindow.h
index fe2ea25367..3a3d4eb1b4 100644
--- a/panda/src/windisplay/winGraphicsWindow.h
+++ b/panda/src/windisplay/winGraphicsWindow.h
@@ -19,10 +19,10 @@
 #ifndef WINGRAPHICSWINDOW_H
 #define WINGRAPHICSWINDOW_H
 
-// include win32 defns for everything up to XP, and assume I'm smart
+// include win32 defns for everything up to WinServer2003, and assume I'm smart
 // enough to use GetProcAddress for backward compat on w95/w98 for
 // newer fns
-#define _WIN32_WINNT 0x0501
+#define _WIN32_WINNT 0x0502
 
 #define WINDOWS_LEAN_AND_MEAN
 #include <windows.h>