diff --git a/LEGO1/lego/legoomni/include/actions/act2main_actions.h b/LEGO1/lego/legoomni/include/actions/act2main_actions.h
index 0dfeb72e..2368043f 100644
--- a/LEGO1/lego/legoomni/include/actions/act2main_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/act2main_actions.h
@@ -5,7 +5,7 @@
 
 namespace Act2mainScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/act3_actions.h b/LEGO1/lego/legoomni/include/actions/act3_actions.h
index c10c229b..141afc74 100644
--- a/LEGO1/lego/legoomni/include/actions/act3_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/act3_actions.h
@@ -5,7 +5,7 @@
 
 namespace Act3Script
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/actionsfwd.h b/LEGO1/lego/legoomni/include/actions/actionsfwd.h
index 061443a1..984262a4 100644
--- a/LEGO1/lego/legoomni/include/actions/actionsfwd.h
+++ b/LEGO1/lego/legoomni/include/actions/actionsfwd.h
@@ -5,7 +5,7 @@
 
 namespace SndanimScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -14,7 +14,7 @@ enum Script;
 
 namespace NocdScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -23,7 +23,7 @@ enum Script;
 
 namespace CreditsScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -32,7 +32,7 @@ enum Script;
 
 namespace IntroScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -41,7 +41,7 @@ enum Script;
 
 namespace HospitalScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -50,7 +50,7 @@ enum Script;
 
 namespace CarraceScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -59,7 +59,7 @@ enum Script;
 
 namespace JetraceScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -68,7 +68,7 @@ enum Script;
 
 namespace CarracerScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -77,7 +77,7 @@ enum Script;
 
 namespace JetracerScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -86,7 +86,7 @@ enum Script;
 
 namespace InfoscorScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -95,7 +95,7 @@ enum Script;
 
 namespace RegbookScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -104,7 +104,7 @@ enum Script;
 
 namespace HistbookScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -113,7 +113,7 @@ enum Script;
 
 namespace InfomainScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -122,7 +122,7 @@ enum Script;
 
 namespace ElevbottScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -131,7 +131,7 @@ enum Script;
 
 namespace InfodoorScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -140,7 +140,7 @@ enum Script;
 
 namespace RacecarScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -149,7 +149,7 @@ enum Script;
 
 namespace DunecarScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -158,7 +158,7 @@ enum Script;
 
 namespace CopterScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -167,7 +167,7 @@ enum Script;
 
 namespace JetskiScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -176,7 +176,7 @@ enum Script;
 
 namespace GarageScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -185,7 +185,7 @@ enum Script;
 
 namespace Act3Script
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -194,7 +194,7 @@ enum Script;
 
 namespace Act2mainScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -203,7 +203,7 @@ enum Script;
 
 namespace JukeboxwScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -212,13 +212,13 @@ enum Script;
 
 namespace IsleScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
 #endif
 
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script2 : int;
 #else
 enum Script2;
@@ -227,7 +227,7 @@ enum Script2;
 
 namespace JukeboxScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
@@ -236,7 +236,7 @@ enum Script;
 
 namespace PoliceScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int;
 #else
 enum Script;
diff --git a/LEGO1/lego/legoomni/include/actions/carrace_actions.h b/LEGO1/lego/legoomni/include/actions/carrace_actions.h
index 5084f2bc..3c1ba930 100644
--- a/LEGO1/lego/legoomni/include/actions/carrace_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/carrace_actions.h
@@ -5,7 +5,7 @@
 
 namespace CarraceScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/carracer_actions.h b/LEGO1/lego/legoomni/include/actions/carracer_actions.h
index 7bde84b3..59657dd2 100644
--- a/LEGO1/lego/legoomni/include/actions/carracer_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/carracer_actions.h
@@ -5,7 +5,7 @@
 
 namespace CarracerScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/copter_actions.h b/LEGO1/lego/legoomni/include/actions/copter_actions.h
index 749898b6..1650765e 100644
--- a/LEGO1/lego/legoomni/include/actions/copter_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/copter_actions.h
@@ -5,7 +5,7 @@
 
 namespace CopterScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/credits_actions.h b/LEGO1/lego/legoomni/include/actions/credits_actions.h
index a754a15b..5ac2ed8b 100644
--- a/LEGO1/lego/legoomni/include/actions/credits_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/credits_actions.h
@@ -5,7 +5,7 @@
 
 namespace CreditsScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/dunecar_actions.h b/LEGO1/lego/legoomni/include/actions/dunecar_actions.h
index bc1ea6fd..44aed8ce 100644
--- a/LEGO1/lego/legoomni/include/actions/dunecar_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/dunecar_actions.h
@@ -5,7 +5,7 @@
 
 namespace DunecarScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/elevbott_actions.h b/LEGO1/lego/legoomni/include/actions/elevbott_actions.h
index 45e63778..78e02772 100644
--- a/LEGO1/lego/legoomni/include/actions/elevbott_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/elevbott_actions.h
@@ -5,7 +5,7 @@
 
 namespace ElevbottScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/garage_actions.h b/LEGO1/lego/legoomni/include/actions/garage_actions.h
index 8d6988f5..f9dde49c 100644
--- a/LEGO1/lego/legoomni/include/actions/garage_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/garage_actions.h
@@ -5,7 +5,7 @@
 
 namespace GarageScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/histbook_actions.h b/LEGO1/lego/legoomni/include/actions/histbook_actions.h
