From a54ebd358515fe78a47fab306c0c88b3cb69fd72 Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Mon, 13 Jan 2025 21:45:35 +0100
Subject: [PATCH 1/2] Remove hard hearing dependency

---
 addons/compat_spe/CfgWeapons.hpp              |   1 -
 addons/compat_spe/CfgWeapons/helmets.hpp      | 142 -----------------
 .../compat_spe_hearing/CfgWeapons.hpp         | 145 ++++++++++++++++++
 .../compat_spe/compat_spe_hearing/config.cpp  |  27 ++++
 .../compat_spe_hearing/script_component.hpp   |   3 +
 addons/compat_spe/config.cpp                  |   1 -
 6 files changed, 175 insertions(+), 144 deletions(-)
 delete mode 100644 addons/compat_spe/CfgWeapons/helmets.hpp
 create mode 100644 addons/compat_spe/compat_spe_hearing/CfgWeapons.hpp
 create mode 100644 addons/compat_spe/compat_spe_hearing/config.cpp
 create mode 100644 addons/compat_spe/compat_spe_hearing/script_component.hpp

diff --git a/addons/compat_spe/CfgWeapons.hpp b/addons/compat_spe/CfgWeapons.hpp
index f6b1532bdad..35d04a36dcd 100644
--- a/addons/compat_spe/CfgWeapons.hpp
+++ b/addons/compat_spe/CfgWeapons.hpp
@@ -1,5 +1,4 @@
 class CfgWeapons {
-    #include "CfgWeapons\helmets.hpp"
     #include "CfgWeapons\launchers.hpp"
     #include "CfgWeapons\weapons.hpp"
 };
