diff --git a/panda/src/display/Sources.pp b/panda/src/display/Sources.pp
index 0140b9a797..c86373da2b 100644
--- a/panda/src/display/Sources.pp
+++ b/panda/src/display/Sources.pp
@@ -1,6 +1,6 @@
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
                    dtoolutil:c dtoolbase:c dtool:m
-				   
+                   
 #begin lib_target
   #define TARGET display
   #define LOCAL_LIBS \
@@ -39,6 +39,8 @@
     savedFrameBuffer.I savedFrameBuffer.h textureContext.I \
     textureContext.h
 
+  #define PRECOMPILED_HEADER display_headers.h  
+
   #define IGATESCAN all
 
 #end lib_target
diff --git a/panda/src/display/config_display.cxx b/panda/src/display/config_display.cxx
index 33c77a4245..45f2ab9c7f 100644
--- a/panda/src/display/config_display.cxx
+++ b/panda/src/display/config_display.cxx
@@ -16,6 +16,13 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "display_headers.h"
+#endif
+
+#pragma hdrstop
+
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "config_display.h"
 #include "graphicsStateGuardian.h"
 #include "savedFrameBuffer.h"
@@ -26,6 +33,7 @@
 #include "graphicsChannel.h"
 #include "hardwareChannel.h"
 #include "textureContext.h"
+#endif
 
 Configure(config_display);
 NotifyCategoryDef(display, "");
diff --git a/panda/src/display/displayRegion.cxx b/panda/src/display/displayRegion.cxx
index f66fe5520b..576d6b3a37 100644
--- a/panda/src/display/displayRegion.cxx
+++ b/panda/src/display/displayRegion.cxx
@@ -16,12 +16,20 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include "displayRegion.h"
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "display_headers.h"
+#endif
+
+#pragma hdrstop
+
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "graphicsLayer.h"
 #include "graphicsChannel.h"
 #include "graphicsWindow.h"
 #include "config_display.h"
+#endif
 
+#include "displayRegion.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: DisplayRegion::Constructor
diff --git a/panda/src/display/display_headers.h b/panda/src/display/display_headers.h
new file mode 100644
index 0000000000..1a85749454
--- /dev/null
+++ b/panda/src/display/display_headers.h
@@ -0,0 +1,38 @@
+// Filename: xxx_headers.h
+// Created by:  georges (30May01)
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// panda3d@yahoogroups.com .
+//
+////////////////////////////////////////////////////////////////////
+
+#include <keyboardButton.h>
+#include <mouseButton.h>
+
+#include "config_display.h"
+#include "graphicsChannel.h"
+#include "graphicsLayer.h"
+#include "graphicsPipe.h"
+#include "graphicsStateGuardian.h"
+#include "graphicsWindow.h"
+#include "hardwareChannel.h"
+#include "interactiveGraphicsPipe.h"
+#include "noninteractiveGraphicsPipe.h"
+#include "savedFrameBuffer.h"
+#include "textureContext.h"
+
+#include <algorithm>
+#include <map>
+
+#pragma hdrstop
+
diff --git a/panda/src/display/graphicsChannel.cxx b/panda/src/display/graphicsChannel.cxx
index 7d03fa1928..8837aacec4 100644
--- a/panda/src/display/graphicsChannel.cxx
+++ b/panda/src/display/graphicsChannel.cxx
@@ -15,11 +15,19 @@
 // panda3d@yahoogroups.com .
 //
 ////////////////////////////////////////////////////////////////////
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "display_headers.h"
+#endif
+
+#pragma hdrstop
+
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "graphicsChannel.h"
 #include "graphicsWindow.h"
 #include "config_display.h"
 
 #include <map>
+#endif
 
 ////////////////////////////////////////////////////////////////////
 // Static variables
diff --git a/panda/src/display/graphicsLayer.cxx b/panda/src/display/graphicsLayer.cxx
index b862fd217f..7d6e7cf1ac 100644
--- a/panda/src/display/graphicsLayer.cxx
+++ b/panda/src/display/graphicsLayer.cxx
@@ -15,14 +15,22 @@
 // panda3d@yahoogroups.com .
 //
 ////////////////////////////////////////////////////////////////////
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "display_headers.h"
+#endif
+
+#pragma hdrstop
+
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "graphicsLayer.h"
 #include "graphicsChannel.h"
 #include "graphicsWindow.h"
 #include "config_display.h"
 
-#include <notify.h>
-
 #include <algorithm>
+#endif
+
+#include <notify.h>
 
 ////////////////////////////////////////////////////////////////////
 // Static variables
diff --git a/panda/src/display/graphicsPipe.cxx b/panda/src/display/graphicsPipe.cxx
index 241886ae5c..cc2dd94c51 100644
--- a/panda/src/display/graphicsPipe.cxx
+++ b/panda/src/display/graphicsPipe.cxx
@@ -15,14 +15,22 @@
 // panda3d@yahoogroups.com .
 //
 ////////////////////////////////////////////////////////////////////
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "display_headers.h"
+#endif
+
+#pragma hdrstop
+
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "graphicsPipe.h"
 #include "config_display.h"
 
+#include <algorithm>
+#endif
+
 #include <load_dso.h>
 #include <filename.h>
 
-#include <algorithm>
-
 // Static variables
 ////////////////////////////////////////////////////////////////////
 TypeHandle GraphicsPipe::_type_handle;
diff --git a/panda/src/display/graphicsStateGuardian.cxx b/panda/src/display/graphicsStateGuardian.cxx
index f0dc740340..c31d1f4b4f 100644
--- a/panda/src/display/graphicsStateGuardian.cxx
+++ b/panda/src/display/graphicsStateGuardian.cxx
@@ -16,16 +16,22 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "display_headers.h"
+#endif
+
+#pragma hdrstop
+
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "graphicsStateGuardian.h"
-#include "renderBuffer.h"
 #include "config_display.h"
 #include "textureContext.h"
