diff --git a/tests/external_metro.cpp b/tests/external_metro.cpp
index 6ca8bc90..2d5ff022 100644
--- a/tests/external_metro.cpp
+++ b/tests/external_metro.cpp
@@ -17,7 +17,7 @@
 */
 
 #include "external_metro.h"
-#include <stdio.h>
+#include <cstdio>
 
 typedef jack_default_audio_sample_t sample_t;
 
diff --git a/tests/external_metro.h b/tests/external_metro.h
index 8c618410..317dcb60 100644
--- a/tests/external_metro.h
+++ b/tests/external_metro.h
@@ -21,18 +21,13 @@
 #ifndef __external_metro__
 #define __external_metro__
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cerrno>
 #include <unistd.h>
-#include <math.h>
+#include <cmath>
 #include <getopt.h>
-#include <string.h>
+#include <cstring>
 #include <jack/jack.h>
 #include <jack/transport.h>
 
@@ -63,8 +58,4 @@ extern "C"
         static void shutdown (void* arg);
     };
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif