diff --git a/tests/rng/main.c b/tests/rng/main.c
index c27655b12ea1..fe0e3ba43e3e 100644
--- a/tests/rng/main.c
+++ b/tests/rng/main.c
@@ -19,6 +19,9 @@
  */
 
 #include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <inttypes.h>
 
 #include "shell.h"
 
diff --git a/tests/rng/test.c b/tests/rng/test.c
index e0704a0f0486..7558f06d41aa 100644
--- a/tests/rng/test.c
+++ b/tests/rng/test.c
@@ -6,8 +6,20 @@
  * directory for more details.
  */
 
+#include <stdint.h>
+#include <math.h>
+#include <stdio.h>
+
 #include "test.h"
 
+#include "fmt.h"
+#include "random.h"
+#include "xtimer.h"
+
+#ifdef MODULE_PERIPH_HWRNG
+#include "periph/hwrng.h"
+#endif
+
 /**
  * @brief   Seed for initializing random module.
  */
diff --git a/tests/rng/test.h b/tests/rng/test.h
index ed835e171c9a..93a6eafb8387 100644
--- a/tests/rng/test.h
+++ b/tests/rng/test.h
@@ -9,17 +9,7 @@
 #ifndef TEST_H
 #define TEST_H
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "fmt.h"
-#include "random.h"
-#include "xtimer.h"
-
-#ifdef MODULE_PERIPH_HWRNG
-#include "periph/hwrng.h"
-#endif
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {