diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index 44420792..165ea3c5 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -1,5 +1,6 @@
 #include "isleapp.h"
 
+#include "3dmanager/lego3dmanager.h"
 #include "decomp.h"
 #include "legoanimationmanager.h"
 #include "legobuildingmanager.h"
@@ -12,6 +13,7 @@
 #include "legoworldpresenter.h"
 #include "misc.h"
 #include "mxbackgroundaudiomanager.h"
+#include "mxdirectx/mxdirect3d.h"
 #include "mxdsaction.h"
 #include "mxmisc.h"
 #include "mxomnicreateflags.h"
@@ -21,6 +23,7 @@
 #include "mxtimer.h"
 #include "mxtransitionmanager.h"
 #include "res/resource.h"
+#include "roi/legoroi.h"
 #include "viewmanager/viewmanager.h"
 
 #include <dsound.h>
diff --git a/LEGO1/lego/legoomni/include/act1state.h b/LEGO1/lego/legoomni/include/act1state.h
index db99ec6a..dcc09959 100644
--- a/LEGO1/lego/legoomni/include/act1state.h
+++ b/LEGO1/lego/legoomni/include/act1state.h
@@ -1,9 +1,9 @@
 #ifndef ACT1STATE_H
 #define ACT1STATE_H
 
-#include "legonamedtexture.h"
 #include "legostate.h"
-#include "roi/legoroi.h"
+
+class LegoNamedTexture;
 
 // VTABLE: LEGO1 0x100d7028
 // SIZE 0x26c
diff --git a/LEGO1/lego/legoomni/include/ambulance.h b/LEGO1/lego/legoomni/include/ambulance.h
index 99615f9e..1aff83a0 100644
--- a/LEGO1/lego/legoomni/include/ambulance.h
+++ b/LEGO1/lego/legoomni/include/ambulance.h
@@ -1,9 +1,10 @@
 #ifndef AMBULANCE_H
 #define AMBULANCE_H
 
-#include "ambulancemissionstate.h"
 #include "islepathactor.h"
 
