(Refactor) Use more forward declarations (#881)

* Use more forward declarations

* Use more forward declarations

* Add more forward declarations

* Fix

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)

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)
 

LEGO1/lego/legoomni/src/actors/helicopter.cpp

@@ -3,11 +3,13 @@
 #include "act1state.h"
 #include "act3.h"
 #include "act3_actions.h"
+#include "helicopterstate.h"
 #include "isle.h"
 #include "isle_actions.h"
 #include "jukebox.h"
 #include "jukebox_actions.h"
 #include "legoanimationmanager.h"
+#include "legocameracontroller.h"
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoomni.h"

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"
 

LEGO1/lego/legoomni/src/actors/jukeboxentity.cpp

@@ -12,6 +12,7 @@
 #include "mxbackgroundaudiomanager.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
+#include "mxnotificationparam.h"
 #include "mxtransitionmanager.h"
 
 DECOMP_SIZE_ASSERT(JukeBoxEntity, 0x6c)

LEGO1/lego/legoomni/src/actors/radio.cpp

@@ -4,11 +4,14 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoomni.h"
+#include "legoworld.h"
 #include "misc.h"
+#include "mxactionnotificationparam.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxcontrolpresenter.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
+#include "radiostate.h"
 
 DECOMP_SIZE_ASSERT(Radio, 0x10)
 

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"

LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp

@@ -1,8 +1,10 @@
 #include "legoloadcachesoundpresenter.h"
 
+#include "legocachesoundmanager.h"
 #include "legocachsound.h"
 #include "legosoundmanager.h"
 #include "misc.h"
+#include "mxdssubscriber.h"
 #include "mxstreamchunk.h"
 #include "mxwavepresenter.h"
 

LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp

@@ -1,5 +1,6 @@
 #include "legosoundmanager.h"
 
+#include "legocachesoundmanager.h"
 #include "mxautolock.h"
 #include "mxomni.h"
 

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"

LEGO1/lego/legoomni/src/build/buildingentity.cpp

@@ -2,6 +2,7 @@
 
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
+#include "mxnotificationparam.h"
 
 DECOMP_SIZE_ASSERT(BuildingEntity, 0x68)
 

LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp

@@ -5,10 +5,12 @@
 #include "legoomni.h"
 #include "legoutils.h"
 #include "mxcompositepresenter.h"
+#include "mxdssubscriber.h"
 #include "mxmediapresenter.h"
 #include "mxmisc.h"
 #include "mxstreamchunk.h"
 #include "mxticklemanager.h"
+#include "mxutilities.h"
 
 DECOMP_SIZE_ASSERT(LegoActionControlPresenter, 0x68)
 

LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp

@@ -1,19 +1,23 @@
 #include "legoanimationmanager.h"
 
+#include "animstate.h"
 #include "define.h"
 #include "islepathactor.h"
 #include "legocharactermanager.h"
 #include "legoendanimnotificationparam.h"
+#include "legoextraactor.h"
 #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"
-#include "roi/legoroi.h"
 
 #include <io.h>
 

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"

LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp

@@ -1,10 +1,13 @@
 #include "legobackgroundcolor.h"
 
+#include "3dmanager/lego3dmanager.h"
 #include "decomp.h"
 #include "legoutils.h"
 #include "legovideomanager.h"
 #include "misc.h"
 
+#include <stdio.h>
+
 DECOMP_SIZE_ASSERT(LegoBackgroundColor, 0x30)
 
 // GLOBAL: LEGO1 0x100f3fb0

LEGO1/lego/legoomni/src/common/legocharactermanager.cpp

@@ -1,15 +1,20 @@
 #include "legocharactermanager.h"
 
+#include "3dmanager/lego3dmanager.h"
 #include "legoanimactor.h"
 #include "legocharacters.h"
+#include "legoextraactor.h"
 #include "legogamestate.h"
+#include "legovariables.h"
 #include "legovideomanager.h"
 #include "misc.h"
 #include "misc/legocontainer.h"
+#include "misc/legostorage.h"
 #include "mxmisc.h"
+#include "mxvariabletable.h"
 #include "realtime/realtime.h"
 #include "roi/legolod.h"
