diff --git a/conf/autopilot/subsystems/fixedwing/navigation.makefile b/conf/autopilot/subsystems/fixedwing/navigation.makefile
index e966122d64..929b261ef8 100644
--- a/conf/autopilot/subsystems/fixedwing/navigation.makefile
+++ b/conf/autopilot/subsystems/fixedwing/navigation.makefile
@@ -4,8 +4,8 @@
 #add these to all targets
 
 $(TARGET).CFLAGS += -DNAV
-$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/nav.c
+$(TARGET).srcs += $(SRC_SUBSYSTEMS)/nav.c
 $(TARGET).srcs += $(SRC_FIXEDWING)/traffic_info.c
-$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/navigation/nav_survey_rectangle.c $(SRC_FIXEDWING)/subsystems/navigation/nav_line.c
+$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_survey_rectangle.c $(SRC_SUBSYSTEMS)/navigation/nav_line.c
 
 
diff --git a/conf/autopilot/subsystems/fixedwing/navigation_bomb.makefile b/conf/autopilot/subsystems/fixedwing/navigation_bomb.makefile
index 5f2a0f5be8..de839f98a0 100644
--- a/conf/autopilot/subsystems/fixedwing/navigation_bomb.makefile
+++ b/conf/autopilot/subsystems/fixedwing/navigation_bomb.makefile
@@ -3,5 +3,5 @@
 
 #add these to all targets
 
-$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/navigation/bomb.c
+$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/bomb.c
 
diff --git a/conf/autopilot/subsystems/fixedwing/navigation_extra.makefile b/conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
index 7094c84a29..72b28fcb19 100644
--- a/conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
+++ b/conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
@@ -4,12 +4,12 @@
 #add these to all targets
 
 $(TARGET).CFLAGS += -DNAV
-$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/nav.c
+$(TARGET).srcs += $(SRC_SUBSYSTEMS)/nav.c
 $(TARGET).srcs += $(SRC_FIXEDWING)/traffic_info.c
-$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/navigation/nav_survey_rectangle.c $(SRC_FIXEDWING)/subsystems/navigation/nav_line.c
+$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_survey_rectangle.c $(SRC_SUBSYSTEMS)/navigation/nav_line.c
 
-$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/navigation/nav_cube.c
-$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/navigation/discsurvey.c
-$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/navigation/OSAMNav.c
-$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/navigation/snav.c
+$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_cube.c
+$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/discsurvey.c
+$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/OSAMNav.c
+$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/snav.c