diff --git a/repos/base-fiasco/src/core/include/map_local.h b/repos/base-fiasco/src/core/include/map_local.h
index e1b21382f..c911777d2 100644
--- a/repos/base-fiasco/src/core/include/map_local.h
+++ b/repos/base-fiasco/src/core/include/map_local.h
@@ -84,4 +84,3 @@ namespace Genode {
 }
 
 #endif /* _CORE__INCLUDE__MAP_LOCAL_H_ */
-
diff --git a/repos/base-fiasco/src/include/base/internal/core_console.h b/repos/base-fiasco/src/include/base/internal/core_console.h
index 4fda716ef..490093a12 100644
--- a/repos/base-fiasco/src/include/base/internal/core_console.h
+++ b/repos/base-fiasco/src/include/base/internal/core_console.h
@@ -11,6 +11,9 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+#ifndef _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_
+#define _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_
+
 /* Fiasco includes */
 namespace Fiasco {
 #include <l4/sys/kdebug.h>
@@ -28,3 +31,5 @@ namespace Genode {
 			void _out_char(char c) { Fiasco::outchar(c); }
 	};
 }
+
+#endif /* _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_ */
diff --git a/repos/base-fiasco/src/include/base/internal/lock_helper.h b/repos/base-fiasco/src/include/base/internal/lock_helper.h
index 569ce6c99..27f8fde67 100644
--- a/repos/base-fiasco/src/include/base/internal/lock_helper.h
+++ b/repos/base-fiasco/src/include/base/internal/lock_helper.h
@@ -1,4 +1,3 @@
-
 /*
  * \brief  L4/Fiasco-specific helper functions for the Lock implementation
  * \author Norman Feske
@@ -19,6 +18,9 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+#ifndef _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_
+#define _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_
+
 /* L4/Fiasco includes */
 namespace Fiasco {
 #include <l4/sys/ipc.h>
@@ -32,3 +34,5 @@ static inline void thread_yield()
 {
 	Fiasco::l4_ipc_sleep(Fiasco::l4_ipc_timeout(0, 0, 500, 0));
 }
+
+#endif /* _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_ */
diff --git a/repos/base-foc/include/base/native_types.h b/repos/base-foc/include/base/native_types.h
index 981f4a744..b40b6e4c1 100644
--- a/repos/base-foc/include/base/native_types.h
+++ b/repos/base-foc/include/base/native_types.h
@@ -1,3 +1,16 @@
+/*
+ * \brief  Platform-specific type definitions
+ * \author Norman Feske
+ * \date   2009-10-02
+ */
+
+/*
+ * Copyright (C) 2009-2013 Genode Labs GmbH
+ *
+ * This file is part of the Genode OS framework, which is distributed
+ * under the terms of the GNU General Public License version 2.
+ */
+
 #ifndef _INCLUDE__BASE__NATIVE_TYPES_H_
 #define _INCLUDE__BASE__NATIVE_TYPES_H_
 
diff --git a/repos/base-foc/include/signal_source/foc_signal_source.h b/repos/base-foc/include/signal_source/foc_signal_source.h
index 1d66b8fac..751efc980 100644
--- a/repos/base-foc/include/signal_source/foc_signal_source.h
+++ b/repos/base-foc/include/signal_source/foc_signal_source.h
@@ -27,4 +27,4 @@ struct Genode::Foc_signal_source : Signal_source
 	GENODE_RPC_INTERFACE_INHERIT(Signal_source, Rpc_request_semaphore);
 };
 
-#endif /* _INCLUDE__SIGNAL_SOURCE__SIGNAL_SOURCE_H_ */
+#endif /* _INCLUDE__SIGNAL_SOURCE__FOC_SIGNAL_SOURCE_H_ */
diff --git a/repos/base-foc/include/spec/arm/base/native_config.h b/repos/base-foc/include/spec/arm/base/native_config.h
index 97bcf113a..340ff18a0 100644
--- a/repos/base-foc/include/spec/arm/base/native_config.h
+++ b/repos/base-foc/include/spec/arm/base/native_config.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__NATIVE_CONFIG_H_
-#define _INCLUDE__BASE__NATIVE_CONFIG_H_
+#ifndef _INCLUDE__SPEC__ARM__BASE__NATIVE_CONFIG_H_
+#define _INCLUDE__SPEC__ARM__BASE__NATIVE_CONFIG_H_
 
 #include <base/stdint.h>
 
@@ -35,4 +35,4 @@ namespace Genode {
 	};
 }
 
-#endif /* _INCLUDE__BASE__NATIVE_CONFIG_H_ */
+#endif /* _INCLUDE__SPEC__ARM__BASE__NATIVE_CONFIG_H_ */
diff --git a/repos/base-foc/include/spec/x86/base/native_config.h b/repos/base-foc/include/spec/x86/base/native_config.h
index 6fbf3c7ab..8829c4195 100644
--- a/repos/base-foc/include/spec/x86/base/native_config.h
+++ b/repos/base-foc/include/spec/x86/base/native_config.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__NATIVE_CONFIG_H_
-#define _INCLUDE__BASE__NATIVE_CONFIG_H_
+#ifndef _INCLUDE__SPEC__X86__BASE__NATIVE_CONFIG_H_
+#define _INCLUDE__SPEC__X86__BASE__NATIVE_CONFIG_H_
 
 #include <base/stdint.h>
 
@@ -35,4 +35,4 @@ namespace Genode {
 	};
 }
 
-#endif /* _INCLUDE__BASE__NATIVE_CONFIG_H_ */
+#endif /* _INCLUDE__SPEC__X86__BASE__NATIVE_CONFIG_H_ */
diff --git a/repos/base-foc/src/core/include/cap_id_alloc.h b/repos/base-foc/src/core/include/cap_id_alloc.h
index b780b7cf4..9b96d599f 100644
--- a/repos/base-foc/src/core/include/cap_id_alloc.h
+++ b/repos/base-foc/src/core/include/cap_id_alloc.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CORE__INCLUDE__CAP_IP_ALLOC_H_
-#define _CORE__INCLUDE__CAP_IP_ALLOC_H_
+#ifndef _CORE__INCLUDE__CAP_ID_ALLOC_H_
+#define _CORE__INCLUDE__CAP_ID_ALLOC_H_
 
 /* Genode includes */
 #include <base/allocator_avl.h>
@@ -48,4 +48,4 @@ namespace Genode {
 	};
 }
 
-#endif /* _CORE__INCLUDE__CAP_IP_ALLOC_H_ */
+#endif /* _CORE__INCLUDE__CAP_ID_ALLOC_H_ */
diff --git a/repos/base-foc/src/core/include/irq_object.h b/repos/base-foc/src/core/include/irq_object.h
index 774539159..49ef03f71 100644
--- a/repos/base-foc/src/core/include/irq_object.h
+++ b/repos/base-foc/src/core/include/irq_object.h
@@ -13,7 +13,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#pragma once 
+#ifndef _CORE__INCLUDE__IRQ_OBJECT_H_
+#define _CORE__INCLUDE__IRQ_OBJECT_H_
 
 /* Genode includes */
 #include <base/printf.h>
@@ -57,3 +58,5 @@ class Genode::Irq_object
 		               Irq_session::Polarity);
 		void ack_irq();
 };
+
+#endif /* _CORE__INCLUDE__IRQ_OBJECT_H_ */
diff --git a/repos/base-foc/src/core/include/map_local.h b/repos/base-foc/src/core/include/map_local.h
index 5d9e42694..f742cc7cc 100644
--- a/repos/base-foc/src/core/include/map_local.h
+++ b/repos/base-foc/src/core/include/map_local.h
@@ -142,4 +142,3 @@ namespace Genode {
 }
 
 #endif /* _CORE__INCLUDE__MAP_LOCAL_H_ */
-
diff --git a/repos/base-foc/src/include/base/internal/core_console.h b/repos/base-foc/src/include/base/internal/core_console.h
index 4fda716ef..490093a12 100644
--- a/repos/base-foc/src/include/base/internal/core_console.h
+++ b/repos/base-foc/src/include/base/internal/core_console.h
@@ -11,6 +11,9 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+#ifndef _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_
+#define _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_
+
 /* Fiasco includes */
 namespace Fiasco {
 #include <l4/sys/kdebug.h>
@@ -28,3 +31,5 @@ namespace Genode {
 			void _out_char(char c) { Fiasco::outchar(c); }
 	};
 }
+
+#endif /* _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_ */
diff --git a/repos/base-foc/src/include/base/internal/lock_helper.h b/repos/base-foc/src/include/base/internal/lock_helper.h
index 1cd3d6a44..d9c2dc1c6 100644
--- a/repos/base-foc/src/include/base/internal/lock_helper.h
+++ b/repos/base-foc/src/include/base/internal/lock_helper.h
@@ -15,8 +15,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__LOCK__LOCK_HELPER_H_
-#define _INCLUDE__BASE__LOCK__LOCK_HELPER_H_
+#ifndef _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_
+#define _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_
 
 /* Genode includes */
 #include <base/native_types.h>
@@ -88,4 +88,4 @@ static void thread_stop_myself()
 	l4_irq_receive(irq, L4_IPC_NEVER);
 }
 
-#endif /* _INCLUDE__BASE__LOCK__LOCK_HELPER_H_ */
+#endif /* _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_ */
diff --git a/repos/base-hw/include/base/native_capability.h b/repos/base-hw/include/base/native_capability.h
index 4d77c31fd..496dc099e 100644
--- a/repos/base-hw/include/base/native_capability.h
+++ b/repos/base-hw/include/base/native_capability.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BASE__NATIVE_CAPABILITY_H_
-#define _BASE__NATIVE_CAPABILITY_H_
+#ifndef _INCLUDE__BASE__NATIVE_CAPABILITY_H_
+#define _INCLUDE__BASE__NATIVE_CAPABILITY_H_
 
 /* Genode includes */
 #include <kernel/interface.h>
@@ -92,4 +92,4 @@ class Genode::Native_capability
 		}
 };
 
-#endif /* _BASE__NATIVE_CAPABILITY_H_ */
+#endif /* _INCLUDE__BASE__NATIVE_CAPABILITY_H_ */
diff --git a/repos/base-hw/include/base/native_env.h b/repos/base-hw/include/base/native_env.h
index 3deeba780..2cb9c99a1 100644
--- a/repos/base-hw/include/base/native_env.h
+++ b/repos/base-hw/include/base/native_env.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BASE__NATIVE_ENV_H_
-#define _BASE__NATIVE_ENV_H_
+#ifndef _INCLUDE__BASE__NATIVE_ENV_H_
+#define _INCLUDE__BASE__NATIVE_ENV_H_
 
 /* Genode includes */
 #include <base/stdint.h>
@@ -25,4 +25,4 @@ namespace Genode
 	void upgrade_pd_session_quota(Genode::size_t);
 };
 
-#endif /**_BASE__NATIVE_ENV_H_ */
+#endif /* _INCLUDE__BASE__NATIVE_ENV_H_ */
diff --git a/repos/base-hw/include/base/native_types.h b/repos/base-hw/include/base/native_types.h
index c6fe26031..5ea3ef500 100644
--- a/repos/base-hw/include/base/native_types.h
+++ b/repos/base-hw/include/base/native_types.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BASE__NATIVE_TYPES_H_
-#define _BASE__NATIVE_TYPES_H_
+#ifndef _INCLUDE__BASE__NATIVE_TYPES_H_
+#define _INCLUDE__BASE__NATIVE_TYPES_H_
 
 /* Genode includes */
 #include <kernel/log.h>
@@ -198,4 +198,4 @@ namespace Genode
 		return (Native_utcb *) (VIRT_ADDR_SPACE_START + VIRT_ADDR_SPACE_SIZE); }
 }
 
-#endif /* _BASE__NATIVE_TYPES_H_ */
+#endif /* _INCLUDE__BASE__NATIVE_TYPES_H_ */
diff --git a/repos/base-hw/include/kernel/interface.h b/repos/base-hw/include/kernel/interface.h
index aee31bf02..b19af0a79 100644
--- a/repos/base-hw/include/kernel/interface.h
+++ b/repos/base-hw/include/kernel/interface.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__INTERFACE_H_
-#define _KERNEL__INTERFACE_H_
+#ifndef _INCLUDE__KERNEL__INTERFACE_H_
+#define _INCLUDE__KERNEL__INTERFACE_H_
 
 /* base-hw includes */
 #include <kernel/interface_support.h>
@@ -288,4 +288,4 @@ namespace Kernel
 	}
 }
 
-#endif /* _KERNEL__INTERFACE_H_ */
+#endif /* _INCLUDE__KERNEL__INTERFACE_H_ */
diff --git a/repos/base-hw/include/kernel/log.h b/repos/base-hw/include/kernel/log.h
index 86a01ac75..dc383845a 100644
--- a/repos/base-hw/include/kernel/log.h
+++ b/repos/base-hw/include/kernel/log.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__LOG_H_
-#define _KERNEL__LOG_H_
+#ifndef _INCLUDE__KERNEL__LOG_H_
+#define _INCLUDE__KERNEL__LOG_H_
 
 /* Genode includes */
 #include <kernel/interface.h>
@@ -114,5 +114,4 @@ namespace Kernel
 	}
 }
 
-#endif /* _KERNEL__LOG_H_  */
-
+#endif /* _INCLUDE__KERNEL__LOG_H_ */
diff --git a/repos/base-hw/include/spec/arm/kernel/interface_support.h b/repos/base-hw/include/spec/arm/kernel/interface_support.h
index 50fa16d69..c6bd161ea 100644
--- a/repos/base-hw/include/spec/arm/kernel/interface_support.h
+++ b/repos/base-hw/include/spec/arm/kernel/interface_support.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__INTERFACE_SUPPORT_H_
-#define _KERNEL__INTERFACE_SUPPORT_H_
+#ifndef _INCLUDE__SPEC__ARM__KERNEL__INTERFACE_SUPPORT_H_
+#define _INCLUDE__SPEC__ARM__KERNEL__INTERFACE_SUPPORT_H_
 
 /* Genode includes */
 #include <base/stdint.h>
@@ -31,5 +31,4 @@ namespace Kernel
 	};
 }
 
-#endif /* _KERNEL__INTERFACE_SUPPORT_H_ */
-
+#endif /* _INCLUDE__SPEC__ARM__KERNEL__INTERFACE_SUPPORT_H_ */
diff --git a/repos/base-hw/include/spec/imx53/drivers/trustzone.h b/repos/base-hw/include/spec/imx53/drivers/trustzone.h
index e21453e15..b85a7d67f 100644
--- a/repos/base-hw/include/spec/imx53/drivers/trustzone.h
+++ b/repos/base-hw/include/spec/imx53/drivers/trustzone.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__PLATFORM__IMX53__DRIVERS__TRUSTZONE_H_
-#define _INCLUDE__PLATFORM__IMX53__DRIVERS__TRUSTZONE_H_
+#ifndef _INCLUDE__SPEC__IMX53__DRIVERS__TRUSTZONE_H_
+#define _INCLUDE__SPEC__IMX53__DRIVERS__TRUSTZONE_H_
 
 /* Genode includes */
 #include <drivers/board_base.h>
@@ -33,5 +33,4 @@ namespace Trustzone
 	};
 }
 
-#endif /* _INCLUDE__PLATFORM__IMX53__DRIVERS__TRUSTZONE_H_ */
-
+#endif /* _INCLUDE__SPEC__IMX53__DRIVERS__TRUSTZONE_H_ */
diff --git a/repos/base-hw/include/spec/x86_64/kernel/interface_support.h b/repos/base-hw/include/spec/x86_64/kernel/interface_support.h
index cbaa6f570..cf56df800 100644
--- a/repos/base-hw/include/spec/x86_64/kernel/interface_support.h
+++ b/repos/base-hw/include/spec/x86_64/kernel/interface_support.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__INTERFACE_SUPPORT_H_
-#define _KERNEL__INTERFACE_SUPPORT_H_
+#ifndef _INCLUDE__SPEC__X86_64__KERNEL__INTERFACE_SUPPORT_H_
+#define _INCLUDE__SPEC__X86_64__KERNEL__INTERFACE_SUPPORT_H_
 
 /* Genode includes */
 #include <base/stdint.h>
@@ -31,5 +31,4 @@ namespace Kernel
 	};
 }
 
-#endif /* _KERNEL__INTERFACE_SUPPORT_H_ */
-
+#endif /* _INCLUDE__SPEC__X86_64__KERNEL__INTERFACE_SUPPORT_H_ */
diff --git a/repos/base-hw/src/core/include/assert.h b/repos/base-hw/src/core/include/assert.h
index 992444a78..cb6419784 100644
--- a/repos/base-hw/src/core/include/assert.h
+++ b/repos/base-hw/src/core/include/assert.h
@@ -52,4 +52,3 @@
 	} while (0) ;
 
 #endif /* _CORE__INCLUDE__ASSERT_H_ */
-
diff --git a/repos/base-hw/src/core/include/cpu_thread_allocator.h b/repos/base-hw/src/core/include/cpu_thread_allocator.h
index cdda474f0..c30eee1e3 100644
--- a/repos/base-hw/src/core/include/cpu_thread_allocator.h
+++ b/repos/base-hw/src/core/include/cpu_thread_allocator.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CORE__INCLUDE__CPU_SESSION_SUPPORT_H_
-#define _CORE__INCLUDE__CPU_SESSION_SUPPORT_H_
+#ifndef _CORE__INCLUDE__CPU_THREAD_ALLOCATOR_H_
+#define _CORE__INCLUDE__CPU_THREAD_ALLOCATOR_H_
 
 #include <base/printf.h>
 #include <base/allocator.h>
@@ -66,4 +66,4 @@ namespace Genode
 	};
 }
 
-#endif /* _CORE__INCLUDE__CPU_SESSION_SUPPORT_H_ */
+#endif /* _CORE__INCLUDE__CPU_THREAD_ALLOCATOR_H_ */
diff --git a/repos/base-hw/src/core/include/irq_session_component.h b/repos/base-hw/src/core/include/irq_session_component.h
index d81a699e2..51f07c1b8 100644
--- a/repos/base-hw/src/core/include/irq_session_component.h
+++ b/repos/base-hw/src/core/include/irq_session_component.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__IRQ_SESSION_COMPONENT_H_
-#define __INCLUDE__IRQ_SESSION_COMPONENT_H_
+#ifndef _CORE__INCLUDE__IRQ_SESSION_COMPONENT_H_
+#define _CORE__INCLUDE__IRQ_SESSION_COMPONENT_H_
 
 /* Genode includes */
 #include <base/rpc_server.h>
@@ -72,4 +72,4 @@ class Genode::Irq_session_component : public Rpc_object<Irq_session>,
 		}
 };
 
-#endif /* _INCLUDE__IRQ_SESSION_COMPONENT_H_ */
+#endif /* _CORE__INCLUDE__IRQ_SESSION_COMPONENT_H_ */
diff --git a/repos/base-hw/src/core/include/kernel/configuration.h b/repos/base-hw/src/core/include/kernel/configuration.h
index 6903c4f52..4c0e5af60 100644
--- a/repos/base-hw/src/core/include/kernel/configuration.h
+++ b/repos/base-hw/src/core/include/kernel/configuration.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__CONFIGURATION_H_
-#define _KERNEL__CONFIGURATION_H_
+#ifndef _CORE__INCLUDE__KERNEL__CONFIGURATION_H_
+#define _CORE__INCLUDE__KERNEL__CONFIGURATION_H_
 
 namespace Kernel
 {
@@ -31,4 +31,4 @@ namespace Kernel
 	constexpr unsigned cpu_fill_ms = 10;
 }
 
-#endif /* _KERNEL__CONFIGURATION_H_ */
+#endif /* _CORE__INCLUDE__KERNEL__CONFIGURATION_H_ */
diff --git a/repos/base-hw/src/core/include/kernel/core_interface.h b/repos/base-hw/src/core/include/kernel/core_interface.h
index a0a9476af..93bd7dbe0 100644
--- a/repos/base-hw/src/core/include/kernel/core_interface.h
+++ b/repos/base-hw/src/core/include/kernel/core_interface.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__CORE_INTERFACE_H_
-#define _KERNEL__CORE_INTERFACE_H_
+#ifndef _CORE__INCLUDE__KERNEL__CORE_INTERFACE_H_
+#define _CORE__INCLUDE__KERNEL__CORE_INTERFACE_H_
 
 /* base-hw includes */
 #include <kernel/interface.h>
@@ -221,4 +221,4 @@ namespace Kernel
 	}
 }
 
