diff --git a/Core/GameEngine/Include/GameClient/Smudge.h b/Core/GameEngine/Include/GameClient/Smudge.h
index f36e12c857d..ab6245736b1 100644
--- a/Core/GameEngine/Include/GameClient/Smudge.h
+++ b/Core/GameEngine/Include/GameClient/Smudge.h
@@ -30,7 +30,7 @@ struct Smudge : public DLNodeClass<Smudge>
 {
 	typedef void *Identifier;
 
-	W3DMPO_GLUE(Smudge)
+	W3DMPO_CODE(Smudge)
 
 	Identifier m_identifier;	//a number or pointer to identify this smudge
 	Vector3 m_pos;	//position of smudge center
@@ -61,10 +61,10 @@ struct SmudgeSet : public DLNodeClass<SmudgeSet>
 {
 	friend class SmudgeManager;
 
-	W3DMPO_GLUE(SmudgeSet)
+	W3DMPO_CODE(SmudgeSet)
 
 	SmudgeSet();
-	virtual ~SmudgeSet() override;
+	~SmudgeSet();
 
 	void reset();
 	void resetDraw();
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h
index f1cb568c5be..5a223aee10c 100644
--- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h
@@ -41,7 +41,7 @@ class WorldHeightMap;
 ***************************************************************************/
 class TerrainTextureClass : public TextureClass
 {
-	W3DMPO_GLUE(TerrainTextureClass)
+	W3DMPO_CODE(TerrainTextureClass)
 protected:
 	virtual void Apply(unsigned int stage) override;
 
@@ -62,7 +62,7 @@ class TerrainTextureClass : public TextureClass
 
 class AlphaTerrainTextureClass : public TextureClass
 {
-	W3DMPO_GLUE(AlphaTerrainTextureClass)
+	W3DMPO_CODE(AlphaTerrainTextureClass)
 protected:
 		virtual void Apply(unsigned int stage) override;
 public:
@@ -78,7 +78,7 @@ class AlphaTerrainTextureClass : public TextureClass
 ***************************************************************************/
 class AlphaEdgeTextureClass : public TextureClass
 {
-	W3DMPO_GLUE(AlphaEdgeTextureClass)
+	W3DMPO_CODE(AlphaEdgeTextureClass)
 protected:
 	virtual void Apply(unsigned int stage) override;
 	int update256(WorldHeightMap *htMap);///< Sets the pixels, and returns the actual height of the texture.
@@ -95,7 +95,7 @@ class AlphaEdgeTextureClass : public TextureClass
 
 class LightMapTerrainTextureClass : public TextureClass
 {
-	W3DMPO_GLUE(LightMapTerrainTextureClass)
+	W3DMPO_CODE(LightMapTerrainTextureClass)
 protected:
 		virtual void Apply(unsigned int stage) override;
 
@@ -108,7 +108,7 @@ class LightMapTerrainTextureClass : public TextureClass
 
 class ScorchTextureClass : public TextureClass
 {
-	W3DMPO_GLUE(ScorchTextureClass)
+	W3DMPO_CODE(ScorchTextureClass)
 protected:
 		virtual void Apply(unsigned int stage) override;
 
@@ -121,7 +121,7 @@ class ScorchTextureClass : public TextureClass
 
 class CloudMapTerrainTextureClass : public TextureClass
 {
-	W3DMPO_GLUE(CloudMapTerrainTextureClass)
+	W3DMPO_CODE(CloudMapTerrainTextureClass)
 protected:
 		virtual void Apply(unsigned int stage) override;
 
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h
index f3bfa61b9db..e13a96e7ee4 100644
--- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h
@@ -44,9 +44,9 @@ class Drawable;
 /**
 This render object handles drawing tracks left by objects moving on the terrain.
 */
-class TerrainTracksRenderObjClass : public W3DMPO, public RenderObjClass
+class TerrainTracksRenderObjClass : public RenderObjClass
 {
-	W3DMPO_GLUE(TerrainTracksRenderObjClass)
+	W3DMPO_CODE(TerrainTracksRenderObjClass)
 
 	friend class TerrainTracksRenderObjClassSystem;
 
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h
index 1011814ec77..db2abe59ed2 100644
--- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h
+++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h
@@ -153,7 +153,7 @@ class W3DTreeBuffer : public Snapshot
 	//-----------------------------------------------------------------------------
 	class W3DTreeTextureClass : public TextureClass
 	{
-		W3DMPO_GLUE(W3DTreeTextureClass)
+		W3DMPO_CODE(W3DTreeTextureClass)
 	protected:
 		virtual void Apply(unsigned int stage) override;
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h
index b7d326920ca..8521736b726 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h
@@ -79,9 +79,9 @@ struct BoxRayAPTContextStruct;
 ** is in MeshGeometryClass.  I moved these out into a separate file just to reduce the
 ** size of meshmdl.cpp.
 */
-class AABTreeClass : public W3DMPO, public RefCountClass
+class AABTreeClass : public RefCountClass
 {
-	W3DMPO_GLUE(AABTreeClass)
+	W3DMPO_CODE(AABTreeClass)
 public:
 
 	AABTreeClass();
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h
index 9178700bc41..987d423a8f4 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h
@@ -194,9 +194,9 @@ class AggregateDefClass
 //
 //	AggregatePrototypeClass
 //
-class AggregatePrototypeClass : public W3DMPO, public PrototypeClass
+class AggregatePrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(AggregatePrototypeClass)
+	W3DMPO_CODE(AggregatePrototypeClass)
 	public:
 
 		///////////////////////////////////////////////////////////
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp b/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp
index 98fdc43e32a..9d35c5931cb 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp
@@ -117,9 +117,9 @@ class CollectionDefClass
 ** CollectionPrototypeClass this is the render object prototype for
 ** Collections.
 */
-class CollectionPrototypeClass : public W3DMPO, public PrototypeClass
+class CollectionPrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(CollectionPrototypeClass)
+	W3DMPO_CODE(CollectionPrototypeClass)
 public:
 	CollectionPrototypeClass(CollectionDefClass * def)		{ ColDef = def; WWASSERT(ColDef); }
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/distlod.h b/Core/Libraries/Source/WWVegas/WW3D2/distlod.h
index f973fa96e37..1aaa3cc1dd0 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/distlod.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/distlod.h
@@ -214,9 +214,9 @@ class DistLODDefClass
 /*
 ** Prototype for Dist-LOD objects
 */
-class DistLODPrototypeClass : public W3DMPO, public PrototypeClass
+class DistLODPrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(DistLODPrototypeClass)
+	W3DMPO_CODE(DistLODPrototypeClass)
 public:
 	DistLODPrototypeClass( DistLODDefClass *def ) { Definition = def; }
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dllist.h b/Core/Libraries/Source/WWVegas/WW3D2/dllist.h
index 7b7f5eee52f..c97e26c8b69 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/dllist.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/dllist.h
@@ -79,18 +79,15 @@ class DLDestroyListClass : public DLListClass<T>
 };
 
 template <class T>
-class DLNodeClass : public W3DMPO
+class DLNodeClass
 {
-	// nope, this is an ABC
-	//W3DMPO_GLUE(DLNodeClass)
-
 	friend DLListClass<T>;
 	DLNodeClass<T>* succ;
 	DLNodeClass<T>* pred;
 	DLListClass<T>* list;
 public:
 	DLNodeClass() : succ(0), pred(0), list(0) {}
-	virtual ~DLNodeClass() override { Remove(); }
+	~DLNodeClass() { Remove(); }
 
 	void Insert_Before(DLNodeClass<T>* n)
 	{
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h
index fb5c8d7056e..e024ab5d68f 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h
@@ -52,7 +52,7 @@ class	IntersectionResultClass;
 */
 class DynamicMeshModel : public MeshGeometryClass
 {
-	W3DMPO_GLUE(DynamicMeshModel)
+	W3DMPO_CODE(DynamicMeshModel)
 
 public:
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/htree.h b/Core/Libraries/Source/WWVegas/WW3D2/htree.h
index 8a2d61d9745..080968c10f9 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/htree.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/htree.h
@@ -66,9 +66,9 @@ class HRawAnimClass;
 	by the HierarchyModelClass.
 
 */
-class HTreeClass : public W3DMPO
+class HTreeClass
 {
-	W3DMPO_GLUE(HTreeClass)
+	W3DMPO_CODE(HTreeClass)
 public:
 
 	enum
@@ -79,7 +79,7 @@ class HTreeClass : public W3DMPO
 
 	HTreeClass();
 	HTreeClass(const HTreeClass & src);
-	virtual ~HTreeClass() override;
+	~HTreeClass();
 
 	int					Load_W3D(ChunkLoadClass & cload);
 	void					Init_Default();
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/line3d.h b/Core/Libraries/Source/WWVegas/WW3D2/line3d.h
index 3fd1db0c887..a1a325a91dd 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/line3d.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/line3d.h
@@ -52,9 +52,9 @@ class RenderInfoClass;
 ** Line3DCLass objects are unlit, therefore only the sihouette needs to be
 ** approximated).
 */
-class Line3DClass : public W3DMPO, public RenderObjClass
+class Line3DClass : public RenderObjClass
 {
-	W3DMPO_GLUE(Line3DClass)
+	W3DMPO_CODE(Line3DClass)
 
 	public:
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h
index 74bffa1745b..61cda2a4278 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h
@@ -63,9 +63,9 @@ class MeshMatDescClass;
 ** that the mesh is using.
 **
 ***********************************************************************************************/
-class MaterialInfoClass : public W3DMPO, public RefCountClass
+class MaterialInfoClass : public RefCountClass
 {
-	W3DMPO_GLUE(MaterialInfoClass)
+	W3DMPO_CODE(MaterialInfoClass)
 public:
 
 	MaterialInfoClass();
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp b/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp
index c279eac95af..d8ef8aa5cd6 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp
@@ -86,9 +86,9 @@ RenderObjClass * PrimitivePrototypeClass::Create()
 }
 
 
-class HModelPrototypeClass : public W3DMPO, public PrototypeClass
+class HModelPrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(HModelPrototypeClass)
+	W3DMPO_CODE(HModelPrototypeClass)
 public:
 	HModelPrototypeClass(HModelDefClass * def)				{ HModelDef = def; assert(HModelDef); }
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proto.h b/Core/Libraries/Source/WWVegas/WW3D2/proto.h
index 1b5b793e3d9..5a363e2458d 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/proto.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/proto.h
@@ -102,9 +102,9 @@ class PrototypeClass
 	PrototypeClass & operator = (const PrototypeClass & that);
 };
 
-class PrimitivePrototypeClass : public W3DMPO, public PrototypeClass
+class PrimitivePrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(PrimitivePrototypeClass)
+	W3DMPO_CODE(PrimitivePrototypeClass)
 public:
 	PrimitivePrototypeClass(RenderObjClass * proto);
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h
index 75aabf421ce..5f6c4406381 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h
@@ -51,9 +51,9 @@ class	SurfaceClass;
 //
 //	Private data structures
 //
-class FontCharsClassCharDataStruct : public W3DMPO
+class FontCharsClassCharDataStruct
 {
-	W3DMPO_GLUE(FontCharsClassCharDataStruct)
+	W3DMPO_CODE(FontCharsClassCharDataStruct)
 public:
 	WCHAR				Value;
 	short				Width;
@@ -62,17 +62,17 @@ class FontCharsClassCharDataStruct : public W3DMPO
 
 enum { CHAR_BUFFER_LEN		= 32768 };
 
-class FontCharsBuffer : public W3DMPO
+class FontCharsBuffer
 {
-	W3DMPO_GLUE(FontCharsBuffer)
+	W3DMPO_CODE(FontCharsBuffer)
 public:
 	uint16			Buffer[CHAR_BUFFER_LEN];
 };
 
 
-class FontCharsClass : public W3DMPO, public RefCountClass
+class FontCharsClass : public RefCountClass
 {
-	W3DMPO_GLUE(FontCharsClass)
+	W3DMPO_CODE(FontCharsClass)
 
 public:
 	FontCharsClass();
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h
index 8aaa5ee47c4..c11a3c87d53 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h
@@ -324,9 +324,9 @@ class RingLoaderClass : public PrototypeLoaderClass
 /*
 ** Prototype for Ring objects
 */
-class RingPrototypeClass : public W3DMPO, public PrototypeClass
+class RingPrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(RingPrototypeClass)
+	W3DMPO_CODE(RingPrototypeClass)
 
 public:
 	RingPrototypeClass ();
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h
index a632d8478de..4ece0237ac2 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h
@@ -222,9 +222,9 @@ class SoundRenderObjDefClass : public RefCountClass
 //	SoundRenderObjPrototypeClass
 //
 ///////////////////////////////////////////////////////////////////////////////////
-class SoundRenderObjPrototypeClass : public W3DMPO, public PrototypeClass
+class SoundRenderObjPrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(SoundRenderObjPrototypeClass)
+	W3DMPO_CODE(SoundRenderObjPrototypeClass)
 public:
 
 	///////////////////////////////////////////////////////////
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h
index 05865a423d5..4222b6b9988 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h
@@ -433,9 +433,9 @@ class SphereLoaderClass : public PrototypeLoaderClass
 /*
 ** Prototype for Sphere objects
 */
-class SpherePrototypeClass : public W3DMPO, public PrototypeClass
+class SpherePrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(SpherePrototypeClass)
+	W3DMPO_CODE(SpherePrototypeClass)
 public:
 	SpherePrototypeClass ();
 	SpherePrototypeClass (SphereRenderObjClass *sphere);
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h
index a12fe791acb..37b4b3aed4c 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h
@@ -53,9 +53,9 @@ class Vector3;
 ** Hector Yee 2/12/01 - added in fills, blits etc for font3d class
 **
 *************************************************************************/
-class SurfaceClass : public W3DMPO, public RefCountClass
+class SurfaceClass : public RefCountClass
 {
-	W3DMPO_GLUE(SurfaceClass)
+	W3DMPO_CODE(SurfaceClass)
 	public:
 		typedef void *LockedSurfacePtr;
 
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texture.h b/Core/Libraries/Source/WWVegas/WW3D2/texture.h
index 8a36a550130..9d98c7b6ba6 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/texture.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/texture.h
@@ -261,9 +261,9 @@ class TextureBaseClass : public RefCountClass
 ** modes.
 **
 *************************************************************************/
-class TextureClass : public W3DMPO, public TextureBaseClass
+class TextureClass : public TextureBaseClass
 {
-	W3DMPO_GLUE(TextureClass)
+	W3DMPO_CODE(TextureClass)
 //	friend DX8Wrapper;
 
 public:
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h b/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h
index cc21d126159..91ba3037d18 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h
+++ b/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h
@@ -83,7 +83,7 @@ class ThumbnailClass
 
 class ThumbnailManagerClass : public DLNodeClass<ThumbnailManagerClass>
 {
-	W3DMPO_GLUE(ThumbnailManagerClass);
+	W3DMPO_CODE(ThumbnailManagerClass);
 
 	friend ThumbnailClass;
 
@@ -96,7 +96,7 @@ class ThumbnailManagerClass : public DLNodeClass<ThumbnailManagerClass>
 	unsigned long DateTime;
 
 	ThumbnailManagerClass(const char* thumbnail_filename);
-	virtual ~ThumbnailManagerClass() override;
+	~ThumbnailManagerClass();
 
 	void Remove_From_Hash(ThumbnailClass* thumb);
 	void Insert_To_Hash(ThumbnailClass* thumb);
diff --git a/Core/Libraries/Source/WWVegas/WWLib/always.h b/Core/Libraries/Source/WWVegas/WWLib/always.h
index c048ebdc385..f670661d8f5 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/always.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/always.h
@@ -130,44 +130,23 @@ extern void* allocateFromW3DMemPool(void* p, int allocationSize, const char* msg
 extern void freeFromW3DMemPool(void* pool, void* p);
 
 // ----------------------------------------------------------------------------
-#define W3DMPO_GLUE(ARGCLASS) \
+#define W3DMPO_CODE(ARGCLASS) \
 private: \
 	static void* getClassMemoryPool() \
 	{ \
-		/* \
-			Note that this static variable will be initialized exactly once: the first time \
-			control flows over this section of code. This allows us to neatly resolve the \
-			order-of-execution problem for static variables, ensuring this is not executed \
-			prior to the initialization of TheMemoryPoolFactory. \
+		/*
+		construct on first first use to avoid static initialization order fiasco
+		that may occur if this were initialized prior to the initialization of TheMemoryPoolFactory.
 		*/ \
 		static void* The##ARGCLASS##Pool = createW3DMemPool(#ARGCLASS, sizeof(ARGCLASS)); \
 		return The##ARGCLASS##Pool; \
 	} \
-protected: \
-	virtual void glueEnforcer() const override { } \
 public: \
 	inline void* operator new(size_t s) { return allocateFromW3DMemPool(getClassMemoryPool(), s); } \
 	inline void operator delete(void *p) { freeFromW3DMemPool(getClassMemoryPool(), p); } \
 	inline void* operator new(size_t s, const char* msg, int unused) { return allocateFromW3DMemPool(getClassMemoryPool(), s, msg, unused); } \
 	inline void operator delete(void *p, const char* msg, int unused) { freeFromW3DMemPool(getClassMemoryPool(), p); } \
 
-// ----------------------------------------------------------------------------
-class W3DMPO
-{
-private:
-	static void* getClassMemoryPool()
-	{
-		assert(0);	// must replace this via W3DMPO_GLUE
-		return nullptr;
-	}
-protected:
-	// we never call this; it is present to cause compile errors in descendent classes
-	virtual void glueEnforcer() const = 0;
-public:
-	virtual ~W3DMPO() { /* nothing */ }
-};
-// ----------------------------------------------------------------------------
-
 #else
 
 	#define MSGW3DNEW(MSG)					new
@@ -178,9 +157,7 @@ class W3DMPO
 	#define NEW_REF( C, P )					( W3DNEW C P )
 	#define SET_REF_OWNER( P )			P
 
-	#define W3DMPO_GLUE(ARGCLASS)
-
-	class W3DMPO { };
+	#define W3DMPO_CODE(ARGCLASS)
 
 #endif // (gth) removing the generals memory stuff from W3D
 
diff --git a/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h b/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h
index c722ab020c7..6aa6d2d144d 100644
--- a/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h
+++ b/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h
@@ -45,9 +45,9 @@
 ** refcounted wrapper (also a count).
 */
 template <class T>
-class ShareBufferClass : public W3DMPO, public RefCountClass
+class ShareBufferClass : public RefCountClass
 {
-	W3DMPO_GLUE(ShareBufferClass)
+	W3DMPO_CODE(ShareBufferClass)
 	public:
 		ShareBufferClass(int count, const char* msg);
 		ShareBufferClass(const ShareBufferClass & that);
diff --git a/Core/Libraries/Source/WWVegas/WWMath/matrix3d.h b/Core/Libraries/Source/WWVegas/WWMath/matrix3d.h
index 3651ee2cf2c..f5ab7d2e2ef 100644
--- a/Core/Libraries/Source/WWVegas/WWMath/matrix3d.h
+++ b/Core/Libraries/Source/WWVegas/WWMath/matrix3d.h
@@ -1805,9 +1805,9 @@ WWINLINE void	Matrix3D::Inverse_Rotate_Vector(const Matrix3D & A,const Vector3 &
 	out->Z = (A[0][2] * v->X + A[1][2] * v->Y + A[2][2] * v->Z);
 }
 
-class DynamicMatrix3D : public W3DMPO
+class DynamicMatrix3D
 {
-	W3DMPO_GLUE(DynamicMatrix3D)
+	W3DMPO_CODE(DynamicMatrix3D)
 public:
 	Matrix3D Mat;
 };
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h
index d69025ef28b..9df5c4aab4c 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h
@@ -129,9 +129,9 @@ inline void BoxRenderObjClass::Set_Local_Min_Max(const Vector3 & min,const Vecto
 /*
 ** AABoxRenderObjClass -- RenderObject for axis-aligned collision boxes.
 */
-class AABoxRenderObjClass : public W3DMPO, public BoxRenderObjClass
+class AABoxRenderObjClass : public BoxRenderObjClass
 {
-	W3DMPO_GLUE(AABoxRenderObjClass)
+	W3DMPO_CODE(AABoxRenderObjClass)
 public:
 
 	AABoxRenderObjClass();
@@ -180,9 +180,9 @@ inline const AABoxClass & AABoxRenderObjClass::Get_Box()
 /*
 ** OBBoxRenderObjClass - render object for oriented collision boxes
 */
-class OBBoxRenderObjClass : public W3DMPO, public BoxRenderObjClass
+class OBBoxRenderObjClass : public BoxRenderObjClass
 {
-	W3DMPO_GLUE(OBBoxRenderObjClass)
+	W3DMPO_CODE(OBBoxRenderObjClass)
 public:
 
 	OBBoxRenderObjClass();
@@ -237,9 +237,9 @@ class BoxLoaderClass : public PrototypeLoaderClass
 /*
 ** Prototype for Box objects
 */
-class BoxPrototypeClass : public W3DMPO, public PrototypeClass
+class BoxPrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(BoxPrototypeClass)
+	W3DMPO_CODE(BoxPrototypeClass)
 public:
 	BoxPrototypeClass(W3dBoxStruct box);
 	virtual const char *				Get_Name() const override;
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h
index c903098bf91..795fc6c74ca 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h
@@ -353,9 +353,9 @@ class DazzleVisibilityClass
 ** information needed to construct a particular instance of a dazzle.  Prototypes are
 ** stored in the asset manager and used to construct render objects when needed.
 */
-class DazzlePrototypeClass : public W3DMPO, public PrototypeClass
+class DazzlePrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(DazzlePrototypeClass)
+	W3DMPO_CODE(DazzlePrototypeClass)
 public:
 	DazzlePrototypeClass() : DazzleType(0)				{ }
 
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h
index dc004e925b2..7be198173b7 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h
@@ -244,9 +244,9 @@ struct VertexFormatXYZNDCUBEMAP
 // FVF info class can be created for any legal FVF. It constructs information
 // of offsets to various elements in the vertex buffer.
 
-class FVFInfoClass : public W3DMPO
+class FVFInfoClass
 {
-	W3DMPO_GLUE(FVFInfoClass)
+	W3DMPO_CODE(FVFInfoClass)
 
 	mutable unsigned						FVF;
 	mutable unsigned						fvf_size;
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h
index a61be107dfa..64f694c9361 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h
@@ -50,10 +50,8 @@ class SortingIndexBufferClass;
 
 // ----------------------------------------------------------------------------
 
-class IndexBufferClass : public W3DMPO, public RefCountClass
+class IndexBufferClass : public RefCountClass
 {
-	// nope, it's an ABC
-	//W3DMPO_GLUE(IndexBufferClass)
 protected:
 	virtual ~IndexBufferClass() override;
 public:
@@ -105,9 +103,9 @@ class IndexBufferClass : public W3DMPO, public RefCountClass
 
 // HY 2/14/01
 // Created
-class DynamicIBAccessClass : public W3DMPO
+class DynamicIBAccessClass
 {
-	W3DMPO_GLUE(DynamicIBAccessClass)
+	W3DMPO_CODE(DynamicIBAccessClass)
 
 	friend DX8Wrapper;
 	friend SortingRendererClass;
@@ -122,7 +120,7 @@ class DynamicIBAccessClass : public W3DMPO
 
 public:
 	DynamicIBAccessClass(unsigned short type, unsigned short index_count);
-	virtual ~DynamicIBAccessClass() override;
+	~DynamicIBAccessClass();
 
 	unsigned Get_Type() const { return Type; }
 	unsigned short Get_Index_Count() const { return IndexCount; }
@@ -155,7 +153,7 @@ class DynamicIBAccessClass : public W3DMPO
 */
 class DX8IndexBufferClass : public IndexBufferClass
 {
-	W3DMPO_GLUE(DX8IndexBufferClass)
+	W3DMPO_CODE(DX8IndexBufferClass)
 
 	friend IndexBufferClass::WriteLockClass;
 	friend IndexBufferClass::AppendLockClass;
@@ -183,7 +181,7 @@ class DX8IndexBufferClass : public IndexBufferClass
 
 class SortingIndexBufferClass : public IndexBufferClass
 {
-	W3DMPO_GLUE(SortingIndexBufferClass)
+	W3DMPO_CODE(SortingIndexBufferClass)
 
 	friend DX8Wrapper;
 	friend SortingRendererClass;
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h
index 668b1ab411d..ef868b0e9a3 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h
@@ -72,11 +72,8 @@ class VertexBufferLockClass
 ** DX8VertexBufferClass
 ** This class wraps a DX8 vertex buffer.  Use the lock objects to modify or append to the vertex buffer.
 */
-class VertexBufferClass : public W3DMPO, public RefCountClass
+class VertexBufferClass : public RefCountClass
 {
-	// nope, an ABC
-	//W3DMPO_GLUE(VertexBufferClass)
-
 protected:
 	VertexBufferClass(unsigned type, unsigned FVF, unsigned short VertexCount);
 	virtual ~VertexBufferClass() override;
@@ -199,7 +196,7 @@ inline VertexFormatXYZNDUV2 * DynamicVBAccessClass::WriteLockClass::Get_Formatte
 */
 class DX8VertexBufferClass : public VertexBufferClass
 {
-	W3DMPO_GLUE(DX8VertexBufferClass)
+	W3DMPO_CODE(DX8VertexBufferClass)
 protected:
 	virtual ~DX8VertexBufferClass() override;
 public:
@@ -238,7 +235,7 @@ class DX8VertexBufferClass : public VertexBufferClass
 */
 class SortingVertexBufferClass : public VertexBufferClass
 {
-	W3DMPO_GLUE(SortingVertexBufferClass)
+	W3DMPO_CODE(SortingVertexBufferClass)
 
 	friend DX8Wrapper;
 	friend SortingRendererClass;
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
index e312bc772bb..523fe147f3a 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
@@ -182,9 +182,9 @@ class ProxyRecordClass
 ** This is a ref-counted list of proxy objects.  It is generated whenever an HLODdef contains
 ** proxies.  Each instantiated HLOD simply add-refs a pointer to the single list.
 */
-class ProxyArrayClass : public W3DMPO, public VectorClass<ProxyRecordClass>, public RefCountClass
+class ProxyArrayClass : public VectorClass<ProxyRecordClass>, public RefCountClass
 {
-	W3DMPO_GLUE(ProxyArrayClass)
+	W3DMPO_CODE(ProxyArrayClass)
 public:
 	ProxyArrayClass(int size) : VectorClass<ProxyRecordClass>(size)
 	{
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h
index 377e74b1663..8c477cb8c7c 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h
@@ -58,9 +58,9 @@ class ProxyArrayClass;
 	This is an hierarchical, animatable level-of-detail model.
 
 */
-class HLodClass : public W3DMPO, public Animatable3DObjClass
+class HLodClass : public Animatable3DObjClass
 {
-	W3DMPO_GLUE(HLodClass)
+	W3DMPO_CODE(HLodClass)
 public:
 
 	HLodClass(const HLodClass & src);
@@ -276,14 +276,14 @@ class HLodLoaderClass : public PrototypeLoaderClass
 ** This description object is generated when reading a W3D_CHUNK_HLOD.  It
 ** directly describes the contents of an HLod model.
 */
-class HLodDefClass : public W3DMPO
+class HLodDefClass
 {
-	W3DMPO_GLUE(HLodDefClass)
+	W3DMPO_CODE(HLodDefClass)
 public:
 
 	HLodDefClass();
 	HLodDefClass(HLodClass &src_lod);
-	virtual ~HLodDefClass() override;
+	~HLodDefClass();
 
 	WW3DErrorType				Load_W3D(ChunkLoadClass & cload);
 	WW3DErrorType				Save(ChunkSaveClass & csave);
@@ -342,9 +342,9 @@ class HLodDefClass : public W3DMPO
 /*
 ** Prototype for HLod objects
 */
-class HLodPrototypeClass : public W3DMPO, public PrototypeClass
+class HLodPrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(HLodPrototypeClass)
+	W3DMPO_CODE(HLodPrototypeClass)
 public:
 	HLodPrototypeClass( HLodDefClass *def )					{ Definition = def; }
 
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h
index 6c0d256c537..cd54640dc60 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h
@@ -53,7 +53,7 @@ class INIClass;
 ** TextureMapperClass
 ** Base class for all texture mappers.
 */
-class TextureMapperClass : public W3DMPO, public RefCountClass
+class TextureMapperClass : public RefCountClass
 {
 	public:
 
@@ -106,7 +106,7 @@ class TextureMapperClass : public W3DMPO, public RefCountClass
 */
 class ScaleTextureMapperClass : public TextureMapperClass
 {
-	W3DMPO_GLUE(ScaleTextureMapperClass)
+	W3DMPO_CODE(ScaleTextureMapperClass)
 public:
 	ScaleTextureMapperClass(unsigned int stage);
 	ScaleTextureMapperClass(const Vector2 &scale, unsigned int stage);
@@ -129,7 +129,7 @@ class ScaleTextureMapperClass : public TextureMapperClass
 */
 class LinearOffsetTextureMapperClass : public ScaleTextureMapperClass
 {
-	W3DMPO_GLUE(LinearOffsetTextureMapperClass)
+	W3DMPO_CODE(LinearOffsetTextureMapperClass)
 public:
 	LinearOffsetTextureMapperClass(const Vector2 &offset_per_sec, const Vector2 &scale, unsigned int stage);
 	LinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage);
@@ -169,7 +169,7 @@ class LinearOffsetTextureMapperClass : public ScaleTextureMapperClass
 */
 class GridTextureMapperClass : public TextureMapperClass
 {
-	W3DMPO_GLUE(GridTextureMapperClass)
+	W3DMPO_CODE(GridTextureMapperClass)
 public:
 	GridTextureMapperClass(float fps, unsigned int gridwidth_log2, unsigned int stage);
 	GridTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage);
@@ -211,7 +211,7 @@ class GridTextureMapperClass : public TextureMapperClass
 */
 class RotateTextureMapperClass : public ScaleTextureMapperClass
 {
-	W3DMPO_GLUE(RotateTextureMapperClass)
+	W3DMPO_CODE(RotateTextureMapperClass)
 public:
 	RotateTextureMapperClass(float rad_per_sec, const Vector2& center, unsigned int stage);
 	RotateTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage);
@@ -238,7 +238,7 @@ class RotateTextureMapperClass : public ScaleTextureMapperClass
 */
 class SineLinearOffsetTextureMapperClass : public TextureMapperClass
 {
-	W3DMPO_GLUE(SineLinearOffsetTextureMapperClass)
+	W3DMPO_CODE(SineLinearOffsetTextureMapperClass)
 public:
 	SineLinearOffsetTextureMapperClass(const Vector3 &uafp, const Vector3 &vafp, unsigned int stage);
 	SineLinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage);
@@ -265,7 +265,7 @@ class SineLinearOffsetTextureMapperClass : public TextureMapperClass
 */
 class StepLinearOffsetTextureMapperClass : public TextureMapperClass
 {
-	W3DMPO_GLUE(StepLinearOffsetTextureMapperClass)
+	W3DMPO_CODE(StepLinearOffsetTextureMapperClass)
 public:
 	StepLinearOffsetTextureMapperClass(const Vector2 &step, float steps_per_sec, unsigned int stage);
 	StepLinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage);
@@ -292,7 +292,7 @@ class StepLinearOffsetTextureMapperClass : public TextureMapperClass
 */
 class ZigZagLinearOffsetTextureMapperClass : public TextureMapperClass
 {
-	W3DMPO_GLUE(ZigZagLinearOffsetTextureMapperClass)
+	W3DMPO_CODE(ZigZagLinearOffsetTextureMapperClass)
 public:
 	ZigZagLinearOffsetTextureMapperClass(const Vector2 &speed, float period, unsigned int stage);
 	ZigZagLinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage);
@@ -321,7 +321,7 @@ class ZigZagLinearOffsetTextureMapperClass : public TextureMapperClass
 
 class ClassicEnvironmentMapperClass : public TextureMapperClass
 {
-	W3DMPO_GLUE(ClassicEnvironmentMapperClass)
+	W3DMPO_CODE(ClassicEnvironmentMapperClass)
 public:
 	ClassicEnvironmentMapperClass(unsigned int stage) : TextureMapperClass(stage) { }
 	ClassicEnvironmentMapperClass(const ClassicEnvironmentMapperClass & src) : TextureMapperClass(src) { }
@@ -333,7 +333,7 @@ class ClassicEnvironmentMapperClass : public TextureMapperClass
 
 class EnvironmentMapperClass : public TextureMapperClass
 {
-	W3DMPO_GLUE(EnvironmentMapperClass)
+	W3DMPO_CODE(EnvironmentMapperClass)
 public:
 	EnvironmentMapperClass(unsigned int stage) : TextureMapperClass(stage) { }
 	EnvironmentMapperClass(const EnvironmentMapperClass & src) : TextureMapperClass(src) { }
@@ -345,7 +345,7 @@ class EnvironmentMapperClass : public TextureMapperClass
 
 class EdgeMapperClass : public TextureMapperClass
 {
-	W3DMPO_GLUE(EdgeMapperClass)
+	W3DMPO_CODE(EdgeMapperClass)
 public:
 	EdgeMapperClass(unsigned int stage);
 	EdgeMapperClass(const INIClass &ini, const char *section, unsigned int stage);
@@ -365,7 +365,7 @@ class EdgeMapperClass : public TextureMapperClass
 
 class WSClassicEnvironmentMapperClass : public TextureMapperClass
 {
-	W3DMPO_GLUE(WSClassicEnvironmentMapperClass)
+	W3DMPO_CODE(WSClassicEnvironmentMapperClass)
 public:
 	WSClassicEnvironmentMapperClass(unsigned int stage) : TextureMapperClass(stage) { }
 	WSClassicEnvironmentMapperClass(const WSClassicEnvironmentMapperClass & src) : TextureMapperClass(src) { }
@@ -377,7 +377,7 @@ class WSClassicEnvironmentMapperClass : public TextureMapperClass
 
 class WSEnvironmentMapperClass : public TextureMapperClass
 {
-	W3DMPO_GLUE(WSEnvironmentMapperClass)
+	W3DMPO_CODE(WSEnvironmentMapperClass)
 public:
 	WSEnvironmentMapperClass(unsigned int stage) : TextureMapperClass(stage) { }
 	WSEnvironmentMapperClass(const WSEnvironmentMapperClass & src) : TextureMapperClass(src) { }
@@ -389,7 +389,7 @@ class WSEnvironmentMapperClass : public TextureMapperClass
 
 class GridClassicEnvironmentMapperClass : public GridTextureMapperClass
 {
-	W3DMPO_GLUE(GridClassicEnvironmentMapperClass)
+	W3DMPO_CODE(GridClassicEnvironmentMapperClass)
 public:
 	GridClassicEnvironmentMapperClass(float fps,unsigned int gridwidth, unsigned int stage):GridTextureMapperClass(fps,gridwidth,stage) { }
 	GridClassicEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : GridTextureMapperClass(ini,section,stage) { }
@@ -402,7 +402,7 @@ class GridClassicEnvironmentMapperClass : public GridTextureMapperClass
 
 class GridEnvironmentMapperClass : public GridTextureMapperClass
 {
-	W3DMPO_GLUE(GridEnvironmentMapperClass)
+	W3DMPO_CODE(GridEnvironmentMapperClass)
 public:
 	GridEnvironmentMapperClass(float fps,unsigned int gridwidth, unsigned int stage):GridTextureMapperClass(fps,gridwidth,stage) { }
 	GridEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : GridTextureMapperClass(ini,section,stage) { }
@@ -421,7 +421,7 @@ class GridEnvironmentMapperClass : public GridTextureMapperClass
 // ----------------------------------------------------------------------------
 class ScreenMapperClass : public LinearOffsetTextureMapperClass
 {
-	W3DMPO_GLUE(ScreenMapperClass)
+	W3DMPO_CODE(ScreenMapperClass)
 public:
 	ScreenMapperClass(const Vector2 &offset_per_sec, const Vector2 &scale, unsigned int stage):LinearOffsetTextureMapperClass(offset_per_sec,scale,stage) { }
 	ScreenMapperClass(const INIClass &ini, const char *section, unsigned int stage):LinearOffsetTextureMapperClass(ini,section,stage) { }
@@ -437,7 +437,7 @@ class ScreenMapperClass : public LinearOffsetTextureMapperClass
 */
 class RandomTextureMapperClass : public TextureMapperClass
 {
-	W3DMPO_GLUE(RandomTextureMapperClass)
+	W3DMPO_CODE(RandomTextureMapperClass)
 public:
 	RandomTextureMapperClass(float fps, unsigned int stage);
 	RandomTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage);
@@ -466,7 +466,7 @@ class RandomTextureMapperClass : public TextureMapperClass
 */
 class BumpEnvTextureMapperClass : public LinearOffsetTextureMapperClass
 {
-	W3DMPO_GLUE(BumpEnvTextureMapperClass)
+	W3DMPO_CODE(BumpEnvTextureMapperClass)
 public:
 	BumpEnvTextureMapperClass(float rad_per_sec, float scale_factor, const Vector2 & offset_per_sec, const Vector2 &scale, unsigned int stage);
 	BumpEnvTextureMapperClass(INIClass &ini, const char *section, unsigned int stage);
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h
index f5961f7f51b..508f50b2203 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h
@@ -60,7 +60,7 @@
 */
 class MatrixMapperClass : public TextureMapperClass
 {
-	W3DMPO_GLUE(MatrixMapperClass)
+	W3DMPO_CODE(MatrixMapperClass)
 public:
 
 	enum {
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h
index 244883fe068..23341bc63d9 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h
@@ -65,9 +65,9 @@ struct VertexFormatXYZNDUV2;
 /**
 ** MeshClass -- Render3DObject for rendering meshes.
 */
-class MeshClass : public W3DMPO, public RenderObjClass
+class MeshClass : public RenderObjClass
 {
-	W3DMPO_GLUE(MeshClass)
+	W3DMPO_CODE(MeshClass)
 public:
 
 	MeshClass();
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h
index 1d04e255aba..e7e50b39aa2 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h
@@ -81,10 +81,8 @@ typedef Vector3i TriIndex;
 ** This class encapsulates the geometry data for a triangle mesh.
 */
 
-class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListObjectClass
+class MeshGeometryClass : public RefCountClass, public MultiListObjectClass
 {
-	//W3DMPO_GLUE(MeshGeometryClass)
-
 public:
 
 	MeshGeometryClass();
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h
index 61341f1d76b..de691b9d9ed 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h
@@ -57,9 +57,9 @@ class MeshModelClass;
 ** MeshMatDescClass - This class encapsulates all of the material description data for a mesh.
 ** WARNING: The vertex count and polygon count *MUST* be kept in sync with the mesh
 */
-class MeshMatDescClass : public W3DMPO
+class MeshMatDescClass
 {
-	W3DMPO_GLUE(MeshMatDescClass)
+	W3DMPO_CODE(MeshMatDescClass)
 public:
 
 	enum
@@ -72,7 +72,7 @@ class MeshMatDescClass : public W3DMPO
 
 	MeshMatDescClass();
 	MeshMatDescClass(const MeshMatDescClass & that);
-	virtual ~MeshMatDescClass() override;
+	~MeshMatDescClass();
 	void							Reset(int polycount,int vertcount,int passcount);
 	MeshMatDescClass &		operator = (const MeshMatDescClass & that);
 
@@ -230,7 +230,7 @@ class MeshMatDescClass : public W3DMPO
 */
 class MatBufferClass : public ShareBufferClass < VertexMaterialClass * >
 {
-	W3DMPO_GLUE(MatBufferClass)
+	W3DMPO_CODE(MatBufferClass)
 public:
 	MatBufferClass(int count, const char* msg) : ShareBufferClass<VertexMaterialClass *>(count, msg) { Clear(); }
 	MatBufferClass(const MatBufferClass & that);
@@ -252,7 +252,7 @@ class MatBufferClass : public ShareBufferClass < VertexMaterialClass * >
 */
 class TexBufferClass : public ShareBufferClass < TextureClass * >
 {
-	W3DMPO_GLUE(TexBufferClass)
+	W3DMPO_CODE(TexBufferClass)
 public:
 	TexBufferClass(int count, const char* msg) : ShareBufferClass<TextureClass *>(count, msg) { Clear(); }
 	TexBufferClass(const TexBufferClass & that);
@@ -274,7 +274,7 @@ class TexBufferClass : public ShareBufferClass < TextureClass * >
 */
 class UVBufferClass : public ShareBufferClass < Vector2 >
 {
-	W3DMPO_GLUE(UVBufferClass)
+	W3DMPO_CODE(UVBufferClass)
 public:
 	UVBufferClass(int count, const char* msg) : ShareBufferClass<Vector2>(count, msg), CRC(0xFFFFFFFF) { }
 	UVBufferClass(const UVBufferClass & that);
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h
index 82bf3df2884..cbc007a719c 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h
@@ -117,9 +117,9 @@ struct VertexFormatXYZNDUV2;
 ** GapFillerClass
 ** This class is used to generate gap-filling polygons for "N-Patched" meshes
 */
-class GapFillerClass : public W3DMPO
+class GapFillerClass
 {
-	W3DMPO_GLUE(GapFillerClass)
+	W3DMPO_CODE(GapFillerClass)
 
 	TriIndex* PolygonArray;
 	unsigned PolygonCount;
@@ -133,7 +133,7 @@ class GapFillerClass : public W3DMPO
 public:
 	GapFillerClass(MeshModelClass* mmc);
 	GapFillerClass(const GapFillerClass& that);
-	virtual ~GapFillerClass() override;
+	~GapFillerClass();
 
 	WWINLINE const TriIndex* Get_Polygon_Array() const { return PolygonArray; }
 	WWINLINE unsigned Get_Polygon_Count() const { return PolygonCount; }
@@ -147,7 +147,7 @@ class GapFillerClass : public W3DMPO
 
 class MeshModelClass : public MeshGeometryClass
 {
-	W3DMPO_GLUE(MeshModelClass)
+	W3DMPO_CODE(MeshModelClass)
 	GapFillerClass* GapFiller;
 
 public:
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
index 1c3377ddde6..28889da0c38 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
@@ -109,12 +109,12 @@
 ** will own the refs for the mesh.  The load context object is destroyed once
 ** loading is complete...
 */
-class MeshLoadContextClass : public W3DMPO
+class MeshLoadContextClass
 {
-	W3DMPO_GLUE(MeshLoadContextClass)
+	W3DMPO_CODE(MeshLoadContextClass)
 private:
 	MeshLoadContextClass();
-	virtual ~MeshLoadContextClass() override;
+	~MeshLoadContextClass();
 
 	W3dTexCoordStruct *		Get_Texcoord_Array();
 
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h
index c1dc763e043..ffb3f655f8b 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h
@@ -56,14 +56,14 @@ class Quaternion;
 
 ******************************************************************************/
 
-class MotionChannelClass : public W3DMPO
+class MotionChannelClass
 {
-	W3DMPO_GLUE(MotionChannelClass)
+	W3DMPO_CODE(MotionChannelClass)
 
 public:
 
 	MotionChannelClass();
-	virtual ~MotionChannelClass() override;
+	~MotionChannelClass();
 
 	bool	Load_W3D(ChunkLoadClass & cload);
 	WWINLINE int Get_Type() const { return Type; }
@@ -147,14 +147,14 @@ WWINLINE void MotionChannelClass::Get_Vector_As_Quat(int frame, Quaternion& quat
 
 ******************************************************************************/
 
-class BitChannelClass : public W3DMPO
+class BitChannelClass
 {
-	W3DMPO_GLUE(BitChannelClass)
+	W3DMPO_CODE(BitChannelClass)
 
 public:
 
 	BitChannelClass();
-	virtual ~BitChannelClass() override;
+	~BitChannelClass();
 
 	bool	Load_W3D(ChunkLoadClass & cload);
 	WWINLINE int	Get_Type() const { return Type; }
@@ -203,14 +203,14 @@ WWINLINE int BitChannelClass::Get_Bit(int frame) const
 
 ******************************************************************************/
 
-class TimeCodedMotionChannelClass : public W3DMPO
+class TimeCodedMotionChannelClass
 {
-	W3DMPO_GLUE(TimeCodedMotionChannelClass)
+	W3DMPO_CODE(TimeCodedMotionChannelClass)
 
 public:
 
 	TimeCodedMotionChannelClass();
-	virtual ~TimeCodedMotionChannelClass() override;
+	~TimeCodedMotionChannelClass();
 
 	bool	Load_W3D(ChunkLoadClass & cload);
 	int	Get_Type() { return Type; }
@@ -241,14 +241,14 @@ class TimeCodedMotionChannelClass : public W3DMPO
 	friend class HCompressedAnimClass;
 };
 
-class AdaptiveDeltaMotionChannelClass : public W3DMPO
+class AdaptiveDeltaMotionChannelClass
 {
-	W3DMPO_GLUE(AdaptiveDeltaMotionChannelClass)
+	W3DMPO_CODE(AdaptiveDeltaMotionChannelClass)
 
 public:
 
 	AdaptiveDeltaMotionChannelClass();
-	virtual ~AdaptiveDeltaMotionChannelClass() override;
+	~AdaptiveDeltaMotionChannelClass();
 
 	bool	Load_W3D(ChunkLoadClass & cload);
 	int	Get_Type() { return Type; }
@@ -290,14 +290,14 @@ class AdaptiveDeltaMotionChannelClass : public W3DMPO
 
 ******************************************************************************/
 
-class TimeCodedBitChannelClass : public W3DMPO
+class TimeCodedBitChannelClass
 {
-	W3DMPO_GLUE(TimeCodedBitChannelClass)
+	W3DMPO_CODE(TimeCodedBitChannelClass)
 
 public:
 
 	TimeCodedBitChannelClass();
-	virtual ~TimeCodedBitChannelClass() override;
+	~TimeCodedBitChannelClass();
 
 	bool	Load_W3D(ChunkLoadClass & cload);
 	int	Get_Type() { return Type; }
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h
index 5652c0e9de1..aebfccdc201 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h
@@ -60,9 +60,9 @@ class Null3DObjClass : public RenderObjClass
 };
 
 
-class NullPrototypeClass : public W3DMPO, public PrototypeClass
+class NullPrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(NullPrototypeClass)
+	W3DMPO_CODE(NullPrototypeClass)
 public:
 	NullPrototypeClass();
 	NullPrototypeClass(const W3dNullObjectStruct &null);
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h
index 72368f13138..9ff21bee7e7 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h
@@ -312,9 +312,9 @@ inline void ParticleEmitterDefClass::Set_Line_Texture_Mapping_Mode(int mode)
 //
 //	ParticleEmitterPrototypeClass
 //
-class ParticleEmitterPrototypeClass : public W3DMPO, public PrototypeClass
+class ParticleEmitterPrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(ParticleEmitterPrototypeClass)
+	W3DMPO_CODE(ParticleEmitterPrototypeClass)
 	public:
 
 		///////////////////////////////////////////////////////////
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h
index 57cf782d41c..62181ff591e 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h
@@ -90,12 +90,12 @@ class	Vector4;
 /*
 ** Render2DClass
 */
-class Render2DClass : public W3DMPO
+class Render2DClass
 {
-	W3DMPO_GLUE(Render2DClass)
+	W3DMPO_CODE(Render2DClass)
 public:
 	Render2DClass( TextureClass* tex = nullptr );
-	virtual ~Render2DClass() override;
+	virtual ~Render2DClass();
 
 	virtual	void	Reset();
 	void	Render();
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp
index 4b82a5d7ebd..e2ba6fbd2ec 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp
@@ -214,7 +214,7 @@ void Sort (
 
 class SortingNodeStruct : public DLNodeClass<SortingNodeStruct>
 {
-	W3DMPO_GLUE(SortingNodeStruct)
+	W3DMPO_CODE(SortingNodeStruct)
 
 public:
 	RenderStateStruct sorting_state;
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp
index 097d42441e2..59eeeab4434 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp
@@ -53,9 +53,9 @@ static unsigned int unique=1;
 VertexMaterialClass* VertexMaterialClass::Presets[VertexMaterialClass::PRESET_COUNT];
 
 #ifdef DYN_MAT8
-class DynD3DMATERIAL8 : public W3DMPO
+class DynD3DMATERIAL8
 {
-	W3DMPO_GLUE(DynD3DMATERIAL8)
+	W3DMPO_CODE(DynD3DMATERIAL8)
 public:
 	D3DMATERIAL8 Mat;
 };
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h
index 9540ffc28c8..2d9e204859e 100644
--- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h
+++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h
@@ -60,9 +60,9 @@ struct _D3DMATERIAL8;
 ** This is simply the typical W3D thin-wrapper around the surrender vertex material.
 ** The vertex material defines things like the lighting properties of a vertex.
 */
-class VertexMaterialClass : public W3DMPO, public RefCountClass
+class VertexMaterialClass : public RefCountClass
 {
-	W3DMPO_GLUE(VertexMaterialClass)
+	W3DMPO_CODE(VertexMaterialClass)
 
 	friend DX8Wrapper;
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h
index 47cd00273a9..81dad2c0215 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h
@@ -129,9 +129,9 @@ inline void BoxRenderObjClass::Set_Local_Min_Max(const Vector3 & min,const Vecto
 /*
 ** AABoxRenderObjClass -- RenderObject for axis-aligned collision boxes.
 */
-class AABoxRenderObjClass : public W3DMPO, public BoxRenderObjClass
+class AABoxRenderObjClass : public BoxRenderObjClass
 {
-	W3DMPO_GLUE(AABoxRenderObjClass)
+	W3DMPO_CODE(AABoxRenderObjClass)
 public:
 
 	AABoxRenderObjClass();
@@ -180,9 +180,9 @@ inline const AABoxClass & AABoxRenderObjClass::Get_Box()
 /*
 ** OBBoxRenderObjClass - render object for oriented collision boxes
 */
-class OBBoxRenderObjClass : public W3DMPO, public BoxRenderObjClass
+class OBBoxRenderObjClass : public BoxRenderObjClass
 {
-	W3DMPO_GLUE(OBBoxRenderObjClass)
+	W3DMPO_CODE(OBBoxRenderObjClass)
 public:
 
 	OBBoxRenderObjClass();
@@ -237,9 +237,9 @@ class BoxLoaderClass : public PrototypeLoaderClass
 /*
 ** Prototype for Box objects
 */
-class BoxPrototypeClass : public W3DMPO, public PrototypeClass
+class BoxPrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(BoxPrototypeClass)
+	W3DMPO_CODE(BoxPrototypeClass)
 public:
 	BoxPrototypeClass(W3dBoxStruct box);
 	virtual const char *				Get_Name() const override;
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h
index 4fdc4408672..1afc4bc1d71 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h
@@ -353,9 +353,9 @@ class DazzleVisibilityClass
 ** information needed to construct a particular instance of a dazzle.  Prototypes are
 ** stored in the asset manager and used to construct render objects when needed.
 */
-class DazzlePrototypeClass : public W3DMPO, public PrototypeClass
+class DazzlePrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(DazzlePrototypeClass)
+	W3DMPO_CODE(DazzlePrototypeClass)
 public:
 	DazzlePrototypeClass() : DazzleType(0)				{ }
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h
index 1e0dde9298f..ece477309ec 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h
@@ -244,9 +244,9 @@ struct VertexFormatXYZNDCUBEMAP
 // FVF info class can be created for any legal FVF. It constructs information
 // of offsets to various elements in the vertex buffer.
 
-class FVFInfoClass : public W3DMPO
+class FVFInfoClass
 {
-	W3DMPO_GLUE(FVFInfoClass)
+	W3DMPO_CODE(FVFInfoClass)
 
 	mutable unsigned						FVF;
 	mutable unsigned						fvf_size;
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h
index 02a112a4448..7b20cd3db73 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h
@@ -50,10 +50,8 @@ class SortingIndexBufferClass;
 
 // ----------------------------------------------------------------------------
 
-class IndexBufferClass : public W3DMPO, public RefCountClass
+class IndexBufferClass : public RefCountClass
 {
-	// nope, it's an ABC
-	//W3DMPO_GLUE(IndexBufferClass)
 protected:
 	virtual ~IndexBufferClass() override;
 public:
@@ -105,9 +103,9 @@ class IndexBufferClass : public W3DMPO, public RefCountClass
 
 // HY 2/14/01
 // Created
-class DynamicIBAccessClass : public W3DMPO
+class DynamicIBAccessClass
 {
-	W3DMPO_GLUE(DynamicIBAccessClass)
+	W3DMPO_CODE(DynamicIBAccessClass)
 
 	friend DX8Wrapper;
 	friend SortingRendererClass;
@@ -122,7 +120,7 @@ class DynamicIBAccessClass : public W3DMPO
 
 public:
 	DynamicIBAccessClass(unsigned short type, unsigned short index_count);
-	virtual ~DynamicIBAccessClass() override;
+	~DynamicIBAccessClass();
 
 	unsigned Get_Type() const { return Type; }
 	unsigned short Get_Index_Count() const { return IndexCount; }
@@ -155,7 +153,7 @@ class DynamicIBAccessClass : public W3DMPO
 */
 class DX8IndexBufferClass : public IndexBufferClass
 {
-	W3DMPO_GLUE(DX8IndexBufferClass)
+	W3DMPO_CODE(DX8IndexBufferClass)
 
 	friend IndexBufferClass::WriteLockClass;
 	friend IndexBufferClass::AppendLockClass;
@@ -183,7 +181,7 @@ class DX8IndexBufferClass : public IndexBufferClass
 
 class SortingIndexBufferClass : public IndexBufferClass
 {
-	W3DMPO_GLUE(SortingIndexBufferClass)
+	W3DMPO_CODE(SortingIndexBufferClass)
 
 	friend DX8Wrapper;
 	friend SortingRendererClass;
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h
index 8694a867cdf..264caa33840 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h
@@ -73,11 +73,8 @@ class VertexBufferLockClass
 ** DX8VertexBufferClass
 ** This class wraps a DX8 vertex buffer.  Use the lock objects to modify or append to the vertex buffer.
 */
-class VertexBufferClass : public W3DMPO, public RefCountClass
+class VertexBufferClass : public RefCountClass
 {
-	// nope, an ABC
-	//W3DMPO_GLUE(VertexBufferClass)
-
 protected:
 	VertexBufferClass(unsigned type, unsigned FVF, unsigned short VertexCount);
 	virtual ~VertexBufferClass() override;
@@ -200,7 +197,7 @@ inline VertexFormatXYZNDUV2 * DynamicVBAccessClass::WriteLockClass::Get_Formatte
 */
 class DX8VertexBufferClass : public VertexBufferClass
 {
-	W3DMPO_GLUE(DX8VertexBufferClass)
+	W3DMPO_CODE(DX8VertexBufferClass)
 protected:
 	virtual ~DX8VertexBufferClass() override;
 public:
@@ -239,7 +236,7 @@ class DX8VertexBufferClass : public VertexBufferClass
 */
 class SortingVertexBufferClass : public VertexBufferClass
 {
-	W3DMPO_GLUE(SortingVertexBufferClass)
+	W3DMPO_CODE(SortingVertexBufferClass)
 
 	friend DX8Wrapper;
 	friend SortingRendererClass;
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
index f9d19777468..9066f1f1986 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
@@ -182,9 +182,9 @@ class ProxyRecordClass
 ** This is a ref-counted list of proxy objects.  It is generated whenever an HLODdef contains
 ** proxies.  Each instantiated HLOD simply add-refs a pointer to the single list.
 */
-class ProxyArrayClass : public W3DMPO, public VectorClass<ProxyRecordClass>, public RefCountClass
+class ProxyArrayClass : public VectorClass<ProxyRecordClass>, public RefCountClass
 {
-	W3DMPO_GLUE(ProxyArrayClass)
+	W3DMPO_CODE(ProxyArrayClass)
 public:
 	ProxyArrayClass(int size) : VectorClass<ProxyRecordClass>(size)
 	{
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h
index 49d85036081..bfb1fdd6972 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h
@@ -59,9 +59,9 @@ class ProxyArrayClass;
 	This is an hierarchical, animatable level-of-detail model.
 
 */
-class HLodClass : public W3DMPO, public Animatable3DObjClass
+class HLodClass : public Animatable3DObjClass
 {
-	W3DMPO_GLUE(HLodClass)
+	W3DMPO_CODE(HLodClass)
 public:
 
 	HLodClass(const HLodClass & src);
@@ -277,14 +277,14 @@ class HLodLoaderClass : public PrototypeLoaderClass
 ** This description object is generated when reading a W3D_CHUNK_HLOD.  It
 ** directly describes the contents of an HLod model.
 */
-class HLodDefClass : public W3DMPO
+class HLodDefClass
 {
-	W3DMPO_GLUE(HLodDefClass)
+	W3DMPO_CODE(HLodDefClass)
 public:
 
 	HLodDefClass();
 	HLodDefClass(HLodClass &src_lod);
-	virtual ~HLodDefClass() override;
+	~HLodDefClass();
 
 	WW3DErrorType				Load_W3D(ChunkLoadClass & cload);
 	WW3DErrorType				Save(ChunkSaveClass & csave);
@@ -343,9 +343,9 @@ class HLodDefClass : public W3DMPO
 /*
 ** Prototype for HLod objects
 */
-class HLodPrototypeClass : public W3DMPO, public PrototypeClass
+class HLodPrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(HLodPrototypeClass)
+	W3DMPO_CODE(HLodPrototypeClass)
 public:
 	HLodPrototypeClass( HLodDefClass *def )					{ Definition = def; }
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h
index 1b2c6d5047b..3ce443e5c55 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h
@@ -53,7 +53,7 @@ class INIClass;
 ** TextureMapperClass
 ** Base class for all texture mappers.
 */
-class TextureMapperClass : public W3DMPO, public RefCountClass
+class TextureMapperClass : public RefCountClass
 {
 	public:
 
@@ -113,7 +113,7 @@ class TextureMapperClass : public W3DMPO, public RefCountClass
 */
 class ScaleTextureMapperClass : public TextureMapperClass
 {
-	W3DMPO_GLUE(ScaleTextureMapperClass)
+	W3DMPO_CODE(ScaleTextureMapperClass)
 public:
 	ScaleTextureMapperClass(const Vector2 &scale, unsigned int stage);
 	ScaleTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage);
@@ -136,7 +136,7 @@ class ScaleTextureMapperClass : public TextureMapperClass
 */
 class LinearOffsetTextureMapperClass : public ScaleTextureMapperClass
 {
-	W3DMPO_GLUE(LinearOffsetTextureMapperClass)
+	W3DMPO_CODE(LinearOffsetTextureMapperClass)
 public:
 	LinearOffsetTextureMapperClass(const Vector2 &offset_per_sec, const Vector2 & start_offset,
 		bool clamp_fix, const Vector2 &scale, unsigned int stage);
@@ -179,7 +179,7 @@ class LinearOffsetTextureMapperClass : public ScaleTextureMapperClass
 */
 class GridTextureMapperClass : public TextureMapperClass
 {
-	W3DMPO_GLUE(GridTextureMapperClass)
+	W3DMPO_CODE(GridTextureMapperClass)
 public:
 	GridTextureMapperClass(float fps, unsigned int gridwidth_log2, unsigned int last_frame, unsigned int offset, unsigned int stage);
 	GridTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage);
@@ -223,7 +223,7 @@ class GridTextureMapperClass : public TextureMapperClass
 */
 class RotateTextureMapperClass : public ScaleTextureMapperClass
 {
-	W3DMPO_GLUE(RotateTextureMapperClass)
+	W3DMPO_CODE(RotateTextureMapperClass)
 public:
 	RotateTextureMapperClass(float rad_per_sec, const Vector2& center, const Vector2 &scale, unsigned int stage);
 	RotateTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage);
@@ -250,7 +250,7 @@ class RotateTextureMapperClass : public ScaleTextureMapperClass
 */
 class SineLinearOffsetTextureMapperClass : public ScaleTextureMapperClass
 {
-	W3DMPO_GLUE(SineLinearOffsetTextureMapperClass)
+	W3DMPO_CODE(SineLinearOffsetTextureMapperClass)
 public:
 	SineLinearOffsetTextureMapperClass(const Vector3 &uafp, const Vector3 &vafp, const Vector2 &scale, unsigned int stage);
 	SineLinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage);
@@ -277,7 +277,7 @@ class SineLinearOffsetTextureMapperClass : public ScaleTextureMapperClass
 */
 class StepLinearOffsetTextureMapperClass : public ScaleTextureMapperClass
 {
-	W3DMPO_GLUE(StepLinearOffsetTextureMapperClass)
+	W3DMPO_CODE(StepLinearOffsetTextureMapperClass)
 public:
 	StepLinearOffsetTextureMapperClass(const Vector2 &step, float steps_per_sec, bool clamp_fix,
 		const Vector2 &scale, unsigned int stage);
@@ -307,7 +307,7 @@ class StepLinearOffsetTextureMapperClass : public ScaleTextureMapperClass
 */
 class ZigZagLinearOffsetTextureMapperClass : public ScaleTextureMapperClass
 {
-	W3DMPO_GLUE(ZigZagLinearOffsetTextureMapperClass)
+	W3DMPO_CODE(ZigZagLinearOffsetTextureMapperClass)
 public:
 	ZigZagLinearOffsetTextureMapperClass(const Vector2 &speed, float period, const Vector2 &scale, unsigned int stage);
 	ZigZagLinearOffsetTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage);
@@ -338,7 +338,7 @@ class ZigZagLinearOffsetTextureMapperClass : public ScaleTextureMapperClass
 
 class ClassicEnvironmentMapperClass : public TextureMapperClass
 {
-	W3DMPO_GLUE(ClassicEnvironmentMapperClass)
+	W3DMPO_CODE(ClassicEnvironmentMapperClass)
 public:
 	ClassicEnvironmentMapperClass(unsigned int stage) : TextureMapperClass(stage) { }
 	ClassicEnvironmentMapperClass(const ClassicEnvironmentMapperClass & src) : TextureMapperClass(src) { }
@@ -351,7 +351,7 @@ class ClassicEnvironmentMapperClass : public TextureMapperClass
 
 class EnvironmentMapperClass : public TextureMapperClass
 {
-	W3DMPO_GLUE(EnvironmentMapperClass)
+	W3DMPO_CODE(EnvironmentMapperClass)
 public:
 	EnvironmentMapperClass(unsigned int stage) : TextureMapperClass(stage) { }
 	EnvironmentMapperClass(const EnvironmentMapperClass & src) : TextureMapperClass(src) { }
@@ -364,7 +364,7 @@ class EnvironmentMapperClass : public TextureMapperClass
 
 class EdgeMapperClass : public TextureMapperClass
 {
-	W3DMPO_GLUE(EdgeMapperClass)
+	W3DMPO_CODE(EdgeMapperClass)
 public:
 	EdgeMapperClass(unsigned int stage);
 	EdgeMapperClass(const INIClass &ini, const char *section, unsigned int stage);
@@ -398,7 +398,7 @@ class WSEnvMapperClass : public TextureMapperClass
 
 class WSClassicEnvironmentMapperClass : public WSEnvMapperClass
 {
-	W3DMPO_GLUE(WSClassicEnvironmentMapperClass)
+	W3DMPO_CODE(WSClassicEnvironmentMapperClass)
 public:
 	WSClassicEnvironmentMapperClass(AxisType axis, unsigned int stage) : WSEnvMapperClass(axis, stage) { }
 	WSClassicEnvironmentMapperClass(const WSClassicEnvironmentMapperClass & src) : WSEnvMapperClass(src) { }
@@ -410,7 +410,7 @@ class WSClassicEnvironmentMapperClass : public WSEnvMapperClass
 
 class WSEnvironmentMapperClass : public WSEnvMapperClass
 {
-	W3DMPO_GLUE(WSEnvironmentMapperClass)
+	W3DMPO_CODE(WSEnvironmentMapperClass)
 public:
 	WSEnvironmentMapperClass(AxisType axis, unsigned int stage) : WSEnvMapperClass(axis, stage) { }
 	WSEnvironmentMapperClass(const WSClassicEnvironmentMapperClass & src) : WSEnvMapperClass(src) { }
@@ -422,7 +422,7 @@ class WSEnvironmentMapperClass : public WSEnvMapperClass
 
 class GridClassicEnvironmentMapperClass : public GridTextureMapperClass
 {
-	W3DMPO_GLUE(GridClassicEnvironmentMapperClass)
+	W3DMPO_CODE(GridClassicEnvironmentMapperClass)
 public:
 	GridClassicEnvironmentMapperClass(float fps, unsigned int gridwidth_log2, unsigned int last_frame, unsigned int offset, unsigned int stage) : GridTextureMapperClass(fps, gridwidth_log2, last_frame, offset, stage) { }
 	GridClassicEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : GridTextureMapperClass(ini, section, stage) { }
@@ -436,7 +436,7 @@ class GridClassicEnvironmentMapperClass : public GridTextureMapperClass
 
 class GridEnvironmentMapperClass : public GridTextureMapperClass
 {
-	W3DMPO_GLUE(GridEnvironmentMapperClass)
+	W3DMPO_CODE(GridEnvironmentMapperClass)
 public:
 	GridEnvironmentMapperClass(float fps, unsigned int gridwidth_log2, unsigned int last_frame, unsigned int offset, unsigned int stage) : GridTextureMapperClass(fps, gridwidth_log2, last_frame, offset, stage) { }
 	GridEnvironmentMapperClass(const INIClass &ini, const char *section, unsigned int stage) : GridTextureMapperClass(ini, section, stage) { }
@@ -456,7 +456,7 @@ class GridEnvironmentMapperClass : public GridTextureMapperClass
 // ----------------------------------------------------------------------------
 class ScreenMapperClass : public LinearOffsetTextureMapperClass
 {
-	W3DMPO_GLUE(ScreenMapperClass)
+	W3DMPO_CODE(ScreenMapperClass)
 public:
 	ScreenMapperClass(const Vector2 &offset_per_sec, const Vector2 & start_offset, bool clamp_fix,
 		const Vector2 &scale, unsigned int stage) : LinearOffsetTextureMapperClass(offset_per_sec, start_offset, clamp_fix, scale, stage) { }
@@ -474,7 +474,7 @@ class ScreenMapperClass : public LinearOffsetTextureMapperClass
 */
 class RandomTextureMapperClass : public ScaleTextureMapperClass
 {
-	W3DMPO_GLUE(RandomTextureMapperClass)
+	W3DMPO_CODE(RandomTextureMapperClass)
 public:
 	RandomTextureMapperClass(float fps, const Vector2 &scale, unsigned int stage);
 	RandomTextureMapperClass(const INIClass &ini, const char *section, unsigned int stage);
@@ -505,7 +505,7 @@ class RandomTextureMapperClass : public ScaleTextureMapperClass
 */
 class BumpEnvTextureMapperClass : public LinearOffsetTextureMapperClass
 {
-	W3DMPO_GLUE(BumpEnvTextureMapperClass)
+	W3DMPO_CODE(BumpEnvTextureMapperClass)
 public:
 	BumpEnvTextureMapperClass(float rad_per_sec, float scale_factor, const Vector2 & offset_per_sec,
 		const Vector2 & start_offset, bool clamp_fix, const Vector2 &scale, unsigned int stage);
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h
index 935ebce02de..6f62ae9e125 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h
@@ -60,7 +60,7 @@
 */
 class MatrixMapperClass : public TextureMapperClass
 {
-	W3DMPO_GLUE(MatrixMapperClass)
+	W3DMPO_CODE(MatrixMapperClass)
 public:
 
 	enum {
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h
index d248a1f9a6b..ae67cd6bc14 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h
@@ -65,9 +65,9 @@ struct VertexFormatXYZNDUV2;
 /**
 ** MeshClass -- Render3DObject for rendering meshes.
 */
-class MeshClass : public W3DMPO, public RenderObjClass
+class MeshClass : public RenderObjClass
 {
-	W3DMPO_GLUE(MeshClass)
+	W3DMPO_CODE(MeshClass)
 public:
 
 	MeshClass();
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h
index 37db2d915c7..68a99ef51a3 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h
@@ -83,10 +83,8 @@ typedef Vector3i16 TriIndex;
 ** This class encapsulates the geometry data for a triangle mesh.
 */
 
-class MeshGeometryClass : public W3DMPO, public RefCountClass, public MultiListObjectClass
+class MeshGeometryClass : public RefCountClass, public MultiListObjectClass
 {
-	//W3DMPO_GLUE(MeshGeometryClass)
-
 public:
 
 	MeshGeometryClass();
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h
index 3c96ccbf0e2..c0acb113c0b 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h
@@ -57,9 +57,9 @@ class MeshModelClass;
 ** MeshMatDescClass - This class encapsulates all of the material description data for a mesh.
 ** WARNING: The vertex count and polygon count *MUST* be kept in sync with the mesh
 */
-class MeshMatDescClass : public W3DMPO
+class MeshMatDescClass
 {
-	W3DMPO_GLUE(MeshMatDescClass)
+	W3DMPO_CODE(MeshMatDescClass)
 public:
 
 	enum
@@ -72,7 +72,7 @@ class MeshMatDescClass : public W3DMPO
 
 	MeshMatDescClass();
 	MeshMatDescClass(const MeshMatDescClass & that);
-	virtual ~MeshMatDescClass() override;
+	~MeshMatDescClass();
 	void							Reset(int polycount,int vertcount,int passcount);
 	MeshMatDescClass &		operator = (const MeshMatDescClass & that);
 
@@ -230,7 +230,7 @@ class MeshMatDescClass : public W3DMPO
 */
 class MatBufferClass : public ShareBufferClass < VertexMaterialClass * >
 {
-	W3DMPO_GLUE(MatBufferClass)
+	W3DMPO_CODE(MatBufferClass)
 public:
 	MatBufferClass(int count, const char* msg) : ShareBufferClass<VertexMaterialClass *>(count, msg) { Clear(); }
 	MatBufferClass(const MatBufferClass & that);
@@ -252,7 +252,7 @@ class MatBufferClass : public ShareBufferClass < VertexMaterialClass * >
 */
 class TexBufferClass : public ShareBufferClass < TextureClass * >
 {
-	W3DMPO_GLUE(TexBufferClass)
+	W3DMPO_CODE(TexBufferClass)
 public:
 	TexBufferClass(int count, const char* msg) : ShareBufferClass<TextureClass *>(count, msg) { Clear(); }
 	TexBufferClass(const TexBufferClass & that);
@@ -274,7 +274,7 @@ class TexBufferClass : public ShareBufferClass < TextureClass * >
 */
 class UVBufferClass : public ShareBufferClass < Vector2 >
 {
-	W3DMPO_GLUE(UVBufferClass)
+	W3DMPO_CODE(UVBufferClass)
 public:
 	UVBufferClass(int count, const char* msg) : ShareBufferClass<Vector2>(count, msg), CRC(0xFFFFFFFF) { }
 	UVBufferClass(const UVBufferClass & that);
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h
index 50d20fe9bdf..86fc55e767c 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h
@@ -117,9 +117,9 @@ struct VertexFormatXYZNDUV2;
 ** GapFillerClass
 ** This class is used to generate gap-filling polygons for "N-Patched" meshes
 */
-class GapFillerClass : public W3DMPO
+class GapFillerClass
 {
-	W3DMPO_GLUE(GapFillerClass)
+	W3DMPO_CODE(GapFillerClass)
 
 	TriIndex* PolygonArray;
 	unsigned PolygonCount;
@@ -133,7 +133,7 @@ class GapFillerClass : public W3DMPO
 public:
 	GapFillerClass(MeshModelClass* mmc);
 	GapFillerClass(const GapFillerClass& that);
-	virtual ~GapFillerClass() override;
+	~GapFillerClass();
 
 	WWINLINE const TriIndex* Get_Polygon_Array() const { return PolygonArray; }
 	WWINLINE unsigned Get_Polygon_Count() const { return PolygonCount; }
@@ -147,7 +147,7 @@ class GapFillerClass : public W3DMPO
 
 class MeshModelClass : public MeshGeometryClass
 {
-	W3DMPO_GLUE(MeshModelClass)
+	W3DMPO_CODE(MeshModelClass)
 
 public:
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
index 41115be07bc..0ef86f0e6c2 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
@@ -109,12 +109,12 @@
 ** will own the refs for the mesh.  The load context object is destroyed once
 ** loading is complete...
 */
-class MeshLoadContextClass : public W3DMPO
+class MeshLoadContextClass
 {
-	W3DMPO_GLUE(MeshLoadContextClass)
+	W3DMPO_CODE(MeshLoadContextClass)
 private:
 	MeshLoadContextClass();
-	virtual ~MeshLoadContextClass() override;
+	~MeshLoadContextClass();
 
 	W3dTexCoordStruct *		Get_Texcoord_Array();
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h
index 067708080f5..4e6214ab2b6 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h
@@ -55,16 +55,16 @@ class Quaternion;
 
 ******************************************************************************/
 
-class MotionChannelClass : public W3DMPO
+class MotionChannelClass
 {
-	W3DMPO_GLUE(MotionChannelClass)
+	W3DMPO_CODE(MotionChannelClass)
 
 public:
 	void Do_Data_Compression(int datasize);
 	void Get_Vector(int frame,float * setvec) const;
 
 	MotionChannelClass();
-	virtual ~MotionChannelClass() override;
+	~MotionChannelClass();
 
 	bool	Load_W3D(ChunkLoadClass & cload);
 	WWINLINE int Get_Type() const { return Type; }
@@ -152,14 +152,14 @@ WWINLINE void MotionChannelClass::Get_Vector_As_Quat(int frame, Quaternion& quat
 
 ******************************************************************************/
 
-class BitChannelClass : public W3DMPO
+class BitChannelClass
 {
-	W3DMPO_GLUE(BitChannelClass)
+	W3DMPO_CODE(BitChannelClass)
 
 public:
 
 	BitChannelClass();
-	virtual ~BitChannelClass() override;
+	~BitChannelClass();
 
 	bool	Load_W3D(ChunkLoadClass & cload);
 	WWINLINE int	Get_Type() const { return Type; }
@@ -208,14 +208,14 @@ WWINLINE int BitChannelClass::Get_Bit(int frame) const
 
 ******************************************************************************/
 
-class TimeCodedMotionChannelClass : public W3DMPO
+class TimeCodedMotionChannelClass
 {
-	W3DMPO_GLUE(TimeCodedMotionChannelClass)
+	W3DMPO_CODE(TimeCodedMotionChannelClass)
 
 public:
 
 	TimeCodedMotionChannelClass();
-	virtual ~TimeCodedMotionChannelClass() override;
+	~TimeCodedMotionChannelClass();
 
 	bool	Load_W3D(ChunkLoadClass & cload);
 	int	Get_Type() { return Type; }
@@ -246,14 +246,14 @@ class TimeCodedMotionChannelClass : public W3DMPO
 	friend class HCompressedAnimClass;
 };
 
-class AdaptiveDeltaMotionChannelClass : public W3DMPO
+class AdaptiveDeltaMotionChannelClass
 {
-	W3DMPO_GLUE(AdaptiveDeltaMotionChannelClass)
+	W3DMPO_CODE(AdaptiveDeltaMotionChannelClass)
 
 public:
 
 	AdaptiveDeltaMotionChannelClass();
-	virtual ~AdaptiveDeltaMotionChannelClass() override;
+	~AdaptiveDeltaMotionChannelClass();
 
 	bool	Load_W3D(ChunkLoadClass & cload);
 	int	Get_Type() { return Type; }
@@ -295,14 +295,14 @@ class AdaptiveDeltaMotionChannelClass : public W3DMPO
 
 ******************************************************************************/
 
-class TimeCodedBitChannelClass : public W3DMPO
+class TimeCodedBitChannelClass
 {
-	W3DMPO_GLUE(TimeCodedBitChannelClass)
+	W3DMPO_CODE(TimeCodedBitChannelClass)
 
 public:
 
 	TimeCodedBitChannelClass();
-	virtual ~TimeCodedBitChannelClass() override;
+	~TimeCodedBitChannelClass();
 
 	bool	Load_W3D(ChunkLoadClass & cload);
 	int	Get_Type() { return Type; }
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h
index fcd16c43eb1..08eaf76fbff 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h
@@ -60,9 +60,9 @@ class Null3DObjClass : public RenderObjClass
 };
 
 
-class NullPrototypeClass : public W3DMPO, public PrototypeClass
+class NullPrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(NullPrototypeClass)
+	W3DMPO_CODE(NullPrototypeClass)
 public:
 	NullPrototypeClass();
 	NullPrototypeClass(const W3dNullObjectStruct &null);
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h
index ee5ee16c56e..7c088c897b8 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h
@@ -317,9 +317,9 @@ inline void ParticleEmitterDefClass::Set_Line_Texture_Mapping_Mode(int mode)
 //
 //	ParticleEmitterPrototypeClass
 //
-class ParticleEmitterPrototypeClass : public W3DMPO, public PrototypeClass
+class ParticleEmitterPrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(ParticleEmitterPrototypeClass)
+	W3DMPO_CODE(ParticleEmitterPrototypeClass)
 	public:
 
 		///////////////////////////////////////////////////////////
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h
index efafbef9043..98f78181c3d 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h
@@ -91,12 +91,12 @@ class	Vector4;
 /*
 ** Render2DClass
 */
-class Render2DClass : public W3DMPO
+class Render2DClass
 {
-	W3DMPO_GLUE(Render2DClass)
+	W3DMPO_CODE(Render2DClass)
 public:
 	Render2DClass( TextureClass* tex = nullptr );
-	virtual ~Render2DClass() override;
+	virtual ~Render2DClass();
 
 	virtual	void	Reset();
 	void	Render();
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp
index bc855b2d529..f64b5da1636 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp
@@ -152,7 +152,7 @@ void Sort(TempIndexStruct *begin, TempIndexStruct *end)
 
 class SortingNodeStruct : public DLNodeClass<SortingNodeStruct>
 {
-	W3DMPO_GLUE(SortingNodeStruct)
+	W3DMPO_CODE(SortingNodeStruct)
 
 public:
 	RenderStateStruct sorting_state;
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp
index 89ef5f06fbe..8cfcd703611 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp
@@ -53,9 +53,9 @@ static unsigned int unique=1;
 VertexMaterialClass* VertexMaterialClass::Presets[VertexMaterialClass::PRESET_COUNT];
 
 #ifdef DYN_MAT8
-class DynD3DMATERIAL8 : public W3DMPO
+class DynD3DMATERIAL8
 {
-	W3DMPO_GLUE(DynD3DMATERIAL8)
+	W3DMPO_CODE(DynD3DMATERIAL8)
 public:
 	D3DMATERIAL8 Mat;
 };
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h
index 4a3f6f92441..7323e285c93 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h
@@ -60,9 +60,9 @@ struct _D3DMATERIAL8;
 ** This is simply the typical W3D thin-wrapper around the surrender vertex material.
 ** The vertex material defines things like the lighting properties of a vertex.
 */
-class VertexMaterialClass : public W3DMPO, public RefCountClass
+class VertexMaterialClass : public RefCountClass
 {
-	W3DMPO_GLUE(VertexMaterialClass)
+	W3DMPO_CODE(VertexMaterialClass)
 
 	friend DX8Wrapper;