diff --git a/pandatool/src/bam/bamInfo.cxx b/pandatool/src/bam/bamInfo.cxx
index e5dc4cfafc..4e8694dd22 100644
--- a/pandatool/src/bam/bamInfo.cxx
+++ b/pandatool/src/bam/bamInfo.cxx
@@ -23,7 +23,7 @@
 #include <renderRelation.h>
 #include <geomNode.h>
 
-#include <vector>
+#include "pvector.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: BamInfo::Constructor
@@ -126,7 +126,7 @@ get_info(const Filename &filename) {
   nout << filename << " : Bam version " << bam_file.get_file_major_ver()
        << "." << bam_file.get_file_minor_ver() << "\n";
 
-  typedef vector<TypedWritable *> Objects;
+  typedef pvector<TypedWritable *> Objects;
   Objects objects;
   TypedWritable *object = bam_file.read_object();
   while (object != (TypedWritable *)NULL || !bam_file.is_eof()) {
diff --git a/pandatool/src/egg-palettize/eggFile.cxx b/pandatool/src/egg-palettize/eggFile.cxx
index 95cd226e12..acf00fad2c 100644
--- a/pandatool/src/egg-palettize/eggFile.cxx
+++ b/pandatool/src/egg-palettize/eggFile.cxx
@@ -127,7 +127,7 @@ scan_textures() {
 //               appended to the existing set.
 ////////////////////////////////////////////////////////////////////
 void EggFile::
-get_textures(set<TextureImage *> &result) const {
+get_textures(pset<TextureImage *> &result) const {
   Textures::const_iterator ti;
   for (ti = _textures.begin(); ti != _textures.end(); ++ti) {
     result.insert((*ti)->get_texture());
diff --git a/pandatool/src/egg-palettize/paletteGroup.cxx b/pandatool/src/egg-palettize/paletteGroup.cxx
index 3002b2c33d..b482a6002d 100644
--- a/pandatool/src/egg-palettize/paletteGroup.cxx
+++ b/pandatool/src/egg-palettize/paletteGroup.cxx
@@ -132,7 +132,7 @@ get_groups() const {
 //               the vector first.
 ////////////////////////////////////////////////////////////////////
 void PaletteGroup::
-get_placements(vector<TexturePlacement *> &placements) const {
+get_placements(pvector<TexturePlacement *> &placements) const {
   Placements::const_iterator pi;
   for (pi = _placements.begin(); pi != _placements.end(); ++pi) {
     placements.push_back(*pi);
@@ -147,7 +147,7 @@ get_placements(vector<TexturePlacement *> &placements) const {
 //               vector.  See get_placements().
 ////////////////////////////////////////////////////////////////////
 void PaletteGroup::
-get_complete_placements(vector<TexturePlacement *> &placements) const {
+get_complete_placements(pvector<TexturePlacement *> &placements) const {
   PaletteGroups complete;
   complete.make_complete(_dependent);
 
@@ -671,7 +671,7 @@ complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
 void PaletteGroup::
 finalize() {
   // Now we can copy the pages into the actual map.
-  vector<PalettePage *>::const_iterator pi;
+  pvector<PalettePage *>::const_iterator pi;
   for (pi = _load_pages.begin(); pi != _load_pages.end(); ++pi) {
     PalettePage *page = (*pi);
     bool inserted = _pages.
diff --git a/pandatool/src/egg-palettize/palettizer.cxx b/pandatool/src/egg-palettize/palettizer.cxx
index 4ee997f025..9e0776c38a 100644
--- a/pandatool/src/egg-palettize/palettizer.cxx
+++ b/pandatool/src/egg-palettize/palettizer.cxx
@@ -191,7 +191,7 @@ report_pi() const {
 
   // Sort the palette groups into order of preference, so that the
   // more specific ones appear at the bottom.
-  vector<PaletteGroup *> sorted_groups;
+  pvector<PaletteGroup *> sorted_groups;
   Groups::const_iterator gi;
   for (gi = _groups.begin(); gi != _groups.end(); ++gi) {
     sorted_groups.push_back((*gi).second);
@@ -200,7 +200,7 @@ report_pi() const {
        SortGroupsByPreference());
 
   cout << "\npalette groups\n";
-  vector<PaletteGroup *>::iterator si;
+  pvector<PaletteGroup *>::iterator si;
   for (si = sorted_groups.begin(); si != sorted_groups.end(); ++si) {
     PaletteGroup *group = (*si);
     if (si != sorted_groups.begin()) {
@@ -245,7 +245,7 @@ void Palettizer::
 report_statistics() const {
   // Sort the groups into order by dependency order, for the user's
   // convenience.
-  vector<PaletteGroup *> sorted_groups;
+  pvector<PaletteGroup *> sorted_groups;
 
   Groups::const_iterator gi;
   for (gi = _groups.begin(); gi != _groups.end(); ++gi) {
@@ -257,7 +257,7 @@ report_statistics() const {
 
   Placements overall_placements;
 
-  vector<PaletteGroup *>::const_iterator si;
+  pvector<PaletteGroup *>::const_iterator si;
   for (si = sorted_groups.begin();
        si != sorted_groups.end();
        ++si) {
diff --git a/pandatool/src/egg-palettize/txaLine.cxx b/pandatool/src/egg-palettize/txaLine.cxx
index db569c3ef6..62ff567e9e 100644
--- a/pandatool/src/egg-palettize/txaLine.cxx
+++ b/pandatool/src/egg-palettize/txaLine.cxx
@@ -119,7 +119,7 @@ parse(const string &line) {
 
       } else {
         // Collect a number of consecutive numeric fields.
-        vector<int> numbers;
+        pvector<int> numbers;
         while (wi != words.end() && isdigit((*wi)[0])) {
           const string &word = *wi;
           int num;
diff --git a/pandatool/src/fltegg/fltToEggConverter.cxx b/pandatool/src/fltegg/fltToEggConverter.cxx
index b3c2852d0a..3b679a1210 100644
--- a/pandatool/src/fltegg/fltToEggConverter.cxx
+++ b/pandatool/src/fltegg/fltToEggConverter.cxx
@@ -372,7 +372,7 @@ convert_face(const FltFace *flt_face, FltToEggLevelState &state) {
   }
 
   // Collect the vertices for this primitive.
-  vector< PT_EggVertex > vertices;
+  pvector< PT_EggVertex > vertices;
 
   const FltVertexList *vlist = (FltVertexList *)NULL;
   int num_children = flt_face->get_num_children();
diff --git a/pandatool/src/gtk-stats/gtkStatsStripWindow.cxx b/pandatool/src/gtk-stats/gtkStatsStripWindow.cxx
index 9b71a22a24..62f8207adf 100644
--- a/pandatool/src/gtk-stats/gtkStatsStripWindow.cxx
+++ b/pandatool/src/gtk-stats/gtkStatsStripWindow.cxx
@@ -83,7 +83,7 @@ new_collector() {
   // Determine the set of collectors that display level data.  We'll
   // want to put these on the "Levels" pull-down menu.
 
-  set<int> levels;
+  pset<int> levels;
 
   int num_collectors = client_data->get_num_collectors();
   for (int i = 0; i < num_collectors; i++) {
@@ -109,7 +109,7 @@ new_collector() {
 
   // Now put the collectors we found on the menu.
   _levels_menu->items().clear();
-  set<int>::const_iterator li;
+  pset<int>::const_iterator li;
   for (li = levels.begin(); li != levels.end(); ++li) {
     int collector_index = (*li);
     _levels_menu->items().push_back
diff --git a/pandatool/src/maya/mayaShader.cxx b/pandatool/src/maya/mayaShader.cxx
index 396e8705f6..90f22d7657 100644
--- a/pandatool/src/maya/mayaShader.cxx
+++ b/pandatool/src/maya/mayaShader.cxx
@@ -201,7 +201,7 @@ read_surface_color(MObject color) {
     } else {
       // If we don't have a heavy verbose count, only report each type
       // of unsupportted shader once.
-      static set<MFn::Type> bad_types;
+      static pset<MFn::Type> bad_types;
       if (bad_types.insert(color.apiType()).second) {
         if (verbose == 1) {
           nout << "\n";
diff --git a/pandatool/src/progbase/programBase.cxx b/pandatool/src/progbase/programBase.cxx
index e6a375b33b..633ff8dcdd 100644
--- a/pandatool/src/progbase/programBase.cxx
+++ b/pandatool/src/progbase/programBase.cxx
@@ -211,13 +211,13 @@ parse_command_line(int argc, char *argv[]) {
 
   // Build up the long options list and the short options string for
   // getopt_long_only().
-  vector<struct option> long_options;
+  pvector<struct option> long_options;
   string short_options;
 
   // We also need to build a temporary map of int index numbers to
   // Option pointers.  We'll pass these index numbers to GNU's
   // getopt_long() so we can tell one option from another.
-  typedef map<int, const Option *> Options;
+  typedef pmap<int, const Option *> Options;
   Options options;
 
   OptionsByName::const_iterator oi;
diff --git a/pandatool/src/pstatserver/pStatView.cxx b/pandatool/src/pstatserver/pStatView.cxx
index f512206c47..bc5fe1cb22 100644
--- a/pandatool/src/pstatserver/pStatView.cxx
+++ b/pandatool/src/pstatserver/pStatView.cxx
@@ -23,7 +23,7 @@
 #include <vector_int.h>
 
 #include <algorithm>
-#include <list>
+#include "plist.h"
 
 
 
@@ -36,7 +36,7 @@
 ////////////////////////////////////////////////////////////////////
 class FrameSample {
 public:
-  typedef list<FrameSample *> Started;
+  typedef plist<FrameSample *> Started;
 
   FrameSample() {
     _touched = false;
@@ -323,7 +323,7 @@ void PStatView::
 update_time_data(const PStatFrameData &frame_data) {
   int num_events = frame_data.get_num_events();
 
-  typedef vector<FrameSample> Samples;
+  typedef pvector<FrameSample> Samples;
   Samples samples(_client_data->get_num_collectors());
 
   FrameSample::Started started;
@@ -332,7 +332,7 @@ update_time_data(const PStatFrameData &frame_data) {
 
 
   // This tracks the set of samples we actually care about.
-  typedef set<int> GotSamples;
+  typedef pset<int> GotSamples;
   GotSamples got_samples;
 
   int i;
@@ -432,7 +432,7 @@ update_level_data(const PStatFrameData &frame_data) {
 
 
   // This tracks the set of level values we got.
-  typedef map<int, float> GotValues;
+  typedef pmap<int, float> GotValues;
   GotValues net_values;
 
   int i;
diff --git a/pandatool/src/softprogs/softCVS.cxx b/pandatool/src/softprogs/softCVS.cxx
index f1008696ff..82f2f56034 100644
--- a/pandatool/src/softprogs/softCVS.cxx
+++ b/pandatool/src/softprogs/softCVS.cxx
@@ -151,7 +151,7 @@ traverse_subdir(const Filename &directory) {
 
   // We need to know the set of files in this directory that are CVS
   // elements.
-  set<string> cvs_elements;
+  pset<string> cvs_elements;
   bool in_cvs = false;
   if (!_no_cvs) {
     in_cvs = scan_cvs(directory, cvs_elements);
@@ -401,7 +401,7 @@ rename_file(SoftCVS::SceneFiles::iterator begin,
 //               CVS-controlled, false otherwise.
 ////////////////////////////////////////////////////////////////////
 bool SoftCVS::
-scan_cvs(const string &dirname, set<string> &cvs_elements) {
+scan_cvs(const string &dirname, pset<string> &cvs_elements) {
   Filename cvs_entries = dirname + "/CVS/Entries";
   if (!cvs_entries.exists()) {
     // Try to CVSify the directory.