-#endif /* _KERNEL__CORE_INTERFACE_H_ */
+#endif /* _CORE__INCLUDE__KERNEL__CORE_INTERFACE_H_ */
diff --git a/repos/base-hw/src/core/include/kernel/cpu.h b/repos/base-hw/src/core/include/kernel/cpu.h
index bdc193e18..7c89f6002 100644
--- a/repos/base-hw/src/core/include/kernel/cpu.h
+++ b/repos/base-hw/src/core/include/kernel/cpu.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__CPU_H_
-#define _KERNEL__CPU_H_
+#ifndef _CORE__INCLUDE__KERNEL__CPU_H_
+#define _CORE__INCLUDE__KERNEL__CPU_H_
 
 /* core includes */
 #include <timer.h>
@@ -366,4 +366,4 @@ class Kernel::Cpu_pool
 		Timer * timer() { return &_timer; }
 };
 
-#endif /* _KERNEL__CPU_H_ */
+#endif /* _CORE__INCLUDE__KERNEL__CPU_H_ */
diff --git a/repos/base-hw/src/core/include/kernel/cpu_scheduler.h b/repos/base-hw/src/core/include/kernel/cpu_scheduler.h
index ac8040b76..a7b9af8ce 100644
--- a/repos/base-hw/src/core/include/kernel/cpu_scheduler.h
+++ b/repos/base-hw/src/core/include/kernel/cpu_scheduler.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__CPU_SCHEDULER_H_
-#define _KERNEL__CPU_SCHEDULER_H_
+#ifndef _CORE__INCLUDE__KERNEL__CPU_SCHEDULER_H_
+#define _CORE__INCLUDE__KERNEL__CPU_SCHEDULER_H_
 
 /* core includes */
 #include <util.h>
@@ -229,4 +229,4 @@ class Kernel::Cpu_scheduler
 		unsigned residual() const { return _residual; }
 };
 
-#endif /* _KERNEL__CPU_SCHEDULER_H_ */
+#endif /* _CORE__INCLUDE__KERNEL__CPU_SCHEDULER_H_ */
diff --git a/repos/base-hw/src/core/include/kernel/double_list.h b/repos/base-hw/src/core/include/kernel/double_list.h
index b500e770b..1c4db45dc 100644
--- a/repos/base-hw/src/core/include/kernel/double_list.h
+++ b/repos/base-hw/src/core/include/kernel/double_list.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__DOUBLE_LIST_H_
-#define _KERNEL__DOUBLE_LIST_H_
+#ifndef _CORE__INCLUDE__KERNEL__DOUBLE_LIST_H_
+#define _CORE__INCLUDE__KERNEL__DOUBLE_LIST_H_
 
 namespace Kernel
 {
@@ -126,4 +126,4 @@ template <typename T> class Kernel::Double_list_typed : public Double_list
 		T * head() const { return _typed(Double_list::head()); }
 };
 
-#endif /* _KERNEL__DOUBLE_LIST_H_ */
+#endif /* _CORE__INCLUDE__KERNEL__DOUBLE_LIST_H_ */
diff --git a/repos/base-hw/src/core/include/kernel/fifo.h b/repos/base-hw/src/core/include/kernel/fifo.h
index c2135acf8..cb09397ca 100644
--- a/repos/base-hw/src/core/include/kernel/fifo.h
+++ b/repos/base-hw/src/core/include/kernel/fifo.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__FIFO_H_
-#define _KERNEL__FIFO_H_
+#ifndef _CORE__INCLUDE__KERNEL__FIFO_H_
+#define _CORE__INCLUDE__KERNEL__FIFO_H_
 
 /* Genode includes */
 #include <util/fifo.h>
@@ -40,4 +40,4 @@ namespace Kernel {
 	};
 }
 
-#endif /* _KERNEL__FIFO_H_ */
+#endif /* _CORE__INCLUDE__KERNEL__FIFO_H_ */
diff --git a/repos/base-hw/src/core/include/kernel/ipc_node.h b/repos/base-hw/src/core/include/kernel/ipc_node.h
index 04b86a923..408161b83 100644
--- a/repos/base-hw/src/core/include/kernel/ipc_node.h
+++ b/repos/base-hw/src/core/include/kernel/ipc_node.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__IPC_NODE_H_
-#define _KERNEL__IPC_NODE_H_
+#ifndef _CORE__INCLUDE__KERNEL__IPC_NODE_H_
+#define _CORE__INCLUDE__KERNEL__IPC_NODE_H_
 
 /* Genode includes */
 #include <util/construct_at.h>
@@ -202,4 +202,4 @@ class Kernel::Ipc_node : public Ipc_node_queue::Element
 		Genode::Native_utcb * utcb() { return _utcb; }
 };
 
-#endif /* _KERNEL__IPC_NODE_H_ */
+#endif /* _CORE__INCLUDE__KERNEL__IPC_NODE_H_ */
diff --git a/repos/base-hw/src/core/include/kernel/irq.h b/repos/base-hw/src/core/include/kernel/irq.h
index 71e521880..06519bab8 100644
--- a/repos/base-hw/src/core/include/kernel/irq.h
+++ b/repos/base-hw/src/core/include/kernel/irq.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__IRQ_H_
-#define _KERNEL__IRQ_H_
+#ifndef _CORE__INCLUDE__KERNEL__IRQ_H_
+#define _CORE__INCLUDE__KERNEL__IRQ_H_
 
 /* Genode includes */
 #include <base/native_types.h>
@@ -157,4 +157,4 @@ class Kernel::User_irq : public Kernel::Irq, public Kernel::Object
 			return dynamic_cast<User_irq*>(_pool()->object(irq)); }
 };
 
-#endif /* _KERNEL__IRQ_H_ */
+#endif /* _CORE__INCLUDE__KERNEL__IRQ_H_ */
diff --git a/repos/base-hw/src/core/include/kernel/kernel.h b/repos/base-hw/src/core/include/kernel/kernel.h
index aa92ff1f7..5fc81156a 100644
--- a/repos/base-hw/src/core/include/kernel/kernel.h
+++ b/repos/base-hw/src/core/include/kernel/kernel.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__KERNEL_H_
-#define _KERNEL__KERNEL_H_
+#ifndef _CORE__INCLUDE__KERNEL__KERNEL_H_
+#define _CORE__INCLUDE__KERNEL__KERNEL_H_
 
 #include <pic.h>
 #include <board.h>
@@ -33,4 +33,4 @@ namespace Kernel {
 	Genode::Board & board();
 }
 
-#endif /* _KERNEL__KERNEL_H_ */
+#endif /* _CORE__INCLUDE__KERNEL__KERNEL_H_ */
diff --git a/repos/base-hw/src/core/include/kernel/object.h b/repos/base-hw/src/core/include/kernel/object.h
index 6adfd5acf..14390b31c 100644
--- a/repos/base-hw/src/core/include/kernel/object.h
+++ b/repos/base-hw/src/core/include/kernel/object.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__OBJECT_H_
-#define _KERNEL__OBJECT_H_
+#ifndef _CORE__INCLUDE__KERNEL__OBJECT_H_
+#define _CORE__INCLUDE__KERNEL__OBJECT_H_
 
 /* Genode includes */
 #include <util/avl_tree.h>
@@ -190,4 +190,4 @@ class Kernel::Core_object : public T, public Kernel::Core_object_identity<T>
 		: T(args...), Core_object_identity<T>(*static_cast<T*>(this)) { }
 };
 
-#endif /* _KERNEL__OBJECT_H_ */
+#endif /* _CORE__INCLUDE__KERNEL__OBJECT_H_ */
diff --git a/repos/base-hw/src/core/include/kernel/pd.h b/repos/base-hw/src/core/include/kernel/pd.h
index 455de7bdd..6ba2bb6cd 100644
--- a/repos/base-hw/src/core/include/kernel/pd.h
+++ b/repos/base-hw/src/core/include/kernel/pd.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__PD_H_
-#define _KERNEL__PD_H_
+#ifndef _CORE__INCLUDE__KERNEL__PD_H_
+#define _CORE__INCLUDE__KERNEL__PD_H_
 
 /* core includes */
 #include <translation_table_allocator_tpl.h>
@@ -187,4 +187,4 @@ class Kernel::Pd : public Cpu::Pd,
 		Object_identity_reference_tree & cap_tree()     { return _cap_tree;    }
 };
 
-#endif /* _KERNEL__PD_H_ */
+#endif /* _CORE__INCLUDE__KERNEL__PD_H_ */
diff --git a/repos/base-hw/src/core/include/kernel/perf_counter.h b/repos/base-hw/src/core/include/kernel/perf_counter.h
index df3aee766..8bddf6dd6 100644
--- a/repos/base-hw/src/core/include/kernel/perf_counter.h
+++ b/repos/base-hw/src/core/include/kernel/perf_counter.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__PERF_COUNTER_H_
-#define _KERNEL__PERF_COUNTER_H_
+#ifndef _CORE__INCLUDE__KERNEL__PERF_COUNTER_H_
+#define _CORE__INCLUDE__KERNEL__PERF_COUNTER_H_
 
 namespace Kernel
 {
@@ -33,4 +33,4 @@ namespace Kernel
 	extern Perf_counter * perf_counter();
 }
 
-#endif /* _KERNEL__PERF_COUNTER_H_ */
+#endif /* _CORE__INCLUDE__KERNEL__PERF_COUNTER_H_ */
diff --git a/repos/base-hw/src/core/include/kernel/signal_receiver.h b/repos/base-hw/src/core/include/kernel/signal_receiver.h
index 45e2576f8..1a3037567 100644
--- a/repos/base-hw/src/core/include/kernel/signal_receiver.h
+++ b/repos/base-hw/src/core/include/kernel/signal_receiver.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__SIGNAL_RECEIVER_H_
-#define _KERNEL__SIGNAL_RECEIVER_H_
+#ifndef _CORE__INCLUDE__KERNEL__SIGNAL_RECEIVER_H_
+#define _CORE__INCLUDE__KERNEL__SIGNAL_RECEIVER_H_
 
 /* Genode includes */
 #include <base/signal.h>
@@ -358,4 +358,4 @@ class Kernel::Signal_receiver : public Kernel::Object
 			call(call_id_delete_signal_receiver(), (Call_arg)receiver); }
 };
 
-#endif /* _KERNEL__SIGNAL_RECEIVER_ */
+#endif /* _CORE__INCLUDE__KERNEL__SIGNAL_RECEIVER_H_ */
diff --git a/repos/base-hw/src/core/include/kernel/thread.h b/repos/base-hw/src/core/include/kernel/thread.h
index f48928584..eeb98c376 100644
--- a/repos/base-hw/src/core/include/kernel/thread.h
+++ b/repos/base-hw/src/core/include/kernel/thread.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__THREAD_H_
-#define _KERNEL__THREAD_H_
+#ifndef _CORE__INCLUDE__KERNEL__THREAD_H_
+#define _CORE__INCLUDE__KERNEL__THREAD_H_
 
 /* core includes */
 #include <kernel/signal_receiver.h>
@@ -371,4 +371,4 @@ class Kernel::Core_thread : public Core_object<Kernel::Thread>
 		static Thread & singleton();
 };
 
-#endif /* _KERNEL__THREAD_H_ */
+#endif /* _CORE__INCLUDE__KERNEL__THREAD_H_ */
diff --git a/repos/base-hw/src/core/include/kernel/vm.h b/repos/base-hw/src/core/include/kernel/vm.h
index d87f7255c..b95d3f389 100644
--- a/repos/base-hw/src/core/include/kernel/vm.h
+++ b/repos/base-hw/src/core/include/kernel/vm.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__VM_H_
-#define _KERNEL__VM_H_
+#ifndef _CORE__INCLUDE__KERNEL__VM_H_
+#define _CORE__INCLUDE__KERNEL__VM_H_
 
 #include <vm_state.h>
 
@@ -122,4 +122,4 @@ class Kernel::Vm : public Cpu_job,
 		Cpu_job * helping_sink() { return this; }
 };
 
-#endif /* _KERNEL__VM_H_ */
+#endif /* _CORE__INCLUDE__KERNEL__VM_H_ */
diff --git a/repos/base-hw/src/core/include/page_flags.h b/repos/base-hw/src/core/include/page_flags.h
index 914fd3d83..891d041d4 100644
--- a/repos/base-hw/src/core/include/page_flags.h
+++ b/repos/base-hw/src/core/include/page_flags.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _TLB__PAGE_FLAGS_H_
-#define _TLB__PAGE_FLAGS_H_
+#ifndef _CORE__INCLUDE__PAGE_FLAGS_H_
+#define _CORE__INCLUDE__PAGE_FLAGS_H_
 
 #include <base/cache.h>
 
@@ -48,4 +48,4 @@ namespace Genode
 	};
 }
 
-#endif /* _TLB__PAGE_FLAGS_H_ */
+#endif /* _CORE__INCLUDE__PAGE_FLAGS_H_ */
diff --git a/repos/base-hw/src/core/include/platform.h b/repos/base-hw/src/core/include/platform.h
index cf0482f58..6b68a03ef 100644
--- a/repos/base-hw/src/core/include/platform.h
+++ b/repos/base-hw/src/core/include/platform.h
@@ -184,4 +184,3 @@ namespace Genode {
 }
 
 #endif /* _CORE__INCLUDE__PLATFORM_H_ */
-
diff --git a/repos/base-hw/src/core/include/platform_pd.h b/repos/base-hw/src/core/include/platform_pd.h
index 1b0f175b8..8c1500a68 100644
--- a/repos/base-hw/src/core/include/platform_pd.h
+++ b/repos/base-hw/src/core/include/platform_pd.h
@@ -240,4 +240,3 @@ class Genode::Core_platform_pd : public Genode::Platform_pd
 };
 
 #endif /* _CORE__INCLUDE__PLATFORM_PD_H_ */
-
diff --git a/repos/base-hw/src/core/include/platform_thread.h b/repos/base-hw/src/core/include/platform_thread.h
index 721219e47..2607ff20f 100644
--- a/repos/base-hw/src/core/include/platform_thread.h
+++ b/repos/base-hw/src/core/include/platform_thread.h
@@ -201,4 +201,3 @@ namespace Genode {
 }
 
 #endif /* _CORE__INCLUDE__PLATFORM_THREAD_H_ */
-
diff --git a/repos/base-hw/src/core/include/spec/arm/cpu_support.h b/repos/base-hw/src/core/include/spec/arm/cpu_support.h
index 3350caf91..971a838e4 100644
--- a/repos/base-hw/src/core/include/spec/arm/cpu_support.h
+++ b/repos/base-hw/src/core/include/spec/arm/cpu_support.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _SPEC__ARM__CPU_SUPPORT_H_
-#define _SPEC__ARM__CPU_SUPPORT_H_
+#ifndef _CORE__INCLUDE__SPEC__ARM__CPU_SUPPORT_H_
+#define _CORE__INCLUDE__SPEC__ARM__CPU_SUPPORT_H_
 
 /* Genode includes */
 #include <util/register.h>
@@ -553,4 +553,4 @@ class Genode::Arm
 		static unsigned primary_id() { return 0; }
 };
 
-#endif /* _SPEC__ARM__CPU_SUPPORT_H_ */
+#endif /* _CORE__INCLUDE__SPEC__ARM__CPU_SUPPORT_H_ */
diff --git a/repos/base-hw/src/core/include/spec/arm/pl310.h b/repos/base-hw/src/core/include/spec/arm/pl310.h
index fb2898a50..384180e09 100644
--- a/repos/base-hw/src/core/include/spec/arm/pl310.h
+++ b/repos/base-hw/src/core/include/spec/arm/pl310.h
@@ -13,8 +13,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _SPEC__ARM__PL310_H_
-#define _SPEC__ARM__PL310_H_
+#ifndef _CORE__INCLUDE__SPEC__ARM__PL310_H_
+#define _CORE__INCLUDE__SPEC__ARM__PL310_H_
 
 /* Genode includes */
 #include <util/mmio.h>
@@ -89,4 +89,4 @@ class Arm::Pl310 : public Genode::Mmio
 		}
 };
 
-#endif /* _SPEC__ARM__PL310_H_ */
+#endif /* _CORE__INCLUDE__SPEC__ARM__PL310_H_ */
diff --git a/repos/base-hw/src/core/include/spec/arm/short_translation_table.h b/repos/base-hw/src/core/include/spec/arm/short_translation_table.h
index 8e48b0ae4..b1101b7ad 100644
--- a/repos/base-hw/src/core/include/spec/arm/short_translation_table.h
+++ b/repos/base-hw/src/core/include/spec/arm/short_translation_table.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _SPEC__ARM__SHORT_TRANSLATION_TABLE_H_
-#define _SPEC__ARM__SHORT_TRANSLATION_TABLE_H_
+#ifndef _CORE__INCLUDE__SPEC__ARM__SHORT_TRANSLATION_TABLE_H_
+#define _CORE__INCLUDE__SPEC__ARM__SHORT_TRANSLATION_TABLE_H_
 
 /* Genode includes */
 #include <util/register.h>
@@ -585,4 +585,4 @@ class Genode::Translation_table
 		}
 } __attribute__((aligned(1<<Translation_table::ALIGNM_LOG2)));
 
-#endif /* _SPEC__ARM__SHORT_TRANSLATION_TABLE_H_ */
+#endif /* _CORE__INCLUDE__SPEC__ARM__SHORT_TRANSLATION_TABLE_H_ */
diff --git a/repos/base-hw/src/core/include/spec/arm_gic/pic.h b/repos/base-hw/src/core/include/spec/arm_gic/pic.h
index 7e594bf90..60e90dfef 100644
--- a/repos/base-hw/src/core/include/spec/arm_gic/pic.h
+++ b/repos/base-hw/src/core/include/spec/arm_gic/pic.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _SPEC__ARM_GIC__PIC_SUPPORT_H_
-#define _SPEC__ARM_GIC__PIC_SUPPORT_H_
+#ifndef _CORE__INCLUDE__SPEC__ARM_GIC__PIC_H_
+#define _CORE__INCLUDE__SPEC__ARM_GIC__PIC_H_
 
 /* Genode includes */
 #include <util/mmio.h>
@@ -293,4 +293,4 @@ class Genode::Pic
 		}
 };
 
-#endif /* _SPEC__ARM_GIC__PIC_SUPPORT_H_ */
+#endif /* _CORE__INCLUDE__SPEC__ARM_GIC__PIC_H_ */
diff --git a/repos/base-hw/src/core/include/spec/arm_v6/cpu.h b/repos/base-hw/src/core/include/spec/arm_v6/cpu.h
index 201746183..326d7fc91 100644
--- a/repos/base-hw/src/core/include/spec/arm_v6/cpu.h
+++ b/repos/base-hw/src/core/include/spec/arm_v6/cpu.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CPU_H_
-#define _CPU_H_
+#ifndef _CORE__INCLUDE__SPEC__ARM_V6__CPU_H_
+#define _CORE__INCLUDE__SPEC__ARM_V6__CPU_H_
 
 /* core includes */
 #include <spec/arm/cpu_support.h>
@@ -94,4 +94,4 @@ class Genode::Cpu : public Arm
 		static void invalidate_control_flow_predictions() { /* FIXME */ }
 };
 
-#endif /* _CPU_H_ */
+#endif /* _CORE__INCLUDE__SPEC__ARM_V6__CPU_H_ */
diff --git a/repos/base-hw/src/core/include/spec/arm_v6/translation_table.h b/repos/base-hw/src/core/include/spec/arm_v6/translation_table.h
index ea1c3bc26..a94a4c23c 100644
--- a/repos/base-hw/src/core/include/spec/arm_v6/translation_table.h
+++ b/repos/base-hw/src/core/include/spec/arm_v6/translation_table.h
@@ -12,12 +12,12 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _TRANSLATION_TABLE_H_
-#define _TRANSLATION_TABLE_H_
+#ifndef _CORE__INCLUDE__SPEC__ARM_V6__TRANSLATION_TABLE_H_
+#define _CORE__INCLUDE__SPEC__ARM_V6__TRANSLATION_TABLE_H_
 
 /* core includes */
 #include <spec/arm/short_translation_table.h>
 
 constexpr unsigned Genode::Translation::_device_tex() { return 0; }
 
-#endif /* _TRANSLATION_TABLE_H_ */
+#endif /* _CORE__INCLUDE__SPEC__ARM_V6__TRANSLATION_TABLE_H_ */
diff --git a/repos/base-hw/src/core/include/spec/arm_v7/cpu_support.h b/repos/base-hw/src/core/include/spec/arm_v7/cpu_support.h
index 26f35fc0b..1fae98bb9 100644
--- a/repos/base-hw/src/core/include/spec/arm_v7/cpu_support.h
+++ b/repos/base-hw/src/core/include/spec/arm_v7/cpu_support.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _SPEC__ARM_V7__CPU_SUPPORT_H_
-#define _SPEC__ARM_V7__CPU_SUPPORT_H_
+#ifndef _CORE__INCLUDE__SPEC__ARM_V7__CPU_SUPPORT_H_
+#define _CORE__INCLUDE__SPEC__ARM_V7__CPU_SUPPORT_H_
 
 /* core includes */
 #include <spec/arm/cpu_support.h>