-#include "roi/legoroi.h"
+#include "viewmanager/viewmanager.h"
 
 #include <vec.h>
 

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"
@@ -28,8 +29,10 @@
 #include "jukebox_actions.h"
 #include "jukeboxw_actions.h"
 #include "legoanimationmanager.h"
+#include "legobackgroundcolor.h"
 #include "legobuildingmanager.h"
 #include "legocharactermanager.h"
+#include "legofullscreenmovie.h"
 #include "legonavcontroller.h"
 #include "legoomni.h"
 #include "legoplantmanager.h"
@@ -40,8 +43,11 @@
 #include "misc.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxmisc.h"
+#include "mxnotificationmanager.h"
+#include "mxnotificationparam.h"
 #include "mxobjectfactory.h"
 #include "mxstring.h"
+#include "mxutilities.h"
 #include "mxvariabletable.h"
 #include "police_actions.h"
 #include "racecar.h"

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)

LEGO1/lego/legoomni/src/common/legoutils.cpp

@@ -1,6 +1,8 @@
 #include "legoutils.h"
 
+#include "3dmanager/lego3dmanager.h"
 #include "act1state.h"
+#include "anim/legoanim.h"
 #include "islepathactor.h"
 #include "legoanimpresenter.h"
 #include "legogamestate.h"
@@ -8,14 +10,18 @@
 #include "legonamedtexture.h"
 #include "legoomni.h"
 #include "legosoundmanager.h"
+#include "legovideomanager.h"
 #include "legoworld.h"
 #include "legoworldlist.h"
 #include "misc.h"
+#include "misc/legotree.h"
 #include "mxdsaction.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxstreamer.h"
 #include "mxtypes.h"
+#include "mxutilities.h"
+#include "mxvariabletable.h"
 #include "realtime/realtime.h"
 
 #include <process.h>

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"

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;

LEGO1/lego/legoomni/src/common/mxtransitionmanager.cpp

@@ -6,6 +6,7 @@
 #include "legoworld.h"
 #include "misc.h"
 #include "mxbackgroundaudiomanager.h"
+#include "mxdisplaysurface.h"
 #include "mxmisc.h"
 #include "mxparam.h"
 #include "mxticklemanager.h"

LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp

@@ -4,6 +4,7 @@
 #include "legovideomanager.h"
 #include "misc.h"
 #include "mxcontrolpresenter.h"
+#include "mxdsaction.h"
 #include "mxmisc.h"
 #include "mxpresenter.h"
 #include "mxticklemanager.h"

LEGO1/lego/legoomni/src/control/legometerpresenter.cpp

@@ -2,6 +2,7 @@
 
 #include "decomp.h"
 #include "mxbitmap.h"
+#include "mxdsaction.h"
 #include "mxutilities.h"
 
 DECOMP_SIZE_ASSERT(LegoMeterPresenter, 0x94)

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)
 

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>
 

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)

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>
 

LEGO1/lego/legoomni/src/entity/legoworld.cpp

@@ -1,9 +1,12 @@
 #include "legoworld.h"
 
+#include "anim/legoanim.h"
 #include "islepathactor.h"
 #include "legoanimationmanager.h"
 #include "legoanimpresenter.h"
 #include "legobuildingmanager.h"
+#include "legocachesoundmanager.h"
+#include "legocameracontroller.h"
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
@@ -21,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)

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)
 

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"

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"
@@ -19,15 +20,19 @@
 #include "mxactionnotificationparam.h"
 #include "mxautolock.h"
 #include "mxbackgroundaudiomanager.h"
+#include "mxdisplaysurface.h"
 #include "mxdsfile.h"
 #include "mxmisc.h"
+#include "mxnotificationmanager.h"
 #include "mxomnicreateflags.h"
 #include "mxomnicreateparam.h"
 #include "mxstreamer.h"
 #include "mxticklemanager.h"
 #include "mxtransitionmanager.h"
+#include "mxvariabletable.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)

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"

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"

LEGO1/lego/legoomni/src/paths/legopathactor.cpp

@@ -1,11 +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>
 

LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp

@@ -1,8 +1,11 @@
 #include "legopathpresenter.h"
 
+#include "legopathcontroller.h"
 #include "legovideomanager.h"
