diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20fe5dac..88bd836d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -217,6 +217,7 @@ add_library(omni STATIC
   LEGO1/omni/src/common/mxcore.cpp
   LEGO1/omni/src/common/mxmediamanager.cpp
   LEGO1/omni/src/common/mxmediapresenter.cpp
+  LEGO1/omni/src/common/mxmisc.cpp
   LEGO1/omni/src/common/mxobjectfactory.cpp
   LEGO1/omni/src/common/mxpresenter.cpp
   LEGO1/omni/src/common/mxstring.cpp
diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index 95bc6f62..11a7399b 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -6,12 +6,12 @@
 #include "legogamestate.h"
 #include "legoinputmanager.h"
 #include "legomodelpresenter.h"
-#include "legoomni.h"
 #include "legopartpresenter.h"
 #include "legovideomanager.h"
 #include "legoworldpresenter.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxdsaction.h"
+#include "mxmisc.h"
 #include "mxomnicreateflags.h"
 #include "mxomnicreateparam.h"
 #include "mxstreamer.h"
diff --git a/LEGO1/lego/legoomni/include/pizza.h b/LEGO1/lego/legoomni/include/pizza.h
index 5ba1da94..1b67bc6d 100644
--- a/LEGO1/lego/legoomni/include/pizza.h
+++ b/LEGO1/lego/legoomni/include/pizza.h
@@ -3,10 +3,6 @@
 
 #include "decomp.h"
 #include "isleactor.h"
-#include "mxcore.h"
-#include "mxomni.h"
-#include "mxticklemanager.h"
-#include "mxtypes.h"
 
 // VTABLE: LEGO1 0x100d7380
 // SIZE 0x9c
diff --git a/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp b/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
index f0be968d..e4fee977 100644
--- a/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
+++ b/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
@@ -1,6 +1,7 @@
 #include "legosoundmanager.h"
 
 #include "mxautolocker.h"
+#include "mxomni.h"
 
 // FUNCTION: LEGO1 0x100298a0
 LegoSoundManager::LegoSoundManager()
diff --git a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
index 734c9be7..ecdfe135 100644
--- a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
+++ b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
@@ -3,7 +3,7 @@
 #include "legoomni.h"
 #include "mxcompositepresenter.h"
 #include "mxdssound.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxpresenter.h"
 #include "mxstreamer.h"
 #include "mxticklemanager.h"
diff --git a/LEGO1/lego/legoomni/src/build/buildingentity.cpp b/LEGO1/lego/legoomni/src/build/buildingentity.cpp
index f8ff1a83..01eb235b 100644
--- a/LEGO1/lego/legoomni/src/build/buildingentity.cpp
+++ b/LEGO1/lego/legoomni/src/build/buildingentity.cpp
@@ -1,6 +1,6 @@
 #include "buildingentity.h"
 
-#include "legoomni.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 
 // FUNCTION: LEGO1 0x10014e20
diff --git a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
index 9a5c3641..f97e17d4 100644
--- a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
@@ -6,7 +6,7 @@
 #include "legoutil.h"
 #include "mxcompositepresenter.h"
 #include "mxmediapresenter.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxstreamchunk.h"
 #include "mxticklemanager.h"
 
diff --git a/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp b/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp
index 1f2aa70d..2cc1baaa 100644
--- a/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp
+++ b/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp
@@ -1,7 +1,7 @@
 #include "legocharactermanager.h"
 
 #include "legogamestate.h"
-#include "legoomni.h"
+#include "mxmisc.h"
 #include "roi/legoroi.h"
 
 DECOMP_SIZE_ASSERT(LegoCharacterManager, 0x08)
diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index 76d8253a..d77861ca 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -19,6 +19,7 @@
 #include "legovideomanager.h"
 #include "legoworld.h"
 #include "mxbackgroundaudiomanager.h"
+#include "mxmisc.h"
 #include "mxobjectfactory.h"
 #include "mxstring.h"
 #include "mxvariabletable.h"
diff --git a/LEGO1/lego/legoomni/src/common/legoutil.cpp b/LEGO1/lego/legoomni/src/common/legoutil.cpp
index d85c51ce..8abf8e8e 100644
--- a/LEGO1/lego/legoomni/src/common/legoutil.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoutil.cpp
@@ -6,8 +6,8 @@
 #include "legoworld.h"
 #include "legoworldlist.h"
 #include "mxdsaction.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
-#include "mxomni.h"
 #include "mxstreamer.h"
 #include "mxtypes.h"
 
diff --git a/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
index 355cf12f..da5327d8 100644
--- a/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
+++ b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
@@ -6,6 +6,7 @@
 #include "mxautolocker.h"
 #include "mxdsmultiaction.h"
 #include "mxmediapresenter.h"
+#include "mxmisc.h"
 #include "mxobjectfactory.h"
 #include "mxtimer.h"
 
diff --git a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
index 8ff38b9c..8ccb53ea 100644
--- a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
+++ b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
@@ -4,6 +4,7 @@
 #include "legoomni.h"
 #include "legovideomanager.h"
 #include "mxcontrolpresenter.h"
+#include "mxmisc.h"
 #include "mxpresenter.h"
 #include "mxticklemanager.h"
 
diff --git a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
index a3d13457..0db69c06 100644
--- a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
@@ -3,6 +3,7 @@
 #include "define.h"
 #include "legocontrolmanager.h"
 #include "mxdsmultiaction.h"
+#include "mxmisc.h"
 #include "mxticklemanager.h"
 #include "mxtimer.h"
 #include "mxutil.h"
diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
index bd33b4b4..689c6009 100644
--- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp
@@ -8,6 +8,7 @@
 #include "legoutil.h"
 #include "legovideomanager.h"
 #include "legoworld.h"
+#include "mxmisc.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 e6dc33a2..30816149 100644
--- a/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
@@ -4,29 +4,41 @@
 #include "legoomni.h"
 #include "legoutil.h"
 #include "legovideomanager.h"
+#include "mxmisc.h"
 
 // GLOBAL: LEGO1 0x100f4c28
 int g_mouseDeadzone = 40;
+
 // GLOBAL: LEGO1 0x100f4c2c
 float g_zeroThreshold = 0.001f;
+
 // GLOBAL: LEGO1 0x100f4c30
 float g_movementMaxSpeed = 40.0f;
+
 // GLOBAL: LEGO1 0x100f4c34
 float g_turnMaxSpeed = 20.0f;
+
 // GLOBAL: LEGO1 0x100f4c38
 float g_movementMaxAccel = 15.0f;
+
 // GLOBAL: LEGO1 0x100f4c3c
 float g_turnMaxAccel = 30.0f;
+
 // GLOBAL: LEGO1 0x100f4c40
 float g_movementMinAccel = 4.0f;
+
 // GLOBAL: LEGO1 0x100f4c44
 float g_turnMinAccel = 15.0f;
+
 // GLOBAL: LEGO1 0x100f4c48
 float g_movementDecel = 50.0f;
+
 // GLOBAL: LEGO1 0x100f4c4c
 float g_turnDecel = 50.0f;
+
 // GLOBAL: LEGO1 0x100f4c50
 float g_turnSensitivity = 0.4f;
+
 // GLOBAL: LEGO1 0x100f4c54
 MxBool g_turnUseVelocity = FALSE;
 
diff --git a/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp b/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
index f656022d..0f218c43 100644
--- a/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
@@ -1,6 +1,7 @@
 #include "legonavcontroller.h"
 #include "legoomni.h"
 #include "legopointofviewcontroller.h"
+#include "mxmisc.h"
 #include "mxticklemanager.h"
 
 DECOMP_SIZE_ASSERT(LegoMouseController, 0x20);
diff --git a/LEGO1/lego/legoomni/src/entity/legorace.cpp b/LEGO1/lego/legoomni/src/entity/legorace.cpp
index 7c65c4da..034d3af8 100644
--- a/LEGO1/lego/legoomni/src/entity/legorace.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legorace.cpp
@@ -1,5 +1,6 @@
 #include "legorace.h"
 
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 
 DECOMP_SIZE_ASSERT(LegoRace, 0x144)
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index d7aab174..fa3a2a2b 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -15,9 +15,9 @@
 #include "legovideomanager.h"
 #include "mxactionnotificationparam.h"
 #include "mxcontrolpresenter.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxnotificationparam.h"
-#include "mxomni.h"
 #include "mxticklemanager.h"
 
 DECOMP_SIZE_ASSERT(LegoWorld, 0xf8)
diff --git a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
index e3555d7a..476ffa37 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
@@ -19,6 +19,7 @@
 #include "mxdschunk.h"
 #include "mxdsmediaaction.h"
 #include "mxdsmultiaction.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxobjectfactory.h"
 #include "mxpresenter.h"
diff --git a/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
index 4aacb404..07e85b5c 100644
--- a/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
+++ b/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
@@ -4,6 +4,7 @@
 #include "legogamestate.h"
 #include "legoinputmanager.h"
 #include "legoomni.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxticklemanager.h"
 
diff --git a/LEGO1/lego/legoomni/src/hospital/hospital.cpp b/LEGO1/lego/legoomni/src/hospital/hospital.cpp
index e298ef34..6dfee325 100644
--- a/LEGO1/lego/legoomni/src/hospital/hospital.cpp
+++ b/LEGO1/lego/legoomni/src/hospital/hospital.cpp
@@ -1,7 +1,7 @@
 #include "hospital.h"
 
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
-#include "mxomni.h"
 
 DECOMP_SIZE_ASSERT(Hospital, 0x12c)
 
diff --git a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
index 960cf40e..60d2479a 100644
--- a/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
@@ -7,8 +7,8 @@
 #include "legoinputmanager.h"
 #include "legoomni.h"
 #include "legovariables.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
-#include "mxomni.h"
 #include "mxtransitionmanager.h"
 
 DECOMP_SIZE_ASSERT(ElevatorBottom, 0xfc)
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index fc32d61f..5e209055 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -18,6 +18,7 @@
 #include "mxactionnotificationparam.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxcontrolpresenter.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxstillpresenter.h"
 #include "mxticklemanager.h"
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
index 2553956b..40dd70b3 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
@@ -5,9 +5,9 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
-#include "legoomni.h"
 #include "mxactionnotificationparam.h"
 #include "mxbackgroundaudiomanager.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxtransitionmanager.h"
 
diff --git a/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp b/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
index d8ae7003..a5a17612 100644
--- a/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp
@@ -6,6 +6,7 @@
 #include "legoinputmanager.h"
 #include "legoomni.h"
 #include "mxactionnotificationparam.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxtimer.h"
 
diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
index 0f924725..aeade035 100644
--- a/LEGO1/lego/legoomni/src/infocenter/score.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/score.cpp
@@ -5,8 +5,8 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
-#include "legoomni.h"
 #include "misc/legocontainer.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxnotificationparam.h"
 #include "mxtransitionmanager.h"
diff --git a/LEGO1/lego/legoomni/src/isle/historybook.cpp b/LEGO1/lego/legoomni/src/isle/historybook.cpp
index 33659bf5..7e83aa71 100644
--- a/LEGO1/lego/legoomni/src/isle/historybook.cpp
+++ b/LEGO1/lego/legoomni/src/isle/historybook.cpp
@@ -3,9 +3,8 @@
 #include "jukebox.h"
 #include "legocontrolmanager.h"
 #include "legoinputmanager.h"
-#include "legoomni.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
-#include "mxomni.h"
 #include "mxtransitionmanager.h"
 
 DECOMP_SIZE_ASSERT(HistoryBook, 0x3e4)
diff --git a/LEGO1/lego/legoomni/src/isle/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp
index bf3f912d..eaa4421e 100644
--- a/LEGO1/lego/legoomni/src/isle/isle.cpp
+++ b/LEGO1/lego/legoomni/src/isle/isle.cpp
@@ -6,8 +6,8 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
-#include "legoomni.h"
 #include "legoutil.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxtransitionmanager.h"
 #include "pizza.h"
diff --git a/LEGO1/lego/legoomni/src/isle/jukebox.cpp b/LEGO1/lego/legoomni/src/isle/jukebox.cpp
index 70c1bb0a..6febadb1 100644
--- a/LEGO1/lego/legoomni/src/isle/jukebox.cpp
+++ b/LEGO1/lego/legoomni/src/isle/jukebox.cpp
@@ -5,9 +5,8 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
-#include "legoomni.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
-#include "mxomni.h"
 #include "mxstillpresenter.h"
 #include "mxticklemanager.h"
 #include "mxtransitionmanager.h"
diff --git a/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp b/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
index 1fed8533..481ceb76 100644
--- a/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
+++ b/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp
@@ -6,6 +6,7 @@
 #include "legogamestate.h"
 #include "legoutil.h"
 #include "mxbackgroundaudiomanager.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxtransitionmanager.h"
 
diff --git a/LEGO1/lego/legoomni/src/isle/radio.cpp b/LEGO1/lego/legoomni/src/isle/radio.cpp
index c0a4e44d..30179fcc 100644
--- a/LEGO1/lego/legoomni/src/isle/radio.cpp
+++ b/LEGO1/lego/legoomni/src/isle/radio.cpp
@@ -5,6 +5,7 @@
 #include "legoomni.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxcontrolpresenter.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 
 DECOMP_SIZE_ASSERT(Radio, 0x10);
diff --git a/LEGO1/lego/legoomni/src/isle/radiostate.cpp b/LEGO1/lego/legoomni/src/isle/radiostate.cpp
index 077864a7..faae33c7 100644
--- a/LEGO1/lego/legoomni/src/isle/radiostate.cpp
+++ b/LEGO1/lego/legoomni/src/isle/radiostate.cpp
@@ -2,6 +2,7 @@
 
 #include "jukebox.h"
 #include "legoomni.h"
+#include "mxmisc.h"
 #include "mxtimer.h"
 
 // GLOBAL: LEGO1 0x100f3218
diff --git a/LEGO1/lego/legoomni/src/isle/skateboard.cpp b/LEGO1/lego/legoomni/src/isle/skateboard.cpp
index 22998f85..759ce4b6 100644
--- a/LEGO1/lego/legoomni/src/isle/skateboard.cpp
+++ b/LEGO1/lego/legoomni/src/isle/skateboard.cpp
@@ -1,8 +1,8 @@
 #include "skateboard.h"
 
 #include "decomp.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
-#include "mxomni.h"
 
 DECOMP_SIZE_ASSERT(SkateBoard, 0x168);
 
diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp
index bba07b2c..0f52af42 100644
--- a/LEGO1/lego/legoomni/src/main/legoomni.cpp
+++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp
@@ -18,6 +18,7 @@
 #include "mxautolocker.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxdsfile.h"
+#include "mxmisc.h"
 #include "mxomnicreateflags.h"
 #include "mxomnicreateparam.h"
 #include "mxstreamer.h"
diff --git a/LEGO1/lego/legoomni/src/pizzeria/pizza.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizza.cpp
index 8b7efe78..1e36a7c4 100644
--- a/LEGO1/lego/legoomni/src/pizzeria/pizza.cpp
+++ b/LEGO1/lego/legoomni/src/pizzeria/pizza.cpp
@@ -1,5 +1,8 @@
 #include "pizza.h"
 
+#include "mxmisc.h"
+#include "mxticklemanager.h"
+
 DECOMP_SIZE_ASSERT(Pizza, 0x9c);
 
 // FUNCTION: LEGO1 0x10037ef0
diff --git a/LEGO1/lego/legoomni/src/police/police.cpp b/LEGO1/lego/legoomni/src/police/police.cpp
index b95938ee..ea09c6ed 100644
--- a/LEGO1/lego/legoomni/src/police/police.cpp
+++ b/LEGO1/lego/legoomni/src/police/police.cpp
@@ -4,8 +4,8 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
-#include "legoomni.h"
 #include "mxbackgroundaudiomanager.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxtransitionmanager.h"
 #include "policestate.h"
diff --git a/LEGO1/lego/legoomni/src/police/policestate.cpp b/LEGO1/lego/legoomni/src/police/policestate.cpp
index c1d978e1..6a0cf16e 100644
--- a/LEGO1/lego/legoomni/src/police/policestate.cpp
+++ b/LEGO1/lego/legoomni/src/police/policestate.cpp
@@ -3,7 +3,7 @@
 #include "islepathactor.h"
 #include "legoomni.h"
 #include "mxdsaction.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "police.h"
 
 #include <stdlib.h>
diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
index 58d88a5e..57cf0b16 100644
--- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
@@ -7,6 +7,7 @@
 #include "legoworld.h"
 #include "mxcompositepresenter.h"
 #include "mxdsanim.h"
+#include "mxmisc.h"
 #include "mxstreamchunk.h"
 #include "mxtimer.h"
 #include "mxvideomanager.h"
diff --git a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
index 9325d042..049b8cd7 100644
--- a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
@@ -1,6 +1,6 @@
 #include "legovideomanager.h"
 
-#include "legoomni.h"
+#include "mxmisc.h"
 #include "mxtimer.h"
 #include "mxtransitionmanager.h"
 #include "realtime/matrix.h"
diff --git a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
index 8672cdaa..78421ff2 100644
--- a/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
@@ -5,6 +5,7 @@
 #include "legovideomanager.h"
 #include "legoworld.h"
 #include "mxbackgroundaudiomanager.h"
+#include "mxmisc.h"
 #include "mxparam.h"
 #include "mxticklemanager.h"
 
diff --git a/LEGO1/omni/include/mxmisc.h b/LEGO1/omni/include/mxmisc.h
new file mode 100644
index 00000000..0e55d147
--- /dev/null
+++ b/LEGO1/omni/include/mxmisc.h
@@ -0,0 +1,33 @@
+#ifndef MXMISC_H
+#define MXMISC_H
+
+#include "mxtypes.h"
+
+class MxAtomIdCounterSet;
+class MxDSAction;
+class MxEventManager;
+class MxMusicManager;
+class MxNotificationManager;
+class MxObjectFactory;
+class MxSoundManager;
+class MxStreamer;
+class MxTickleManager;
+class MxTimer;
+class MxVariableTable;
+class MxVideoManager;
+
+MxTickleManager* TickleManager();
+MxTimer* Timer();
+MxStreamer* Streamer();
+MxSoundManager* MSoundManager();
+MxVariableTable* VariableTable();
+MxMusicManager* MusicManager();
+MxEventManager* EventManager();
+MxResult Start(MxDSAction*);
+MxNotificationManager* NotificationManager();
+MxVideoManager* MVideoManager();
+MxAtomIdCounterSet* AtomIdCounterSet();
+MxObjectFactory* ObjectFactory();
+void DeleteObject(MxDSAction& p_dsAction);
+
+#endif // MXMISC_H
diff --git a/LEGO1/omni/include/mxomni.h b/LEGO1/omni/include/mxomni.h
index e82bf84f..8cefb099 100644
--- a/LEGO1/omni/include/mxomni.h
+++ b/LEGO1/omni/include/mxomni.h
@@ -5,9 +5,9 @@
 #include "mxcriticalsection.h"
 #include "mxstring.h"
 
-class MxAtomId;
 class MxAtomIdCounterSet;
 class MxDSAction;
+class MxEntity;
 class MxEventManager;
 class MxMusicManager;
 class MxNotificationManager;
@@ -17,12 +17,11 @@ class MxOmniCreateParam;
 class MxPresenter;
 class MxSoundManager;
 class MxStreamer;
+class MxStreamController;
 class MxTickleManager;
 class MxTimer;
 class MxVariableTable;
 class MxVideoManager;
-class MxEntity;
-class MxStreamController;
 
 // VTABLE: LEGO1 0x100dc168
 // SIZE 0x68
@@ -96,19 +95,4 @@ class MxOmni : public MxCore {
 	MxBool m_timerRunning;                        // 0x64
 };
 
-MxTickleManager* TickleManager();
-MxTimer* Timer();
-MxStreamer* Streamer();
-MxSoundManager* MSoundManager();
-MxVariableTable* VariableTable();
-MxMusicManager* MusicManager();
-MxEventManager* EventManager();
-MxResult Start(MxDSAction*);
-MxNotificationManager* NotificationManager();
-
-MxVideoManager* MVideoManager();
-MxAtomIdCounterSet* AtomIdCounterSet();
-MxObjectFactory* ObjectFactory();
-void DeleteObject(MxDSAction& p_dsAction);
-
 #endif // MXOMNI_H
diff --git a/LEGO1/omni/include/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h
index 62090b7f..2448d952 100644
--- a/LEGO1/omni/include/mxpresenter.h
+++ b/LEGO1/omni/include/mxpresenter.h
@@ -5,7 +5,6 @@
 #include "mxcore.h"
 #include "mxcriticalsection.h"
 #include "mxdsaction.h"
-#include "mxomni.h"
 #include "mxpoint32.h"
 
 class MxCompositePresenter;
diff --git a/LEGO1/omni/include/mxsoundpresenter.h b/LEGO1/omni/include/mxsoundpresenter.h
index 1281b2be..3f578109 100644
--- a/LEGO1/omni/include/mxsoundpresenter.h
+++ b/LEGO1/omni/include/mxsoundpresenter.h
@@ -2,7 +2,6 @@
 #define MXSOUNDPRESENTER_H
 
 #include "mxaudiopresenter.h"
-#include "mxomni.h"
 
 // VTABLE: LEGO1 0x100d4b08
 // SIZE 0x54
diff --git a/LEGO1/omni/src/action/mxdsaction.cpp b/LEGO1/omni/src/action/mxdsaction.cpp
index fde95329..975cb2b7 100644
--- a/LEGO1/omni/src/action/mxdsaction.cpp
+++ b/LEGO1/omni/src/action/mxdsaction.cpp
@@ -1,6 +1,6 @@
 #include "mxdsaction.h"
 
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxtimer.h"
 #include "mxutil.h"
 
diff --git a/LEGO1/omni/src/action/mxdsselectaction.cpp b/LEGO1/omni/src/action/mxdsselectaction.cpp
index 97e9ff73..2a3e7ca2 100644
--- a/LEGO1/omni/src/action/mxdsselectaction.cpp
+++ b/LEGO1/omni/src/action/mxdsselectaction.cpp
@@ -1,6 +1,6 @@
 #include "mxdsselectaction.h"
 
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxtimer.h"
 #include "mxvariabletable.h"
 
diff --git a/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp b/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
index c7f4ea1c..51c305fe 100644
--- a/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
+++ b/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp
@@ -2,8 +2,8 @@
 
 #include "decomp.h"
 #include "mxdssound.h"
+#include "mxmisc.h"
 #include "mxmusicmanager.h"
-#include "mxomni.h"
 
 DECOMP_SIZE_ASSERT(MxLoopingMIDIPresenter, 0x58);
 
diff --git a/LEGO1/omni/src/audio/mxmidipresenter.cpp b/LEGO1/omni/src/audio/mxmidipresenter.cpp
index 91e5ba60..361481fc 100644
--- a/LEGO1/omni/src/audio/mxmidipresenter.cpp
+++ b/LEGO1/omni/src/audio/mxmidipresenter.cpp
@@ -3,6 +3,7 @@
 #include "decomp.h"
 #include "mxautolocker.h"
 #include "mxdssound.h"
+#include "mxmisc.h"
 #include "mxmusicmanager.h"
 
 DECOMP_SIZE_ASSERT(MxMIDIPresenter, 0x58);
diff --git a/LEGO1/omni/src/audio/mxmusicmanager.cpp b/LEGO1/omni/src/audio/mxmusicmanager.cpp
index 23562678..59c8f841 100644
--- a/LEGO1/omni/src/audio/mxmusicmanager.cpp
+++ b/LEGO1/omni/src/audio/mxmusicmanager.cpp
@@ -1,6 +1,6 @@
 #include "mxmusicmanager.h"
 
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxticklemanager.h"
 
 #include <windows.h>
diff --git a/LEGO1/omni/src/audio/mxmusicpresenter.cpp b/LEGO1/omni/src/audio/mxmusicpresenter.cpp
index 437cd52d..9f327ae4 100644
--- a/LEGO1/omni/src/audio/mxmusicpresenter.cpp
+++ b/LEGO1/omni/src/audio/mxmusicpresenter.cpp
@@ -1,8 +1,8 @@
 #include "mxmusicpresenter.h"
 
 #include "decomp.h"
+#include "mxmisc.h"
 #include "mxmusicmanager.h"
-#include "mxomni.h"
 
 DECOMP_SIZE_ASSERT(MxMusicPresenter, 0x54);
 
diff --git a/LEGO1/omni/src/audio/mxsoundmanager.cpp b/LEGO1/omni/src/audio/mxsoundmanager.cpp
index 55055107..5fdf9a03 100644
--- a/LEGO1/omni/src/audio/mxsoundmanager.cpp
+++ b/LEGO1/omni/src/audio/mxsoundmanager.cpp
@@ -2,8 +2,9 @@
 
 #include "define.h"
 #include "mxautolocker.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxpresenter.h"
+#include "mxomni.h"
 #include "mxticklemanager.h"
 #include "mxwavepresenter.h"
 
diff --git a/LEGO1/omni/src/audio/mxsoundpresenter.cpp b/LEGO1/omni/src/audio/mxsoundpresenter.cpp
index 60459d2c..aa0435a2 100644
--- a/LEGO1/omni/src/audio/mxsoundpresenter.cpp
+++ b/LEGO1/omni/src/audio/mxsoundpresenter.cpp
@@ -1,6 +1,7 @@
 #include "mxsoundpresenter.h"
 
 #include "decomp.h"
+#include "mxmisc.h"
 #include "mxsoundmanager.h"
 
 DECOMP_SIZE_ASSERT(MxSoundPresenter, 0x54)
diff --git a/LEGO1/omni/src/audio/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp
index 50f25853..3d48a03c 100644
--- a/LEGO1/omni/src/audio/mxwavepresenter.cpp
+++ b/LEGO1/omni/src/audio/mxwavepresenter.cpp
@@ -4,6 +4,7 @@
 #include "define.h"
 #include "mxautolocker.h"
 #include "mxdssound.h"
+#include "mxmisc.h"
 #include "mxomni.h"
 #include "mxsoundmanager.h"
 #include "mxutil.h"
diff --git a/LEGO1/omni/src/common/mxatomid.cpp b/LEGO1/omni/src/common/mxatomid.cpp
index 94decf7e..5701d100 100644
--- a/LEGO1/omni/src/common/mxatomid.cpp
+++ b/LEGO1/omni/src/common/mxatomid.cpp
@@ -1,5 +1,6 @@
 #include "mxatomid.h"
 
+#include "mxmisc.h"
 #include "mxomni.h"
 
 // FUNCTION: LEGO1 0x100acf90
diff --git a/LEGO1/omni/src/common/mxcompositepresenter.cpp b/LEGO1/omni/src/common/mxcompositepresenter.cpp
index 7e3c75f1..043af4ea 100644
--- a/LEGO1/omni/src/common/mxcompositepresenter.cpp
+++ b/LEGO1/omni/src/common/mxcompositepresenter.cpp
@@ -3,6 +3,7 @@
 #include "decomp.h"
 #include "mxautolocker.h"
 #include "mxdsmultiaction.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxobjectfactory.h"
 
diff --git a/LEGO1/omni/src/common/mxmediapresenter.cpp b/LEGO1/omni/src/common/mxmediapresenter.cpp
index b0a11c1b..5f162c71 100644
--- a/LEGO1/omni/src/common/mxmediapresenter.cpp
+++ b/LEGO1/omni/src/common/mxmediapresenter.cpp
@@ -3,6 +3,7 @@
 #include "mxactionnotificationparam.h"
 #include "mxautolocker.h"
 #include "mxcompositepresenter.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxstreamchunk.h"
 #include "mxtimer.h"
diff --git a/LEGO1/omni/src/common/mxmisc.cpp b/LEGO1/omni/src/common/mxmisc.cpp
new file mode 100644
index 00000000..34c71679
--- /dev/null
+++ b/LEGO1/omni/src/common/mxmisc.cpp
@@ -0,0 +1,81 @@
+#include "mxmisc.h"
+
+#include "mxomni.h"
+
+// FUNCTION: LEGO1 0x100acea0
+MxObjectFactory* ObjectFactory()
+{
+	return MxOmni::GetInstance()->GetObjectFactory();
+}
+
+// FUNCTION: LEGO1 0x100aceb0
+MxNotificationManager* NotificationManager()
+{
+	return MxOmni::GetInstance()->GetNotificationManager();
+}
+
+// FUNCTION: LEGO1 0x100acec0
+MxTickleManager* TickleManager()
+{
+	return MxOmni::GetInstance()->GetTickleManager();
+}
+
+// FUNCTION: LEGO1 0x100aced0
+MxTimer* Timer()
+{
+	return MxOmni::GetInstance()->GetTimer();
+}
+
+// FUNCTION: LEGO1 0x100acee0
+MxAtomIdCounterSet* AtomIdCounterSet()
+{
+	return MxOmni::GetInstance()->GetAtomIdCounterSet();
+}
+
+// FUNCTION: LEGO1 0x100acef0
+MxStreamer* Streamer()
+{
+	return MxOmni::GetInstance()->GetStreamer();
+}
+
+// FUNCTION: LEGO1 0x100acf00
+MxSoundManager* MSoundManager()
+{
+	return MxOmni::GetInstance()->GetSoundManager();
+}
+
+// FUNCTION: LEGO1 0x100acf10
+MxVideoManager* MVideoManager()
+{
+	return MxOmni::GetInstance()->GetVideoManager();
+}
+
+// FUNCTION: LEGO1 0x100acf20
+MxVariableTable* VariableTable()
+{
+	return MxOmni::GetInstance()->GetVariableTable();
+}
+
+// FUNCTION: LEGO1 0x100acf30
+MxMusicManager* MusicManager()
+{
+	return MxOmni::GetInstance()->GetMusicManager();
+}
+
+// FUNCTION: LEGO1 0x100acf40
+MxEventManager* EventManager()
+{
+	return MxOmni::GetInstance()->GetEventManager();
+}
+
+// FUNCTION: LEGO1 0x100acf50
+MxResult Start(MxDSAction* p_dsAction)
+{
+	return MxOmni::GetInstance()->Start(p_dsAction);
+}
+
+// FUNCTION: LEGO1 0x100acf70
+void DeleteObject(MxDSAction& p_dsAction)
+{
+	MxOmni::GetInstance()->DeleteObject(p_dsAction);
+}
diff --git a/LEGO1/omni/src/common/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp
index 96389b5f..cc418f39 100644
--- a/LEGO1/omni/src/common/mxpresenter.cpp
+++ b/LEGO1/omni/src/common/mxpresenter.cpp
@@ -8,8 +8,10 @@
 #include "mxdsanim.h"
 #include "mxdssound.h"
 #include "mxentity.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxobjectfactory.h"
+#include "mxomni.h"
 #include "mxparam.h"
 #include "mxstreamer.h"
 #include "mxutil.h"
diff --git a/LEGO1/omni/src/common/mxticklemanager.cpp b/LEGO1/omni/src/common/mxticklemanager.cpp
index 8ce0b492..59fae3f3 100644
--- a/LEGO1/omni/src/common/mxticklemanager.cpp
+++ b/LEGO1/omni/src/common/mxticklemanager.cpp
@@ -1,7 +1,7 @@
 #include "mxticklemanager.h"
 
 #include "decomp.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxtimer.h"
 #include "mxtypes.h"
 
diff --git a/LEGO1/omni/src/event/mxeventmanager.cpp b/LEGO1/omni/src/event/mxeventmanager.cpp
index c0ee3229..7e269ce6 100644
--- a/LEGO1/omni/src/event/mxeventmanager.cpp
+++ b/LEGO1/omni/src/event/mxeventmanager.cpp
@@ -1,7 +1,7 @@
 #include "mxeventmanager.h"
 
 #include "mxcriticalsection.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxthread.h"
 #include "mxticklemanager.h"
 
diff --git a/LEGO1/omni/src/event/mxeventpresenter.cpp b/LEGO1/omni/src/event/mxeventpresenter.cpp
index 9652ca9a..90d5ceee 100644
--- a/LEGO1/omni/src/event/mxeventpresenter.cpp
+++ b/LEGO1/omni/src/event/mxeventpresenter.cpp
@@ -3,7 +3,7 @@
 #include "decomp.h"
 #include "mxautolocker.h"
 #include "mxeventmanager.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxvariabletable.h"
 
 DECOMP_SIZE_ASSERT(MxEventPresenter, 0x54);
diff --git a/LEGO1/omni/src/main/mxomni.cpp b/LEGO1/omni/src/main/mxomni.cpp
index cf29d3be..f9bf36dc 100644
--- a/LEGO1/omni/src/main/mxomni.cpp
+++ b/LEGO1/omni/src/main/mxomni.cpp
@@ -5,6 +5,7 @@
 #include "mxautolocker.h"
 #include "mxdsmultiaction.h"
 #include "mxeventmanager.h"
+#include "mxmisc.h"
 #include "mxmusicmanager.h"
 #include "mxnotificationmanager.h"
 #include "mxobjectfactory.h"
@@ -28,84 +29,6 @@ MxBool g_use3dSound = FALSE;
 // GLOBAL: LEGO1 0x101015b0
 MxOmni* MxOmni::g_instance = NULL;
 
-// FUNCTION: LEGO1 0x100acea0
-MxObjectFactory* ObjectFactory()
-{
-	return MxOmni::GetInstance()->GetObjectFactory();
-}
-
-// FUNCTION: LEGO1 0x100aceb0
-MxNotificationManager* NotificationManager()
-{
-	return MxOmni::GetInstance()->GetNotificationManager();
-}
-
-// FUNCTION: LEGO1 0x100acec0
-MxTickleManager* TickleManager()
-{
-	return MxOmni::GetInstance()->GetTickleManager();
-}
-
-// FUNCTION: LEGO1 0x100aced0
-MxTimer* Timer()
-{
-	return MxOmni::GetInstance()->GetTimer();
-}
-
-// FUNCTION: LEGO1 0x100acee0
-MxAtomIdCounterSet* AtomIdCounterSet()
-{
-	return MxOmni::GetInstance()->GetAtomIdCounterSet();
-}
-
-// FUNCTION: LEGO1 0x100acef0
-MxStreamer* Streamer()
-{
-	return MxOmni::GetInstance()->GetStreamer();
-}
-
-// FUNCTION: LEGO1 0x100acf00
-MxSoundManager* MSoundManager()
-{
-	return MxOmni::GetInstance()->GetSoundManager();
-}
-
-// FUNCTION: LEGO1 0x100acf10
-MxVideoManager* MVideoManager()
-{
-	return MxOmni::GetInstance()->GetVideoManager();
-}
-
-// FUNCTION: LEGO1 0x100acf20
-MxVariableTable* VariableTable()
-{
-	return MxOmni::GetInstance()->GetVariableTable();
-}
-
-// FUNCTION: LEGO1 0x100acf30
-MxMusicManager* MusicManager()
-{
-	return MxOmni::GetInstance()->GetMusicManager();
-}
-
-// FUNCTION: LEGO1 0x100acf40
-MxEventManager* EventManager()
-{
-	return MxOmni::GetInstance()->GetEventManager();
-}
-
-// FUNCTION: LEGO1 0x100acf50
-MxResult Start(MxDSAction* p_dsAction)
-{
-	return MxOmni::GetInstance()->Start(p_dsAction);
-}
-
-// FUNCTION: LEGO1 0x100acf70
-void DeleteObject(MxDSAction& p_dsAction)
-{
-	MxOmni::GetInstance()->DeleteObject(p_dsAction);
-}
-
 // FUNCTION: LEGO1 0x100aef10
 MxOmni::MxOmni()
 {
diff --git a/LEGO1/omni/src/notify/mxnotificationmanager.cpp b/LEGO1/omni/src/notify/mxnotificationmanager.cpp
index fe10a82c..48429dfc 100644
--- a/LEGO1/omni/src/notify/mxnotificationmanager.cpp
+++ b/LEGO1/omni/src/notify/mxnotificationmanager.cpp
@@ -3,7 +3,7 @@
 #include "compat.h"
 #include "decomp.h"
 #include "mxautolocker.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxparam.h"
 #include "mxticklemanager.h"
 #include "mxtypes.h"
diff --git a/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
index a2b2edf9..1ce82edc 100644
--- a/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
+++ b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
@@ -4,6 +4,7 @@
 #include "mxautolocker.h"
 #include "mxdiskstreamprovider.h"
 #include "mxdsstreamingaction.h"
+#include "mxmisc.h"
 #include "mxomni.h"
 #include "mxticklemanager.h"
 
diff --git a/LEGO1/omni/src/stream/mxdsbuffer.cpp b/LEGO1/omni/src/stream/mxdsbuffer.cpp
index 697984e0..a42577c7 100644
--- a/LEGO1/omni/src/stream/mxdsbuffer.cpp
+++ b/LEGO1/omni/src/stream/mxdsbuffer.cpp
@@ -3,6 +3,7 @@
 #include "mxdiskstreamcontroller.h"
 #include "mxdschunk.h"
 #include "mxdsstreamingaction.h"
+#include "mxmisc.h"
 #include "mxomni.h"
 #include "mxstreamchunk.h"
 #include "mxstreamcontroller.h"
diff --git a/LEGO1/omni/src/stream/mxstreamcontroller.cpp b/LEGO1/omni/src/stream/mxstreamcontroller.cpp
index 977db130..3948376c 100644
--- a/LEGO1/omni/src/stream/mxstreamcontroller.cpp
+++ b/LEGO1/omni/src/stream/mxstreamcontroller.cpp
@@ -3,8 +3,8 @@
 #include "mxautolocker.h"
 #include "mxdsmultiaction.h"
 #include "mxdsstreamingaction.h"
+#include "mxmisc.h"
 #include "mxnextactiondatastart.h"
-#include "mxomni.h"
 #include "mxstl/stlcompat.h"
 #include "mxstreamchunk.h"
 #include "mxtimer.h"
diff --git a/LEGO1/omni/src/stream/mxstreamer.cpp b/LEGO1/omni/src/stream/mxstreamer.cpp
index 76aa7862..1cede5a7 100644
--- a/LEGO1/omni/src/stream/mxstreamer.cpp
+++ b/LEGO1/omni/src/stream/mxstreamer.cpp
@@ -1,8 +1,8 @@
 #include "mxstreamer.h"
 
 #include "mxdiskstreamcontroller.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
-#include "mxomni.h"
 #include "mxramstreamcontroller.h"
 
 #include <algorithm>
diff --git a/LEGO1/omni/src/system/mxthread.cpp b/LEGO1/omni/src/system/mxthread.cpp
index 14c4ea82..fe327f2d 100644
--- a/LEGO1/omni/src/system/mxthread.cpp
+++ b/LEGO1/omni/src/system/mxthread.cpp
@@ -1,7 +1,7 @@
 #include "mxthread.h"
 
 #include "decomp.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxtimer.h"
 
 #include <process.h>
diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp
index 4f4a8030..9c7c7088 100644
--- a/LEGO1/omni/src/video/mxdisplaysurface.cpp
+++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp
@@ -1,5 +1,7 @@
 #include "mxdisplaysurface.h"
 
+#include "mxmisc.h"
+#include "mxomni.h"
 #include "mxutil.h"
 #include "mxvideomanager.h"
 
diff --git a/LEGO1/omni/src/video/mxflcpresenter.cpp b/LEGO1/omni/src/video/mxflcpresenter.cpp
index da7441a8..64d3d4b9 100644
--- a/LEGO1/omni/src/video/mxflcpresenter.cpp
+++ b/LEGO1/omni/src/video/mxflcpresenter.cpp
@@ -3,7 +3,7 @@
 #include "decomp.h"
 #include "mxbitmap.h"
 #include "mxdsmediaaction.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxpalette.h"
 #include "mxvideomanager.h"
 
diff --git a/LEGO1/omni/src/video/mxpalette.cpp b/LEGO1/omni/src/video/mxpalette.cpp
index 6a677b90..f3a3e599 100644
--- a/LEGO1/omni/src/video/mxpalette.cpp
+++ b/LEGO1/omni/src/video/mxpalette.cpp
@@ -1,6 +1,6 @@
 #include "mxpalette.h"
 
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxvideomanager.h"
 
 // GLOBAL: LEGO1 0x10102188
diff --git a/LEGO1/omni/src/video/mxsmkpresenter.cpp b/LEGO1/omni/src/video/mxsmkpresenter.cpp
index 8bb2ed6f..9461d90a 100644
--- a/LEGO1/omni/src/video/mxsmkpresenter.cpp
+++ b/LEGO1/omni/src/video/mxsmkpresenter.cpp
@@ -2,6 +2,7 @@
 
 #include "decomp.h"
 #include "mxdsmediaaction.h"
+#include "mxmisc.h"
 #include "mxvideomanager.h"
 
 DECOMP_SIZE_ASSERT(MxSmkPresenter, 0x720);
diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp
index 560e62e6..d926d189 100644
--- a/LEGO1/omni/src/video/mxstillpresenter.cpp
+++ b/LEGO1/omni/src/video/mxstillpresenter.cpp
@@ -4,6 +4,7 @@
 #include "define.h"
 #include "mxcompositepresenter.h"
 #include "mxdsmediaaction.h"
+#include "mxmisc.h"
 #include "mxomni.h"
 #include "mxutil.h"
 #include "mxvideomanager.h"
diff --git a/LEGO1/omni/src/video/mxvideomanager.cpp b/LEGO1/omni/src/video/mxvideomanager.cpp
index f2c9ddfa..8e414480 100644
--- a/LEGO1/omni/src/video/mxvideomanager.cpp
+++ b/LEGO1/omni/src/video/mxvideomanager.cpp
@@ -1,6 +1,8 @@
 #include "mxvideomanager.h"
 
 #include "mxautolocker.h"
+#include "mxmisc.h"
+#include "mxomni.h"
 #include "mxpresenter.h"
 #include "mxticklemanager.h"
 
diff --git a/LEGO1/omni/src/video/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp
index a30b811b..e1ab5837 100644
--- a/LEGO1/omni/src/video/mxvideopresenter.cpp
+++ b/LEGO1/omni/src/video/mxvideopresenter.cpp
@@ -2,6 +2,7 @@
 
 #include "mxautolocker.h"
 #include "mxdsmediaaction.h"
+#include "mxmisc.h"
 #include "mxregioncursor.h"
 #include "mxvideomanager.h"