diff --git a/repos/base-hw/src/core/include/spec/cortex_a9/board_support.h b/repos/base-hw/src/core/include/spec/cortex_a9/board_support.h
index f6e78b001..891c14ad7 100644
--- a/repos/base-hw/src/core/include/spec/cortex_a9/board_support.h
+++ b/repos/base-hw/src/core/include/spec/cortex_a9/board_support.h
@@ -11,39 +11,36 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _SPEC__CORTEX_A9__BOARD_H_
-#define _SPEC__CORTEX_A9__BOARD_H_
+#ifndef _SPEC__CORTEX_A9__BOARD_SUPPORT_H_
+#define _SPEC__CORTEX_A9__BOARD_SUPPORT_H_
 
 /* core includes */
 #include <drivers/board_base.h>
 
 namespace Cortex_a9
 {
-	class Board_base : public Genode::Board_base
-	{
-		private:
-
-			using Base = Genode::Board_base;
-
-		public:
-
-			enum
-			{
-				/* interrupt controller */
-				IRQ_CONTROLLER_DISTR_BASE = Base::CORTEX_A9_PRIVATE_MEM_BASE
-				                            + 0x1000,
-				IRQ_CONTROLLER_DISTR_SIZE = 0x1000,
-				IRQ_CONTROLLER_CPU_BASE   = Base::CORTEX_A9_PRIVATE_MEM_BASE
-				                            + 0x100,
-				IRQ_CONTROLLER_CPU_SIZE   = 0x100,
-
-				/* timer */
-				PRIVATE_TIMER_MMIO_BASE   = Base::CORTEX_A9_PRIVATE_MEM_BASE
-				                            + 0x600,
-				PRIVATE_TIMER_MMIO_SIZE   = 0x10,
-				PRIVATE_TIMER_IRQ         = 29,
-			};
-	};
+	/**
+	 * Board driver
+	 */
+	class Board;
 }
 
-#endif /* _SPEC__CORTEX_A9__BOARD_H_ */
+class Cortex_a9::Board : public Genode::Board_base
+{
+	public:
+
+		enum {
+			/* interrupt controller */
+			IRQ_CONTROLLER_DISTR_BASE = CORTEX_A9_PRIVATE_MEM_BASE + 0x1000,
+			IRQ_CONTROLLER_DISTR_SIZE = 0x1000,
+			IRQ_CONTROLLER_CPU_BASE   = CORTEX_A9_PRIVATE_MEM_BASE + 0x100,
+			IRQ_CONTROLLER_CPU_SIZE   = 0x100,
+
+			/* timer */
+			PRIVATE_TIMER_MMIO_BASE   = CORTEX_A9_PRIVATE_MEM_BASE + 0x600,
+			PRIVATE_TIMER_MMIO_SIZE   = 0x10,
+			PRIVATE_TIMER_IRQ         = 29,
+		};
+};
+
+#endif /* _SPEC__CORTEX_A9__BOARD_SUPPORT_H_ */
diff --git a/repos/base-hw/src/core/include/spec/panda/board.h b/repos/base-hw/src/core/include/spec/panda/board.h
index a461de15a..185dcae4c 100644
--- a/repos/base-hw/src/core/include/spec/panda/board.h
+++ b/repos/base-hw/src/core/include/spec/panda/board.h
@@ -20,7 +20,7 @@
 
 namespace Genode
 {
-	struct Board : Cortex_a9::Board_base
+	struct Board : Cortex_a9::Board
 	{
 		/**
 		 * L2 outer cache controller
diff --git a/repos/base-hw/src/core/include/spec/pbxa9/board.h b/repos/base-hw/src/core/include/spec/pbxa9/board.h
index d4124c94f..c8a730eed 100644
--- a/repos/base-hw/src/core/include/spec/pbxa9/board.h
+++ b/repos/base-hw/src/core/include/spec/pbxa9/board.h
@@ -19,7 +19,7 @@
 
 namespace Genode
 {
-	class Board : public Cortex_a9::Board_base
+	class Board : public Cortex_a9::Board
 	{
 		public:
 
diff --git a/repos/base-hw/src/core/include/spec/vea9x4/board.h b/repos/base-hw/src/core/include/spec/vea9x4/board.h
index dcd66c216..269aa4938 100644
--- a/repos/base-hw/src/core/include/spec/vea9x4/board.h
+++ b/repos/base-hw/src/core/include/spec/vea9x4/board.h
@@ -19,7 +19,7 @@
 
 namespace Genode
 {
-	class Board : public Cortex_a9::Board_base
+	class Board : public Cortex_a9::Board
 	{
 		public: