diff --git a/panda/src/egg/eggGroupNode.cxx b/panda/src/egg/eggGroupNode.cxx
index 072d67003c..4abe111495 100644
--- a/panda/src/egg/eggGroupNode.cxx
+++ b/panda/src/egg/eggGroupNode.cxx
@@ -14,6 +14,8 @@
 #include "eggVertex.h"
 #include "eggTextureCollection.h"
 #include "eggMaterialCollection.h"
+#include "pt_EggTexture.h"
+#include "pt_EggMaterial.h"
 #include "config_egg.h"
 
 #include <dSearchPath.h>
@@ -820,7 +822,7 @@ find_textures(EggTextureCollection *collection) {
     EggNode *child = *ci;
 
     if (child->is_of_type(EggTexture::get_class_type())) {
-      PT(EggTexture) tex = DCAST(EggTexture, child);
+      PT_EggTexture tex = DCAST(EggTexture, child);
 
       // Now remove the EggTexture entry from our child list.
       prepare_remove_child(tex);
@@ -866,7 +868,7 @@ find_materials(EggMaterialCollection *collection) {
     EggNode *child = *ci;
 
     if (child->is_of_type(EggMaterial::get_class_type())) {
-      PT(EggMaterial) tex = DCAST(EggMaterial, child);
+      PT_EggMaterial tex = DCAST(EggMaterial, child);
 
       // Now remove the EggMaterial entry from our child list.
       prepare_remove_child(tex);
diff --git a/panda/src/egg/eggPrimitive.h b/panda/src/egg/eggPrimitive.h
index 7ad9dde06d..a477675d36 100644
--- a/panda/src/egg/eggPrimitive.h
+++ b/panda/src/egg/eggPrimitive.h
@@ -14,6 +14,8 @@
 #include "eggTexture.h"
 #include "eggMaterial.h"
 #include "eggRenderMode.h"
+#include "pt_EggTexture.h"
+#include "pt_EggMaterial.h"
 #include "vector_PT_EggVertex.h"
 
 #include <pointerTo.h>
@@ -152,8 +154,8 @@ protected:
 
 
 private:
-  PT(EggTexture) _texture;
-  PT(EggMaterial) _material;
+  PT_EggTexture _texture;
+  PT_EggMaterial _material;
   bool _bface;
 
 public:
diff --git a/panda/src/egg/eggUtilities.h b/panda/src/egg/eggUtilities.h
index c7d4e12f07..9c82930f06 100644
--- a/panda/src/egg/eggUtilities.h
+++ b/panda/src/egg/eggUtilities.h
@@ -18,6 +18,7 @@
 #include <pandabase.h>
 
 #include "eggTexture.h"
+#include "pt_EggTexture.h"
 
 #include <filename.h>
 #include <pointerTo.h>
@@ -28,7 +29,7 @@
 class EggNode;
 class EggVertex;
 
-typedef set< PT(EggTexture) > EggTextures;
+typedef set< PT_EggTexture > EggTextures;
 typedef map<Filename, EggTextures> EggTextureFilenames;
 
 
diff --git a/panda/src/egg/parser.yxx b/panda/src/egg/parser.yxx
index 855b2a5c66..f6a7627e26 100644
--- a/panda/src/egg/parser.yxx
+++ b/panda/src/egg/parser.yxx
@@ -26,6 +26,8 @@
 #include "eggCoordinateSystem.h"
 #include "eggExternalReference.h"
 #include "eggData.h"
+#include "pt_EggTexture.h"
+#include "pt_EggMaterial.h"
 
 #include <string_utils.h>
 #include <filename.h>
@@ -52,24 +54,21 @@ typedef vector< PT(EggObject) > EggStack;
 static EggStack egg_stack;
 
 // There's one "top-level" egg node, which is where we should parent
-// things (e.g. textures) encountered in the egg file that don't have
-// an explicit place in the tree.  If this is NULL, such things won't
-// be parented anywhere.
+// things (e.g. implicit textures) encountered in the egg file that
+// don't have an explicit place in the tree.  If this is NULL, such
+// things won't be parented anywhere.
 static EggGroupNode *egg_top_node;
 
 // We need a table mapping vertex pool names to vertex pools.
-
 typedef map<string,  PT(EggVertexPool) > VertexPools;
 static VertexPools vertex_pools;
 
 // And another one mapping texture names to textures.
-
-typedef map<string,  PT(EggTexture) > Textures;
+typedef map<string,  PT_EggTexture > Textures;
 static Textures textures;
 
 // And again for material names to materials.
-
-typedef map<string,  PT(EggMaterial) > Materials;
+typedef map<string,  PT_EggMaterial > Materials;
 static Materials materials;
 
 // We need to be able to save the index number requested for a vertex