diff --git a/addons/atragmx/CfgVehicles.hpp b/addons/atragmx/CfgVehicles.hpp
index 65ef589d0f..2d85b39a4a 100644
--- a/addons/atragmx/CfgVehicles.hpp
+++ b/addons/atragmx/CfgVehicles.hpp
@@ -24,10 +24,7 @@ class CfgVehicles {
         displayName = "ATragMX";
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_ATragMX {
-                name = "ACE_ATragMX";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_ATragMX,1);
         };
     };
 
diff --git a/addons/common/CfgVehicles.hpp b/addons/common/CfgVehicles.hpp
index 767822f4ea..e0ac3a22ec 100644
--- a/addons/common/CfgVehicles.hpp
+++ b/addons/common/CfgVehicles.hpp
@@ -113,10 +113,7 @@ class CfgVehicles {
         author = CSTRING(ACETeam);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_banana {
-                name = "ACE_banana";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_banana,1);
         };
     };
 };
diff --git a/addons/dagr/CfgVehicles.hpp b/addons/dagr/CfgVehicles.hpp
index f26d8841ae..a9948ca8aa 100644
--- a/addons/dagr/CfgVehicles.hpp
+++ b/addons/dagr/CfgVehicles.hpp
@@ -33,10 +33,7 @@ class CfgVehicles {
         displayName = "DAGR";
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_DAGR {
-                name = "ACE_DAGR";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_DAGR,1);
         };
     };
 
diff --git a/addons/huntir/CfgVehicles.hpp b/addons/huntir/CfgVehicles.hpp
index bc8ed4fc83..3b6486aaf7 100644
--- a/addons/huntir/CfgVehicles.hpp
+++ b/addons/huntir/CfgVehicles.hpp
@@ -16,7 +16,7 @@ class CfgVehicles {
             };
         };
     };
-    
+
     class Parachute_02_base_F;
     class ACE_HuntIR: Parachute_02_base_F {
         author = ECSTRING(common,ACETeam);
@@ -67,13 +67,10 @@ class CfgVehicles {
         displayName = CSTRING(monitor_displayName);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_HuntIR_monitor {
-                name = "ACE_HuntIR_monitor";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_HuntIR_monitor,1);
         };
     };
-    
+
     class ReammoBox_F;
     class ACE_HuntIR_Box: ReammoBox_F {
         model = PATHTOF(data\ace_huntirbox.p3d);
diff --git a/addons/kestrel4500/CfgVehicles.hpp b/addons/kestrel4500/CfgVehicles.hpp
index 776bd8dcf5..8efd0e2bd1 100644
--- a/addons/kestrel4500/CfgVehicles.hpp
+++ b/addons/kestrel4500/CfgVehicles.hpp
@@ -42,10 +42,7 @@ class CfgVehicles {
         displayName = "Kestrel 4500";
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_Kestrel4500 {
-                name = "ACE_Kestrel4500";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_Kestrel4500,1);
         };
     };
 
diff --git a/addons/logistics_uavbattery/CfgVehicles.hpp b/addons/logistics_uavbattery/CfgVehicles.hpp
index ca924a1cb8..a6f2db786f 100644
--- a/addons/logistics_uavbattery/CfgVehicles.hpp
+++ b/addons/logistics_uavbattery/CfgVehicles.hpp
@@ -30,10 +30,7 @@ class CfgVehicles {
     class Box_NATO_Support_F;
     class ACE_Box_Misc: Box_NATO_Support_F {
         class TransportItems {
-            class _xx_ACE_UAVBattery {
-                count = 6;
-                name = "ACE_UAVBattery";
-            };
+            MACRO_ADDITEM(ACE_UAVBattery,6);
         };
     };
 };
diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp
index 45ac0b165f..aab193c098 100644
--- a/addons/medical/CfgVehicles.hpp
+++ b/addons/medical/CfgVehicles.hpp
@@ -752,10 +752,7 @@ class CfgVehicles {
         author = ECSTRING(common,ACETeam);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_fieldDressing {
-                name = "ACE_fieldDressing";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_fieldDressing,1);
         };
     };
     class ACE_packingBandageItem: Item_Base_F {
@@ -765,10 +762,7 @@ class CfgVehicles {
         author = ECSTRING(common,ACETeam);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_packingBandage {
-                name = "ACE_packingBandage";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_packingBandage,1);
         };
     };
     class ACE_elasticBandageItem: Item_Base_F {
@@ -778,10 +772,7 @@ class CfgVehicles {
         author = ECSTRING(common,ACETeam);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_elasticBandage {
-                name = "ACE_elasticBandage";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_elasticBandage,1);
         };
     };
     class ACE_tourniquetItem: Item_Base_F {
@@ -791,10 +782,7 @@ class CfgVehicles {
         author = ECSTRING(common,ACETeam);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_tourniquet {
-                name = "ACE_tourniquet";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_tourniquet,1);
         };
     };
     class ACE_morphineItem: Item_Base_F {
@@ -804,10 +792,7 @@ class CfgVehicles {
         author = ECSTRING(common,ACETeam);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_morphine {
-                name = "ACE_morphine";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_morphine,1);
         };
     };
     class ACE_atropineItem: Item_Base_F {
@@ -817,10 +802,7 @@ class CfgVehicles {
         author = ECSTRING(common,ACETeam);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_atropine {
-                name = "ACE_atropine";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_atropine,1);
         };
     };
     class ACE_epinephrineItem: Item_Base_F {
@@ -830,10 +812,7 @@ class CfgVehicles {
         author = ECSTRING(common,ACETeam);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_epinephrine {
-                name = "ACE_epinephrine";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_epinephrine,1);
         };
     };
     class ACE_plasmaIVItem: Item_Base_F {
@@ -843,10 +822,7 @@ class CfgVehicles {
         author = ECSTRING(common,ACETeam);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_plasmaIV {
-                name = "ACE_plasmaIV";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_plasmaIV,1);
         };
     };
 
@@ -857,10 +833,7 @@ class CfgVehicles {
         author = ECSTRING(common,ACETeam);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_bloodIV {
-                name = "ACE_bloodIV";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_bloodIV,1);
         };
     };
     class ACE_salineIVItem: Item_Base_F {
@@ -870,10 +843,7 @@ class CfgVehicles {
         author = ECSTRING(common,ACETeam);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_salineIV {
-                name = "ACE_salineIV";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_salineIV,1);
         };
     };
     class ACE_quikClotItem: Item_Base_F {
@@ -883,10 +853,7 @@ class CfgVehicles {
         author = ECSTRING(common,ACETeam);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_quikClot {
-                name = "ACE_quikclot";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_quikclot,1);
         };
     };
     class ACE_personalAidKitItem: Item_Base_F {
@@ -896,10 +863,7 @@ class CfgVehicles {
         author = ECSTRING(common,ACETeam);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_personalAidKit {
-                name = "ACE_personalAidKit";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_personalAidKit,1);
         };
     };
     class ACE_surgicalKitItem: Item_Base_F {
@@ -909,10 +873,7 @@ class CfgVehicles {
         author = ECSTRING(common,ACETeam);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_surgicalKit {
-                name = "ACE_surgicalKit";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_surgicalKit,1);
         };
     };
     class ACE_bodyBagItem: Item_Base_F {
@@ -922,10 +883,7 @@ class CfgVehicles {
         author = ECSTRING(common,ACETeam);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_bodyBag {
-                name = "ACE_bodyBag";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_bodyBag,1);
         };
     };
 
