diff --git a/Engine/source/T3D/shapeBase.cpp b/Engine/source/T3D/shapeBase.cpp
index e5266b855..1cc2cc2d4 100644
--- a/Engine/source/T3D/shapeBase.cpp
+++ b/Engine/source/T3D/shapeBase.cpp
@@ -40,7 +40,6 @@
 #include "scene/sceneRenderState.h"
 #include "scene/sceneObjectLightingPlugin.h"
 #include "T3D/fx/explosion.h"
-#include "T3D/fx/particleEmitter.h"
 #include "T3D/fx/cameraFXMgr.h"
 #include "environment/waterBlock.h"
 #include "T3D/debris.h"
diff --git a/Engine/source/T3D/shapeBase.h b/Engine/source/T3D/shapeBase.h
index 55499a8e7..16e934439 100644
--- a/Engine/source/T3D/shapeBase.h
+++ b/Engine/source/T3D/shapeBase.h
@@ -63,6 +63,8 @@
    #include "console/dynamicTypes.h"
 #endif
 
+// Need full definition visible for SimObjectPtr<ParticleEmitter>
+#include "T3D/fx/particleEmitter.h"
 
 class GFXCubemap;
 class TSShapeInstance;
@@ -70,8 +72,6 @@ class SceneRenderState;
 class TSThread;
 class GameConnection;
 struct CameraScopeQuery;
-class ParticleEmitter;
-class ParticleEmitterData;
 class ProjectileData;
 class ExplosionData;
 struct DebrisData;
diff --git a/Engine/source/gui/worldEditor/undoActions.h b/Engine/source/gui/worldEditor/undoActions.h
index 66e8df5ef..48475647c 100644
--- a/Engine/source/gui/worldEditor/undoActions.h
+++ b/Engine/source/gui/worldEditor/undoActions.h
@@ -30,7 +30,9 @@
 #include "console/simObjectMemento.h"
 #endif
 
-class GuiInspectorField;
+// Need full definition visible for SimObjectPtr<GuiInspectorField>
+#include "gui/editor/inspector/field.h"
+
 class GuiInspector;
 
 class MECreateUndoAction : public UndoAction