@@ -191,4 +191,4 @@ class Genode::Arm_v7 : public Arm
 			asm volatile ("mcr p15, 4, %[rd], c12, c0, 0" :: [rd] "r" (a)); }
 };
 
-#endif /* _SPEC__ARM_V7__CPU_SUPPORT_H_ */
+#endif /* _CORE__INCLUDE__SPEC__ARM_V7__CPU_SUPPORT_H_ */
diff --git a/repos/base-hw/src/core/include/spec/arm_v7/long_translation_table.h b/repos/base-hw/src/core/include/spec/arm_v7/long_translation_table.h
index dd91071ad..71d326465 100644
--- a/repos/base-hw/src/core/include/spec/arm_v7/long_translation_table.h
+++ b/repos/base-hw/src/core/include/spec/arm_v7/long_translation_table.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _ARM_V7__LONG_TRANSLATION_TABLE_H_
-#define _ARM_V7__LONG_TRANSLATION_TABLE_H_
+#ifndef _CORE__INCLUDE__SPEC__ARM_V7__LONG_TRANSLATION_TABLE_H_
+#define _CORE__INCLUDE__SPEC__ARM_V7__LONG_TRANSLATION_TABLE_H_
 
 /* Genode includes */
 #include <util/misc_math.h>
@@ -543,4 +543,4 @@ class Genode::Translation_table : public Level_1_stage_1_translation_table
 			                          TABLE_LEVEL_X_ENTRIES,
 		};
 };
-#endif /* _ARM_V7__LONG_TRANSLATION_TABLE_H_ */
+#endif /* _CORE__INCLUDE__SPEC__ARM_V7__LONG_TRANSLATION_TABLE_H_ */
diff --git a/repos/base-hw/src/core/include/spec/arm_v7/trustzone/vm_session_component.h b/repos/base-hw/src/core/include/spec/arm_v7/trustzone/vm_session_component.h
index 2f5a2f753..59bf16fe6 100644
--- a/repos/base-hw/src/core/include/spec/arm_v7/trustzone/vm_session_component.h
+++ b/repos/base-hw/src/core/include/spec/arm_v7/trustzone/vm_session_component.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CORE__INCLUDE__VM_SESSION_COMPONENT_H_
-#define _CORE__INCLUDE__VM_SESSION_COMPONENT_H_
+#ifndef _CORE__INCLUDE__SPEC__ARM_V7__TRUSTZONE__VM_SESSION_COMPONENT_H_
+#define _CORE__INCLUDE__SPEC__ARM_V7__TRUSTZONE__VM_SESSION_COMPONENT_H_
 
 /* Genode includes */
 #include <base/allocator.h>
@@ -73,4 +73,4 @@ class Genode::Vm_session_component
 			PWRN("Not implemented for TrustZone case"); }
 };
 
-#endif /* _CORE__INCLUDE__VM_SESSION_COMPONENT_H_ */
+#endif /* _CORE__INCLUDE__SPEC__ARM_V7__TRUSTZONE__VM_SESSION_COMPONENT_H_ */
diff --git a/repos/base-hw/src/core/include/spec/arm_v7/virtualization/vm_session_component.h b/repos/base-hw/src/core/include/spec/arm_v7/virtualization/vm_session_component.h
index b5ac48672..15f125507 100644
--- a/repos/base-hw/src/core/include/spec/arm_v7/virtualization/vm_session_component.h
+++ b/repos/base-hw/src/core/include/spec/arm_v7/virtualization/vm_session_component.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CORE__INCLUDE__VM_SESSION_COMPONENT_H_
-#define _CORE__INCLUDE__VM_SESSION_COMPONENT_H_
+#ifndef _CORE__INCLUDE__SPEC__ARM_V7__VIRTUALIZATION__VM_SESSION_COMPONENT_H_
+#define _CORE__INCLUDE__SPEC__ARM_V7__VIRTUALIZATION__VM_SESSION_COMPONENT_H_
 
 /* Genode includes */
 #include <base/allocator.h>
@@ -76,4 +76,4 @@ class Genode::Vm_session_component
 		void detach(addr_t vm_addr, size_t size);
 };
 
-#endif /* _CORE__INCLUDE__VM_SESSION_COMPONENT_H_ */
+#endif /* _CORE__INCLUDE__SPEC__ARM_V7__VIRTUALIZATION__VM_SESSION_COMPONENT_H_ */
diff --git a/repos/base-hw/src/core/include/spec/cortex_a15/board_support.h b/repos/base-hw/src/core/include/spec/cortex_a15/board_support.h
index 1bcb47d85..76794b4e4 100644
--- a/repos/base-hw/src/core/include/spec/cortex_a15/board_support.h
+++ b/repos/base-hw/src/core/include/spec/cortex_a15/board_support.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _SPEC__CORTEX_A15__BOARD_SUPPORT_H_
-#define _SPEC__CORTEX_A15__BOARD_SUPPORT_H_
+#ifndef _CORE__INCLUDE__SPEC__CORTEX_A15__BOARD_SUPPORT_H_
+#define _CORE__INCLUDE__SPEC__CORTEX_A15__BOARD_SUPPORT_H_
 
 /* core includes */
 #include <drivers/board_base.h>
@@ -38,4 +38,4 @@ namespace Cortex_a15
 	};
 }
 
-#endif /* _SPEC__CORTEX_A15__BOARD_SUPPORT_H_ */
+#endif /* _CORE__INCLUDE__SPEC__CORTEX_A15__BOARD_SUPPORT_H_ */
diff --git a/repos/base-hw/src/core/include/spec/cortex_a15/cpu.h b/repos/base-hw/src/core/include/spec/cortex_a15/cpu.h
index fba697282..4168f7b56 100644
--- a/repos/base-hw/src/core/include/spec/cortex_a15/cpu.h
+++ b/repos/base-hw/src/core/include/spec/cortex_a15/cpu.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CPU_H_
-#define _CPU_H_
+#ifndef _CORE__INCLUDE__SPEC__CORTEX_A15__CPU_H_
+#define _CORE__INCLUDE__SPEC__CORTEX_A15__CPU_H_
 
 /* core includes */
 #include <spec/arm_v7/cpu_support.h>
diff --git a/repos/base-hw/src/core/include/spec/cortex_a15/translation_table.h b/repos/base-hw/src/core/include/spec/cortex_a15/translation_table.h
index 9b6fcc5b8..9fc58c998 100644
--- a/repos/base-hw/src/core/include/spec/cortex_a15/translation_table.h
+++ b/repos/base-hw/src/core/include/spec/cortex_a15/translation_table.h
@@ -1,18 +1,20 @@
 /*
- * \brief Translation table definitions for core
+ * \brief  Translation table definitions for core
  * \author Stefan Kalkowski
- * \date 2015-01-30
+ * \date   2015-01-30
  */
+
 /*
  * Copyright (C) 2015 Genode Labs GmbH
  *
  * This file is part of the Genode OS framework, which is distributed
  * under the terms of the GNU General Public License version 2.
  */
-#ifndef _TRANSLATION_TABLE_H_
-#define _TRANSLATION_TABLE_H_
+
+#ifndef _CORE__INCLUDE__SPEC__CORTEX_A15__TRANSLATION_TABLE_H_
+#define _CORE__INCLUDE__SPEC__CORTEX_A15__TRANSLATION_TABLE_H_
 
 /* core includes */
 #include <long_translation_table.h>
 
-#endif /* _TRANSLATION_TABLE_H_ */
+#endif /* _CORE__INCLUDE__SPEC__CORTEX_A15__TRANSLATION_TABLE_H_ */
diff --git a/repos/base-hw/src/core/include/spec/cortex_a8/cpu.h b/repos/base-hw/src/core/include/spec/cortex_a8/cpu.h
index 46fb44db9..d0001cca3 100644
--- a/repos/base-hw/src/core/include/spec/cortex_a8/cpu.h
+++ b/repos/base-hw/src/core/include/spec/cortex_a8/cpu.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CPU_H_
-#define _CPU_H_
+#ifndef _CORE__INCLUDE__SPEC__CORTEX_A8__CPU_H_
+#define _CORE__INCLUDE__SPEC__CORTEX_A8__CPU_H_
 
 /* core includes */
 #include <spec/arm_v7/cpu_support.h>
@@ -51,4 +51,4 @@ class Genode::Cpu : public Arm_v7
 		static void translation_added(addr_t const addr, size_t const size);
 };
 
-#endif /* _CPU_H_ */
+#endif /* _CORE__INCLUDE__SPEC__CORTEX_A8__CPU_H_ */
diff --git a/repos/base-hw/src/core/include/spec/cortex_a8/translation_table.h b/repos/base-hw/src/core/include/spec/cortex_a8/translation_table.h
index 7b7a2fd87..8d6c7e2af 100644
--- a/repos/base-hw/src/core/include/spec/cortex_a8/translation_table.h
+++ b/repos/base-hw/src/core/include/spec/cortex_a8/translation_table.h
@@ -4,18 +4,20 @@
  * \author Stefan Kalkowski
  * \date 2012-02-22
  */
+
 /*
  * Copyright (C) 2012-2013 Genode Labs GmbH
  *
  * This file is part of the Genode OS framework, which is distributed
  * under the terms of the GNU General Public License version 2.
  */
-#ifndef _TRANSLATION_TABLE_H_
-#define _TRANSLATION_TABLE_H_
+
+#ifndef _CORE__INCLUDE__SPEC__CORTEX_A8__TRANSLATION_TABLE_H_
+#define _CORE__INCLUDE__SPEC__CORTEX_A8__TRANSLATION_TABLE_H_
 
 /* core includes */
 #include <short_translation_table.h>
 
 constexpr unsigned Genode::Translation::_device_tex() { return 2; }
 
-#endif /* _TRANSLATION_TABLE_H_ */
+#endif /* _CORE__INCLUDE__SPEC__CORTEX_A8__TRANSLATION_TABLE_H_ */
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 358788f8b..6718cbe24 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,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _SPEC__CORTEX_A9__BOARD_SUPPORT_H_
-#define _SPEC__CORTEX_A9__BOARD_SUPPORT_H_
+#ifndef _CORE__INCLUDE__SPEC__CORTEX_A9__BOARD_SUPPORT_H_
+#define _CORE__INCLUDE__SPEC__CORTEX_A9__BOARD_SUPPORT_H_
 
 /* core includes */
 #include <drivers/board_base.h>
@@ -71,4 +71,4 @@ class Cortex_a9::Board : public Genode::Board_base
 		bool errata(Errata);
 };
 
-#endif /* _SPEC__CORTEX_A9__BOARD_SUPPORT_H_ */
+#endif /* _CORE__INCLUDE__SPEC__CORTEX_A9__BOARD_SUPPORT_H_ */
diff --git a/repos/base-hw/src/core/include/spec/cortex_a9/timer.h b/repos/base-hw/src/core/include/spec/cortex_a9/timer.h
index da18fa8fe..179e7efd3 100644
--- a/repos/base-hw/src/core/include/spec/cortex_a9/timer.h
+++ b/repos/base-hw/src/core/include/spec/cortex_a9/timer.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _TIMER_H_
-#define _TIMER_H_
+#ifndef _CORE__INCLUDE__SPEC__CORTEX_A9__TIMER_H_
+#define _CORE__INCLUDE__SPEC__CORTEX_A9__TIMER_H_
 
 /* Genode includes */
 #include <util/mmio.h>
@@ -107,4 +107,4 @@ namespace Genode
 
 namespace Kernel { class Timer : public Genode::Timer { }; }
 
-#endif /* _TIMER_H_ */
+#endif /* _CORE__INCLUDE__SPEC__CORTEX_A9__TIMER_H_ */
diff --git a/repos/base-hw/src/core/include/spec/cortex_a9/translation_table.h b/repos/base-hw/src/core/include/spec/cortex_a9/translation_table.h
index 7b7a2fd87..3875a3c17 100644
--- a/repos/base-hw/src/core/include/spec/cortex_a9/translation_table.h
+++ b/repos/base-hw/src/core/include/spec/cortex_a9/translation_table.h
@@ -4,18 +4,20 @@
  * \author Stefan Kalkowski
  * \date 2012-02-22
  */
+
 /*
  * Copyright (C) 2012-2013 Genode Labs GmbH
  *
  * This file is part of the Genode OS framework, which is distributed
  * under the terms of the GNU General Public License version 2.
  */
-#ifndef _TRANSLATION_TABLE_H_
-#define _TRANSLATION_TABLE_H_
+
+#ifndef _CORE__INCLUDE__SPEC__CORTEX_A9__TRANSLATION_TABLE_H_
+#define _CORE__INCLUDE__SPEC__CORTEX_A9__TRANSLATION_TABLE_H_
 
 /* core includes */
 #include <short_translation_table.h>
 
 constexpr unsigned Genode::Translation::_device_tex() { return 2; }
 
-#endif /* _TRANSLATION_TABLE_H_ */
+#endif /* _CORE__INCLUDE__SPEC__CORTEX_A9__TRANSLATION_TABLE_H_ */
diff --git a/repos/base-hw/src/core/include/spec/exynos5/board.h b/repos/base-hw/src/core/include/spec/exynos5/board.h
index 3f00b32a0..0b34428b7 100644
--- a/repos/base-hw/src/core/include/spec/exynos5/board.h
+++ b/repos/base-hw/src/core/include/spec/exynos5/board.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BOARD_H_
-#define _BOARD_H_
+#ifndef _CORE__INCLUDE__SPEC__EXYNOS5__BOARD_H_
+#define _CORE__INCLUDE__SPEC__EXYNOS5__BOARD_H_
 
 /* core includes */
 #include <spec/cortex_a15/board_support.h>
@@ -40,4 +40,4 @@ namespace Genode
 	};
 }
 
-#endif /* _BOARD_H_ */
+#endif /* _CORE__INCLUDE__SPEC__EXYNOS5__BOARD_H_ */
diff --git a/repos/base-hw/src/core/include/spec/exynos5/serial.h b/repos/base-hw/src/core/include/spec/exynos5/serial.h
index 758d4266c..c66047904 100644
--- a/repos/base-hw/src/core/include/spec/exynos5/serial.h
+++ b/repos/base-hw/src/core/include/spec/exynos5/serial.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _SERIAL_H_
-#define _SERIAL_H_
+#ifndef _CORE__INCLUDE__SPEC__EXYNOS5__SERIAL_H_
+#define _CORE__INCLUDE__SPEC__EXYNOS5__SERIAL_H_
 
 /* core includes */
 #include <board.h>
@@ -43,4 +43,4 @@ namespace Genode
 	};
 }
 
-#endif /* _SERIAL_H_ */
+#endif /* _CORE__INCLUDE__SPEC__EXYNOS5__SERIAL_H_ */
diff --git a/repos/base-hw/src/core/include/spec/exynos5/timer.h b/repos/base-hw/src/core/include/spec/exynos5/timer.h
index 704198d57..4be81e615 100644
--- a/repos/base-hw/src/core/include/spec/exynos5/timer.h
+++ b/repos/base-hw/src/core/include/spec/exynos5/timer.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _TIMER_H_
-#define _TIMER_H_
+#ifndef _CORE__INCLUDE__SPEC__EXYNOS5__TIMER_H_
+#define _CORE__INCLUDE__SPEC__EXYNOS5__TIMER_H_
 
 /* core include */
 #include <board.h>
@@ -254,4 +254,4 @@ class Genode::Timer : public Mmio
 
 namespace Kernel { class Timer : public Genode::Timer { }; }
 
-#endif /* _TIMER_H_ */
+#endif /* _CORE__INCLUDE__SPEC__EXYNOS5__TIMER_H_ */
diff --git a/repos/base-hw/src/core/include/spec/imx/board_support.h b/repos/base-hw/src/core/include/spec/imx/board_support.h
index 5c2ddfc75..1ec484b9e 100644
--- a/repos/base-hw/src/core/include/spec/imx/board_support.h
+++ b/repos/base-hw/src/core/include/spec/imx/board_support.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _SPEC__IMX__BOARD_SUPPORT_H_
-#define _SPEC__IMX__BOARD_SUPPORT_H_
+#ifndef _CORE__INCLUDE__SPEC__IMX__BOARD_SUPPORT_H_
+#define _CORE__INCLUDE__SPEC__IMX__BOARD_SUPPORT_H_
 
 /* Genode includes */
 #include <drivers/board_base.h>
@@ -107,4 +107,4 @@ class Imx::Board : public Genode::Board_base
 		}
 };
 
-#endif /* _SPEC__IMX__BOARD_SUPPORT_H_ */
+#endif /* _CORE__INCLUDE__SPEC__IMX__BOARD_SUPPORT_H_ */
diff --git a/repos/base-hw/src/core/include/spec/imx53/board.h b/repos/base-hw/src/core/include/spec/imx53/board.h
index 52344e0c7..3bd5b5cdc 100644
--- a/repos/base-hw/src/core/include/spec/imx53/board.h
+++ b/repos/base-hw/src/core/include/spec/imx53/board.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BOARD_H_
-#define _BOARD_H_
+#ifndef _CORE__INCLUDE__SPEC__IMX53__BOARD_H_
+#define _CORE__INCLUDE__SPEC__IMX53__BOARD_H_
 
 /* core includes */
 #include <spec/imx/board_support.h>
@@ -31,4 +31,4 @@ namespace Genode
    	};
 }
 
-#endif /* _BOARD_H_ */
+#endif /* _CORE__INCLUDE__SPEC__IMX53__BOARD_H_ */
diff --git a/repos/base-hw/src/core/include/spec/imx53/pic.h b/repos/base-hw/src/core/include/spec/imx53/pic.h
index 92894899a..c2c60a90c 100644
--- a/repos/base-hw/src/core/include/spec/imx53/pic.h
+++ b/repos/base-hw/src/core/include/spec/imx53/pic.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _PIC_H_
-#define _PIC_H_
+#ifndef _CORE__INCLUDE__SPEC__IMX53__PIC_H_
+#define _CORE__INCLUDE__SPEC__IMX53__PIC_H_
 
 /* Genode includes */
 #include <util/mmio.h>
@@ -178,4 +178,4 @@ class Genode::Pic : public Mmio
 
 namespace Kernel { class Pic : public Genode::Pic { }; }
 
-#endif /* _PIC_H_ */
+#endif /* _CORE__INCLUDE__SPEC__IMX53__PIC_H_ */
diff --git a/repos/base-hw/src/core/include/spec/imx53/trustzone/csu.h b/repos/base-hw/src/core/include/spec/imx53/trustzone/csu.h
index 6db0624ef..62c6340b2 100644
--- a/repos/base-hw/src/core/include/spec/imx53/trustzone/csu.h
+++ b/repos/base-hw/src/core/include/spec/imx53/trustzone/csu.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CSU_H_
-#define _CSU_H_
+#ifndef _CORE__INCLUDE__SPEC__IMX53__TRUSTZONE__CSU_H_
+#define _CORE__INCLUDE__SPEC__IMX53__TRUSTZONE__CSU_H_
 
 /* Genode includes */
 #include <util/mmio.h>
@@ -239,4 +239,4 @@ namespace Genode {
 	};
 }
 
-#endif /* _CSU_H_ */
+#endif /* _CORE__INCLUDE__SPEC__IMX53__TRUSTZONE__CSU_H_ */
diff --git a/repos/base-hw/src/core/include/spec/imx53_qsb/trustzone/csu_config.h b/repos/base-hw/src/core/include/spec/imx53_qsb/trustzone/csu_config.h
index 44d040e78..818f1ea4e 100644
--- a/repos/base-hw/src/core/include/spec/imx53_qsb/trustzone/csu_config.h
+++ b/repos/base-hw/src/core/include/spec/imx53_qsb/trustzone/csu_config.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CSU_CONFIG_H_
-#define _CSU_CONFIG_H_
+#ifndef _CORE__INCLUDE__SPEC__IMX53_QSB__TRUSTZONE__CSU_CONFIG_H_
+#define _CORE__INCLUDE__SPEC__IMX53_QSB__TRUSTZONE__CSU_CONFIG_H_
 
 /**
  * Configuration of the Driver for the Central Security Unit
@@ -27,4 +27,4 @@ namespace Csu_config
 	};
 };
 
-#endif /* _CSU_CONFIG_H_ */
+#endif /* _CORE__INCLUDE__SPEC__IMX53_QSB__TRUSTZONE__CSU_CONFIG_H_ */
diff --git a/repos/base-hw/src/core/include/spec/imx6/board.h b/repos/base-hw/src/core/include/spec/imx6/board.h
index 81217e6ed..540ee9501 100644
--- a/repos/base-hw/src/core/include/spec/imx6/board.h
+++ b/repos/base-hw/src/core/include/spec/imx6/board.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BOARD_H_
-#define _BOARD_H_
+#ifndef _CORE__INCLUDE__SPEC__IMX6__BOARD_H_
+#define _CORE__INCLUDE__SPEC__IMX6__BOARD_H_
 
 /* core includes */
 #include <spec/imx/board_support.h>
