diff --git a/dtool/src/interrogate/CMakeLists.txt b/dtool/src/interrogate/CMakeLists.txt
index 9d9ccf094c..272b81e869 100644
--- a/dtool/src/interrogate/CMakeLists.txt
+++ b/dtool/src/interrogate/CMakeLists.txt
@@ -19,7 +19,9 @@ set(INTERROGATE_HEADERS
 	parameterRemapPTToPointer.h
 	parameterRemapReferenceToConcrete.h
 	parameterRemapReferenceToPointer.h parameterRemapThis.h
-	parameterRemapToString.h parameterRemapUnchanged.h
+	parameterRemapToString.h
+	parameterRemapHandleToInt.h
+	parameterRemapUnchanged.h
 	typeManager.h)
 
 set(INTERROGATE_SOURCES
@@ -42,7 +44,9 @@ set(INTERROGATE_SOURCES
 	parameterRemapEnumToInt.cxx parameterRemapPTToPointer.cxx
 	parameterRemapReferenceToConcrete.cxx
 	parameterRemapReferenceToPointer.cxx parameterRemapThis.cxx
-	parameterRemapToString.cxx parameterRemapUnchanged.cxx
+	parameterRemapToString.cxx
+	parameterRemapHandleToInt.cxx
+	parameterRemapUnchanged.cxx
 	typeManager.cxx)
 
 composite_sources(interrogate INTERROGATE_SOURCES)
diff --git a/panda/src/downloader/CMakeLists.txt b/panda/src/downloader/CMakeLists.txt
index 5095ee9323..f82ed55333 100644
--- a/panda/src/downloader/CMakeLists.txt
+++ b/panda/src/downloader/CMakeLists.txt
@@ -62,9 +62,14 @@ set(P3DOWNLOADER_SOURCES
   virtualFileMountHTTP.cxx
 )
 
+set(P3DOWNLOADER_IGATEEXT
+  stringStream_ext.cxx
+  stringStream_ext.h
+)
+
 composite_sources(p3downloader P3DOWNLOADER_SOURCES)
 add_library(p3downloader ${P3DOWNLOADER_HEADERS} ${P3DOWNLOADER_SOURCES})
 target_link_libraries(p3downloader p3express)
-target_interrogate(p3downloader ALL)
+target_interrogate(p3downloader ALL EXTENSIONS ${P3DOWNLOADER_IGATEEXT})
 
 install(TARGETS p3downloader DESTINATION lib)
diff --git a/panda/src/express/CMakeLists.txt b/panda/src/express/CMakeLists.txt
index e5e77eee9b..78b0bd196d 100644
--- a/panda/src/express/CMakeLists.txt
+++ b/panda/src/express/CMakeLists.txt
@@ -134,10 +134,14 @@ set(P3EXPRESS_IGATEEXT
   ramfile_ext.h
   streamReader_ext.cxx
   streamReader_ext.h
+  streamWriter_ext.cxx
+  streamWriter_ext.h
   typeHandle_ext.cxx
   typeHandle_ext.h
   virtualFileSystem_ext.cxx
-  virtualFileSystem_ext.h)
+  virtualFileSystem_ext.h
+  virtualFile_ext.cxx
+  virtualFile_ext.h)
 
 composite_sources(p3express P3EXPRESS_SOURCES)