diff --git a/base-hw/src/core/arndale/platform_support.cc b/base-hw/src/core/arndale/platform_support.cc
index 0f329fafd4..403985a366 100644
--- a/base-hw/src/core/arndale/platform_support.cc
+++ b/base-hw/src/core/arndale/platform_support.cc
@@ -15,7 +15,7 @@
 #include <board.h>
 #include <platform.h>
 #include <pic.h>
-#include <cpu.h>
+#include <processor_driver.h>
 #include <timer.h>
 #include <kernel/irq.h>
 
diff --git a/base-hw/src/core/arndale/cpu.h b/base-hw/src/core/arndale/processor_driver.h
similarity index 100%
rename from base-hw/src/core/arndale/cpu.h
rename to base-hw/src/core/arndale/processor_driver.h
diff --git a/base-hw/src/core/imx31/platform_support.cc b/base-hw/src/core/imx31/platform_support.cc
index eced4c8157..1dc009c83d 100644
--- a/base-hw/src/core/imx31/platform_support.cc
+++ b/base-hw/src/core/imx31/platform_support.cc
@@ -15,7 +15,7 @@
 #include <platform.h>
 #include <board.h>
 #include <pic.h>
-#include <cpu.h>
+#include <processor_driver.h>
 #include <kernel/irq.h>
 
 using namespace Genode;
diff --git a/base-hw/src/core/imx31/cpu.h b/base-hw/src/core/imx31/processor_driver.h
similarity index 100%
rename from base-hw/src/core/imx31/cpu.h
rename to base-hw/src/core/imx31/processor_driver.h
diff --git a/base-hw/src/core/imx53/no_trustzone/platform_support.cc b/base-hw/src/core/imx53/no_trustzone/platform_support.cc
index 65988ed45e..0b83729a1e 100644
--- a/base-hw/src/core/imx53/no_trustzone/platform_support.cc
+++ b/base-hw/src/core/imx53/no_trustzone/platform_support.cc
@@ -15,7 +15,7 @@
 #include <platform.h>
 #include <board.h>
 #include <pic.h>
-#include <cpu.h>
+#include <processor_driver.h>
 #include <kernel/irq.h>
 
 using namespace Genode;
diff --git a/base-hw/src/core/imx53/cpu.h b/base-hw/src/core/imx53/processor_driver.h
similarity index 100%
rename from base-hw/src/core/imx53/cpu.h
rename to base-hw/src/core/imx53/processor_driver.h
diff --git a/base-hw/src/core/imx53/trustzone/platform_support.cc b/base-hw/src/core/imx53/trustzone/platform_support.cc
index 31ac459df0..bee1d724f0 100644
--- a/base-hw/src/core/imx53/trustzone/platform_support.cc
+++ b/base-hw/src/core/imx53/trustzone/platform_support.cc
@@ -17,7 +17,7 @@
 #include <platform.h>
 #include <board.h>
 #include <pic.h>
-#include <cpu.h>
+#include <processor_driver.h>
 #include <kernel/irq.h>
 
 using namespace Genode;
diff --git a/base-hw/src/core/imx53/trustzone/trustzone.cc b/base-hw/src/core/imx53/trustzone/trustzone.cc
index a54f46ce60..76607fb297 100644
--- a/base-hw/src/core/imx53/trustzone/trustzone.cc
+++ b/base-hw/src/core/imx53/trustzone/trustzone.cc
@@ -14,7 +14,7 @@
 /* core includes */
 #include <trustzone.h>
 #include <pic.h>
-#include <cpu.h>
+#include <processor_driver.h>
 #include <csu.h>
 #include <board.h>
 
diff --git a/base-hw/src/core/kernel/irq.cc b/base-hw/src/core/kernel/irq.cc
index 1427473560..223d8c2911 100644
--- a/base-hw/src/core/kernel/irq.cc
+++ b/base-hw/src/core/kernel/irq.cc
@@ -14,7 +14,7 @@
 /* core includes */
 #include <kernel/irq.h>
 #include <pic.h>
-#include <cpu.h>
+#include <processor_driver.h>
 
 using namespace Kernel;
 