diff --git a/addons/compat_spe/CfgWeapons/helmets.hpp b/addons/compat_spe/CfgWeapons/helmets.hpp
deleted file mode 100644
index 54cbfd15b86..00000000000
--- a/addons/compat_spe/CfgWeapons/helmets.hpp
+++ /dev/null
@@ -1,142 +0,0 @@
-class H_SPE_HelmetB;
-class H_SPE_Hat: H_SPE_HelmetB {};
-
-//ALLIED PILOT
-class H_SPE_US_Helmet_Pilot: H_SPE_Hat {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_Pilot_Op: H_SPE_US_Helmet_Pilot {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_Pilot_Glasses_Up: H_SPE_US_Helmet_Pilot {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_Pilot_Glasses_Down: H_SPE_US_Helmet_Pilot {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_Pilot_Respirator: H_SPE_US_Helmet_Pilot {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_Pilot_Respirator_Glasses_Up: H_SPE_US_Helmet_Pilot_Respirator {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_Pilot_Respirator_Glasses_Down: H_SPE_US_Helmet_Pilot_Respirator {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_Pilot_SWDG_Respirator: H_SPE_US_Helmet_Pilot {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_Pilot_SWDG_low_Respirator: H_SPE_US_Helmet_Pilot {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_H15: H_SPE_US_Helmet_Pilot {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_H15_Op: H_SPE_US_Helmet_H15 {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_H15_SWDG: H_SPE_US_Helmet_H15 {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_H15_SWDG_low: H_SPE_US_Helmet_H15 {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_H15_O2: H_SPE_US_Helmet_H15 {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_H15_B7_O2: H_SPE_US_Helmet_H15_O2 {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_H15_B7_low_O2: H_SPE_US_Helmet_H15_O2 {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_H15_SWDG_O2: H_SPE_US_Helmet_H15_O2 {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_H15_SWDG_low_O2: H_SPE_US_Helmet_H15_O2 {
-    HEARING_PROTECTION_EARMUFF;
-};
-
-//ALLIED TANKER
-class H_SPE_US_Helmet_Tank: H_SPE_HelmetB {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_Tank_NG: H_SPE_US_Helmet_Tank {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_Tank_Nun: H_SPE_US_Helmet_Tank {
-    HEARING_PROTECTION_OPEN;
-};
-class H_SPE_US_Helmet_Tank_M1_OS: H_SPE_US_Helmet_Tank {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_Tank_M1_NS: H_SPE_US_Helmet_Tank_M1_OS {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_Tank_M1_Scrim: H_SPE_US_Helmet_Tank_M1_OS {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_Tank_polar: H_SPE_US_Helmet_Tank {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_Tank_polar_tapes: H_SPE_US_Helmet_Tank_polar {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_Tank_polar_low: H_SPE_US_Helmet_Tank_polar {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_US_Helmet_Tank_tapes: H_SPE_US_Helmet_Tank {
-    HEARING_PROTECTION_EARMUFF;
-};
-
-//AXIS PILOT
-class H_SPE_GER_LW_PilotHelmet_base: H_SPE_Hat {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_GER_LW_PilotHelmet: H_SPE_GER_LW_PilotHelmet_base {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_GER_LW_S_PilotHelmet: H_SPE_GER_LW_PilotHelmet_base {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_GER_LW_PilotHelmet_Mask_base: H_SPE_Hat {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_GER_LW_PilotHelmet_Mask: H_SPE_GER_LW_PilotHelmet_Mask_base {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_GER_LW_PilotHelmet_S_Mask: H_SPE_GER_LW_PilotHelmet_Mask_base {
-    HEARING_PROTECTION_EARMUFF;
-};
-
-//AXIS TANKER
-class H_SPE_GER_TankPrivateCap: H_SPE_Hat {
-    HEARING_PROTECTION_OPEN;
-};
-class H_SPE_GER_TankOfficerCap: H_SPE_Hat {
-    HEARING_PROTECTION_OPEN;
-};
-class H_SPE_GER_Fieldcap: H_SPE_Hat {
-    HEARING_PROTECTION_OPEN;
-};
-class H_SPE_GER_Fieldcap2: H_SPE_GER_Fieldcap {
-    HEARING_PROTECTION_OPEN;
-};
-class H_SPE_GER_TankPrivateCap2: H_SPE_GER_TankPrivateCap {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_GER_TankOffzCap2: H_SPE_GER_TankPrivateCap {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_GER_TankOfficerCap2: H_SPE_GER_TankOfficerCap {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_GER_SPGPrivateCap: H_SPE_Hat {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_GER_ST_Tanker_Cap2: H_SPE_GER_Fieldcap2 {
-    HEARING_PROTECTION_EARMUFF;
-};
-class H_SPE_GER_ST_Tanker_Cap: H_SPE_GER_Fieldcap {
-    HEARING_PROTECTION_EARMUFF;
-};
diff --git a/addons/compat_spe/compat_spe_hearing/CfgWeapons.hpp b/addons/compat_spe/compat_spe_hearing/CfgWeapons.hpp
new file mode 100644
index 00000000000..a1e1fcc3b99
--- /dev/null
+++ b/addons/compat_spe/compat_spe_hearing/CfgWeapons.hpp
@@ -0,0 +1,145 @@
+class CfgWeapons {
+    class H_SPE_HelmetB;
+    class H_SPE_Hat: H_SPE_HelmetB {};
+
+    //ALLIED PILOT
+    class H_SPE_US_Helmet_Pilot: H_SPE_Hat {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_Pilot_Op: H_SPE_US_Helmet_Pilot {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_Pilot_Glasses_Up: H_SPE_US_Helmet_Pilot {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_Pilot_Glasses_Down: H_SPE_US_Helmet_Pilot {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_Pilot_Respirator: H_SPE_US_Helmet_Pilot {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_Pilot_Respirator_Glasses_Up: H_SPE_US_Helmet_Pilot_Respirator {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_Pilot_Respirator_Glasses_Down: H_SPE_US_Helmet_Pilot_Respirator {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_Pilot_SWDG_Respirator: H_SPE_US_Helmet_Pilot {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_Pilot_SWDG_low_Respirator: H_SPE_US_Helmet_Pilot {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_H15: H_SPE_US_Helmet_Pilot {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_H15_Op: H_SPE_US_Helmet_H15 {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_H15_SWDG: H_SPE_US_Helmet_H15 {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_H15_SWDG_low: H_SPE_US_Helmet_H15 {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_H15_O2: H_SPE_US_Helmet_H15 {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_H15_B7_O2: H_SPE_US_Helmet_H15_O2 {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_H15_B7_low_O2: H_SPE_US_Helmet_H15_O2 {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_H15_SWDG_O2: H_SPE_US_Helmet_H15_O2 {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_H15_SWDG_low_O2: H_SPE_US_Helmet_H15_O2 {
+        HEARING_PROTECTION_EARMUFF;
+    };
+
+    //ALLIED TANKER
+    class H_SPE_US_Helmet_Tank: H_SPE_HelmetB {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_Tank_NG: H_SPE_US_Helmet_Tank {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_Tank_Nun: H_SPE_US_Helmet_Tank {
+        HEARING_PROTECTION_OPEN;
+    };
+    class H_SPE_US_Helmet_Tank_M1_OS: H_SPE_US_Helmet_Tank {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_Tank_M1_NS: H_SPE_US_Helmet_Tank_M1_OS {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_Tank_M1_Scrim: H_SPE_US_Helmet_Tank_M1_OS {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_Tank_polar: H_SPE_US_Helmet_Tank {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_Tank_polar_tapes: H_SPE_US_Helmet_Tank_polar {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_Tank_polar_low: H_SPE_US_Helmet_Tank_polar {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_US_Helmet_Tank_tapes: H_SPE_US_Helmet_Tank {
+        HEARING_PROTECTION_EARMUFF;
+    };
+
+    //AXIS PILOT
+    class H_SPE_GER_LW_PilotHelmet_base: H_SPE_Hat {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_GER_LW_PilotHelmet: H_SPE_GER_LW_PilotHelmet_base {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_GER_LW_S_PilotHelmet: H_SPE_GER_LW_PilotHelmet_base {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_GER_LW_PilotHelmet_Mask_base: H_SPE_Hat {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_GER_LW_PilotHelmet_Mask: H_SPE_GER_LW_PilotHelmet_Mask_base {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_GER_LW_PilotHelmet_S_Mask: H_SPE_GER_LW_PilotHelmet_Mask_base {
+        HEARING_PROTECTION_EARMUFF;
+    };
+
+    //AXIS TANKER
+    class H_SPE_GER_TankPrivateCap: H_SPE_Hat {
+        HEARING_PROTECTION_OPEN;
+    };
+    class H_SPE_GER_TankOfficerCap: H_SPE_Hat {
+        HEARING_PROTECTION_OPEN;
+    };
+    class H_SPE_GER_Fieldcap: H_SPE_Hat {
+        HEARING_PROTECTION_OPEN;
+    };
+    class H_SPE_GER_Fieldcap2: H_SPE_GER_Fieldcap {
+        HEARING_PROTECTION_OPEN;
+    };
+    class H_SPE_GER_TankPrivateCap2: H_SPE_GER_TankPrivateCap {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_GER_TankOffzCap2: H_SPE_GER_TankPrivateCap {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_GER_TankOfficerCap2: H_SPE_GER_TankOfficerCap {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_GER_SPGPrivateCap: H_SPE_Hat {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_GER_ST_Tanker_Cap2: H_SPE_GER_Fieldcap2 {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class H_SPE_GER_ST_Tanker_Cap: H_SPE_GER_Fieldcap {
+        HEARING_PROTECTION_EARMUFF;
+    };
+
+};
diff --git a/addons/compat_spe/compat_spe_hearing/config.cpp b/addons/compat_spe/compat_spe_hearing/config.cpp
new file mode 100644
index 00000000000..b2b55e9ff42
--- /dev/null
+++ b/addons/compat_spe/compat_spe_hearing/config.cpp
@@ -0,0 +1,27 @@
+#include "script_component.hpp"
+#include "\z\ace\addons\hearing\script_macros_hearingProtection.hpp"
+
+class CfgPatches {
+    class SUBADDON {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "ww2_spe_assets_c_weapons_infantryweapons_c",
+            "ww2_spe_assets_c_vehicles_staticweapons_c",
+            "ww2_spe_assets_c_vehicles_weapons_c",
+            "ww2_spe_core_f_system_staticweapons_f",
+            "ww2_spe_core_c_core_c_eventhandlers",
+            "ace_hearing"
+        };
+        skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        url = ECSTRING(main,URL);
+        VERSION_CONFIG;
+
+        addonRootClass = QUOTE(ADDON);
+    };
+};
+
+#include "CfgWeapons.hpp"
diff --git a/addons/compat_spe/compat_spe_hearing/script_component.hpp b/addons/compat_spe/compat_spe_hearing/script_component.hpp
new file mode 100644
index 00000000000..8edb825af34
--- /dev/null
+++ b/addons/compat_spe/compat_spe_hearing/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT hearing
+#define SUBCOMPONENT_BEAUTIFIED Hearing
+#include "..\script_component.hpp"
diff --git a/addons/compat_spe/config.cpp b/addons/compat_spe/config.cpp
index 5c1ba718d68..13bd24f53dd 100644
--- a/addons/compat_spe/config.cpp
+++ b/addons/compat_spe/config.cpp
@@ -1,5 +1,4 @@
 #include "script_component.hpp"
-#include "\z\ace\addons\hearing\script_macros_hearingProtection.hpp"
 
 class CfgPatches {
     class ADDON {

From 8e8ed7f9ebfc4c832fbfe8d5fda5006032626a64 Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Mon, 13 Jan 2025 22:02:29 +0100
Subject: [PATCH 2/2] Remove hard hearing dependency

---
 addons/compat_gm/CfgWeapons.hpp               | 124 -----------------
 .../compat_gm_hearing/CfgWeapons.hpp          | 125 ++++++++++++++++++
 addons/compat_gm/compat_gm_hearing/config.cpp |  23 ++++
 .../compat_gm_hearing/script_component.hpp    |   3 +
 addons/compat_gm/config.cpp                   |   3 -
 .../compat_spe_hearing/CfgWeapons.hpp         |   1 -
 6 files changed, 151 insertions(+), 128 deletions(-)
 create mode 100644 addons/compat_gm/compat_gm_hearing/CfgWeapons.hpp
 create mode 100644 addons/compat_gm/compat_gm_hearing/config.cpp
 create mode 100644 addons/compat_gm/compat_gm_hearing/script_component.hpp

diff --git a/addons/compat_gm/CfgWeapons.hpp b/addons/compat_gm/CfgWeapons.hpp
index d144c445900..0f3b8151ab6 100644
--- a/addons/compat_gm/CfgWeapons.hpp
+++ b/addons/compat_gm/CfgWeapons.hpp
@@ -54,128 +54,4 @@ class CfgWeapons {
     class gm_p2a1_base: gm_pistol_base {
         EGVAR(overheating,jamTypesAllowed)[] = {"Fire", "Dud"};
     };
-
-    // HELMETS
-    class gm_ge_headgear_headset_crew_base;
-    class gm_ge_headgear_headset_crew_oli: gm_ge_headgear_headset_crew_base {
-        HEARING_PROTECTION_PELTOR;
-    };
-
-    class gm_ge_headgear_sph4_base;
-    class gm_ge_headgear_sph4_oli: gm_ge_headgear_sph4_base {
-        HEARING_PROTECTION_PELTOR;
-    };
-
-    class gm_pl_headgear_wz63_base;
-    class gm_pl_army_headgear_wz63_oli: gm_pl_headgear_wz63_base {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_pl_army_headgear_wz63_net_oli: gm_pl_headgear_wz63_base {
-        HEARING_PROTECTION_PELTOR;
-    };
-
-    class gm_ge_headgear_crewhat_80_base;
-    class gm_ge_headgear_crewhat_80_blk: gm_ge_headgear_crewhat_80_base {
-        HEARING_PROTECTION_PELTOR;
-    };
-
-    class gm_gc_headgear_crewhat_80_base;
-    class gm_gc_army_headgear_crewhat_80_blk: gm_gc_headgear_crewhat_80_base {
-        HEARING_PROTECTION_PELTOR;
-    };
-
-    class gm_gc_headgear_zsh3_base;
-    class gm_gc_headgear_zsh3_wht: gm_gc_headgear_zsh3_base {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_gc_headgear_zsh3_blu: gm_gc_headgear_zsh3_base {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_gc_headgear_zsh3_orn: gm_gc_headgear_zsh3_base {
-        HEARING_PROTECTION_PELTOR;
-    };
-
-    class gm_ge_headgear_beret_crew_base;
-    class gm_ge_headgear_beret_crew_blk: gm_ge_headgear_beret_crew_base {
-        HEARING_PROTECTION_PELTOR;
-    };
-
-    class gm_ge_headgear_beret_crew_bdx;
-    class gm_ge_headgear_beret_crew_grn;
-    class gm_ge_headgear_beret_crew_red;
-
-    class gm_ge_headgear_beret_crew_red_antiair: gm_ge_headgear_beret_crew_red {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_ge_headgear_beret_crew_red_artillery: gm_ge_headgear_beret_crew_red {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_ge_headgear_beret_crew_red_engineer: gm_ge_headgear_beret_crew_red {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_ge_headgear_beret_crew_red_maintenance: gm_ge_headgear_beret_crew_red {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_ge_headgear_beret_crew_grn_mechinf: gm_ge_headgear_beret_crew_grn {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_ge_headgear_beret_crew_grn_infantry: gm_ge_headgear_beret_crew_grn {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_ge_headgear_beret_crew_red_militarypolice: gm_ge_headgear_beret_crew_red {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_ge_headgear_beret_crew_red_nbc: gm_ge_headgear_beret_crew_red {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_ge_headgear_beret_crew_red_opcom: gm_ge_headgear_beret_crew_red {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_ge_headgear_beret_crew_bdx_paratrooper: gm_ge_headgear_beret_crew_bdx {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_ge_headgear_beret_crew_bdx_lrrp: gm_ge_headgear_beret_crew_bdx {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_ge_headgear_beret_crew_red_supply: gm_ge_headgear_beret_crew_red {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_ge_headgear_beret_crew_red_signals: gm_ge_headgear_beret_crew_red {
-        HEARING_PROTECTION_PELTOR;
-    };
-
-    class gm_ge_bgs_headgear_beret_crew_grn: gm_ge_headgear_beret_crew_grn {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_ge_bgs_headgear_beret_crew_grn_sf: gm_ge_headgear_beret_crew_grn {
-        HEARING_PROTECTION_PELTOR;
-    };
-
-    class gm_ge_headgear_hat_beanie_base;
-    class gm_ge_headgear_hat_beanie_crew_blk: gm_ge_headgear_hat_beanie_base {
-        HEARING_PROTECTION_PELTOR;
-    };
-
-    class gm_xx_headgear_headwrap_01_base;
-    class gm_xx_headgear_headwrap_crew_01_oli: gm_xx_headgear_headwrap_01_base {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_xx_headgear_headwrap_crew_01_m84: gm_xx_headgear_headwrap_01_base {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_xx_headgear_headwrap_crew_01_grn: gm_xx_headgear_headwrap_01_base {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_xx_headgear_headwrap_crew_01_smp: gm_xx_headgear_headwrap_01_base {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_xx_headgear_headwrap_crew_01_blk: gm_xx_headgear_headwrap_01_base {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_xx_headgear_headwrap_crew_01_flk: gm_xx_headgear_headwrap_01_base {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class gm_xx_headgear_headwrap_crew_01_trp: gm_xx_headgear_headwrap_01_base {
-        HEARING_PROTECTION_PELTOR;
-    };
 };
diff --git a/addons/compat_gm/compat_gm_hearing/CfgWeapons.hpp b/addons/compat_gm/compat_gm_hearing/CfgWeapons.hpp
new file mode 100644
index 00000000000..a15d9611010
--- /dev/null
+++ b/addons/compat_gm/compat_gm_hearing/CfgWeapons.hpp
@@ -0,0 +1,125 @@
+class CfgWeapons {
+    // HELMETS
+    class gm_ge_headgear_headset_crew_base;
+    class gm_ge_headgear_headset_crew_oli: gm_ge_headgear_headset_crew_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+
+    class gm_ge_headgear_sph4_base;
+    class gm_ge_headgear_sph4_oli: gm_ge_headgear_sph4_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+
+    class gm_pl_headgear_wz63_base;
+    class gm_pl_army_headgear_wz63_oli: gm_pl_headgear_wz63_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_pl_army_headgear_wz63_net_oli: gm_pl_headgear_wz63_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+
+    class gm_ge_headgear_crewhat_80_base;
+    class gm_ge_headgear_crewhat_80_blk: gm_ge_headgear_crewhat_80_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+
+    class gm_gc_headgear_crewhat_80_base;
+    class gm_gc_army_headgear_crewhat_80_blk: gm_gc_headgear_crewhat_80_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+
+    class gm_gc_headgear_zsh3_base;
+    class gm_gc_headgear_zsh3_wht: gm_gc_headgear_zsh3_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_gc_headgear_zsh3_blu: gm_gc_headgear_zsh3_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_gc_headgear_zsh3_orn: gm_gc_headgear_zsh3_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+
+    class gm_ge_headgear_beret_crew_base;
+    class gm_ge_headgear_beret_crew_blk: gm_ge_headgear_beret_crew_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+
+    class gm_ge_headgear_beret_crew_bdx;
+    class gm_ge_headgear_beret_crew_grn;
+    class gm_ge_headgear_beret_crew_red;
+
+    class gm_ge_headgear_beret_crew_red_antiair: gm_ge_headgear_beret_crew_red {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_ge_headgear_beret_crew_red_artillery: gm_ge_headgear_beret_crew_red {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_ge_headgear_beret_crew_red_engineer: gm_ge_headgear_beret_crew_red {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_ge_headgear_beret_crew_red_maintenance: gm_ge_headgear_beret_crew_red {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_ge_headgear_beret_crew_grn_mechinf: gm_ge_headgear_beret_crew_grn {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_ge_headgear_beret_crew_grn_infantry: gm_ge_headgear_beret_crew_grn {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_ge_headgear_beret_crew_red_militarypolice: gm_ge_headgear_beret_crew_red {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_ge_headgear_beret_crew_red_nbc: gm_ge_headgear_beret_crew_red {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_ge_headgear_beret_crew_red_opcom: gm_ge_headgear_beret_crew_red {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_ge_headgear_beret_crew_bdx_paratrooper: gm_ge_headgear_beret_crew_bdx {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_ge_headgear_beret_crew_bdx_lrrp: gm_ge_headgear_beret_crew_bdx {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_ge_headgear_beret_crew_red_supply: gm_ge_headgear_beret_crew_red {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_ge_headgear_beret_crew_red_signals: gm_ge_headgear_beret_crew_red {
+        HEARING_PROTECTION_PELTOR;
+    };
+
+    class gm_ge_bgs_headgear_beret_crew_grn: gm_ge_headgear_beret_crew_grn {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_ge_bgs_headgear_beret_crew_grn_sf: gm_ge_headgear_beret_crew_grn {
+        HEARING_PROTECTION_PELTOR;
+    };
+
+    class gm_ge_headgear_hat_beanie_base;
+    class gm_ge_headgear_hat_beanie_crew_blk: gm_ge_headgear_hat_beanie_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+
+    class gm_xx_headgear_headwrap_01_base;
+    class gm_xx_headgear_headwrap_crew_01_oli: gm_xx_headgear_headwrap_01_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_xx_headgear_headwrap_crew_01_m84: gm_xx_headgear_headwrap_01_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_xx_headgear_headwrap_crew_01_grn: gm_xx_headgear_headwrap_01_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_xx_headgear_headwrap_crew_01_smp: gm_xx_headgear_headwrap_01_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_xx_headgear_headwrap_crew_01_blk: gm_xx_headgear_headwrap_01_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_xx_headgear_headwrap_crew_01_flk: gm_xx_headgear_headwrap_01_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class gm_xx_headgear_headwrap_crew_01_trp: gm_xx_headgear_headwrap_01_base {
+        HEARING_PROTECTION_PELTOR;
+    };
+};
diff --git a/addons/compat_gm/compat_gm_hearing/config.cpp b/addons/compat_gm/compat_gm_hearing/config.cpp
new file mode 100644
index 00000000000..64ae8adcf8a
--- /dev/null
+++ b/addons/compat_gm/compat_gm_hearing/config.cpp
@@ -0,0 +1,23 @@
+#include "script_component.hpp"
+#include "\z\ace\addons\hearing\script_macros_hearingProtection.hpp"
+
+class CfgPatches {
+    class SUBADDON {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "gm_core",
+            "ace_hearing"
+        };
+        skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        url = ECSTRING(main,URL);
+        VERSION_CONFIG;
+
+        addonRootClass = QUOTE(ADDON);
+    };
+};
+
+#include "CfgWeapons.hpp"
diff --git a/addons/compat_gm/compat_gm_hearing/script_component.hpp b/addons/compat_gm/compat_gm_hearing/script_component.hpp
new file mode 100644
index 00000000000..8edb825af34
--- /dev/null
+++ b/addons/compat_gm/compat_gm_hearing/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT hearing
+#define SUBCOMPONENT_BEAUTIFIED Hearing
+#include "..\script_component.hpp"
diff --git a/addons/compat_gm/config.cpp b/addons/compat_gm/config.cpp
index 3f00812dc1a..63f43635d59 100644
--- a/addons/compat_gm/config.cpp
+++ b/addons/compat_gm/config.cpp
@@ -1,7 +1,4 @@
 #include "script_component.hpp"
-#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
-#include "\z\ace\addons\hearing\script_macros_hearingProtection.hpp"
-
 
 class CfgPatches {
     class ADDON {
diff --git a/addons/compat_spe/compat_spe_hearing/CfgWeapons.hpp b/addons/compat_spe/compat_spe_hearing/CfgWeapons.hpp
index a1e1fcc3b99..e494a6121bb 100644
--- a/addons/compat_spe/compat_spe_hearing/CfgWeapons.hpp
+++ b/addons/compat_spe/compat_spe_hearing/CfgWeapons.hpp
@@ -141,5 +141,4 @@ class CfgWeapons {
     class H_SPE_GER_ST_Tanker_Cap: H_SPE_GER_Fieldcap {
         HEARING_PROTECTION_EARMUFF;
     };
-
 };