diff --git a/Makefile b/Makefile
index 6e2505755db..7f130ae8a8b 100644
--- a/Makefile
+++ b/Makefile
@@ -97,11 +97,10 @@ UBX_PROTOCOL_H=$(STATICINCLUDE)/ubx_protocol.h
 MTK_PROTOCOL_H=$(STATICINCLUDE)/mtk_protocol.h
 XSENS_PROTOCOL_H=$(STATICINCLUDE)/xsens_protocol.h
 ABI_MESSAGES_H=$(STATICINCLUDE)/abi_messages.h
-INTERMCU_MSG_H=$(STATICINCLUDE)/intermcu_msg.h
 MAVLINK_DIR=$(STATICINCLUDE)/mavlink/
 MAVLINK_PROTOCOL_H=$(MAVLINK_DIR)protocol.h
 
-GEN_HEADERS = $(UBX_PROTOCOL_H) $(MTK_PROTOCOL_H) $(XSENS_PROTOCOL_H) $(ABI_MESSAGES_H) $(INTERMCU_MSG_H) $(MAVLINK_PROTOCOL_H)
+GEN_HEADERS = $(UBX_PROTOCOL_H) $(MTK_PROTOCOL_H) $(XSENS_PROTOCOL_H) $(ABI_MESSAGES_H) $(MAVLINK_PROTOCOL_H)
 
 all: ground_segment ext lpctools
 
@@ -224,14 +223,6 @@ $(ABI_MESSAGES_H) : $(ABI_XML) generators
 	$(Q)mv $($@_TMP) $@
 	$(Q)chmod a+r $@
 
-$(INTERMCU_MSG_H) : $(MESSAGES_XML) generators
-	$(Q)test -d $(STATICINCLUDE) || mkdir -p $(STATICINCLUDE)
-	@echo GENERATE $@
-	$(eval $@_TMP := $(shell $(MKTEMP)))
-	$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(GENERATORS)/gen_messages.out $< intermcu > $($@_TMP)
-	$(Q)mv $($@_TMP) $@
-	$(Q)chmod a+r $@
-
 $(MAVLINK_PROTOCOL_H) :
 	$(Q)make -C $(PAPARAZZI_HOME)/sw/ext mavlink
 
diff --git a/sw/airborne/subsystems/intermcu/intermcu_ap.c b/sw/airborne/subsystems/intermcu/intermcu_ap.c
index 68a91616748..e9862cef18c 100644
--- a/sw/airborne/subsystems/intermcu/intermcu_ap.c
+++ b/sw/airborne/subsystems/intermcu/intermcu_ap.c
@@ -25,7 +25,7 @@
  */
 
 #include "intermcu_ap.h"
-#include "intermcu_msg.h"
+#include "pprzlink/intermcu_msg.h"
 #include "subsystems/radio_control.h"
 #include "pprzlink/pprz_transport.h"
 #include "mcu_periph/uart.h"
diff --git a/sw/airborne/subsystems/intermcu/intermcu_fbw.c b/sw/airborne/subsystems/intermcu/intermcu_fbw.c
index eb25a153fed..f97a34badbb 100644
--- a/sw/airborne/subsystems/intermcu/intermcu_fbw.c
+++ b/sw/airborne/subsystems/intermcu/intermcu_fbw.c
@@ -25,7 +25,7 @@
  */
 
 #include "intermcu_fbw.h"
-#include "intermcu_msg.h"
+#include "pprzlink/intermcu_msg.h"
 #include "subsystems/radio_control.h"
 #include "mcu_periph/uart.h"
 #include "pprzlink/pprz_transport.h"
diff --git a/sw/ext/pprzlink b/sw/ext/pprzlink
index ebad76c5203..45dd221fa9a 160000
--- a/sw/ext/pprzlink
+++ b/sw/ext/pprzlink
@@ -1 +1 @@
-Subproject commit ebad76c520308f36879c549c8d753cd4108d31f8
+Subproject commit 45dd221fa9a613e3554b7f0ff78ffa62d4f434af