diff --git a/panda/src/pgui/Sources.pp b/panda/src/pgui/Sources.pp
index 7122bac58d..189d2769fe 100644
--- a/panda/src/pgui/Sources.pp
+++ b/panda/src/pgui/Sources.pp
@@ -7,7 +7,7 @@
     audio grutil text tform graph linmath event putil gobj \
     mathutil sgraph sgraphutil
 
-//  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx 
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx 
 
   #define SOURCES  \
     config_pgui.h \
@@ -20,9 +20,8 @@
     pgMouseWatcherRegion.I pgMouseWatcherRegion.h \
     pgTop.I pgTop.h \
     pgWaitBar.I pgWaitBar.h
-     
-//  #define INCLUDED_SOURCES  \
-  #define SOURCES $[SOURCES] \
+    
+  #define INCLUDED_SOURCES  \
     config_pgui.cxx \
     pgButton.cxx \
     pgEntry.cxx \
diff --git a/panda/src/pgui/pgui_composite1.cxx b/panda/src/pgui/pgui_composite1.cxx
new file mode 100644
index 0000000000..f51e1f27e0
--- /dev/null
+++ b/panda/src/pgui/pgui_composite1.cxx
@@ -0,0 +1,7 @@
+    
+#include "config_pgui.cxx"
+#include "pgButton.cxx"
+#include "pgEntry.cxx"
+#include "pgMouseWatcherGroup.cxx"
+#include "pgMouseWatcherParameter.cxx"
+
diff --git a/panda/src/pgui/pgui_composite2.cxx b/panda/src/pgui/pgui_composite2.cxx
new file mode 100644
index 0000000000..84efeec58d
--- /dev/null
+++ b/panda/src/pgui/pgui_composite2.cxx
@@ -0,0 +1,7 @@
+
+#include "pgFrameStyle.cxx"
+#include "pgItem.cxx"
+#include "pgMouseWatcherRegion.cxx"
+#include "pgTop.cxx"
+#include "pgWaitBar.cxx"
+