(Refactor) Use more forward declarations (#881)

* Use more forward declarations

* Use more forward declarations

* Add more forward declarations

* Fix

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"
@@ -20,7 +22,9 @@
 #include "mxticklemanager.h"
 #include "mxtimer.h"
 #include "mxtransitionmanager.h"
+#include "mxvariabletable.h"
 #include "res/resource.h"
+#include "roi/legoroi.h"
 #include "viewmanager/viewmanager.h"
 
 #include <dsound.h>

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

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 {

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 {

LEGO1/lego/legoomni/include/helicopter.h

@@ -1,10 +1,11 @@
 #ifndef HELICOPTER_H
 #define HELICOPTER_H
 
-#include "helicopterstate.h"
 #include "islepathactor.h"
 #include "realtime/matrix.h"
 
+class HelicopterState;
+
 // VTABLE: LEGO1 0x100d40f8
 // SIZE 0x230
 class Helicopter : public IslePathActor {

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

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

LEGO1/lego/legoomni/include/infocenter.h

@@ -8,6 +8,7 @@
 #include "radio.h"
 
 class InfocenterState;
+class MxNotificationParam;
 class MxStillPresenter;
 class LegoControlManagerEvent;
 

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

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

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

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 {

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

LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h

@@ -2,14 +2,15 @@
 #define LEGOACTIONCONTROLPRESENTER_H
 
 #include "decomp.h"
-#include "legoutils.h"
+#include "extra.h"
 #include "mxmediapresenter.h"
+#include "mxstring.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

LEGO1/lego/legoomni/include/legoactor.h

@@ -2,9 +2,10 @@
 #define LEGOACTOR_H
 
 #include "decomp.h"
-#include "legocachsound.h"
 #include "legoentity.h"
 
+class LegoCacheSound;
+
 // VTABLE: LEGO1 0x100d6d68
 // SIZE 0x78
 class LegoActor : public LegoEntity {

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);

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

LEGO1/lego/legoomni/include/legoanimmmpresenter.h

@@ -2,12 +2,12 @@
 #define LEGOANIMMMPRESENTER_H
 
 #include "mxcompositepresenter.h"
-#include "mxgeometry/mxmatrix.h"
 
 class LegoAnimPresenter;
 class LegoWorld;
 class LegoROI;
 struct LegoTranInfo;
+class MxMatrix;
 
 // VTABLE: LEGO1 0x100d7de8
 // SIZE 0x74

LEGO1/lego/legoomni/include/legoanimpresenter.h

@@ -1,16 +1,16 @@
 #ifndef LEGOANIMPRESENTER_H
 #define LEGOANIMPRESENTER_H
 
-#include "anim/legoanim.h"
 #include "legoroilist.h"
-#include "mxgeometry/mxgeometry3d.h"
-#include "mxgeometry/mxmatrix.h"
+#include "mxatom.h"
 #include "mxvideopresenter.h"
 
+class LegoAnim;
 class LegoWorld;
-class LegoAnimClass;
 class LegoAnimActor;
 class LegoPathBoundary;
+class MxMatrix;
+class Vector3;
 
 struct LegoAnimStructComparator {
 	MxBool operator()(const char* const& p_a, const char* const& p_b) const { return strcmp(p_a, p_b) < 0; }

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

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) {}

LEGO1/lego/legoomni/include/legocameracontroller.h

@@ -2,7 +2,6 @@
 #define LEGOCAMERACONTROLLER_H
 
 #include "legopointofviewcontroller.h"
-#include "mxcore.h"
 #include "mxgeometry/mxgeometry3d.h"
 #include "mxgeometry/mxmatrix.h"
 #include "mxpoint32.h"

LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h

@@ -1,6 +1,7 @@
 #ifndef LEGOCARBUILDANIMPRESENTER_H
 #define LEGOCARBUILDANIMPRESENTER_H
 
+#include "anim/legoanim.h"
 #include "legoanimpresenter.h"
 
 // VTABLE: LEGO1 0x100d99e0

LEGO1/lego/legoomni/include/legocharactermanager.h

@@ -2,13 +2,14 @@
 #define LEGOCHARACTERMANAGER_H
 
 #include "decomp.h"
-#include "legoextraactor.h"
-#include "legovariables.h"
-#include "misc/legostorage.h"
 #include "mxstl/stlcompat.h"
 #include "mxtypes.h"
+#include "roi/legoroi.h"
 
+class CustomizeAnimFileVariable;
 class LegoActor;
+class LegoExtraActor;
+class LegoStorage;
 class LegoROI;
 
 #pragma warning(disable : 4237)

LEGO1/lego/legoomni/include/legoentity.h

@@ -3,10 +3,11 @@
 
 #include "decomp.h"
 #include "extra.h"
-#include "mxdsaction.h"
 #include "mxentity.h"
-#include "realtime/vector.h"
-#include "roi/legoroi.h"
+
+class LegoROI;
+class MxDSAction;
+class Vector3;
 
 // VTABLE: LEGO1 0x100d4858
 // SIZE 0x68

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 *>
 

LEGO1/lego/legoomni/include/legoentitypresenter.h

@@ -4,6 +4,7 @@
 #include "mxcompositepresenter.h"
 
 class LegoEntity;
+class Vector3;
 
 // VTABLE: LEGO1 0x100d8398
 // SIZE 0x50

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 {

LEGO1/lego/legoomni/include/legogamestate.h

@@ -3,14 +3,17 @@
 
 #include "actionsfwd.h"
 #include "decomp.h"
-#include "legobackgroundcolor.h"
-#include "legofullscreenmovie.h"
-#include "misc/legostorage.h"
 #include "mxtypes.h"
-#include "mxvariabletable.h"
 
+#include <string.h>
+
+class LegoBackgroundColor;
+class LegoFile;
+class LegoFullScreenMovie;
 class LegoState;
+class LegoStorage;
 class MxVariable;
+class MxVariableTable;
 class MxString;
 
 // SIZE 0x08

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;

LEGO1/lego/legoomni/include/legometerpresenter.h

@@ -2,6 +2,7 @@
 #define LEGOMETERPRESENTER_H
 
 #include "mxstillpresenter.h"
+#include "mxstring.h"
 
 // VTABLE: LEGO1 0x100d7ac8
 // SIZE 0x94

LEGO1/lego/legoomni/include/legonavcontroller.h

@@ -4,7 +4,8 @@
 #include "decomp.h"
 #include "mxcore.h"
 #include "mxtypes.h"
-#include "realtime/vector.h"
+
+class Vector3;
 
 //////////////////////////////////////////////////////////////////////////////
 //

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 {

LEGO1/lego/legoomni/include/legopathactor.h

@@ -1,14 +1,15 @@
 #ifndef LEGOPATHACTOR_H
 #define LEGOPATHACTOR_H
 
-#include "geom/legounkown100db7f4.h"
 #include "legoactor.h"
 #include "misc/legounknown.h"
+#include "mxgeometry/mxmatrix.h"
 #include "mxtypes.h"
-#include "realtime/matrix.h"
 
+struct LegoEdge;
 class LegoPathBoundary;
 class LegoPathController;
+class LegoUnknown100db7f4;
 
 // VTABLE: LEGO1 0x100d6e28
 // SIZE 0x154

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
 	{

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; }

LEGO1/lego/legoomni/include/legopathpresenter.h

@@ -1,6 +1,7 @@
 #ifndef LEGOPATHPRESENTER_H
 #define LEGOPATHPRESENTER_H
 
+#include "mxatom.h"
 #include "mxmediapresenter.h"
 
 // VTABLE: LEGO1 0x100d7c10

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

LEGO1/lego/legoomni/include/legoraceactor.h

@@ -2,7 +2,8 @@
 #define LEGORACEACTOR_H
 
 #include "legoanimactor.h"
-#include "realtime/matrix.h"
+
+class Matrix4;
 
 /*
 	VTABLE: LEGO1 0x100d5b78 LegoAnimActor

LEGO1/lego/legoomni/include/legoracecar.h

@@ -2,7 +2,6 @@
 #define LEGORACECAR_H
 
 #include "legocarraceactor.h"
-#include "legopathactor.h"
 #include "legoracemap.h"
 
 /*

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 {

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

LEGO1/lego/legoomni/include/legotraninfo.h

@@ -3,6 +3,7 @@
 
 #include "decomp.h"
 #include "mxgeometry/mxmatrix.h"
+#include "mxtypes.h"
 
 struct AnimInfo;
 class LegoAnimMMPresenter;

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 {

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;

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

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;
 

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;

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 {

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

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

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

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

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

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

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"