@@ -36,4 +36,4 @@ namespace Genode
 	};
 }
 
-#endif /* _BOARD_H_ */
+#endif /* _CORE__INCLUDE__SPEC__IMX6__BOARD_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 6443f493d..11bf43002 100644
--- a/repos/base-hw/src/core/include/spec/panda/board.h
+++ b/repos/base-hw/src/core/include/spec/panda/board.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BOARD_H_
-#define _BOARD_H_
+#ifndef _CORE__INCLUDE__SPEC__PANDA__BOARD_H_
+#define _CORE__INCLUDE__SPEC__PANDA__BOARD_H_
 
 /* core includes */
 #include <spec/arm/pl310.h>
@@ -131,4 +131,4 @@ class Genode::Board : public Cortex_a9::Board
 		Secure_monitor & monitor()  { return _monitor;  }
 };
 
-#endif /* _BOARD_H_ */
+#endif /* _CORE__INCLUDE__SPEC__PANDA__BOARD_H_ */
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 8dc3c0aa4..55aba7035 100644
--- a/repos/base-hw/src/core/include/spec/pbxa9/board.h
+++ b/repos/base-hw/src/core/include/spec/pbxa9/board.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _SPEC__PBXA9__BOARD_H_
-#define _SPEC__PBXA9__BOARD_H_
+#ifndef _CORE__INCLUDE__SPEC__PBXA9__BOARD_H_
+#define _CORE__INCLUDE__SPEC__PBXA9__BOARD_H_
 
 /* core includes */
 #include <spec/cortex_a9/board_support.h>
@@ -22,4 +22,4 @@ namespace Genode
 	using Board = Cortex_a9::Board;
 }
 
-#endif /* _SPEC__PBXA9__BOARD_H_ */
+#endif /* _CORE__INCLUDE__SPEC__PBXA9__BOARD_H_ */
diff --git a/repos/base-hw/src/core/include/spec/rpi/board.h b/repos/base-hw/src/core/include/spec/rpi/board.h
index 5e4f378ba..e47c0d84d 100644
--- a/repos/base-hw/src/core/include/spec/rpi/board.h
+++ b/repos/base-hw/src/core/include/spec/rpi/board.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BOARD_H_
-#define _BOARD_H_
+#ifndef _CORE__INCLUDE__BOARD_H_
+#define _CORE__INCLUDE__BOARD_H_
 
 /* core includes */
 #include <drivers/board_base.h>
@@ -30,4 +30,4 @@ namespace Genode
 	};
 }
 
-#endif /* _BOARD_H_ */
+#endif /* _CORE__INCLUDE__BOARD_H_ */
diff --git a/repos/base-hw/src/core/include/spec/rpi/pic.h b/repos/base-hw/src/core/include/spec/rpi/pic.h
index dfec6b46c..d86d458eb 100644
--- a/repos/base-hw/src/core/include/spec/rpi/pic.h
+++ b/repos/base-hw/src/core/include/spec/rpi/pic.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _PIC_H_
-#define _PIC_H_
+#ifndef _CORE__INCLUDE__SPEC__RPI__PIC_H_
+#define _CORE__INCLUDE__SPEC__RPI__PIC_H_
 
 /* Genode includes */
 #include <util/mmio.h>
@@ -246,4 +246,4 @@ class Genode::Pic : Mmio
 
 namespace Kernel { class Pic : public Genode::Pic { }; }
 
-#endif /* _PIC_H_ */
+#endif /* _CORE__INCLUDE__SPEC__RPI__PIC_H_ */
diff --git a/repos/base-hw/src/core/include/spec/rpi/timer.h b/repos/base-hw/src/core/include/spec/rpi/timer.h
index 41473af2f..1d22037ae 100644
--- a/repos/base-hw/src/core/include/spec/rpi/timer.h
+++ b/repos/base-hw/src/core/include/spec/rpi/timer.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _TIMER_H_
-#define _TIMER_H_
+#ifndef _CORE__INCLUDE__SPEC__RPI__TIMER_H_
+#define _CORE__INCLUDE__SPEC__RPI__TIMER_H_
 
 /* Genode includes */
 #include <util/mmio.h>
@@ -65,4 +65,4 @@ class Genode::Timer : public Mmio
 
 namespace Kernel { class Timer : public Genode::Timer { }; }
 
-#endif /* _TIMER_H_ */
+#endif /* _CORE__INCLUDE__SPEC__RPI__TIMER_H_ */
diff --git a/repos/base-hw/src/core/include/spec/smp/kernel/lock.h b/repos/base-hw/src/core/include/spec/smp/kernel/lock.h
index de4942827..2e56f43be 100644
--- a/repos/base-hw/src/core/include/spec/smp/kernel/lock.h
+++ b/repos/base-hw/src/core/include/spec/smp/kernel/lock.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _KERNEL__LOCK_H_
-#define _KERNEL__LOCK_H_
+#ifndef _CORE__INCLUDE__KERNEL__LOCK_H_
+#define _CORE__INCLUDE__KERNEL__LOCK_H_
 
 /* Genode includes */
 #include <base/lock_guard.h>
@@ -60,4 +60,4 @@ class Kernel::Lock
 		typedef Genode::Lock_guard<Kernel::Lock> Guard;
 };
 
-#endif /* _KERNEL__LOCK_H_ */
+#endif /* _CORE__INCLUDE__KERNEL__LOCK_H_ */
diff --git a/repos/base-hw/src/core/include/spec/tl16c750/serial.h b/repos/base-hw/src/core/include/spec/tl16c750/serial.h
index 0805057ca..ecc572ff8 100644
--- a/repos/base-hw/src/core/include/spec/tl16c750/serial.h
+++ b/repos/base-hw/src/core/include/spec/tl16c750/serial.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _SERIAL_H_
-#define _SERIAL_H_
+#ifndef _CORE__INCLUDE__SPEC__TL16C750__SERIAL_H_
+#define _CORE__INCLUDE__SPEC__TL16C750__SERIAL_H_
 
 /* core includes */
 #include <board.h>
@@ -42,4 +42,4 @@ namespace Genode
 	};
 }
 
-#endif /* _SERIAL_H_ */
+#endif /* _CORE__INCLUDE__SPEC__TL16C750__SERIAL_H_ */
diff --git a/repos/base-hw/src/core/include/spec/usb_armory/csu_config.h b/repos/base-hw/src/core/include/spec/usb_armory/csu_config.h
index 27ed47303..5e148fc5e 100644
--- a/repos/base-hw/src/core/include/spec/usb_armory/csu_config.h
+++ b/repos/base-hw/src/core/include/spec/usb_armory/csu_config.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CSU_CONFIG_H_
-#define _CSU_CONFIG_H_
+#ifndef _CORE__INCLUDE__SPEC__USB_ARMORY__CSU_CONFIG_H_
+#define _CORE__INCLUDE__SPEC__USB_ARMORY__CSU_CONFIG_H_
 
 /**
  * Configuration of the Driver for the Central Security Unit
@@ -27,4 +27,4 @@ namespace Csu_config
 	};
 };
 
-#endif /* _CSU_CONFIG_H_ */
+#endif /* _CORE__INCLUDE__SPEC__USB_ARMORY__CSU_CONFIG_H_ */
diff --git a/repos/base-hw/src/core/include/spec/x86/board.h b/repos/base-hw/src/core/include/spec/x86/board.h
index bc2926b09..4d72305b5 100644
--- a/repos/base-hw/src/core/include/spec/x86/board.h
+++ b/repos/base-hw/src/core/include/spec/x86/board.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BOARD_H_
-#define _BOARD_H_
+#ifndef _CORE__INCLUDE__SPEC__X86__BOARD_H_
+#define _CORE__INCLUDE__SPEC__X86__BOARD_H_
 
 namespace Genode
 {
@@ -34,4 +34,4 @@ namespace Genode
 	};
 }
 
-#endif /* _BOARD_H_ */
+#endif /* _CORE__INCLUDE__SPEC__X86__BOARD_H_ */
diff --git a/repos/base-hw/src/core/include/spec/x86/cpu_support.h b/repos/base-hw/src/core/include/spec/x86/cpu_support.h
index cc9d0ac74..f42086795 100644
--- a/repos/base-hw/src/core/include/spec/x86/cpu_support.h
+++ b/repos/base-hw/src/core/include/spec/x86/cpu_support.h
@@ -13,8 +13,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _SPEC__X86__CPU_SUPPORT_H_
-#define _SPEC__X86__CPU_SUPPORT_H_
+#ifndef _CORE__INCLUDE__SPEC__X86__CPU_SUPPORT_H_
+#define _CORE__INCLUDE__SPEC__X86__CPU_SUPPORT_H_
 
 /* Genode includes */
 #include <util/register.h>
@@ -255,4 +255,4 @@ struct Genode::Cpu::Cr4 : Register<64>
 	}
 };
 
-#endif /* _SPEC__X86__CPU_SUPPORT_H_ */
+#endif /* _CORE__INCLUDE__SPEC__X86__CPU_SUPPORT_H_ */
diff --git a/repos/base-hw/src/core/include/spec/x86/pic.h b/repos/base-hw/src/core/include/spec/x86/pic.h
index 50d7b2a82..14b3ea42c 100644
--- a/repos/base-hw/src/core/include/spec/x86/pic.h
+++ b/repos/base-hw/src/core/include/spec/x86/pic.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _PIC_H_
-#define _PIC_H_
+#ifndef _CORE__INCLUDE__SPEC__X86__PIC_H_
+#define _CORE__INCLUDE__SPEC__X86__PIC_H_
 
 /* Genode includes */
 #include <util/mmio.h>
@@ -280,4 +280,4 @@ class Genode::Pic : public Mmio
 
 namespace Kernel { class Pic : public Genode::Pic { }; }
 
-#endif /* _PIC_H_ */
+#endif /* _CORE__INCLUDE__SPEC__X86__PIC_H_ */
diff --git a/repos/base-hw/src/core/include/spec/x86/port_io.h b/repos/base-hw/src/core/include/spec/x86/port_io.h
index d16478435..7e103ec24 100644
--- a/repos/base-hw/src/core/include/spec/x86/port_io.h
+++ b/repos/base-hw/src/core/include/spec/x86/port_io.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _PORT_IO_H_
-#define _PORT_IO_H_
+#ifndef _CORE__INCLUDE__SPEC__X86__PORT_IO_H_
+#define _CORE__INCLUDE__SPEC__X86__PORT_IO_H_
 
 #include <base/stdint.h>
 
@@ -37,4 +37,4 @@ namespace Genode
 	}
 }
 
-#endif /* _PORT_IO_H_ */
+#endif /* _CORE__INCLUDE__SPEC__X86__PORT_IO_H_ */
diff --git a/repos/base-hw/src/core/include/spec/x86/timer.h b/repos/base-hw/src/core/include/spec/x86/timer.h
index 5d720effe..9c5884dbe 100644
--- a/repos/base-hw/src/core/include/spec/x86/timer.h
+++ b/repos/base-hw/src/core/include/spec/x86/timer.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _TIMER_H_
-#define _TIMER_H_
+#ifndef _CORE__INCLUDE__SPEC__X86__TIMER_H_
+#define _CORE__INCLUDE__SPEC__X86__TIMER_H_
 
 /* Genode includes */
 #include <util/mmio.h>
@@ -136,4 +136,4 @@ class Genode::Timer : public Mmio
 
 namespace Kernel { class Timer : public Genode::Timer { }; }
 
-#endif /* _TIMER_H_ */
+#endif /* _CORE__INCLUDE__SPEC__X86__TIMER_H_ */
diff --git a/repos/base-hw/src/core/include/spec/x86_64/cpu.h b/repos/base-hw/src/core/include/spec/x86_64/cpu.h
index 3a43e074c..ed4328e1a 100644
--- a/repos/base-hw/src/core/include/spec/x86_64/cpu.h
+++ b/repos/base-hw/src/core/include/spec/x86_64/cpu.h
@@ -11,12 +11,12 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CPU_H_
-#define _CPU_H_
+#ifndef _CORE__INCLUDE__SPEC__X86_64__CPU_H_
+#define _CORE__INCLUDE__SPEC__X86_64__CPU_H_
 
 /* core includes */
 #include <spec/x86/cpu_support.h>
 
 namespace Genode { typedef __uint128_t sizet_arithm_t; }
 
-#endif /* _CPU_H_ */
+#endif /* _CORE__INCLUDE__SPEC__X86_64__CPU_H_ */
diff --git a/repos/base-hw/src/core/include/spec/x86_64/gdt.h b/repos/base-hw/src/core/include/spec/x86_64/gdt.h
index 06f175dee..5b3278feb 100644
--- a/repos/base-hw/src/core/include/spec/x86_64/gdt.h
+++ b/repos/base-hw/src/core/include/spec/x86_64/gdt.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _GDT_H_
-#define _GDT_H_
+#ifndef _CORE__INCLUDE__SPEC__X86_64__GDT_H_
+#define _CORE__INCLUDE__SPEC__X86_64__GDT_H_
 
 /* core includes */
 #include <pseudo_descriptor.h>
@@ -48,4 +48,4 @@ class Genode::Gdt
 		}
 };
 
-#endif /* _GDT_H_ */
+#endif /* _CORE__INCLUDE__SPEC__X86_64__GDT_H_ */
diff --git a/repos/base-hw/src/core/include/spec/x86_64/idt.h b/repos/base-hw/src/core/include/spec/x86_64/idt.h
index dd4435504..da1358498 100644
--- a/repos/base-hw/src/core/include/spec/x86_64/idt.h
+++ b/repos/base-hw/src/core/include/spec/x86_64/idt.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _IDT_H_
-#define _IDT_H_
+#ifndef _CORE__INCLUDE__SPEC__X86_64__IDT_H_
+#define _CORE__INCLUDE__SPEC__X86_64__IDT_H_
 
 #include <base/stdint.h>
 
@@ -70,4 +70,4 @@ class Genode::Idt
 		void load(addr_t const virt_base);
 };
 
-#endif /* _IDT_H_ */
+#endif /* _CORE__INCLUDE__SPEC__X86_64__IDT_H_ */
diff --git a/repos/base-hw/src/core/include/spec/x86_64/mtc_util.h b/repos/base-hw/src/core/include/spec/x86_64/mtc_util.h
index 69445aea3..7303fd7eb 100644
--- a/repos/base-hw/src/core/include/spec/x86_64/mtc_util.h
+++ b/repos/base-hw/src/core/include/spec/x86_64/mtc_util.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _MTC_UTIL_H_
-#define _MTC_UTIL_H_
+#ifndef _CORE__INCLUDE__SPEC__X86_64__MTC_UTIL_H_
+#define _CORE__INCLUDE__SPEC__X86_64__MTC_UTIL_H_
 
 #include <base/stdint.h>
 
@@ -33,4 +33,4 @@ namespace Genode
 	}
 }
 
-#endif /* _MTC_UTIL_H_ */
+#endif /* _CORE__INCLUDE__SPEC__X86_64__MTC_UTIL_H_ */
diff --git a/repos/base-hw/src/core/include/spec/x86_64/muen/pic.h b/repos/base-hw/src/core/include/spec/x86_64/muen/pic.h
index a3f5a79f1..c0b172195 100644
--- a/repos/base-hw/src/core/include/spec/x86_64/muen/pic.h
+++ b/repos/base-hw/src/core/include/spec/x86_64/muen/pic.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _PIC_H_
-#define _PIC_H_
+#ifndef _CORE__INCLUDE__SPEC__X86_64__MUEN__PIC_H_
+#define _CORE__INCLUDE__SPEC__X86_64__MUEN__PIC_H_
 
 namespace Genode
 {
@@ -72,4 +72,4 @@ class Genode::Pic
 
 namespace Kernel { class Pic : public Genode::Pic { }; }
 
-#endif /* _PIC_H_ */
+#endif /* _CORE__INCLUDE__SPEC__X86_64__MUEN__PIC_H_ */
diff --git a/repos/base-hw/src/core/include/spec/x86_64/muen/serial.h b/repos/base-hw/src/core/include/spec/x86_64/muen/serial.h
index 231a2a461..7e42cc678 100644
--- a/repos/base-hw/src/core/include/spec/x86_64/muen/serial.h
+++ b/repos/base-hw/src/core/include/spec/x86_64/muen/serial.h
@@ -12,7 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#pragma once
+#ifndef _CORE__INCLUDE__SPEC__X86_64__MUEN__SERIAL_H_
+#define _CORE__INCLUDE__SPEC__X86_64__MUEN__SERIAL_H_
 
 /* Genode includes */
 #include <drivers/uart_base.h>
@@ -38,3 +39,5 @@ class Genode::Serial : public X86_uart_base
 			X86_uart_base(COM1_PORT, CLOCK_UNUSED, baud_rate)
 		{ }
 };
+
+#endif /* _CORE__INCLUDE__SPEC__X86_64__MUEN__SERIAL_H_ */
diff --git a/repos/base-hw/src/core/include/spec/x86_64/muen/sinfo.h b/repos/base-hw/src/core/include/spec/x86_64/muen/sinfo.h
index 4e9002999..b922f50fb 100644
--- a/repos/base-hw/src/core/include/spec/x86_64/muen/sinfo.h
+++ b/repos/base-hw/src/core/include/spec/x86_64/muen/sinfo.h
@@ -14,8 +14,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _SINFO_H
-#define _SINFO_H
+#ifndef _CORE__INCLUDE__SPEC__X86_64__MUEN__SINFO_H_
+#define _CORE__INCLUDE__SPEC__X86_64__MUEN__SINFO_H_
 
 #include <base/stdint.h>
 
@@ -152,4 +152,4 @@ class Genode::Sinfo
 		static uint64_t get_sched_end(void);
 };
 
-#endif /* _SINFO_H */
+#endif /* _CORE__INCLUDE__SPEC__X86_64__MUEN__SINFO_H_ */
diff --git a/repos/base-hw/src/core/include/spec/x86_64/muen/timer.h b/repos/base-hw/src/core/include/spec/x86_64/muen/timer.h
index 457d5dcd1..cb375a1b0 100644
--- a/repos/base-hw/src/core/include/spec/x86_64/muen/timer.h
+++ b/repos/base-hw/src/core/include/spec/x86_64/muen/timer.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _TIMER_H_
-#define _TIMER_H_
+#ifndef _CORE__INCLUDE__SPEC__X86_64__MUEN__TIMER_H_
+#define _CORE__INCLUDE__SPEC__X86_64__MUEN__TIMER_H_
 
 #include <base/printf.h>
 
@@ -104,4 +104,4 @@ class Genode::Timer
 
 namespace Kernel { class Timer : public Genode::Timer { }; }
 
-#endif /* _TIMER_H_ */
+#endif /* _CORE__INCLUDE__SPEC__X86_64__MUEN__TIMER_H_ */
diff --git a/repos/base-hw/src/core/include/spec/x86_64/pseudo_descriptor.h b/repos/base-hw/src/core/include/spec/x86_64/pseudo_descriptor.h
index 16087e911..17ac2da47 100644
--- a/repos/base-hw/src/core/include/spec/x86_64/pseudo_descriptor.h
+++ b/repos/base-hw/src/core/include/spec/x86_64/pseudo_descriptor.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _PSEUDO_DESCRIPTOR_H_
-#define _PSEUDO_DESCRIPTOR_H_
+#ifndef _CORE__INCLUDE__SPEC__X86_64__PSEUDO_DESCRIPTOR_H_
+#define _CORE__INCLUDE__SPEC__X86_64__PSEUDO_DESCRIPTOR_H_
 
 #include <base/stdint.h>
 
@@ -36,4 +36,4 @@ class Genode::Pseudo_descriptor
 		Pseudo_descriptor(uint16_t l, uint64_t b) : _limit(l), _base (b) { };
 } __attribute__((packed));
 
