diff --git a/conf/modules/ahrs_chimu_uart.xml b/conf/modules/ahrs_chimu_uart.xml
index f2e0531d79..15536a758f 100644
--- a/conf/modules/ahrs_chimu_uart.xml
+++ b/conf/modules/ahrs_chimu_uart.xml
@@ -17,8 +17,8 @@
     <define name="USE_AHRS"/>
     <define name="USE_INS_MODULE"/>
     <define name="USE_UART$(CHIMU_UART_NR)" value="1"/>
-    <define name="INS_LINK" value="UART$(CHIMU_UART_NR)"/>
-    <define name="uart$(CHIMU_UART_NR)_BAUD" value="B115200"/>
+    <define name="INS_LINK" value="uart$(CHIMU_UART_NR)"/>
+    <define name="UART$(CHIMU_UART_NR)_BAUD" value="B115200"/>
     <file name="ahrs_chimu_uart.c"/>
     <file name="imu_chimu.c"/>
     <file name="ahrs.c" dir="subsystems"/>
diff --git a/sw/airborne/modules/max7456/max7456.c b/sw/airborne/modules/max7456/max7456.c
index 239dac45b5..05a8d497b8 100644
--- a/sw/airborne/modules/max7456/max7456.c
+++ b/sw/airborne/modules/max7456/max7456.c
@@ -31,19 +31,20 @@
 #include "mcu_periph/sys_time.h"
 #include "mcu_periph/gpio.h"
 #include "mcu_periph/spi.h"
-#include "led.h"
-#include "autopilot.h"
 
-#include "firmwares/fixedwing/nav.h"
 #include "generated/flight_plan.h"
 #include "generated/airframe.h"
-#include "subsystems/datalink/datalink.h"
+#include "autopilot.h"
 #include "subsystems/electrical.h"
-
-#include "messages.h"
-#include "subsystems/datalink/downlink.h"
 #include "state.h"
 
+// for GetPosAlt, include correct header until we have unified API
+#ifdef AP
+#include "subsystems/navigation/nav.h"
+#else
+#include "firmwares/rotorcraft/navigation.h"
+#endif
+
 // Peripherials
 #include "max7456.h"
 #include "max7456_regs.h"