diff --git a/panda/metalibs/panda/Sources.pp b/panda/metalibs/panda/Sources.pp
index cc4d0d06b9..3a3e7e31bb 100644
--- a/panda/metalibs/panda/Sources.pp
+++ b/panda/metalibs/panda/Sources.pp
@@ -9,6 +9,7 @@
 #define USE_NET yes
 
 #define COMPONENT_LIBS \
+    pgraph \
     pvrpn grutil chan chancfg pstatclient \
     char chat collide cull device \
     dgraph display gobj graph gsgbase \
diff --git a/panda/src/pgraph/Sources.pp b/panda/src/pgraph/Sources.pp
index 8541932160..181948c6a7 100644
--- a/panda/src/pgraph/Sources.pp
+++ b/panda/src/pgraph/Sources.pp
@@ -19,8 +19,9 @@
     renderState.h renderState.I \
     textureAttrib.h textureAttrib.I
     
-// #define INCLUDED_SOURCES
-  #define SOURCES $[SOURCES] \
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx    
+//  #define SOURCES $[SOURCES] \
+  #define INCLUDED_SOURCES \
     colorAttrib.cxx \
     config_pgraph.cxx \
     cycleData.cxx \
diff --git a/panda/src/pgraph/renderState.cxx b/panda/src/pgraph/renderState.cxx
index e1ae0c1129..5828e0f1d8 100644
--- a/panda/src/pgraph/renderState.cxx
+++ b/panda/src/pgraph/renderState.cxx
@@ -100,7 +100,7 @@ RenderState::
 
       // We should never have a reflexive entry in this map.  If we
       // do, something got screwed up elsewhere.
-      nassertv(other != this);
+      nassertv(other != (const RenderState *)this);
       
       // Now we're holding a reference count to the other state, as well
       // as to the computed result (if any), so neither object will be
@@ -281,7 +281,7 @@ compose(const RenderState *other) const {
     CPT(RenderState) result = do_compose(this);
     ((RenderState *)this)->_self_compose = result;
 
-    if (result != this) {
+    if (result != (const RenderState *)this) {
       // If the result of compose(this) is something other than this,
       // explicitly increment the reference count.  We have to be sure
       // to decrement it again later, in our destructor.