diff --git a/panda/src/collide/collisionLevelStateBase.h b/panda/src/collide/collisionLevelStateBase.h
index c7359b99dc..bc51128b92 100644
--- a/panda/src/collide/collisionLevelStateBase.h
+++ b/panda/src/collide/collisionLevelStateBase.h
@@ -31,6 +31,7 @@
 #include "pStatCollector.h"
 #include "bitMask.h"
 #include "register_type.h"
+#include "collisionSolid.h"
 
 class CollisionSolid;
 class CollisionNode;
diff --git a/panda/src/glxdisplay/glxGraphicsStateGuardian.h b/panda/src/glxdisplay/glxGraphicsStateGuardian.h
index b971d29bf6..675c43fa7d 100644
--- a/panda/src/glxdisplay/glxGraphicsStateGuardian.h
+++ b/panda/src/glxdisplay/glxGraphicsStateGuardian.h
@@ -61,8 +61,8 @@ extern "C" void (*glXGetProcAddressARB(const GLubyte *procName))( void );
 // system GLX version matches or exceeds the GLX version in which
 // these functions are defined, and the system glx.h sometimes doesn't
 // declare these typedefs.
-typedef __GLXextFuncPtr (* PFNGLXGETPROCADDRESSPROC) (const GLubyte *procName);
 #ifndef __EDG__  // Protect the following from the Tau instrumentor.
+typedef __GLXextFuncPtr (* PFNGLXGETPROCADDRESSPROC) (const GLubyte *procName);
 typedef int (* PFNGLXSWAPINTERVALSGIPROC) (int interval);
 #endif  // __EDG__
 
diff --git a/panda/src/putil/Sources.pp b/panda/src/putil/Sources.pp
index d38f250402..09a9200d69 100644
--- a/panda/src/putil/Sources.pp
+++ b/panda/src/putil/Sources.pp
@@ -56,6 +56,7 @@
     portalMask.h \
     pta_double.h \
     pta_float.h pta_int.h \
+    spamDeletor.h \
     sparseArray.I sparseArray.h \
     string_utils.I string_utils.N string_utils.h \
     timedCycle.I timedCycle.h typedWritable.I \
@@ -101,6 +102,7 @@
     nonDeletor.cxx \
     pta_double.cxx pta_float.cxx \
     pta_int.cxx pta_ushort.cxx \
+    spamDeletor.cxx \
     sparseArray.cxx \
     string_utils.cxx timedCycle.cxx typedWritable.cxx \
     typedWritableReferenceCount.cxx updateSeq.cxx \
@@ -157,6 +159,7 @@
     portalMask.h \
     pta_double.h \
     pta_float.h pta_int.h pta_ushort.h \
+    spamDeletor.h \
     sparseArray.I sparseArray.h \
     string_utils.I \
     string_utils.h timedCycle.I timedCycle.h typedWritable.I \