+class AmbulanceMissionState;
+
 // VTABLE: LEGO1 0x100d71a8
 // SIZE 0x184
 class Ambulance : public IslePathActor {
diff --git a/LEGO1/lego/legoomni/include/gasstation.h b/LEGO1/lego/legoomni/include/gasstation.h
index 9071aba5..c6dd28d5 100644
--- a/LEGO1/lego/legoomni/include/gasstation.h
+++ b/LEGO1/lego/legoomni/include/gasstation.h
@@ -2,12 +2,13 @@
 #define GASSTATION_H
 
 #include "decomp.h"
-#include "gasstationstate.h"
 #include "legogamestate.h"
 #include "legoworld.h"
-#include "mxstillpresenter.h"
 #include "radio.h"
 
+class GasStationState;
+class MxStillPresenter;
+
 // VTABLE: LEGO1 0x100d4650
 // SIZE 0x128
 class GasStation : public LegoWorld {
diff --git a/LEGO1/lego/legoomni/include/historybook.h b/LEGO1/lego/legoomni/include/historybook.h
index d7a79705..af3b9be2 100644
--- a/LEGO1/lego/legoomni/include/historybook.h
+++ b/LEGO1/lego/legoomni/include/historybook.h
@@ -4,7 +4,8 @@
 #include "decomp.h"
 #include "legogamestate.h"
 #include "legoworld.h"
-#include "mxstillpresenter.h"
+
+class MxStillPresenter;
 
 // VTABLE: LEGO1 0x100da328
 // SIZE 0x3e4
diff --git a/LEGO1/lego/legoomni/include/hospital.h b/LEGO1/lego/legoomni/include/hospital.h
index 9595988f..40f4f947 100644
--- a/LEGO1/lego/legoomni/include/hospital.h
+++ b/LEGO1/lego/legoomni/include/hospital.h
@@ -3,11 +3,13 @@
 
 #include "actionsfwd.h"
 #include "decomp.h"
-#include "hospitalstate.h"
 #include "legogamestate.h"
 #include "legoworld.h"
-#include "mxstillpresenter.h"
-#include "radio.h"
+
+class HospitalState;
+class LegoControlManagerEvent;
+class MxEndActionNotificationParam;
+class MxStillPresenter;
 
 // VTABLE: LEGO1 0x100d9730
 // SIZE 0x12c
diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index e4342fee..04b56757 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -8,6 +8,7 @@
 #include "radio.h"
 
 class InfocenterState;
+class MxNotificationParam;
 class MxStillPresenter;
 class LegoControlManagerEvent;
 
diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h
index e154f42e..05b0ed83 100644
--- a/LEGO1/lego/legoomni/include/infocenterstate.h
+++ b/LEGO1/lego/legoomni/include/infocenterstate.h
@@ -4,7 +4,8 @@
 #include "decomp.h"
 #include "legogamestate.h"
 #include "legostate.h"
-#include "mxstillpresenter.h"
+
+class MxStillPresenter;
 
 // VTABLE: LEGO1 0x100d93a8
 // SIZE 0x94
diff --git a/LEGO1/lego/legoomni/include/isleactor.h b/LEGO1/lego/legoomni/include/isleactor.h
index 6e337454..1affab4a 100644
--- a/LEGO1/lego/legoomni/include/isleactor.h
+++ b/LEGO1/lego/legoomni/include/isleactor.h
@@ -2,8 +2,10 @@
 #define ISLEACTOR_H
 
 #include "legoactor.h"
-#include "legoworld.h"
-#include "mxactionnotificationparam.h"
+
+class LegoWorld;
+class MxEndActionNotificationParam;
+class MxNotificationParam;
 
 // VTABLE: LEGO1 0x100d5178
 // SIZE 0x7c
diff --git a/LEGO1/lego/legoomni/include/jetski.h b/LEGO1/lego/legoomni/include/jetski.h
index 92147be9..263b2a4f 100644
--- a/LEGO1/lego/legoomni/include/jetski.h
+++ b/LEGO1/lego/legoomni/include/jetski.h
@@ -3,7 +3,8 @@
 
 #include "decomp.h"
 #include "islepathactor.h"
-#include "legocontrolmanager.h"
+
+class LegoControlManagerEvent;
 
 // VTABLE: LEGO1 0x100d9ec8
 // SIZE 0x164
diff --git a/LEGO1/lego/legoomni/include/jukebox.h b/LEGO1/lego/legoomni/include/jukebox.h
index f5778dda..260fb9a5 100644
--- a/LEGO1/lego/legoomni/include/jukebox.h
+++ b/LEGO1/lego/legoomni/include/jukebox.h
@@ -2,11 +2,12 @@
 #define JUKEBOX_H
 
 #include "decomp.h"
-#include "jukeboxstate.h"
-#include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoworld.h"
 
+class LegoControlManagerEvent;
+class JukeBoxState;
+
 // VTABLE: LEGO1 0x100d8958
 // SIZE 0x104
 class JukeBox : public LegoWorld {
diff --git a/LEGO1/lego/legoomni/include/legoact2.h b/LEGO1/lego/legoomni/include/legoact2.h
index f0ee58dd..c7dd6a35 100644
--- a/LEGO1/lego/legoomni/include/legoact2.h
+++ b/LEGO1/lego/legoomni/include/legoact2.h
@@ -2,8 +2,6 @@
 #define LEGOACT2_H
 
 #include "act2brick.h"
-#include "legocarraceactor.h"
-#include "legopathactor.h"
 #include "legoworld.h"
 
 // VTABLE: LEGO1 0x100d82e0
diff --git a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
index 7bc6b005..6031a328 100644
--- a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
@@ -2,14 +2,14 @@
 #define LEGOACTIONCONTROLPRESENTER_H
 
 #include "decomp.h"
-#include "legoutils.h"
+#include "extra.h"
 #include "mxmediapresenter.h"
 
 // VTABLE: LEGO1 0x100d5118
 // SIZE 0x68
 class LegoActionControlPresenter : public MxMediaPresenter {
 public:
-	inline LegoActionControlPresenter() { m_unk0x50 = Extra::ActionType::e_none; }
+	LegoActionControlPresenter() { m_unk0x50 = Extra::ActionType::e_none; }
 	~LegoActionControlPresenter() override { Destroy(TRUE); } // vtable+0x00
 
 	// FUNCTION: LEGO1 0x1000d0e0
diff --git a/LEGO1/lego/legoomni/include/legoanimactor.h b/LEGO1/lego/legoomni/include/legoanimactor.h
index 91eafd11..296c48d0 100644
--- a/LEGO1/lego/legoomni/include/legoanimactor.h
+++ b/LEGO1/lego/legoomni/include/legoanimactor.h
@@ -1,10 +1,11 @@
 #ifndef LEGOANIMACTOR_H
 #define LEGOANIMACTOR_H
 
-#include "anim/legoanim.h"
 #include "decomp.h"
 #include "legopathactor.h"
 
+class LegoAnim;
+
 // SIZE 0x20
 struct LegoAnimActorStruct {
 	LegoAnimActorStruct(float p_unk0x00, LegoAnim* p_AnimTreePtr, LegoROI** p_roiMap, MxU32 p_numROIs);
diff --git a/LEGO1/lego/legoomni/include/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h
index ebebbbef..56efee8c 100644
--- a/LEGO1/lego/legoomni/include/legoanimationmanager.h
+++ b/LEGO1/lego/legoomni/include/legoanimationmanager.h
@@ -2,15 +2,18 @@
 #define LEGOANIMATIONMANAGER_H
 
 #include "actionsfwd.h"
-#include "animstate.h"
 #include "decomp.h"
 #include "legotraninfolist.h"
 #include "mxcore.h"
+#include "mxgeometry/mxgeometry3d.h"
 
+class AnimState;
 class LegoAnimPresenter;
 class LegoEntity;
+class LegoFile;
 class LegoPathBoundary;
 class LegoROIList;
+struct ModelInfo;
 class MxDSAction;
 
 // SIZE 0x18
diff --git a/LEGO1/lego/legoomni/include/legobuildingmanager.h b/LEGO1/lego/legoomni/include/legobuildingmanager.h
index b82b7b06..380a1c99 100644
--- a/LEGO1/lego/legoomni/include/legobuildingmanager.h
+++ b/LEGO1/lego/legoomni/include/legobuildingmanager.h
@@ -2,11 +2,11 @@
 #define LEGOBUILDINGMANAGER_H
 
 #include "decomp.h"
-#include "misc/legostorage.h"
 #include "mxcore.h"
 
 class LegoEntity;
 class LegoROI;
+class LegoStorage;
 
 // VTABLE: LEGO1 0x100d6f50
 // SIZE 0x30
diff --git a/LEGO1/lego/legoomni/include/legocachesoundmanager.h b/LEGO1/lego/legoomni/include/legocachesoundmanager.h
index f326c35d..67d139ff 100644
--- a/LEGO1/lego/legoomni/include/legocachesoundmanager.h
+++ b/LEGO1/lego/legoomni/include/legocachesoundmanager.h
@@ -6,6 +6,8 @@
 #include "mxstl/stlcompat.h"
 #include "mxtypes.h"
 
+#pragma warning(disable : 4237)
+
 // SIZE 0x08
 struct LegoCacheSoundEntry {
 	LegoCacheSoundEntry() : m_sound(NULL), m_name(NULL) {}
diff --git a/LEGO1/lego/legoomni/include/legocameracontroller.h b/LEGO1/lego/legoomni/include/legocameracontroller.h
index 50439347..c5c3d17c 100644
--- a/LEGO1/lego/legoomni/include/legocameracontroller.h
+++ b/LEGO1/lego/legoomni/include/legocameracontroller.h
@@ -2,11 +2,11 @@
 #define LEGOCAMERACONTROLLER_H
 
 #include "legopointofviewcontroller.h"
-#include "mxcore.h"
-#include "mxgeometry/mxgeometry3d.h"
 #include "mxgeometry/mxmatrix.h"
 #include "mxpoint32.h"
 
+class Vector3;
+
 // VTABLE: LEGO1 0x100d57b0
 // SIZE 0xc8
 class LegoCameraController : public LegoPointOfViewController {
diff --git a/LEGO1/lego/legoomni/include/legoentitylist.h b/LEGO1/lego/legoomni/include/legoentitylist.h
index 783692b3..2a7320af 100644
--- a/LEGO1/lego/legoomni/include/legoentitylist.h
+++ b/LEGO1/lego/legoomni/include/legoentitylist.h
@@ -1,11 +1,10 @@
 #ifndef LEGOENTITYLIST_H
 #define LEGOENTITYLIST_H
 
+#include "legoentity.h"
 #include "mxlist.h"
 #include "mxtypes.h"
 
-class LegoEntity;
-
 // VTABLE: LEGO1 0x100d6410
 // class MxCollection<LegoEntity *>
 
diff --git a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
index 732d4894..cdd771e3 100644
--- a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
+++ b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
@@ -3,10 +3,11 @@
 
 #include "mxnotificationparam.h"
 #include "mxtypes.h"
-#include "roi/legoroi.h"
 
 #include <stdlib.h>
 
+class LegoROI;
+
 // VTABLE: LEGO1 0x100d6aa0
 // SIZE 0x20
 class LegoEventNotificationParam : public MxNotificationParam {
diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h
index 508179c3..05f24c5f 100644
--- a/LEGO1/lego/legoomni/include/legogamestate.h
+++ b/LEGO1/lego/legoomni/include/legogamestate.h
@@ -3,12 +3,15 @@
 
 #include "actionsfwd.h"
 #include "decomp.h"
-#include "misc/legostorage.h"
 #include "mxtypes.h"
 
+#include <string.h>
+
 class LegoBackgroundColor;
+class LegoFile;
 class LegoFullScreenMovie;
 class LegoState;
+class LegoStorage;
 class MxVariable;
 class MxVariableTable;
 class MxString;
diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index f103360c..2bd7e26b 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -3,14 +3,15 @@
 
 #include "decomp.h"
 #include "legoeventnotificationparam.h"
-#include "legoworld.h"
 #include "mxlist.h"
 #include "mxpresenter.h"
 #include "mxqueue.h"
 
 #include <dinput.h>
 
+class LegoCameraController;
 class LegoControlManager;
+class LegoWorld;
 
 extern MxS32 g_unk0x100f31b0;
 extern const char* g_unk0x100f31b4;
diff --git a/LEGO1/lego/legoomni/include/legopalettepresenter.h b/LEGO1/lego/legoomni/include/legopalettepresenter.h
index c9e7fb81..d6906540 100644
--- a/LEGO1/lego/legoomni/include/legopalettepresenter.h
+++ b/LEGO1/lego/legoomni/include/legopalettepresenter.h
@@ -2,9 +2,10 @@
 #define LEGOPALETTEPRESENTER_H
 
 #include "decomp.h"
-#include "mxpalette.h"
 #include "mxvideopresenter.h"
 
+class MxPalette;
+
 // VTABLE: LEGO1 0x100d9aa0
 // SIZE 0x68
 class LegoPalettePresenter : public MxVideoPresenter {
diff --git a/LEGO1/lego/legoomni/include/legopathactor.h b/LEGO1/lego/legoomni/include/legopathactor.h
index c8863866..86b67ac2 100644
--- a/LEGO1/lego/legoomni/include/legopathactor.h
+++ b/LEGO1/lego/legoomni/include/legopathactor.h
@@ -3,13 +3,13 @@
 
 #include "legoactor.h"
 #include "misc/legounknown.h"
+#include "mxgeometry/mxmatrix.h"
 #include "mxtypes.h"
 
 struct LegoEdge;
 class LegoPathBoundary;
 class LegoPathController;
 class LegoUnknown100db7f4;
-class Matrix4;
 
 // VTABLE: LEGO1 0x100d6e28
 // SIZE 0x154
diff --git a/LEGO1/lego/legoomni/include/legopathboundary.h b/LEGO1/lego/legoomni/include/legopathboundary.h
index 024e85d2..393ab9ed 100644
--- a/LEGO1/lego/legoomni/include/legopathboundary.h
+++ b/LEGO1/lego/legoomni/include/legopathboundary.h
@@ -3,11 +3,10 @@
 
 #include "geom/legowegedge.h"
 #include "legoanimpresenter.h"
+#include "legopathactor.h"
 #include "mxstl/stlcompat.h"
 #include "mxtypes.h"
 
-class LegoPathActor;
-
 struct LegoPathActorSetCompare {
 	MxU32 operator()(const LegoPathActor* p_lhs, const LegoPathActor* p_rhs) const
 	{
diff --git a/LEGO1/lego/legoomni/include/legopathcontroller.h b/LEGO1/lego/legoomni/include/legopathcontroller.h
index 5a55fa0e..ac4c0bdc 100644
--- a/LEGO1/lego/legoomni/include/legopathcontroller.h
+++ b/LEGO1/lego/legoomni/include/legopathcontroller.h
@@ -2,12 +2,15 @@
 #define LEGOPATHCONTROLLER_H
 
 #include "decomp.h"
-#include "legopathactor.h"
 #include "mxcore.h"
+#include "mxstl/stlcompat.h"
 
 class LegoAnimPresenter;
+class LegoPathActor;
 class LegoPathBoundary;
 class LegoWorld;
+class MxAtomId;
+class Vector3;
 
 struct LegoPathControllerComparator {
 	MxBool operator()(const undefined*, const undefined*) const { return 0; }
diff --git a/LEGO1/lego/legoomni/include/legoplantmanager.h b/LEGO1/lego/legoomni/include/legoplantmanager.h
index 3094f33c..e2eccd80 100644
--- a/LEGO1/lego/legoomni/include/legoplantmanager.h
+++ b/LEGO1/lego/legoomni/include/legoplantmanager.h
@@ -2,11 +2,11 @@
 #define LEGOPLANTMANAGER_H
 
 #include "decomp.h"
-#include "misc/legostorage.h"
 #include "mxcore.h"
 
 class LegoEntity;
 class LegoROI;
+class LegoStorage;
 
 // VTABLE: LEGO1 0x100d6758
 // SIZE 0x2c
diff --git a/LEGO1/lego/legoomni/include/legoracecar.h b/LEGO1/lego/legoomni/include/legoracecar.h
index 4c7db772..d090b686 100644
--- a/LEGO1/lego/legoomni/include/legoracecar.h
+++ b/LEGO1/lego/legoomni/include/legoracecar.h
@@ -2,7 +2,6 @@
 #define LEGORACECAR_H
 
 #include "legocarraceactor.h"
-#include "legopathactor.h"
 #include "legoracemap.h"
 
 /*
diff --git a/LEGO1/lego/legoomni/include/legosoundmanager.h b/LEGO1/lego/legoomni/include/legosoundmanager.h
index e7dd809e..ad46bf8f 100644
--- a/LEGO1/lego/legoomni/include/legosoundmanager.h
+++ b/LEGO1/lego/legoomni/include/legosoundmanager.h
@@ -1,9 +1,10 @@
 #ifndef LEGOSOUNDMANAGER_H
 #define LEGOSOUNDMANAGER_H
 
-#include "legocachesoundmanager.h"
 #include "mxsoundmanager.h"
 
+class LegoCacheSoundManager;
+
 // VTABLE: LEGO1 0x100d6b10
 // SIZE 0x44
 class LegoSoundManager : public MxSoundManager {
diff --git a/LEGO1/lego/legoomni/include/legostate.h b/LEGO1/lego/legoomni/include/legostate.h
index b3ba9e31..21ddde85 100644
--- a/LEGO1/lego/legoomni/include/legostate.h
+++ b/LEGO1/lego/legoomni/include/legostate.h
@@ -4,7 +4,6 @@
 #include "decomp.h"
 #include "misc/legostorage.h"
 #include "mxcore.h"
-#include "mxstring.h"
 
 // VTABLE: LEGO1 0x100d46c0
 // SIZE 0x08
diff --git a/LEGO1/lego/legoomni/include/legotraninfo.h b/LEGO1/lego/legoomni/include/legotraninfo.h
index 89fdabb9..3ded0903 100644
--- a/LEGO1/lego/legoomni/include/legotraninfo.h
+++ b/LEGO1/lego/legoomni/include/legotraninfo.h
@@ -3,6 +3,7 @@
 
 #include "decomp.h"
 #include "mxgeometry/mxmatrix.h"
+#include "mxtypes.h"
 
 struct AnimInfo;
 class LegoAnimMMPresenter;
diff --git a/LEGO1/lego/legoomni/include/legounknown100d5778.h b/LEGO1/lego/legoomni/include/legounknown100d5778.h
index cb4dd25e..fe5df73f 100644
--- a/LEGO1/lego/legoomni/include/legounknown100d5778.h
+++ b/LEGO1/lego/legoomni/include/legounknown100d5778.h
@@ -3,10 +3,11 @@
 
 #include "decomp.h"
 #include "mxtypes.h"
-#include "roi/legoroi.h"
 
 #include <dsound.h>
 
+class LegoROI;
+
 // VTABLE: LEGO1 0x100d5778
 // SIZE 0x30
 class LegoUnknown100d5778 {
diff --git a/LEGO1/lego/legoomni/include/legoutils.h b/LEGO1/lego/legoomni/include/legoutils.h
index e484c9a0..687d7d24 100644
--- a/LEGO1/lego/legoomni/include/legoutils.h
+++ b/LEGO1/lego/legoomni/include/legoutils.h
@@ -2,16 +2,13 @@
 #define LEGOUTILS_H
 
 #include "extra.h"
-#include "misc/legostorage.h"
-#include "misc/legotexture.h"
-#include "mxstring.h"
 #include "mxtypes.h"
-#include "mxutilities.h"
 
 #include <windows.h>
 
 class MxAtomId;
 class LegoEntity;
+class LegoFile;
 class LegoAnimPresenter;
 class LegoNamedTexture;
 class LegoTreeNode;
diff --git a/LEGO1/lego/legoomni/include/legovideomanager.h b/LEGO1/lego/legoomni/include/legovideomanager.h
index 01ad45c9..eb7a0b90 100644
--- a/LEGO1/lego/legoomni/include/legovideomanager.h
+++ b/LEGO1/lego/legoomni/include/legovideomanager.h
@@ -1,16 +1,21 @@
 #ifndef LEGOVIDEOMANAGER_H
 #define LEGOVIDEOMANAGER_H
 
-#include "3dmanager/lego3dmanager.h"
 #include "decomp.h"
 #include "legophonemelist.h"
-#include "mxdirectx/mxdirect3d.h"
-#include "mxdirectx/mxstopwatch.h"
 #include "mxvideomanager.h"
 
 #include <ddraw.h>
 
+class Lego3DManager;
 class LegoROI;
+class MxDirect3D;
+class MxStopWatch;
+
+namespace Tgl
+{
+class Renderer;
+}
 
 // VTABLE: LEGO1 0x100d9c88
 // SIZE 0x590
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index f882b685..9f7dd7c1 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -2,15 +2,14 @@
 #define LEGOWORLD_H
 
 #include "legocachesoundlist.h"
-#include "legocachsound.h"
-#include "legocameracontroller.h"
 #include "legoentity.h"
 #include "legoentitylist.h"
 #include "legopathcontrollerlist.h"
-#include "mxpresenter.h"
 #include "mxpresenterlist.h"
+#include "roi/legoroi.h"
 
 class IslePathActor;
+class LegoCameraController;
 class LegoPathBoundary;
 class LegoHideAnimPresenter;
 
diff --git a/LEGO1/lego/legoomni/include/misc.h b/LEGO1/lego/legoomni/include/misc.h
index 2d809258..65606dfb 100644
--- a/LEGO1/lego/legoomni/include/misc.h
+++ b/LEGO1/lego/legoomni/include/misc.h
@@ -3,9 +3,6 @@
 
 #include "compat.h"
 #include "decomp.h"
-#include "legoinputmanager.h"
-#include "legoomni.h"
-#include "legovideomanager.h"
 // Long include path due to dependency of misc library on LegoOmni
 #include "lego/legoomni/include/actions/actionsfwd.h"
 #include "mxtypes.h"
@@ -16,6 +13,7 @@ class LegoBuildingManager;
 class LegoCharacterManager;
 class LegoControlManager;
 class LegoGameState;
+class LegoInputManager;
 class LegoNavController;
 class LegoOmni;
 class LegoPlantManager;
diff --git a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
index 4b70e9e8..922ff625 100644
--- a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
+++ b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
@@ -1,13 +1,12 @@
 #ifndef MXBACKGROUNDAUDIOMANAGER_H
 #define MXBACKGROUNDAUDIOMANAGER_H
 
-#include "mxaudiopresenter.h"
 #include "mxcore.h"
 #include "mxdsaction.h"
-#include "mxnotificationmanager.h"
-#include "mxpresenter.h"
 #include "mxtypes.h"
 
+class MxAudioPresenter;
+
 // VTABLE: LEGO1 0x100d9fe8
 // SIZE 0x150
 class MxBackgroundAudioManager : public MxCore {
diff --git a/LEGO1/lego/legoomni/include/police.h b/LEGO1/lego/legoomni/include/police.h
index 5b4e4778..4ba7ac20 100644
--- a/LEGO1/lego/legoomni/include/police.h
+++ b/LEGO1/lego/legoomni/include/police.h
@@ -2,12 +2,13 @@
 #define POLICE_H
 
 #include "decomp.h"
-#include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoworld.h"
-#include "mxdsaction.h"
 #include "radio.h"
 
+class LegoControlManagerEvent;
+class LegoEventNotificationParam;
+class MxDSAction;
 class PoliceState;
 
 // VTABLE: LEGO1 0x100d8a80
diff --git a/LEGO1/lego/legoomni/include/policestate.h b/LEGO1/lego/legoomni/include/policestate.h
index 3f9a9bad..75970729 100644
--- a/LEGO1/lego/legoomni/include/policestate.h
+++ b/LEGO1/lego/legoomni/include/policestate.h
@@ -4,7 +4,6 @@
 #include "actionsfwd.h"
 #include "decomp.h"
 #include "legostate.h"
-#include "police.h"
 
 // VTABLE: LEGO1 0x100d8af0
 // SIZE 0x10
diff --git a/LEGO1/lego/legoomni/include/radio.h b/LEGO1/lego/legoomni/include/radio.h
index 7e3cff87..3c35a300 100644
--- a/LEGO1/lego/legoomni/include/radio.h
+++ b/LEGO1/lego/legoomni/include/radio.h
@@ -1,10 +1,11 @@
 #ifndef RADIO_H
 #define RADIO_H
 
-#include "legocontrolmanager.h"
-#include "mxactionnotificationparam.h"
 #include "mxcore.h"
-#include "radiostate.h"
+
+class LegoControlManagerEvent;
+class MxEndActionNotificationParam;
+class RadioState;
 
 // VTABLE: LEGO1 0x100d6d10
 // SIZE 0x10
diff --git a/LEGO1/lego/legoomni/include/radiostate.h b/LEGO1/lego/legoomni/include/radiostate.h
index b768da19..e0c0066c 100644
--- a/LEGO1/lego/legoomni/include/radiostate.h
+++ b/LEGO1/lego/legoomni/include/radiostate.h
@@ -2,7 +2,8 @@
 #define RADIOSTATE_H
 
 #include "legostate.h"
-#include "mxdsaction.h"
+
+class MxAtomId;
 
 // VTABLE: LEGO1 0x100d6d28
 // SIZE 0x30
diff --git a/LEGO1/lego/legoomni/include/registrationbook.h b/LEGO1/lego/legoomni/include/registrationbook.h
index 9bb23115..1266d29b 100644
--- a/LEGO1/lego/legoomni/include/registrationbook.h
+++ b/LEGO1/lego/legoomni/include/registrationbook.h
@@ -1,14 +1,12 @@
 #ifndef REGISTRATIONBOOK_H
 #define REGISTRATIONBOOK_H
 
-#include "jukebox.h"
-#include "legogamestate.h"
 #include "legoworld.h"
-#include "mxcontrolpresenter.h"
-#include "mxstillpresenter.h"
 
 class InfocenterState;
+class MxControlPresenter;
 class MxEndActionNotificationParam;
+class MxStillPresenter;
 class LegoControlManagerEvent;
 
 // VTABLE: LEGO1 0x100d9928
diff --git a/LEGO1/lego/legoomni/include/score.h b/LEGO1/lego/legoomni/include/score.h
index 9ee47851..71efd0f4 100644
--- a/LEGO1/lego/legoomni/include/score.h
+++ b/LEGO1/lego/legoomni/include/score.h
@@ -1,12 +1,12 @@
 #ifndef SCORE_H
 #define SCORE_H
 
-#include "legocontrolmanager.h"
-#include "legoeventnotificationparam.h"
 #include "legogamestate.h"
 #include "legoworld.h"
-#include "mxactionnotificationparam.h"
-#include "scorestate.h"
+
+class LegoControlManagerEvent;
+class MxEndActionNotificationParam;
+class ScoreState;
 
 // VTABLE: LEGO1 0x100d4018
 // SIZE 0x104
diff --git a/LEGO1/lego/legoomni/src/act1/act1state.cpp b/LEGO1/lego/legoomni/src/act1/act1state.cpp
index c3e53fde..98c167fe 100644
--- a/LEGO1/lego/legoomni/src/act1/act1state.cpp
+++ b/LEGO1/lego/legoomni/src/act1/act1state.cpp
@@ -1,5 +1,6 @@
 #include "act1state.h"
 
+#include "legonamedtexture.h"
 #include "legoutils.h"
 
 DECOMP_SIZE_ASSERT(Act1State, 0x26c)
diff --git a/LEGO1/lego/legoomni/src/actors/ambulance.cpp b/LEGO1/lego/legoomni/src/actors/ambulance.cpp
index 9c0f87e5..933f96f9 100644
--- a/LEGO1/lego/legoomni/src/actors/ambulance.cpp
+++ b/LEGO1/lego/legoomni/src/actors/ambulance.cpp
@@ -1,14 +1,17 @@
 #include "ambulance.h"
 
+#include "ambulancemissionstate.h"
 #include "decomp.h"
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoomni.h"
 #include "legovariables.h"
+#include "legoworld.h"
 #include "misc.h"
 #include "mxmisc.h"
 #include "mxticklemanager.h"
 #include "mxtimer.h"
+#include "mxvariabletable.h"
 
 DECOMP_SIZE_ASSERT(Ambulance, 0x184)
 
diff --git a/LEGO1/lego/legoomni/src/actors/helicopter.cpp b/LEGO1/lego/legoomni/src/actors/helicopter.cpp
index 36507ecc..3158452c 100644
--- a/LEGO1/lego/legoomni/src/actors/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/actors/helicopter.cpp
@@ -9,6 +9,7 @@
 #include "jukebox.h"
 #include "jukebox_actions.h"
 #include "legoanimationmanager.h"
+#include "legocameracontroller.h"
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoomni.h"
diff --git a/LEGO1/lego/legoomni/src/actors/islepathactor.cpp b/LEGO1/lego/legoomni/src/actors/islepathactor.cpp
index 48d3e06f..607892bd 100644
--- a/LEGO1/lego/legoomni/src/actors/islepathactor.cpp
+++ b/LEGO1/lego/legoomni/src/actors/islepathactor.cpp
@@ -1,10 +1,14 @@
 #include "islepathactor.h"
 
+#include "3dmanager/lego3dmanager.h"
 #include "jukebox_actions.h"
 #include "legoanimationmanager.h"
 #include "legonavcontroller.h"
+#include "legoomni.h"
 #include "legopathboundary.h"
 #include "legoutils.h"
+#include "legovideomanager.h"
+#include "legoworld.h"
 #include "misc.h"
 #include "mxnotificationparam.h"
 
diff --git a/LEGO1/lego/legoomni/src/actors/radio.cpp b/LEGO1/lego/legoomni/src/actors/radio.cpp
index 5aaea1ab..794604ea 100644
--- a/LEGO1/lego/legoomni/src/actors/radio.cpp
+++ b/LEGO1/lego/legoomni/src/actors/radio.cpp
@@ -4,11 +4,13 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoomni.h"
+#include "legoworld.h"
 #include "misc.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxcontrolpresenter.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
+#include "radiostate.h"
 
 DECOMP_SIZE_ASSERT(Radio, 0x10)
 
diff --git a/LEGO1/lego/legoomni/src/actors/skateboard.cpp b/LEGO1/lego/legoomni/src/actors/skateboard.cpp
index 30f3f218..37016797 100644
--- a/LEGO1/lego/legoomni/src/actors/skateboard.cpp
+++ b/LEGO1/lego/legoomni/src/actors/skateboard.cpp
@@ -6,6 +6,8 @@
 #include "isle_actions.h"
 #include "jukebox_actions.h"
 #include "legoanimationmanager.h"
+#include "legocontrolmanager.h"
+#include "legoomni.h"
 #include "legoutils.h"
 #include "misc.h"
 #include "mxmisc.h"
diff --git a/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp b/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
index a30aa94a..f54b1655 100644
--- a/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp
@@ -1,5 +1,6 @@
 #include "legoloadcachesoundpresenter.h"
 
+#include "legocachesoundmanager.h"
 #include "legocachsound.h"
 #include "legosoundmanager.h"
 #include "misc.h"
diff --git a/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp b/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
index 0c077963..942f8040 100644
--- a/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
+++ b/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
@@ -1,5 +1,6 @@
 #include "legosoundmanager.h"
 
+#include "legocachesoundmanager.h"
 #include "mxautolock.h"
 #include "mxomni.h"
 
diff --git a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
index 4a3a0eda..04d8cbc8 100644
--- a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
+++ b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
@@ -2,9 +2,11 @@
 
 #include "legoomni.h"
 #include "misc.h"
+#include "mxaudiopresenter.h"
 #include "mxcompositepresenter.h"
 #include "mxdssound.h"
 #include "mxmisc.h"
+#include "mxnotificationmanager.h"
 #include "mxpresenter.h"
 #include "mxstreamer.h"
 #include "mxticklemanager.h"
diff --git a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
index 86972b68..9346d4a8 100644
--- a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
@@ -9,6 +9,7 @@
 #include "mxmisc.h"
 #include "mxstreamchunk.h"
 #include "mxticklemanager.h"
+#include "mxutilities.h"
 
 DECOMP_SIZE_ASSERT(LegoActionControlPresenter, 0x68)
 
diff --git a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
index 0abafbd8..6160fd3b 100644
--- a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
@@ -1,5 +1,6 @@
 #include "legoanimationmanager.h"
 
+#include "animstate.h"
 #include "define.h"
 #include "islepathactor.h"
 #include "legocharactermanager.h"
@@ -8,9 +9,12 @@
 #include "legogamestate.h"
 #include "legoomni.h"
 #include "legoroilist.h"
+#include "legovideomanager.h"
+#include "legoworld.h"
 #include "misc.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxmisc.h"
+#include "mxnotificationmanager.h"
 #include "mxticklemanager.h"
 #include "mxtimer.h"
 #include "mxutilities.h"
diff --git a/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp
index d2b2632a..9ebaaa8a 100644
--- a/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp
@@ -1,5 +1,6 @@
 #include "legoanimmmpresenter.h"
 
+#include "3dmanager/lego3dmanager.h"
 #include "decomp.h"
 #include "define.h"
 #include "islepathactor.h"
diff --git a/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp b/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
index fa5795d7..52d82898 100644
--- a/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
+++ b/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
@@ -1,5 +1,6 @@
 #include "legobackgroundcolor.h"
 
+#include "3dmanager/lego3dmanager.h"
 #include "decomp.h"
 #include "legoutils.h"
 #include "legovideomanager.h"
diff --git a/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp b/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp
index 816e1f8e..b8bd5a2a 100644
--- a/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp
+++ b/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp
@@ -1,5 +1,6 @@
 #include "legocharactermanager.h"
 
+#include "3dmanager/lego3dmanager.h"
 #include "legoanimactor.h"
 #include "legocharacters.h"
 #include "legoextraactor.h"
@@ -8,9 +9,11 @@
 #include "legovideomanager.h"
 #include "misc.h"
 #include "misc/legocontainer.h"
+#include "misc/legostorage.h"
 #include "mxmisc.h"
 #include "realtime/realtime.h"
 #include "roi/legolod.h"
+#include "viewmanager/viewmanager.h"
 
 #include <vec.h>
 
diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index fb859752..762bded2 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -1,5 +1,6 @@
 #include "legogamestate.h"
 
+#include "3dmanager/lego3dmanager.h"
 #include "act1state.h"
 #include "act2main_actions.h"
 #include "act3_actions.h"
@@ -42,8 +43,10 @@
 #include "misc.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxmisc.h"
+#include "mxnotificationmanager.h"
 #include "mxobjectfactory.h"
 #include "mxstring.h"
+#include "mxutilities.h"
 #include "mxvariabletable.h"
 #include "police_actions.h"
 #include "racecar.h"
diff --git a/LEGO1/lego/legoomni/src/common/legotextureinfo.cpp b/LEGO1/lego/legoomni/src/common/legotextureinfo.cpp
index 7463524c..520a0070 100644
--- a/LEGO1/lego/legoomni/src/common/legotextureinfo.cpp
+++ b/LEGO1/lego/legoomni/src/common/legotextureinfo.cpp
@@ -4,6 +4,7 @@
 #include "misc.h"
 #include "misc/legoimage.h"
 #include "misc/legotexture.h"
+#include "mxdirectx/mxdirect3d.h"
 #include "tgl/d3drm/impl.h"
 
 DECOMP_SIZE_ASSERT(LegoTextureInfo, 0x10)
diff --git a/LEGO1/lego/legoomni/src/common/legoutils.cpp b/LEGO1/lego/legoomni/src/common/legoutils.cpp
index 38124069..92d9bc2e 100644
--- a/LEGO1/lego/legoomni/src/common/legoutils.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoutils.cpp
@@ -1,5 +1,6 @@
 #include "legoutils.h"
 
+#include "3dmanager/lego3dmanager.h"
 #include "act1state.h"
 #include "anim/legoanim.h"
 #include "islepathactor.h"
@@ -9,6 +10,7 @@
 #include "legonamedtexture.h"
 #include "legoomni.h"
 #include "legosoundmanager.h"
+#include "legovideomanager.h"
 #include "legoworld.h"
 #include "legoworldlist.h"
 #include "misc.h"
@@ -18,6 +20,7 @@
 #include "mxnotificationmanager.h"
 #include "mxstreamer.h"
 #include "mxtypes.h"
+#include "mxutilities.h"
 #include "realtime/realtime.h"
 
 #include <process.h>
diff --git a/LEGO1/lego/legoomni/src/common/legovariables.cpp b/LEGO1/lego/legoomni/src/common/legovariables.cpp
index 71e6e587..993b0129 100644
--- a/LEGO1/lego/legoomni/src/common/legovariables.cpp
+++ b/LEGO1/lego/legoomni/src/common/legovariables.cpp
@@ -1,5 +1,6 @@
 #include "legovariables.h"
 
+#include "3dmanager/lego3dmanager.h"
 #include "legobuildingmanager.h"
 #include "legocharactermanager.h"
 #include "legogamestate.h"
diff --git a/LEGO1/lego/legoomni/src/common/misc.cpp b/LEGO1/lego/legoomni/src/common/misc.cpp
index fe4c6f7d..9f632bf8 100644
--- a/LEGO1/lego/legoomni/src/common/misc.cpp
+++ b/LEGO1/lego/legoomni/src/common/misc.cpp
@@ -1,7 +1,12 @@
 #include "misc.h"
 
+#include "3dmanager/lego3dmanager.h"
+#include "legoinputmanager.h"
+#include "legoomni.h"
+#include "legovideomanager.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxmisc.h"
+#include "roi/legoroi.h"
 
 // GLOBAL: LEGO1 0x100f4c58
 MxBool g_isWorldActive = TRUE;
diff --git a/LEGO1/lego/legoomni/src/entity/legoactor.cpp b/LEGO1/lego/legoomni/src/entity/legoactor.cpp
index 6c27fd34..58df76c4 100644
--- a/LEGO1/lego/legoomni/src/entity/legoactor.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoactor.cpp
@@ -1,9 +1,11 @@
 #include "legoactor.h"
 
 #include "define.h"
+#include "legocachesoundmanager.h"
 #include "legosoundmanager.h"
 #include "misc.h"
 #include "mxutilities.h"
+#include "roi/legoroi.h"
 
 DECOMP_SIZE_ASSERT(LegoActor, 0x78)
 
diff --git a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
index 1076e787..6025f614 100644
--- a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
@@ -1,5 +1,6 @@
 #include "legocameracontroller.h"
 
+#include "3dmanager/lego3dmanager.h"
 #include "legoinputmanager.h"
 #include "legonotify.h"
 #include "legosoundmanager.h"
@@ -8,6 +9,7 @@
 #include "mxmisc.h"
 #include "mxtimer.h"
 #include "realtime/realtime.h"
+#include "roi/legoroi.h"
 
 #include <vec.h>
 
diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
index a55693f9..d1f145c2 100644
--- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
@@ -1,8 +1,11 @@
 #include "legoentity.h"
 
+#include "3dmanager/lego3dmanager.h"
 #include "define.h"
 #include "legobuildingmanager.h"
+#include "legocameracontroller.h"
 #include "legocharactermanager.h"
+#include "legoeventnotificationparam.h"
 #include "legogamestate.h"
 #include "legoplantmanager.h"
 #include "legoutils.h"
@@ -10,6 +13,7 @@
 #include "legoworld.h"
 #include "misc.h"
 #include "mxmisc.h"
+#include "mxutilities.h"
 #include "realtime/realtime.h"
 
 DECOMP_SIZE_ASSERT(LegoEntity, 0x68)
diff --git a/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
index 573d2392..b49c3438 100644
--- a/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
@@ -1,7 +1,9 @@
 #include "legonavcontroller.h"
 
+#include "3dmanager/lego3dmanager.h"
 #include "infocenterstate.h"
 #include "legoanimationmanager.h"
+#include "legocameracontroller.h"
 #include "legocameralocations.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
@@ -9,12 +11,15 @@
 #include "legosoundmanager.h"
 #include "legoutils.h"
 #include "legovideomanager.h"
+#include "legoworld.h"
 #include "misc.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxmisc.h"
 #include "mxtimer.h"
 #include "mxtransitionmanager.h"
+#include "mxutilities.h"
 #include "realtime/realtime.h"
+#include "realtime/realtimeview.h"
 
 #include <vec.h>
 
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index d6a1273a..c7d47303 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -5,6 +5,8 @@
 #include "legoanimationmanager.h"
 #include "legoanimpresenter.h"
 #include "legobuildingmanager.h"
+#include "legocachesoundmanager.h"
+#include "legocameracontroller.h"
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
@@ -22,6 +24,8 @@
 #include "mxnotificationmanager.h"
 #include "mxnotificationparam.h"
 #include "mxticklemanager.h"
+#include "mxutilities.h"
+#include "viewmanager/viewmanager.h"
 
 DECOMP_SIZE_ASSERT(LegoWorld, 0xf8)
 DECOMP_SIZE_ASSERT(LegoEntityList, 0x18)
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
index 2af1ddbb..a6159d62 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
@@ -2,6 +2,7 @@
 
 #include "infocenter.h"
 #include "infomain_actions.h"
+#include "mxstillpresenter.h"
 
 DECOMP_SIZE_ASSERT(InfocenterState, 0x94)
 
diff --git a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
index 65bcc1b5..8d67c169 100644
--- a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
+++ b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
@@ -1,8 +1,10 @@
 #include "legoinputmanager.h"
 
+#include "legocameracontroller.h"
 #include "legocontrolmanager.h"
 #include "legoomni.h"
 #include "legovideomanager.h"
+#include "legoworld.h"
 #include "misc.h"
 #include "mxautolock.h"
 #include "roi/legoroi.h"
diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
index 73244b41..103e2e7f 100644
--- a/LEGO1/lego/legoomni/src/main/legoomni.cpp
+++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp
@@ -1,5 +1,6 @@
 #include "legoomni.h"
 
+#include "3dmanager/lego3dmanager.h"
 #include "islepathactor.h"
 #include "legoanimationmanager.h"
 #include "legobuildingmanager.h"
@@ -21,6 +22,7 @@
 #include "mxbackgroundaudiomanager.h"
 #include "mxdsfile.h"
 #include "mxmisc.h"
+#include "mxnotificationmanager.h"
 #include "mxomnicreateflags.h"
 #include "mxomnicreateparam.h"
 #include "mxstreamer.h"
@@ -28,6 +30,7 @@
 #include "mxtransitionmanager.h"
 #include "viewmanager/viewmanager.h"
 
+DECOMP_SIZE_ASSERT(LegoOmni, 0x140)
 DECOMP_SIZE_ASSERT(LegoOmni::ScriptContainer, 0x1c)
 DECOMP_SIZE_ASSERT(LegoWorldList, 0x18)
 DECOMP_SIZE_ASSERT(LegoWorldListCursor, 0x10)
diff --git a/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp b/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
index c94b498d..70c73fe2 100644
--- a/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
+++ b/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
@@ -1,5 +1,6 @@
 #include "legoanimactor.h"
 
+#include "anim/legoanim.h"
 #include "define.h"
 #include "legolocomotionanimpresenter.h"
 #include "legopathboundary.h"
diff --git a/LEGO1/lego/legoomni/src/paths/legoextraactor.cpp b/LEGO1/lego/legoomni/src/paths/legoextraactor.cpp
index 4402756d..9da6e219 100644
--- a/LEGO1/lego/legoomni/src/paths/legoextraactor.cpp
+++ b/LEGO1/lego/legoomni/src/paths/legoextraactor.cpp
@@ -1,8 +1,11 @@
 #include "legoextraactor.h"
 
+#include "anim/legoanim.h"
+#include "legocachesoundmanager.h"
 #include "legolocomotionanimpresenter.h"
 #include "legopathboundary.h"
 #include "legosoundmanager.h"
+#include "legoworld.h"
 #include "misc.h"
 #include "mxmisc.h"
 #include "mxtimer.h"
diff --git a/LEGO1/lego/legoomni/src/paths/legopathactor.cpp b/LEGO1/lego/legoomni/src/paths/legopathactor.cpp
index 4a6dcfa0..400f165d 100644
--- a/LEGO1/lego/legoomni/src/paths/legopathactor.cpp
+++ b/LEGO1/lego/legoomni/src/paths/legopathactor.cpp
@@ -1,12 +1,16 @@
 #include "legopathactor.h"
 
 #include "geom/legounkown100db7f4.h"
+#include "legocachesoundmanager.h"
+#include "legocameracontroller.h"
 #include "legonavcontroller.h"
 #include "legopathboundary.h"
 #include "legosoundmanager.h"
+#include "legoworld.h"
 #include "misc.h"
 #include "mxmisc.h"
 #include "mxtimer.h"
+#include "mxvariabletable.h"
 
 #include <vec.h>
 
diff --git a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
index 9ff31ed4..a6eaab0f 100644
--- a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
@@ -1,6 +1,8 @@
 #include "legopathpresenter.h"
 
+#include "legopathcontroller.h"
 #include "legovideomanager.h"
+#include "legoworld.h"
 #include "misc.h"
 #include "mxautolock.h"
 #include "mxutilities.h"
diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
index 3c347bc2..3cd6e6a0 100644
--- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
@@ -1,9 +1,11 @@
 #include "legoanimpresenter.h"
 
+#include "3dmanager/lego3dmanager.h"
 #include "anim/legoanim.h"
 #include "define.h"
 #include "legoanimationmanager.h"
 #include "legoanimmmpresenter.h"
+#include "legocameracontroller.h"
 #include "legocharactermanager.h"
 #include "legoendanimnotificationparam.h"
 #include "legopathboundary.h"
@@ -20,6 +22,7 @@
 #include "mxutilities.h"
 #include "mxvideomanager.h"
 #include "realtime/realtime.h"
+#include "viewmanager/viewmanager.h"
 
 DECOMP_SIZE_ASSERT(LegoAnimPresenter, 0xbc)
 
diff --git a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
index 7417748f..c4d455a2 100644
--- a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
@@ -1,5 +1,6 @@
 #include "legomodelpresenter.h"
 
+#include "3dmanager/lego3dmanager.h"
 #include "anim/legoanim.h"
 #include "define.h"
 #include "legocharactermanager.h"
@@ -12,6 +13,7 @@
 #include "misc/legotexture.h"
 #include "misc/version.h"
 #include "mxcompositepresenter.h"
+#include "mxdirectx/mxdirect3d.h"
 #include "mxutilities.h"
 #include "realtime/realtime.h"
 #include "roi/legoroi.h"
diff --git a/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp b/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp
index 7aead0ed..c11c9968 100644
--- a/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp
@@ -5,6 +5,7 @@
 #include "misc/legocontainer.h"
 #include "misc/legostorage.h"
 #include "misc/legotexture.h"
+#include "mxdirectx/mxdirect3d.h"
 #include "viewmanager/viewlodlist.h"
 
 DECOMP_SIZE_ASSERT(LegoLODList, 0x18)
diff --git a/LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp b/LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp
index 5c0dd322..a1277103 100644
--- a/LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp
@@ -1,6 +1,7 @@
 #include "legophonemepresenter.h"
 
 #include "legocharactermanager.h"
+#include "legovideomanager.h"
 #include "misc.h"
 #include "misc/legocontainer.h"
 #include "mxcompositepresenter.h"
diff --git a/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp b/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
index e2d5211b..0a217da0 100644
--- a/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp
@@ -6,6 +6,7 @@
 #include "misc/legoimage.h"
 #include "misc/legostorage.h"
 #include "mxcompositepresenter.h"
+#include "mxdirectx/mxdirect3d.h"
 
 DECOMP_SIZE_ASSERT(LegoTexturePresenter, 0x54)
 DECOMP_SIZE_ASSERT(LegoNamedTexture, 0x14)
diff --git a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
index e24de146..f1c0638a 100644
--- a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
@@ -1,7 +1,11 @@
 #include "legovideomanager.h"
 
+#include "3dmanager/lego3dmanager.h"
+#include "legoinputmanager.h"
 #include "legoomni.h"
 #include "misc.h"
+#include "mxdirectx/mxdirect3d.h"
+#include "mxdirectx/mxstopwatch.h"
 #include "mxmisc.h"
 #include "mxtimer.h"
 #include "mxtransitionmanager.h"
diff --git a/LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp
index 0222bd83..bbec9dd0 100644
--- a/LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp
@@ -13,6 +13,7 @@
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxtransitionmanager.h"
+#include "mxvariabletable.h"
 
 DECOMP_SIZE_ASSERT(ElevatorBottom, 0xfc)
 
diff --git a/LEGO1/lego/legoomni/src/worlds/gasstation.cpp b/LEGO1/lego/legoomni/src/worlds/gasstation.cpp
index 9f4f870f..9da31f68 100644
--- a/LEGO1/lego/legoomni/src/worlds/gasstation.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/gasstation.cpp
@@ -1,6 +1,7 @@
 #include "gasstation.h"
 
 #include "garage_actions.h"
+#include "gasstationstate.h"
 #include "islepathactor.h"
 #include "jukebox.h"
 #include "jukebox_actions.h"
@@ -12,6 +13,7 @@
 #include "mxbackgroundaudiomanager.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
+#include "mxstillpresenter.h"
 #include "mxticklemanager.h"
 #include "mxtimer.h"
 #include "mxtransitionmanager.h"
diff --git a/LEGO1/lego/legoomni/src/worlds/historybook.cpp b/LEGO1/lego/legoomni/src/worlds/historybook.cpp
index 9f99002b..7534623a 100644
--- a/LEGO1/lego/legoomni/src/worlds/historybook.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/historybook.cpp
@@ -7,6 +7,7 @@
 #include "misc.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
+#include "mxstillpresenter.h"
 #include "mxtransitionmanager.h"
 
 DECOMP_SIZE_ASSERT(HistoryBook, 0x3e4)
diff --git a/LEGO1/lego/legoomni/src/worlds/hospital.cpp b/LEGO1/lego/legoomni/src/worlds/hospital.cpp
index 43b422dc..7666098b 100644
--- a/LEGO1/lego/legoomni/src/worlds/hospital.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/hospital.cpp
@@ -2,6 +2,7 @@
 
 #include "act1state.h"
 #include "hospital_actions.h"
+#include "hospitalstate.h"
 #include "islepathactor.h"
 #include "jukebox.h"
 #include "jukebox_actions.h"
@@ -10,9 +11,11 @@
 #include "legoomni.h"
 #include "legoutils.h"
 #include "misc.h"
+#include "mxactionnotificationparam.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
+#include "mxstillpresenter.h"
 #include "mxticklemanager.h"
 #include "mxtimer.h"
 #include "mxtransitionmanager.h"
diff --git a/LEGO1/lego/legoomni/src/worlds/infocenter.cpp b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp
index bddef81b..5c97ddc0 100644
--- a/LEGO1/lego/legoomni/src/worlds/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp
@@ -27,7 +27,10 @@
 #include "mxstillpresenter.h"
 #include "mxticklemanager.h"
 #include "mxtransitionmanager.h"
+#include "mxutilities.h"
+#include "radiostate.h"
 #include "sndanim_actions.h"
+#include "viewmanager/viewmanager.h"
 
 DECOMP_SIZE_ASSERT(Infocenter, 0x1d8)
 DECOMP_SIZE_ASSERT(InfocenterMapEntry, 0x18)
diff --git a/LEGO1/lego/legoomni/src/worlds/isle.cpp b/LEGO1/lego/legoomni/src/worlds/isle.cpp
index f61857d1..4bf90ff1 100644
--- a/LEGO1/lego/legoomni/src/worlds/isle.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/isle.cpp
@@ -1,5 +1,6 @@
 #include "isle.h"
 
+#include "3dmanager/lego3dmanager.h"
 #include "act1state.h"
 #include "ambulance.h"
 #include "bike.h"
@@ -22,6 +23,7 @@
 #include "legovideomanager.h"
 #include "misc.h"
 #include "motocycle.h"
+#include "mxactionnotificationparam.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
diff --git a/LEGO1/lego/legoomni/src/worlds/police.cpp b/LEGO1/lego/legoomni/src/worlds/police.cpp
index e73c1384..9080e4c1 100644
--- a/LEGO1/lego/legoomni/src/worlds/police.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/police.cpp
@@ -7,6 +7,7 @@
 #include "legoinputmanager.h"
 #include "legoomni.h"
 #include "misc.h"
+#include "mxactionnotificationparam.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
diff --git a/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp b/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp
index 549fc89a..b4cdd0a4 100644
--- a/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp
@@ -9,9 +9,11 @@
 #include "misc.h"
 #include "mxactionnotificationparam.h"
 #include "mxbackgroundaudiomanager.h"
+#include "mxcontrolpresenter.h"
 #include "mxdisplaysurface.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
+#include "mxstillpresenter.h"
 #include "mxtimer.h"
 #include "mxtransitionmanager.h"
 #include "regbook_actions.h"
diff --git a/LEGO1/lego/legoomni/src/worlds/score.cpp b/LEGO1/lego/legoomni/src/worlds/score.cpp
index 868241d6..33814313 100644
--- a/LEGO1/lego/legoomni/src/worlds/score.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/score.cpp
@@ -12,12 +12,14 @@
 #include "legoomni.h"
 #include "misc.h"
 #include "misc/legocontainer.h"
+#include "mxactionnotificationparam.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxnotificationparam.h"
 #include "mxtransitionmanager.h"
 #include "pizzamissionstate.h"
 #include "racestate.h"
+#include "scorestate.h"
 #include "towtrackmissionstate.h"
 
 DECOMP_SIZE_ASSERT(Score, 0x104)
diff --git a/LEGO1/lego/sources/3dmanager/lego3dmanager.cpp b/LEGO1/lego/sources/3dmanager/lego3dmanager.cpp
index f58a519a..1781870a 100644
--- a/LEGO1/lego/sources/3dmanager/lego3dmanager.cpp
+++ b/LEGO1/lego/sources/3dmanager/lego3dmanager.cpp
@@ -4,6 +4,7 @@
 
 #include "decomp.h"
 #include "viewmanager/viewlodlist.h"
+#include "viewmanager/viewmanager.h"
 
 DECOMP_SIZE_ASSERT(Lego3DManager, 0x10);
 
diff --git a/LEGO1/lego/sources/3dmanager/lego3dview.h b/LEGO1/lego/sources/3dmanager/lego3dview.h
index 74a9eb1c..6c8930e9 100644
--- a/LEGO1/lego/sources/3dmanager/lego3dview.h
+++ b/LEGO1/lego/sources/3dmanager/lego3dview.h
@@ -3,7 +3,9 @@
 
 #include "decomp.h"
 #include "legoview1.h"
-#include "viewmanager/viewmanager.h"
+
+class ViewManager;
+class ViewROI;
 
 /////////////////////////////////////////////////////////////////////////////
 // Lego3DView
diff --git a/LEGO1/lego/sources/misc/legocontainer.cpp b/LEGO1/lego/sources/misc/legocontainer.cpp
index dddb979a..d9bdc0eb 100644
--- a/LEGO1/lego/sources/misc/legocontainer.cpp
+++ b/LEGO1/lego/sources/misc/legocontainer.cpp
@@ -2,6 +2,7 @@
 
 #include "lego/legoomni/include/legovideomanager.h"
 #include "lego/legoomni/include/misc.h"
+#include "mxdirectx/mxdirect3d.h"
 #include "tgl/d3drm/impl.h"
 
 DECOMP_SIZE_ASSERT(LegoContainerInfo<LegoTexture>, 0x10);
diff --git a/LEGO1/lego/sources/misc/legounknown.h b/LEGO1/lego/sources/misc/legounknown.h
index 8980d96a..03eafcee 100644
--- a/LEGO1/lego/sources/misc/legounknown.h
+++ b/LEGO1/lego/sources/misc/legounknown.h
@@ -3,7 +3,8 @@
 
 #include "legotypes.h"
 #include "mxgeometry/mxgeometry3d.h"
-#include "mxgeometry/mxmatrix.h"
+
+class Matrix4;
 
 // SIZE 0x50
 class LegoUnknown {