diff --git a/conf/firmwares/subsystems/fixedwing/autopilot.makefile b/conf/firmwares/subsystems/fixedwing/autopilot.makefile
index 5d2e99d9ae..b24a313122 100644
--- a/conf/firmwares/subsystems/fixedwing/autopilot.makefile
+++ b/conf/firmwares/subsystems/fixedwing/autopilot.makefile
@@ -125,8 +125,7 @@ endif
 #
 ns_srcs 		+= mcu_periph/uart.c
 ns_srcs 		+= $(SRC_ARCH)/mcu_periph/uart_arch.c
-ns_srcs 		+= subsystems/settings.c
-ns_srcs 		+= $(SRC_ARCH)/subsystems/settings_arch.c
+
 
 #
 # ANALOG
@@ -160,6 +159,8 @@ ap_srcs 		+= $(SRC_FIRMWARE)/main_ap.c
 ap_srcs 		+= $(SRC_FIRMWARE)/autopilot.c
 ap_srcs			+= $(SRC_FIRMWARE)/ap_downlink.c
 ap_srcs 		+= state.c
+ap_srcs 		+= subsystems/settings.c
+ap_srcs 		+= $(SRC_ARCH)/subsystems/settings_arch.c
 
 # BARO
 ifeq ($(BOARD), umarim)
diff --git a/conf/firmwares/subsystems/fixedwing/ins_xsens.makefile b/conf/firmwares/subsystems/fixedwing/ins_xsens.makefile
index 81cf8c7f62..9e8ea823ab 100644
--- a/conf/firmwares/subsystems/fixedwing/ins_xsens.makefile
+++ b/conf/firmwares/subsystems/fixedwing/ins_xsens.makefile
@@ -33,16 +33,6 @@ ap.CFLAGS += -DAHRS_TRIGGERED_ATTITUDE_LOOP
 
 
 
-ifeq ($(TARGET), fbw)
-
-# when compiling FBW only, the settings need to know the AHRS_TYPE
-
-fbw.CFLAGS += -DAHRS_TYPE_H=\"modules/ins/ins_xsens.h\"
-fbw.CFLAGS += -DUSE_INS_MODULE
-
-endif
-
-
 #########################################
 ## GPS