diff --git a/addons/common/MainMenu.hpp b/addons/common/MainMenu.hpp
index d10ff5deda..1f1a1dc547 100644
--- a/addons/common/MainMenu.hpp
+++ b/addons/common/MainMenu.hpp
@@ -29,7 +29,7 @@ class ACE_Tile_Base {
         right = 0;
         bottom = 0;
     };
-    action = "(findDisplay 49) closeDisplay 0; 0 spawn ACE_Common_openMenu;";
+    action = QUOTE((findDisplay 49) closeDisplay 0; 0 spawn GVAR(openMenu););
     animTextureDefault = "#(argb,8,8,3)color(1,1,1,1)";
     animTextureDisabled = "#(argb,8,8,3)color(1,1,1,1)";
     animTextureFocused = "#(argb,8,8,3)color(1,1,1,1)";
diff --git a/addons/common/MenuConfig.hpp b/addons/common/MenuConfig.hpp
index 4d84bfb78b..370a62c30a 100644
--- a/addons/common/MenuConfig.hpp
+++ b/addons/common/MenuConfig.hpp
@@ -3,7 +3,7 @@
 #define VSPACE 0.3
 #define BORDER 0.1
 
-class ACE_Common_Interactive_Button_Base {
+class GVAR(Interactive_Button_Base) {
     tooltip = "";
     action = "";
 
@@ -46,7 +46,7 @@ class ACE_Common_Interactive_Button_Base {
 #define VSPACE2 0.05
 #define BORDER 0.1
 
-class ACE_Common_Text_Button_Base {
+class GVAR(Text_Button_Base) {
     idc = 2;
     moving = 0;
     text = "";
@@ -65,10 +65,10 @@ class ACE_Common_Text_Button_Base {
     h = 0;
 };
 
-class ACE_Common_OptionsMenu_Dialog {
+class GVAR(OptionsMenu_Dialog) {
     idd = -1;
     movingEnable = true;
-    onLoad = "_dlgMenuDialog = _this select 0; for '_a' from 20 to 32 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 100 to 119 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 200 to 219 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 300 to 319 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 400 to 419 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 500 to 519 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; uiNamespace setVariable ['ACE_Common_MenuDialog', _dlgMenuDialog];";
+    onLoad = QUOTE(_dlgMenuDialog = _this select 0; for '_a' from 20 to 32 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 100 to 119 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 200 to 219 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 300 to 319 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 400 to 419 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 500 to 519 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; uiNamespace setVariable [ARR_2(QUOTE(QGVAR(MenuDialog)),_dlgMenuDialog)];);
     objects[] = {};
 
     class controlsBackground {
@@ -112,7 +112,7 @@ class ACE_Common_OptionsMenu_Dialog {
             h = 0.3 / 9 * safezoneH;
         };
 
-        class ACE_Logo : ACE_Common_Interactive_Button_Base {
+        class ACE_Logo: GVAR(Interactive_Button_Base) {
             action = "closeDialog 0;";
             type = 0;
             style = 48;
@@ -128,7 +128,7 @@ class ACE_Common_OptionsMenu_Dialog {
     };
 
     class controls {
-        class Text_Button0 : ACE_Common_Text_Button_Base {
+        class Text_Button0: GVAR(Text_Button_Base) {
             idc = 100;
             style = 0 + 0x800;
             x = (HSPACE2 + 0 * 0.1) * safezoneW + safezoneX;
@@ -137,105 +137,105 @@ class ACE_Common_OptionsMenu_Dialog {
             h = 0.3 / 9 * safezoneH;
         };
 
-        class Text_Button1 : Text_Button0 {
+        class Text_Button1: Text_Button0 {
             idc = 101;
             y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Button2 : Text_Button0 {
+        class Text_Button2: Text_Button0 {
             idc = 102;
             y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Button3 : Text_Button0 {
+        class Text_Button3: Text_Button0 {
             idc = 103;
             y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Button4 : Text_Button0 {
+        class Text_Button4: Text_Button0 {
             idc = 104;
             y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Button5 : Text_Button0 {
+        class Text_Button5: Text_Button0 {
             idc = 105;
             y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Button6 : Text_Button0 {
+        class Text_Button6: Text_Button0 {
             idc = 106;
             y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Button7 : Text_Button0 {
+        class Text_Button7: Text_Button0 {
             idc = 107;
             y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Button8 : Text_Button0 {
+        class Text_Button8: Text_Button0 {
             idc = 108;
             y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Button9 : Text_Button0 {
+        class Text_Button9: Text_Button0 {
             idc = 109;
             y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Button10 : Text_Button0 {
+        class Text_Button10: Text_Button0 {
             idc = 110;
             y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Button11 : Text_Button0 {
+        class Text_Button11: Text_Button0 {
             idc = 111;
             y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Button12 : Text_Button0 {
+        class Text_Button12: Text_Button0 {
             idc = 112;
             y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Button13 : Text_Button0 {
+        class Text_Button13: Text_Button0 {
             idc = 113;
             y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Button14 : Text_Button0 {
+        class Text_Button14: Text_Button0 {
             idc = 114;
             y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Button15 : Text_Button0 {
+        class Text_Button15: Text_Button0 {
             idc = 115;
             y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Button16 : Text_Button0 {
+        class Text_Button16: Text_Button0 {
             idc = 116;
             y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Button17 : Text_Button0 {
+        class Text_Button17: Text_Button0 {
             idc = 117;
             y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Button18 : Text_Button0 {
+        class Text_Button18: Text_Button0 {
             idc = 118;
             y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Button19 : Text_Button0 {
+        class Text_Button19: Text_Button0 {
             idc = 119;
             y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY;
         };
 
         //////////////////////////////////////////////////
 
-        class Interactive_Button0 : ACE_Common_Interactive_Button_Base {
-            action = "ACE_Common_keySet = -1; [0] spawn ACE_Common_editKey";
+        class Interactive_Button0: GVAR(Interactive_Button_Base) {
+            action = QUOTE(GVAR(keySet) = -1; [0] spawn GVAR(editKey));
             sizeEx = "0.8 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs";
             idc = 200;
             style = 2 + 0x800;
@@ -245,123 +245,123 @@ class ACE_Common_OptionsMenu_Dialog {
             h = 0.3 / 9 * safezoneH;
         };
 
-        class Interactive_Button1 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [1] spawn ACE_Common_editKey";
+        class Interactive_Button1: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [1] spawn GVAR(editKey));
             idc = 201;
             y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Button2 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [2] spawn ACE_Common_editKey";
+        class Interactive_Button2: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [2] spawn GVAR(editKey));
             idc = 202;
             y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Button3 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [3] spawn ACE_Common_editKey";
+        class Interactive_Button3: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [3] spawn GVAR(editKey));
             idc = 203;
             y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Button4 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [4] spawn ACE_Common_editKey";
+        class Interactive_Button4: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [4] spawn GVAR(editKey));
             idc = 204;
             y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Button5 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [5] spawn ACE_Common_editKey";
+        class Interactive_Button5: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [5] spawn GVAR(editKey));
             idc = 205;
             y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Button6 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [6] spawn ACE_Common_editKey";
+        class Interactive_Button6: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [6] spawn GVAR(editKey));
             idc = 206;
             y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Button7 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [7] spawn ACE_Common_editKey";
+        class Interactive_Button7: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [7] spawn GVAR(editKey));
             idc = 207;
             y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Button8 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [8] spawn ACE_Common_editKey";
+        class Interactive_Button8: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [8] spawn GVAR(editKey));
             idc = 208;
             y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Button9 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [9] spawn ACE_Common_editKey";
+        class Interactive_Button9: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [9] spawn GVAR(editKey));
             idc = 209;
             y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Button10 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [10] spawn ACE_Common_editKey";
+        class Interactive_Button10: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [10] spawn GVAR(editKey));
             idc = 210;
             y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Button11 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [11] spawn ACE_Common_editKey";
+        class Interactive_Button11: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [11] spawn GVAR(editKey));
             idc = 211;
             y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Button12 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [12] spawn ACE_Common_editKey";
+        class Interactive_Button12: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [12] spawn GVAR(editKey));
             idc = 212;
             y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Button13 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [13] spawn ACE_Common_editKey";
+        class Interactive_Button13: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [13] spawn GVAR(editKey));
             idc = 213;
             y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Button14 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [14] spawn ACE_Common_editKey";
+        class Interactive_Button14: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [14] spawn GVAR(editKey));
             idc = 214;
             y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Button15 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [15] spawn ACE_Common_editKey";
+        class Interactive_Button15: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [15] spawn GVAR(editKey));
             idc = 215;
             y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Button16 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [16] spawn ACE_Common_editKey";
+        class Interactive_Button16: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [16] spawn GVAR(editKey));
             idc = 216;
             y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Button17 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [17] spawn ACE_Common_editKey";
+        class Interactive_Button17: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [17] spawn GVAR(editKey));
             idc = 217;
             y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Button18 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [18] spawn ACE_Common_editKey";
+        class Interactive_Button18: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [18] spawn GVAR(editKey));
             idc = 218;
             y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Button19 : Interactive_Button0 {
-            action = "ACE_Common_keySet = -1; [19] spawn ACE_Common_editKey";
+        class Interactive_Button19: Interactive_Button0 {
+            action = QUOTE(GVAR(keySet) = -1; [19] spawn GVAR(editKey));
             idc = 219;
             y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY;
         };
 
         //////////////////////////////////////////////////
 
-        class Interactive_Checkbox0 : Text_Button0 {
+        class Interactive_Checkbox0: Text_Button0 {
             action = "hint '0'";
             idc = 300;
             //type = 0;
@@ -375,115 +375,115 @@ class ACE_Common_OptionsMenu_Dialog {
             h = 0.3 / 9 * safezoneH;
         };
 
-        class Interactive_Checkbox1 : Interactive_Checkbox0 {
+        class Interactive_Checkbox1: Interactive_Checkbox0 {
             action = "";
             idc = 301;
             y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Checkbox2 : Interactive_Checkbox0 {
+        class Interactive_Checkbox2: Interactive_Checkbox0 {
             action = "";
             idc = 302;
             y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Checkbox3 : Interactive_Checkbox0 {
+        class Interactive_Checkbox3: Interactive_Checkbox0 {
             action = "";
             idc = 303;
             y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Checkbox4 : Interactive_Checkbox0 {
+        class Interactive_Checkbox4: Interactive_Checkbox0 {
             action = "";
             idc = 304;
             y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Checkbox5 : Interactive_Checkbox0 {
+        class Interactive_Checkbox5: Interactive_Checkbox0 {
             action = "";
             idc = 305;
             y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Checkbox6 : Interactive_Checkbox0 {
+        class Interactive_Checkbox6: Interactive_Checkbox0 {
             action = "";
             idc = 306;
             y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Checkbox7 : Interactive_Checkbox0 {
+        class Interactive_Checkbox7: Interactive_Checkbox0 {
             action = "";
             idc = 307;
             y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Checkbox8 : Interactive_Checkbox0 {
+        class Interactive_Checkbox8: Interactive_Checkbox0 {
             action = "";
             idc = 308;
             y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Checkbox9 : Interactive_Checkbox0 {
+        class Interactive_Checkbox9: Interactive_Checkbox0 {
             action = "";
             idc = 309;
             y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Checkbox10 : Interactive_Checkbox0 {
+        class Interactive_Checkbox10: Interactive_Checkbox0 {
             action = "";
             idc = 310;
             y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Checkbox11 : Interactive_Checkbox0 {
+        class Interactive_Checkbox11: Interactive_Checkbox0 {
             action = "";
             idc = 311;
             y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Checkbox12 : Interactive_Checkbox0 {
+        class Interactive_Checkbox12: Interactive_Checkbox0 {
             action = "";
             idc = 312;
             y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Checkbox13 : Interactive_Checkbox0 {
+        class Interactive_Checkbox13: Interactive_Checkbox0 {
             action = "";
             idc = 313;
             y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Checkbox14 : Interactive_Checkbox0 {
+        class Interactive_Checkbox14: Interactive_Checkbox0 {
             action = "";
             idc = 314;
             y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Checkbox15 : Interactive_Checkbox0 {
+        class Interactive_Checkbox15: Interactive_Checkbox0 {
             action = "";
             idc = 315;
             y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Checkbox16 : Interactive_Checkbox0 {
+        class Interactive_Checkbox16: Interactive_Checkbox0 {
             action = "";
             idc = 316;
             y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Checkbox17 : Interactive_Checkbox0 {
+        class Interactive_Checkbox17: Interactive_Checkbox0 {
             action = "";
             idc = 317;
             y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Checkbox18 : Interactive_Checkbox0 {
+        class Interactive_Checkbox18: Interactive_Checkbox0 {
             action = "";
             idc = 318;
             y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_Checkbox19 : Interactive_Checkbox0 {
+        class Interactive_Checkbox19: Interactive_Checkbox0 {
             action = "";
             idc = 319;
             y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY;
@@ -491,7 +491,7 @@ class ACE_Common_OptionsMenu_Dialog {
 
         //////////////////////////////////////////////////
 
-        class Text_Checkbox0 : Text_Button0 {
+        class Text_Checkbox0: Text_Button0 {
             idc = 400;
             x = (HSPACE2 + 0 * 0.1) * safezoneW + safezoneX;
             y = (VSPACE2 + 2 * 0.04) * safezoneH + safezoneY;
@@ -499,105 +499,105 @@ class ACE_Common_OptionsMenu_Dialog {
             h = 0.3 / 9 * safezoneH;
         };
 
-        class Text_Checkbox1 : Text_Checkbox0 {
+        class Text_Checkbox1: Text_Checkbox0 {
             idc = 401;
             y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Checkbox2 : Text_Checkbox0 {
+        class Text_Checkbox2: Text_Checkbox0 {
             idc = 402;
             y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Checkbox3 : Text_Checkbox0 {
+        class Text_Checkbox3: Text_Checkbox0 {
             idc = 403;
             y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Checkbox4 : Text_Checkbox0 {
+        class Text_Checkbox4: Text_Checkbox0 {
             idc = 404;
             y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Checkbox5 : Text_Checkbox0 {
+        class Text_Checkbox5: Text_Checkbox0 {
             idc = 405;
             y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Checkbox6 : Text_Checkbox0 {
+        class Text_Checkbox6: Text_Checkbox0 {
             idc = 406;
             y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Checkbox7 : Text_Checkbox0 {
+        class Text_Checkbox7: Text_Checkbox0 {
             idc = 407;
             y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Checkbox8 : Text_Checkbox0 {
+        class Text_Checkbox8: Text_Checkbox0 {
             idc = 408;
             y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Checkbox9 : Text_Checkbox0 {
+        class Text_Checkbox9: Text_Checkbox0 {
             idc = 409;
             y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Checkbox10 : Text_Checkbox0 {
+        class Text_Checkbox10: Text_Checkbox0 {
             idc = 410;
             y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Checkbox11 : Text_Checkbox0 {
+        class Text_Checkbox11: Text_Checkbox0 {
             idc = 411;
             y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Checkbox12 : Text_Checkbox0 {
+        class Text_Checkbox12: Text_Checkbox0 {
             idc = 412;
             y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Checkbox13 : Text_Checkbox0 {
+        class Text_Checkbox13: Text_Checkbox0 {
             idc = 413;
             y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Checkbox14 : Text_Checkbox0 {
+        class Text_Checkbox14: Text_Checkbox0 {
             idc = 414;
             y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Checkbox15 : Text_Checkbox0 {
+        class Text_Checkbox15: Text_Checkbox0 {
             idc = 415;
             y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Checkbox16 : Text_Checkbox0 {
+        class Text_Checkbox16: Text_Checkbox0 {
             idc = 416;
             y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Checkbox17 : Text_Checkbox0 {
+        class Text_Checkbox17: Text_Checkbox0 {
             idc = 417;
             y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Checkbox18 : Text_Checkbox0 {
+        class Text_Checkbox18: Text_Checkbox0 {
             idc = 418;
             y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Text_Checkbox19 : Text_Checkbox0 {
+        class Text_Checkbox19: Text_Checkbox0 {
             idc = 419;
             y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY;
         };
 
         //////////////////////////////////////////////////
 
-        class Interactive_CheckboxButton0 : ACE_Common_Interactive_Button_Base {
-            action = "[0] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton0: GVAR(Interactive_Button_Base) {
+            action = QUOTE([0] call GVAR(toggleState));
             idc = 500;
             colorBackground[] = {0, 0, 0, 0};
             colorBackgroundActive[] = {0, 0, 0, 0};
@@ -608,123 +608,123 @@ class ACE_Common_OptionsMenu_Dialog {
             h = 0.3 / 9 * safezoneH;
         };
 
-        class Interactive_CheckboxButton1 : Interactive_CheckboxButton0 {
-            action = "[1] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton1: Interactive_CheckboxButton0 {
+            action = QUOTE([1] call GVAR(toggleState));
             idc = 501;
             y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_CheckboxButton2 : Interactive_CheckboxButton0 {
-            action = "[2] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton2: Interactive_CheckboxButton0 {
+            action = QUOTE([2] call GVAR(toggleState));
             idc = 502;
             y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_CheckboxButton3 : Interactive_CheckboxButton0 {
-            action = "[3] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton3: Interactive_CheckboxButton0 {
+            action = QUOTE([3] call GVAR(toggleState));
             idc = 503;
             y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_CheckboxButton4 : Interactive_CheckboxButton0 {
-            action = "[4] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton4: Interactive_CheckboxButton0 {
+            action = QUOTE([4] call GVAR(toggleState));
             idc = 504;
             y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_CheckboxButton5 : Interactive_CheckboxButton0 {
-            action = "[5] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton5: Interactive_CheckboxButton0 {
+            action = QUOTE([5] call GVAR(toggleState));
             idc = 505;
             y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_CheckboxButton6 : Interactive_CheckboxButton0 {
-            action = "[6] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton6: Interactive_CheckboxButton0 {
+            action = QUOTE([6] call GVAR(toggleState));
             idc = 506;
             y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_CheckboxButton7 : Interactive_CheckboxButton0 {
-            action = "[7] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton7: Interactive_CheckboxButton0 {
+            action = QUOTE([7] call GVAR(toggleState));
             idc = 507;
             y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_CheckboxButton8 : Interactive_CheckboxButton0 {
-            action = "[8] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton8: Interactive_CheckboxButton0 {
+            action = QUOTE([8] call GVAR(toggleState));
             idc = 508;
             y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_CheckboxButton9 : Interactive_CheckboxButton0 {
-            action = "[9] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton9: Interactive_CheckboxButton0 {
+            action = QUOTE([9] call GVAR(toggleState));
             idc = 509;
             y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_CheckboxButton10 : Interactive_CheckboxButton0 {
-            action = "[10] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton10: Interactive_CheckboxButton0 {
+            action = QUOTE([10] call GVAR(toggleState));
             idc = 510;
             y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_CheckboxButton11 : Interactive_CheckboxButton0 {
-            action = "[11] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton11: Interactive_CheckboxButton0 {
+            action = QUOTE([11] call GVAR(toggleState));
             idc = 511;
             y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_CheckboxButton12 : Interactive_CheckboxButton0 {
-            action = "[12] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton12: Interactive_CheckboxButton0 {
+            action = QUOTE([12] call GVAR(toggleState));
             idc = 512;
             y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_CheckboxButton13 : Interactive_CheckboxButton0 {
-            action = "[13] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton13: Interactive_CheckboxButton0 {
+            action = QUOTE([13] call GVAR(toggleState));
             idc = 513;
             y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_CheckboxButton14 : Interactive_CheckboxButton0 {
-            action = "[14] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton14: Interactive_CheckboxButton0 {
+            action = QUOTE([14] call GVAR(toggleState));
             idc = 514;
             y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_CheckboxButton15 : Interactive_CheckboxButton0 {
-            action = "[15] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton15: Interactive_CheckboxButton0 {
+            action = QUOTE([15] call GVAR(toggleState));
             idc = 515;
             y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_CheckboxButton16 : Interactive_CheckboxButton0 {
-            action = "[16] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton16: Interactive_CheckboxButton0 {
+            action = QUOTE([16] call GVAR(toggleState));
             idc = 516;
             y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_CheckboxButton17 : Interactive_CheckboxButton0 {
-            action = "[17] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton17: Interactive_CheckboxButton0 {
+            action = QUOTE([17] call GVAR(toggleState));
             idc = 517;
             y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_CheckboxButton18 : Interactive_CheckboxButton0 {
-            action = "[18] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton18: Interactive_CheckboxButton0 {
+            action = QUOTE([18] call GVAR(toggleState));
             idc = 518;
             y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY;
         };
 
-        class Interactive_CheckboxButton19 : Interactive_CheckboxButton0 {
-            action = "[19] call ACE_Common_toggleState";
+        class Interactive_CheckboxButton19: Interactive_CheckboxButton0 {
+            action = QUOTE([19] call GVAR(toggleState));
             idc = 519;
             y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY;
         };
 
         //////////////////////////////////////////////////
 
-        class TextBox_KeyChange : Text_Button0 {
+        class TextBox_KeyChange: Text_Button0 {
             text = "";
             idc = 20;
             style = 2 + 0x800;
@@ -734,7 +734,7 @@ class ACE_Common_OptionsMenu_Dialog {
             h = (3.0 / 9 - VSPACE2 / 2) * safezoneH;
         };
 
-        /*class TextBox_Key_Shift : TextBox_KeyChange {
+        /*class TextBox_Key_Shift: TextBox_KeyChange {
             text = "$STR_ACE_Common_Shift";
             idc = 21;
             colorText[] = {0.25,0.25,0.25,1};
@@ -745,22 +745,22 @@ class ACE_Common_OptionsMenu_Dialog {
             h = 0.3 / 9 * safezoneH;
         };
 
-        class TextBox_Key_Control : TextBox_Key_Shift {
+        class TextBox_Key_Control: TextBox_Key_Shift {
             text = "$STR_ACE_Common_Ctrl";
             idc = 22;
             x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX;
             y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY;
         };
 
-        class TextBox_Key_Alt : TextBox_Key_Shift {
+        class TextBox_Key_Alt: TextBox_Key_Shift {
             text = "$STR_ACE_Common_Alt";
             idc = 23;
             x = (3 / 4 * HSPACE2 + 7.75 * 0.1) * safezoneW + safezoneX;
             y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY;
         };*/
 
-        class TextBox_Key_Shift : Interactive_Button0 {
-            action = "ACE_Common_keyNewTemp = [42, [false, false, false], 42];";
+        class TextBox_Key_Shift: Interactive_Button0 {
+            action = QUOTE(GVAR(keyNewTemp) = [ARR_3(42,[ARR_3(false,false,false)],42)];);
             text = "$STR_ACE_Common_Shift";
             sizeEx = "0.7 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs";
             idc = 21;
@@ -772,47 +772,47 @@ class ACE_Common_OptionsMenu_Dialog {
             h = 0.3 / 9 * safezoneH;
         };
 
-        class TextBox_Key_Control : TextBox_Key_Shift {
-            action = "ACE_Common_keyNewTemp = [29, [false, false, false], 29];";
+        class TextBox_Key_Control: TextBox_Key_Shift {
+            action = QUOTE(GVAR(keyNewTemp) = [ARR_3(29,[ARR_3(false,false,false)],29)];);
             text = "$STR_ACE_Common_Ctrl";
             idc = 22;
             x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX;
             y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY;
         };
 
-        class TextBox_Key_Alt : TextBox_Key_Shift {
-            action = "ACE_Common_keyNewTemp = [56, [false, false, false], 56];";
+        class TextBox_Key_Alt: TextBox_Key_Shift {
+            action = QUOTE(GVAR(keyNewTemp) = [ARR_3(56,[ARR_3(false,false,false)],56)];);
             text = "$STR_ACE_Common_Alt";
             idc = 23;
             x = (3 / 4 * HSPACE2 + 7.5 * 0.1) * safezoneW + safezoneX;
             y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY;
         };
 
-        class TextBox_Key_Shift_Right : TextBox_Key_Shift {
-            action = "ACE_Common_keyNewTemp = [54, [false, false, false], 54];";
+        class TextBox_Key_Shift_Right: TextBox_Key_Shift {
+            action = QUOTE(GVAR(keyNewTemp) = [ARR_3(54,[ARR_3(false,false,false)],54)];);
             text = "$STR_ACE_Common_Shift_Right";
             idc = 27;
             x = (3 / 4 * HSPACE2 + 6 * 0.1) * safezoneW + safezoneX;
             y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY;
         };
 
-        class TextBox_Key_Control_Right : TextBox_Key_Shift {
-            action = "ACE_Common_keyNewTemp = [157, [false, false, false], 157];";
+        class TextBox_Key_Control_Right: TextBox_Key_Shift {
+            action = QUOTE(GVAR(keyNewTemp) = [ARR_3(157,[ARR_3(false,false,false)],157)];);
             text = "$STR_ACE_Common_Ctrl_Right";
             idc = 28;
             x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX;
             y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY;
         };
 
-        class TextBox_Key_Alt_Right : TextBox_Key_Shift {
-            action = "ACE_Common_keyNewTemp = [184, [false, false, false], 184];";
+        class TextBox_Key_Alt_Right: TextBox_Key_Shift {
+            action = QUOTE(GVAR(keyNewTemp) = [ARR_3(184,[ARR_3(false,false,false)],184)];);
             text = "$STR_ACE_Common_Alt_Right";
             idc = 29;
             x = (3 / 4 * HSPACE2 + 7.5 * 0.1) * safezoneW + safezoneX;
             y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY;
         };
 
-        class TextBox_Action : TextBox_KeyChange {
+        class TextBox_Action: TextBox_KeyChange {
             text = "";
             idc = 30;
             colorText[] = {1,1,1,1};
@@ -824,23 +824,23 @@ class ACE_Common_OptionsMenu_Dialog {
             h = 0.3 / 9 * safezoneH;
         };
 
-        class TextBox_Key_Default : TextBox_Key_Shift {
-            action = "call ACE_Common_keysetDefault";
+        class TextBox_Key_Default: TextBox_Key_Shift {
+            action = QUOTE(call GVAR(keysetDefault));
             text = "$STR_ACE_Common_KeyDefault";
             idc = 31;
             x = (3 / 4 * HSPACE2 + 8.25 * 0.1) * safezoneW + safezoneX;
             y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY;
         };
 
-        class TextBox_Key_None : TextBox_Key_Shift {
-            action = "ACE_Common_keyNewTemp = [0, [false, false, false], 0];";
+        class TextBox_Key_None: TextBox_Key_Shift {
+            action = QUOTE(GVAR(keyNewTemp) = [ARR_3(0,[ARR_3(false,false,false)],0)];);
             text = "$STR_ACE_Common_KeyNone";
             idc = 32;
             x = (3 / 4 * HSPACE2 + 8.25 * 0.1) * safezoneW + safezoneX;
             y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY;
         };
 
-        class TextBox_Key : TextBox_KeyChange {
+        class TextBox_Key: TextBox_KeyChange {
             text = "";
             idc = 24;
             colorText[] = {1,1,1,1};
@@ -852,8 +852,8 @@ class ACE_Common_OptionsMenu_Dialog {
             h = 0.3 / 9 * safezoneH;
         };
 
-        class Interactive_ButtonV : Interactive_Button0 {
-            action = "ACE_Common_keySet = 1";
+        class Interactive_ButtonV: Interactive_Button0 {
+            action = QUOTE(ACE_Common_keySet = 1);
             text = "$STR_ACE_Common_Save";
             sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs";
             idc = 25;
@@ -864,8 +864,8 @@ class ACE_Common_OptionsMenu_Dialog {
             h = 0.3 / 9 * safezoneH;
         };
 
-        class Interactive_ButtonW : Interactive_ButtonV {
-            action = "ACE_Common_keySet = -1";
+        class Interactive_ButtonW: Interactive_ButtonV {
+            action = QUOTE(GVAR(keySet) = -1);
             text = "$STR_ACE_Common_Cancel";
             idc = 26;
             x = (HSPACE2 + 7.5 * 0.1) * safezoneW + safezoneX;
@@ -874,8 +874,8 @@ class ACE_Common_OptionsMenu_Dialog {
             h = 0.3 / 9 * safezoneH;
         };
 
-        class Interactive_ButtonX : Interactive_Button0 {
-            action = "ACE_Common_keySave = 1; closeDialog 0";
+        class Interactive_ButtonX: Interactive_Button0 {
+            action = QUOTE(GVAR(keySave) = 1; closeDialog 0);
             text = "$STR_ACE_Common_Save";
             sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs";
             idc = 10;
@@ -885,8 +885,8 @@ class ACE_Common_OptionsMenu_Dialog {
             h = 0.3 / 9 * safezoneH;
         };
 
-        class Interactive_ButtonY : Interactive_Button0 {
-            action = "ACE_Common_keySave = -1; closeDialog 0";
+        class Interactive_ButtonY: Interactive_Button0 {
+            action = QUOTE(GVAR(keySave) = -1; closeDialog 0);
             text = "$STR_ACE_Common_Cancel";
             sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs";
             idc = 11;
@@ -896,8 +896,8 @@ class ACE_Common_OptionsMenu_Dialog {
             h = 0.3 / 9 * safezoneH;
         };
 
-        class Interactive_ButtonA : ACE_Common_Interactive_Button_Base {
-            action = "false call ACE_Common_nextKeys";
+        class Interactive_ButtonA: GVAR(Interactive_Button_Base) {
+            action = QUOTE(false call GVAR(nextKeys));
             text = "$STR_ACE_Common_Prev";
             idc = 12;
             style = 2 + 0x800;
@@ -907,14 +907,14 @@ class ACE_Common_OptionsMenu_Dialog {
             h = 0.3 / 9 * safezoneH;
         };
 
-        class Interactive_ButtonB : Interactive_ButtonA {
-            action = "true call ACE_Common_nextKeys";
+        class Interactive_ButtonB: Interactive_ButtonA {
+            action = QUOTE(true call GVAR(nextKeys));
             text = "$STR_ACE_Common_Next";
             idc = 13;
             x = (HSPACE2 + 3 * 0.1 + 2.0 / 16) * safezoneW + safezoneX;
         };
 
-        class Interactive_ButtonC : ACE_Common_Text_Button_Base {
+        class Interactive_ButtonC: GVAR(Text_Button_Base) {
             text = "";
             idc = 14;
             style = 2 + 0x800;
diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
index 1476f775c0..5c37862c7b 100644
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@@ -8,7 +8,7 @@ QGVAR(remoteFnc) addPublicVariableEventHandler {
 [missionNamespace] call FUNC(executePersistent);
 
 // check previous version number from profile
-_currentVersion = getText (configFile >> "CfgPatches" >> "ACE_Common" >> "version");
+_currentVersion = getText (configFile >> "CfgPatches" >> ADDON >> "version");
 _previousVersion = profileNamespace getVariable ["ACE_VersionNumberString", ""];
 
 if (_currentVersion != _previousVersion) then {
diff --git a/addons/common/functions/fnc_addActionEventHandler.sqf b/addons/common/functions/fnc_addActionEventHandler.sqf
index e540bde53f..a75b1537d1 100644
--- a/addons/common/functions/fnc_addActionEventHandler.sqf
+++ b/addons/common/functions/fnc_addActionEventHandler.sqf
@@ -12,7 +12,7 @@
  * Return value:
  * ID of the action (used to remove it later).
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_action", "_condition", "_statement", "_name", "_actionsVar", "_actionID", "_actions", "_id", "_actionIDs"];
 
diff --git a/addons/common/functions/fnc_addActionMenuEventHandler.sqf b/addons/common/functions/fnc_addActionMenuEventHandler.sqf
index 6878f78575..249ee7e1cd 100644
--- a/addons/common/functions/fnc_addActionMenuEventHandler.sqf
+++ b/addons/common/functions/fnc_addActionMenuEventHandler.sqf
@@ -16,7 +16,7 @@
  * Return value:
  * ID of the action (used to remove it later).
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_displayName", "_action", "_condition", "_statement", "_condition2", "_statement2", "_priority", "_name", "_actionsVar", "_id", "_actionIDs", "_actions", "_nameVar", "_addAction", "_actionID"];
 
diff --git a/addons/common/functions/fnc_addCameraEventHandler.sqf b/addons/common/functions/fnc_addCameraEventHandler.sqf
index b0aaeac8e0..45fdb3bdca 100644
--- a/addons/common/functions/fnc_addCameraEventHandler.sqf
+++ b/addons/common/functions/fnc_addCameraEventHandler.sqf
@@ -10,7 +10,7 @@
  * Return value:
  * ID of the event script (used to remove it later).
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_statement", "_actionsVar", "_id", "_actionIDs", "_actions"];
 
diff --git a/addons/common/functions/fnc_addCuratorUnloadEventhandler.sqf b/addons/common/functions/fnc_addCuratorUnloadEventhandler.sqf
index 4d279c0f7a..0d1606aaf6 100644
--- a/addons/common/functions/fnc_addCuratorUnloadEventhandler.sqf
+++ b/addons/common/functions/fnc_addCuratorUnloadEventhandler.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private "_dlg";
 
diff --git a/addons/common/functions/fnc_addCustomEventHandler.sqf b/addons/common/functions/fnc_addCustomEventHandler.sqf
index 975a191942..e31730dbb3 100644
--- a/addons/common/functions/fnc_addCustomEventHandler.sqf
+++ b/addons/common/functions/fnc_addCustomEventHandler.sqf
@@ -11,7 +11,7 @@
  * Return value:
  * ID of the event script (used to remove it later).
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_object", "_type", "_statement", "_name", "_actionsVar", "_id", "_actionIDs", "_actions"];
 
diff --git a/addons/common/functions/fnc_addInfoDisplayEventHandler.sqf b/addons/common/functions/fnc_addInfoDisplayEventHandler.sqf
index 08258db97d..d80c8b7fec 100644
--- a/addons/common/functions/fnc_addInfoDisplayEventHandler.sqf
+++ b/addons/common/functions/fnc_addInfoDisplayEventHandler.sqf
@@ -10,7 +10,7 @@
  * Return value:
  * ID of the event script (used to remove it later).
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_type", "_statement", "_actionsVar", "_id", "_actionIDs", "_actions"];
 
diff --git a/addons/common/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf b/addons/common/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf
index a7b83c1f1b..60681e066c 100644
--- a/addons/common/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf
+++ b/addons/common/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * ID of the event script (used to remove it later).
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_statement", "_actionsVar", "_id", "_actionIDs", "_actions"];
 
diff --git a/addons/common/functions/fnc_addMapMarkerCreatedEventHandler.sqf b/addons/common/functions/fnc_addMapMarkerCreatedEventHandler.sqf
index 10631265bc..64ce3e9735 100644
--- a/addons/common/functions/fnc_addMapMarkerCreatedEventHandler.sqf
+++ b/addons/common/functions/fnc_addMapMarkerCreatedEventHandler.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * ID of the event script (used to remove it later).
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_statement", "_actionsVar", "_id", "_actionIDs", "_actions"];
 
diff --git a/addons/common/functions/fnc_addScrollWheelEventHandler.sqf b/addons/common/functions/fnc_addScrollWheelEventHandler.sqf
index 07ff213133..98444a160d 100644
--- a/addons/common/functions/fnc_addScrollWheelEventHandler.sqf
+++ b/addons/common/functions/fnc_addScrollWheelEventHandler.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * ID of the event script (used to remove it later).
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_statement", "_actionsVar", "_id", "_actionIDs", "_actions"];
 
diff --git a/addons/common/functions/fnc_adminKick.sqf b/addons/common/functions/fnc_adminKick.sqf
index ad8b133064..bc9afd9fcb 100644
--- a/addons/common/functions/fnc_adminKick.sqf
+++ b/addons/common/functions/fnc_adminKick.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private "_name";
 
diff --git a/addons/common/functions/fnc_ambientBrightness.sqf b/addons/common/functions/fnc_ambientBrightness.sqf
index 2ab3be4834..034129735a 100644
--- a/addons/common/functions/fnc_ambientBrightness.sqf
+++ b/addons/common/functions/fnc_ambientBrightness.sqf
@@ -9,6 +9,6 @@
  * Return value:
  * Ambient brightness (Number)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 sunOrMoon * sunOrMoon + moonIntensity/5 min 1
diff --git a/addons/common/functions/fnc_applyForceWalkStatus.sqf b/addons/common/functions/fnc_applyForceWalkStatus.sqf
index c090c236db..0f8ffb58ea 100644
--- a/addons/common/functions/fnc_applyForceWalkStatus.sqf
+++ b/addons/common/functions/fnc_applyForceWalkStatus.sqf
@@ -15,7 +15,7 @@ Returns:
 Example:
   [ACE_Player] call FUNC(applyForceWalkStatus)
 */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_forceWalkNumber"];
 
diff --git a/addons/common/functions/fnc_binarizeNumber.sqf b/addons/common/functions/fnc_binarizeNumber.sqf
index bba135b9b9..11334083f8 100644
--- a/addons/common/functions/fnc_binarizeNumber.sqf
+++ b/addons/common/functions/fnc_binarizeNumber.sqf
@@ -10,7 +10,7 @@
  * Return value:
  * Booleans (Array)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_number", "_minLength", "_array", "_index", "_rest"];
 
diff --git a/addons/common/functions/fnc_callCustomEventHandlers.sqf b/addons/common/functions/fnc_callCustomEventHandlers.sqf
index 9d2b7c2370..4b822e0754 100644
--- a/addons/common/functions/fnc_callCustomEventHandlers.sqf
+++ b/addons/common/functions/fnc_callCustomEventHandlers.sqf
@@ -11,7 +11,7 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_object", "_type", "_argument", "_name", "_actions"];
 
diff --git a/addons/common/functions/fnc_callCustomEventHandlersGlobal.sqf b/addons/common/functions/fnc_callCustomEventHandlersGlobal.sqf
index 5333a2e065..e1dddd5916 100644
--- a/addons/common/functions/fnc_callCustomEventHandlersGlobal.sqf
+++ b/addons/common/functions/fnc_callCustomEventHandlersGlobal.sqf
@@ -11,6 +11,6 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 [_this, QUOTE(FUNC(callCustomEventHandlers)), 2] call FUNC(execRemoteFnc);
diff --git a/addons/common/functions/fnc_canGetInPosition.sqf b/addons/common/functions/fnc_canGetInPosition.sqf
index 9aaaa4518a..859d8ed461 100644
--- a/addons/common/functions/fnc_canGetInPosition.sqf
+++ b/addons/common/functions/fnc_canGetInPosition.sqf
@@ -14,7 +14,7 @@
  * Return Value:
  * Nothing
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 #define CANGETINDRIVER      (isNull (driver _vehicle)             || {!alive driver _vehicle})               && {!lockedDriver _vehicle}           && {getNumber (_config >> "isUav") != 1}
 #define CANGETINTURRETINDEX (isNull (_vehicle turretUnit _turret) || {!alive (_vehicle turretUnit _turret)}) && {!(_vehicle lockedTurret _turret)} && {getNumber (_config >> "isUav") != 1}
diff --git a/addons/common/functions/fnc_canInteractWith.sqf b/addons/common/functions/fnc_canInteractWith.sqf
index 741c1474b4..9c5405452e 100644
--- a/addons/common/functions/fnc_canInteractWith.sqf
+++ b/addons/common/functions/fnc_canInteractWith.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_target", "_owner"];
 
diff --git a/addons/common/functions/fnc_canUseWeapon.sqf b/addons/common/functions/fnc_canUseWeapon.sqf
index 4c686089df..cbb33f1905 100644
--- a/addons/common/functions/fnc_canUseWeapon.sqf
+++ b/addons/common/functions/fnc_canUseWeapon.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 // returns true if the unit is on foot or in a ffv position
 
diff --git a/addons/common/functions/fnc_changeProjectileDirection.sqf b/addons/common/functions/fnc_changeProjectileDirection.sqf
index 43ff5243de..04154da9c1 100644
--- a/addons/common/functions/fnc_changeProjectileDirection.sqf
+++ b/addons/common/functions/fnc_changeProjectileDirection.sqf
@@ -12,7 +12,7 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_projectile", "_adjustDir", "_adjustUp", "_adjustSpeed", "_vdir", "_dir", "_up", "_l", "_r", "_vup", "_vel"];
 
diff --git a/addons/common/functions/fnc_checkPBOs.sqf b/addons/common/functions/fnc_checkPBOs.sqf
index 42f71ba8bd..7c4aaeba13 100644
--- a/addons/common/functions/fnc_checkPBOs.sqf
+++ b/addons/common/functions/fnc_checkPBOs.sqf
@@ -14,7 +14,7 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_mode", "_checkAll", "_whitelist", "_logic"];
 
diff --git a/addons/common/functions/fnc_claim.sqf b/addons/common/functions/fnc_claim.sqf
index 3da556fe9f..cf960ac462 100644
--- a/addons/common/functions/fnc_claim.sqf
+++ b/addons/common/functions/fnc_claim.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_target", "_lockTarget", "_owner"];
 
diff --git a/addons/common/functions/fnc_closeDialogIfTargetMoves.sqf b/addons/common/functions/fnc_closeDialogIfTargetMoves.sqf
index 417adffdf3..c701db6a02 100644
--- a/addons/common/functions/fnc_closeDialogIfTargetMoves.sqf
+++ b/addons/common/functions/fnc_closeDialogIfTargetMoves.sqf
@@ -10,7 +10,7 @@
  * Return Value:
  * None
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 _this spawn {
   _target = _this select 0;
diff --git a/addons/common/functions/fnc_codeToLetter.sqf b/addons/common/functions/fnc_codeToLetter.sqf
index 31e7241e16..8e8a9c8a3e 100644
--- a/addons/common/functions/fnc_codeToLetter.sqf
+++ b/addons/common/functions/fnc_codeToLetter.sqf
@@ -1,4 +1,4 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 ["", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"] select ([2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 30, 48, 46, 32, 18, 33, 34, 35, 23, 36, 37, 38, 50, 49, 24, 25, 16, 19, 31, 20, 22, 47, 17, 45, 44, 21] find (_this select 0)) + 1
diff --git a/addons/common/functions/fnc_codeToString.sqf b/addons/common/functions/fnc_codeToString.sqf
index fa7187cae9..440cacc5a3 100644
--- a/addons/common/functions/fnc_codeToString.sqf
+++ b/addons/common/functions/fnc_codeToString.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Code (String)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private "_function";
 
diff --git a/addons/common/functions/fnc_convertKeyCode.sqf b/addons/common/functions/fnc_convertKeyCode.sqf
index 67c316fda8..a8af25401c 100644
--- a/addons/common/functions/fnc_convertKeyCode.sqf
+++ b/addons/common/functions/fnc_convertKeyCode.sqf
@@ -12,7 +12,7 @@
  * Return value:
  * Key code (Number)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 #define KEY_MODIFIERS [42, 54, 29, 157, 56, 184]
 
diff --git a/addons/common/functions/fnc_currentChannel.sqf b/addons/common/functions/fnc_currentChannel.sqf
index 15fd89a464..115364fb24 100644
--- a/addons/common/functions/fnc_currentChannel.sqf
+++ b/addons/common/functions/fnc_currentChannel.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * The current channel. Can be "group", "side", "global", "command", "vehicle" or "direct" (String)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 #define CHANNELS ["group", "side", "global", "command", "vehicle", "direct"]
 #define CHANNELS_LOCALIZED [localize "str_channel_group", localize "str_channel_side", localize "str_channel_global", localize "str_channel_command", localize "str_channel_vehicle", localize "str_channel_direct"]
diff --git a/addons/common/functions/fnc_disableUserInput.sqf b/addons/common/functions/fnc_disableUserInput.sqf
index 324f02d1b1..923575dd97 100644
--- a/addons/common/functions/fnc_disableUserInput.sqf
+++ b/addons/common/functions/fnc_disableUserInput.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Nothing
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_state", "_dlg"];
 
diff --git a/addons/common/functions/fnc_displayText.sqf b/addons/common/functions/fnc_displayText.sqf
index 36feff14c0..c6a68cbab2 100644
--- a/addons/common/functions/fnc_displayText.sqf
+++ b/addons/common/functions/fnc_displayText.sqf
@@ -12,7 +12,7 @@
  * Return value:
  * Nothing
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 #define DEFAULT_PLAY_SOUND false
 #define DEFAULT_DELAY 2
diff --git a/addons/common/functions/fnc_displayTextPicture.sqf b/addons/common/functions/fnc_displayTextPicture.sqf
index 4b9a0255af..8d46d8d38e 100644
--- a/addons/common/functions/fnc_displayTextPicture.sqf
+++ b/addons/common/functions/fnc_displayTextPicture.sqf
@@ -10,7 +10,7 @@
  * Return value:
  * Nothing
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_text", "_image"];
 
diff --git a/addons/common/functions/fnc_displayTextStructured.sqf b/addons/common/functions/fnc_displayTextStructured.sqf
index aed3f0555a..62db6a829f 100644
--- a/addons/common/functions/fnc_displayTextStructured.sqf
+++ b/addons/common/functions/fnc_displayTextStructured.sqf
@@ -10,7 +10,7 @@
  * Return value:
  * Nothing
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_text", "_size", "_isShown", "_ctrlHint"];
 
diff --git a/addons/common/functions/fnc_doAnimation.sqf b/addons/common/functions/fnc_doAnimation.sqf
index fb1483fcd1..969a57fd6d 100644
--- a/addons/common/functions/fnc_doAnimation.sqf
+++ b/addons/common/functions/fnc_doAnimation.sqf
@@ -14,7 +14,7 @@
  * Return value:
  * Nothing
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_animation", "_priority", "_force"];
 
diff --git a/addons/common/functions/fnc_endRadioTransmission.sqf b/addons/common/functions/fnc_endRadioTransmission.sqf
index 5d6ffe19b0..990d4e03d8 100644
--- a/addons/common/functions/fnc_endRadioTransmission.sqf
+++ b/addons/common/functions/fnc_endRadioTransmission.sqf
@@ -10,7 +10,7 @@
  * None.
  *
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 // ACRE
 if (isClass (configFile >> "CfgPatches" >> "acre_main")) then {
diff --git a/addons/common/functions/fnc_execPersistentFnc.sqf b/addons/common/functions/fnc_execPersistentFnc.sqf
index 542466d60c..248d35636e 100644
--- a/addons/common/functions/fnc_execPersistentFnc.sqf
+++ b/addons/common/functions/fnc_execPersistentFnc.sqf
@@ -12,7 +12,7 @@
  * Return value:
  * Nothing.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_arguments", "_function", "_unit", "_name"];
 
diff --git a/addons/common/functions/fnc_execRemoteFnc.sqf b/addons/common/functions/fnc_execRemoteFnc.sqf
index e4091bf2f6..111dbbdc0c 100644
--- a/addons/common/functions/fnc_execRemoteFnc.sqf
+++ b/addons/common/functions/fnc_execRemoteFnc.sqf
@@ -15,7 +15,7 @@
  * Return value:
  * Nothing
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_arguments", "_function", "_unit", "_id"];
 
diff --git a/addons/common/functions/fnc_executePersistent.sqf b/addons/common/functions/fnc_executePersistent.sqf
index 8e8f7375b0..80f29f35ad 100644
--- a/addons/common/functions/fnc_executePersistent.sqf
+++ b/addons/common/functions/fnc_executePersistent.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private "_target";
 
diff --git a/addons/common/functions/fnc_exportConfig.sqf b/addons/common/functions/fnc_exportConfig.sqf
index 3b157f0a81..10c88d6bca 100644
--- a/addons/common/functions/fnc_exportConfig.sqf
+++ b/addons/common/functions/fnc_exportConfig.sqf
@@ -4,7 +4,7 @@
 
 	(configFile >> "CfgAmmo") call FUNC(exportConfig);
 */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private "_fnc_logEntries";
 
diff --git a/addons/common/functions/fnc_filter.sqf b/addons/common/functions/fnc_filter.sqf
index 3d61c7559e..23e28c5fc5 100644
--- a/addons/common/functions/fnc_filter.sqf
+++ b/addons/common/functions/fnc_filter.sqf
@@ -13,7 +13,7 @@
  * Usage:
  * [[0,1,2,3,4], {_this > 2}] call FUNC(filter) ==> [3,4]
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_array", "_code", "_newArray", "_index"];
 
diff --git a/addons/common/functions/fnc_fixCrateContent.sqf b/addons/common/functions/fnc_fixCrateContent.sqf
index d6e7f91cc6..3128f783d5 100644
--- a/addons/common/functions/fnc_fixCrateContent.sqf
+++ b/addons/common/functions/fnc_fixCrateContent.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_crate", "_weapons", "_items"];
 
diff --git a/addons/common/functions/fnc_fixLoweredRifleAnimation.sqf b/addons/common/functions/fnc_fixLoweredRifleAnimation.sqf
index 2a5a5d1224..55bc6865b0 100644
--- a/addons/common/functions/fnc_fixLoweredRifleAnimation.sqf
+++ b/addons/common/functions/fnc_fixLoweredRifleAnimation.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private "_unit";
 
diff --git a/addons/common/functions/fnc_getCaptivityStatus.sqf b/addons/common/functions/fnc_getCaptivityStatus.sqf
index 857d78d5b1..dcd3d6b0ff 100644
--- a/addons/common/functions/fnc_getCaptivityStatus.sqf
+++ b/addons/common/functions/fnc_getCaptivityStatus.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Reasons, why the unit is a captive. An empty array is returned if the unit is not a captive (Array of Strings)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_captivityReasons", "_unitCaptivityStatus", "_unitCaptivityReasons"];
 
diff --git a/addons/common/functions/fnc_getChildren.sqf b/addons/common/functions/fnc_getChildren.sqf
index 4fcf7af2fb..057b14ff40 100644
--- a/addons/common/functions/fnc_getChildren.sqf
+++ b/addons/common/functions/fnc_getChildren.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_name", "_cfgClass", "_classes"];
 
diff --git a/addons/common/functions/fnc_getConfigCommander.sqf b/addons/common/functions/fnc_getConfigCommander.sqf
index bb65331228..5fca3af81c 100644
--- a/addons/common/functions/fnc_getConfigCommander.sqf
+++ b/addons/common/functions/fnc_getConfigCommander.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Commander config (Config)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_vehicle", "_config", "_turret"];
 
diff --git a/addons/common/functions/fnc_getConfigGunner.sqf b/addons/common/functions/fnc_getConfigGunner.sqf
index e4708599d8..0c09461a04 100644
--- a/addons/common/functions/fnc_getConfigGunner.sqf
+++ b/addons/common/functions/fnc_getConfigGunner.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Gunner config (Config)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_vehicle", "_config", "_turret"];
 
diff --git a/addons/common/functions/fnc_getDefaultAnim.sqf b/addons/common/functions/fnc_getDefaultAnim.sqf
index 99636e36e7..fd53668396 100644
--- a/addons/common/functions/fnc_getDefaultAnim.sqf
+++ b/addons/common/functions/fnc_getDefaultAnim.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_anim", "_stance"];
 
diff --git a/addons/common/functions/fnc_getDisplayConfigName.sqf b/addons/common/functions/fnc_getDisplayConfigName.sqf
index 38623ff333..3ffc20de2f 100644
--- a/addons/common/functions/fnc_getDisplayConfigName.sqf
+++ b/addons/common/functions/fnc_getDisplayConfigName.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_configName", "_index"];
 
diff --git a/addons/common/functions/fnc_getDoorTurrets.sqf b/addons/common/functions/fnc_getDoorTurrets.sqf
index 02d9dd6978..eadaeb2000 100644
--- a/addons/common/functions/fnc_getDoorTurrets.sqf
+++ b/addons/common/functions/fnc_getDoorTurrets.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Turret indexes of the door gunner. Empty array means no gunner position. (Array)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_vehicleType", "_turrets", "_doorTurrets", "_config"];
 
diff --git a/addons/common/functions/fnc_getForceWalkStatus.sqf b/addons/common/functions/fnc_getForceWalkStatus.sqf
index 3d762b1cdd..10a70546fb 100644
--- a/addons/common/functions/fnc_getForceWalkStatus.sqf
+++ b/addons/common/functions/fnc_getForceWalkStatus.sqf
@@ -15,7 +15,7 @@ Returns:
 Example:
   [ACE_Player] call FUNC(getForceWalkStatus)
 */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_forceWalkReasons", "_unitForceWalkNumber", "_unitForceWalkStatus", "_unitForceWalkReasons"];
 
diff --git a/addons/common/functions/fnc_getHitPoints.sqf b/addons/common/functions/fnc_getHitPoints.sqf
index 2b6c157891..a6d75e41b9 100644
--- a/addons/common/functions/fnc_getHitPoints.sqf
+++ b/addons/common/functions/fnc_getHitPoints.sqf
@@ -9,7 +9,7 @@
  * Return Value:
  * The hitpoints (Array)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_vehicle", "_config", "_hitpoints"];
 
diff --git a/addons/common/functions/fnc_getHitPointsWithSelections.sqf b/addons/common/functions/fnc_getHitPointsWithSelections.sqf
index f48489b130..e9a7a8fac5 100644
--- a/addons/common/functions/fnc_getHitPointsWithSelections.sqf
+++ b/addons/common/functions/fnc_getHitPointsWithSelections.sqf
@@ -9,7 +9,7 @@
  * Return Value:
  * The hitpoints with selections. Format: [hitpoints, selections]. They correspond by index. (Array)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_vehicle", "_config", "_hitpoints", "_selections"];
 
diff --git a/addons/common/functions/fnc_getInPosition.sqf b/addons/common/functions/fnc_getInPosition.sqf
index 4cc7705b3c..0cfce1e124 100644
--- a/addons/common/functions/fnc_getInPosition.sqf
+++ b/addons/common/functions/fnc_getInPosition.sqf
@@ -13,7 +13,7 @@
  * Return Value:
  * Nothing
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 #define CANGETINDRIVER      (isNull (driver _vehicle)             || {!alive driver _vehicle})               && {!lockedDriver _vehicle}           && {getNumber (_config >> "isUav") != 1}
 #define CANGETINTURRETINDEX (isNull (_vehicle turretUnit _turret) || {!alive (_vehicle turretUnit _turret)}) && {!(_vehicle lockedTurret _turret)} && {getNumber (_config >> "isUav") != 1}
diff --git a/addons/common/functions/fnc_getMarkerType.sqf b/addons/common/functions/fnc_getMarkerType.sqf
index cfcfcc420d..0324bf0ede 100644
--- a/addons/common/functions/fnc_getMarkerType.sqf
+++ b/addons/common/functions/fnc_getMarkerType.sqf
@@ -9,7 +9,7 @@
  * Return Value:
  * Marker Type (string)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 _group = _this select 0;
 _leader = leader _group;
diff --git a/addons/common/functions/fnc_getName.sqf b/addons/common/functions/fnc_getName.sqf
index 3bc0663f51..4d10ce052c 100644
--- a/addons/common/functions/fnc_getName.sqf
+++ b/addons/common/functions/fnc_getName.sqf
@@ -10,7 +10,7 @@
  * Return value:
  * The name.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_showEffective", "_name"];
 
diff --git a/addons/common/functions/fnc_getNumberFromMissionSQM.sqf b/addons/common/functions/fnc_getNumberFromMissionSQM.sqf
index 7251a253a6..1c9fbda77d 100644
--- a/addons/common/functions/fnc_getNumberFromMissionSQM.sqf
+++ b/addons/common/functions/fnc_getNumberFromMissionSQM.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Value of the entry. Note: If the entry does not exist, it might return 0 or an entry with the same name of another class! (Number)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private "_number";
 
diff --git a/addons/common/functions/fnc_getPitchBankYaw.sqf b/addons/common/functions/fnc_getPitchBankYaw.sqf
index 3758b42931..2a9b0bacd1 100644
--- a/addons/common/functions/fnc_getPitchBankYaw.sqf
+++ b/addons/common/functions/fnc_getPitchBankYaw.sqf
@@ -9,6 +9,6 @@
  * Return Value:
  * [pitch, bank, yaw]
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 ((_this select 0) call BIS_fnc_getPitchBank) + [getDir (_this select 0)]
diff --git a/addons/common/functions/fnc_getStringFromMissionSQM.sqf b/addons/common/functions/fnc_getStringFromMissionSQM.sqf
index 1fb22e51c8..a19e3490aa 100644
--- a/addons/common/functions/fnc_getStringFromMissionSQM.sqf
+++ b/addons/common/functions/fnc_getStringFromMissionSQM.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Value of the entry. Note: If the entry does not exist, it might return an empty string or an entry with the same name of another class! (String)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_path", "_mission", "_a", "_class", "_index", "_array", "_b", "_entry"];
 
diff --git a/addons/common/functions/fnc_getTargetAzimuthAndInclination.sqf b/addons/common/functions/fnc_getTargetAzimuthAndInclination.sqf
index 0327a38f5d..396a3ec85e 100644
--- a/addons/common/functions/fnc_getTargetAzimuthAndInclination.sqf
+++ b/addons/common/functions/fnc_getTargetAzimuthAndInclination.sqf
@@ -10,7 +10,7 @@
  * 0: Azimuth (Number)
  * 1: Inclination or 'slope' (Number)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_position", "_direction", "_azimuth", "_inclination"];
 
diff --git a/addons/common/functions/fnc_getTargetDistance.sqf b/addons/common/functions/fnc_getTargetDistance.sqf
index d30e880d21..79ef273fad 100644
--- a/addons/common/functions/fnc_getTargetDistance.sqf
+++ b/addons/common/functions/fnc_getTargetDistance.sqf
@@ -11,7 +11,7 @@
  * Return value:
  * Measured distance in meters. Can return maximal or minimal distance (Number)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_interval", "_maxDistance", "_minDistance", "_position", "_laser", "_line", "_distance", "_iteration"];
 
diff --git a/addons/common/functions/fnc_getTargetObject.sqf b/addons/common/functions/fnc_getTargetObject.sqf
index 5ad46b4f85..c00a0e2340 100644
--- a/addons/common/functions/fnc_getTargetObject.sqf
+++ b/addons/common/functions/fnc_getTargetObject.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Nearest object directly in line of sight, if none objNull (Object)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_maxDistance", "_position", "_laser", "_intersects"];
 
diff --git a/addons/common/functions/fnc_getTurretCommander.sqf b/addons/common/functions/fnc_getTurretCommander.sqf
index ed68cbd7c5..4c2b1139c8 100644
--- a/addons/common/functions/fnc_getTurretCommander.sqf
+++ b/addons/common/functions/fnc_getTurretCommander.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Turret index of the vehicles commander. Empty array means no observer position. (Array)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_vehicle", "_turrets", "_turret", "_config"];
 
diff --git a/addons/common/functions/fnc_getTurretConfigPath.sqf b/addons/common/functions/fnc_getTurretConfigPath.sqf
index 2d8f099ac8..aab3433a4f 100644
--- a/addons/common/functions/fnc_getTurretConfigPath.sqf
+++ b/addons/common/functions/fnc_getTurretConfigPath.sqf
@@ -10,7 +10,7 @@
  * Return value:
  * Turret config (Config)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_config", "_turretIndex", "_index", "_offset", "_config2", "_foundClasses"];
 
diff --git a/addons/common/functions/fnc_getTurretCopilot.sqf b/addons/common/functions/fnc_getTurretCopilot.sqf
index ab31245777..c2a7e81778 100644
--- a/addons/common/functions/fnc_getTurretCopilot.sqf
+++ b/addons/common/functions/fnc_getTurretCopilot.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Turret index of the vehicles gunner. Empty array means no copilot position. (Array)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_vehicle", "_turrets", "_turret", "_config"];
 
diff --git a/addons/common/functions/fnc_getTurretGunner.sqf b/addons/common/functions/fnc_getTurretGunner.sqf
index 4aeac062bc..fd1134dc83 100644
--- a/addons/common/functions/fnc_getTurretGunner.sqf
+++ b/addons/common/functions/fnc_getTurretGunner.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Turret index of the vehicles gunner. Empty array means no gunner position. (Array)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_vehicle", "_turrets", "_turret", "_config"];
 
diff --git a/addons/common/functions/fnc_getTurretIndex.sqf b/addons/common/functions/fnc_getTurretIndex.sqf
index dca0581279..7e62c78848 100644
--- a/addons/common/functions/fnc_getTurretIndex.sqf
+++ b/addons/common/functions/fnc_getTurretIndex.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Turret index array or config path. E.g: [0] for gunner or [0,0] for commander. Returns empty array if unit is not in a turret. (Array)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_vehicle", "_turrets", "_units", "_index"];
 
diff --git a/addons/common/functions/fnc_getTurrets.sqf b/addons/common/functions/fnc_getTurrets.sqf
index 2fa93678c3..47ffcde090 100644
--- a/addons/common/functions/fnc_getTurrets.sqf
+++ b/addons/common/functions/fnc_getTurrets.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * All turret index arrays of the vehicle. E.g: [[0], [0,0]] (Array)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_type", "_config", "_turrets", "_fnc_addTurret"];
 
diff --git a/addons/common/functions/fnc_getTurretsFFV.sqf b/addons/common/functions/fnc_getTurretsFFV.sqf
index f4c800a5b0..b09dfed027 100644
--- a/addons/common/functions/fnc_getTurretsFFV.sqf
+++ b/addons/common/functions/fnc_getTurretsFFV.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Turret index of the vehicles gunner. Empty array means no ffv turrets. (Array)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_vehicle", "_turrets", "_turret", "_config"];
 
diff --git a/addons/common/functions/fnc_getTurretsOther.sqf b/addons/common/functions/fnc_getTurretsOther.sqf
index ccb16f1102..53673b5a8d 100644
--- a/addons/common/functions/fnc_getTurretsOther.sqf
+++ b/addons/common/functions/fnc_getTurretsOther.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Turret index of the vehicles gunner. Empty array means no other turrets. (Array)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_vehicle", "_turrets", "_turret", "_config"];
 
diff --git a/addons/common/functions/fnc_getUavControlPosition.sqf b/addons/common/functions/fnc_getUavControlPosition.sqf
index 9e255efea3..82b04e2928 100644
--- a/addons/common/functions/fnc_getUavControlPosition.sqf
+++ b/addons/common/functions/fnc_getUavControlPosition.sqf
@@ -18,7 +18,7 @@ Returns:
 Example:
   [ACE_Player] call FUNC(getUavControlPosition)
 */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_uav", "_positionArray", "_playerIndex"];
 
diff --git a/addons/common/functions/fnc_getVehicleCargo.sqf b/addons/common/functions/fnc_getVehicleCargo.sqf
index e5b0f235e7..e0483e8487 100644
--- a/addons/common/functions/fnc_getVehicleCargo.sqf
+++ b/addons/common/functions/fnc_getVehicleCargo.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Vehicle cargo positions. (Array)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_vehicle", "_config", "_cargo", "_codrivers"];
 
diff --git a/addons/common/functions/fnc_getVehicleCodriver.sqf b/addons/common/functions/fnc_getVehicleCodriver.sqf
index 901a40ea2f..4fd8058d1e 100644
--- a/addons/common/functions/fnc_getVehicleCodriver.sqf
+++ b/addons/common/functions/fnc_getVehicleCodriver.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Vehicle codriver positions. (Array)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_vehicle", "_config", "_cargo", "_codrivers"];
 
diff --git a/addons/common/functions/fnc_getVehicleCrew.sqf b/addons/common/functions/fnc_getVehicleCrew.sqf
index bdbeb1cf22..b14fbe561e 100644
--- a/addons/common/functions/fnc_getVehicleCrew.sqf
+++ b/addons/common/functions/fnc_getVehicleCrew.sqf
@@ -10,7 +10,7 @@
  * Return value:
  * Crew (Array)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_vehicle", "_types", "_crew"];
 
diff --git a/addons/common/functions/fnc_getWeaponAzimuthAndInclination.sqf b/addons/common/functions/fnc_getWeaponAzimuthAndInclination.sqf
index 13b94d607d..7433991e29 100644
--- a/addons/common/functions/fnc_getWeaponAzimuthAndInclination.sqf
+++ b/addons/common/functions/fnc_getWeaponAzimuthAndInclination.sqf
@@ -10,7 +10,7 @@
  * 0: Azimuth (Number)
  * 1: Inclination or 'slope' (Number)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_weapon", "_direction", "_azimuth", "_inclination"];
 
diff --git a/addons/common/functions/fnc_getWeaponType.sqf b/addons/common/functions/fnc_getWeaponType.sqf
index b95a4c389f..89ee46427b 100644
--- a/addons/common/functions/fnc_getWeaponType.sqf
+++ b/addons/common/functions/fnc_getWeaponType.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Slot index of the given class name, 1: primary, 2: secondary, 3: handgun, else: -1 (Number)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_weapon", "_type", "_index"];
 
diff --git a/addons/common/functions/fnc_getWindDirection.sqf b/addons/common/functions/fnc_getWindDirection.sqf
index c6618d9958..5bd4ff12ff 100644
--- a/addons/common/functions/fnc_getWindDirection.sqf
+++ b/addons/common/functions/fnc_getWindDirection.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Wind direction. (String)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 switch (round (windDir / 360 * 16)) do {
   case 1 :  {localize QUOTE(DOUBLES(STR,GVAR(SSW)))};
diff --git a/addons/common/functions/fnc_goKneeling.sqf b/addons/common/functions/fnc_goKneeling.sqf
index 846aac4712..fbe7c3b8f3 100644
--- a/addons/common/functions/fnc_goKneeling.sqf
+++ b/addons/common/functions/fnc_goKneeling.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private "_unit";
 
diff --git a/addons/common/functions/fnc_hadamardProduct.sqf b/addons/common/functions/fnc_hadamardProduct.sqf
index c7011db943..dd614f8dd0 100644
--- a/addons/common/functions/fnc_hadamardProduct.sqf
+++ b/addons/common/functions/fnc_hadamardProduct.sqf
@@ -11,7 +11,7 @@
  * Return Value:
  * Hadamard Product
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 _vector1 = _this select 0;
 _vector2 = _this select 1;
diff --git a/addons/common/functions/fnc_inTransitionAnim.sqf b/addons/common/functions/fnc_inTransitionAnim.sqf
index 8dad063660..4ce16aebf9 100644
--- a/addons/common/functions/fnc_inTransitionAnim.sqf
+++ b/addons/common/functions/fnc_inTransitionAnim.sqf
@@ -1,4 +1,4 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> animationState (_this select 0) >> "looped") == 0
diff --git a/addons/common/functions/fnc_interpolateFromArray.sqf b/addons/common/functions/fnc_interpolateFromArray.sqf
index 79b5f2eff3..8c0c8daa36 100644
--- a/addons/common/functions/fnc_interpolateFromArray.sqf
+++ b/addons/common/functions/fnc_interpolateFromArray.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_array", "_value", "_min", "_max"];
 
diff --git a/addons/common/functions/fnc_isAutoWind.sqf b/addons/common/functions/fnc_isAutoWind.sqf
index 87099a23e7..50933e40a2 100644
--- a/addons/common/functions/fnc_isAutoWind.sqf
+++ b/addons/common/functions/fnc_isAutoWind.sqf
@@ -9,6 +9,6 @@
  * Return value:
  * This mission has automatic wind? (Bool)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 ["Mission", "Intel", "windForced"] call FUNC(getNumberFromMissionSQM) != 1
diff --git a/addons/common/functions/fnc_isEOD.sqf b/addons/common/functions/fnc_isEOD.sqf
index 7cc185c773..6149dfa37b 100644
--- a/addons/common/functions/fnc_isEOD.sqf
+++ b/addons/common/functions/fnc_isEOD.sqf
@@ -18,7 +18,7 @@
   Example:
     _isSpecialist = [player] call FUNC(isEOD);
 */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private "_unit";
 
diff --git a/addons/common/functions/fnc_isEngineer.sqf b/addons/common/functions/fnc_isEngineer.sqf
index fa4d12cef6..2bdb62df4c 100644
--- a/addons/common/functions/fnc_isEngineer.sqf
+++ b/addons/common/functions/fnc_isEngineer.sqf
@@ -9,7 +9,7 @@
  * Return Value:
  * Bool: is the unit an engineer?
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private "_unit";
 
diff --git a/addons/common/functions/fnc_isInBuilding.sqf b/addons/common/functions/fnc_isInBuilding.sqf
index 0b69318f8a..0989db42da 100644
--- a/addons/common/functions/fnc_isInBuilding.sqf
+++ b/addons/common/functions/fnc_isInBuilding.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Is the unit in a building? (Bool)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 #define DISTANCE 10
 
diff --git a/addons/common/functions/fnc_isMedic.sqf b/addons/common/functions/fnc_isMedic.sqf
index dec244d0c0..d4efdca5b6 100644
--- a/addons/common/functions/fnc_isMedic.sqf
+++ b/addons/common/functions/fnc_isMedic.sqf
@@ -9,7 +9,7 @@
  * Return Value:
  * Bool: is unit medic?
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit"];
 
diff --git a/addons/common/functions/fnc_isPlayer.sqf b/addons/common/functions/fnc_isPlayer.sqf
index 05b8484a0c..772fae1746 100644
--- a/addons/common/functions/fnc_isPlayer.sqf
+++ b/addons/common/functions/fnc_isPlayer.sqf
@@ -10,6 +10,6 @@
  * Return Value:
  * Bool: is unit a player?
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 isPlayer (_this select 0) || {_this select 0 == call FUNC(player)}
diff --git a/addons/common/functions/fnc_isTurnedOut.sqf b/addons/common/functions/fnc_isTurnedOut.sqf
index b467df6e1a..8f722ed733 100644
--- a/addons/common/functions/fnc_isTurnedOut.sqf
+++ b/addons/common/functions/fnc_isTurnedOut.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Is the unit turned out or not? Will return false if there is no option to turn out in the first place. (Bool)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_vehicle", "_config", "_animation", "_action", "_inAction", "_turretIndex"];
 
diff --git a/addons/common/functions/fnc_letterToCode.sqf b/addons/common/functions/fnc_letterToCode.sqf
index d50f6b87df..59243915f5 100644
--- a/addons/common/functions/fnc_letterToCode.sqf
+++ b/addons/common/functions/fnc_letterToCode.sqf
@@ -1,4 +1,4 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 [-1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 30, 48, 46, 32, 18, 33, 34, 35, 23, 36, 37, 38, 50, 49, 24, 25, 16, 19, 31, 20, 22, 47, 17, 45, 44, 21] select (["1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"] find toUpper (_this select 0)) + 1
diff --git a/addons/common/functions/fnc_log.sqf b/addons/common/functions/fnc_log.sqf
index b778269845..43a5a27682 100644
--- a/addons/common/functions/fnc_log.sqf
+++ b/addons/common/functions/fnc_log.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 if ((_this select 0) in (missionNamespace getVariable ["ACE_Debug", []])) then {
   private ["_type", "_argument", "_function", "_showInGame"];
diff --git a/addons/common/functions/fnc_logControls.sqf b/addons/common/functions/fnc_logControls.sqf
index 39f611aa25..5a0a17c317 100644
--- a/addons/common/functions/fnc_logControls.sqf
+++ b/addons/common/functions/fnc_logControls.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_array", "_index"];
 
diff --git a/addons/common/functions/fnc_logDisplays.sqf b/addons/common/functions/fnc_logDisplays.sqf
index 2e1bbb4634..81598facf4 100644
--- a/addons/common/functions/fnc_logDisplays.sqf
+++ b/addons/common/functions/fnc_logDisplays.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_array", "_index"];
 
diff --git a/addons/common/functions/fnc_map.sqf b/addons/common/functions/fnc_map.sqf
index 07062a795b..99c52ae742 100644
--- a/addons/common/functions/fnc_map.sqf
+++ b/addons/common/functions/fnc_map.sqf
@@ -13,7 +13,7 @@
  * Usage:
  * [["2", "gobblecock", "25"], {parseNumber _this}] call FUNC(map) ==> [2, 0, 25]
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_array", "_code"];
 
diff --git a/addons/common/functions/fnc_moduleCheckPBOs.sqf b/addons/common/functions/fnc_moduleCheckPBOs.sqf
index 5bb95ec463..4b5ea2374a 100644
--- a/addons/common/functions/fnc_moduleCheckPBOs.sqf
+++ b/addons/common/functions/fnc_moduleCheckPBOs.sqf
@@ -9,7 +9,7 @@
  * Return Value:
  * None
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 _logic = _this select 0;
 _units = _this select 1;
diff --git a/addons/common/functions/fnc_moduleLSDVehicles.sqf b/addons/common/functions/fnc_moduleLSDVehicles.sqf
index 0eba43a974..f06c1cf2ea 100644
--- a/addons/common/functions/fnc_moduleLSDVehicles.sqf
+++ b/addons/common/functions/fnc_moduleLSDVehicles.sqf
@@ -9,7 +9,7 @@
  * Return Value:
  * None
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 _logic = _this select 0;
 _units = _this select 1;
diff --git a/addons/common/functions/fnc_monitor.sqf b/addons/common/functions/fnc_monitor.sqf
index 325deeff14..dcb9e5163f 100644
--- a/addons/common/functions/fnc_monitor.sqf
+++ b/addons/common/functions/fnc_monitor.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 terminate (missionNamespace getVariable [QGVAR(MonitorFnc), scriptNull]);
 
diff --git a/addons/common/functions/fnc_muteUnit.sqf b/addons/common/functions/fnc_muteUnit.sqf
index d0b21b777c..8edf9df391 100644
--- a/addons/common/functions/fnc_muteUnit.sqf
+++ b/addons/common/functions/fnc_muteUnit.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Nothing
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_speaker"];
 
diff --git a/addons/common/functions/fnc_numberToDigits.sqf b/addons/common/functions/fnc_numberToDigits.sqf
index a95b051249..465955b455 100644
--- a/addons/common/functions/fnc_numberToDigits.sqf
+++ b/addons/common/functions/fnc_numberToDigits.sqf
@@ -10,7 +10,7 @@
  * Return value:
  * Digits. The maximum count is six digits. (Array)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_number", "_minLength", "_length", "_digits", "_index", "_count"];
 
diff --git a/addons/common/functions/fnc_numberToDigitsString.sqf b/addons/common/functions/fnc_numberToDigitsString.sqf
index 88b457c0d8..db4e33e6cb 100644
--- a/addons/common/functions/fnc_numberToDigitsString.sqf
+++ b/addons/common/functions/fnc_numberToDigitsString.sqf
@@ -10,7 +10,7 @@
  * Return value:
  * Digits. The maximum length is six digits. (String)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_digits", "_count", "_string", "_index"];
 
diff --git a/addons/common/functions/fnc_onLoadRscDisplayChannel.sqf b/addons/common/functions/fnc_onLoadRscDisplayChannel.sqf
index b853dcfeeb..2a2fbfc9a4 100644
--- a/addons/common/functions/fnc_onLoadRscDisplayChannel.sqf
+++ b/addons/common/functions/fnc_onLoadRscDisplayChannel.sqf
@@ -13,7 +13,7 @@
   Returns:
     Nothing
 */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 uiNamespace setVariable ["ACE_ctrlChannel", (_this select 0) displayCtrl 101];
 
diff --git a/addons/common/functions/fnc_owned.sqf b/addons/common/functions/fnc_owned.sqf
index feeb223109..4fa1dbeb98 100644
--- a/addons/common/functions/fnc_owned.sqf
+++ b/addons/common/functions/fnc_owned.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private "_object";
 
diff --git a/addons/common/functions/fnc_player.sqf b/addons/common/functions/fnc_player.sqf
index 7aba5a4c24..3e5990f84b 100644
--- a/addons/common/functions/fnc_player.sqf
+++ b/addons/common/functions/fnc_player.sqf
@@ -10,6 +10,6 @@
  * Return Value:
  * Player controlled unit (object)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 missionNamespace getVariable ["bis_fnc_moduleRemoteControl_unit", player]
diff --git a/addons/common/functions/fnc_playerSide.sqf b/addons/common/functions/fnc_playerSide.sqf
index e1ee07750f..632cf11abf 100644
--- a/addons/common/functions/fnc_playerSide.sqf
+++ b/addons/common/functions/fnc_playerSide.sqf
@@ -1,4 +1,4 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 side group ACE_player
diff --git a/addons/common/functions/fnc_progressBar.sqf b/addons/common/functions/fnc_progressBar.sqf
index 59323bc3f3..a50b1ecfdd 100644
--- a/addons/common/functions/fnc_progressBar.sqf
+++ b/addons/common/functions/fnc_progressBar.sqf
@@ -13,7 +13,7 @@
  * Return value:
  * Nothing
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 closeDialog 0;
 createDialog QGVAR(ProgressBar_Dialog);
diff --git a/addons/common/functions/fnc_queueAnimation.sqf b/addons/common/functions/fnc_queueAnimation.sqf
index 73535e1d54..a489a46174 100644
--- a/addons/common/functions/fnc_queueAnimation.sqf
+++ b/addons/common/functions/fnc_queueAnimation.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 terminate (missionNamespace getVariable [QGVAR(waitForAnimationHandle), scriptNull]);
 
diff --git a/addons/common/functions/fnc_readBooleanParameterFromModule.sqf b/addons/common/functions/fnc_readBooleanParameterFromModule.sqf
index a4cf2b6bc0..9ee2faa001 100644
--- a/addons/common/functions/fnc_readBooleanParameterFromModule.sqf
+++ b/addons/common/functions/fnc_readBooleanParameterFromModule.sqf
@@ -11,7 +11,7 @@
  * Return Value:
  * None
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
  private ["_logic", "_parameterName", "_moduleParameterName"];
 
diff --git a/addons/common/functions/fnc_readNumericParameterFromModule.sqf b/addons/common/functions/fnc_readNumericParameterFromModule.sqf
index cdb2f2a409..a9c35f5b46 100644
--- a/addons/common/functions/fnc_readNumericParameterFromModule.sqf
+++ b/addons/common/functions/fnc_readNumericParameterFromModule.sqf
@@ -11,7 +11,7 @@
  * Return Value:
  * None
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
  private ["_logic", "_parameterName", "_moduleParameterName", "_value"];
 
diff --git a/addons/common/functions/fnc_removeActionEventHandler.sqf b/addons/common/functions/fnc_removeActionEventHandler.sqf
index 5e5783dcc3..7d92b3de75 100644
--- a/addons/common/functions/fnc_removeActionEventHandler.sqf
+++ b/addons/common/functions/fnc_removeActionEventHandler.sqf
@@ -11,7 +11,7 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_action", "_id", "_name", "_actionsVar", "_actionID", "_actions", "_currentID", "_actionIDs", "_count"];
 
diff --git a/addons/common/functions/fnc_removeActionMenuEventHandler.sqf b/addons/common/functions/fnc_removeActionMenuEventHandler.sqf
index 5614752aba..7c45bae112 100644
--- a/addons/common/functions/fnc_removeActionMenuEventHandler.sqf
+++ b/addons/common/functions/fnc_removeActionMenuEventHandler.sqf
@@ -11,7 +11,7 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_action", "_id", "_name", "_actionsVar", "_currentID", "_actionIDs", "_actions", "_actionID", "_nameVar"];
 
diff --git a/addons/common/functions/fnc_removeCameraEventHandler.sqf b/addons/common/functions/fnc_removeCameraEventHandler.sqf
index 66c2382481..0fe8953078 100644
--- a/addons/common/functions/fnc_removeCameraEventHandler.sqf
+++ b/addons/common/functions/fnc_removeCameraEventHandler.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_id", "_actionsVar", "_currentId", "_actionIDs", "_actions"];
 
diff --git a/addons/common/functions/fnc_removeCustomEventHandler.sqf b/addons/common/functions/fnc_removeCustomEventHandler.sqf
index 419a349a72..771ea9f5bf 100644
--- a/addons/common/functions/fnc_removeCustomEventHandler.sqf
+++ b/addons/common/functions/fnc_removeCustomEventHandler.sqf
@@ -11,7 +11,7 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_object", "_type", "_id", "_name", "_actionsVar", "_currentId", "_actionIDs", "_actions"];
 
diff --git a/addons/common/functions/fnc_removeInfoDisplayEventHandler.sqf b/addons/common/functions/fnc_removeInfoDisplayEventHandler.sqf
index 002c75364c..160002990c 100644
--- a/addons/common/functions/fnc_removeInfoDisplayEventHandler.sqf
+++ b/addons/common/functions/fnc_removeInfoDisplayEventHandler.sqf
@@ -10,7 +10,7 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_type", "_id", "_actionsVar", "_currentId", "_actionIDs", "_actions"];
 
diff --git a/addons/common/functions/fnc_removeInventoryDisplayLoadedEventHandler.sqf b/addons/common/functions/fnc_removeInventoryDisplayLoadedEventHandler.sqf
index 64e6263d8b..f022d7d228 100644
--- a/addons/common/functions/fnc_removeInventoryDisplayLoadedEventHandler.sqf
+++ b/addons/common/functions/fnc_removeInventoryDisplayLoadedEventHandler.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_id", "_actionsVar", "_currentId", "_actionIDs", "_actions"];
 
diff --git a/addons/common/functions/fnc_removeMapMarkerCreatedEventHandler.sqf b/addons/common/functions/fnc_removeMapMarkerCreatedEventHandler.sqf
index aaba83a56c..0f31b5e886 100644
--- a/addons/common/functions/fnc_removeMapMarkerCreatedEventHandler.sqf
+++ b/addons/common/functions/fnc_removeMapMarkerCreatedEventHandler.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_id", "_actionsVar", "_currentId", "_actionIDs", "_actions"];
 
diff --git a/addons/common/functions/fnc_removeScrollWheelEventHandler.sqf b/addons/common/functions/fnc_removeScrollWheelEventHandler.sqf
index 4246360666..914064538d 100644
--- a/addons/common/functions/fnc_removeScrollWheelEventHandler.sqf
+++ b/addons/common/functions/fnc_removeScrollWheelEventHandler.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_id", "_actionsVar", "_currentId", "_actionIDs", "_actions"];
 
diff --git a/addons/common/functions/fnc_restoreVariablesJIP.sqf b/addons/common/functions/fnc_restoreVariablesJIP.sqf
index 2aaad78c81..2c173a054c 100644
--- a/addons/common/functions/fnc_restoreVariablesJIP.sqf
+++ b/addons/common/functions/fnc_restoreVariablesJIP.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Nothing.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_respawnVariables"];
 
diff --git a/addons/common/functions/fnc_revertKeyCodeLocalized.sqf b/addons/common/functions/fnc_revertKeyCodeLocalized.sqf
index f30bf2bc82..bdffb3a6c9 100644
--- a/addons/common/functions/fnc_revertKeyCodeLocalized.sqf
+++ b/addons/common/functions/fnc_revertKeyCodeLocalized.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * What input will result in the given key code? (String)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_keyCode", "_key", "_alt", "_ctrl", "_shft"];
 
diff --git a/addons/common/functions/fnc_sanitizeString.sqf b/addons/common/functions/fnc_sanitizeString.sqf
index 29809f4dca..44717915db 100644
--- a/addons/common/functions/fnc_sanitizeString.sqf
+++ b/addons/common/functions/fnc_sanitizeString.sqf
@@ -10,7 +10,7 @@
  * Return Value:
  * Sanitized string
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_string", "_removeTags", "_array", "_arrayNew"];
 
diff --git a/addons/common/functions/fnc_serverLog.sqf b/addons/common/functions/fnc_serverLog.sqf
index fedeb4fe88..e2c981302d 100644
--- a/addons/common/functions/fnc_serverLog.sqf
+++ b/addons/common/functions/fnc_serverLog.sqf
@@ -1,5 +1,5 @@
 // by CAA-Picard
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 if (isServer) then {
   diag_log _this;
diff --git a/addons/common/functions/fnc_setCaptivityStatus.sqf b/addons/common/functions/fnc_setCaptivityStatus.sqf
index 4c95926960..b943fce4ab 100644
--- a/addons/common/functions/fnc_setCaptivityStatus.sqf
+++ b/addons/common/functions/fnc_setCaptivityStatus.sqf
@@ -11,7 +11,7 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_reason", "_status", "_captivityReasons", "_unitCaptivityReasons", "_captivityReasonsBooleans", "_bitmask"];
 
diff --git a/addons/common/functions/fnc_setForceWalkStatus.sqf b/addons/common/functions/fnc_setForceWalkStatus.sqf
index 45aa6715ed..52b674015f 100644
--- a/addons/common/functions/fnc_setForceWalkStatus.sqf
+++ b/addons/common/functions/fnc_setForceWalkStatus.sqf
@@ -18,7 +18,7 @@ Returns:
 Example:
   [ACE_Player, "BrokenLeg", true] call FUNC(setForceWalkStatus)
 */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_reason", "_status", "_forceWalkReasons", "_unitForceWalkReasons", "_forceWalkReasonsBooleans", "_bitmaskNumber"];
 
diff --git a/addons/common/functions/fnc_setKeyDefault.sqf b/addons/common/functions/fnc_setKeyDefault.sqf
index ffb3edc709..3c93eb6ba7 100644
--- a/addons/common/functions/fnc_setKeyDefault.sqf
+++ b/addons/common/functions/fnc_setKeyDefault.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_overwrite", "_saveProfile", "_config", "_count", "_index", "_configFile", "_name", "_key", "_shft", "_ctrl", "_alt", "_keyCode", "_state"];
 
diff --git a/addons/common/functions/fnc_setName.sqf b/addons/common/functions/fnc_setName.sqf
index 3dfe18650a..d50d5b1987 100644
--- a/addons/common/functions/fnc_setName.sqf
+++ b/addons/common/functions/fnc_setName.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Nothing.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_name"];
 
diff --git a/addons/common/functions/fnc_setParameter.sqf b/addons/common/functions/fnc_setParameter.sqf
index 8ecccd9d71..889c242bb3 100644
--- a/addons/common/functions/fnc_setParameter.sqf
+++ b/addons/common/functions/fnc_setParameter.sqf
@@ -10,7 +10,7 @@
  * Return Value:
  * None
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
  private ["_name", "_value"];
 
diff --git a/addons/common/functions/fnc_setPitchBankYaw.sqf b/addons/common/functions/fnc_setPitchBankYaw.sqf
index 8e8696d2b9..f5d13eb6fe 100644
--- a/addons/common/functions/fnc_setPitchBankYaw.sqf
+++ b/addons/common/functions/fnc_setPitchBankYaw.sqf
@@ -13,7 +13,7 @@
  * Return Value:
  * None
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_object", "_aroundX", "_aroundY", "_aroundZ", "_dirX", "_dirY", "_dirZ", "_upX", "_upY", "_upZ", "_dir", "_up", "_dirXTemp", "_upXTemp"];
 
diff --git a/addons/common/functions/fnc_setVariableJIP.sqf b/addons/common/functions/fnc_setVariableJIP.sqf
index 6f932079c5..8e790353f4 100644
--- a/addons/common/functions/fnc_setVariableJIP.sqf
+++ b/addons/common/functions/fnc_setVariableJIP.sqf
@@ -11,7 +11,7 @@
  * Return value:
  * Nothing.
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_varName", "_value", "_respawnVariables"];
 
diff --git a/addons/common/functions/fnc_showUser.sqf b/addons/common/functions/fnc_showUser.sqf
index 3510cdc93f..a5d602251d 100644
--- a/addons/common/functions/fnc_showUser.sqf
+++ b/addons/common/functions/fnc_showUser.sqf
@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private "_object";
 
diff --git a/addons/common/functions/fnc_stringToColoredText.sqf b/addons/common/functions/fnc_stringToColoredText.sqf
index 90a8912f49..4f6b1e7143 100644
--- a/addons/common/functions/fnc_stringToColoredText.sqf
+++ b/addons/common/functions/fnc_stringToColoredText.sqf
@@ -10,7 +10,7 @@
  * Return value:
  * Text
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_string", "_color"];
 
diff --git a/addons/common/functions/fnc_subString.sqf b/addons/common/functions/fnc_subString.sqf
index bf3cfa0156..2389dbed00 100644
--- a/addons/common/functions/fnc_subString.sqf
+++ b/addons/common/functions/fnc_subString.sqf
@@ -11,7 +11,7 @@
  * Return Value:
  * String when successfull / False when not
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 _string = _this select 0;
 _index = _this select 1;
diff --git a/addons/common/functions/fnc_toBin.sqf b/addons/common/functions/fnc_toBin.sqf
index 0bfaf399ac..4fdcded607 100644
--- a/addons/common/functions/fnc_toBin.sqf
+++ b/addons/common/functions/fnc_toBin.sqf
@@ -10,7 +10,7 @@ A number
 Return Value:
 A binary number, String
 */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_number", "_minLength", "_sign", "_bin", "_rest"];
 
diff --git a/addons/common/functions/fnc_toBitmask.sqf b/addons/common/functions/fnc_toBitmask.sqf
index c628700645..eb69e67621 100644
--- a/addons/common/functions/fnc_toBitmask.sqf
+++ b/addons/common/functions/fnc_toBitmask.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Bitmask (Number)
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_array", "_result"];
 
diff --git a/addons/common/functions/fnc_toHex.sqf b/addons/common/functions/fnc_toHex.sqf
index 521cf1ddce..df8f3654de 100644
--- a/addons/common/functions/fnc_toHex.sqf
+++ b/addons/common/functions/fnc_toHex.sqf
@@ -10,7 +10,7 @@ A number
 Return Value:
 A hexadecimal number, String
 */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_number", "_minLength", "_sign", "_hex", "_rest"];
 
diff --git a/addons/common/functions/fnc_toNumber.sqf b/addons/common/functions/fnc_toNumber.sqf
index c9c0169b9d..fc481398d3 100644
--- a/addons/common/functions/fnc_toNumber.sqf
+++ b/addons/common/functions/fnc_toNumber.sqf
@@ -16,7 +16,7 @@
   Example:
     _number = ["102"] call FUNC(toNumber);
 */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 if (typeName (_this select 0) == "SCALAR") exitWith {
   (_this select 0)
diff --git a/addons/common/functions/fnc_unmuteUnit.sqf b/addons/common/functions/fnc_unmuteUnit.sqf
index ed8cff1032..8de7708d4b 100644
--- a/addons/common/functions/fnc_unmuteUnit.sqf
+++ b/addons/common/functions/fnc_unmuteUnit.sqf
@@ -9,7 +9,7 @@
  * Return value:
  * Nothing
  */
-#include "\z\ace\addons\common\script_component.hpp"
+#include "script_component.hpp"
 
 private ["_unit", "_speaker"];
 
diff --git a/addons/interaction/config.cpp b/addons/interaction/config.cpp
index 860acf3997..e597349599 100644
--- a/addons/interaction/config.cpp
+++ b/addons/interaction/config.cpp
@@ -160,7 +160,7 @@ class CfgVehicles {
           displayName = "$STR_ACE_Interaction_JoinTeamRed";
           distance = 4;
           condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player});
-          statement = QUOTE([ARR2(_target,'RED')] call DFUNC(joinTeam));
+          statement = QUOTE([ARR_2(_target,'RED')] call DFUNC(joinTeam));
           showDisabled = 1;
           icon = PATHTOF(UI\team\team_red_ca.paa);
           priority = 2.4;