diff --git a/panda/src/chan/Sources.pp b/panda/src/chan/Sources.pp
index e9df9468b9..9c73c6110f 100644
--- a/panda/src/chan/Sources.pp
+++ b/panda/src/chan/Sources.pp
@@ -5,25 +5,31 @@
   #define TARGET chan
   #define LOCAL_LIBS \
     putil linmath mathutil event graph sgattrib
+    
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx    
 
   #define SOURCES \
-    animBundle.I animBundle.cxx animBundle.h animBundleNode.I \
-    animBundleNode.cxx animBundleNode.h animChannel.I animChannel.cxx \
-    animChannel.h animChannelBase.I animChannelBase.cxx \
-    animChannelBase.h animChannelMatrixXfmTable.I \
-    animChannelMatrixXfmTable.cxx animChannelMatrixXfmTable.h \
-    animChannelScalarTable.I animChannelScalarTable.cxx \
-    animChannelScalarTable.h animControl.I animControl.N \
-    animControl.cxx animControl.h animControlCollection.I \
-    animControlCollection.cxx animControlCollection.h animGroup.I \
-    animGroup.cxx animGroup.h auto_bind.cxx auto_bind.h config_chan.cxx \
-    config_chan.h movingPartBase.I movingPartBase.cxx movingPartBase.h \
-    movingPartMatrix.I movingPartMatrix.cxx movingPartMatrix.h \
-    movingPartScalar.I movingPartScalar.cxx movingPartScalar.h \
-    partBundle.I partBundle.N partBundle.cxx partBundle.h \
-    partBundleNode.I partBundleNode.cxx partBundleNode.h partGroup.I \
-    partGroup.cxx partGroup.h vector_PartGroupStar.cxx \
-    vector_PartGroupStar.h
+     animBundle.I animBundle.h animBundleNode.I animBundleNode.h  \
+     animChannel.I animChannel.h animChannelBase.I  \
+     animChannelBase.h animChannelMatrixXfmTable.I  \
+     animChannelMatrixXfmTable.h animChannelScalarTable.I  \
+     animChannelScalarTable.h animControl.I animControl.N  \
+     animControl.h animControlCollection.I  \
+     animControlCollection.h animGroup.I animGroup.h auto_bind.h  \
+     config_chan.h movingPartBase.I movingPartBase.h  \
+     movingPartMatrix.I movingPartMatrix.h movingPartScalar.I  \
+     movingPartScalar.h partBundle.I partBundle.N partBundle.h  \
+     partBundleNode.I partBundleNode.h partGroup.I partGroup.h  \
+     vector_PartGroupStar.h 
+
+  #define INCLUDED_SOURCES  \
+     animBundle.cxx animBundleNode.cxx animChannel.cxx  \
+     animChannelBase.cxx animChannelMatrixXfmTable.cxx  \
+     animChannelScalarTable.cxx animControl.cxx  \
+     animControlCollection.cxx animGroup.cxx auto_bind.cxx  \
+     config_chan.cxx movingPartBase.cxx movingPartMatrix.cxx  \
+     movingPartScalar.cxx partBundle.cxx partBundleNode.cxx  \
+     partGroup.cxx vector_PartGroupStar.cxx 
 
   #define INSTALL_HEADERS \
     animBundle.I animBundle.h animBundleNode.I animBundleNode.h \
@@ -39,7 +45,7 @@
     partBundleNode.I partBundleNode.h partGroup.I partGroup.h \
     vector_PartGroupStar.h
     
-  #define PRECOMPILED_HEADER chan_headers.h 
+//  #define PRECOMPILED_HEADER chan_headers.h 
 
   #define IGATESCAN all
 
diff --git a/panda/src/chan/chan_composite1.cxx b/panda/src/chan/chan_composite1.cxx
new file mode 100644
index 0000000000..959097bc6a
--- /dev/null
+++ b/panda/src/chan/chan_composite1.cxx
@@ -0,0 +1,11 @@
+
+#include "auto_bind.cxx"
+#include "config_chan.cxx"
+#include "movingPartBase.cxx"
+#include "movingPartMatrix.cxx"
+#include "movingPartScalar.cxx"
+#include "partBundle.cxx"
+#include "partBundleNode.cxx"
+#include "partGroup.cxx"
+#include "vector_PartGroupStar.cxx"
+
diff --git a/panda/src/chan/chan_composite2.cxx b/panda/src/chan/chan_composite2.cxx
new file mode 100644
index 0000000000..434b8a3e0b
--- /dev/null
+++ b/panda/src/chan/chan_composite2.cxx
@@ -0,0 +1,11 @@
+
+#include "animBundle.cxx"
+#include "animBundleNode.cxx"
+#include "animChannel.cxx"
+#include "animChannelBase.cxx"
+#include "animChannelMatrixXfmTable.cxx"
+#include "animChannelScalarTable.cxx"
+#include "animControl.cxx"
+#include "animControlCollection.cxx"
+#include "animGroup.cxx"
+