diff --git a/panda/src/char/char_headers.h b/panda/src/char/char_headers.h
index b5709bda67..54d81db7d8 100644
--- a/panda/src/char/char_headers.h
+++ b/panda/src/char/char_headers.h
@@ -16,16 +16,10 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include <clockObject.h>
-#include <animControl.h>
-#include <geomNode.h>
 #include <datagram.h>
 #include <datagramIterator.h>
 #include <bamReader.h>
 #include <bamWriter.h>
-#include <pStatTimer.h>
-#include <dconfig.h>
-#include <luse.h>
 #include <compose_matrix.h>
 #include <transformTransition.h>
 #include <ioPtaDatagramLinMath.h>
diff --git a/panda/src/char/character.cxx b/panda/src/char/character.cxx
index 329bf9325c..323eac64fa 100644
--- a/panda/src/char/character.cxx
+++ b/panda/src/char/character.cxx
@@ -16,9 +16,33 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#ifdef WIN32_VC
 #include "char_headers.h"
+#endif
+
 #pragma hdrstop
 
+#ifndef WIN32_VC
+#include "character.h"
+#include "characterJoint.h"
+#include "computedVertices.h"
+#include "config_char.h"
+
+#include <geomNode.h>
+#include <datagram.h>
+#include <datagramIterator.h>
+#include <bamReader.h>
+#include <bamWriter.h>
+#include <pStatTimer.h>
+#endif
+
+#include <geomNode.h>
+#include <animControl.h>
+#include <clockObject.h>
+#include <pStatTimer.h>
+
+
+
 TypeHandle Character::_type_handle;
 
 #ifndef CPPPARSER
diff --git a/panda/src/char/characterJoint.cxx b/panda/src/char/characterJoint.cxx
index b179f316a8..30c18cd65a 100644
--- a/panda/src/char/characterJoint.cxx
+++ b/panda/src/char/characterJoint.cxx
@@ -16,9 +16,24 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#ifdef WIN32_VC
 #include "char_headers.h"
+#endif
+
 #pragma hdrstop
 
+#ifndef WIN32_VC
+#include "characterJoint.h"
+#include "config_char.h"
+
+#include <compose_matrix.h>
+#include <transformTransition.h>
+#include <datagram.h>
+#include <datagramIterator.h>
+#include <bamReader.h>
+#include <bamWriter.h>
+#endif
+
 TypeHandle CharacterJoint::_type_handle;
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/char/characterJointBundle.cxx b/panda/src/char/characterJointBundle.cxx
index 799fe876d5..1cec4f3d81 100644
--- a/panda/src/char/characterJointBundle.cxx
+++ b/panda/src/char/characterJointBundle.cxx
@@ -16,9 +16,21 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#ifdef WIN32_VC
 #include "char_headers.h"
+#endif
+
 #pragma hdrstop
 
+#ifndef WIN32_VC
+#include "characterJointBundle.h"
+#include "character.h"
+#include <datagram.h>
+#include <datagramIterator.h>
+#include <bamReader.h>
+#include <bamWriter.h>
+#endif
+
 TypeHandle CharacterJointBundle::_type_handle;
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/char/characterSlider.cxx b/panda/src/char/characterSlider.cxx
index 009d2b01b5..3909902d8a 100644
--- a/panda/src/char/characterSlider.cxx
+++ b/panda/src/char/characterSlider.cxx
@@ -16,9 +16,20 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#ifdef WIN32_VC
 #include "char_headers.h"
+#endif
+
 #pragma hdrstop
 
+#ifndef WIN32_VC
+#include "characterSlider.h"
+#include <datagram.h>
+#include <datagramIterator.h>
+#include <bamReader.h>
+#include <bamWriter.h>
+#endif
+
 TypeHandle CharacterSlider::_type_handle;
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/char/computedVertices.cxx b/panda/src/char/computedVertices.cxx
index 5cd90c229f..9c679ce090 100644
--- a/panda/src/char/computedVertices.cxx
+++ b/panda/src/char/computedVertices.cxx
@@ -16,15 +16,26 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#ifdef WIN32_VC
 #include "char_headers.h"
+#endif
+
 #pragma hdrstop
 
-#include <algorithm>
+#ifndef WIN32_VC
+#include "computedVertices.h"
+#include "characterJoint.h"
+#include "character.h"
+#include "config_char.h"
+
 #include <datagram.h>
 #include <datagramIterator.h>
 #include <bamReader.h>
 #include <bamWriter.h>
 #include <ioPtaDatagramLinMath.h>
+#endif
+
+#include <algorithm>
 
 TypeHandle ComputedVertices::_type_handle;
 
diff --git a/panda/src/char/computedVerticesMorph.cxx b/panda/src/char/computedVerticesMorph.cxx
index baae523f3d..7e4588ed42 100644
--- a/panda/src/char/computedVerticesMorph.cxx
+++ b/panda/src/char/computedVerticesMorph.cxx
@@ -16,9 +16,21 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#ifdef WIN32_VC
 #include "char_headers.h"
+#endif
+
 #pragma hdrstop
 
+#ifndef WIN32_VC
+#include "computedVerticesMorph.h"
+
+#include <datagram.h>
+#include <datagramIterator.h>
+#include <bamReader.h>
+#include <bamWriter.h>
+#endif
+
 ////////////////////////////////////////////////////////////////////
 //     Function: ComputedVerticesMorphValue2::write_datagram
 //       Access: Public
diff --git a/panda/src/char/config_char.cxx b/panda/src/char/config_char.cxx
index 5c0ada76a4..4f5e9a4731 100644
--- a/panda/src/char/config_char.cxx
+++ b/panda/src/char/config_char.cxx
@@ -16,9 +16,25 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#ifdef WIN32_VC
 #include "char_headers.h"
+#endif
+
 #pragma hdrstop
 
+#ifndef WIN32_VC
+#include "config_char.h"
+#include "character.h"
+#include "characterJoint.h"
+#include "characterJointBundle.h"
+#include "characterSlider.h"
+#include "computedVertices.h"
+#include "dynamicVertices.h"
+#endif
+
+#include <dconfig.h>
+#include <lmatrix4.h>
+
 Configure(config_char);
 NotifyCategoryDef(char, "");
 
diff --git a/panda/src/char/dynamicVertices.cxx b/panda/src/char/dynamicVertices.cxx
index aeab63ed95..7a24925de9 100644
--- a/panda/src/char/dynamicVertices.cxx
+++ b/panda/src/char/dynamicVertices.cxx
@@ -16,11 +16,25 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#ifdef WIN32_VC
 #include "char_headers.h"
+#endif
+
 #pragma hdrstop
 
+#ifndef WIN32_VC
+#include "dynamicVertices.h"
+#include "config_char.h"
+#include <bamReader.h>
+#include <bamWriter.h>
+#include <datagram.h>
+#include <datagramIterator.h>
+#include <ioPtaDatagramLinMath.h>
+#endif
+
 TypeHandle DynamicVertices::_type_handle;
 
+
 ////////////////////////////////////////////////////////////////////
 //     Function: DynamicVertices::Constructor
 //       Access: Public