diff --git a/addons/captives/CfgVehicles.hpp b/addons/captives/CfgVehicles.hpp
index b6f9edd576..930f2b27d8 100644
--- a/addons/captives/CfgVehicles.hpp
+++ b/addons/captives/CfgVehicles.hpp
@@ -154,15 +154,10 @@ class CfgVehicles {
         MACRO_LOADUNLOADCAPTIVE
     };
 
-#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
-            name = #ITEM; \
-            count = COUNT; \
-        };
-
     class Box_NATO_Support_F;
     class ACE_Box_Misc: Box_NATO_Support_F {
         class TransportItems {
-            MACRO_ADDITEM(ACE_CableTie,12)
+            MACRO_ADDITEM(ACE_CableTie,12);
         };
     };
 
diff --git a/addons/explosives/CfgVehicles.hpp b/addons/explosives/CfgVehicles.hpp
index a1f0aa5944..e62b31aa56 100644
--- a/addons/explosives/CfgVehicles.hpp
+++ b/addons/explosives/CfgVehicles.hpp
@@ -1,8 +1,3 @@
-#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
-  name = #ITEM; \
-  count = COUNT; \
-};
-
 class CfgVehicles {
   class Man;
 
@@ -142,47 +137,47 @@ class CfgVehicles {
 
   class Box_NATO_AmmoOrd_F: NATO_Box_Base {
     class TransportItems {
-      MACRO_ADDITEM(ACE_Clacker,12)
-      MACRO_ADDITEM(ACE_M26_Clacker,6)
-      MACRO_ADDITEM(ACE_DefusalKit,12)
+      MACRO_ADDITEM(ACE_Clacker,12);
+      MACRO_ADDITEM(ACE_M26_Clacker,6);
+      MACRO_ADDITEM(ACE_DefusalKit,12);
     };
   };
 
   class Box_East_AmmoOrd_F: EAST_Box_Base {
     class TransportItems {
-      MACRO_ADDITEM(ACE_Clacker,12)
-      MACRO_ADDITEM(ACE_M26_Clacker,6)
-      MACRO_ADDITEM(ACE_DefusalKit,12)
+      MACRO_ADDITEM(ACE_Clacker,12);
+      MACRO_ADDITEM(ACE_M26_Clacker,6);
+      MACRO_ADDITEM(ACE_DefusalKit,12);
     };
   };
 
   class Box_IND_AmmoOrd_F: IND_Box_Base {
     class TransportItems {
-      MACRO_ADDITEM(ACE_Clacker,12)
-      MACRO_ADDITEM(ACE_M26_Clacker,6)
-      MACRO_ADDITEM(ACE_DefusalKit,12)
-      MACRO_ADDITEM(ACE_Deadmanswitch,2)
-      MACRO_ADDITEM(ACE_Cellphone,3)
+      MACRO_ADDITEM(ACE_Clacker,12);
+      MACRO_ADDITEM(ACE_M26_Clacker,6);
+      MACRO_ADDITEM(ACE_DefusalKit,12);
+      MACRO_ADDITEM(ACE_Deadmanswitch,2);
+      MACRO_ADDITEM(ACE_Cellphone,3);
     };
   };
 
   class Box_FIA_Ammo_F: FIA_Box_Base_F {
     class TransportItems {
-      MACRO_ADDITEM(ACE_Clacker,2)
-      MACRO_ADDITEM(ACE_M26_Clacker,2)
-      MACRO_ADDITEM(ACE_DefusalKit,2)
-      MACRO_ADDITEM(ACE_Deadmanswitch,1)
-      MACRO_ADDITEM(ACE_Cellphone,2)
+      MACRO_ADDITEM(ACE_Clacker,2);
+      MACRO_ADDITEM(ACE_M26_Clacker,2);
+      MACRO_ADDITEM(ACE_DefusalKit,2);
+      MACRO_ADDITEM(ACE_Deadmanswitch,1);
+      MACRO_ADDITEM(ACE_Cellphone,2);
     };
   };
 
   class ACE_Box_Misc: Box_NATO_Support_F {
     class TransportItems {
-      MACRO_ADDITEM(ACE_Clacker,12)
-      MACRO_ADDITEM(ACE_M26_Clacker,6)
-      MACRO_ADDITEM(ACE_DefusalKit,12)
-      MACRO_ADDITEM(ACE_Deadmanswitch,6)
-      MACRO_ADDITEM(ACE_Cellphone,10)
+      MACRO_ADDITEM(ACE_Clacker,12);
+      MACRO_ADDITEM(ACE_M26_Clacker,6);
+      MACRO_ADDITEM(ACE_DefusalKit,12);
+      MACRO_ADDITEM(ACE_Deadmanswitch,6);
+      MACRO_ADDITEM(ACE_Cellphone,10);
     };
   };
 
diff --git a/addons/grenades/CfgVehicles.hpp b/addons/grenades/CfgVehicles.hpp
index d4ff039bf7..7cf2085193 100644
--- a/addons/grenades/CfgVehicles.hpp
+++ b/addons/grenades/CfgVehicles.hpp
@@ -1,8 +1,3 @@
-#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
-        name = #ITEM; \
-        count = COUNT; \
-    };
-
 class CfgVehicles {
     class NATO_Box_Base;
     class EAST_Box_Base;
@@ -11,35 +6,35 @@ class CfgVehicles {
 
     class Box_NATO_Grenades_F: NATO_Box_Base {
         class TransportItems {
-            MACRO_ADDITEM(ACE_HandFlare_White,12)
-            MACRO_ADDITEM(ACE_HandFlare_Green,12)
-            MACRO_ADDITEM(ACE_M84,12)
+            MACRO_ADDITEM(ACE_HandFlare_White,12);
+            MACRO_ADDITEM(ACE_HandFlare_Green,12);
+            MACRO_ADDITEM(ACE_M84,12);
         };
     };
 
     class Box_East_Grenades_F: EAST_Box_Base {
         class TransportItems {
-            MACRO_ADDITEM(ACE_HandFlare_Yellow,12)
-            MACRO_ADDITEM(ACE_HandFlare_Red,12)
-            MACRO_ADDITEM(ACE_M84,12)
+            MACRO_ADDITEM(ACE_HandFlare_Yellow,12);
+            MACRO_ADDITEM(ACE_HandFlare_Red,12);
+            MACRO_ADDITEM(ACE_M84,12);
         };
     };
 
     class Box_IND_Grenades_F: IND_Box_Base {
         class TransportItems {
-            MACRO_ADDITEM(ACE_HandFlare_Yellow,12)
-            MACRO_ADDITEM(ACE_HandFlare_Green,12)
-            MACRO_ADDITEM(ACE_M84,12)
+            MACRO_ADDITEM(ACE_HandFlare_Yellow,12);
+            MACRO_ADDITEM(ACE_HandFlare_Green,12);
+            MACRO_ADDITEM(ACE_M84,12);
         };
     };
 
     class ACE_Box_Misc: Box_NATO_Support_F {
         class TransportItems {
-            MACRO_ADDITEM(ACE_HandFlare_White,12)
-            MACRO_ADDITEM(ACE_HandFlare_Red,12)
-            MACRO_ADDITEM(ACE_HandFlare_Green,12)
-            MACRO_ADDITEM(ACE_HandFlare_Yellow,12)
-            MACRO_ADDITEM(ACE_M84,12)
+            MACRO_ADDITEM(ACE_HandFlare_White,12);
+            MACRO_ADDITEM(ACE_HandFlare_Red,12);
+            MACRO_ADDITEM(ACE_HandFlare_Green,12);
+            MACRO_ADDITEM(ACE_HandFlare_Yellow,12);
+            MACRO_ADDITEM(ACE_M84,12);
         };
     };
 };
diff --git a/addons/hearing/CfgVehicles.hpp b/addons/hearing/CfgVehicles.hpp
index 11eb55ef7f..1f499d88a4 100644
--- a/addons/hearing/CfgVehicles.hpp
+++ b/addons/hearing/CfgVehicles.hpp
@@ -1,9 +1,3 @@
-
-#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
-    name = #ITEM; \
-    count = COUNT; \
-};
-
 class CfgVehicles {
     class Man;
     class CAManBase: Man {
@@ -41,61 +35,61 @@ class CfgVehicles {
 
     class Box_NATO_Support_F: NATO_Box_Base {
         class TransportItems {
-            MACRO_ADDITEM(ACE_EarBuds,12)
+            MACRO_ADDITEM(ACE_EarBuds,12);
         };
     };
 
     class B_supplyCrate_F: ReammoBox_F {
         class TransportItems {
-            MACRO_ADDITEM(ACE_EarBuds,12)
+            MACRO_ADDITEM(ACE_EarBuds,12);
         };
     };
 
     class Box_East_Support_F: EAST_Box_Base {
         class TransportItems {
-            MACRO_ADDITEM(ACE_EarBuds,12)
+            MACRO_ADDITEM(ACE_EarBuds,12);
         };
     };
 
     class O_supplyCrate_F: B_supplyCrate_F {
         class TransportItems {
-            MACRO_ADDITEM(ACE_EarBuds,12)
+            MACRO_ADDITEM(ACE_EarBuds,12);
         };
     };
 
     class Box_IND_Support_F: IND_Box_Base {
         class TransportItems {
-            MACRO_ADDITEM(ACE_EarBuds,12)
+            MACRO_ADDITEM(ACE_EarBuds,12);
         };
     };
 
     class Box_FIA_Support_F: FIA_Box_Base_F {
         class TransportItems {
-            MACRO_ADDITEM(ACE_EarBuds,12)
+            MACRO_ADDITEM(ACE_EarBuds,12);
         };
     };
 
     class I_supplyCrate_F: B_supplyCrate_F {
         class TransportItems {
-            MACRO_ADDITEM(ACE_EarBuds,12)
+            MACRO_ADDITEM(ACE_EarBuds,12);
         };
     };
 
     class IG_supplyCrate_F: ReammoBox_F {
         class TransportItems {
-            MACRO_ADDITEM(ACE_EarBuds,12)
+            MACRO_ADDITEM(ACE_EarBuds,12);
         };
     };
 
     class C_supplyCrate_F: ReammoBox_F {
         class TransportItems {
-            MACRO_ADDITEM(ACE_EarBuds,12)
+            MACRO_ADDITEM(ACE_EarBuds,12);
         };
     };
 
     class ACE_Box_Misc: Box_NATO_Support_F {
         class TransportItems {
-            MACRO_ADDITEM(ACE_EarBuds,12)
+            MACRO_ADDITEM(ACE_EarBuds,12);
         };
     };
 };
diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp
index 3cf95fe1a4..947c2e2579 100644
--- a/addons/interaction/CfgVehicles.hpp
+++ b/addons/interaction/CfgVehicles.hpp
@@ -1,8 +1,3 @@
-#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
-  name = #ITEM; \
-  count = COUNT; \
-};
-
 class CfgVehicles {
 
   class Module_F;
diff --git a/addons/kestrel/CfgVehicles.hpp b/addons/kestrel/CfgVehicles.hpp
index 906e3a9e22..31aea38bda 100644
--- a/addons/kestrel/CfgVehicles.hpp
+++ b/addons/kestrel/CfgVehicles.hpp
@@ -1,9 +1,3 @@
-
-#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
-    name = #ITEM; \
-    count = COUNT; \
-}
-
 class CfgVehicles {
     class Man;
     class CAManBase: Man {
diff --git a/addons/laserpointer/CfgVehicles.hpp b/addons/laserpointer/CfgVehicles.hpp
index c98d0626c2..8c81837fe2 100644
--- a/addons/laserpointer/CfgVehicles.hpp
+++ b/addons/laserpointer/CfgVehicles.hpp
@@ -1,9 +1,3 @@
-
-#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
-    name = #ITEM; \
-    count = COUNT; \
-}
-
 class CfgVehicles {
     class NATO_Box_Base;
     class Box_NATO_Support_F: NATO_Box_Base {
diff --git a/addons/map/CfgVehicles.hpp b/addons/map/CfgVehicles.hpp
index 4452c10b23..ffdfc0029b 100644
--- a/addons/map/CfgVehicles.hpp
+++ b/addons/map/CfgVehicles.hpp
@@ -1,8 +1,3 @@
-#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
-    name = #ITEM; \
-    count = COUNT; \
-  };
-
 class CfgVehicles {
   class Man;
   class CAManBase: Man {
@@ -103,31 +98,31 @@ class CfgVehicles {
 
   class Box_NATO_Support_F: NATO_Box_Base {
     class TransportItems {
-      MACRO_ADDITEM(ACE_MapTools,12)
+      MACRO_ADDITEM(ACE_MapTools,12);
     };
   };
 
   class Box_East_Support_F: EAST_Box_Base {
     class TransportItems {
-      MACRO_ADDITEM(ACE_MapTools,12)
+      MACRO_ADDITEM(ACE_MapTools,12);
     };
   };
 
   class Box_IND_Support_F: IND_Box_Base {
     class TransportItems {
-      MACRO_ADDITEM(ACE_MapTools,12)
+      MACRO_ADDITEM(ACE_MapTools,12);
     };
   };
 
   class Box_FIA_Support_F: FIA_Box_Base_F {
     class TransportItems {
-      MACRO_ADDITEM(ACE_MapTools,12)
+      MACRO_ADDITEM(ACE_MapTools,12);
     };
   };
 
   class ACE_Box_Misc: Box_NATO_Support_F {
     class TransportItems {
-      MACRO_ADDITEM(ACE_MapTools,12)
+      MACRO_ADDITEM(ACE_MapTools,12);
     };
   };
 
diff --git a/addons/nightvision/CfgVehicles.hpp b/addons/nightvision/CfgVehicles.hpp
index d53ce54467..84e7105f0b 100644
--- a/addons/nightvision/CfgVehicles.hpp
+++ b/addons/nightvision/CfgVehicles.hpp
@@ -4,19 +4,14 @@ class CfgVehicles {
         ACE_NightVision_blur = 0.055;
     };
 
-#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
-            name = #ITEM; \
-            count = COUNT; \
-        };
-
     class Box_NATO_Support_F;
     class ACE_Box_Misc: Box_NATO_Support_F {
         class TransportItems {
-            MACRO_ADDITEM(ACE_NVG_Gen1,6)
-            MACRO_ADDITEM(ACE_NVG_Gen2,6)
-            //MACRO_ADDITEM(ACE_NVG_Gen3,6)
-            MACRO_ADDITEM(ACE_NVG_Gen4,6)
-            MACRO_ADDITEM(ACE_NVG_Wide,6)
+            MACRO_ADDITEM(ACE_NVG_Gen1,6);
+            MACRO_ADDITEM(ACE_NVG_Gen2,6);
+            //MACRO_ADDITEM(ACE_NVG_Gen3,6);
+            MACRO_ADDITEM(ACE_NVG_Gen4,6);
+            MACRO_ADDITEM(ACE_NVG_Wide,6);
         };
     };
 };
diff --git a/addons/overheating/CfgVehicles.hpp b/addons/overheating/CfgVehicles.hpp
index 2c96bec24d..411e0a702d 100644
--- a/addons/overheating/CfgVehicles.hpp
+++ b/addons/overheating/CfgVehicles.hpp
@@ -1,8 +1,3 @@
-#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
-    name = #ITEM; \
-    count = COUNT; \
-};
-
 class CfgVehicles {
     class Man;
 
@@ -39,61 +34,61 @@ class CfgVehicles {
 
     class Box_NATO_Support_F: NATO_Box_Base {
         class TransportItems {
-            MACRO_ADDITEM(ACE_SpareBarrel,2)
+            MACRO_ADDITEM(ACE_SpareBarrel,2);
         };
     };
 
     class B_supplyCrate_F: ReammoBox_F {
         class TransportItems {
-            MACRO_ADDITEM(ACE_SpareBarrel,2)
+            MACRO_ADDITEM(ACE_SpareBarrel,2);
         };
     };
 
     class Box_East_Support_F: EAST_Box_Base {
         class TransportItems {
-            MACRO_ADDITEM(ACE_SpareBarrel,2)
+            MACRO_ADDITEM(ACE_SpareBarrel,2);
         };
     };
 
     class O_supplyCrate_F: B_supplyCrate_F {
         class TransportItems {
-            MACRO_ADDITEM(ACE_SpareBarrel,2)
+            MACRO_ADDITEM(ACE_SpareBarrel,2);
         };
     };
 
     class Box_IND_Support_F: IND_Box_Base {
         class TransportItems {
-            MACRO_ADDITEM(ACE_SpareBarrel,2)
+            MACRO_ADDITEM(ACE_SpareBarrel,2);
         };
     };
 
     class Box_FIA_Support_F: FIA_Box_Base_F {
         class TransportItems {
-            MACRO_ADDITEM(ACE_SpareBarrel,2)
+            MACRO_ADDITEM(ACE_SpareBarrel,2);
         };
     };
 
     class I_supplyCrate_F: B_supplyCrate_F {
         class TransportItems {
-            MACRO_ADDITEM(ACE_SpareBarrel,2)
+            MACRO_ADDITEM(ACE_SpareBarrel,2);
         };
     };
 
     class IG_supplyCrate_F: ReammoBox_F {
         class TransportItems {
-            MACRO_ADDITEM(ACE_SpareBarrel,2)
+            MACRO_ADDITEM(ACE_SpareBarrel,2);
         };
     };
 
     class C_supplyCrate_F: ReammoBox_F {
         class TransportItems {
-            MACRO_ADDITEM(ACE_SpareBarrel,2)
+            MACRO_ADDITEM(ACE_SpareBarrel,2);
         };
     };
 
     class ACE_Box_Misc: Box_NATO_Support_F {
         class TransportItems {
-            MACRO_ADDITEM(ACE_SpareBarrel,6)
+            MACRO_ADDITEM(ACE_SpareBarrel,6);
         };
     };
 
diff --git a/addons/smallarms/CfgVehicles.hpp b/addons/smallarms/CfgVehicles.hpp
index 49de74005a..f81316c3e9 100644
--- a/addons/smallarms/CfgVehicles.hpp
+++ b/addons/smallarms/CfgVehicles.hpp
@@ -1,8 +1,4 @@
-/*#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \
-    name = #ITEM; \
-    count = COUNT; \
-};
-
+/*
 class CfgVehicles {
     class NATO_Box_Base;
     class EAST_Box_Base;
@@ -10,25 +6,25 @@ class CfgVehicles {
 
     class Box_NATO_Support_F: NATO_Box_Base {
         class TransportItems {
-            MACRO_ADDITEM(ACE_acc_flashlight_tls,5)
+            MACRO_ADDITEM(ACE_acc_flashlight_tls,5);
         };
     };
 
     class Box_East_Support_F: EAST_Box_Base {
         class TransportItems {
-            MACRO_ADDITEM(ACE_acc_flashlight_tls,5)
+            MACRO_ADDITEM(ACE_acc_flashlight_tls,5);
         };
     };
 
     class Box_IND_Support_F: IND_Box_Base {
         class TransportItems {
-            MACRO_ADDITEM(ACE_acc_flashlight_tls,5)
+            MACRO_ADDITEM(ACE_acc_flashlight_tls,5);
         };
     };
 
     class ACE_Box_Misc: Box_NATO_Support_F {
         class TransportItems {
-            MACRO_ADDITEM(ACE_acc_flashlight_tls,2)
+            MACRO_ADDITEM(ACE_acc_flashlight_tls,2);
         };
     };
 };*/