Warn about the use of deprecated headers

This commit enables compile-time warnings displayed whenever a deprecated
API header is included, and adjusts the existing #include directives
accordingly.

Issue #1987

repos/base-linux/src/core/include/pager.h

@@ -20,7 +20,6 @@
 /* Genode includes */
 #include <base/signal.h>
 #include <pager/capability.h>
-#include <cap_session/cap_session.h>
 #include <thread/capability.h>
 
 /* core-local includes */

repos/base-nova/src/core/include/pager.h

@@ -19,7 +19,6 @@
 #include <base/object_pool.h>
 #include <base/capability.h>
 #include <base/session_label.h>
-#include <cap_session/cap_session.h>
 #include <pager/capability.h>
 
 /* NOVA includes */

repos/base-nova/src/test/platform/main.cc

@@ -23,7 +23,7 @@
 #include <rm_session/connection.h>
 #include <region_map/client.h>
 
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 #include <os/config.h>
 
 #include <trace/timestamp.h>

repos/base-sel4/src/core/include/pager.h

@@ -20,7 +20,6 @@
 #include <base/thread.h>
 #include <base/object_pool.h>
 #include <base/session_label.h>
-#include <cap_session/cap_session.h>
 #include <pager/capability.h>
 #include <ipc_pager.h>
 

repos/base-sel4/src/core/rpc_cap_factory.cc

@@ -16,7 +16,7 @@
 #include <util/misc_math.h>
 
 /* core includes */
-#include <cap_session/cap_session.h>
+#include <pd_session/pd_session.h>
 #include <rpc_cap_factory.h>
 #include <platform.h>
 
@@ -40,7 +40,7 @@ Native_capability Rpc_cap_factory::_alloc(Rpc_cap_factory *owner,
 	Rpc_obj_key const rpc_obj_key(++unique_id_cnt);
 
 	// XXX remove cast
-	return Capability_space::create_rpc_obj_cap(ep, (Cap_session*)owner, rpc_obj_key);
+	return Capability_space::create_rpc_obj_cap(ep, (Pd_session*)owner, rpc_obj_key);
 }
 
 

repos/base/include/base/rpc_server.h

@@ -21,7 +21,7 @@
 #include <base/lock.h>
 #include <base/log.h>
 #include <base/trace/events.h>
