diff --git a/direct/src/dcparser/dcparser_composite1.cxx b/direct/src/dcparser/dcparser_composite1.cxx
index a0fbc900a6..a46697a223 100644
--- a/direct/src/dcparser/dcparser_composite1.cxx
+++ b/direct/src/dcparser/dcparser_composite1.cxx
@@ -1,4 +1,6 @@
 
+#include "primeNumberGenerator.cxx"
+#include "hashGenerator.cxx"
 #include "dcAtomicField.cxx"
 #include "dcClass.cxx"
 
diff --git a/direct/src/dcparser/dcparser_composite2.cxx b/direct/src/dcparser/dcparser_composite2.cxx
index 3d19297264..4e6fe869eb 100644
--- a/direct/src/dcparser/dcparser_composite2.cxx
+++ b/direct/src/dcparser/dcparser_composite2.cxx
@@ -4,5 +4,3 @@
 #include "dcMolecularField.cxx"
 #include "dcSubatomicType.cxx"
 #include "dcindent.cxx"
-#include "hashGenerator.cxx"
-#include "primeNumberGenerator.cxx"
diff --git a/direct/src/dcparser/primeNumberGenerator.h b/direct/src/dcparser/primeNumberGenerator.h
index 4ab7f9a4d0..1ef35a3ec4 100644
--- a/direct/src/dcparser/primeNumberGenerator.h
+++ b/direct/src/dcparser/primeNumberGenerator.h
@@ -20,6 +20,7 @@
 #define PRIMENUMBERGENERATOR_H
 
 #include "dcbase.h"
+#include "vector_int.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PrimeNumberGenerator
@@ -36,7 +37,7 @@ public:
   int operator [] (int n);
 
 private:
-  typedef pvector<int> Primes;
+  typedef vector_int Primes;
   Primes _primes;
 };