diff --git a/sw/tools/generators/gen_messages.ml b/sw/tools/generators/gen_messages.ml
diff --git a/sw/tools/generators/gen_modules.ml b/sw/tools/generators/gen_modules.ml
@@ -261,7 +261,7 @@ let print_event_functions = fun modules ->
   lprintf out_h "}\n"
 
 let print_datalink_functions = fun modules ->
-  lprintf out_h "\n#include \"messages.h\"\n";
+  lprintf out_h "\n#include \"pprzlink/messages.h\"\n";
   lprintf out_h "#include \"generated/airframe.h\"\n";
   lprintf out_h "static inline void modules_parse_datalink(uint8_t msg_id __attribute__ ((unused))) {\n";
   right ();

diff --git a/sw/tools/generators/gen_ubx.ml b/sw/tools/generators/gen_ubx.ml
@@ -159,7 +159,7 @@ let _ =
     fprintf out "/* Generated by gen_ubx from %s */\n" xml_file;
     fprintf out "/* Please DO NOT EDIT */\n\n";
 
-    fprintf out "#include \"mcu_periph/link_device.h\"\n\n";
+    fprintf out "#include \"pprzlink/pprzlink_device.h\"\n\n";
     fprintf out "#include \"subsystems/gps/gps_ubx.h\"\n\n";
 
     define "UBX_SYNC1" "0xB5";