diff --git a/LEGO1/lego/legoomni/include/hospital.h b/LEGO1/lego/legoomni/include/hospital.h
index 73585c64..c24775dc 100644
--- a/LEGO1/lego/legoomni/include/hospital.h
+++ b/LEGO1/lego/legoomni/include/hospital.h
@@ -1,6 +1,7 @@
 #ifndef HOSPITAL_H
 #define HOSPITAL_H
 
+#include "actionsfwd.h"
 #include "decomp.h"
 #include "hospitalstate.h"
 #include "legogamestate.h"
@@ -8,15 +9,6 @@
 #include "mxstillpresenter.h"
 #include "radio.h"
 
-namespace HospitalScript
-{
-#ifdef COMPAT_MODE
-enum Script : int;
-#else
-enum Script;
-#endif
-} // namespace HospitalScript
-
 // VTABLE: LEGO1 0x100d9730
 // SIZE 0x12c
 class Hospital : public LegoWorld {
diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index c2dd079c..e4342fee 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -1,6 +1,7 @@
 #ifndef INFOCENTER_H
 #define INFOCENTER_H
 
+#include "actionsfwd.h"
 #include "legogamestate.h"
 #include "legoworld.h"
 #include "mxrect32.h"
@@ -10,15 +11,6 @@ class InfocenterState;
 class MxStillPresenter;
 class LegoControlManagerEvent;
 
-namespace InfomainScript
-{
-#ifdef COMPAT_MODE
-enum Script : int;
-#else
-enum Script;
-#endif
-} // namespace InfomainScript
-
 // SIZE 0x18
 struct InfocenterMapEntry {
 	// FUNCTION: LEGO1 0x1006ec80
diff --git a/LEGO1/lego/legoomni/include/jukeboxentity.h b/LEGO1/lego/legoomni/include/jukeboxentity.h
index f992ea37..4166cf1e 100644
--- a/LEGO1/lego/legoomni/include/jukeboxentity.h
+++ b/LEGO1/lego/legoomni/include/jukeboxentity.h
@@ -1,17 +1,9 @@
 #ifndef JUKEBOXENTITY_H
 #define JUKEBOXENTITY_H
 
+#include "actionsfwd.h"
 #include "legoentity.h"
 
-namespace JukeboxScript
-{
-#ifdef COMPAT_MODE
-enum Script : int;
-#else
-enum Script;
-#endif
-} // namespace JukeboxScript
-
 // VTABLE: LEGO1 0x100da8a0
 // SIZE 0x6c
 class JukeBoxEntity : public LegoEntity {
diff --git a/LEGO1/lego/legoomni/include/legocharactermanager.h b/LEGO1/lego/legoomni/include/legocharactermanager.h
index 8e657db3..4d7ea084 100644
--- a/LEGO1/lego/legoomni/include/legocharactermanager.h
+++ b/LEGO1/lego/legoomni/include/legocharactermanager.h
@@ -19,9 +19,6 @@ struct LegoCharacterComparator {
 
 // SIZE 0x08
 struct LegoCharacter {
-	LegoROI* m_roi;   // 0x00
-	MxU32 m_refCount; // 0x04
-
 	LegoCharacter(LegoROI* p_roi)
 	{
 		m_roi = p_roi;
@@ -29,6 +26,9 @@ struct LegoCharacter {
 	}
 
 	inline void AddRef() { m_refCount++; }
+
+	LegoROI* m_roi;   // 0x00
+	MxU32 m_refCount; // 0x04
 };
 
 typedef map<const char*, LegoCharacter*, LegoCharacterComparator> LegoCharacterMap;
diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h
index 86549a54..f6fc965e 100644
--- a/LEGO1/lego/legoomni/include/legogamestate.h
+++ b/LEGO1/lego/legoomni/include/legogamestate.h
@@ -1,6 +1,7 @@
 #ifndef LEGOGAMESTATE_H
 #define LEGOGAMESTATE_H
 
+#include "actionsfwd.h"
 #include "decomp.h"
 #include "legobackgroundcolor.h"
 #include "legofullscreenmovie.h"
@@ -17,15 +18,6 @@ struct ColorStringStruct {
 	const char* m_colorName;
 };
 
-namespace JukeboxScript
-{
-#ifdef COMPAT_MODE
-enum Script : int;
-#else
-enum Script;
-#endif
-} // namespace JukeboxScript
-
 // SIZE 0x430
 class LegoGameState {
 public:
diff --git a/LEGO1/lego/legoomni/include/misc.h b/LEGO1/lego/legoomni/include/misc.h
index 433d2c2e..b5bafcbe 100644
--- a/LEGO1/lego/legoomni/include/misc.h
+++ b/LEGO1/lego/legoomni/include/misc.h
@@ -1,9 +1,10 @@
 #ifndef MISC_H
 #define MISC_H
 
-#include "actionsfwd.h"
 #include "compat.h"
 #include "decomp.h"
+// Long include path due to dependency of misc library on LegoOmni
+#include "lego/legoomni/include/actions/actionsfwd.h"
 #include "mxtypes.h"
 
 class IslePathActor;
diff --git a/LEGO1/lego/legoomni/include/policestate.h b/LEGO1/lego/legoomni/include/policestate.h
index 3deaff35..4fe5d711 100644
--- a/LEGO1/lego/legoomni/include/policestate.h
+++ b/LEGO1/lego/legoomni/include/policestate.h
@@ -1,19 +1,11 @@
 #ifndef POLICESTATE_H
 #define POLICESTATE_H
 
+#include "actionsfwd.h"
 #include "decomp.h"
 #include "legostate.h"
 #include "police.h"
 
-namespace PoliceScript
-{
-#ifdef COMPAT_MODE
-enum Script : int;
-#else
-enum Script;
-#endif
-} // namespace PoliceScript
-
 // VTABLE: LEGO1 0x100d8af0
 // SIZE 0x10
 class PoliceState : public LegoState {