diff --git a/dtool/src/cppparser/CMakeLists.txt b/dtool/src/cppparser/CMakeLists.txt
index 9e1f20a186..020c72c817 100644
--- a/dtool/src/cppparser/CMakeLists.txt
+++ b/dtool/src/cppparser/CMakeLists.txt
@@ -7,7 +7,7 @@ set(P3CPPPARSER_HEADERS
 	cppExpressionParser.h cppExtensionType.h cppFile.h
 	cppFunctionGroup.h cppFunctionType.h cppGlobals.h
 	cppIdentifier.h cppInstance.h cppInstanceIdentifier.h
-	cppMakeSeq.h cppManifest.h
+  cppMakeProperty.h cppMakeSeq.h cppManifest.h
 	cppNameComponent.h cppNamespace.h
 	cppParameterList.h cppParser.h cppPointerType.h
 	cppPreprocessor.h cppReferenceType.h cppScope.h
@@ -25,7 +25,7 @@ set(P3CPPPARSER_SOURCES
 	cppExtensionType.cxx cppFile.cxx cppFunctionGroup.cxx
 	cppFunctionType.cxx cppGlobals.cxx cppIdentifier.cxx
 	cppInstance.cxx cppInstanceIdentifier.cxx
-	cppMakeSeq.cxx cppManifest.cxx
+  cppMakeProperty.cxx cppMakeSeq.cxx cppManifest.cxx
 	cppNameComponent.cxx cppNamespace.cxx cppParameterList.cxx
 	cppParser.cxx cppPointerType.cxx cppPreprocessor.cxx
 	cppReferenceType.cxx cppScope.cxx cppSimpleType.cxx
diff --git a/dtool/src/dtoolbase/CMakeLists.txt b/dtool/src/dtoolbase/CMakeLists.txt
index 9b4ccc020e..53aa3caf3d 100644
--- a/dtool/src/dtoolbase/CMakeLists.txt
+++ b/dtool/src/dtoolbase/CMakeLists.txt
@@ -31,7 +31,8 @@ set(P3DTOOLBASE_HEADERS
     typeRegistryNode.I typeRegistryNode.h
     typedObject.I typedObject.h
     pallocator.T pallocator.h
-    pdeque.h plist.h pmap.h pset.h pvector.h
+    pdeque.h plist.h pmap.h pset.h
+    pvector.h epvector.h
     lookup3.h
 )
 
diff --git a/dtool/src/dtoolutil/CMakeLists.txt b/dtool/src/dtoolutil/CMakeLists.txt
index f68db48a5b..c314a635ab 100644
--- a/dtool/src/dtoolutil/CMakeLists.txt
+++ b/dtool/src/dtoolutil/CMakeLists.txt
@@ -16,6 +16,7 @@ set(P3DTOOLUTIL_HEADERS
 	panda_getopt.h panda_getopt_long.h panda_getopt_impl.h
 	pfstream.h pfstream.I pfstreamBuf.h
 	preprocess_argv.h
+  string_utils.h string_utils.I
 	stringDecoder.h stringDecoder.I
 	textEncoder.h textEncoder.I
 	unicodeLatinMap.h
@@ -41,6 +42,7 @@ set(P3DTOOLUTIL_SOURCES
 	panda_getopt_impl.cxx
 	pfstreamBuf.cxx pfstream.cxx
 	preprocess_argv.cxx
+  string_utils.cxx
 	stringDecoder.cxx
 	textEncoder.cxx
 	unicodeLatinMap.cxx
diff --git a/panda/src/gsgbase/CMakeLists.txt b/panda/src/gsgbase/CMakeLists.txt
index 8c5d8cf105..e10fc246e6 100644
--- a/panda/src/gsgbase/CMakeLists.txt
+++ b/panda/src/gsgbase/CMakeLists.txt
@@ -14,7 +14,7 @@ set(P3GSGBASE_SOURCES
 
 composite_sources(p3gsgbase P3GSGBASE_SOURCES)
 add_library(p3gsgbase ${P3GSGBASE_HEADERS} ${P3GSGBASE_SOURCES})
-target_link_libraries(p3gsgbase p3linmath)
+target_link_libraries(p3gsgbase p3putil p3linmath)
 target_interrogate(p3gsgbase ALL)
 
 install(TARGETS p3gsgbase DESTINATION lib)
diff --git a/panda/src/linmath/CMakeLists.txt b/panda/src/linmath/CMakeLists.txt
index d45048316a..267ea360d3 100644
--- a/panda/src/linmath/CMakeLists.txt
+++ b/panda/src/linmath/CMakeLists.txt
@@ -44,7 +44,7 @@ set(P3LINMATH_SOURCES
 
 composite_sources(p3linmath P3LINMATH_SOURCES)
 add_library(p3linmath ${P3LINMATH_HEADERS} ${P3LINMATH_SOURCES})
-target_link_libraries(p3linmath p3putil)
+target_link_libraries(p3linmath p3express p3pandabase)
 target_use_packages(p3linmath EIGEN)
 target_interrogate(p3linmath ALL)
 
diff --git a/panda/src/putil/CMakeLists.txt b/panda/src/putil/CMakeLists.txt
index 21beca3703..22b01dbad9 100644
--- a/panda/src/putil/CMakeLists.txt
+++ b/panda/src/putil/CMakeLists.txt
@@ -53,7 +53,6 @@ set(P3PUTIL_HEADERS
   pythonCallbackObject.h pythonCallbackObject.I
   simpleHashMap.I simpleHashMap.h
   sparseArray.I sparseArray.h
-  string_utils.I string_utils.h
   timedCycle.I timedCycle.h typedWritable.I
   typedWritable.h typedWritableReferenceCount.I
   typedWritableReferenceCount.h updateSeq.I updateSeq.h
@@ -103,7 +102,6 @@ set(P3PUTIL_SOURCES
   pythonCallbackObject.cxx
   simpleHashMap.cxx
   sparseArray.cxx
-  string_utils.cxx
   timedCycle.cxx typedWritable.cxx
   typedWritableReferenceCount.cxx updateSeq.cxx
   uniqueIdAllocator.cxx