diff --git a/conf/firmwares/subsystems/fixedwing/attitude_dcm.makefile b/conf/firmwares/subsystems/fixedwing/attitude_dcm.makefile
deleted file mode 100644
index 6512931788..0000000000
--- a/conf/firmwares/subsystems/fixedwing/attitude_dcm.makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# attitude estimation for fixedwings via dcm algorithm
-
-
-$(error The attitude_dcm subsystem has been renamed, please replace <subsystem name="attitude" type="dcm"/> with <subsystem name="ahrs" type="dcm"/>)
diff --git a/conf/firmwares/subsystems/fixedwing/attitude_infrared.makefile b/conf/firmwares/subsystems/fixedwing/attitude_infrared.makefile
deleted file mode 100644
index 34a12e0fa7..0000000000
--- a/conf/firmwares/subsystems/fixedwing/attitude_infrared.makefile
+++ /dev/null
@@ -1 +0,0 @@
-$(error Attitude estimation via infrared has been implemented as an AHRS subsystem now. Please replace <subsystem name="attitude" type="infrared"/> with <subsystem name="ahrs" type="infrared"/> and add the module <load name="infrared_adc.xml"/> in your airframe file.)
diff --git a/conf/firmwares/subsystems/fixedwing/attitude_infrared_i2c.makefile b/conf/firmwares/subsystems/fixedwing/attitude_infrared_i2c.makefile
deleted file mode 100644
index af75bb8d7c..0000000000
--- a/conf/firmwares/subsystems/fixedwing/attitude_infrared_i2c.makefile
+++ /dev/null
@@ -1 +0,0 @@
-$(error Attitude estimation via infrared has been implemented as an AHRS subsystem now. Please replace <subsystem name="attitude" type="infrared"/> with <subsystem name="ahrs" type="infrared"/> and add the module <load name="infrared_i2c.xml"/> in your airframe file.)
diff --git a/conf/firmwares/subsystems/fixedwing/gps_ublox_lea4p.makefile b/conf/firmwares/subsystems/fixedwing/gps_ublox_lea4p.makefile
deleted file mode 100644
index da4d84a19d..0000000000
--- a/conf/firmwares/subsystems/fixedwing/gps_ublox_lea4p.makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# UBlox LEA 4P
-
-$(error The gps_ublox_lea4p subsystem has been renamed, please replace <subsystem name="gps" type="ublox_lea4p"/> with <subsystem name="gps" type="ublox_utm"/> in your airframe file.)
diff --git a/conf/firmwares/subsystems/fixedwing/gps_ublox_lea5h.makefile b/conf/firmwares/subsystems/fixedwing/gps_ublox_lea5h.makefile
deleted file mode 100644
index 59e9799be5..0000000000
--- a/conf/firmwares/subsystems/fixedwing/gps_ublox_lea5h.makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# UBlox LEA 5H
-
-$(error The gps_ublox_lea5h subsystem has been renamed, please replace <subsystem name="gps" type="ublox_lea5h"/> with <subsystem name="gps" type="ublox"/> in your airframe file.)
-
diff --git a/conf/firmwares/subsystems/fixedwing/imu_booz.makefile b/conf/firmwares/subsystems/fixedwing/imu_booz.makefile
deleted file mode 100644
index 8efad96332..0000000000
--- a/conf/firmwares/subsystems/fixedwing/imu_booz.makefile
+++ /dev/null
@@ -1 +0,0 @@
-$(error The imu_booz subsystem has been removed, please replace <subsystem name="imu" type="booz"/> with e.g. <subsystem name="imu" type="yai"/> or "b2_v1.0", "b2_v1.1", "b2_v1.2" as appropriate.)