-#include <cap_session/cap_session.h>
+#include <pd_session/pd_session.h>
 
 namespace Genode {
 
@@ -396,7 +396,7 @@ class Genode::Rpc_entrypoint : Thread, public Object_pool<Rpc_object_base>
 		/**
 		 * Constructor
 		 *
-		 * \param cap_session  'Cap_session' for creating capabilities
+		 * \param pd_session   'Pd_session' for creating capabilities
 		 *                     for the RPC objects managed by this entry
 		 *                     point
 		 * \param stack_size   stack size of entrypoint thread

repos/base/include/cap_session/cap_session.h

@@ -8,6 +8,10 @@
  * This header is scheduled for removal. It exists for API compatiblity only.
  */
 
+#ifndef INCLUDED_BY_ENTRYPOINT_CC
+#warning cap_session/cap_session.h is deprecated
+#endif
+
 /*
  * Copyright (C) 2006-2013 Genode Labs GmbH
  *

repos/base/src/core/include/irq_root.h

@@ -47,15 +47,15 @@ class Genode::Irq_root : public Root_component<Irq_session_component>
 		/**
 		 * Constructor
 		 *
-		 * \param cap_session  capability allocator
+		 * \param pd_session   capability allocator
 		 * \param irq_alloc    IRQ range that can be assigned to clients
 		 * \param md_alloc     meta-data allocator to be used by root component
 		 */
-		Irq_root(Cap_session *cap_session,
+		Irq_root(Pd_session *pd_session,
 		         Range_allocator *irq_alloc, Allocator *md_alloc)
 		:
 			Root_component<Irq_session_component>(&_session_ep, md_alloc),
-			_session_ep(cap_session, STACK_SIZE, "irq"),
+			_session_ep(pd_session, STACK_SIZE, "irq"),
 			_irq_alloc(irq_alloc)
 		{ }
 };

repos/base/src/core/include/pager.h

@@ -20,7 +20,6 @@
 #include <base/session_label.h>
 #include <base/thread.h>
 #include <base/object_pool.h>
-#include <cap_session/cap_session.h>
 #include <pager/capability.h>
 #include <ipc_pager.h>
 

repos/base/src/lib/ldso/include/file.h

@@ -15,7 +15,7 @@
 #define _INCLUDE__FILE_H_
 
 /* Genode includes */
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 
 /* local includes */
 #include <util.h>

repos/base/src/test/rm_fault/main.cc

@@ -21,7 +21,7 @@
 #include <base/log.h>
 #include <base/child.h>
 #include <rm_session/connection.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 
 using namespace Genode;
 

repos/dde_linux/src/drivers/framebuffer/intel/include/component.h

@@ -22,9 +22,9 @@
 #include <framebuffer_session/framebuffer_session.h>
 #include <timer_session/connection.h>
 #include <util/reconstructible.h>
-#include <os/attached_dataspace.h>
-#include <os/attached_ram_dataspace.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_dataspace.h>
+#include <base/attached_ram_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 #include <blit/blit.h>
 
 #include <lx_emul_c.h>

repos/dde_linux/src/drivers/framebuffer/intel/lx_emul.cc

@@ -15,7 +15,7 @@
 /* Genode includes */
 #include <util/bit_allocator.h>
 #include <base/log.h>
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 #include <os/reporter.h>
 
 /* local includes */

repos/dde_linux/src/drivers/wifi/main.cc

@@ -16,7 +16,7 @@
 #include <base/heap.h>
 #include <base/log.h>
 #include <base/sleep.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 #include <util/xml_node.h>
 #include <util/string.h>
 

repos/dde_linux/src/include/lx_kit/internal/pci_dev.h

@@ -21,7 +21,7 @@
 #include <platform_session/connection.h>
 #include <platform_device/client.h>
 #include <io_mem_session/connection.h>
-#include <os/attached_dataspace.h>
+#include <base/attached_dataspace.h>
 #include <util/retry.h>
 
 /* Linux emulation environment includes */

repos/dde_linux/src/lib/usb/spec/arm/platform_device.cc

@@ -11,7 +11,7 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 #include <lx_emul.h>
 
 #include <lx_kit/malloc.h>

repos/dde_linux/src/lib/usb/spec/arndale/platform.cc

@@ -13,7 +13,7 @@
 
 /* Genode */
 #include <drivers/board_base.h>
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 #include <io_mem_session/connection.h>
 #include <regulator/consts.h>
 #include <regulator_session/connection.h>

repos/dde_linux/src/lib/usb/spec/odroid_x2/platform.cc

@@ -16,7 +16,7 @@
 
 /* Genode */
 #include <drivers/board_base.h>
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 #include <io_mem_session/connection.h>
 #include <regulator/consts.h>
 #include <regulator_session/connection.h>

repos/dde_linux/src/lib/wpa_supplicant/reporter.cc

@@ -13,7 +13,7 @@
 
 /* Genode includes */
 #include <base/log.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 #include <os/reporter.h>
 #include <util/string.h>
 

repos/dde_linux/src/lx_kit/mapped_io_mem_range.cc

@@ -12,7 +12,7 @@
  */
 
 /* Genode includes */
-#include <os/attached_dataspace.h>
+#include <base/attached_dataspace.h>
 #include <io_mem_session/io_mem_session.h>
 #include <rm_session/connection.h>
 #include <region_map/client.h>

repos/dde_linux/src/server/usb_terminal/main.cc

@@ -14,7 +14,7 @@
 
 #include <base/component.h>
 #include <base/heap.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 #include <os/ring_buffer.h>
 #include <os/static_root.h>
 #include <terminal_session/terminal_session.h>

repos/dde_linux/src/test/framebuffer/intel/main.cc

@@ -17,7 +17,7 @@
 #include <base/log.h>
 #include <file_system_session/connection.h>
 #include <file_system/util.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 #include <util/xml_generator.h>
 #include <util/xml_node.h>
 

repos/gems/include/gems/chunky_texture.h

@@ -16,7 +16,7 @@
 
 #include <os/surface.h>
 #include <os/texture.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 
 template <typename PT>
 class Chunky_texture : Genode::Attached_ram_dataspace, public Genode::Texture<PT>

repos/gems/include/gems/local_reporter.h

@@ -15,7 +15,7 @@
 #define _INCLUDE__GEMS__LOCAL_REPORTER_H_
 
 /* Genode includes */
-#include <os/attached_dataspace.h>
+#include <base/attached_dataspace.h>
 #include <util/xml_generator.h>
 #include <report_session/client.h>
 

repos/gems/include/gems/nitpicker_buffer.h

@@ -17,8 +17,8 @@
 /* Genode includes */
 #include <ram_session/ram_session.h>
 #include <nitpicker_session/connection.h>
-#include <os/attached_dataspace.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 #include <os/surface.h>
 #include <os/pixel_rgb565.h>
 #include <os/pixel_alpha8.h>

repos/gems/include/nano3d/scene.h

@@ -25,7 +25,7 @@
 #include <nitpicker_session/connection.h>
 #include <os/surface.h>
 #include <os/pixel_alpha8.h>
-#include <os/attached_dataspace.h>
+#include <base/attached_dataspace.h>
 #include <input/event.h>
 
 namespace Nano3d {

repos/gems/src/app/cpu_load_display/main.cc

@@ -13,7 +13,7 @@
 
 /* Genode includes */
 #include <base/component.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 #include <polygon_gfx/shaded_polygon_painter.h>
 #include <polygon_gfx/interpolate_rgb565.h>
 #include <os/pixel_alpha8.h>

repos/gems/src/app/launcher/dialog_nitpicker.h

@@ -21,7 +21,7 @@
 /* Genode includes */
 #include <util/string.h>
 #include <base/entrypoint.h>
-#include <os/attached_dataspace.h>
+#include <base/attached_dataspace.h>
 #include <nitpicker_session/nitpicker_session.h>
 #include <input_session/client.h>
 #include <input/event.h>

repos/gems/src/app/launcher/main.cc

@@ -15,7 +15,7 @@
 #include <base/component.h>
 #include <decorator/xml_utils.h>
 #include <util/reconstructible.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 #include <nitpicker_session/connection.h>
 
 /* local includes */

repos/gems/src/app/mixer_gui_qt/main.cpp

@@ -7,7 +7,7 @@
 /* Genode includes */
 #include <base/log.h>
 #include <base/thread.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 
 /* Qt includes */
 #include <QApplication>

repos/gems/src/app/mixer_gui_qt/main_window.cpp

@@ -14,7 +14,7 @@
 /* Genode includes */
 #include <base/log.h>
 #include <mixer/channel.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 #include <os/config.h>
 #include <os/reporter.h>
 #include <rom_session/connection.h>

repos/gems/src/app/themed_decorator/window.h

@@ -18,7 +18,7 @@
 #include <ram_session/ram_session.h>
 #include <decorator/window.h>
 #include <nitpicker_session/connection.h>
-#include <os/attached_dataspace.h>
+#include <base/attached_dataspace.h>
 #include <util/reconstructible.h>
 
 /* demo includes */

repos/gems/src/server/cpu_sampler/main.cc

@@ -16,7 +16,7 @@
 #include <base/component.h>
 #include <base/heap.h>
 #include <cpu_session/cpu_session.h>
-#include <os/attached_dataspace.h>
+#include <base/attached_dataspace.h>
 #include <os/server.h>
 #include <os/session_policy.h>
 #include <os/static_root.h>

repos/gems/src/server/file_terminal/main.cc

@@ -17,7 +17,7 @@
 #include <base/rpc_server.h>
 #include <base/sleep.h>
 #include <cap_session/connection.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 #include <os/session_policy.h>
 #include <root/component.h>
 #include <terminal_session/terminal_session.h>

repos/gems/src/server/tcp_terminal/main.cc

@@ -20,7 +20,7 @@
 #include <root/component.h>
 #include <terminal_session/terminal_session.h>
 #include <cap_session/connection.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 #include <os/session_policy.h>
 
 /* socket API */

repos/gems/src/server/terminal_mux/main.cc

@@ -18,7 +18,7 @@
 #include <base/session_label.h>
 #include <util/arg_string.h>
 #include <root/component.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 #include <timer_session/connection.h>
 
 /* terminal includes */

repos/libports/src/app/acpica/os.cc

@@ -19,7 +19,7 @@
 #include <irq_session/connection.h>
 #include <io_port_session/connection.h>
 
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 #include <os/reporter.h>
 
 #include <util/reconstructible.h>

repos/libports/src/lib/acpica/scan_root.cc

@@ -12,7 +12,7 @@
  */
 
 #include <io_mem_session/connection.h>
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 
 #include "env.h"
 

repos/libports/src/lib/qemu-usb/host.cc

@@ -8,7 +8,7 @@
 #include <base/allocator_avl.h>
 #include <base/sleep.h>
 #include <base/log.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 #include <os/server.h>
 #include <os/signal_rpc_dispatcher.h>
 #include <usb_session/connection.h>

repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qgenodeclipboard.h

@@ -19,7 +19,7 @@
 #ifndef QT_NO_CLIPBOARD
 
 /* Genode includes */
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 #include <os/reporter.h>
 #include <qoost/qmember.h>
 

repos/libports/src/server/acpi_input/main.cc

@@ -21,7 +21,7 @@
 /* os includes */
 #include <input/component.h>
 #include <input/root.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 
 namespace Transform {
 	using Genode::Xml_node;

repos/libports/src/server/ffat_fs/main.cc

@@ -16,7 +16,7 @@
 #include <file_system_session/rpc_object.h>
 #include <root/component.h>
 #include <cap_session/connection.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 #include <os/config.h>
 #include <os/session_policy.h>
 #include <util/xml_node.h>

repos/libports/src/server/fuse_fs/fuse_fs_main.cc

@@ -15,7 +15,7 @@
 #include <base/heap.h>
 #include <file_system/node_handle_registry.h>
 #include <file_system_session/rpc_object.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 #include <os/config.h>
 #include <os/session_policy.h>
 #include <root/component.h>

repos/os/include/input/component.h

@@ -16,7 +16,7 @@
 
 #include <base/env.h>
 #include <base/rpc_server.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 #include <os/ring_buffer.h>
 #include <root/component.h>
 #include <input_session/input_session.h>

repos/os/include/nic/component.h

@@ -15,7 +15,7 @@
 #ifndef _INCLUDE__NIC__COMPONENT_H_
 #define _INCLUDE__NIC__COMPONENT_H_
 
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 #include <os/server.h>
 #include <nic/packet_allocator.h>
 #include <nic_session/rpc_object.h>

repos/os/include/nitpicker_session/client.h

@@ -16,7 +16,7 @@
 
 #include <nitpicker_session/capability.h>
 #include <base/rpc_client.h>
-#include <os/attached_dataspace.h>
+#include <base/attached_dataspace.h>
 
 namespace Nitpicker { struct Session_client; }
 

repos/os/include/os/attached_dataspace.h

@@ -13,6 +13,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+#warning os/attached_dataspace.h is deprecated, use base/attached_dataspace.h instead
+
 #ifndef _INCLUDE__OS__ATTACHED_DATASPACE_H_
 #define _INCLUDE__OS__ATTACHED_DATASPACE_H_
 

repos/os/include/os/attached_io_mem_dataspace.h

@@ -13,6 +13,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+#warning os/attached_io_mem_dataspace.h is deprecated, use base/attached_io_mem_dataspace.h instead
+
 #ifndef _INCLUDE__OS__ATTACHED_IO_MEM_DATASPACE_H_
 #define _INCLUDE__OS__ATTACHED_IO_MEM_DATASPACE_H_
 

repos/os/include/os/attached_mmio.h

@@ -15,7 +15,7 @@
 #define _INCLUDE__OS__ATTACHED_MMIO_H_
 
 /* Genode includes */
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 #include <util/mmio.h>
 
 namespace Genode { class Attached_mmio; }

repos/os/include/os/attached_ram_dataspace.h

@@ -13,6 +13,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+#warning os/attached_ram_dataspace.h is deprecated, use base/attached_ram_dataspace.h instead
+
 #ifndef _INCLUDE__OS__ATTACHED_RAM_DATASPACE_H_
 #define _INCLUDE__OS__ATTACHED_RAM_DATASPACE_H_
 

repos/os/include/os/attached_rom_dataspace.h

@@ -13,6 +13,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+#warning os/attached_rom_dataspace.h is deprecated, use base/attached_rom_dataspace.h instead
+
 #ifndef _INCLUDE__OS__ATTACHED_ROM_DATASPACE_H_
 #define _INCLUDE__OS__ATTACHED_ROM_DATASPACE_H_
 

repos/os/include/os/child_policy_dynamic_rom.h

@@ -20,7 +20,7 @@
 #include <ram_session/ram_session.h>
 #include <rom_session/rom_session.h>
 #include <base/rpc_server.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 
 namespace Genode { class Child_policy_dynamic_rom_file; }
 

repos/os/include/os/config.h

@@ -11,6 +11,12 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+#ifndef INCLUDED_BY_OS_CONFIG_CC
+#ifndef INCLUDED_FROM_OS_SESSION_POLICY_H
+#warning os/config.h is deprecated, use 'Attached_rom_dataspace' instead
+#endif
+#endif
+
 #ifndef _INCLUDE__OS__CONFIG_H_
 #define _INCLUDE__OS__CONFIG_H_
 

repos/os/include/os/reporter.h

@@ -15,7 +15,7 @@
 #define _INCLUDE__OS__REPORTER_H_
 
 #include <util/reconstructible.h>
-#include <os/attached_dataspace.h>
+#include <base/attached_dataspace.h>
 #include <report_session/connection.h>
 #include <util/xml_generator.h>
 

repos/os/include/os/session_policy.h

@@ -15,9 +15,13 @@
 #define _INCLUDE__OS__SESSION_POLICY_H_
 
 #include <util/arg_string.h>
-#include <os/config.h>
 #include <base/session_label.h>
 
+/* to be removed along with the \deprecated API */
+#define INCLUDED_FROM_OS_SESSION_POLICY_H
+#include <os/config.h>
+#undef INCLUDED_FROM_OS_SESSION_POLICY_H
+
 namespace Genode {
 
 	struct Xml_node_label_score;

repos/os/include/os/signal_rpc_dispatcher.h

@@ -8,6 +8,8 @@
  *              The header will eventually be removed.
  */
 
+#warning os/signal_rpc_dispatcher.h is deprecated
+
 /*
  * Copyright (C) 2013 Genode Labs GmbH
  *

repos/os/include/terminal_session/client.h

@@ -19,7 +19,7 @@
 #include <util/string.h>
 #include <base/lock.h>
 #include <base/rpc_client.h>
-#include <os/attached_dataspace.h>
+#include <base/attached_dataspace.h>
 
 #include <terminal_session/terminal_session.h>
 

repos/os/src/app/rom_to_file/main.cc

@@ -15,7 +15,7 @@
 #include <rom_session/connection.h>
 #include <base/signal.h>
 #include <os/config.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 #include <util/print_lines.h>
 #include <os/server.h>
 #include <util/reconstructible.h>

repos/os/src/app/usb_report_filter/main.cc

@@ -13,7 +13,7 @@
 
 /* Genode includes */
 #include <base/allocator_avl.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 #include <os/config.h>
 #include <os/reporter.h>
 #include <os/server.h>

repos/os/src/drivers/framebuffer/spec/imx53/driver.h

@@ -16,7 +16,7 @@
 
 /* Genode includes */
 #include <drivers/board_base.h>
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 #include <io_mem_session/connection.h>
 #include <gpio_session/connection.h>
 #include <platform_session/connection.h>

repos/os/src/drivers/framebuffer/spec/imx53/ipu.h

@@ -19,7 +19,7 @@
 #include <util/mmio.h>
 #include <util/string.h>
 #include <drivers/board_base.h>
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 
 
 class Ipu : Genode::Mmio

repos/os/src/drivers/framebuffer/spec/omap4/driver.h

@@ -14,7 +14,7 @@
 
 /* Genode includes */
 #include <drivers/board_base.h>
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 #include <timer_session/connection.h>
 #include <util/mmio.h>
 

repos/os/src/drivers/gpio/spec/exynos4/gpio.h

@@ -18,7 +18,7 @@
 #define _GPIO_H_
 
 /* Genode includes */
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 #include <util/mmio.h>
 
 #include <base/printf.h>

repos/os/src/drivers/gpio/spec/imx53/gpio.h

@@ -17,7 +17,7 @@
 #define _DRIVERS__GPIO__SPEC__IMX53__GPIO_H_
 
 /* Genode includes */
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 #include <util/mmio.h>
 
 struct Gpio_reg : Genode::Attached_io_mem_dataspace, Genode::Mmio

repos/os/src/drivers/gpio/spec/omap4/gpio.h

@@ -17,7 +17,7 @@
 #define _DRIVERS__GPIO__SPEC__OMAP4__GPIO_H_
 
 /* Genode includes */
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 #include <util/mmio.h>
 
 struct Gpio_reg : Genode::Attached_io_mem_dataspace, Genode::Mmio

repos/os/src/drivers/gpio/spec/rpi/gpio.h

@@ -19,7 +19,7 @@
 
 /* Genode includes */
 #include <base/printf.h>
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 #include <util/mmio.h>
 #include <timer_session/connection.h>
 

repos/os/src/drivers/input/spec/imx53/egalax_ts.h

@@ -16,7 +16,7 @@
 
 /* Genode includes */
 #include <drivers/board_base.h>
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 #include <input/event_queue.h>
 #include <input/event.h>
 #include <input/keycodes.h>

repos/os/src/drivers/input/spec/imx53/mpr121.h

@@ -16,7 +16,7 @@
 
 /* Genode includes */
 #include <drivers/board_base.h>
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 #include <input/event_queue.h>
 #include <input/event.h>
 #include <input/keycodes.h>

repos/os/src/drivers/nic/spec/gem/buffer_descriptor.h

@@ -15,7 +15,7 @@
 #define _INCLUDE__DRIVERS__NIC__GEM__BUFFER_DESCRIPTOR_H_
 
 /* Genode includes */
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 #include <util/mmio.h>
 
 using namespace Genode;

repos/os/src/drivers/platform/spec/imx53/ccm.h

@@ -18,7 +18,7 @@
 /* Genode includes */
 #include <util/mmio.h>
 #include <drivers/board_base.h>
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 
 class Ccm : public Genode::Attached_io_mem_dataspace,
             Genode::Mmio

repos/os/src/drivers/platform/spec/imx53/iim.h

@@ -17,7 +17,7 @@
 /* Genode includes */
 #include <util/mmio.h>
 #include <drivers/board_base.h>
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 
 class Iim : public Genode::Attached_io_mem_dataspace,
             Genode::Mmio

repos/os/src/drivers/platform/spec/imx53/iomux.h

@@ -17,7 +17,7 @@
 /* Genode includes */
 #include <util/mmio.h>
 #include <drivers/board_base.h>
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 
 class Iomux : public Genode::Attached_io_mem_dataspace,
                Genode::Mmio

repos/os/src/drivers/platform/spec/imx53/src.h

@@ -18,7 +18,7 @@
 /* Genode includes */
 #include <util/mmio.h>
 #include <drivers/board_base.h>
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 
 class Src : public Genode::Attached_io_mem_dataspace,
             Genode::Mmio

repos/os/src/drivers/platform/spec/rpi/mbox.h

@@ -18,7 +18,7 @@
 #include <util/mmio.h>
 #include <base/env.h>
 #include <os/attached_mmio.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 #include <base/log.h>
 #include <dataspace/client.h>
 #include <timer_session/connection.h>

repos/os/src/drivers/sd_card/adma2.h

@@ -16,7 +16,7 @@
 
 /* Genode includes */
 #include <util/register.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 
 namespace Adma2
 {

repos/os/src/drivers/sd_card/spec/exynos5/driver.h

@@ -21,7 +21,7 @@
 #include <drivers/board_base.h>
 #include <regulator_session/connection.h>
 #include <irq_session/connection.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 
 /* local includes */
 #include <driver_base.h>

repos/os/src/drivers/timer/fiasco/time_source.cc

@@ -15,7 +15,7 @@
 
 /* Genode includes */
 #include <util/misc_math.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 
 /* Fiasco includes */
 namespace Fiasco {

repos/os/src/drivers/timer/nova/time_source.cc

@@ -13,7 +13,7 @@
  */
 
 /* Genode includes */
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 
 /* NOVA includes */
 #include <nova/native_thread.h>

repos/os/src/drivers/uart/main.cc

@@ -14,7 +14,7 @@
 /* Genode includes */
 #include <base/heap.h>
 #include <base/log.h>
-#include <os/attached_io_mem_dataspace.h>
+#include <base/attached_io_mem_dataspace.h>
 
 /* local includes */
 #include <uart_component.h>

repos/os/src/lib/config/config.cc

@@ -13,7 +13,9 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+#define INCLUDED_BY_OS_CONFIG_CC
 #include <os/config.h>
+#undef INCLUDED_BY_OS_CONFIG_CC
 
 using namespace Genode;
 

repos/os/src/server/dynamic_rom/main.cc

@@ -18,8 +18,8 @@
 #include <base/component.h>
 #include <base/session_label.h>
 #include <base/log.h>
-#include <os/attached_rom_dataspace.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_rom_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 #include <rom_session/rom_session.h>
 #include <timer_session/connection.h>
 #include <root/component.h>

repos/os/src/server/iso9660/main.cc

@@ -19,7 +19,7 @@
 #include <dataspace/client.h>
 #include <root/component.h>
 #include <util/avl_string.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 #include <base/session_label.h>
 #include <block_session/connection.h>
 #include <rom_session/rom_session.h>

repos/os/src/server/loader/rom.h

@@ -16,8 +16,8 @@
 
 #include <rom_session/rom_session.h>
 #include <base/rpc_server.h>
-#include <os/attached_ram_dataspace.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_ram_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 
 namespace Genode {
 

repos/os/src/server/log_report/main.cc

@@ -19,7 +19,7 @@
 #include <base/log.h>
 #include <base/session_label.h>
 #include <root/component.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 
 
 namespace Report {

repos/os/src/server/log_terminal/main.cc

@@ -15,7 +15,7 @@
 #include <base/component.h>
 #include <base/heap.h>
 #include <root/component.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 #include <terminal_session/terminal_session.h>
 #include <log_session/log_session.h>
 

repos/os/src/server/part_blk/main.cc

@@ -13,7 +13,7 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 #include <block_session/rpc_object.h>
 
 #include "component.h"

repos/os/src/server/ram_fs/main.cc

@@ -18,7 +18,7 @@
 #include <base/attached_rom_dataspace.h>
 #include <base/heap.h>
 #include <root/component.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 #include <os/session_policy.h>
 
 /* local includes */

repos/os/src/server/terminal_crosslink/terminal_session_component.h

@@ -16,7 +16,7 @@
 
 /* Genode includes */
 #include <base/rpc_server.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 #include <os/ring_buffer.h>
 #include <terminal_session/terminal_session.h>
 

repos/os/src/server/trace_fs/main.cc

@@ -15,7 +15,7 @@
 #include <base/component.h>
 #include <file_system/node_handle_registry.h>
 #include <file_system_session/rpc_object.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 #include <os/config.h>
 #include <os/server.h>
 #include <os/session_policy.h>

repos/os/src/server/tz_vmm/include/serial_driver.h

@@ -15,7 +15,7 @@
 #define _SERIAL_DRIVER_H_
 
 /* Genode includes */
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 
 /* local includes */
 #include <vm_base.h>

repos/os/src/test/dynamic_config/server/main.cc

@@ -16,7 +16,7 @@
  */
 
 /* Genode includes */
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 #include <os/static_root.h>
 #include <timer_session/connection.h>
 #include <rom_session/rom_session.h>

repos/os/src/test/fb_bench/main.cc

@@ -15,7 +15,7 @@
 /* Genode includes */
 #include <base/component.h>
 #include <base/heap.h>
-#include <os/attached_dataspace.h>
+#include <base/attached_dataspace.h>
 #include <blit/blit.h>
 #include <framebuffer_session/connection.h>
 #include <timer_session/connection.h>

repos/os/src/test/framebuffer/main.cc

@@ -18,7 +18,7 @@
 #include <base/log.h>
 #include <dataspace/client.h>
 #include <framebuffer_session/connection.h>
-#include <os/attached_dataspace.h>
+#include <base/attached_dataspace.h>
 #include <util/reconstructible.h>
 
 

repos/os/src/test/iso/main.cc

@@ -13,7 +13,7 @@
 
 #include <base/component.h>
 #include <base/log.h>
-#include <os/attached_rom_dataspace.h>
+#include <base/attached_rom_dataspace.h>
 
 using namespace Genode;
 

repos/os/src/test/sd_card_bench/main.cc

@@ -15,7 +15,7 @@
 /* Genode includes */
 #include <base/component.h>
 #include <timer_session/connection.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 #include <base/attached_rom_dataspace.h>
 
 /* local includes */

repos/ports/src/app/vbox_pointer/policy.cc

@@ -13,8 +13,8 @@
  */
 
 /* Genode includes */
-#include <os/attached_rom_dataspace.h>
-#include <os/attached_ram_dataspace.h>
+#include <base/attached_rom_dataspace.h>
+#include <base/attached_ram_dataspace.h>
 #include <os/pixel_alpha8.h>
 #include <os/pixel_rgb888.h>
 #include <os/surface.h>