diff --git a/sw/airborne/firmwares/tutorial/main_demo3.c b/sw/airborne/firmwares/tutorial/main_demo3.c
index a8b1971889..4995f784e1 100644
--- a/sw/airborne/firmwares/tutorial/main_demo3.c
+++ b/sw/airborne/firmwares/tutorial/main_demo3.c
@@ -4,7 +4,7 @@
 #include "mcu_periph/sys_time.h"
 #include "led.h"
 #include "mcu_periph/uart.h"
-#include "print.h"
+#include "subsystems/datalink/uart_print.h"
 
 static inline void main_init( void );
 static inline void main_periodic_task( void );
diff --git a/sw/airborne/firmwares/vor/lpc_vor_main.c b/sw/airborne/firmwares/vor/lpc_vor_main.c
index 5c84bf9b02..acbd00c390 100644
--- a/sw/airborne/firmwares/vor/lpc_vor_main.c
+++ b/sw/airborne/firmwares/vor/lpc_vor_main.c
@@ -4,7 +4,7 @@
 #include "led.h"
 #include "interrupt_hw.h"
 #include "mcu_periph/uart.h"
-#include "print.h"
+#include "subsystems/datalink/uart_print.h"
 //#include "messages.h"
 //#include "subsystems/datalink/downlink.h"
 
diff --git a/sw/airborne/print.h b/sw/airborne/subsystems/datalink/uart_print.h
similarity index 97%
rename from sw/airborne/print.h
rename to sw/airborne/subsystems/datalink/uart_print.h
index 5a27b4a5a6..6f77dd173b 100644
--- a/sw/airborne/print.h
+++ b/sw/airborne/subsystems/datalink/uart_print.h
@@ -1,6 +1,4 @@
 /*
- * Paparazzi $I$
- *
  * Copyright (C) 2005 Pascal Brisset, Antoine Drouin
  *
  * This file is part of paparazzi.
@@ -19,11 +17,10 @@
  * along with paparazzi; see the file COPYING.  If not, write to
  * the Free Software Foundation, 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
- *
  */
 
-#ifndef PRINT_H
-#define PRINT_H
+#ifndef UART_PRINT_H
+#define UART_PRINT_H
 
 #include "mcu_periph/uart.h"
 #include "mcu_periph/usb_serial.h"
@@ -109,5 +106,5 @@
 #define UsbSPrintString(s) _PrintString(VCOM_putchar, s)
 
 
-#endif /* PRINT_H */
+#endif /* UART_PRINT_H */
 
diff --git a/sw/airborne/subsystems/datalink/xbee.c b/sw/airborne/subsystems/datalink/xbee.c
index af198ac9f2..4c89b86915 100644
--- a/sw/airborne/subsystems/datalink/xbee.c
+++ b/sw/airborne/subsystems/datalink/xbee.c
@@ -21,7 +21,7 @@
  */
 
 #include "mcu_periph/sys_time.h"
-#include "print.h"
+#include "subsystems/datalink/uart_print.h"
 #include "subsystems/datalink/xbee.h"
 
 #ifdef SIM_UART