diff --git a/dtool/src/dtoolutil/CMakeLists.txt b/dtool/src/dtoolutil/CMakeLists.txt
index 3a6b01c1e7..6bdf9be8ff 100644
--- a/dtool/src/dtoolutil/CMakeLists.txt
+++ b/dtool/src/dtoolutil/CMakeLists.txt
@@ -23,7 +23,11 @@ set(P3DTOOLUTIL_HEADERS
   stringDecoder.h stringDecoder.I
   textEncoder.h textEncoder.I
   unicodeLatinMap.h
+  vector_double.h
+  vector_float.h
+  vector_int.h
   vector_string.h
+  vector_uchar.h
   vector_src.h
   win32ArgParser.h
 )
@@ -50,7 +54,11 @@ set(P3DTOOLUTIL_SOURCES
   stringDecoder.cxx
   textEncoder.cxx
   unicodeLatinMap.cxx
+  vector_double.cxx
+  vector_float.cxx
+  vector_int.cxx
   vector_string.cxx
+  vector_uchar.cxx
   win32ArgParser.cxx
 )
 
diff --git a/dtool/src/interrogatedb/CMakeLists.txt b/dtool/src/interrogatedb/CMakeLists.txt
index 798335b2b5..eb13d2b302 100644
--- a/dtool/src/interrogatedb/CMakeLists.txt
+++ b/dtool/src/interrogatedb/CMakeLists.txt
@@ -10,7 +10,7 @@ set(P3INTERROGATEDB_HEADERS
 	interrogateType.I interrogateType.h
 	interrogate_datafile.I interrogate_datafile.h
 	interrogate_interface.h interrogate_request.h
-	extension.h py_panda.h)
+	extension.h py_compat.h py_panda.h py_wrappers.h)
 
 set(P3INTERROGATEDB_SOURCES
 	config_interrogatedb.cxx
@@ -23,7 +23,9 @@ set(P3INTERROGATEDB_SOURCES
 	interrogateManifest.cxx
 	interrogateType.cxx interrogate_datafile.cxx
 	interrogate_interface.cxx interrogate_request.cxx
-	py_panda.cxx)
+	py_compat.cxx
+	py_panda.cxx
+	py_wrappers.cxx)
 
 composite_sources(p3interrogatedb P3INTERROGATEDB_SOURCES)
 
