diff --git a/boards/pic32-clicker/clicker.c b/boards/pic32-clicker/clicker.c
index 6e665be72b..fe8dfdd9f3 100644
--- a/boards/pic32-clicker/clicker.c
+++ b/boards/pic32-clicker/clicker.c
@@ -7,13 +7,9 @@
  * directory for more details.
  *
  */
-#include <stdio.h>
-#include <stdint.h>
-#include "periph/gpio.h"
-#include "periph/uart.h"
-#include "bitarithm.h"
+
 #include "board.h"
-#include "cpu.h"
+#include "periph/gpio.h"
 
 extern void dummy(void);
 
diff --git a/boards/pic32-clicker/include/board.h b/boards/pic32-clicker/include/board.h
index 33d94d0a1b..03cd42931e 100644
--- a/boards/pic32-clicker/include/board.h
+++ b/boards/pic32-clicker/include/board.h
@@ -26,6 +26,7 @@
 #ifndef BOARD_H
 #define BOARD_H
 
+#include "cpu.h"
 #include "periph_conf.h"
 
 #ifdef __cplusplus