diff --git a/dtool/CMakeLists.txt b/dtool/CMakeLists.txt
index 97a54a8d89..55577b6b11 100644
--- a/dtool/CMakeLists.txt
+++ b/dtool/CMakeLists.txt
@@ -45,6 +45,7 @@ add_subdirectory(src/dconfig)
 add_subdirectory(src/pystub)
 add_subdirectory(src/cppparser)
 add_subdirectory(src/interrogatedb)
+add_subdirectory(src/interrogate)
 
 ## Include dtool metalibs ##
 add_subdirectory(metalibs/dtool)
diff --git a/dtool/src/interrogate/CMakeLists.txt b/dtool/src/interrogate/CMakeLists.txt
new file mode 100644
index 0000000000..d5bf4d82a7
--- /dev/null
+++ b/dtool/src/interrogate/CMakeLists.txt
@@ -0,0 +1,61 @@
+include_directories(../cppparser)
+include_directories(../interrogatedb)
+include_directories(../dconfig)
+include_directories(../dtoolutil)
+include_directories(../dtoolbase)
+include_directories(../pystub)
+include_directories(../prc)
+
+set(INTERROGATE_HEADERS
+	functionRemap.h
+	functionWriter.h
+	functionWriterPtrFromPython.h functionWriterPtrToPython.h
+	functionWriters.h
+	interfaceMaker.h
+	interfaceMakerC.h
+	interfaceMakerPython.h interfaceMakerPythonObj.h
+	interfaceMakerPythonSimple.h
+	interfaceMakerPythonNative.h
+	interrogate.h interrogateBuilder.h parameterRemap.I
+	parameterRemap.h
+	parameterRemapBasicStringPtrToString.h
+	parameterRemapBasicStringRefToString.h
+	parameterRemapBasicStringToString.h
+	parameterRemapCharStarToString.h
+	parameterRemapConcreteToPointer.h
+	parameterRemapConstToNonConst.h parameterRemapEnumToInt.h
+	parameterRemapPTToPointer.h
+	parameterRemapReferenceToConcrete.h
+	parameterRemapReferenceToPointer.h parameterRemapThis.h
+	parameterRemapToString.h parameterRemapUnchanged.h
+	typeManager.h)
+
+set(INTERROGATE_SOURCES
+	functionRemap.cxx
+	functionWriter.cxx
+	functionWriterPtrFromPython.cxx functionWriterPtrToPython.cxx
+	functionWriters.cxx
+	interfaceMaker.cxx
+	interfaceMakerC.cxx
+	interfaceMakerPython.cxx interfaceMakerPythonObj.cxx
+	interfaceMakerPythonSimple.cxx
+	interfaceMakerPythonNative.cxx
+	interrogate.cxx interrogateBuilder.cxx parameterRemap.cxx
+	parameterRemapBasicStringPtrToString.cxx
+	parameterRemapBasicStringRefToString.cxx
+	parameterRemapBasicStringToString.cxx
+	parameterRemapCharStarToString.cxx
+	parameterRemapConcreteToPointer.cxx
+	parameterRemapConstToNonConst.cxx
+	parameterRemapEnumToInt.cxx parameterRemapPTToPointer.cxx
+	parameterRemapReferenceToConcrete.cxx
+	parameterRemapReferenceToPointer.cxx parameterRemapThis.cxx
+	parameterRemapToString.cxx parameterRemapUnchanged.cxx
+	typeManager.cxx)
+
+add_executable(interrogate
+	${INTERROGATE_HEADERS}
+	${INTERROGATE_SOURCES})
+target_link_libraries(interrogate
+	p3cppParser p3interrogatedb p3dconfig p3dtoolutil p3dtoolbase p3pystub
+	p3prc)
diff --git a/dtool/src/interrogate/interfaceMaker.h b/dtool/src/interrogate/interfaceMaker.h
index 57e73ae008..8928afe556 100644
--- a/dtool/src/interrogate/interfaceMaker.h
+++ b/dtool/src/interrogate/interfaceMaker.h
@@ -17,6 +17,8 @@
 
 #include "dtoolbase.h"
 
+#include "cppMakeSeq.h"
+
 #include "interrogate_interface.h"
 #include "interrogate_request.h"
 #include "functionWriters.h"
diff --git a/dtool/src/interrogate/interfaceMakerPythonNative.cxx b/dtool/src/interrogate/interfaceMakerPythonNative.cxx
index 0a457f4058..a6461578c7 100755
--- a/dtool/src/interrogate/interfaceMakerPythonNative.cxx
+++ b/dtool/src/interrogate/interfaceMakerPythonNative.cxx
@@ -17,6 +17,7 @@
 #include "parameterRemapUnchanged.h"
 #include "typeManager.h"
 
+#include "pnotify.h" // For nout
 #include "interrogateDatabase.h"
 #include "interrogateType.h"
 #include "interrogateFunction.h"
diff --git a/dtool/src/interrogate/parameterRemapToString.cxx b/dtool/src/interrogate/parameterRemapToString.cxx
index 432b02d69f..362cd89691 100644
--- a/dtool/src/interrogate/parameterRemapToString.cxx
+++ b/dtool/src/interrogate/parameterRemapToString.cxx
@@ -14,6 +14,7 @@
 
 #include "parameterRemapToString.h"
 #include "interrogate.h"
+#include "typeManager.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: ParameterRemapToString::Constructor