-#endif /* _PSEUDO_DESCRIPTOR_H_ */
+#endif /* _CORE__INCLUDE__SPEC__X86_64__PSEUDO_DESCRIPTOR_H_ */
diff --git a/repos/base-hw/src/core/include/spec/x86_64/serial.h b/repos/base-hw/src/core/include/spec/x86_64/serial.h
index c749469e9..fdaed5b0b 100644
--- a/repos/base-hw/src/core/include/spec/x86_64/serial.h
+++ b/repos/base-hw/src/core/include/spec/x86_64/serial.h
@@ -11,7 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#pragma once
+#ifndef _CORE__INCLUDE__SPEC__X86_64__SERIAL_H_
+#define _CORE__INCLUDE__SPEC__X86_64__SERIAL_H_
 
 /* Genode includes */
 #include <bios_data_area.h>
@@ -36,3 +37,5 @@ class Genode::Serial : public X86_uart_base
 			              CLOCK_UNUSED, baud_rate)
 		{ }
 };
+
+#endif /* _CORE__INCLUDE__SPEC__X86_64__SERIAL_H_ */
diff --git a/repos/base-hw/src/core/include/spec/x86_64/translation_table.h b/repos/base-hw/src/core/include/spec/x86_64/translation_table.h
index 144b30ea0..13a76ea5d 100644
--- a/repos/base-hw/src/core/include/spec/x86_64/translation_table.h
+++ b/repos/base-hw/src/core/include/spec/x86_64/translation_table.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _TRANSLATION_TABLE_H_
-#define _TRANSLATION_TABLE_H_
+#ifndef _CORE__INCLUDE__SPEC__X86_64__TRANSLATION_TABLE_H_
+#define _CORE__INCLUDE__SPEC__X86_64__TRANSLATION_TABLE_H_
 
 /* Genode includes */
 #include <util/misc_math.h>
@@ -718,4 +718,4 @@ class Genode::Translation_table : public Pml4_table
 		};
 };
 
-#endif /* _TRANSLATION_TABLE_H_ */
+#endif /* _CORE__INCLUDE__SPEC__X86_64__TRANSLATION_TABLE_H_ */
diff --git a/repos/base-hw/src/core/include/spec/x86_64/tss.h b/repos/base-hw/src/core/include/spec/x86_64/tss.h
index 9924eb09e..0f2f92f26 100644
--- a/repos/base-hw/src/core/include/spec/x86_64/tss.h
+++ b/repos/base-hw/src/core/include/spec/x86_64/tss.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _TSS_H_
-#define _TSS_H_
+#ifndef _CORE__INCLUDE__SPEC__X86_64__TSS_H_
+#define _CORE__INCLUDE__SPEC__X86_64__TSS_H_
 
 #include <base/stdint.h>
 
@@ -61,4 +61,4 @@ class Genode::Tss
 
 }__attribute__((packed));
 
-#endif /* _TSS_H_ */
+#endif /* _CORE__INCLUDE__SPEC__X86_64__TSS_H_ */
diff --git a/repos/base-hw/src/core/include/spec/xilinx/serial.h b/repos/base-hw/src/core/include/spec/xilinx/serial.h
index 09cfc8c72..9172c5d62 100644
--- a/repos/base-hw/src/core/include/spec/xilinx/serial.h
+++ b/repos/base-hw/src/core/include/spec/xilinx/serial.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _SERIAL_H_
-#define _SERIAL_H_
+#ifndef _CORE__INCLUDE__SPEC__XILINX__SERIAL_H_
+#define _CORE__INCLUDE__SPEC__XILINX__SERIAL_H_
 
 /* core includes */
 #include <board.h>
@@ -41,4 +41,4 @@ class Genode::Serial : public Xilinx_uartps_base
 		{ }
 };
 
-#endif /* _SERIAL_H_ */
+#endif /* _CORE__INCLUDE__SPEC__XILINX__SERIAL_H_ */
diff --git a/repos/base-hw/src/core/include/spec/zynq/board.h b/repos/base-hw/src/core/include/spec/zynq/board.h
index 9b615430b..8227af014 100644
--- a/repos/base-hw/src/core/include/spec/zynq/board.h
+++ b/repos/base-hw/src/core/include/spec/zynq/board.h
@@ -13,8 +13,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BOARD_H_
-#define _BOARD_H_
+#ifndef _CORE__INCLUDE__SPEC__ZYNQ__BOARD_H_
+#define _CORE__INCLUDE__SPEC__ZYNQ__BOARD_H_
 
 /* core includes */
 #include <spec/cortex_a9/board_support.h>
@@ -24,4 +24,4 @@ namespace Genode
 	using Board = Cortex_a9::Board;
 }
 
-#endif /* _BOARD_H_ */
+#endif /* _CORE__INCLUDE__SPEC__ZYNQ__BOARD_H_ */
diff --git a/repos/base-hw/src/core/include/util.h b/repos/base-hw/src/core/include/util.h
index 5bdc53d6f..3f510860e 100644
--- a/repos/base-hw/src/core/include/util.h
+++ b/repos/base-hw/src/core/include/util.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _UTIL_H_
-#define _UTIL_H_
+#ifndef _CORE__INCLUDE__UTIL_H_
+#define _CORE__INCLUDE__UTIL_H_
 
 /* Genode includes */
 #include <rm_session/rm_session.h>
@@ -129,4 +129,4 @@ void Genode::print_page_fault(char const * const fault_msg,
 	}
 }
 
-#endif /* _UTIL_H_ */
+#endif /* _CORE__INCLUDE__UTIL_H_ */
diff --git a/repos/base-hw/src/core/spec/x86_64/muen/musinfo.h b/repos/base-hw/src/core/spec/x86_64/muen/musinfo.h
index c7d215cad..78490c7cb 100644
--- a/repos/base-hw/src/core/spec/x86_64/muen/musinfo.h
+++ b/repos/base-hw/src/core/spec/x86_64/muen/musinfo.h
@@ -1,5 +1,18 @@
-#ifndef MUSINFO_H_
-#define MUSINFO_H_
+/*
+ * \brief   Muen subject info
+ * \author  Stefan Kalkowski
+ * \date    2015-06-02
+ */
+
+/*
+ * Copyright (C) 2015 Genode Labs GmbH
+ *
+ * This file is part of the Genode OS framework, which is distributed
+ * under the terms of the GNU General Public License version 2.
+ */
+
+#ifndef _CORE__SPEC__X86_64__MUEN__MUSINFO_H_
+#define _CORE__SPEC__X86_64__MUEN__MUSINFO_H_
 
 #include <base/stdint.h>
 
@@ -69,4 +82,4 @@ struct subject_info_type {
 	struct dev_info_type dev_info[MAX_RESOURCE_COUNT];
 } __attribute__((packed, aligned (8)));
 
-#endif /* MUSINFO_H_  */
+#endif /* _CORE__SPEC__X86_64__MUEN__MUSINFO_H_ */
diff --git a/repos/base-hw/src/include/base/internal/lock_helper.h b/repos/base-hw/src/include/base/internal/lock_helper.h
index b76dcb79b..752f51395 100644
--- a/repos/base-hw/src/include/base/internal/lock_helper.h
+++ b/repos/base-hw/src/include/base/internal/lock_helper.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _LOCK_HELPER_H_
-#define _LOCK_HELPER_H_
+#ifndef _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_
+#define _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_
 
 /* Genode includes */
 #include <base/native_types.h>
@@ -64,5 +64,4 @@ thread_check_stopped_and_restart(Genode::Thread_base * const t)
 static inline void thread_stop_myself() { Kernel::pause_current_thread(); }
 
 
-#endif /* _LOCK_HELPER_H_ */
-
+#endif /* _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_ */
diff --git a/repos/base-hw/src/include/startup/internal/_main_parent_cap.h b/repos/base-hw/src/include/startup/internal/_main_parent_cap.h
index 1872439e8..2c8ac855c 100644
--- a/repos/base-hw/src/include/startup/internal/_main_parent_cap.h
+++ b/repos/base-hw/src/include/startup/internal/_main_parent_cap.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _LIB__STARTUP___MAIN_PARENT_CAP_H_
-#define _LIB__STARTUP___MAIN_PARENT_CAP_H_
+#ifndef _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_
+#define _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_
 
 /* Genode includes */
 #include <parent/capability.h>
@@ -33,4 +33,4 @@ namespace Genode {
 	}
 }
 
-#endif /* _LIB__STARTUP___MAIN_PARENT_CAP_H_ */
+#endif /* _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_ */
diff --git a/repos/base-linux/include/base/local_capability.h b/repos/base-linux/include/base/local_capability.h
index f27399603..9fa5b63d5 100644
--- a/repos/base-linux/include/base/local_capability.h
+++ b/repos/base-linux/include/base/local_capability.h
@@ -14,8 +14,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE_LINUX__CAPABILITY_H_
-#define _INCLUDE__BASE_LINUX__CAPABILITY_H_
+#ifndef _INCLUDE__BASE__LOCAL_CAPABILITY_H_
+#define _INCLUDE__BASE__LOCAL_CAPABILITY_H_
 
 #include <base/capability.h>
 
@@ -57,4 +57,4 @@ class Genode::Local_capability
 			return reinterpret_cast<RPC_INTERFACE*>(c.local_name()); }
 };
 
-#endif /* _INCLUDE__BASE_LINUX__CAPABILITY_H_ */
+#endif /* _INCLUDE__BASE__LOCAL_CAPABILITY_H_ */
diff --git a/repos/base-linux/include/linux_native_pd/client.h b/repos/base-linux/include/linux_native_pd/client.h
index 87490685c..450d303fc 100644
--- a/repos/base-linux/include/linux_native_pd/client.h
+++ b/repos/base-linux/include/linux_native_pd/client.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__LINUX_PD_SESSION__CLIENT_H_
-#define _INCLUDE__LINUX_PD_SESSION__CLIENT_H_
+#ifndef _INCLUDE__LINUX_NATIVE_PD__CLIENT_H_
+#define _INCLUDE__LINUX_NATIVE_PD__CLIENT_H_
 
 #include <linux_native_pd/linux_native_pd.h>
 #include <base/rpc_client.h>
@@ -28,4 +28,4 @@ struct Genode::Linux_native_pd_client : Rpc_client<Linux_native_pd>
 		call<Rpc_start>(binary); }
 };
 
-#endif /* _INCLUDE__LINUX_PD_SESSION__CLIENT_H_ */
+#endif /* _INCLUDE__LINUX_NATIVE_PD__CLIENT_H_ */
diff --git a/repos/base-linux/include/linux_native_pd/linux_native_pd.h b/repos/base-linux/include/linux_native_pd/linux_native_pd.h
index 1a574ff14..ba287d72d 100644
--- a/repos/base-linux/include/linux_native_pd/linux_native_pd.h
+++ b/repos/base-linux/include/linux_native_pd/linux_native_pd.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__LINUX_NATIVE_PD__LINUX_NATIVE_PD_
-#define _INCLUDE__LINUX_NATIVE_PD__LINUX_NATIVE_PD_
+#ifndef _INCLUDE__LINUX_NATIVE_PD__LINUX_NATIVE_PD_H_
+#define _INCLUDE__LINUX_NATIVE_PD__LINUX_NATIVE_PD_H_
 
 #include <pd_session/pd_session.h>
 #include <dataspace/dataspace.h>
@@ -28,4 +28,4 @@ struct Genode::Linux_native_pd : Pd_session::Native_pd
 	GENODE_RPC_INTERFACE(Rpc_start);
 };
 
-#endif /* _INCLUDE__LINUX_NATIVE_PD__LINUX_NATIVE_PD_ */
+#endif /* _INCLUDE__LINUX_NATIVE_PD__LINUX_NATIVE_PD_H_ */
diff --git a/repos/base-linux/src/core/include/dataspace_component.h b/repos/base-linux/src/core/include/dataspace_component.h
index 41cc18146..c0c26c448 100644
--- a/repos/base-linux/src/core/include/dataspace_component.h
+++ b/repos/base-linux/src/core/include/dataspace_component.h
@@ -16,8 +16,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CORE__INCLUDE__LINUX__DATASPACE_COMPONENT_H_
-#define _CORE__INCLUDE__LINUX__DATASPACE_COMPONENT_H_
+#ifndef _CORE__INCLUDE__DATASPACE_COMPONENT_H_
+#define _CORE__INCLUDE__DATASPACE_COMPONENT_H_
 
 #include <linux_dataspace/linux_dataspace.h>
 #include <util/string.h>
@@ -129,4 +129,4 @@ namespace Genode {
 	};
 }
 
-#endif /* _CORE__INCLUDE__LINUX__DATASPACE_COMPONENT_H_ */
+#endif /* _CORE__INCLUDE__DATASPACE_COMPONENT_H_ */
diff --git a/repos/base-linux/src/core/include/io_mem_session_component.h b/repos/base-linux/src/core/include/io_mem_session_component.h
index 540b7a2fe..95d9085ba 100644
--- a/repos/base-linux/src/core/include/io_mem_session_component.h
+++ b/repos/base-linux/src/core/include/io_mem_session_component.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CORE__INCLUDE__LINUX__IO_MEM_SESSION_COMPONENT_H_
-#define _CORE__INCLUDE__LINUX__IO_MEM_SESSION_COMPONENT_H_
+#ifndef _CORE__INCLUDE__IO_MEM_SESSION_COMPONENT_H_
+#define _CORE__INCLUDE__IO_MEM_SESSION_COMPONENT_H_
 
 /* Genode includes */
 #include <base/allocator.h>
@@ -61,4 +61,4 @@ namespace Genode {
 	};
 }
 
-#endif /* _CORE__INCLUDE__LINUX__IO_MEM_SESSION_COMPONENT_H_ */
+#endif /* _CORE__INCLUDE__IO_MEM_SESSION_COMPONENT_H_ */
diff --git a/repos/base-linux/src/core/include/irq_session_component.h b/repos/base-linux/src/core/include/irq_session_component.h
index c7f5c00f1..9d6229d73 100644
--- a/repos/base-linux/src/core/include/irq_session_component.h
+++ b/repos/base-linux/src/core/include/irq_session_component.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CORE__INCLUDE__LINUX__IRQ_SESSION_COMPONENT_H_
-#define _CORE__INCLUDE__LINUX__IRQ_SESSION_COMPONENT_H_
+#ifndef _CORE__INCLUDE__IRQ_SESSION_COMPONENT_H_
+#define _CORE__INCLUDE__IRQ_SESSION_COMPONENT_H_
 
 #include <util/list.h>
 #include <base/rpc_server.h>
@@ -51,4 +51,4 @@ class Genode::Irq_session_component : public Rpc_object<Irq_session>,
 			return { .type = Genode::Irq_session::Info::Type::INVALID }; }
 };
 
-#endif /* _CORE__INCLUDE__LINUX__IRQ_SESSION_COMPONENT_H_ */
+#endif /* _CORE__INCLUDE__IRQ_SESSION_COMPONENT_H_ */
diff --git a/repos/base-linux/src/core/include/platform.h b/repos/base-linux/src/core/include/platform.h
index 4dac77cd0..e3b925bf3 100644
--- a/repos/base-linux/src/core/include/platform.h
+++ b/repos/base-linux/src/core/include/platform.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CORE__INCLUDE__LINUX__PLATFORM_H_
-#define _CORE__INCLUDE__LINUX__PLATFORM_H_
+#ifndef _CORE__INCLUDE__PLATFORM_H_
+#define _CORE__INCLUDE__PLATFORM_H_
 
 #include <base/allocator_avl.h>
 #include <base/lock_guard.h>
diff --git a/repos/base-linux/src/core/include/platform_pd.h b/repos/base-linux/src/core/include/platform_pd.h
index 8415b3dbe..9a05be50e 100644
--- a/repos/base-linux/src/core/include/platform_pd.h
+++ b/repos/base-linux/src/core/include/platform_pd.h
@@ -13,8 +13,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CORE__INCLUDE__LINUX__PLATFORM_PD_H_
-#define _CORE__INCLUDE__LINUX__PLATFORM_PD_H_
+#ifndef _CORE__INCLUDE__PLATFORM_PD_H_
+#define _CORE__INCLUDE__PLATFORM_PD_H_
 
 #include <base/allocator.h>
 
@@ -22,4 +22,4 @@ namespace Genode { struct Platform_pd; }
 
 struct Genode::Platform_pd { Platform_pd(Allocator *, char const *) { } };
 
-#endif /* _CORE__INCLUDE__LINUX__PLATFORM_PD_H_ */
+#endif /* _CORE__INCLUDE__PLATFORM_PD_H_ */
diff --git a/repos/base-linux/src/core/include/platform_thread.h b/repos/base-linux/src/core/include/platform_thread.h
index a0fb69608..cff5dc66a 100644
--- a/repos/base-linux/src/core/include/platform_thread.h
+++ b/repos/base-linux/src/core/include/platform_thread.h
@@ -13,8 +13,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CORE__INCLUDE__LINUX__PLATFORM_THREAD_H_
-#define _CORE__INCLUDE__LINUX__PLATFORM_THREAD_H_
+#ifndef _CORE__INCLUDE__PLATFORM_THREAD_H_
+#define _CORE__INCLUDE__PLATFORM_THREAD_H_
 
 /* Genode includes */
 #include <base/thread_state.h>
@@ -169,4 +169,4 @@ namespace Genode {
 	};
 }
 
-#endif /* _CORE__INCLUDE__LINUX__PLATFORM_THREAD_H_ */
+#endif /* _CORE__INCLUDE__PLATFORM_THREAD_H_ */
diff --git a/repos/base-linux/src/core/include/resource_path.h b/repos/base-linux/src/core/include/resource_path.h
index bbebf06c4..0cd15683c 100644
--- a/repos/base-linux/src/core/include/resource_path.h
+++ b/repos/base-linux/src/core/include/resource_path.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CORE__INCLUDE__RPATH_H_
-#define _CORE__INCLUDE__RPATH_H_
+#ifndef _CORE__INCLUDE__RESOURCE_PATH_H_
+#define _CORE__INCLUDE__RESOURCE_PATH_H_
 
 /* Linux syscall bindings */
 #include <linux_syscalls.h>
@@ -41,4 +41,4 @@ static inline char const *resource_path()
 	return path.string;
 }
 
-#endif /* _CORE__INCLUDE__RPATH_H_ */
+#endif /* _CORE__INCLUDE__RESOURCE_PATH_H_ */
diff --git a/repos/base-linux/src/core/include/rm_session_component.h b/repos/base-linux/src/core/include/rm_session_component.h
index 2e92f5812..09479ae61 100644
--- a/repos/base-linux/src/core/include/rm_session_component.h
+++ b/repos/base-linux/src/core/include/rm_session_component.h
@@ -13,8 +13,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CORE__INCLUDE__LINUX__RM_SESSION_COMPONENT_H_
-#define _CORE__INCLUDE__LINUX__RM_SESSION_COMPONENT_H_
+#ifndef _CORE__INCLUDE__RM_SESSION_COMPONENT_H_
+#define _CORE__INCLUDE__RM_SESSION_COMPONENT_H_
 
 /* Genode includes */
 #include <base/allocator.h>
@@ -75,4 +75,4 @@ namespace Genode {
 	struct Rm_client : Pager_object, Rm_member { };
 }
 
-#endif /* _CORE__INCLUDE__LINUX__RM_SESSION_COMPONENT_H_ */
+#endif /* _CORE__INCLUDE__RM_SESSION_COMPONENT_H_ */
diff --git a/repos/base-linux/src/include/base/internal/context_area.h b/repos/base-linux/src/include/base/internal/context_area.h
index aa2e3c2dd..c0e363026 100644
--- a/repos/base-linux/src/include/base/internal/context_area.h
+++ b/repos/base-linux/src/include/base/internal/context_area.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BASE__ENV__CONTEXT_AREA_H_
-#define _BASE__ENV__CONTEXT_AREA_H_
+#ifndef _INCLUDE__BASE__INTERNAL__CONTEXT_AREA_H_
+#define _INCLUDE__BASE__INTERNAL__CONTEXT_AREA_H_
 
 /* Genode includes */
 #include <base/thread.h>
@@ -61,4 +61,4 @@ static inline Genode::addr_t reserve_context_area()
 	return (addr_t) addr_out;
 }
 
-#endif /* _BASE__ENV__CONTEXT_AREA_H_ */
+#endif /* _INCLUDE__BASE__INTERNAL__CONTEXT_AREA_H_ */
diff --git a/repos/base-linux/src/include/base/internal/core_console.h b/repos/base-linux/src/include/base/internal/core_console.h
index 581212014..9ce049c6b 100644
--- a/repos/base-linux/src/include/base/internal/core_console.h
+++ b/repos/base-linux/src/include/base/internal/core_console.h
@@ -13,6 +13,9 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+#ifndef _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_
+#define _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_
+
 /* Genode includes */
 #include <base/console.h>
 
