diff --git a/conf/firmwares/rotorcraft.makefile b/conf/firmwares/rotorcraft.makefile
index 0ba06eec9b..0e606bb9b4 100644
--- a/conf/firmwares/rotorcraft.makefile
+++ b/conf/firmwares/rotorcraft.makefile
@@ -43,7 +43,6 @@ VPATH += $(PAPARAZZI_HOME)/var/share
 ## COMMON ROTORCRAFT ALL TARGETS (AP + NPS)
 ##
 
-$(TARGET).CFLAGS += -DFIRMWARE=ROTORCRAFT
 $(TARGET).CFLAGS += $(ROTORCRAFT_INC)
 $(TARGET).CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 $(TARGET).CFLAGS += -DPERIPHERALS_AUTO_INIT
diff --git a/conf/firmwares/subsystems/fixedwing/autopilot.makefile b/conf/firmwares/subsystems/fixedwing/autopilot.makefile
index 8bf979d90d..74d1fb07a8 100644
--- a/conf/firmwares/subsystems/fixedwing/autopilot.makefile
+++ b/conf/firmwares/subsystems/fixedwing/autopilot.makefile
@@ -25,7 +25,6 @@
 ##
 ## COMMON FIXEDWING ALL TARGETS (SIM + AP + FBW ...)
 ##
-$(TARGET).CFLAGS += -DFIRMWARE=FIXEDWING
 
 #
 # Board config + Include paths
diff --git a/conf/modules/copilot.xml b/conf/modules/copilot.xml
index f9a4ad3367..3f285e06ef 100644
--- a/conf/modules/copilot.xml
+++ b/conf/modules/copilot.xml
@@ -36,26 +36,12 @@
   <datalink message="MOVE_WP" fun="copilot_parse_move_wp_dl(buf)"/>
   <makefile target="ap">
     <file name="copilot_common.c"/>
-      <raw>
-        # attach the correct file based on firmware
-        RESULT=0
-
-        ifneq (,$(findstring ROTORCRAFT,$($(TARGET).CFLAGS)))
-            # Rotorcraft
-            RESULT=1
-            $(TARGET).srcs += $(SRC_MODULES)/mission/copilot_rotorcraft.c
-        endif
-
-        ifneq (,$(findstring FIXEDWING,$($(TARGET).CFLAGS)))
-            # Fixedwing
-            $(TARGET).srcs += $(SRC_MODULES)/mission/copilot_fixedwing.c
-            RESULT=1
-        endif
-
-        ifeq ($(RESULT), 0)
-            $(error Error: Copilot module can be compiled only in Fixeding or Rotorcraft firmware. Please check your firmware.)
-        endif
-    </raw>
+  </makefile>
+  <makefile target="ap" firmware="fixedwing">
+    <file name="copilot_fixedwing.c"/>
+  </makefile>
+  <makefile target="ap" firmware="rotorcraft">
+    <file name="copilot_rotorcraft.c"/>
   </makefile>
 </module>