diff --git a/pandatool/src/eggcharbase/Sources.pp b/pandatool/src/eggcharbase/Sources.pp
index 33756a0996..57e965d48a 100644
--- a/pandatool/src/eggcharbase/Sources.pp
+++ b/pandatool/src/eggcharbase/Sources.pp
@@ -4,21 +4,25 @@
     eggbase progbase
   #define OTHER_LIBS \
     egg:c panda:m
+    
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx 
 
-  #define SOURCES \
-    config_eggcharbase.cxx config_eggcharbase.h \
-    eggBackPointer.cxx eggBackPointer.h \
-    eggCharacterCollection.cxx eggCharacterCollection.h \
-    eggCharacterCollection.I \
-    eggCharacterData.cxx eggCharacterData.h eggCharacterData.I \
-    eggCharacterFilter.cxx eggCharacterFilter.h \
-    eggComponentData.cxx eggComponentData.h eggComponentData.I \
-    eggJointData.cxx eggJointData.h eggJointData.I \
-    eggJointPointer.cxx eggJointPointer.h \
-    eggJointNodePointer.cxx eggJointNodePointer.h \
-    eggMatrixTablePointer.cxx eggMatrixTablePointer.h \
-    eggSliderData.cxx eggSliderData.h eggSliderData.I \
-    eggVertexPointer.cxx eggVertexPointer.h
+  #define SOURCES \ 
+     config_eggcharbase.h eggBackPointer.h \
+     eggCharacterCollection.h eggCharacterCollection.I \
+     eggCharacterData.h eggCharacterData.I eggCharacterFilter.h \
+     eggComponentData.h eggComponentData.I eggJointData.h \
+     eggJointData.I eggJointPointer.h eggJointNodePointer.h \
+     eggMatrixTablePointer.h eggSliderData.h eggSliderData.I \
+     eggVertexPointer.h
+    
+  #define INCLUDED_SOURCES \
+     config_eggcharbase.cxx eggBackPointer.cxx \
+     eggCharacterCollection.cxx eggCharacterData.cxx \
+     eggCharacterFilter.cxx eggComponentData.cxx eggJointData.cxx \
+     eggJointPointer.cxx eggJointNodePointer.cxx \
+     eggMatrixTablePointer.cxx eggSliderData.cxx \
+     eggVertexPointer.cxx 
 
   #define INSTALL_HEADERS \
     eggBackPointer.h \
diff --git a/pandatool/src/eggcharbase/eggcharbase_composite1.cxx b/pandatool/src/eggcharbase/eggcharbase_composite1.cxx
new file mode 100644
index 0000000000..3a80e8742a
--- /dev/null
+++ b/pandatool/src/eggcharbase/eggcharbase_composite1.cxx
@@ -0,0 +1,14 @@
+
+#include "config_eggcharbase.cxx"
+#include "eggBackPointer.cxx"
+#include "eggCharacterCollection.cxx"
+#include "eggCharacterData.cxx"
+#include "eggCharacterFilter.cxx"
+#include "eggComponentData.cxx"
+#include "eggJointData.cxx"
+#include "eggJointPointer.cxx"
+#include "eggJointNodePointer.cxx"
+#include "eggMatrixTablePointer.cxx"
+#include "eggSliderData.cxx"
+#include "eggVertexPointer.cxx"
+