@@ -29,3 +32,4 @@ namespace Genode {
 	};
 }
 
+#endif /* _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_ */
diff --git a/repos/base-linux/src/include/base/internal/lock_helper.h b/repos/base-linux/src/include/base/internal/lock_helper.h
index 5496e2fac..64398a5f6 100644
--- a/repos/base-linux/src/include/base/internal/lock_helper.h
+++ b/repos/base-linux/src/include/base/internal/lock_helper.h
@@ -17,6 +17,9 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+#ifndef _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_
+#define _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_
+
 /* Genode includes */
 #include <base/native_types.h>
 #include <base/thread.h>
@@ -63,3 +66,5 @@ static inline void thread_stop_myself()
 	                               &main_thread_futex_counter;
 	lx_futex(futex_counter_ptr, LX_FUTEX_WAIT, 0);
 }
+
+#endif /* _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_ */
diff --git a/repos/base-linux/src/include/base/internal/platform_env.h b/repos/base-linux/src/include/base/internal/platform_env.h
index 3678e0da2..7afc2eb3f 100644
--- a/repos/base-linux/src/include/base/internal/platform_env.h
+++ b/repos/base-linux/src/include/base/internal/platform_env.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _PLATFORM_ENV_H_
-#define _PLATFORM_ENV_H_
+#ifndef _INCLUDE__BASE__INTERNAL__PLATFORM_ENV_H_
+#define _INCLUDE__BASE__INTERNAL__PLATFORM_ENV_H_
 
 /* Linux includes */
 #include <unistd.h>
@@ -459,4 +459,4 @@ namespace Genode {
 	};
 }
 
-#endif /* _PLATFORM_ENV_H_ */
+#endif /* _INCLUDE__BASE__INTERNAL__PLATFORM_ENV_H_ */
diff --git a/repos/base-linux/src/include/base/internal/socket_descriptor_registry.h b/repos/base-linux/src/include/base/internal/socket_descriptor_registry.h
index 04c378902..93613322a 100644
--- a/repos/base-linux/src/include/base/internal/socket_descriptor_registry.h
+++ b/repos/base-linux/src/include/base/internal/socket_descriptor_registry.h
@@ -17,8 +17,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BASE__IPC__SOCKET_DESCRIPTOR_REGISTRY_H_
-#define _BASE__IPC__SOCKET_DESCRIPTOR_REGISTRY_H_
+#ifndef _INCLUDE__BASE__INTERNAL__SOCKET_DESCRIPTOR_REGISTRY_H_
+#define _INCLUDE__BASE__INTERNAL__SOCKET_DESCRIPTOR_REGISTRY_H_
 
 #include <base/lock.h>
 
@@ -147,4 +147,4 @@ class Genode::Socket_descriptor_registry
 		}
 };
 
-#endif /* _BASE__IPC__SOCKET_DESCRIPTOR_REGISTRY_H_ */
+#endif /* _INCLUDE__BASE__INTERNAL__SOCKET_DESCRIPTOR_REGISTRY_H_ */
diff --git a/repos/base-nova/include/nova/stdint.h b/repos/base-nova/include/nova/stdint.h
index 14a17461c..e9a076b55 100644
--- a/repos/base-nova/include/nova/stdint.h
+++ b/repos/base-nova/include/nova/stdint.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _PLATFORM__NOVA_STDINT_H_
-#define _PLATFORM__NOVA_STDINT_H_
+#ifndef _INCLUDE__NOVA__STDINT_H_
+#define _INCLUDE__NOVA__STDINT_H_
 
 #include <base/fixed_stdint.h>
 
@@ -25,4 +25,4 @@ namespace Nova {
 	typedef Genode::uint64_t uint64_t;
 }
 
-#endif /* _PLATFORM__NOVA_STDINT_H_ */
+#endif /* _INCLUDE__NOVA__STDINT_H_ */
diff --git a/repos/base-nova/include/nova/syscall-generic.h b/repos/base-nova/include/nova/syscall-generic.h
index 711761933..2d4db229d 100644
--- a/repos/base-nova/include/nova/syscall-generic.h
+++ b/repos/base-nova/include/nova/syscall-generic.h
@@ -31,8 +31,8 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef _PLATFORM__NOVA_SYSCALLS_GENERIC_H_
-#define _PLATFORM__NOVA_SYSCALLS_GENERIC_H_
+#ifndef _INCLUDE__NOVA__SYSCALL_GENERIC_H_
+#define _INCLUDE__NOVA__SYSCALL_GENERIC_H_
 
 #include <nova/stdint.h>
 
@@ -679,4 +679,4 @@ namespace Nova {
 	};
 
 }
-#endif /* _PLATFORM__NOVA_SYSCALLS_GENERIC_H_ */
+#endif /* _INCLUDE__NOVA__SYSCALL_GENERIC_H_ */
diff --git a/repos/base-nova/include/nova/util.h b/repos/base-nova/include/nova/util.h
index 49df5fcfc..d3d61d1ef 100644
--- a/repos/base-nova/include/nova/util.h
+++ b/repos/base-nova/include/nova/util.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _NOVA__INCLUDE__UTIL_H_
-#define _NOVA__INCLUDE__UTIL_H_
+#ifndef _INCLUDE__NOVA__UTIL_H_
+#define _INCLUDE__NOVA__UTIL_H_
 
 #include <base/printf.h>
 #include <base/thread.h>
@@ -113,4 +113,4 @@ inline void delegate_vcpu_portals(Genode::Native_capability const &cap,
 	if (res)
 		PERR("setting exception portals for vCPU failed %u", res);
 }
-#endif /* _NOVA__INCLUDE__UTIL_H_ */
+#endif /* _INCLUDE__NOVA__UTIL_H_ */
diff --git a/repos/base-nova/include/nova_native_pd/client.h b/repos/base-nova/include/nova_native_pd/client.h
index 01ad4dc53..1b76cfbe7 100644
--- a/repos/base-nova/include/nova_native_pd/client.h
+++ b/repos/base-nova/include/nova_native_pd/client.h
@@ -37,4 +37,4 @@ struct Genode::Nova_native_pd_client : Rpc_client<Nova_native_pd>
 	}
 };
 
-#endif /* _INCLUDE__PD_SESSION__CLIENT_H_ */
+#endif /* _INCLUDE__NOVA_NATIVE_PD__CLIENT_H_ */
diff --git a/repos/base-nova/src/core/include/cpu_session_component.h b/repos/base-nova/src/core/include/cpu_session_component.h
index 21b45a287..47dae9a80 100644
--- a/repos/base-nova/src/core/include/cpu_session_component.h
+++ b/repos/base-nova/src/core/include/cpu_session_component.h
@@ -1,7 +1,7 @@
 /*
  * \brief  Core-specific instance of the CPU session/thread interfaces
  * \author Christian Helmuth
-   \author Norman Feske
+ * \author Norman Feske
  * \author Alexander Boettcher
  * \date   2006-07-17
  */
diff --git a/repos/base-nova/src/core/include/echo.h b/repos/base-nova/src/core/include/echo.h
index 00cb2628f..2e7416c18 100644
--- a/repos/base-nova/src/core/include/echo.h
+++ b/repos/base-nova/src/core/include/echo.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _ECHO_H_
-#define _ECHO_H_
+#ifndef _CORE__INCLUDE__ECHO_H_
+#define _CORE__INCLUDE__ECHO_H_
 
 /* NOVA includes */
 #include <nova/syscalls.h>
@@ -55,4 +55,4 @@ class Echo
  */
 Echo *echo();
 
-#endif /* _ECHO_H_ */
+#endif /* _CORE__INCLUDE__ECHO_H_ */
diff --git a/repos/base-nova/src/core/include/irq_object.h b/repos/base-nova/src/core/include/irq_object.h
index 1f9c21bd7..5c749ea43 100644
--- a/repos/base-nova/src/core/include/irq_object.h
+++ b/repos/base-nova/src/core/include/irq_object.h
@@ -10,7 +10,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#pragma once
+#ifndef _CORE__INCLUDE__IRQ_OBJECT_H_
+#define _CORE__INCLUDE__IRQ_OBJECT_H_
 
 namespace Genode { class Irq_object; }
 
@@ -42,3 +43,5 @@ class Genode::Irq_object
 
 		void start(unsigned irq, Genode::addr_t);
 };
+
+#endif /* _CORE__INCLUDE__IRQ_OBJECT_H_ */
diff --git a/repos/base-nova/src/core/include/nova_util.h b/repos/base-nova/src/core/include/nova_util.h
index 4683ca8ba..f1390af57 100644
--- a/repos/base-nova/src/core/include/nova_util.h
+++ b/repos/base-nova/src/core/include/nova_util.h
@@ -13,8 +13,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _NOVA_UTIL_H_
-#define _NOVA_UTIL_H_
+#ifndef _CORE__INCLUDE__NOVA_UTIL_H_
+#define _CORE__INCLUDE__NOVA_UTIL_H_
 
 /* Genode includes */
 #include <base/printf.h>
@@ -233,4 +233,4 @@ inline void unmap_local(Nova::Utcb *utcb, Genode::addr_t start,
 }
 
 
-#endif /* _NOVA_UTIL_H_ */
+#endif /* _CORE__INCLUDE__NOVA_UTIL_H_ */
diff --git a/repos/base-nova/src/include/base/internal/core_console.h b/repos/base-nova/src/include/base/internal/core_console.h
index 3747aefa4..096d93ee7 100644
--- a/repos/base-nova/src/include/base/internal/core_console.h
+++ b/repos/base-nova/src/include/base/internal/core_console.h
@@ -12,7 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#pragma once
+#ifndef _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_
+#define _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_
 
 /* Genode includes */
 #include <base/console.h>
@@ -43,3 +44,5 @@ class Genode::Core_console : public X86_uart_base, public Console
 			              CLOCK, BAUDRATE)
 		{ }
 };
+
+#endif /* _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_ */
diff --git a/repos/base-nova/src/include/base/internal/lock_helper.h b/repos/base-nova/src/include/base/internal/lock_helper.h
index 090848117..7e4f9f642 100644
--- a/repos/base-nova/src/include/base/internal/lock_helper.h
+++ b/repos/base-nova/src/include/base/internal/lock_helper.h
@@ -15,6 +15,9 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+#ifndef _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_
+#define _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_
+
 /* Genode includes */
 #include <base/native_types.h>
 #include <base/thread.h>
@@ -57,3 +60,5 @@ static inline void thread_stop_myself()
 	if (sm_ctrl(sem, SEMAPHORE_DOWNZERO))
 		nova_die();
 }
+
+#endif /* _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_ */
diff --git a/repos/base-nova/src/include/base/internal/spin_lock.h b/repos/base-nova/src/include/base/internal/spin_lock.h
index a991dbd8c..d387a2bc8 100644
--- a/repos/base-nova/src/include/base/internal/spin_lock.h
+++ b/repos/base-nova/src/include/base/internal/spin_lock.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__LOCK__SPIN_H_
-#define _INCLUDE__BASE__LOCK__SPIN_H_
+#ifndef _INCLUDE__BASE__INTERNAL__SPIN_LOCK_H_
+#define _INCLUDE__BASE__INTERNAL__SPIN_LOCK_H_
 
 /* Genode includes */
 #include <cpu/atomic.h>
@@ -101,4 +101,4 @@ static inline void spinlock_unlock(volatile T *lock_variable)
 		Nova::ec_ctrl(Nova::EC_RESCHEDULE);
 }
 
-#endif /* _INCLUDE__BASE__LOCK__SPIN_H_ */
+#endif /* _INCLUDE__BASE__INTERNAL__SPIN_LOCK_H_ */
diff --git a/repos/base-nova/src/include/startup/internal/_main_parent_cap.h b/repos/base-nova/src/include/startup/internal/_main_parent_cap.h
index 27828f78b..d6414f610 100644
--- a/repos/base-nova/src/include/startup/internal/_main_parent_cap.h
+++ b/repos/base-nova/src/include/startup/internal/_main_parent_cap.h
@@ -15,8 +15,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _LIB__STARTUP___MAIN_PARENT_CAP_H_
-#define _LIB__STARTUP___MAIN_PARENT_CAP_H_
+#ifndef _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_
+#define _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_
 
 /* Genode includes */
 #include <util/string.h>
@@ -37,4 +37,4 @@ namespace Genode {
 	}
 }
 
-#endif /* _LIB__STARTUP___MAIN_PARENT_CAP_H_ */
+#endif /* _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_ */
diff --git a/repos/base-okl4/src/include/base/internal/core_console.h b/repos/base-okl4/src/include/base/internal/core_console.h
index 67cea7d82..166840e20 100644
--- a/repos/base-okl4/src/include/base/internal/core_console.h
+++ b/repos/base-okl4/src/include/base/internal/core_console.h
@@ -11,6 +11,9 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+#ifndef _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_
+#define _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_
+
 namespace Okl4 { extern "C" {
 #include <l4/kdebug.h>
 } }
@@ -28,4 +31,4 @@ namespace Genode
 	};
 }
 
-
+#endif /* _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_ */
diff --git a/repos/base-okl4/src/include/base/internal/lock_helper.h b/repos/base-okl4/src/include/base/internal/lock_helper.h
index e70ac3a2b..88577f609 100644
--- a/repos/base-okl4/src/include/base/internal/lock_helper.h
+++ b/repos/base-okl4/src/include/base/internal/lock_helper.h
@@ -14,6 +14,9 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+#ifndef _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_
+#define _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_
+
 /* Genode includes */
 #include <base/native_types.h>
 #include <base/thread.h>
@@ -86,3 +89,5 @@ static inline void thread_stop_myself()
 	                               main_thread_tid;
 	Okl4::L4_Stop(tid);
 }
+
+#endif /* _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_ */
diff --git a/repos/base-okl4/src/include/bootinfo/internal/stdint.h b/repos/base-okl4/src/include/bootinfo/internal/stdint.h
index 2e3099810..095851e86 100644
--- a/repos/base-okl4/src/include/bootinfo/internal/stdint.h
+++ b/repos/base-okl4/src/include/bootinfo/internal/stdint.h
@@ -11,10 +11,10 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef __BOOTINFO__STDINT_H__
-#define __BOOTINFO__STDINT_H__
+#ifndef _INCLUDE__BOOTINFO__INTERNAL__STDINT_H_
+#define _INCLUDE__BOOTINFO__INTERNAL__STDINT_H_
 
 typedef unsigned long uintptr_t;
 typedef          long intptr_t;
 
-#endif /* __BOOTINFO__STDINT_H__ */
+#endif /* _INCLUDE__BOOTINFO__INTERNAL__STDINT_H_ */
diff --git a/repos/base-okl4/src/include/bootinfo/internal/stdio.h b/repos/base-okl4/src/include/bootinfo/internal/stdio.h
index 2923b369d..6c6ece0dc 100644
--- a/repos/base-okl4/src/include/bootinfo/internal/stdio.h
+++ b/repos/base-okl4/src/include/bootinfo/internal/stdio.h
@@ -10,3 +10,7 @@
  * This file is part of the Genode OS framework, which is distributed
  * under the terms of the GNU General Public License version 2.
  */
+
+#ifndef _INCLUDE__BOOTINFO__INTERNAL__STDIO_H_
+#define _INCLUDE__BOOTINFO__INTERNAL__STDIO_H_
+#endif /* _INCLUDE__BOOTINFO__INTERNAL__STDIO_H_ */
diff --git a/repos/base-pistachio/src/core/include/kip.h b/repos/base-pistachio/src/core/include/kip.h
index c0518e652..680c477f9 100644
--- a/repos/base-pistachio/src/core/include/kip.h
+++ b/repos/base-pistachio/src/core/include/kip.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__PISTACHIO__KIP_H_
-#define _INCLUDE__PISTACHIO__KIP_H_
+#ifndef _CORE__INCLUDE__KIP_H_
+#define _CORE__INCLUDE__KIP_H_
 
 namespace Pistachio {
 #include <l4/types.h>
@@ -53,4 +53,4 @@ namespace Pistachio {
 	}
 }
 
-#endif /* _INCLUDE__PISTACHIO__KIP_H_ */
+#endif /* _CORE__INCLUDE__KIP_H_ */
diff --git a/repos/base-pistachio/src/core/include/map_local.h b/repos/base-pistachio/src/core/include/map_local.h
index e0a1be03c..4e4b8986d 100644
--- a/repos/base-pistachio/src/core/include/map_local.h
+++ b/repos/base-pistachio/src/core/include/map_local.h
@@ -98,4 +98,3 @@ namespace Genode {
 }
 
 #endif /* _CORE__INCLUDE__MAP_LOCAL_H_ */
-
diff --git a/repos/base-pistachio/src/core/include/print_l4_thread_id.h b/repos/base-pistachio/src/core/include/print_l4_thread_id.h
index 0d941192b..67595acb0 100644
--- a/repos/base-pistachio/src/core/include/print_l4_thread_id.h
+++ b/repos/base-pistachio/src/core/include/print_l4_thread_id.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__PISTACHIO__PRINT_L4_THREAD_ID_
-#define _INCLUDE__PISTACHIO__PRINT_L4_THREAD_ID_
+#ifndef _CORE__INCLUDE__PRINT_L4_THREAD_ID_H_
+#define _CORE__INCLUDE__PRINT_L4_THREAD_ID_H_
 
 #include <base/printf.h>
 
@@ -41,4 +41,4 @@ namespace Pistachio {
 	}
 }
 
-#endif /* _INCLUDE__PISTACHIO__PRINT_L4_THREAD_ID_ */
+#endif /* _CORE__INCLUDE__PRINT_L4_THREAD_ID_H_ */
diff --git a/repos/base-pistachio/src/include/base/internal/core_console.h b/repos/base-pistachio/src/include/base/internal/core_console.h
index da749e70b..cfd6af8ca 100644
--- a/repos/base-pistachio/src/include/base/internal/core_console.h
+++ b/repos/base-pistachio/src/include/base/internal/core_console.h
@@ -11,6 +11,9 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+#ifndef _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_
+#define _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_
+
 /* Pistachio includes */
 namespace Pistachio {
 #include <l4/kdebug.h>
@@ -29,3 +32,4 @@ namespace Genode
 	};
 }
 
+#endif /* _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_ */
diff --git a/repos/base-pistachio/src/include/base/internal/lock_helper.h b/repos/base-pistachio/src/include/base/internal/lock_helper.h
index 9b4d54489..814306ebe 100644
--- a/repos/base-pistachio/src/include/base/internal/lock_helper.h
+++ b/repos/base-pistachio/src/include/base/internal/lock_helper.h
@@ -14,6 +14,9 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+#ifndef _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_
+#define _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_
+
 /* Genode includes */
 #include <base/native_types.h>
 #include <base/thread.h>
@@ -87,3 +90,5 @@ static inline void thread_stop_myself()
 	                               main_thread_tid;
 	Pistachio::L4_Stop(tid);
 }
+
+#endif /* _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_ */
diff --git a/repos/base-sel4/src/core/include/core_capability_data.h b/repos/base-sel4/src/core/include/core_capability_data.h
index f4d0835dc..1ff78dd30 100644
--- a/repos/base-sel4/src/core/include/core_capability_data.h
+++ b/repos/base-sel4/src/core/include/core_capability_data.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CORE__INCLUDE__CAPABILITY_CORE_DATA_H_
-#define _CORE__INCLUDE__CAPABILITY_CORE_DATA_H_
+#ifndef _CORE__INCLUDE__CORE_CAPABILITY_DATA_H_
+#define _CORE__INCLUDE__CORE_CAPABILITY_DATA_H_
 
 /* base-internal includes */
 #include <base/internal/capability_data.h>
@@ -43,4 +43,4 @@ class Genode::Core_capability_data : public Capability_data
 		}
 };
 
-#endif /* _CORE__INCLUDE__CAPABILITY_CORE_DATA_H_ */
+#endif /* _CORE__INCLUDE__CORE_CAPABILITY_DATA_H_ */
diff --git a/repos/base-sel4/src/include/base/internal/assert.h b/repos/base-sel4/src/include/base/internal/assert.h
index 6488f6f19..2b4229043 100644
--- a/repos/base-sel4/src/include/base/internal/assert.h
+++ b/repos/base-sel4/src/include/base/internal/assert.h
@@ -14,8 +14,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BASE__INTERNAL__ASSERT_H_
-#define _BASE__INTERNAL__ASSERT_H_
+#ifndef _INCLUDE__BASE__INTERNAL__ASSERT_H_
+#define _INCLUDE__BASE__INTERNAL__ASSERT_H_
 
 /* Genode includes */
 #include <base/snprintf.h>
@@ -35,4 +35,4 @@
 	} while(0)
 #else
 
