diff --git a/cpu/fe310/include/cpu.h b/cpu/fe310/include/cpu.h
new file mode 100644
index 0000000000..6b2f2464dc
--- /dev/null
+++ b/cpu/fe310/include/cpu.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2023 Gunar Schorcht
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser
+ * General Public License v2.1. See the file LICENSE in the top level
+ * directory for more details.
+ */
+
+/**
+ * @ingroup     cpu_fe310
+ * @{
+ *
+ * @file
+ * @brief       CPU specific definitions
+ */
+
+#ifndef CPU_H
+#define CPU_H
+
+#include "cpu_common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CPU_H */
+/** @} */
diff --git a/cpu/gd32v/include/cpu.h b/cpu/gd32v/include/cpu.h
new file mode 100644
index 0000000000..fabcae5c55
--- /dev/null
+++ b/cpu/gd32v/include/cpu.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2023 Gunar Schorcht
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser
+ * General Public License v2.1. See the file LICENSE in the top level
+ * directory for more details.
+ */
+
+/**
+ * @ingroup     cpu_gd32v
+ * @{
+ *
+ * @file
+ * @brief       CPU specific definitions
+ */
+
+#ifndef CPU_H
+#define CPU_H
+
+#include "cpu_conf.h"
+#include "cpu_common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CPU_H */
+/** @} */
diff --git a/cpu/riscv_common/include/cpu.h b/cpu/riscv_common/include/cpu_common.h
similarity index 96%
rename from cpu/riscv_common/include/cpu.h
rename to cpu/riscv_common/include/cpu_common.h
index 25ce04b66c..8329b71748 100644
--- a/cpu/riscv_common/include/cpu.h
+++ b/cpu/riscv_common/include/cpu_common.h
@@ -22,8 +22,8 @@
 
 #include "irq_arch.h"
 
-#ifndef CPU_H
-#define CPU_H
+#ifndef CPU_COMMON_H
+#define CPU_COMMON_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -85,5 +85,5 @@ void cpu_reg_disable_bits(volatile uint32_t *reg, uint32_t mask)
 }
 #endif
 
-#endif /* CPU_H */
+#endif /* CPU_COMMON_H */
 /** @} */