diff --git a/addons/compat_cup_terrains/CfgVehicles.hpp b/addons/compat_cup_terrains/CfgVehicles.hpp
index 08176b77fe..3fbd69f291 100644
--- a/addons/compat_cup_terrains/CfgVehicles.hpp
+++ b/addons/compat_cup_terrains/CfgVehicles.hpp
@@ -1,3 +1,6 @@
+class CBA_Extended_EventHandlers;
+#define XEH_INHERITED class EventHandlers {class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};}
+
 class CfgVehicles {
     class House;
     class House_Small_F;
@@ -5,7 +8,7 @@ class CfgVehicles {
     class House_EP1: House {};
 
     class Land_Benzina_schnell: House {
-        transportFuel = 0;
+        XEH_INHERITED;
         EGVAR(refuel,hooks)[] = {{-1.5,-3.93,-1.25}, {2.35,-3.93,-1.25}};
         EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL;
         class ACE_Actions {
@@ -18,22 +21,22 @@ class CfgVehicles {
         };
     };
     class Land_A_FuelStation_Feed: Strategic {
-        transportFuel = 0;
+        XEH_INHERITED;
         EGVAR(refuel,hooks)[] = {{-0.34,0,0}, {0.34,0,0}};
         EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL;
     };
     class Land_Ind_FuelStation_Feed_EP1: House_EP1 {
-        transportFuel = 0;
+        XEH_INHERITED;
         EGVAR(refuel,hooks)[] = {{-0.34,0,0}, {0.34,0,0}};
         EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL;
     };
     class Land_FuelStation_Feed_PMC: Strategic {
-        transportFuel = 0;
+        XEH_INHERITED;
         EGVAR(refuel,hooks)[] = {{-0.34,0,0}, {0.34,0,0}};
         EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL;
     };
     class FuelStation: House_Small_F {
-        transportFuel = 0;
+        XEH_INHERITED;
         EGVAR(refuel,hooks)[] = {{1.25, .2, -1.1}};
         EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL;
         class ACE_Actions {
@@ -45,4 +48,9 @@ class CfgVehicles {
             };
         };
     };
+    class WarfareBBaseStructure;
+    class Base_WarfareBVehicleServicePoint: WarfareBBaseStructure {
+        // "vehicle service point" (a conex /w barrels) - need hooks???
+        XEH_INHERITED;
+    };
 };
diff --git a/addons/compat_cup_vehicles/compat_cup_vehicles_refuel/CfgVehicles.hpp b/addons/compat_cup_vehicles/compat_cup_vehicles_refuel/CfgVehicles.hpp
index 186690908c..1042c0eacf 100644
--- a/addons/compat_cup_vehicles/compat_cup_vehicles_refuel/CfgVehicles.hpp
+++ b/addons/compat_cup_vehicles/compat_cup_vehicles_refuel/CfgVehicles.hpp
@@ -1,35 +1,30 @@
 class CfgVehicles {
     class CUP_T810_Unarmed_Base;
     class CUP_T810_Refuel_Base: CUP_T810_Unarmed_Base {
-        transportFuel = 0;
         EGVAR(refuel,hooks)[] = {{-1.01, 0.21, -0.5},{1.08, 0.2, -0.5}};
         EGVAR(refuel,fuelCargo) = 10000;
     };
 
     class Truck_02_fuel_base_F;
     class CUP_Kamaz_5350_Refuel_Base: Truck_02_fuel_base_F {
-        transportFuel = 0;
         EGVAR(refuel,hooks)[] = {{-0.02, -3.33, -1.05}};
         EGVAR(refuel,fuelCargo) = 10000;
     };
 
     class CUP_Ural_Support_Base;
     class CUP_Ural_Refuel_Base: CUP_Ural_Support_Base {
-        transportFuel = 0;
         EGVAR(refuel,hooks)[] = {{-0.05, -3.65, -0.42}};
         EGVAR(refuel,fuelCargo) = 10000;
     };
 
     class CUP_V3S_Open_Base;
     class CUP_V3S_Refuel_Base: CUP_V3S_Open_Base {
-        transportFuel = 0;
         EGVAR(refuel,hooks)[] = {{-0.35, -3.35, -0.4},{0.40, -3.35, -0.4}};
         EGVAR(refuel,fuelCargo) = 6500;
     };
 
     class CUP_MTVR_Base;
     class CUP_MTVR_Refuel_Base: CUP_MTVR_Base {
-        transportFuel = 0;
         EGVAR(refuel,hooks)[] = {{-1.09, -0.01, -0.5},{1, -0.01, -0.5}};
         EGVAR(refuel,fuelCargo) = 10000;
     };
diff --git a/addons/compat_gm/compat_gm_refuel/CfgVehicles.hpp b/addons/compat_gm/compat_gm_refuel/CfgVehicles.hpp
deleted file mode 100644
index 46a4deeefd..0000000000
--- a/addons/compat_gm/compat_gm_refuel/CfgVehicles.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-class CfgVehicles {
-    class gm_ural4320_base;
-    class gm_ural4320_refuel_base: gm_ural4320_base {
-        transportFuel = 0;
-    };
-};
diff --git a/addons/compat_gm/compat_gm_refuel/config.cpp b/addons/compat_gm/compat_gm_refuel/config.cpp
index 6becabe70a..05688eff70 100644
--- a/addons/compat_gm/compat_gm_refuel/config.cpp
+++ b/addons/compat_gm/compat_gm_refuel/config.cpp
@@ -21,4 +21,3 @@ class CfgPatches {
 };
 
 #include "CfgEventHandlers.hpp"
-#include "CfgVehicles.hpp"
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/CfgVehicles.hpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/CfgVehicles.hpp
deleted file mode 100644
index 047e264c6e..0000000000
--- a/addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/CfgVehicles.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-class CfgVehicles {
-    class RHS_Ural_Support_MSV_Base_01;
-    class RHS_Ural_Fuel_MSV_01: RHS_Ural_Support_MSV_Base_01 {
-        transportFuel = 0;
-    };
- class rhs_kraz255b1_base;
-    class rhs_kraz255b1_fuel_base: rhs_kraz255b1_base {
-        transportFuel = 0;
-    };
-};
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/config.cpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/config.cpp
index 5101a383a3..8e1986b65f 100644
--- a/addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/config.cpp
+++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/config.cpp
@@ -18,4 +18,4 @@ class CfgPatches {
     };
 };
 
-#include "CfgVehicles.hpp"
+// ADDON kept for backward compatiblity
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/CfgVehicles.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/CfgVehicles.hpp
deleted file mode 100644
index 5aaf6b4e22..0000000000
--- a/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/CfgVehicles.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-class CfgVehicles {
-    class rhsusf_M1078A1P2_B_M2_fmtv_usarmy;
-    class rhsusf_M1078A1R_SOV_M2_D_fmtv_socom: rhsusf_M1078A1P2_B_M2_fmtv_usarmy {
-        transportFuel = 0;
-    };
-
-    class rhsusf_M977A4_usarmy_wd;
-    class rhsusf_M978A4_usarmy_wd: rhsusf_M977A4_usarmy_wd {
-        transportFuel = 0;
-    };
-
-    class rhsusf_M978A4_BKIT_usarmy_wd: rhsusf_M977A4_usarmy_wd {
-        transportFuel = 0;
-    };
-};
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp b/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp
index 391e22d95e..bf600d5d5a 100644
--- a/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp
@@ -21,4 +21,3 @@ class CfgPatches {
 };
 
 #include "CfgEventHandlers.hpp"
-#include "CfgVehicles.hpp"
diff --git a/addons/compat_sog/CfgVehicles/wheeled.hpp b/addons/compat_sog/CfgVehicles/wheeled.hpp
index 3525328d3f..3a898519dd 100644
--- a/addons/compat_sog/CfgVehicles/wheeled.hpp
+++ b/addons/compat_sog/CfgVehicles/wheeled.hpp
@@ -5,7 +5,6 @@ class vn_wheeled_m54_base: vn_wheeled_truck_base {
 };
 class vn_wheeled_m54_cab_base;
 class vn_wheeled_m54_fuel_base: vn_wheeled_m54_cab_base {
-    transportFuel = 0;
     EGVAR(refuel,hooks)[] = {{-1.15, -2.3, 0.28}};
     EGVAR(refuel,fuelCargo) = 4542;
 };
@@ -25,7 +24,6 @@ class vn_wheeled_z157_base: vn_wheeled_truck_base {
     EGVAR(refuel,fuelCapacity) = 150;
 };
 class vn_wheeled_z157_fuel_base: vn_wheeled_z157_base {
-    transportFuel = 0;
     EGVAR(refuel,hooks)[] = {{-1.36, -3.575, -0.4}};
     EGVAR(refuel,fuelCargo) = 4000;
 };