diff --git a/dtool/dtool_config.h.in b/dtool/dtool_config.h.in
index 834d3a4467..cd87d171b5 100644
--- a/dtool/dtool_config.h.in
+++ b/dtool/dtool_config.h.in
@@ -233,10 +233,6 @@
    to compile them out.  */
 #cmakedefine NOTIFY_DEBUG
 
-/* Define if we want to export template classes from the DLL.  Only
-   makes sense to MSVC++. */
-#cmakedefine EXPORT_TEMPLATES
-
 /* Define if we are linking PANDAPHYSX in with PANDA. */
 #cmakedefine LINK_IN_PHYSX
 
diff --git a/dtool/src/dtoolutil/checkPandaVersion.cxx.in b/dtool/src/dtoolutil/checkPandaVersion.cxx.in
index f268bfbd21..e986a719ea 100644
--- a/dtool/src/dtoolutil/checkPandaVersion.cxx.in
+++ b/dtool/src/dtoolutil/checkPandaVersion.cxx.in
@@ -18,4 +18,4 @@
 
 #include "dtoolbase.h"
 
-EXPCL_DTOOL int @PANDA_VERSION_SYMBOL@ = 0;
+EXPCL_DTOOL_DTOOLUTIL int @PANDA_VERSION_SYMBOL@ = 0;
diff --git a/dtool/src/dtoolutil/checkPandaVersion.h.in b/dtool/src/dtoolutil/checkPandaVersion.h.in
index 583f3b00f6..162e16704a 100644
--- a/dtool/src/dtoolutil/checkPandaVersion.h.in
+++ b/dtool/src/dtoolutil/checkPandaVersion.h.in
@@ -28,7 +28,7 @@
 
 #include "dtoolbase.h"
 
-extern EXPCL_DTOOL int @PANDA_VERSION_SYMBOL@;
+extern EXPCL_DTOOL_DTOOLUTIL int @PANDA_VERSION_SYMBOL@;
 
 #ifndef WIN32
 /* For Windows, exporting the symbol from the DLL is sufficient; the
diff --git a/panda/src/gobj/CMakeLists.txt b/panda/src/gobj/CMakeLists.txt
index 7cefb48391..e308ba8c6d 100644
--- a/panda/src/gobj/CMakeLists.txt
+++ b/panda/src/gobj/CMakeLists.txt
@@ -12,10 +12,14 @@ set(P3GOBJ_HEADERS
   geomPrimitive.h geomPrimitive.I
   geomPatches.h
   geomTriangles.h
+  geomTrianglesAdjacency.h
   geomTristrips.h
+  geomTristripsAdjacency.h
   geomTrifans.h
   geomLines.h
+  geomLinesAdjacency.h
   geomLinestrips.h
+  geomLinestripsAdjacency.h
   geomPoints.h
   geomVertexArrayData.h geomVertexArrayData.I
   geomVertexArrayFormat.h geomVertexArrayFormat.I
@@ -86,10 +90,14 @@ set(P3GOBJ_SOURCES
   geomPrimitive.cxx
   geomPatches.cxx
   geomTriangles.cxx
+  geomTrianglesAdjacency.cxx
   geomTristrips.cxx
+  geomTristripsAdjacency.cxx
   geomTrifans.cxx
   geomLines.cxx
+  geomLinesAdjacency.cxx
   geomLinestrips.cxx
+  geomLinestripsAdjacency.cxx
   geomPoints.cxx
   geomVertexArrayData.cxx
   geomVertexArrayFormat.cxx