diff --git a/panda/src/chancfg/Sources.pp b/panda/src/chancfg/Sources.pp
index 62aeeae4d6..d7a5dd93a2 100644
--- a/panda/src/chancfg/Sources.pp
+++ b/panda/src/chancfg/Sources.pp
@@ -26,8 +26,6 @@
   #define INSTALL_CONFIG \
     layout_db setup_db window_db
 
-//  #define PRECOMPILED_HEADER chancfg_headers.h 
-
   #define IGATESCAN chancfg.h
 
 #end lib_target
diff --git a/panda/src/chancfg/chancfg.cxx b/panda/src/chancfg/chancfg.cxx
index 226feeece6..52a53ac865 100644
--- a/panda/src/chancfg/chancfg.cxx
+++ b/panda/src/chancfg/chancfg.cxx
@@ -16,18 +16,8 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#if defined(WIN32_VC) && !defined(NO_PCH)
-#include "chancfg_headers.h"
-#endif
-
-#pragma hdrstop
-
-#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "chancfg.h"
 #include <notify.h>
-#endif
-
-#include <algorithm>
 #include <displayRegion.h>
 #include <graphicsChannel.h>
 #include <hardwareChannel.h>
@@ -39,6 +29,7 @@
 #include <dSearchPath.h>
 #include <dconfig.h>
 #include <filename.h>
+#include <algorithm>
 
 Configure(chanconfig);
 
diff --git a/panda/src/chancfg/chanparse.cxx b/panda/src/chancfg/chanparse.cxx
index 44b32774a4..d6e689fb78 100644
--- a/panda/src/chancfg/chanparse.cxx
+++ b/panda/src/chancfg/chanparse.cxx
@@ -16,17 +16,8 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#if defined(WIN32_VC) && !defined(NO_PCH)
-#include "chancfg_headers.h"
-#endif
-
-#pragma hdrstop
-
-#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "chanparse.h"
-
 #include <notify.h>
-#endif
 
 const int ChanFileEOF = -1;
 
diff --git a/panda/src/chancfg/chansetup.cxx b/panda/src/chancfg/chansetup.cxx
index 8f5c8d7ea9..c65d233f01 100644
--- a/panda/src/chancfg/chansetup.cxx
+++ b/panda/src/chancfg/chansetup.cxx
@@ -16,19 +16,10 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#if defined(WIN32_VC) && !defined(NO_PCH)
-#include "chancfg_headers.h"
-#endif
-
-#pragma hdrstop
-
-#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "chansetup.h"
 #include "chanparse.h"
 #include "chanshare.h"
-
 #include <notify.h>
-#endif
 
 SetupType* SetupDB = (SetupType*)0;
 
diff --git a/panda/src/chancfg/chanwindow.cxx b/panda/src/chancfg/chanwindow.cxx
index 16bde965cf..3a608554dd 100644
--- a/panda/src/chancfg/chanwindow.cxx
+++ b/panda/src/chancfg/chanwindow.cxx
@@ -16,20 +16,11 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#if defined(WIN32_VC) && !defined(NO_PCH)
-#include "chancfg_headers.h"
-#endif
-
-#pragma hdrstop
-
-#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "chanwindow.h"
 #include "chanparse.h"
 #include "chanshare.h"
 
 #include <notify.h>
-#endif
-
 WindowType* WindowDB = (WindowType*)0;
 
 class WindowParseFunctor : public ChanParseFunctor {