diff --git a/panda/src/cocoadisplay/CMakeLists.txt b/panda/src/cocoadisplay/CMakeLists.txt
index ce855a82c4..90bf13cf95 100644
--- a/panda/src/cocoadisplay/CMakeLists.txt
+++ b/panda/src/cocoadisplay/CMakeLists.txt
@@ -8,6 +8,7 @@ if(APPLE AND HAVE_GL AND HAVE_COCOA)
 
   set(P3COCOADISPLAY_SOURCES
       config_cocoadisplay.mm
+      cocoaGraphicsBuffer.mm
       cocoaGraphicsPipe.mm
       cocoaGraphicsStateGuardian.mm
       cocoaGraphicsWindow.mm
diff --git a/panda/src/event/CMakeLists.txt b/panda/src/event/CMakeLists.txt
index fd65faf346..c29fa3bcd8 100644
--- a/panda/src/event/CMakeLists.txt
+++ b/panda/src/event/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(P3EVENT_HEADERS
+    asyncFuture.h asyncFuture.I
     asyncTask.h asyncTask.I
     asyncTaskChain.h asyncTaskChain.I
     asyncTaskCollection.h asyncTaskCollection.I
@@ -18,6 +19,7 @@ set(P3EVENT_HEADERS
 )
 
 set(P3EVENT_SOURCES
+    asyncFuture.cxx
     asyncTask.cxx
     asyncTaskChain.cxx
     asyncTaskCollection.cxx
@@ -35,6 +37,8 @@ set(P3EVENT_SOURCES
 )
 
 set(P3EVENT_IGATEEXT
+  asyncFuture_ext.cxx
+  asyncFuture_ext.h
   pythonTask.cxx
   pythonTask.h
   pythonTask.I
diff --git a/panda/src/express/CMakeLists.txt b/panda/src/express/CMakeLists.txt
index 339a5cbf4f..15f27dc53b 100644
--- a/panda/src/express/CMakeLists.txt
+++ b/panda/src/express/CMakeLists.txt
@@ -50,8 +50,6 @@ set(P3EXPRESS_HEADERS
   threadSafePointerToBase.I threadSafePointerToBase.h
   trueClock.I trueClock.h
   typedReferenceCount.I typedReferenceCount.h typedef.h
-  vector_uchar.h vector_double.h vector_float.h
-  vector_stdfloat.h
   virtualFile.I virtualFileList.I virtualFileList.h virtualFileMount.h
   virtualFileComposite.h virtualFileComposite.I virtualFile.h
   virtualFileMount.I virtualFileMountMultifile.h
@@ -107,7 +105,6 @@ set(P3EXPRESS_SOURCES
   threadSafePointerToBase.cxx
   trueClock.cxx
   typedReferenceCount.cxx
-  vector_uchar.cxx vector_double.cxx vector_float.cxx
   virtualFileComposite.cxx virtualFile.cxx virtualFileList.cxx
   virtualFileMount.cxx
   virtualFileMountMultifile.cxx
@@ -122,22 +119,24 @@ set(P3EXPRESS_SOURCES
   windowsRegistry.cxx
   zStream.cxx zStreamBuf.cxx)
 
+# Some of these reside in dtoolbase/dtoolutil. But dtool isn't run through
+# Interrogate; Panda is. So we're responsible for providing the extensions.
 set(P3EXPRESS_IGATEEXT
-  filename_ext.cxx
-  filename_ext.h
-  globPattern_ext.cxx
-  globPattern_ext.h
+  ../../../dtool/src/dtoolutil/filename_ext.cxx
+  ../../../dtool/src/dtoolutil/filename_ext.h
+  ../../../dtool/src/dtoolutil/globPattern_ext.cxx
+  ../../../dtool/src/dtoolutil/globPattern_ext.h
   memoryUsagePointers_ext.cxx
   memoryUsagePointers_ext.h
   pointerToArray_ext.h
   ramfile_ext.cxx
   ramfile_ext.h
-  streamReader_ext.cxx
-  streamReader_ext.h
-  streamWriter_ext.cxx
-  streamWriter_ext.h
-  typeHandle_ext.cxx
-  typeHandle_ext.h
+  ../../../dtool/src/prc/streamReader_ext.cxx
+  ../../../dtool/src/prc/streamReader_ext.h
+  ../../../dtool/src/prc/streamWriter_ext.cxx
+  ../../../dtool/src/prc/streamWriter_ext.h
+  ../../../dtool/src/dtoolbase/typeHandle_ext.cxx
+  ../../../dtool/src/dtoolbase/typeHandle_ext.h
   virtualFileSystem_ext.cxx
   virtualFileSystem_ext.h
   virtualFile_ext.cxx
diff --git a/panda/src/gsgbase/CMakeLists.txt b/panda/src/gsgbase/CMakeLists.txt
index b6b0e1a93b..37f54fe4b9 100644
--- a/panda/src/gsgbase/CMakeLists.txt
+++ b/panda/src/gsgbase/CMakeLists.txt
@@ -1,13 +1,11 @@
 set(P3GSGBASE_HEADERS
   config_gsgbase.h
-  displayRegionBase.I displayRegionBase.h
   graphicsOutputBase.I graphicsOutputBase.h
   graphicsStateGuardianBase.h
 )
 
 set(P3GSGBASE_SOURCES
   config_gsgbase.cxx
-  displayRegionBase.cxx
   graphicsOutputBase.cxx
   graphicsStateGuardianBase.cxx
 )
diff --git a/panda/src/movies/CMakeLists.txt b/panda/src/movies/CMakeLists.txt
index d03f166479..21273d25d6 100644
--- a/panda/src/movies/CMakeLists.txt
+++ b/panda/src/movies/CMakeLists.txt
@@ -10,6 +10,8 @@ set(P3MOVIES_HEADERS
     movieTypeRegistry.h movieTypeRegistry.I
     movieVideo.h movieVideo.I
     movieVideoCursor.h movieVideoCursor.I
+    opusAudio.h opusAudio.I
+    opusAudioCursor.h opusAudioCursor.I
     userDataAudio.h userDataAudio.I
     userDataAudioCursor.h userDataAudioCursor.I
     vorbisAudio.h vorbisAudio.I
@@ -30,6 +32,8 @@ set(P3MOVIES_SOURCES
     movieTypeRegistry.cxx
     movieVideo.cxx
     movieVideoCursor.cxx
+    opusAudio.cxx
+    opusAudioCursor.cxx
     userDataAudio.cxx
     userDataAudioCursor.cxx
     vorbisAudio.cxx
diff --git a/panda/src/pgraph/CMakeLists.txt b/panda/src/pgraph/CMakeLists.txt
index 67da31fb98..7d88a7adca 100644
--- a/panda/src/pgraph/CMakeLists.txt
+++ b/panda/src/pgraph/CMakeLists.txt
@@ -208,6 +208,10 @@ set(P3PGRAPH_IGATEEXT
   pandaNode_ext.h
   renderState_ext.cxx
   renderState_ext.h
+  shaderAttrib_ext.cxx
+  shaderAttrib_ext.h
+  shaderInput_ext.cxx
+  shaderInput_ext.h
   transformState_ext.cxx
   transformState_ext.h
 )
diff --git a/panda/src/pipeline/CMakeLists.txt b/panda/src/pipeline/CMakeLists.txt
index 9775c4b891..a2c2abb089 100644
--- a/panda/src/pipeline/CMakeLists.txt
+++ b/panda/src/pipeline/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(P3PIPELINE_HEADERS
-    asyncTaskBase.h asyncTaskBase.I
     contextSwitch.h
     blockerSimple.h blockerSimple.I
     conditionVar.h conditionVar.I
@@ -57,7 +56,6 @@ set(P3PIPELINE_HEADERS
 )
 
 set(P3PIPELINE_SOURCES
-    asyncTaskBase.cxx
     contextSwitch.c
     conditionVar.cxx
     conditionVarDebug.cxx
diff --git a/panda/src/putil/CMakeLists.txt b/panda/src/putil/CMakeLists.txt
index ea32bcd1c7..e79254aa7b 100644
--- a/panda/src/putil/CMakeLists.txt
+++ b/panda/src/putil/CMakeLists.txt
@@ -25,6 +25,7 @@ set(P3PUTIL_HEADERS
   compareTo.I compareTo.h
   config_util.N config_util.h configurable.h
   cPointerCallbackObject.h cPointerCallbackObject.I
+  datagramBuffer.I datagramBuffer.h
   datagramInputFile.I datagramInputFile.h
   datagramOutputFile.I datagramOutputFile.h
   doubleBitMask.I doubleBitMask.h
@@ -84,6 +85,7 @@ set(P3PUTIL_SOURCES
   copyOnWritePointer.cxx
   config_util.cxx configurable.cxx
   cPointerCallbackObject.cxx
+  datagramBuffer.cxx
   datagramInputFile.cxx datagramOutputFile.cxx
   doubleBitMask.cxx
   factoryBase.cxx