-#endif /* _BASE__INTERNAL__ASSERT_H_ */
+#endif /* _INCLUDE__BASE__INTERNAL__ASSERT_H_ */
diff --git a/repos/base-sel4/src/include/base/internal/capability_data.h b/repos/base-sel4/src/include/base/internal/capability_data.h
index 1ad9f4e46..3e578fee1 100644
--- a/repos/base-sel4/src/include/base/internal/capability_data.h
+++ b/repos/base-sel4/src/include/base/internal/capability_data.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BASE__INTERNAL__CAPABILITY_DATA_H_
-#define _BASE__INTERNAL__CAPABILITY_DATA_H_
+#ifndef _INCLUDE__BASE__INTERNAL__CAPABILITY_DATA_H_
+#define _INCLUDE__BASE__INTERNAL__CAPABILITY_DATA_H_
 
 /* base includes */
 #include <util/noncopyable.h>
@@ -44,4 +44,4 @@ class Genode::Capability_data
 		uint8_t dec_ref() { return --_ref_cnt; }
 };
 
-#endif /* _BASE__INTERNAL__CAPABILITY_DATA_H_ */
+#endif /* _INCLUDE__BASE__INTERNAL__CAPABILITY_DATA_H_ */
diff --git a/repos/base-sel4/src/include/base/internal/capability_space.h b/repos/base-sel4/src/include/base/internal/capability_space.h
index 98518e9d3..bca777b77 100644
--- a/repos/base-sel4/src/include/base/internal/capability_space.h
+++ b/repos/base-sel4/src/include/base/internal/capability_space.h
@@ -15,8 +15,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BASE__INTERNAL__CAPABILITY_SPACE_H_
-#define _BASE__INTERNAL__CAPABILITY_SPACE_H_
+#ifndef _INCLUDE__BASE__INTERNAL__CAPABILITY_SPACE_H_
+#define _INCLUDE__BASE__INTERNAL__CAPABILITY_SPACE_H_
 
 /* Genode includes */
 #include <base/native_types.h>
@@ -49,4 +49,4 @@ namespace Genode { namespace Capability_space {
 	Rpc_obj_key rpc_obj_key(Native_capability::Data const &data);
 } }
 
-#endif /* _BASE__INTERNAL__CAPABILITY_SPACE_H_ */
+#endif /* _INCLUDE__BASE__INTERNAL__CAPABILITY_SPACE_H_ */
diff --git a/repos/base-sel4/src/include/base/internal/capability_space_sel4.h b/repos/base-sel4/src/include/base/internal/capability_space_sel4.h
index 098b046fa..83a59e88e 100644
--- a/repos/base-sel4/src/include/base/internal/capability_space_sel4.h
+++ b/repos/base-sel4/src/include/base/internal/capability_space_sel4.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BASE__INTERNAL__CAPABILITY_SPACE_SEL4_H_
-#define _BASE__INTERNAL__CAPABILITY_SPACE_SEL4_H_
+#ifndef _INCLUDE__BASE__INTERNAL__CAPABILITY_SPACE_SEL4_H_
+#define _INCLUDE__BASE__INTERNAL__CAPABILITY_SPACE_SEL4_H_
 
 /* base includes */
 #include <util/avl_tree.h>
@@ -268,4 +268,4 @@ class Genode::Capability_space_sel4
 };
 
 
-#endif /* _BASE__INTERNAL__CAPABILITY_SPACE_SEL4_H_ */
+#endif /* _INCLUDE__BASE__INTERNAL__CAPABILITY_SPACE_SEL4_H_ */
diff --git a/repos/base-sel4/src/include/base/internal/core_console.h b/repos/base-sel4/src/include/base/internal/core_console.h
index 3d9e2a45b..88c314c2e 100644
--- a/repos/base-sel4/src/include/base/internal/core_console.h
+++ b/repos/base-sel4/src/include/base/internal/core_console.h
@@ -11,6 +11,9 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+#ifndef _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_
+#define _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_
+
 /* Genode includes */
 #include <base/console.h>
 
@@ -30,3 +33,5 @@ class Genode::Core_console : public Console
 			seL4_DebugPutChar(c);
 		}
 };
+
+#endif /* _INCLUDE__BASE__INTERNAL__CORE_CONSOLE_H_ */
diff --git a/repos/base-sel4/src/include/base/internal/kernel_debugger.h b/repos/base-sel4/src/include/base/internal/kernel_debugger.h
index 9bb45bbff..c238e86fc 100644
--- a/repos/base-sel4/src/include/base/internal/kernel_debugger.h
+++ b/repos/base-sel4/src/include/base/internal/kernel_debugger.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BASE__INTERNAL__KERNEL_DEBUGGER_H_
-#define _BASE__INTERNAL__KERNEL_DEBUGGER_H_
+#ifndef _INCLUDE__BASE__INTERNAL__KERNEL_DEBUGGER_H_
+#define _INCLUDE__BASE__INTERNAL__KERNEL_DEBUGGER_H_
 
 /* base includes */
 #include <base/thread.h>
@@ -34,4 +34,4 @@ static inline void kernel_debugger_panic(char const *msg)
 	seL4_TCB_Suspend(Genode::Thread_base::myself()->tid().tcb_sel);
 }
 
-#endif /* _BASE__INTERNAL__KERNEL_DEBUGGER_H_ */
+#endif /* _INCLUDE__BASE__INTERNAL__KERNEL_DEBUGGER_H_ */
diff --git a/repos/base-sel4/src/include/base/internal/lock_helper.h b/repos/base-sel4/src/include/base/internal/lock_helper.h
index d8f8b6cdf..8f2c9a95f 100644
--- a/repos/base-sel4/src/include/base/internal/lock_helper.h
+++ b/repos/base-sel4/src/include/base/internal/lock_helper.h
@@ -1,4 +1,3 @@
-
 /*
  * \brief  seL4-specific helper functions for the Lock implementation
  * \author Norman Feske
@@ -14,8 +13,13 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+#ifndef _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_
+#define _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_
+
 /* seL4 includes */
 #include <sel4/sel4.h>
 
 
 static inline void thread_yield() { seL4_Yield(); }
+
+#endif /* _INCLUDE__BASE__INTERNAL__LOCK_HELPER_H_ */
diff --git a/repos/base-sel4/src/include/base/internal/native_types.h b/repos/base-sel4/src/include/base/internal/native_types.h
index 97c930acf..0c1ad79ca 100644
--- a/repos/base-sel4/src/include/base/internal/native_types.h
+++ b/repos/base-sel4/src/include/base/internal/native_types.h
@@ -11,10 +11,10 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BASE__INTERNAL__NATIVE_TYPES_H_
-#define _BASE__INTERNAL__NATIVE_TYPES_H_
+#ifndef _INCLUDE__BASE__INTERNAL__NATIVE_TYPES_H_
+#define _INCLUDE__BASE__INTERNAL__NATIVE_TYPES_H_
 
 /* Genode includes */
 #include <base/native_types.h>
 
-#endif /* _BASE__INTERNAL__NATIVE_TYPES_H_ */
+#endif /* _INCLUDE__BASE__INTERNAL__NATIVE_TYPES_H_ */
diff --git a/repos/base-sel4/src/include/base/internal/rpc_obj_key.h b/repos/base-sel4/src/include/base/internal/rpc_obj_key.h
index c9125e408..e1dfb22ac 100644
--- a/repos/base-sel4/src/include/base/internal/rpc_obj_key.h
+++ b/repos/base-sel4/src/include/base/internal/rpc_obj_key.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BASE__INTERNAL__RPC_OBJ_KEY_H_
-#define _BASE__INTERNAL__RPC_OBJ_KEY_H_
+#ifndef _INCLUDE__BASE__INTERNAL__RPC_OBJ_KEY_H_
+#define _INCLUDE__BASE__INTERNAL__RPC_OBJ_KEY_H_
 
 /* base includes */
 #include <base/stdint.h>
@@ -40,4 +40,4 @@ class Genode::Rpc_obj_key
 		uint32_t value() const { return _value; }
 };
 
-#endif /* _BASE__INTERNAL__RPC_OBJ_KEY_H_ */
+#endif /* _INCLUDE__BASE__INTERNAL__RPC_OBJ_KEY_H_ */
diff --git a/repos/base-sel4/src/include/startup/internal/_main_parent_cap.h b/repos/base-sel4/src/include/startup/internal/_main_parent_cap.h
index 5bc0bd6cd..83b2ccee8 100644
--- a/repos/base-sel4/src/include/startup/internal/_main_parent_cap.h
+++ b/repos/base-sel4/src/include/startup/internal/_main_parent_cap.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _LIB__STARTUP___MAIN_PARENT_CAP_H_
-#define _LIB__STARTUP___MAIN_PARENT_CAP_H_
+#ifndef _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_
+#define _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_
 
 /* Genode includes */
 #include <util/string.h>
@@ -36,4 +36,4 @@ namespace Genode {
 	}
 }
 
-#endif /* _LIB__STARTUP___MAIN_PARENT_CAP_H_ */
+#endif /* _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_ */
diff --git a/repos/base/include/base/allocator_guard.h b/repos/base/include/base/allocator_guard.h
index 02e22982f..b236b889f 100644
--- a/repos/base/include/base/allocator_guard.h
+++ b/repos/base/include/base/allocator_guard.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _ALLOCATOR_GUARD_H_
-#define _ALLOCATOR_GUARD_H_
+#ifndef _INCLUDE__BASE__ALLOCATOR_GUARD_H_
+#define _INCLUDE__BASE__ALLOCATOR_GUARD_H_
 
 #include <base/allocator.h>
 #include <base/printf.h>
@@ -109,4 +109,4 @@ class Genode::Allocator_guard : public Allocator
 			return _allocator->need_size_for_free(); }
 };
 
-#endif /* _ALLOCATOR_GUARD_H_ */
+#endif /* _INCLUDE__BASE__ALLOCATOR_GUARD_H_ */
diff --git a/repos/base/include/base/ipc.h b/repos/base/include/base/ipc.h
index 63049a692..ff1eb3190 100644
--- a/repos/base/include/base/ipc.h
+++ b/repos/base/include/base/ipc.h
@@ -18,8 +18,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__IPC_GENERIC_H_
-#define _INCLUDE__BASE__IPC_GENERIC_H_
+#ifndef _INCLUDE__BASE__IPC_H_
+#define _INCLUDE__BASE__IPC_H_
 
 #include <util/misc_math.h>
 #include <util/string.h>
@@ -635,4 +635,4 @@ class Genode::Ipc_server : public Ipc_istream, public Ipc_ostream
 		}
 };
 
-#endif /* _INCLUDE__BASE__IPC_GENERIC_H_ */
+#endif /* _INCLUDE__BASE__IPC_H_ */
diff --git a/repos/base/include/base/native_capability.h b/repos/base/include/base/native_capability.h
index 4b3798884..4b22c7e6f 100644
--- a/repos/base/include/base/native_capability.h
+++ b/repos/base/include/base/native_capability.h
@@ -116,4 +116,3 @@ class Genode::Native_capability_tpl
 };
 
 #endif /* _INCLUDE__BASE__NATIVE_CAPABILITY_H_ */
-
diff --git a/repos/base/include/base/shared_object.h b/repos/base/include/base/shared_object.h
index cc7544e0d..3fdd08519 100644
--- a/repos/base/include/base/shared_object.h
+++ b/repos/base/include/base/shared_object.h
@@ -1,9 +1,16 @@
-/**
+/*
  * \brief  Dynamic linker interface
  * \author Sebastian Sumpf
  * \date   2014-10-09
  */
 
+/*
+ * Copyright (C) 2014 Genode Labs GmbH
+ *
+ * This file is part of the Genode OS framework, which is distributed
+ * under the terms of the GNU General Public License version 2.
+ */
+
 #ifndef _INCLUDE__BASE__SHARED_OBJECT_H_
 #define _INCLUDE__BASE__SHARED_OBJECT_H_
 
diff --git a/repos/base/include/base/signal.h b/repos/base/include/base/signal.h
index a8f2d769a..259afe771 100644
--- a/repos/base/include/base/signal.h
+++ b/repos/base/include/base/signal.h
@@ -14,8 +14,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__SIGNAL_H__
-#define _INCLUDE__BASE__SIGNAL_H__
+#ifndef _INCLUDE__BASE__SIGNAL_H_
+#define _INCLUDE__BASE__SIGNAL_H_
 
 #include <util/noncopyable.h>
 #include <util/list.h>
@@ -433,4 +433,4 @@ class Genode::Signal_dispatcher : public Signal_dispatcher_base,
 		void dispatch(unsigned num) { (obj.*member)(num); }
 };
 
-#endif /* _INCLUDE__BASE__SIGNAL_H__ */
+#endif /* _INCLUDE__BASE__SIGNAL_H_ */
diff --git a/repos/base/include/base/synced_interface.h b/repos/base/include/base/synced_interface.h
index 9554a408b..19e4abc1c 100644
--- a/repos/base/include/base/synced_interface.h
+++ b/repos/base/include/base/synced_interface.h
@@ -4,6 +4,13 @@
  * \date   2013-05-16
  */
 
+/*
+ * Copyright (C) 2013-2016 Genode Labs GmbH
+ *
+ * This file is part of the Genode OS framework, which is distributed
+ * under the terms of the GNU General Public License version 2.
+ */
+
 #ifndef _INCLUDE__BASE__SYNCED_INTERFACE_H_
 #define _INCLUDE__BASE__SYNCED_INTERFACE_H_
 
diff --git a/repos/base/include/base/trace/types.h b/repos/base/include/base/trace/types.h
index ec7c15ab3..acc5824e5 100644
--- a/repos/base/include/base/trace/types.h
+++ b/repos/base/include/base/trace/types.h
@@ -4,6 +4,13 @@
  * \date   2013-08-12
  */
 
+/*
+ * Copyright (C) 2013 Genode Labs GmbH
+ *
+ * This file is part of the Genode OS framework, which is distributed
+ * under the terms of the GNU General Public License version 2.
+ */
+
 #ifndef _INCLUDE__BASE__TRACE__TYPES_H_
 #define _INCLUDE__BASE__TRACE__TYPES_H_
 
diff --git a/repos/base/include/session/session.h b/repos/base/include/session/session.h
index 7d26d9de4..dfbb2e6f4 100644
--- a/repos/base/include/session/session.h
+++ b/repos/base/include/session/session.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__SESSION_H_
-#define _INCLUDE__SESSION_H_
+#ifndef _INCLUDE__SESSION__SESSION_H_
+#define _INCLUDE__SESSION__SESSION_H_
 
 /*
  * Each session interface declares an RPC interface and, therefore, relies on
@@ -37,4 +37,4 @@ class Genode::Session
 	 */
 };
 
-#endif /* _INCLUDE__SESSION_H_ */
+#endif /* _INCLUDE__SESSION__SESSION_H_ */
diff --git a/repos/base/include/spec/arm_v6/cpu/memory_barrier.h b/repos/base/include/spec/arm_v6/cpu/memory_barrier.h
index 5ad06bace..728a94f50 100644
--- a/repos/base/include/spec/arm_v6/cpu/memory_barrier.h
+++ b/repos/base/include/spec/arm_v6/cpu/memory_barrier.h
@@ -24,8 +24,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__ARM_V6__CPU__MEMORY_BARRIER_H_
-#define _INCLUDE__ARM_V6__CPU__MEMORY_BARRIER_H_
+#ifndef _INCLUDE__SPEC__ARM_V6__CPU__MEMORY_BARRIER_H_
+#define _INCLUDE__SPEC__ARM_V6__CPU__MEMORY_BARRIER_H_
 
 namespace Genode {
 
@@ -35,4 +35,4 @@ namespace Genode {
 	}
 }
 
-#endif /* _INCLUDE__ARM_V6__CPU__MEMORY_BARRIER_H_ */
+#endif /* _INCLUDE__SPEC__ARM_V6__CPU__MEMORY_BARRIER_H_ */
diff --git a/repos/base/include/spec/arm_v7/cpu/memory_barrier.h b/repos/base/include/spec/arm_v7/cpu/memory_barrier.h
index dc01364b5..9bc46e6b0 100644
--- a/repos/base/include/spec/arm_v7/cpu/memory_barrier.h
+++ b/repos/base/include/spec/arm_v7/cpu/memory_barrier.h
@@ -24,8 +24,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__ARM_V7__CPU__MEMORY_BARRIER_H_
-#define _INCLUDE__ARM_V7__CPU__MEMORY_BARRIER_H_
+#ifndef _INCLUDE__SPEC__ARM_V7__CPU__MEMORY_BARRIER_H_
+#define _INCLUDE__SPEC__ARM_V7__CPU__MEMORY_BARRIER_H_
 
 namespace Genode {
 
@@ -35,4 +35,4 @@ namespace Genode {
 	}
 }
 
-#endif /* _INCLUDE__ARM_V7__CPU__MEMORY_BARRIER_H_ */
+#endif /* _INCLUDE__SPEC__ARM_V7__CPU__MEMORY_BARRIER_H_ */
diff --git a/repos/base/include/spec/arndale/drivers/board_base.h b/repos/base/include/spec/arndale/drivers/board_base.h
index 0181ddbbf..ca0a4fd77 100644
--- a/repos/base/include/spec/arndale/drivers/board_base.h
+++ b/repos/base/include/spec/arndale/drivers/board_base.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__DRIVERS__BOARD_BASE_H_
-#define _INCLUDE__DRIVERS__BOARD_BASE_H_
+#ifndef _INCLUDE__SPEC__ARNDALE__DRIVERS__BOARD_BASE_H_
+#define _INCLUDE__SPEC__ARNDALE__DRIVERS__BOARD_BASE_H_
 
 /* Genode includes */
 #include <spec/exynos5/board_base.h>
@@ -47,4 +47,4 @@ struct Genode::Board_base : Exynos5
 	};
 };
 
-#endif /* _INCLUDE__DRIVERS__BOARD_BASE_H_ */
+#endif /* _INCLUDE__SPEC__ARNDALE__DRIVERS__BOARD_BASE_H_ */
diff --git a/repos/base/include/spec/imx53/drivers/board_base_support.h b/repos/base/include/spec/imx53/drivers/board_base_support.h
index 092ed8b94..a52d174fd 100644
--- a/repos/base/include/spec/imx53/drivers/board_base_support.h
+++ b/repos/base/include/spec/imx53/drivers/board_base_support.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__PLATFORM__IMX53__DRIVERS__BOARD_BASE_SUPPORT_H_
-#define _INCLUDE__PLATFORM__IMX53__DRIVERS__BOARD_BASE_SUPPORT_H_
+#ifndef _INCLUDE__SPEC__IMX53__DRIVERS__BOARD_BASE_SUPPORT_H_
+#define _INCLUDE__SPEC__IMX53__DRIVERS__BOARD_BASE_SUPPORT_H_
 
 namespace Imx53 { struct Board_base; }
 
@@ -117,5 +117,4 @@ struct Imx53::Board_base
 	};
 };
 
-#endif /* _INCLUDE__PLATFORM__IMX53__DRIVERS__BOARD_BASE_SUPPORT_H_ */
-
+#endif /* _INCLUDE__SPEC__IMX53__DRIVERS__BOARD_BASE_SUPPORT_H_ */
diff --git a/repos/base/include/spec/imx53_qsb/drivers/board_base.h b/repos/base/include/spec/imx53_qsb/drivers/board_base.h
index 842e0d4a6..e8b6cf00f 100644
--- a/repos/base/include/spec/imx53_qsb/drivers/board_base.h
+++ b/repos/base/include/spec/imx53_qsb/drivers/board_base.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__PLATFORM__IMX53_QSB__DRIVERS__BOARD_BASE_H_
-#define _INCLUDE__PLATFORM__IMX53_QSB__DRIVERS__BOARD_BASE_H_
+#ifndef _INCLUDE__SPEC__IMX53_QSB__DRIVERS__BOARD_BASE_H_
+#define _INCLUDE__SPEC__IMX53_QSB__DRIVERS__BOARD_BASE_H_
 
 /* Genode includes */
 #include <spec/imx53/drivers/board_base_support.h>
@@ -33,5 +33,4 @@ struct Genode::Board_base : Imx53::Board_base
 	};
 };
 
