diff --git a/sw/in_progress/rctx/main_rctx.c b/sw/in_progress/rctx/main_rctx.c
index d2a3276a4d..dcc1e55e44 100644
--- a/sw/in_progress/rctx/main_rctx.c
+++ b/sw/in_progress/rctx/main_rctx.c
@@ -74,10 +74,10 @@ LED_TOGGLE(3);
 #include "uart_hw.h"
 #include "uart.h"
 #include "autopilot.h"
-#include "datalink.h"
+#include "subsystems/datalink/datalink.h"
 
 #include "messages.h"
-#include "downlink.h"
+#include "subsystems/datalink/downlink.h"
 
 #if ((AC_ID > 0x108) || (AC_ID < (0x101)))
 //#error aircraft ID should be 0x101..0x108 for RC transmitter
diff --git a/sw/simulator/nps/nps_ivy.c b/sw/simulator/nps/nps_ivy.c
index 43a3a5251d..ffd2d7166c 100644
--- a/sw/simulator/nps/nps_ivy.c
+++ b/sw/simulator/nps/nps_ivy.c
@@ -51,7 +51,7 @@ void nps_ivy_init(void) {
 
 #include "generated/settings.h"
 #include "dl_protocol.h"
-#include "downlink.h"
+#include "subsystems/datalink/downlink.h"
 static void on_DL_SETTING(IvyClientPtr app __attribute__ ((unused)),
                           void *user_data __attribute__ ((unused)),
                           int argc __attribute__ ((unused)), char *argv[]) {
diff --git a/sw/simulator/old_booz/booz2_sim_main.c b/sw/simulator/old_booz/booz2_sim_main.c
index f2926eef8d..16384ce71c 100644
--- a/sw/simulator/old_booz/booz2_sim_main.c
+++ b/sw/simulator/old_booz/booz2_sim_main.c
@@ -325,7 +325,7 @@ static void ivy_transport_init(void) {
 #include "std.h"
 #include "generated/settings.h"
 #include "dl_protocol.h"
-#include "downlink.h"
+#include "subsystems/datalink/downlink.h"
 static void on_DL_SETTING(IvyClientPtr app __attribute__ ((unused)),
 			  void *user_data __attribute__ ((unused)),
 			  int argc __attribute__ ((unused)), char *argv[]){