diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index f30b220e..44420792 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -6,6 +6,7 @@
 #include "legogamestate.h"
 #include "legoinputmanager.h"
 #include "legomodelpresenter.h"
+#include "legoomni.h"
 #include "legopartpresenter.h"
 #include "legovideomanager.h"
 #include "legoworldpresenter.h"
diff --git a/LEGO1/lego/legoomni/include/mxtransitionmanager.h b/LEGO1/lego/legoomni/include/mxtransitionmanager.h
index 89f0d73b..31fcdb7e 100644
--- a/LEGO1/lego/legoomni/include/mxtransitionmanager.h
+++ b/LEGO1/lego/legoomni/include/mxtransitionmanager.h
@@ -1,13 +1,15 @@
 #ifndef MXTRANSITIONMANAGER_H
 #define MXTRANSITIONMANAGER_H
 
-#include "legoomni.h"
+#include "decomp.h"
 #include "mxcore.h"
-#include "mxvideopresenter.h"
 
 #include <ddraw.h>
 
+class MxVideoPresenter;
+
 // VTABLE: LEGO1 0x100d7ea0
+// SIZE 0x900
 class MxTransitionManager : public MxCore {
 public:
 	MxTransitionManager();
diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
index 82c9459d..49d7f8ff 100644
--- a/LEGO1/lego/legoomni/src/build/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopter.cpp
@@ -7,6 +7,7 @@
 #include "legoanimationmanager.h"
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
+#include "legoomni.h"
 #include "legoutil.h"
 #include "legoworld.h"
 #include "misc.h"
diff --git a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
index 10d52fb8..3c5c7e27 100644
--- a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
@@ -5,6 +5,7 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
+#include "legoomni.h"
 #include "legovariables.h"
 #include "misc.h"
 #include "mxmisc.h"
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index c74adca2..41f76390 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -11,6 +11,7 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
+#include "legoomni.h"
 #include "legoplantmanager.h"
 #include "legoutil.h"
 #include "legovideomanager.h"
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
index f8d861a4..5654fd34 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
@@ -5,6 +5,7 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
+#include "legoomni.h"
 #include "misc.h"
 #include "mxactionnotificationparam.h"
 #include "mxbackgroundaudiomanager.h"
diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
index 75eac739..187c9918 100644
--- a/LEGO1/lego/legoomni/src/infocenter/score.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/score.cpp
@@ -5,6 +5,7 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
+#include "legoomni.h"
 #include "misc.h"
 #include "misc/legocontainer.h"
 #include "mxmisc.h"
diff --git a/LEGO1/lego/legoomni/src/isle/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp
index 19d43376..aa293c1a 100644
--- a/LEGO1/lego/legoomni/src/isle/isle.cpp
+++ b/LEGO1/lego/legoomni/src/isle/isle.cpp
@@ -6,6 +6,7 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
+#include "legoomni.h"
 #include "legoutil.h"
 #include "misc.h"
 #include "mxmisc.h"
diff --git a/LEGO1/lego/legoomni/src/isle/jukebox.cpp b/LEGO1/lego/legoomni/src/isle/jukebox.cpp
index e2a49f8b..63011a31 100644
--- a/LEGO1/lego/legoomni/src/isle/jukebox.cpp
+++ b/LEGO1/lego/legoomni/src/isle/jukebox.cpp
@@ -5,6 +5,7 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
+#include "legoomni.h"
 #include "misc.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
diff --git a/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp b/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
index 522e38d5..c3243624 100644
--- a/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
+++ b/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
@@ -4,6 +4,7 @@
 #include "islepathactor.h"
 #include "jukeboxstate.h"
 #include "legogamestate.h"
+#include "legoomni.h"
 #include "legoutil.h"
 #include "misc.h"
 #include "mxbackgroundaudiomanager.h"
diff --git a/LEGO1/lego/legoomni/src/police/police.cpp b/LEGO1/lego/legoomni/src/police/police.cpp
index a87b7c7c..59d89120 100644
--- a/LEGO1/lego/legoomni/src/police/police.cpp
+++ b/LEGO1/lego/legoomni/src/police/police.cpp
@@ -4,6 +4,7 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
+#include "legoomni.h"
 #include "misc.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxmisc.h"
diff --git a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
index c89b1e90..a45650e3 100644
--- a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
@@ -1,5 +1,6 @@
 #include "legovideomanager.h"
 
+#include "legoomni.h"
 #include "misc.h"
 #include "mxmisc.h"
 #include "mxtimer.h"
diff --git a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
index 10e0c7cc..65e8387e 100644
--- a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
@@ -9,6 +9,7 @@
 #include "mxmisc.h"
 #include "mxparam.h"
 #include "mxticklemanager.h"
+#include "mxvideopresenter.h"
 
 DECOMP_SIZE_ASSERT(MxTransitionManager, 0x900);