+#include "legoworld.h"
 #include "misc.h"
 #include "mxautolock.h"
+#include "mxdssubscriber.h"
 #include "mxutilities.h"
 
 DECOMP_SIZE_ASSERT(LegoPathPresenter, 0x54)

LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp

@@ -1,8 +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"
@@ -12,13 +15,16 @@
 #include "mxautolock.h"
 #include "mxcompositepresenter.h"
 #include "mxdsanim.h"
+#include "mxdssubscriber.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxstreamchunk.h"
 #include "mxtimer.h"
 #include "mxutilities.h"
+#include "mxvariabletable.h"
 #include "mxvideomanager.h"
 #include "realtime/realtime.h"
+#include "viewmanager/viewmanager.h"
 
 DECOMP_SIZE_ASSERT(LegoAnimPresenter, 0xbc)
 

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,8 @@
 #include "misc/legotexture.h"
 #include "misc/version.h"
 #include "mxcompositepresenter.h"
+#include "mxdirectx/mxdirect3d.h"
+#include "mxdssubscriber.h"
 #include "mxutilities.h"
 #include "realtime/realtime.h"
 #include "roi/legoroi.h"

LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp

@@ -3,6 +3,9 @@
 #include "legovideomanager.h"
 #include "misc.h"
 #include "misc/legostorage.h"
+#include "mxdsaction.h"
+#include "mxdssubscriber.h"
+#include "mxpalette.h"
 #include "mxstreamchunk.h"
 
 DECOMP_SIZE_ASSERT(LegoPalettePresenter, 0x68)

LEGO1/lego/legoomni/src/video/legopartpresenter.cpp

@@ -5,6 +5,9 @@
 #include "misc/legocontainer.h"
 #include "misc/legostorage.h"
 #include "misc/legotexture.h"
+#include "mxdirectx/mxdirect3d.h"
+#include "mxdsaction.h"
+#include "mxdssubscriber.h"
 #include "viewmanager/viewlodlist.h"
 
 DECOMP_SIZE_ASSERT(LegoLODList, 0x18)

LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp

@@ -1,9 +1,11 @@
 #include "legophonemepresenter.h"
 
 #include "legocharactermanager.h"
+#include "legovideomanager.h"
 #include "misc.h"
 #include "misc/legocontainer.h"
 #include "mxcompositepresenter.h"
+#include "mxdsaction.h"
 
 DECOMP_SIZE_ASSERT(LegoPhonemePresenter, 0x88)
 

LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp

@@ -6,6 +6,8 @@
 #include "misc/legoimage.h"
 #include "misc/legostorage.h"
 #include "mxcompositepresenter.h"
+#include "mxdirectx/mxdirect3d.h"
+#include "mxdssubscriber.h"
 
 DECOMP_SIZE_ASSERT(LegoTexturePresenter, 0x54)
 DECOMP_SIZE_ASSERT(LegoNamedTexture, 0x14)

LEGO1/lego/legoomni/src/video/legovideomanager.cpp

@@ -1,8 +1,15 @@
 #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 "mxdisplaysurface.h"
 #include "mxmisc.h"
+#include "mxpalette.h"
+#include "mxregion.h"
 #include "mxtimer.h"
 #include "mxtransitionmanager.h"
 #include "realtime/matrix.h"

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)
 

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"

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)

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"

LEGO1/lego/legoomni/src/worlds/infocenter.cpp

@@ -22,12 +22,16 @@
 #include "mxactionnotificationparam.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxcontrolpresenter.h"
+#include "mxdisplaysurface.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #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)

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"
@@ -13,6 +14,7 @@
 #include "jukebox_actions.h"
 #include "jukeboxentity.h"
 #include "legoanimationmanager.h"
+#include "legobackgroundcolor.h"
 #include "legocontrolmanager.h"
 #include "legoinputmanager.h"
 #include "legoomni.h"
@@ -21,11 +23,13 @@
 #include "legovideomanager.h"
 #include "misc.h"
 #include "motocycle.h"
+#include "mxactionnotificationparam.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxstillpresenter.h"
 #include "mxtransitionmanager.h"
+#include "mxvariabletable.h"
 #include "pizza.h"
 #include "skateboard.h"
 #include "towtrack.h"

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"

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"

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)