index 5ed2df76..cfc6153c 100644
--- a/LEGO1/lego/legoomni/include/actions/histbook_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/histbook_actions.h
@@ -5,7 +5,7 @@
 
 namespace HistbookScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/hospital_actions.h b/LEGO1/lego/legoomni/include/actions/hospital_actions.h
index f8f52c51..0066b874 100644
--- a/LEGO1/lego/legoomni/include/actions/hospital_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/hospital_actions.h
@@ -5,7 +5,7 @@
 
 namespace HospitalScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/infodoor_actions.h b/LEGO1/lego/legoomni/include/actions/infodoor_actions.h
index d422e237..a1b1551f 100644
--- a/LEGO1/lego/legoomni/include/actions/infodoor_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/infodoor_actions.h
@@ -5,7 +5,7 @@
 
 namespace InfodoorScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/infomain_actions.h b/LEGO1/lego/legoomni/include/actions/infomain_actions.h
index 9f0afb9f..3fe87379 100644
--- a/LEGO1/lego/legoomni/include/actions/infomain_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/infomain_actions.h
@@ -5,7 +5,7 @@
 
 namespace InfomainScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/infoscor_actions.h b/LEGO1/lego/legoomni/include/actions/infoscor_actions.h
index b1cecbc1..26d567c3 100644
--- a/LEGO1/lego/legoomni/include/actions/infoscor_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/infoscor_actions.h
@@ -5,7 +5,7 @@
 
 namespace InfoscorScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/intro_actions.h b/LEGO1/lego/legoomni/include/actions/intro_actions.h
index 4f882cff..59b12068 100644
--- a/LEGO1/lego/legoomni/include/actions/intro_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/intro_actions.h
@@ -5,7 +5,7 @@
 
 namespace IntroScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/isle_actions.h b/LEGO1/lego/legoomni/include/actions/isle_actions.h
index 4349a8e6..01644710 100644
--- a/LEGO1/lego/legoomni/include/actions/isle_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/isle_actions.h
@@ -5,7 +5,7 @@
 
 namespace IsleScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
@@ -2017,7 +2017,7 @@ enum Script {
 	c_frt139df_10_sfx = 2005
 };
 
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script2 : int {
 #else
 enum Script2 {
diff --git a/LEGO1/lego/legoomni/include/actions/jetrace_actions.h b/LEGO1/lego/legoomni/include/actions/jetrace_actions.h
index 82bd9013..7e1712fe 100644
--- a/LEGO1/lego/legoomni/include/actions/jetrace_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/jetrace_actions.h
@@ -5,7 +5,7 @@
 
 namespace JetraceScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/jetracer_actions.h b/LEGO1/lego/legoomni/include/actions/jetracer_actions.h
index 01220338..4d746c6d 100644
--- a/LEGO1/lego/legoomni/include/actions/jetracer_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/jetracer_actions.h
@@ -5,7 +5,7 @@
 
 namespace JetracerScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/jetski_actions.h b/LEGO1/lego/legoomni/include/actions/jetski_actions.h
index 9984f7b9..1336b6f1 100644
--- a/LEGO1/lego/legoomni/include/actions/jetski_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/jetski_actions.h
@@ -5,7 +5,7 @@
 
 namespace JetskiScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/jukebox_actions.h b/LEGO1/lego/legoomni/include/actions/jukebox_actions.h
index 483b5652..259f59db 100644
--- a/LEGO1/lego/legoomni/include/actions/jukebox_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/jukebox_actions.h
@@ -5,7 +5,7 @@
 
 namespace JukeboxScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/jukeboxw_actions.h b/LEGO1/lego/legoomni/include/actions/jukeboxw_actions.h
index 54be7db8..b5fa4ff6 100644
--- a/LEGO1/lego/legoomni/include/actions/jukeboxw_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/jukeboxw_actions.h
@@ -5,7 +5,7 @@
 
 namespace JukeboxwScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/nocd_actions.h b/LEGO1/lego/legoomni/include/actions/nocd_actions.h
index b445e0d7..553c13c5 100644
--- a/LEGO1/lego/legoomni/include/actions/nocd_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/nocd_actions.h
@@ -5,7 +5,7 @@
 
 namespace NocdScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/police_actions.h b/LEGO1/lego/legoomni/include/actions/police_actions.h
index a9f6cd99..44f4c14f 100644
--- a/LEGO1/lego/legoomni/include/actions/police_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/police_actions.h
@@ -5,7 +5,7 @@
 
 namespace PoliceScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/racecar_actions.h b/LEGO1/lego/legoomni/include/actions/racecar_actions.h
index 765697aa..cc999aae 100644
--- a/LEGO1/lego/legoomni/include/actions/racecar_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/racecar_actions.h
@@ -5,7 +5,7 @@
 
 namespace RacecarScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/regbook_actions.h b/LEGO1/lego/legoomni/include/actions/regbook_actions.h
index 6f46e2cf..1ace7e92 100644
--- a/LEGO1/lego/legoomni/include/actions/regbook_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/regbook_actions.h
@@ -5,7 +5,7 @@
 
 namespace RegbookScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {
diff --git a/LEGO1/lego/legoomni/include/actions/sndanim_actions.h b/LEGO1/lego/legoomni/include/actions/sndanim_actions.h
index e52d8832..4aa5e7c5 100644
--- a/LEGO1/lego/legoomni/include/actions/sndanim_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/sndanim_actions.h
@@ -5,7 +5,7 @@
 
 namespace SndanimScript
 {
-#ifdef COMPAT_MODE
+#if __cplusplus < 201103L
 enum Script : int {
 #else
 enum Script {