-#endif /* _INCLUDE__PLATFORM__IMX53_QSB__DRIVERS__BOARD_BASE_H_ */
-
+#endif /* _INCLUDE__SPEC__IMX53_QSB__DRIVERS__BOARD_BASE_H_ */
diff --git a/repos/base/include/spec/odroid_x2/drivers/board_base.h b/repos/base/include/spec/odroid_x2/drivers/board_base.h
index a173c18ce..cebf823aa 100644
--- a/repos/base/include/spec/odroid_x2/drivers/board_base.h
+++ b/repos/base/include/spec/odroid_x2/drivers/board_base.h
@@ -13,8 +13,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__DRIVERS__BOARD_BASE_H_
-#define _INCLUDE__DRIVERS__BOARD_BASE_H_
+#ifndef _INCLUDE__SPEC__ODROID_X2__DRIVERS__BOARD_BASE_H_
+#define _INCLUDE__SPEC__ODROID_X2__DRIVERS__BOARD_BASE_H_
 
 /* Genode includes */
 #include <spec/exynos4/board_base.h>
@@ -96,4 +96,4 @@ struct Genode::Board_base : Exynos4
 	};
 };
 
-#endif /* _INCLUDE__DRIVERS__BOARD_BASE_H_ */
+#endif /* _INCLUDE__SPEC__ODROID_X2__DRIVERS__BOARD_BASE_H_ */
diff --git a/repos/base/include/spec/odroid_xu/drivers/board_base.h b/repos/base/include/spec/odroid_xu/drivers/board_base.h
index a43b21d4b..939f9a82c 100644
--- a/repos/base/include/spec/odroid_xu/drivers/board_base.h
+++ b/repos/base/include/spec/odroid_xu/drivers/board_base.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__DRIVERS__BOARD_BASE_H_
-#define _INCLUDE__DRIVERS__BOARD_BASE_H_
+#ifndef _INCLUDE__SPEC__ODROID_XU__DRIVERS__BOARD_BASE_H_
+#define _INCLUDE__SPEC__ODROID_XU__DRIVERS__BOARD_BASE_H_
 
 /* Genode includes */
 #include <spec/exynos5/board_base.h>
@@ -35,4 +35,4 @@ struct Genode::Board_base : Exynos5
 	};
 };
 
-#endif /* _INCLUDE__DRIVERS__BOARD_BASE_H_ */
+#endif /* _INCLUDE__SPEC__ODROID_XU__DRIVERS__BOARD_BASE_H_ */
diff --git a/repos/base/include/spec/tl16c750/drivers/uart_base.h b/repos/base/include/spec/tl16c750/drivers/uart_base.h
index 681170a27..d69a30aa7 100644
--- a/repos/base/include/spec/tl16c750/drivers/uart_base.h
+++ b/repos/base/include/spec/tl16c750/drivers/uart_base.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__DRIVERS__UART__TL16C750_BASE_H_
-#define _INCLUDE__DRIVERS__UART__TL16C750_BASE_H_
+#ifndef _INCLUDE__SPEC__TL16C750__DRIVERS__UART_BASE_H_
+#define _INCLUDE__SPEC__TL16C750__DRIVERS__UART_BASE_H_
 
 /* Genode includes */
 #include <util/mmio.h>
@@ -243,5 +243,4 @@ class Genode::Tl16c750_base : public Mmio
 		}
 };
 
-#endif /* _INCLUDE__DRIVERS__UART__TL16C750_BASE_H_ */
-
+#endif /* _INCLUDE__SPEC__TL16C750__DRIVERS__UART_BASE_H_ */
diff --git a/repos/base/include/spec/usb_armory/drivers/board_base.h b/repos/base/include/spec/usb_armory/drivers/board_base.h
index 032cd796a..6b51c68a7 100644
--- a/repos/base/include/spec/usb_armory/drivers/board_base.h
+++ b/repos/base/include/spec/usb_armory/drivers/board_base.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__PLATFORM__IMX53_QSB__DRIVERS__BOARD_BASE_H_
-#define _INCLUDE__PLATFORM__IMX53_QSB__DRIVERS__BOARD_BASE_H_
+#ifndef _INCLUDE__SPEC__USB_ARMORY__DRIVERS__BOARD_BASE_H_
+#define _INCLUDE__SPEC__USB_ARMORY__DRIVERS__BOARD_BASE_H_
 
 /* Genode includes */
 #include <spec/imx53/drivers/board_base_support.h>
@@ -38,5 +38,4 @@ struct Genode::Board_base : Imx53::Board_base
 	};
 };
 
-#endif /* _INCLUDE__PLATFORM__IMX53_QSB__DRIVERS__BOARD_BASE_H_ */
-
+#endif /* _INCLUDE__SPEC__USB_ARMORY__DRIVERS__BOARD_BASE_H_ */
diff --git a/repos/base/include/spec/zynq/drivers/board_base_support.h b/repos/base/include/spec/zynq/drivers/board_base_support.h
index dff704936..fcec1bcca 100644
--- a/repos/base/include/spec/zynq/drivers/board_base_support.h
+++ b/repos/base/include/spec/zynq/drivers/board_base_support.h
@@ -13,8 +13,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__SPEC__ZYNQ__DRIVERS__BOARD_BASE_H_
-#define _INCLUDE__SPEC__ZYNQ__DRIVERS__BOARD_BASE_H_
+#ifndef _INCLUDE__SPEC__ZYNQ__DRIVERS__BOARD_BASE_SUPPORT_H_
+#define _INCLUDE__SPEC__ZYNQ__DRIVERS__BOARD_BASE_SUPPORT_H_
 
 namespace Zynq { struct Board_base; }
 
@@ -74,4 +74,4 @@ struct Zynq::Board_base
 	};
 };
 
-#endif /* _INCLUDE__SPEC__ZYNQ__DRIVERS__BOARD_BASE_H_ */
+#endif /* _INCLUDE__SPEC__ZYNQ__DRIVERS__BOARD_BASE_SUPPORT_H_ */
diff --git a/repos/base/include/spec/zynq_qemu/drivers/board_base.h b/repos/base/include/spec/zynq_qemu/drivers/board_base.h
index 325c45e66..0dcba7a54 100644
--- a/repos/base/include/spec/zynq_qemu/drivers/board_base.h
+++ b/repos/base/include/spec/zynq_qemu/drivers/board_base.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__PLATFORM__DRIVERS__BOARD_BASE_H_
-#define _INCLUDE__PLATFORM__DRIVERS__BOARD_BASE_H_
+#ifndef _INCLUDE__SPEC__ZYNQ_QEMU__DRIVERS__BOARD_BASE_H_
+#define _INCLUDE__SPEC__ZYNQ_QEMU__DRIVERS__BOARD_BASE_H_
 
 #include <spec/zynq/drivers/board_base_support.h>
 
@@ -35,4 +35,4 @@ struct Genode::Board_base : Zynq::Board_base
 	};
 };
 
-#endif /* _INCLUDE__PLATFORM__DRIVERS__BOARD_BASE_H_ */
+#endif /* _INCLUDE__SPEC__ZYNQ_QEMU__DRIVERS__BOARD_BASE_H_ */
diff --git a/repos/base/include/util/flex_iterator.h b/repos/base/include/util/flex_iterator.h
index 1db114eb6..3db4a10ab 100644
--- a/repos/base/include/util/flex_iterator.h
+++ b/repos/base/include/util/flex_iterator.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__FLEX_ITERATOR_H
-#define _INCLUDE__BASE__FLEX_ITERATOR_H
+#ifndef _INCLUDE__UTIL__FLEX_ITERATOR_H_
+#define _INCLUDE__UTIL__FLEX_ITERATOR_H_
 
 #include <base/stdint.h>
 #include <util/misc_math.h>
@@ -113,4 +113,4 @@ class Genode::Flexpage_iterator
 		}
 };
 
-#endif /* _INCLUDE__BASE__FLEX_ITERATOR_H */
+#endif /* _INCLUDE__UTIL__FLEX_ITERATOR_H_ */
diff --git a/repos/base/include/util/meta.h b/repos/base/include/util/meta.h
index 16b0711fb..17333d5f9 100644
--- a/repos/base/include/util/meta.h
+++ b/repos/base/include/util/meta.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__UTIL__META_H_
-#define _INCLUDE__BASE__UTIL__META_H_
+#ifndef _INCLUDE__UTIL__META_H_
+#define _INCLUDE__UTIL__META_H_
 
 namespace Genode {
 
@@ -684,4 +684,4 @@ namespace Genode {
 	} /* namespace Trait */
 }
 
-#endif /* _INCLUDE__BASE__UTIL__META_H_ */
+#endif /* _INCLUDE__UTIL__META_H_ */
diff --git a/repos/base/include/util/mmio.h b/repos/base/include/util/mmio.h
index 27abd00a7..c82d686d3 100644
--- a/repos/base/include/util/mmio.h
+++ b/repos/base/include/util/mmio.h
@@ -644,4 +644,3 @@ class Genode::Mmio
 };
 
 #endif /* _INCLUDE__UTIL__MMIO_H_ */
-
diff --git a/repos/base/include/util/register.h b/repos/base/include/util/register.h
index b9c368c41..9bceb591c 100644
--- a/repos/base/include/util/register.h
+++ b/repos/base/include/util/register.h
@@ -359,4 +359,3 @@ struct Genode::Bitset_3
 };
 
 #endif /* _INCLUDE__UTIL__REGISTER_H_ */
-
diff --git a/repos/base/src/core/include/cpu_thread_allocator.h b/repos/base/src/core/include/cpu_thread_allocator.h
index eab14f9cb..c66d2fb49 100644
--- a/repos/base/src/core/include/cpu_thread_allocator.h
+++ b/repos/base/src/core/include/cpu_thread_allocator.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BASE__SRC__CORE__INCLUDE__CPU_THREAD_ALLOCATOR_H_
-#define _BASE__SRC__CORE__INCLUDE__CPU_THREAD_ALLOCATOR_H_
+#ifndef _CORE__INCLUDE__CPU_THREAD_ALLOCATOR_H_
+#define _CORE__INCLUDE__CPU_THREAD_ALLOCATOR_H_
 
 /* Genode includes */
 #include <base/tslab.h>
@@ -27,5 +27,4 @@ namespace Genode
 	typedef Tslab<Cpu_thread_component, 1024> Cpu_thread_allocator;
 }
 
-#endif /* _BASE__SRC__CORE__INCLUDE__CPU_THREAD_ALLOCATOR_H_ */
-
+#endif /* _CORE__INCLUDE__CPU_THREAD_ALLOCATOR_H_ */
diff --git a/repos/base/src/core/include/irq_object.h b/repos/base/src/core/include/irq_object.h
index 02733c126..9e4b199f2 100644
--- a/repos/base/src/core/include/irq_object.h
+++ b/repos/base/src/core/include/irq_object.h
@@ -11,7 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#pragma once
+#ifndef _CORE__INCLUDE__IRQ_OBJECT_H_
+#define _CORE__INCLUDE__IRQ_OBJECT_H_
 
 #include <base/thread.h>
 
@@ -40,3 +41,5 @@ class Genode::Irq_object : public Thread<4096> {
 
 		void start() override;
 };
+
+#endif /* _CORE__INCLUDE__IRQ_OBJECT_H_ */
diff --git a/repos/base/src/core/include/irq_session_component.h b/repos/base/src/core/include/irq_session_component.h
index a69d2e0a7..bce828b83 100644
--- a/repos/base/src/core/include/irq_session_component.h
+++ b/repos/base/src/core/include/irq_session_component.h
@@ -11,7 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#pragma once
+#ifndef _CORE__INCLUDE__IRQ_SESSION_COMPONENT_H_
+#define _CORE__INCLUDE__IRQ_SESSION_COMPONENT_H_
 
 #include <base/lock.h>
 #include <base/rpc_server.h>
@@ -57,3 +58,5 @@ class Genode::Irq_session_component : public Rpc_object<Irq_session>,
 		void sigh(Signal_context_capability) override;
 		Info info() override;
 };
+
+#endif /* _CORE__INCLUDE__IRQ_SESSION_COMPONENT_H_ */
diff --git a/repos/base/src/core/include/native_pd_component.h b/repos/base/src/core/include/native_pd_component.h
index c665ac7f3..f88126d06 100644
--- a/repos/base/src/core/include/native_pd_component.h
+++ b/repos/base/src/core/include/native_pd_component.h
@@ -13,8 +13,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CORE__INCLUDE__NATIVE_PD_H_
-#define _CORE__INCLUDE__NATIVE_PD_H_
+#ifndef _CORE__INCLUDE__NATIVE_PD_COMPONENT_H_
+#define _CORE__INCLUDE__NATIVE_PD_COMPONENT_H_
 
 /* Genode includes */
 #include <pd_session/pd_session.h>
@@ -39,4 +39,4 @@ struct Genode::Native_pd_component
 	}
 };
 
-#endif /* _CORE__INCLUDE__RPC_CAP_FACTORY_H_ */
+#endif /* _CORE__INCLUDE__NATIVE_PD_COMPONENT_H_ */
diff --git a/repos/base/src/core/include/synced_range_allocator.h b/repos/base/src/core/include/synced_range_allocator.h
index 9a628cbd6..df84c3cd8 100644
--- a/repos/base/src/core/include/synced_range_allocator.h
+++ b/repos/base/src/core/include/synced_range_allocator.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _SRC__CORE__INCLUDE__SYNCED_RANGE_ALLOCATOR_H_
-#define _SRC__CORE__INCLUDE__SYNCED_RANGE_ALLOCATOR_H_
+#ifndef _CORE__INCLUDE__SYNCED_RANGE_ALLOCATOR_H_
+#define _CORE__INCLUDE__SYNCED_RANGE_ALLOCATOR_H_
 
 #include <base/allocator.h>
 #include <base/synced_interface.h>
@@ -108,4 +108,4 @@ class Genode::Synced_range_allocator : public Range_allocator
 			return _synced_object()->valid_addr(addr); }
 };
 
-#endif /* _SRC__CORE__INCLUDE__SYNCED_RANGE_ALLOCATOR_H_ */
+#endif /* _CORE__INCLUDE__SYNCED_RANGE_ALLOCATOR_H_ */
diff --git a/repos/base/src/include/base/internal/elf_format.h b/repos/base/src/include/base/internal/elf_format.h
index ea05010c2..ab612daf1 100644
--- a/repos/base/src/include/base/internal/elf_format.h
+++ b/repos/base/src/include/base/internal/elf_format.h
@@ -1,8 +1,10 @@
-/**
+/*
  * \brief  ELF binary definition from GNU C library
  * \author Christian Helmuth
  * \date   2006-05-04
- *
+ */
+
+/*
  * This file was slightly modified and stripped down. Original copyright
  * header follows:
  *
@@ -26,8 +28,8 @@
  * 02111-1307 USA.
  */
 
-#ifndef _ELF_H_
-#define _ELF_H_
+#ifndef _INCLUDE__BASE__INTERNAL__ELF_FORMAT_H_
+#define _INCLUDE__BASE__INTERNAL__ELF_FORMAT_H_
 
 extern "C" {
 
@@ -251,4 +253,4 @@ typedef Elf32_Phdr Elf_Phdr;
 
 } /* extern "C" */
 
-#endif /* _ELF_H_ */
+#endif /* _INCLUDE__BASE__INTERNAL__ELF_FORMAT_H_ */
diff --git a/repos/base/src/include/base/internal/platform_env.h b/repos/base/src/include/base/internal/platform_env.h
index 235445624..5769f5d94 100644
--- a/repos/base/src/include/base/internal/platform_env.h
+++ b/repos/base/src/include/base/internal/platform_env.h
@@ -17,8 +17,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _PLATFORM_ENV_H_
-#define _PLATFORM_ENV_H_
+#ifndef _INCLUDE__BASE__INTERNAL__PLATFORM_ENV_H_
+#define _INCLUDE__BASE__INTERNAL__PLATFORM_ENV_H_
 
 /* Genode includes */
 #include <base/printf.h>
@@ -148,4 +148,4 @@ class Genode::Platform_env : public Genode::Env, public Emergency_ram_reserve
 		Allocator              *heap()            override { return &_heap; }
 };
 
-#endif /* _PLATFORM_ENV_H_ */
+#endif /* _INCLUDE__BASE__INTERNAL__PLATFORM_ENV_H_ */
diff --git a/repos/base/src/include/base/internal/platform_env_common.h b/repos/base/src/include/base/internal/platform_env_common.h
index 2836d9d9c..f3982dc1e 100644
--- a/repos/base/src/include/base/internal/platform_env_common.h
+++ b/repos/base/src/include/base/internal/platform_env_common.h
@@ -13,8 +13,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _PLATFORM_ENV_COMMON_H_
-#define _PLATFORM_ENV_COMMON_H_
+#ifndef _INCLUDE__BASE__INTERNAL__PLATFORM_ENV_COMMON_H_
+#define _INCLUDE__BASE__INTERNAL__PLATFORM_ENV_COMMON_H_
 
 #include <base/env.h>
 #include <util/arg_string.h>
@@ -325,5 +325,4 @@ class Genode::Expanding_parent_client : public Parent_client
 		}
 };
 
-
-#endif /* _PLATFORM_ENV_COMMON_H_ */
+#endif /* _INCLUDE__BASE__INTERNAL__PLATFORM_ENV_COMMON_H_ */
diff --git a/repos/base/src/include/base/internal/spin_lock.h b/repos/base/src/include/base/internal/spin_lock.h
index 17e25499e..44cfea3c1 100644
--- a/repos/base/src/include/base/internal/spin_lock.h
+++ b/repos/base/src/include/base/internal/spin_lock.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__LOCK__SPIN_H_
-#define _INCLUDE__BASE__LOCK__SPIN_H_
+#ifndef _INCLUDE__BASE__INTERNAL__SPIN_LOCK_H_
+#define _INCLUDE__BASE__INTERNAL__SPIN_LOCK_H_
 
 /* Genode includes */
 #include <cpu/atomic.h>
@@ -50,4 +50,4 @@ static inline void spinlock_unlock(volatile int *lock_variable)
 	*lock_variable = SPINLOCK_UNLOCKED;
 }
 
-#endif /* _INCLUDE__BASE__LOCK__SPIN_H_ */
+#endif /* _INCLUDE__BASE__INTERNAL__SPIN_LOCK_H_ */
diff --git a/repos/base/src/include/base/internal/trace_control.h b/repos/base/src/include/base/internal/trace_control.h
index 4ffa46cbd..973a3a5ac 100644
--- a/repos/base/src/include/base/internal/trace_control.h
+++ b/repos/base/src/include/base/internal/trace_control.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _TRACE_CONTROL_H_
-#define _TRACE_CONTROL_H_
+#ifndef _INCLUDE__BASE__INTERNAL__TRACE_CONTROL_H_
+#define _INCLUDE__BASE__INTERNAL__TRACE_CONTROL_H_
 
 namespace Genode { namespace Trace { class Control; } }
 
@@ -164,4 +164,4 @@ class Genode::Trace::Control
 		bool is_enabled() const { return _acknowledged_state == ENABLED; }
 };
 
-#endif /* _TRACE_CONTROL_H_ */
+#endif /* _INCLUDE__BASE__INTERNAL__TRACE_CONTROL_H_ */
diff --git a/repos/base/src/include/base/internal/unmanaged_singleton.h b/repos/base/src/include/base/internal/unmanaged_singleton.h
index 578275e2d..e56d9302e 100644
--- a/repos/base/src/include/base/internal/unmanaged_singleton.h
+++ b/repos/base/src/include/base/internal/unmanaged_singleton.h
@@ -29,8 +29,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _UNMANAGED_SINGLETON_H_
-#define _UNMANAGED_SINGLETON_H_
+#ifndef _INCLUDE__BASE__INTERNAL__UNMANAGED_SINGLETON_H_
+#define _INCLUDE__BASE__INTERNAL__UNMANAGED_SINGLETON_H_
 
 /* Genode includes */
 #include <base/stdint.h>
@@ -87,4 +87,4 @@ static inline T * unmanaged_singleton(ARGS... args)
 	return reinterpret_cast<T *>(object_space);
 }
 
-#endif /* _UNMANAGED_SINGLETON_H_ */
+#endif /* _INCLUDE__BASE__INTERNAL__UNMANAGED_SINGLETON_H_ */
diff --git a/repos/base/src/include/startup/internal/_main_parent_cap.h b/repos/base/src/include/startup/internal/_main_parent_cap.h
index 7db13674f..63192cf22 100644
--- a/repos/base/src/include/startup/internal/_main_parent_cap.h
+++ b/repos/base/src/include/startup/internal/_main_parent_cap.h
@@ -14,8 +14,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _LIB__STARTUP___MAIN_PARENT_CAP_H_
-#define _LIB__STARTUP___MAIN_PARENT_CAP_H_
+#ifndef _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_
+#define _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_
 
 namespace Genode {
 
@@ -30,4 +30,4 @@ namespace Genode {
 	}
 }
 
-#endif /* _LIB__STARTUP___MAIN_PARENT_CAP_H_ */
+#endif /* _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_ */