diff --git a/pandatool/src/bam/Sources.pp b/pandatool/src/bam/Sources.pp
index b7bdba94a1..a00e194668 100644
--- a/pandatool/src/bam/Sources.pp
+++ b/pandatool/src/bam/Sources.pp
@@ -3,6 +3,7 @@
   #define LOCAL_LIBS \
     progbase
   #define OTHER_LIBS \
+    parametrics:c collide:c chan:c char:c switchnode:c \
     cull:c loader:c egg:c sgraphutil:c sgattrib:c \
     sgraph:c pnmimagetypes:c \
     graph:c putil:c linmath:c express:c panda:m pandaexpress:m \
diff --git a/pandatool/src/flt/fltMeshPrimitive.h b/pandatool/src/flt/fltMeshPrimitive.h
index dd6b181e5c..bece76d44f 100644
--- a/pandatool/src/flt/fltMeshPrimitive.h
+++ b/pandatool/src/flt/fltMeshPrimitive.h
@@ -12,6 +12,7 @@
 #include "fltHeader.h"
 
 #include <luse.h>
+#include <vector_int.h>
 
 ////////////////////////////////////////////////////////////////////
 // 	 Class : FltMeshPrimitive
@@ -29,7 +30,7 @@ public:
     PT_polygon             = 4,
   };
 
-  typedef vector<int> Vertices;
+  typedef vector_int Vertices;
 
   PrimitiveType _primitive_type;
   Vertices _vertices;
diff --git a/pandatool/src/ptloader/Sources.pp b/pandatool/src/ptloader/Sources.pp
index 423f89bd62..d82a4c62a8 100644
--- a/pandatool/src/ptloader/Sources.pp
+++ b/pandatool/src/ptloader/Sources.pp
@@ -4,7 +4,9 @@
   #define LOCAL_LIBS fltegg flt lwoegg lwo converter pandatoolbase
   #define OTHER_LIBS \
     egg2sg:c builder:c egg:c pandaegg:m \
-    mathutil:c linmath:c putil:c express:c panda:m dtoolconfig dtool
+    mathutil:c linmath:c putil:c panda:m \
+    express:c pandaexpress:m \
+    dtoolconfig dtool
   #define UNIX_SYS_LIBS \
     m
 
diff --git a/pandatool/src/ptloader/config_ptloader.h b/pandatool/src/ptloader/config_ptloader.h
index 3f2c5918c6..b83c2b5982 100644
--- a/pandatool/src/ptloader/config_ptloader.h
+++ b/pandatool/src/ptloader/config_ptloader.h
@@ -10,7 +10,7 @@
 
 #include <dconfig.h>
 
-ConfigureDecl(config_ptloader, EXPCL_PANDAEGG, EXPTP_PANDAEGG);
+ConfigureDecl(config_ptloader, EXPCL_PTLOADER, EXPTP_PTLOADER);
 
 extern EXPCL_PTLOADER void init_libptloader();