base: update include guards

This patch cleans up the include guards, assisted by the
tool/fix_include_ifndef script.

repos/base-fiasco/src/core/include/map_local.h

@@ -84,4 +84,3 @@ namespace Genode {
 }
 
 #endif /* _CORE__INCLUDE__MAP_LOCAL_H_ */
-

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_ */

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_ */

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_
 

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_ */

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_ */

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_ */

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_ */

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_ */

repos/base-foc/src/core/include/map_local.h

@@ -142,4 +142,3 @@ namespace Genode {
 }
 
 #endif /* _CORE__INCLUDE__MAP_LOCAL_H_ */
-

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

repos/base-hw/src/core/include/assert.h

@@ -52,4 +52,3 @@
 	} while (0) ;
 
 #endif /* _CORE__INCLUDE__ASSERT_H_ */
-

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

repos/base-hw/src/core/include/platform.h

@@ -184,4 +184,3 @@ namespace Genode {
 }
 
 #endif /* _CORE__INCLUDE__PLATFORM_H_ */
-

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_ */
-

repos/base-hw/src/core/include/platform_thread.h

@@ -201,4 +201,3 @@ namespace Genode {
 }
 
 #endif /* _CORE__INCLUDE__PLATFORM_THREAD_H_ */
-

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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>

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */

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_ */