diff --git a/direct/src/dcparser/dcPackerInterface.h b/direct/src/dcparser/dcPackerInterface.h
index 0b2f81d2fe..1f4ac4a47f 100644
--- a/direct/src/dcparser/dcPackerInterface.h
+++ b/direct/src/dcparser/dcPackerInterface.h
@@ -16,7 +16,6 @@
 
 #include "dcbase.h"
 #include "dcSubatomicType.h"
-#include "vector_uchar.h"
 
 class DCFile;
 class DCField;
diff --git a/direct/src/dcparser/dcParserDefs.h b/direct/src/dcparser/dcParserDefs.h
index f6f7aacd71..9c7c589753 100644
--- a/direct/src/dcparser/dcParserDefs.h
+++ b/direct/src/dcparser/dcParserDefs.h
@@ -16,7 +16,6 @@
 
 #include "dcbase.h"
 #include "dcSubatomicType.h"
-#include "vector_uchar.h"
 
 class DCFile;
 class DCClass;
diff --git a/direct/src/dcparser/dcbase.h b/direct/src/dcparser/dcbase.h
index 64ef117158..3a3fbbd13e 100644
--- a/direct/src/dcparser/dcbase.h
+++ b/direct/src/dcparser/dcbase.h
@@ -32,6 +32,7 @@
 #include "pvector.h"
 #include "pmap.h"
 #include "pset.h"
+#include "vector_uchar.h"
 
 #else  // WITHIN_PANDA
 
@@ -81,6 +82,7 @@
 #define nassertr_always(condition, return_value) assert(condition)
 #define nassertv(condition) assert(condition)
 #define nassertv_always(condition) assert(condition)
+#define nassert_raise(message) {std::cerr << message << std::endl; abort();}
 
 // Panda defines a special Filename class.  We'll use an ordinary string
 // instead.
@@ -97,8 +99,10 @@ typedef std::string Filename;
 #define pvector std::vector
 #define pmap std::map
 #define pset std::set
+#define vector_uchar std::vector<unsigned char>
 
 #include <stdint.h>
+#include <string.h>
 
 typedef std::ifstream pifstream;
 typedef std::ofstream pofstream;
diff --git a/direct/src/dcparser/hashGenerator.h b/direct/src/dcparser/hashGenerator.h
index 472e858cb0..7779dda735 100644
--- a/direct/src/dcparser/hashGenerator.h
+++ b/direct/src/dcparser/hashGenerator.h
@@ -16,7 +16,6 @@
 
 #include "dcbase.h"
 #include "primeNumberGenerator.h"
-#include "vector_uchar.h"
 
 /**
  * This class generates an arbitrary hash number from a sequence of ints.