diff --git a/panda/src/chancfg/chancfg.cxx b/panda/src/chancfg/chancfg.cxx
index 53bc0a1a52..55ec2d9c0a 100644
--- a/panda/src/chancfg/chancfg.cxx
+++ b/panda/src/chancfg/chancfg.cxx
@@ -16,10 +16,29 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#ifdef WIN32_VC
 #include "chancfg_headers.h"
+#endif
+
 #pragma hdrstop
 
+#ifndef WIN32_VC
+#include "chancfg.h"
+#include <notify.h>
+#endif
+
 #include <algorithm>
+#include <displayRegion.h>
+#include <graphicsChannel.h>
+#include <hardwareChannel.h>
+#include <camera.h>
+#include <frustum.h>
+#include <perspectiveProjection.h>
+#include <renderRelation.h>
+#include <transformTransition.h>
+#include <dSearchPath.h>
+#include <dconfig.h>
+#include <filename.h>
 
 Configure(chanconfig);
 
diff --git a/panda/src/chancfg/chancfg_headers.h b/panda/src/chancfg/chancfg_headers.h
index 5ffdaf7480..783aa9c95f 100644
--- a/panda/src/chancfg/chancfg_headers.h
+++ b/panda/src/chancfg/chancfg_headers.h
@@ -16,18 +16,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include <camera.h>
-#include <dconfig.h>
-#include <displayRegion.h>
-#include <dSearchPath.h>
-#include <filename.h>
-#include <frustum.h>
-#include <graphicsChannel.h>
-#include <hardwareChannel.h>
 #include <notify.h>
-#include <perspectiveProjection.h>
-#include <renderRelation.h>
-#include <transformTransition.h>
 
 #include "chancfg.h"
 #include "chanlayout.h"
diff --git a/panda/src/chancfg/chanlayout.cxx b/panda/src/chancfg/chanlayout.cxx
index 2b3bacb8c7..bdf3f4a458 100644
--- a/panda/src/chancfg/chanlayout.cxx
+++ b/panda/src/chancfg/chanlayout.cxx
@@ -16,9 +16,20 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#ifdef WIN32_VC
 #include "chancfg_headers.h"
+#endif
+
 #pragma hdrstop
 
+#ifndef WIN32_VC
+#include "chanlayout.h"
+#include "chanparse.h"
+#include "chanshare.h"
+
+#include <notify.h>
+#endif
+
 LayoutType* LayoutDB = (LayoutType*)0;
 
 class LayoutParseFunctor : public ChanParseFunctor {
diff --git a/panda/src/chancfg/chanparse.cxx b/panda/src/chancfg/chanparse.cxx
index 836bb266a3..099bef6fc9 100644
--- a/panda/src/chancfg/chanparse.cxx
+++ b/panda/src/chancfg/chanparse.cxx
@@ -16,9 +16,18 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#ifdef WIN32_VC
 #include "chancfg_headers.h"
+#endif
+
 #pragma hdrstop
 
+#ifndef WIN32_VC
+#include "chanparse.h"
+
+#include <notify.h>
+#endif
+
 const int ChanFileEOF = -1;
 
 static bool file_done;
diff --git a/panda/src/chancfg/chansetup.cxx b/panda/src/chancfg/chansetup.cxx
index 74d33830d5..40600eb331 100644
--- a/panda/src/chancfg/chansetup.cxx
+++ b/panda/src/chancfg/chansetup.cxx
@@ -16,9 +16,20 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#ifdef WIN32_VC
 #include "chancfg_headers.h"
+#endif
+
 #pragma hdrstop
 
+#ifndef WIN32_VC
+#include "chansetup.h"
+#include "chanparse.h"
+#include "chanshare.h"
+
+#include <notify.h>
+#endif
+
 SetupType* SetupDB = (SetupType*)0;
 
 class SetupParseFunctor : public ChanParseFunctor {
diff --git a/panda/src/chancfg/chanwindow.cxx b/panda/src/chancfg/chanwindow.cxx
index 6a154e7a58..7291713ad4 100644
--- a/panda/src/chancfg/chanwindow.cxx
+++ b/panda/src/chancfg/chanwindow.cxx
@@ -16,9 +16,20 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#ifdef WIN32_VC
 #include "chancfg_headers.h"
+#endif
+
 #pragma hdrstop
 
+#ifndef WIN32_VC
+#include "chanwindow.h"
+#include "chanparse.h"
+#include "chanshare.h"
+
+#include <notify.h>
+#endif
+
 WindowType* WindowDB = (WindowType*)0;
 
 class WindowParseFunctor : public ChanParseFunctor {