diff --git a/panda/src/gobj/Sources.pp b/panda/src/gobj/Sources.pp
index d678707e19..066705b3c8 100644
--- a/panda/src/gobj/Sources.pp
+++ b/panda/src/gobj/Sources.pp
@@ -6,7 +6,7 @@
   #define LOCAL_LIBS \
     linmath mathutil pnmimage gsgbase graph putil
 
-  #define COMBINED_SOURCES composite1.cxx composite2.cxx
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx 
 
   #define SOURCES \
      LOD.I LOD.h config_gobj.h drawable.h fog.I fog.h geom.I geom.N  \
@@ -17,7 +17,7 @@
      orthoProjection.I orthoProjection.h perspectiveProjection.I  \
      perspectiveProjection.h pixelBuffer.I pixelBuffer.N  \
      pixelBuffer.h projection.h texture.I texture.N texture.h \
-     texturePool.I texturePool.h $[COMBINED_SOURCES] 
+     texturePool.I texturePool.h
     
   #define INCLUDED_SOURCES \
      LOD.cxx config_gobj.cxx drawable.cxx fog.cxx geom.cxx  \
diff --git a/panda/src/gobj/gobj_composite1.cxx b/panda/src/gobj/gobj_composite1.cxx
new file mode 100644
index 0000000000..387a0eb530
--- /dev/null
+++ b/panda/src/gobj/gobj_composite1.cxx
@@ -0,0 +1,14 @@
+
+#include "LOD.cxx"
+#include "geom.cxx"
+#include "geomLine.cxx"
+#include "geomLinestrip.cxx"
+#include "geomPoint.cxx"
+#include "geomPolygon.cxx"
+#include "geomQuad.cxx"
+#include "geomSphere.cxx"
+#include "geomSprite.cxx"
+#include "geomTri.cxx"
+#include "geomTrifan.cxx"
+#include "geomTristrip.cxx"
+
diff --git a/panda/src/gobj/gobj_composite2.cxx b/panda/src/gobj/gobj_composite2.cxx
new file mode 100644
index 0000000000..43d8ec91e5
--- /dev/null
+++ b/panda/src/gobj/gobj_composite2.cxx
@@ -0,0 +1,13 @@
+
+#include "config_gobj.cxx"
+#include "drawable.cxx"
+#include "fog.cxx"
+#include "imageBuffer.cxx"
+#include "material.cxx"
+#include "materialPool.cxx"
+#include "orthoProjection.cxx"
+#include "perspectiveProjection.cxx"
+#include "pixelBuffer.cxx"
+#include "projection.cxx"
+#include "texture.cxx"
+#include "texturePool.cxx"