diff --git a/sw/airborne/arch/sim/jsbsim_hw.h b/sw/airborne/arch/sim/jsbsim_hw.h
index 27406b89a6..173b7ecfc0 100644
--- a/sw/airborne/arch/sim/jsbsim_hw.h
+++ b/sw/airborne/arch/sim/jsbsim_hw.h
@@ -42,7 +42,7 @@
 #include "subsystems/sensors/infrared.h"
 #include "subsystems/commands.h"
 #include "firmwares/fixedwing/main_ap.h"
-#include "ap_downlink.h"
+#include "subsystems/datalink/downlink.h"
 #include "sim_uart.h"
 #include "subsystems/datalink/datalink.h"
 
diff --git a/sw/airborne/modules/enose/anemotaxis.c b/sw/airborne/modules/enose/anemotaxis.c
index d9ec30630c..26de6eeacb 100644
--- a/sw/airborne/modules/enose/anemotaxis.c
+++ b/sw/airborne/modules/enose/anemotaxis.c
@@ -4,7 +4,7 @@
 #include "std.h"
 #include "subsystems/nav.h"
 #include "generated/flight_plan.h"
-#include "ap_downlink.h"
+#include "subsystems/datalink/downlink.h"
 #include "modules/enose/chemo_detect.h"
 
 enum status { UTURN, CROSSWIND };
diff --git a/sw/airborne/modules/enose/chemotaxis.c b/sw/airborne/modules/enose/chemotaxis.c
index 6433f930d6..be89dc4148 100644
--- a/sw/airborne/modules/enose/chemotaxis.c
+++ b/sw/airborne/modules/enose/chemotaxis.c
@@ -4,7 +4,7 @@
 #include "std.h"
 #include "subsystems/nav.h"
 #include "generated/flight_plan.h"
-#include "ap_downlink.h"
+#include "subsystems/datalink/downlink.h"
 #include "modules/enose/chemo_detect.h"
 
 #define MAX_RADIUS 250
diff --git a/sw/airborne/modules/max3100/max3100_hw.c b/sw/airborne/modules/max3100/max3100_hw.c
index ae7bfa8987..2cf0179bdd 100644
--- a/sw/airborne/modules/max3100/max3100_hw.c
+++ b/sw/airborne/modules/max3100/max3100_hw.c
@@ -24,7 +24,7 @@
 #include "interrupt_hw.h"
 #include "max3100_hw.h"
 
-#include "ap_downlink.h"
+#include "subsystems/datalink/downlink.h"
 #include "mcu_periph/uart.h"
 
 
diff --git a/sw/airborne/modules/nav/nav_catapult.c b/sw/airborne/modules/nav/nav_catapult.c
index a65367ec83..108b9e4265 100644
--- a/sw/airborne/modules/nav/nav_catapult.c
+++ b/sw/airborne/modules/nav/nav_catapult.c
@@ -38,7 +38,7 @@
 
 #include "generated/airframe.h"
 #include "state.h"
-#include "ap_downlink.h"
+#include "subsystems/datalink/downlink.h"
 #include "modules/nav/nav_catapult.h"
 #include "subsystems/nav.h"
 #include "generated/flight_plan.h"
diff --git a/sw/airborne/modules/sensors/baro_MS5534A.c b/sw/airborne/modules/sensors/baro_MS5534A.c
index c67ea4ec53..3035013de0 100644
--- a/sw/airborne/modules/sensors/baro_MS5534A.c
+++ b/sw/airborne/modules/sensors/baro_MS5534A.c
@@ -31,7 +31,7 @@
 #include "mcu_periph/spi.h"
 #include "mcu_periph/uart.h"
 #ifndef BARO_NO_DOWNLINK
-#include "ap_downlink.h"
+#include "subsystems/datalink/downlink.h"
 #endif
 #include "subsystems/nav.h"
 #include "state.h"
diff --git a/sw/airborne/subsystems/ins/ins_alt_float.c b/sw/airborne/subsystems/ins/ins_alt_float.c
index 8b673b1ea0..ea49a6d3e1 100644
--- a/sw/airborne/subsystems/ins/ins_alt_float.c
+++ b/sw/airborne/subsystems/ins/ins_alt_float.c
@@ -37,7 +37,7 @@
 
 #ifdef DEBUG_ALT_KALMAN
 #include "mcu_periph/uart.h"
-#include "ap_downlink.h"
+#include "subsystems/datalink/downlink.h"
 #endif
 
 /* vertical position and speed in meters (z-up)*/
diff --git a/sw/airborne/subsystems/navigation/discsurvey.c b/sw/airborne/subsystems/navigation/discsurvey.c
index a2efa53cce..5da1126ad1 100644
--- a/sw/airborne/subsystems/navigation/discsurvey.c
+++ b/sw/airborne/subsystems/navigation/discsurvey.c
@@ -31,7 +31,6 @@
 #include "std.h"
 #include "subsystems/nav.h"
 #include "generated/flight_plan.h"
-#include "ap_downlink.h"
 
 enum status { UTURN, SEGMENT, DOWNWIND };
 static enum status status;