diff --git a/panda/src/putil/bamCache.cxx b/panda/src/putil/bamCache.cxx
index d6223389e6..daf64f40c0 100644
--- a/panda/src/putil/bamCache.cxx
+++ b/panda/src/putil/bamCache.cxx
@@ -14,6 +14,8 @@
 
 #include "bamCache.h"
 #include "bamCacheIndex.h"
+#include "bamReader.h"
+#include "bamWriter.h"
 #include "hashVal.h"
 #include "datagramInputFile.h"
 #include "datagramOutputFile.h"
diff --git a/panda/src/putil/bamCacheIndex.cxx b/panda/src/putil/bamCacheIndex.cxx
index ae993fc88a..6ff14ab583 100644
--- a/panda/src/putil/bamCacheIndex.cxx
+++ b/panda/src/putil/bamCacheIndex.cxx
@@ -13,6 +13,9 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "bamCacheIndex.h"
+#include "bamReader.h"
+#include "bamWriter.h"
+#include "config_util.h" // util_cat
 #include "indent.h"
 #include <algorithm>
 
diff --git a/panda/src/putil/bamCacheRecord.cxx b/panda/src/putil/bamCacheRecord.cxx
index 96f5c7f092..79a12ea2da 100644
--- a/panda/src/putil/bamCacheRecord.cxx
+++ b/panda/src/putil/bamCacheRecord.cxx
@@ -13,9 +13,12 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "bamCacheRecord.h"
+#include "bamReader.h"
+#include "bamWriter.h"
 #include "virtualFileSystem.h"
 #include "virtualFile.h"
 #include "indent.h"
+#include "config_util.h" // util_cat
 
 TypeHandle BamCacheRecord::_type_handle;
 
diff --git a/panda/src/putil/bitArray.cxx b/panda/src/putil/bitArray.cxx
index 323cfc1e1d..9ce4474d7b 100755
--- a/panda/src/putil/bitArray.cxx
+++ b/panda/src/putil/bitArray.cxx
@@ -14,6 +14,8 @@
 
 #include "bitArray.h"
 #include "sparseArray.h"
+#include "datagram.h"
+#include "datagramIterator.h"
 
 TypeHandle BitArray::_type_handle;
 
diff --git a/panda/src/putil/datagramOutputFile.h b/panda/src/putil/datagramOutputFile.h
index 7c40d2b37a..a3a292bdba 100644
--- a/panda/src/putil/datagramOutputFile.h
+++ b/panda/src/putil/datagramOutputFile.h
@@ -21,6 +21,8 @@
 #include "filename.h"
 #include "fileReference.h"
 #include "virtualFile.h"
+#include "virtualFileSystem.h"
+#include "config_util.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : DatagramOutputFile
diff --git a/panda/src/putil/pythonCallbackObject.cxx b/panda/src/putil/pythonCallbackObject.cxx
index 2b0b26baf0..1160877901 100644
--- a/panda/src/putil/pythonCallbackObject.cxx
+++ b/panda/src/putil/pythonCallbackObject.cxx
@@ -18,6 +18,7 @@
 #include "py_panda.h"  
 #include "thread.h"
 #include "callbackData.h"
+#include "config_util.h"
 
 TypeHandle PythonCallbackObject::_type_handle;
 
diff --git a/panda/src/putil/sparseArray.cxx b/panda/src/putil/sparseArray.cxx
index 546416c97a..418a28edfc 100644
--- a/panda/src/putil/sparseArray.cxx
+++ b/panda/src/putil/sparseArray.cxx
@@ -14,6 +14,8 @@
 
 #include "sparseArray.h"
 #include "bitArray.h"
+#include "datagram.h"
+#include "datagramIterator.h"
 
 TypeHandle SparseArray::_type_handle;
 
diff --git a/panda/src/putil/typedWritableReferenceCount.cxx b/panda/src/putil/typedWritableReferenceCount.cxx
index 0de2d392fd..9e5bcb2910 100644
--- a/panda/src/putil/typedWritableReferenceCount.cxx
+++ b/panda/src/putil/typedWritableReferenceCount.cxx
@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "typedWritableReferenceCount.h"
+#include "dcast.h"
 
 TypeHandle TypedWritableReferenceCount::_type_handle;