diff --git a/panda/src/graph/Sources.pp b/panda/src/graph/Sources.pp
index 3f8bb936f2..8bc596c1d8 100644
--- a/panda/src/graph/Sources.pp
+++ b/panda/src/graph/Sources.pp
@@ -6,7 +6,7 @@
   #define LOCAL_LIBS \
     pstatclient putil mathutil
 
-  #define COMBINED_SOURCES composite1.cxx composite2.cxx
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx    
 
   #define SOURCES \  
      allAttributesWrapper.I allAttributesWrapper.T  \
@@ -44,7 +44,7 @@
      setTransitionHelpers.h transitionDirection.h  \
      traverserVisitor.T traverserVisitor.h vector_PT_Node.h  \
      vector_PT_NodeRelation.h vector_NodeRelation_star.h wrt.I \
-     wrt.h $[COMBINED_SOURCES]
+     wrt.h
 
    #define INCLUDED_SOURCES \
      allAttributesWrapper.cxx allTransitionsWrapper.cxx \
diff --git a/panda/src/graph/composite1.cxx b/panda/src/graph/graph_composite1.cxx
similarity index 100%
rename from panda/src/graph/composite1.cxx
rename to panda/src/graph/graph_composite1.cxx
diff --git a/panda/src/graph/composite2.cxx b/panda/src/graph/graph_composite2.cxx
similarity index 100%
rename from panda/src/graph/composite2.cxx
rename to panda/src/graph/graph_composite2.cxx