diff --git a/panda/src/linmath/lcast_to_src.h b/panda/src/linmath/lcast_to_src.h
index 55d2a3446f..9fa5b9e0cd 100644
--- a/panda/src/linmath/lcast_to_src.h
+++ b/panda/src/linmath/lcast_to_src.h
@@ -12,6 +12,8 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#ifndef CPPPARSER
+
 INLINE_LINMATH const FLOATNAME(LVecBase2) &
 lcast_to(FLOATTYPE *, const FLOATNAME(LVecBase2) &source);
 
@@ -85,3 +87,5 @@ INLINE_LINMATH FLOATNAME2(LMatrix4)
 lcast_to(FLOATTYPE2 *, const FLOATNAME(LMatrix4) &source);
 
 #include "lcast_to_src.I"
+
+#endif  // CPPPARSER
diff --git a/panda/src/linmath/lquaternion.h b/panda/src/linmath/lquaternion.h
index f0da179aa9..fcb123c257 100644
--- a/panda/src/linmath/lquaternion.h
+++ b/panda/src/linmath/lquaternion.h
@@ -31,5 +31,4 @@
 #include "dblnames.h"
 #include "lquaternion_src.h"
 
-
 #endif /* __LQUATERNION_H__ */
diff --git a/panda/src/pgraph/Sources.pp b/panda/src/pgraph/Sources.pp
index 5908e7b551..b03f0386aa 100644
--- a/panda/src/pgraph/Sources.pp
+++ b/panda/src/pgraph/Sources.pp
@@ -72,10 +72,9 @@
     modelPool.I modelPool.h \
     modelRoot.I modelRoot.h \
     nodePath.I nodePath.h nodePath.cxx \
-    nodePath_ext.I nodePath_ext.h nodePath_ext.cxx \
+    nodePath_ext.I nodePath_ext.h \
     nodePathCollection.I nodePathCollection.h \
     nodePathCollection_ext.I nodePathCollection_ext.h \
-    nodePathCollection_ext.cxx \
     nodePathComponent.I nodePathComponent.h \
     occluderEffect.I occluderEffect.h \
     occluderNode.I occluderNode.h \
@@ -112,7 +111,12 @@
     transformState.I transformState.h \
     transparencyAttrib.I transparencyAttrib.h \
     weakNodePath.I weakNodePath.h \
-    workingNodePath.I workingNodePath.h
+    workingNodePath.I workingNodePath.h \
+    nodePath_ext.h nodePath_ext.I \
+    nodePathCollection_ext.h nodePathCollection_ext.I \
+    pandaNode_ext.h \
+    renderState_ext.h \
+    transformState_ext.h
 
   #define COMBINED_SOURCES \
     $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx \
@@ -213,7 +217,12 @@
     transformState.cxx \
     transparencyAttrib.cxx \
     weakNodePath.cxx \
-    workingNodePath.cxx
+    workingNodePath.cxx \
+    nodePath_ext.cxx \
+    nodePathCollection_ext.cxx \
+    pandaNode_ext.cxx \
+    renderState_ext.cxx \
+    transformState_ext.cxx
 
   #define INSTALL_HEADERS \
     accumulatedAttribs.I accumulatedAttribs.h \