diff --git a/addons/medical/config.cpp b/addons/medical/config.cpp
index f04470b5be..57b4b06128 100644
--- a/addons/medical/config.cpp
+++ b/addons/medical/config.cpp
@@ -15,16 +15,11 @@ class CfgPatches {
 };
 
 #include "ACE_Settings.hpp"
-#include "ACE_Medical_StateMachine.hpp"
-
 #include "CfgEden.hpp"
 #include "CfgEventHandlers.hpp"
 #include "CfgFactionClasses.hpp"
 #include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"
-#include "UI\CfgInGameUI.hpp"
-#include "UI\RscTitles.hpp"
-#include "UI\triagecard.hpp"
 
 class ACE_Extensions {
     extensions[] += {"ace_medical"};
diff --git a/addons/medical_feedback/functions/script_component.hpp b/addons/medical_feedback/functions/script_component.hpp
index 3559b1f415..ff9d04881c 100644
--- a/addons/medical_feedback/functions/script_component.hpp
+++ b/addons/medical_feedback/functions/script_component.hpp
@@ -1 +1 @@
-#include "\z\ace\addons\medical_ui\script_component.hpp"
\ No newline at end of file
+#include "\z\ace\addons\medical_feedback\script_component.hpp"
diff --git a/addons/medical_gui/functions/script_component.hpp b/addons/medical_gui/functions/script_component.hpp
index 8c2e419166..d2302a9920 100644
--- a/addons/medical_gui/functions/script_component.hpp
+++ b/addons/medical_gui/functions/script_component.hpp
@@ -1 +1 @@
-#include "\z\ace\addons\medical_menu\script_component.hpp"
+#include "\z\ace\addons\medical_gui\script_component.hpp"
diff --git a/addons/medical_statemachine/functions/script_component.hpp b/addons/medical_statemachine/functions/script_component.hpp
new file mode 100644
index 0000000000..5dd15bb8b4
--- /dev/null
+++ b/addons/medical_statemachine/functions/script_component.hpp
@@ -0,0 +1 @@
+#include "\z\ace\addons\medical_statemachine\script_component.hpp"
diff --git a/addons/medical_status/XEH_PREP.sqf b/addons/medical_status/XEH_PREP.hpp
similarity index 100%
rename from addons/medical_status/XEH_PREP.sqf
rename to addons/medical_status/XEH_PREP.hpp
diff --git a/addons/medical_status/functions/script_component.hpp b/addons/medical_status/functions/script_component.hpp
new file mode 100644
index 0000000000..9b83bfbc4f
--- /dev/null
+++ b/addons/medical_status/functions/script_component.hpp
@@ -0,0 +1 @@
+#include "\z\ace\addons\medical_status\script_component.hpp"
diff --git a/addons/medical_vitals/functions/script_component.hpp b/addons/medical_vitals/functions/script_component.hpp
new file mode 100644
index 0000000000..4fe94957b5
--- /dev/null
+++ b/addons/medical_vitals/functions/script_component.hpp
@@ -0,0 +1 @@
+#include "\z\ace\addons\medical_vitals\script_component.hpp"