+#include <algorithm>
+#endif
 
 #include <clockObject.h>
 #include <geomNode.h>
-
-#include <algorithm>
-
+#include "renderBuffer.h"
 
 #ifndef CPPPARSER
 PStatCollector GraphicsStateGuardian::_total_texusage_pcollector("Texture usage");
diff --git a/panda/src/display/graphicsWindow.cxx b/panda/src/display/graphicsWindow.cxx
index a3a734e21e..e7d5eaa44a 100644
--- a/panda/src/display/graphicsWindow.cxx
+++ b/panda/src/display/graphicsWindow.cxx
@@ -15,6 +15,13 @@
 // panda3d@yahoogroups.com .
 //
 ////////////////////////////////////////////////////////////////////
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "display_headers.h"
+#endif
+
+#pragma hdrstop
+
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "graphicsWindow.h"
 #include "graphicsPipe.h"
 #include "config_display.h"
@@ -23,6 +30,7 @@
 #include <keyboardButton.h>
 
 #include <map>
+#endif
 
 ////////////////////////////////////////////////////////////////////
 // Static variables
diff --git a/panda/src/display/graphicsWindowInputDevice.cxx b/panda/src/display/graphicsWindowInputDevice.cxx
index 4633353e9e..51977566a9 100644
--- a/panda/src/display/graphicsWindowInputDevice.cxx
+++ b/panda/src/display/graphicsWindowInputDevice.cxx
@@ -16,9 +16,17 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "display_headers.h"
+#endif
+
+#pragma hdrstop
+
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "graphicsWindowInputDevice.h"
 #include <mouseButton.h>
 #include <keyboardButton.h>
+#endif
 
 #define EXPCL EXPCL_PANDA
 #define EXPTP EXPTP_PANDA
diff --git a/panda/src/display/hardwareChannel.cxx b/panda/src/display/hardwareChannel.cxx
index 73018ed8da..710b43db66 100644
--- a/panda/src/display/hardwareChannel.cxx
+++ b/panda/src/display/hardwareChannel.cxx
@@ -15,8 +15,16 @@
 // panda3d@yahoogroups.com .
 //
 ////////////////////////////////////////////////////////////////////
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "display_headers.h"
+#endif
+
+#pragma hdrstop
+
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "hardwareChannel.h"
 #include "config_display.h"
+#endif
 
 ////////////////////////////////////////////////////////////////////
 // Static variables
diff --git a/panda/src/display/interactiveGraphicsPipe.cxx b/panda/src/display/interactiveGraphicsPipe.cxx
index a31281f562..6c9c7d210f 100644
--- a/panda/src/display/interactiveGraphicsPipe.cxx
+++ b/panda/src/display/interactiveGraphicsPipe.cxx
@@ -16,8 +16,16 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "display_headers.h"
+#endif
+
+#pragma hdrstop
+
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "interactiveGraphicsPipe.h"
 #include "config_display.h"
+#endif
 
 ////////////////////////////////////////////////////////////////////
 // Static variables
diff --git a/panda/src/display/noninteractiveGraphicsPipe.cxx b/panda/src/display/noninteractiveGraphicsPipe.cxx
index db1e4d1ff2..2d55931e0f 100644
--- a/panda/src/display/noninteractiveGraphicsPipe.cxx
+++ b/panda/src/display/noninteractiveGraphicsPipe.cxx
@@ -16,8 +16,16 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "display_headers.h"
+#endif
+
+#pragma hdrstop
+
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "noninteractiveGraphicsPipe.h"
 #include "config_display.h"
+#endif
 
 ////////////////////////////////////////////////////////////////////
 // Static variables
diff --git a/panda/src/display/pipeSpec.cxx b/panda/src/display/pipeSpec.cxx
index c6c2acfe57..c62a7f36e8 100644
--- a/panda/src/display/pipeSpec.cxx
+++ b/panda/src/display/pipeSpec.cxx
@@ -16,8 +16,17 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include "pipeSpec.h"
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "display_headers.h"
+#endif
+
+#pragma hdrstop
+
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "config_display.h"
+#endif
+
+#include "pipeSpec.h"
 
 PipeSpecifier::PipeSpecifier(void)
   : _machine(pipe_spec_machine),
diff --git a/panda/src/display/savedFrameBuffer.cxx b/panda/src/display/savedFrameBuffer.cxx
index 8b20218ef7..d196d00783 100644
--- a/panda/src/display/savedFrameBuffer.cxx
+++ b/panda/src/display/savedFrameBuffer.cxx
@@ -16,6 +16,14 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "display_headers.h"
+#endif
+
+#pragma hdrstop
+
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "savedFrameBuffer.h"
+#endif
 
 TypeHandle SavedFrameBuffer::_type_handle;
diff --git a/panda/src/display/textureContext.cxx b/panda/src/display/textureContext.cxx
index 4ca3faa9a0..ca18f572c5 100644
--- a/panda/src/display/textureContext.cxx
+++ b/panda/src/display/textureContext.cxx
@@ -16,10 +16,18 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include "textureContext.h"
+#if defined(WIN32_VC) && !defined(NO_PCH)
+#include "display_headers.h"
+#endif
+
+#pragma hdrstop
+
+#if !defined(WIN32_VC) || defined(NO_PCH)
+#include "textureContext.h"
+#endif
 
-#include <texture.h>
 #include <pixelBuffer.h>
+#include <texture.h>
 
 TypeHandle TextureContext::_type_handle;