diff --git a/panda/src/wdxdisplay/Sources.pp b/panda/src/wdxdisplay/Sources.pp
index 8726235e19..75a41254a4 100644
--- a/panda/src/wdxdisplay/Sources.pp
+++ b/panda/src/wdxdisplay/Sources.pp
@@ -8,13 +8,15 @@
   #define TARGET wdxdisplay
   #define LOCAL_LIBS \
     dxgsg
-
+    
   #define SOURCES \
     config_wdxdisplay.cxx config_wdxdisplay.h wdxGraphicsPipe.cxx \
     wdxGraphicsPipe.h wdxGraphicsWindow.cxx wdxGraphicsWindow.h
 
   #define INSTALL_HEADERS \
     config_wdxdisplay.h wdxGraphicsPipe.h wdxGraphicsWindow.h
+    
+  #define PRECOMPILED_HEADER wdxdisplay_headers.h 
 
 #end lib_target
 
diff --git a/panda/src/wdxdisplay/config_wdxdisplay.cxx b/panda/src/wdxdisplay/config_wdxdisplay.cxx
index f2d65d572f..b66c3e7f16 100644
--- a/panda/src/wdxdisplay/config_wdxdisplay.cxx
+++ b/panda/src/wdxdisplay/config_wdxdisplay.cxx
@@ -16,11 +16,8 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include "config_wdxdisplay.h"
-#include "wdxGraphicsPipe.h"
-#include "wdxGraphicsWindow.h"
-
-#include <dconfig.h>
+#include "wdxdisplay_headers.h"
+#pragma hdrstop
 
 Configure(config_wdxdisplay);
 NotifyCategoryDef(wdxdisplay, "display");
diff --git a/panda/src/wdxdisplay/wdxGraphicsPipe.cxx b/panda/src/wdxdisplay/wdxGraphicsPipe.cxx
index d1809f6f74..f4496acd70 100644
--- a/panda/src/wdxdisplay/wdxGraphicsPipe.cxx
+++ b/panda/src/wdxdisplay/wdxGraphicsPipe.cxx
@@ -15,11 +15,9 @@
 // panda3d@yahoogroups.com .
 //
 ////////////////////////////////////////////////////////////////////
-#include "wdxGraphicsPipe.h"
-#include "config_wdxdisplay.h"
-#include <mouseButton.h>
-#include <keyboardButton.h>
-#include <dxfile.h>
+
+#include "wdxdisplay_headers.h"
+#pragma hdrstop
 
 ////////////////////////////////////////////////////////////////////
 // Static variables
diff --git a/panda/src/wdxdisplay/wdxGraphicsPipe.h b/panda/src/wdxdisplay/wdxGraphicsPipe.h
index 6639e4ee2d..ce0bab4fef 100644
--- a/panda/src/wdxdisplay/wdxGraphicsPipe.h
+++ b/panda/src/wdxdisplay/wdxGraphicsPipe.h
@@ -26,6 +26,10 @@
 #include <string>
 #include <interactiveGraphicsPipe.h>
 #include "wdxGraphicsWindow.h"
+
+#ifndef STRICT
+#define STRICT
+#endif
 #define WINDOWS_LEAN_AND_MEAN
 #include <windows.h>
 #undef WINDOWS_LEAN_AND_MEAN
diff --git a/panda/src/wdxdisplay/wdxGraphicsWindow.cxx b/panda/src/wdxdisplay/wdxGraphicsWindow.cxx
index edda3f9080..ed7d9f1b50 100644
--- a/panda/src/wdxdisplay/wdxGraphicsWindow.cxx
+++ b/panda/src/wdxdisplay/wdxGraphicsWindow.cxx
@@ -15,26 +15,9 @@
 // panda3d@yahoogroups.com .
 //
 ////////////////////////////////////////////////////////////////////
-#ifndef STRICT
-#define STRICT
-#endif
-#define D3D_OVERLOADS
-//#define  INITGUID  dont need this if linking w/dxguid.lib
-#include <d3d.h>
-#include "wdxGraphicsWindow.h"
-#include "wdxGraphicsPipe.h"
-#include "config_wdxdisplay.h"
 
-#include <keyboardButton.h>
-#include <mouseButton.h>
-#ifdef DO_PSTATS
-#include <pStatTimer.h>
-#endif
-#include "dxGraphicsStateGuardian.h"
-
-#include <errno.h>
-#include <time.h>
-#include <math.h>
+#include "wdxdisplay_headers.h"
+#pragma hdrstop
 
 ////////////////////////////////////////////////////////////////////
 // Static variables