diff --git a/sys/include/ztimer.h b/sys/include/ztimer.h
index 9bc1c07a42..1e03cdd25a 100644
--- a/sys/include/ztimer.h
+++ b/sys/include/ztimer.h
@@ -549,7 +549,7 @@ extern ztimer_clock_t *const ZTIMER_USEC_BASE;
 extern ztimer_clock_t *const ZTIMER_MSEC_BASE;
 
 #ifdef __cplusplus
-extern "C" {
+}
 #endif
 
 #endif /* ZTIMER_H */
diff --git a/sys/include/ztimer/config.h b/sys/include/ztimer/config.h
index 89b467423e..87770b1067 100644
--- a/sys/include/ztimer/config.h
+++ b/sys/include/ztimer/config.h
@@ -117,5 +117,9 @@ extern "C" {
 #define CONFIG_ZTIMER_MSEC_REQUIRED_PM_MODE ZTIMER_CLOCK_NO_REQUIRED_PM_MODE
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* ZTIMER_CONFIG_H */
 /** @} */