@@ -937,119 +895,38 @@ class CfgVehicles {
         model = PATHTOF(data\ace_medcrate.p3d);
         author = ECSTRING(common,ACETeam);
         class TransportItems {
-            class ACE_fieldDressing {
-                name = "ACE_fieldDressing";
-                count = 50;
-            };
-            class ACE_morphine {
-                name = "ACE_morphine";
-                count = 25;
-            };
-            class ACE_epinephrine {
-                name = "ACE_epinephrine";
-                count = 25;
-            };
-            class ACE_bloodIV {
-                name = "ACE_bloodIV";
-                count = 15;
-            };
-            class ACE_bloodIV_500 {
-                name = "ACE_bloodIV_500";
-                count = 15;
-            };
-            class ACE_bloodIV_250 {
-                name = "ACE_bloodIV_250";
-                count = 15;
-            };
-            class ACE_bodyBag {
-                name = "ACE_bodyBag";
-                count = 10;
-            };
+            MACRO_ADDITEM(ACE_fieldDressing,50);
+            MACRO_ADDITEM(ACE_morphine,25);
+            MACRO_ADDITEM(ACE_epinephrine,25);
+            MACRO_ADDITEM(ACE_bloodIV,15);
+            MACRO_ADDITEM(ACE_bloodIV_500,15);
+            MACRO_ADDITEM(ACE_bloodIV_250,15);
+            MACRO_ADDITEM(ACE_bodyBag,10);
         };
     };
     class ACE_medicalSupplyCrate_advanced: ACE_medicalSupplyCrate {
         displayName = CSTRING(medicalSupplyCrate_advanced);
         class TransportItems {
-            class ACE_fieldDressing {
-                name = "ACE_fieldDressing";
-                count = 25;
-            };
-            class ACE_packingBandage {
-                name = "ACE_packingBandage";
-                count = 25;
-            };
-            class ACE_elasticBandage {
-                name = "ACE_elasticBandage";
-                count = 25;
-            };
-            class ACE_tourniquet {
-                name = "ACE_tourniquet";
-                count = 15;
-            };
-            class ACE_morphine {
-                name = "ACE_morphine";
-                count = 15;
-            };
-            class ACE_atropine {
-                name = "ACE_atropine";
-                count = 15;
-            };
-            class ACE_epinephrine {
-                name = "ACE_epinephrine";
-                count = 15;
-            };
-            class ACE_plasmaIV {
-                name = "ACE_plasmaIV";
-                count = 7;
-            };
-            class ACE_plasmaIV_500 {
-                name = "ACE_plasmaIV_500";
-                count = 7;
-            };
-            class ACE_plasmaIV_250 {
-                name = "ACE_plasmaIV_250";
-                count = 7;
-            };
-            class ACE_salineIV {
-                name = "ACE_salineIV";
-                count = 7;
-            };
-            class ACE_salineIV_500 {
-                name = "ACE_salineIV_500";
-                count = 7;
-            };
-            class ACE_salineIV_250 {
-                name = "ACE_salineIV_250";
-                count = 7;
-            };
-            class ACE_bloodIV {
-                name = "ACE_bloodIV";
-                count = 7;
-            };
-            class ACE_bloodIV_500 {
-                name = "ACE_bloodIV_500";
-                count = 7;
-            };
-            class ACE_bloodIV_250 {
-                name = "ACE_bloodIV_250";
-                count = 7;
-            };
-            class ACE_quikClot {
-                name = "ACE_quikclot";
-                count = 20;
-            };
-            class ACE_personalAidKit {
-                name = "ACE_personalAidKit";
-                count = 3;
-            };
-            class ACE_surgicalKit {
-                name = "ACE_surgicalKit";
-                count = 2;
-            };
-            class ACE_bodyBag {
-                name = "ACE_bodyBag";
-                count = 5;
-            };
+            MACRO_ADDITEM(ACE_fieldDressing,25);
+            MACRO_ADDITEM(ACE_packingBandage,25);
+            MACRO_ADDITEM(ACE_elasticBandage,25);
+            MACRO_ADDITEM(ACE_tourniquet,15);
+            MACRO_ADDITEM(ACE_morphine,15);
+            MACRO_ADDITEM(ACE_atropine,15);
+            MACRO_ADDITEM(ACE_epinephrine,15);
+            MACRO_ADDITEM(ACE_plasmaIV,7);
+            MACRO_ADDITEM(ACE_plasmaIV_500,7);
+            MACRO_ADDITEM(ACE_plasmaIV_250,7);
+            MACRO_ADDITEM(ACE_salineIV,7);
+            MACRO_ADDITEM(ACE_salineIV_500,7);
+            MACRO_ADDITEM(ACE_salineIV_250,7);
+            MACRO_ADDITEM(ACE_bloodIV,7);
+            MACRO_ADDITEM(ACE_bloodIV_500,7);
+            MACRO_ADDITEM(ACE_bloodIV_250,7);
+            MACRO_ADDITEM(ACE_quikClot,20);
+            MACRO_ADDITEM(ACE_personalAidKit,3);
+            MACRO_ADDITEM(ACE_surgicalKit,2);
+            MACRO_ADDITEM(ACE_bodyBag,5);
         };
     };
 };
diff --git a/addons/parachute/CfgVehicles.hpp b/addons/parachute/CfgVehicles.hpp
index 345702fd37..0999ba5c38 100644
--- a/addons/parachute/CfgVehicles.hpp
+++ b/addons/parachute/CfgVehicles.hpp
@@ -2,20 +2,11 @@ class CfgVehicles {
     class Box_NATO_Support_F;
     class ACE_Box_Misc: Box_NATO_Support_F {
         class TransportItems {
-            class _xx_ACE_Altimeter {
-                name = "ACE_Altimeter";
-                count = 6;
-            };
+            MACRO_ADDITEM(ACE_Altimeter,6);
         };
         class TransportBackpacks {
-            class _xx_ACE_NonSteerableParachute {
-                backpack = "ACE_NonSteerableParachute";
-                count = 4;
-            };
-            class _xx_ACE_ReserveParachute {
-                backpack = "ACE_ReserveParachute";
-                count = 4;
-            };
+            MACRO_ADDBACKPACK(ACE_NonSteerableParachute,4);
+            MACRO_ADDBACKPACK(ACE_ReserveParachute,4);
         };
     };
 
diff --git a/addons/rangecard/CfgVehicles.hpp b/addons/rangecard/CfgVehicles.hpp
index a5832756ff..9e0793e36b 100644
--- a/addons/rangecard/CfgVehicles.hpp
+++ b/addons/rangecard/CfgVehicles.hpp
@@ -53,10 +53,7 @@ class CfgVehicles {
         displayName = "Range Card";
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_RangeCard {
-                name = "ACE_RangeCard";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_RangeCard,1);
         };
     };
 
diff --git a/addons/sandbag/CfgVehicles.hpp b/addons/sandbag/CfgVehicles.hpp
index b16d2f978d..76a986bfbd 100644
--- a/addons/sandbag/CfgVehicles.hpp
+++ b/addons/sandbag/CfgVehicles.hpp
@@ -22,10 +22,7 @@ class CfgVehicles {
         displayName = CSTRING(sandbagEmpty_displayName);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_Sandbag_empty {
-                name = "ACE_Sandbag_empty";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_Sandbag_empty,1);
         };
     };
     /*
@@ -103,7 +100,7 @@ class CfgVehicles {
         scope = 1;
         model = PATHTOF(data\ace_sandbag_nogeo.p3d);
     };
-    
+
     class Box_NATO_Support_F;
     class ACE_Box_Misc: Box_NATO_Support_F {
         class TransportItems {
diff --git a/addons/spottingscope/CfgVehicles.hpp b/addons/spottingscope/CfgVehicles.hpp
index d42946214b..b0b8bf9c77 100644
--- a/addons/spottingscope/CfgVehicles.hpp
+++ b/addons/spottingscope/CfgVehicles.hpp
@@ -24,10 +24,7 @@ class CfgVehicles {
         displayName = CSTRING(DisplayName);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_SpottingScope {
-                name = "ACE_SpottingScope";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_SpottingScope,1);
         };
     };
 
diff --git a/addons/tacticalladder/CfgVehicles.hpp b/addons/tacticalladder/CfgVehicles.hpp
index d180ccae40..bd66176e34 100644
--- a/addons/tacticalladder/CfgVehicles.hpp
+++ b/addons/tacticalladder/CfgVehicles.hpp
@@ -13,14 +13,14 @@ class CfgVehicles {
             };
         };
     };
-    
+
     class Bag_Base;
     class ACE_TacticalLadder_Pack: Bag_Base {
         scope = 2;
         displayName = CSTRING(DisplayName);
         descriptionShort = "";
         model = PATHTOF(data\ace_tacticalladder_pack.p3d);
-        picture = PATHTOF(UI\ace_tactical_ladder_pack_ca.paa); 
+        picture = PATHTOF(UI\ace_tactical_ladder_pack_ca.paa);
         maximumLoad = 0;
         mass = 50;
     };
@@ -28,13 +28,10 @@ class CfgVehicles {
     class Box_NATO_Support_F;
     class ACE_Box_Misc: Box_NATO_Support_F {
         class TransportBackpacks {
-            class _xx_ACE_TacticalLadder_Pack {
-                backpack = "ACE_TacticalLadder_Pack";
-                count = 3;
-            };
+            MACRO_ADDBACKPACK(ACE_TacticalLadder_Pack,3);
         };
     };
-    
+
     class House;
     class ACE_Tactical_Ladder: House {
         XEH_ENABLED;
diff --git a/addons/tripod/CfgVehicles.hpp b/addons/tripod/CfgVehicles.hpp
index cb1774cdf4..a489e18704 100644
--- a/addons/tripod/CfgVehicles.hpp
+++ b/addons/tripod/CfgVehicles.hpp
@@ -23,10 +23,7 @@ class CfgVehicles {
         displayName = CSTRING(DisplayName);
         vehicleClass = "Items";
         class TransportItems {
-            class ACE_Tripod {
-                name = "ACE_Tripod";
-                count = 1;
-            };
+            MACRO_ADDITEM(ACE_Tripod,1);
         };
     };
 
@@ -36,7 +33,7 @@ class CfgVehicles {
             MACRO_ADDITEM(ACE_Tripod,2);
         };
     };
-    
+
     class thingX;
     class ACE_TripodObject: thingX {
         XEH_ENABLED;
@@ -49,7 +46,7 @@ class CfgVehicles {
                 animPeriod = 0.02;
                 initPhase = 0;
                 minValue = 0;
-                maxValue = 1;			
+                maxValue = 1;
             };
             class retract_leg_1: slide_down_tripod {};
             class retract_leg_2: retract_leg_1 {};
diff --git a/addons/vector/CfgVehicles.hpp b/addons/vector/CfgVehicles.hpp
index cf0d50d18f..f06f79aa12 100644
--- a/addons/vector/CfgVehicles.hpp
+++ b/addons/vector/CfgVehicles.hpp
@@ -1,9 +1,3 @@
-
-#define MACRO_ADDWEAPON(WEAPON,COUNT) class _xx_##WEAPON { \
-    weapon = #WEAPON; \
-    count = COUNT; \
-}
-
 class CfgVehicles {
     class Item_Base_F;
     class ACE_Item_Vector: Item_Base_F {