diff --git a/base-hw/src/core/kernel/pd.h b/base-hw/src/core/kernel/pd.h
index 698f66a71d..b210450e7f 100644
--- a/base-hw/src/core/kernel/pd.h
+++ b/base-hw/src/core/kernel/pd.h
@@ -21,7 +21,7 @@
 #include <kernel/configuration.h>
 #include <kernel/object.h>
 #include <tlb.h>
-#include <cpu.h>
+#include <processor_driver.h>
 #include <assert.h>
 
 /* structure of the mode transition */
diff --git a/base-hw/src/core/kernel/thread.h b/base-hw/src/core/kernel/thread.h
index 5e948c0d57..25d9218aff 100644
--- a/base-hw/src/core/kernel/thread.h
+++ b/base-hw/src/core/kernel/thread.h
@@ -20,7 +20,7 @@
 #include <kernel/signal_receiver.h>
 #include <kernel/ipc_node.h>
 #include <cpu_support.h>
-#include <cpu.h>
+#include <processor_driver.h>
 
 namespace Kernel
 {
diff --git a/base-hw/src/core/kernel/vm.h b/base-hw/src/core/kernel/vm.h
index 390680963d..a12686ccf5 100644
--- a/base-hw/src/core/kernel/vm.h
+++ b/base-hw/src/core/kernel/vm.h
@@ -23,7 +23,7 @@
 #include <kernel/pd.h>
 #include <kernel/multiprocessor.h>
 #include <kernel/signal_receiver.h>
-#include <cpu.h>
+#include <processor_driver.h>
 
 namespace Kernel
 {
diff --git a/base-hw/src/core/odroid_xu/platform_support.cc b/base-hw/src/core/odroid_xu/platform_support.cc
index 6ebd19fd13..8006706d4e 100644
--- a/base-hw/src/core/odroid_xu/platform_support.cc
+++ b/base-hw/src/core/odroid_xu/platform_support.cc
@@ -15,7 +15,7 @@
 #include <board.h>
 #include <platform.h>
 #include <pic.h>
-#include <cpu.h>
+#include <processor_driver.h>
 #include <timer.h>
 #include <kernel/irq.h>
 
diff --git a/base-hw/src/core/odroid_xu/cpu.h b/base-hw/src/core/odroid_xu/processor_driver.h
similarity index 100%
rename from base-hw/src/core/odroid_xu/cpu.h
rename to base-hw/src/core/odroid_xu/processor_driver.h
diff --git a/base-hw/src/core/panda/platform_support.cc b/base-hw/src/core/panda/platform_support.cc
index b0ce08a335..3c1c53da80 100644
--- a/base-hw/src/core/panda/platform_support.cc
+++ b/base-hw/src/core/panda/platform_support.cc
@@ -14,7 +14,7 @@
 /* core includes */
 #include <platform.h>
 #include <board.h>
-#include <cpu.h>
+#include <processor_driver.h>
 #include <pic.h>
 #include <kernel/irq.h>
 
diff --git a/base-hw/src/core/panda/cpu.h b/base-hw/src/core/panda/processor_driver.h
similarity index 100%
rename from base-hw/src/core/panda/cpu.h
rename to base-hw/src/core/panda/processor_driver.h
diff --git a/base-hw/src/core/pbxa9/platform_support.cc b/base-hw/src/core/pbxa9/platform_support.cc
index 6b6c9bed25..e56f481889 100644
--- a/base-hw/src/core/pbxa9/platform_support.cc
+++ b/base-hw/src/core/pbxa9/platform_support.cc
@@ -14,7 +14,7 @@
 /* core includes */
 #include <platform.h>
 #include <board.h>
-#include <cpu.h>
+#include <processor_driver.h>
 #include <pic.h>
 #include <kernel/irq.h>
 
diff --git a/base-hw/src/core/pbxa9/cpu.h b/base-hw/src/core/pbxa9/processor_driver.h
similarity index 100%
rename from base-hw/src/core/pbxa9/cpu.h
rename to base-hw/src/core/pbxa9/processor_driver.h
diff --git a/base-hw/src/core/pic/cortex_a9.h b/base-hw/src/core/pic/cortex_a9.h
index 0f932f7ada..0de95797f1 100644
--- a/base-hw/src/core/pic/cortex_a9.h
+++ b/base-hw/src/core/pic/cortex_a9.h
@@ -16,7 +16,7 @@
 
 /* core includes */
 #include <pic/arm_gic.h>
-#include <cpu.h>
+#include <processor_driver.h>
 
 namespace Cortex_a9
 {
diff --git a/base-hw/src/core/pic/vea9x4_trustzone.h b/base-hw/src/core/pic/vea9x4_trustzone.h
index c75be962b7..743a3354a4 100644
--- a/base-hw/src/core/pic/vea9x4_trustzone.h
+++ b/base-hw/src/core/pic/vea9x4_trustzone.h
@@ -16,7 +16,7 @@
 
 /* core includes */
 #include <pic/arm_gic.h>
-#include <cpu.h>
+#include <processor_driver.h>
 
 namespace Vea9x4_trustzone
 {
diff --git a/base-hw/src/core/rpi/platform_support.cc b/base-hw/src/core/rpi/platform_support.cc
index 98edc91f84..ec0dfdba5f 100644
--- a/base-hw/src/core/rpi/platform_support.cc
+++ b/base-hw/src/core/rpi/platform_support.cc
@@ -14,7 +14,7 @@
 /* core includes */
 #include <platform.h>
 #include <board.h>
-#include <cpu.h>
+#include <processor_driver.h>
 #include <kernel/irq.h>
 
 using namespace Genode;
diff --git a/base-hw/src/core/rpi/cpu.h b/base-hw/src/core/rpi/processor_driver.h
similarity index 100%
rename from base-hw/src/core/rpi/cpu.h
rename to base-hw/src/core/rpi/processor_driver.h
diff --git a/base-hw/src/core/vea9x4/no_trustzone/platform_support.cc b/base-hw/src/core/vea9x4/no_trustzone/platform_support.cc
index 14142b64ae..4336d397f6 100644
--- a/base-hw/src/core/vea9x4/no_trustzone/platform_support.cc
+++ b/base-hw/src/core/vea9x4/no_trustzone/platform_support.cc
@@ -14,7 +14,7 @@
 /* core includes */
 #include <platform.h>
 #include <board.h>
-#include <cpu.h>
+#include <processor_driver.h>
 #include <pic.h>
 #include <kernel/irq.h>
 
diff --git a/base-hw/src/core/vea9x4/cpu.h b/base-hw/src/core/vea9x4/processor_driver.h
similarity index 100%
rename from base-hw/src/core/vea9x4/cpu.h
rename to base-hw/src/core/vea9x4/processor_driver.h
diff --git a/base-hw/src/core/vea9x4/trustzone/platform_support.cc b/base-hw/src/core/vea9x4/trustzone/platform_support.cc
index 1cfd9a0939..c62fdf77e0 100644
--- a/base-hw/src/core/vea9x4/trustzone/platform_support.cc
+++ b/base-hw/src/core/vea9x4/trustzone/platform_support.cc
@@ -15,7 +15,7 @@
 
 /* core includes */
 #include <board.h>
-#include <cpu.h>
+#include <processor_driver.h>
 #include <platform.h>
 #include <pic/vea9x4_trustzone.h>
 #include <kernel/irq.h>
diff --git a/base-hw/src/core/vea9x4/trustzone/trustzone.cc b/base-hw/src/core/vea9x4/trustzone/trustzone.cc
index 112423aa20..a79a0af9f8 100644
--- a/base-hw/src/core/vea9x4/trustzone/trustzone.cc
+++ b/base-hw/src/core/vea9x4/trustzone/trustzone.cc
@@ -14,7 +14,7 @@
 /* core includes */
 #include <trustzone.h>
 #include <pic.h>
-#include <cpu.h>
+#include <processor_driver.h>
 
 /* monitor exception vector address */
 extern int _mon_kernel_entry;