From cd3a5852d6aaccb0430d347ead0c8c99b8047524 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Mon, 30 Jan 2017 11:35:12 +0100
Subject: [PATCH] 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                   | 1 -
 repos/base-nova/src/core/include/pager.h                    | 1 -
 repos/base-nova/src/test/platform/main.cc                   | 2 +-
 repos/base-sel4/src/core/include/pager.h                    | 1 -
 repos/base-sel4/src/core/rpc_cap_factory.cc                 | 4 ++--
 repos/base/include/base/rpc_server.h                        | 4 ++--
 repos/base/include/cap_session/cap_session.h                | 4 ++++
 repos/base/src/core/include/irq_root.h                      | 6 +++---
 repos/base/src/core/include/pager.h                         | 1 -
 repos/base/src/lib/ldso/include/file.h                      | 2 +-
 repos/base/src/test/rm_fault/main.cc                        | 2 +-
 .../src/drivers/framebuffer/intel/include/component.h       | 6 +++---
 repos/dde_linux/src/drivers/framebuffer/intel/lx_emul.cc    | 2 +-
 repos/dde_linux/src/drivers/wifi/main.cc                    | 2 +-
 repos/dde_linux/src/include/lx_kit/internal/pci_dev.h       | 2 +-
 repos/dde_linux/src/lib/usb/spec/arm/platform_device.cc     | 2 +-
 repos/dde_linux/src/lib/usb/spec/arndale/platform.cc        | 2 +-
 repos/dde_linux/src/lib/usb/spec/odroid_x2/platform.cc      | 2 +-
 repos/dde_linux/src/lib/wpa_supplicant/reporter.cc          | 2 +-
 repos/dde_linux/src/lx_kit/mapped_io_mem_range.cc           | 2 +-
 repos/dde_linux/src/server/usb_terminal/main.cc             | 2 +-
 repos/dde_linux/src/test/framebuffer/intel/main.cc          | 2 +-
 repos/gems/include/gems/chunky_texture.h                    | 2 +-
 repos/gems/include/gems/local_reporter.h                    | 2 +-
 repos/gems/include/gems/nitpicker_buffer.h                  | 4 ++--
 repos/gems/include/nano3d/scene.h                           | 2 +-
 repos/gems/src/app/cpu_load_display/main.cc                 | 2 +-
 repos/gems/src/app/launcher/dialog_nitpicker.h              | 2 +-
 repos/gems/src/app/launcher/main.cc                         | 2 +-
 repos/gems/src/app/mixer_gui_qt/main.cpp                    | 2 +-
 repos/gems/src/app/mixer_gui_qt/main_window.cpp             | 2 +-
 repos/gems/src/app/themed_decorator/window.h                | 2 +-
 repos/gems/src/server/cpu_sampler/main.cc                   | 2 +-
 repos/gems/src/server/file_terminal/main.cc                 | 2 +-
 repos/gems/src/server/tcp_terminal/main.cc                  | 2 +-
 repos/gems/src/server/terminal_mux/main.cc                  | 2 +-
 repos/libports/src/app/acpica/os.cc                         | 2 +-
 repos/libports/src/lib/acpica/scan_root.cc                  | 2 +-
 repos/libports/src/lib/qemu-usb/host.cc                     | 2 +-
 .../src/plugins/platforms/nitpicker/qgenodeclipboard.h      | 2 +-
 repos/libports/src/server/acpi_input/main.cc                | 2 +-
 repos/libports/src/server/ffat_fs/main.cc                   | 2 +-
 repos/libports/src/server/fuse_fs/fuse_fs_main.cc           | 2 +-
 repos/os/include/input/component.h                          | 2 +-
 repos/os/include/nic/component.h                            | 2 +-
 repos/os/include/nitpicker_session/client.h                 | 2 +-
 repos/os/include/os/attached_dataspace.h                    | 2 ++
 repos/os/include/os/attached_io_mem_dataspace.h             | 2 ++
 repos/os/include/os/attached_mmio.h                         | 2 +-
 repos/os/include/os/attached_ram_dataspace.h                | 2 ++
 repos/os/include/os/attached_rom_dataspace.h                | 2 ++
 repos/os/include/os/child_policy_dynamic_rom.h              | 2 +-
 repos/os/include/os/config.h                                | 6 ++++++
 repos/os/include/os/reporter.h                              | 2 +-
 repos/os/include/os/session_policy.h                        | 6 +++++-
 repos/os/include/os/signal_rpc_dispatcher.h                 | 2 ++
 repos/os/include/terminal_session/client.h                  | 2 +-
 repos/os/src/app/rom_to_file/main.cc                        | 2 +-
 repos/os/src/app/usb_report_filter/main.cc                  | 2 +-
 repos/os/src/drivers/framebuffer/spec/imx53/driver.h        | 2 +-
 repos/os/src/drivers/framebuffer/spec/imx53/ipu.h           | 2 +-
 repos/os/src/drivers/framebuffer/spec/omap4/driver.h        | 2 +-
 repos/os/src/drivers/gpio/spec/exynos4/gpio.h               | 2 +-
 repos/os/src/drivers/gpio/spec/imx53/gpio.h                 | 2 +-
 repos/os/src/drivers/gpio/spec/omap4/gpio.h                 | 2 +-
 repos/os/src/drivers/gpio/spec/rpi/gpio.h                   | 2 +-
 repos/os/src/drivers/input/spec/imx53/egalax_ts.h           | 2 +-
 repos/os/src/drivers/input/spec/imx53/mpr121.h              | 2 +-
 repos/os/src/drivers/nic/spec/gem/buffer_descriptor.h       | 2 +-
 repos/os/src/drivers/platform/spec/imx53/ccm.h              | 2 +-
 repos/os/src/drivers/platform/spec/imx53/iim.h              | 2 +-
 repos/os/src/drivers/platform/spec/imx53/iomux.h            | 2 +-
 repos/os/src/drivers/platform/spec/imx53/src.h              | 2 +-
 repos/os/src/drivers/platform/spec/rpi/mbox.h               | 2 +-
 repos/os/src/drivers/sd_card/adma2.h                        | 2 +-
 repos/os/src/drivers/sd_card/spec/exynos5/driver.h          | 2 +-
 repos/os/src/drivers/timer/fiasco/time_source.cc            | 2 +-
 repos/os/src/drivers/timer/nova/time_source.cc              | 2 +-
 repos/os/src/drivers/uart/main.cc                           | 2 +-
 repos/os/src/lib/config/config.cc                           | 2 ++
 repos/os/src/server/dynamic_rom/main.cc                     | 4 ++--
 repos/os/src/server/iso9660/main.cc                         | 2 +-
 repos/os/src/server/loader/rom.h                            | 4 ++--
 repos/os/src/server/log_report/main.cc                      | 2 +-
 repos/os/src/server/log_terminal/main.cc                    | 2 +-
 repos/os/src/server/part_blk/main.cc                        | 2 +-
 repos/os/src/server/ram_fs/main.cc                          | 2 +-
 .../server/terminal_crosslink/terminal_session_component.h  | 2 +-
 repos/os/src/server/trace_fs/main.cc                        | 2 +-
 repos/os/src/server/tz_vmm/include/serial_driver.h          | 2 +-
 repos/os/src/test/dynamic_config/server/main.cc             | 2 +-
 repos/os/src/test/fb_bench/main.cc                          | 2 +-
 repos/os/src/test/framebuffer/main.cc                       | 2 +-
 repos/os/src/test/iso/main.cc                               | 2 +-
 repos/os/src/test/sd_card_bench/main.cc                     | 2 +-
 repos/ports/src/app/vbox_pointer/policy.cc                  | 4 ++--
 96 files changed, 120 insertions(+), 98 deletions(-)

diff --git a/repos/base-linux/src/core/include/pager.h b/repos/base-linux/src/core/include/pager.h
index 7b736563a..36de7a3e4 100644
--- a/repos/base-linux/src/core/include/pager.h
+++ b/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 */
diff --git a/repos/base-nova/src/core/include/pager.h b/repos/base-nova/src/core/include/pager.h
index 9b608bcd2..ebb91038f 100644
--- a/repos/base-nova/src/core/include/pager.h
+++ b/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 */
diff --git a/repos/base-nova/src/test/platform/main.cc b/repos/base-nova/src/test/platform/main.cc
index d24734ceb..fa800e410 100644
--- a/repos/base-nova/src/test/platform/main.cc
+++ b/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>
diff --git a/repos/base-sel4/src/core/include/pager.h b/repos/base-sel4/src/core/include/pager.h
index b809607be..c7901e124 100644
--- a/repos/base-sel4/src/core/include/pager.h
+++ b/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>
 
diff --git a/repos/base-sel4/src/core/rpc_cap_factory.cc b/repos/base-sel4/src/core/rpc_cap_factory.cc
index 493ed9dff..798411148 100644
--- a/repos/base-sel4/src/core/rpc_cap_factory.cc
+++ b/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);
 }
 
 
diff --git a/repos/base/include/base/rpc_server.h b/repos/base/include/base/rpc_server.h
index 04ad43853..6efc31514 100644
--- a/repos/base/include/base/rpc_server.h
+++ b/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
diff --git a/repos/base/include/cap_session/cap_session.h b/repos/base/include/cap_session/cap_session.h
index e9cbc7389..b9651544d 100644
--- a/repos/base/include/cap_session/cap_session.h
+++ b/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
  *
diff --git a/repos/base/src/core/include/irq_root.h b/repos/base/src/core/include/irq_root.h
index af6c710e1..876c5ca0d 100644
--- a/repos/base/src/core/include/irq_root.h
+++ b/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)
 		{ }
 };
diff --git a/repos/base/src/core/include/pager.h b/repos/base/src/core/include/pager.h
index 8b012589c..85654879e 100644
--- a/repos/base/src/core/include/pager.h
+++ b/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>
 
diff --git a/repos/base/src/lib/ldso/include/file.h b/repos/base/src/lib/ldso/include/file.h
index c8a09935b..de7ec1c38 100644
--- a/repos/base/src/lib/ldso/include/file.h
+++ b/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>
diff --git a/repos/base/src/test/rm_fault/main.cc b/repos/base/src/test/rm_fault/main.cc
index 81d13f4b5..953eaeb0f 100644
--- a/repos/base/src/test/rm_fault/main.cc
+++ b/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;
 
diff --git a/repos/dde_linux/src/drivers/framebuffer/intel/include/component.h b/repos/dde_linux/src/drivers/framebuffer/intel/include/component.h
index b66d5f331..dba8cb734 100644
--- a/repos/dde_linux/src/drivers/framebuffer/intel/include/component.h
+++ b/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>
diff --git a/repos/dde_linux/src/drivers/framebuffer/intel/lx_emul.cc b/repos/dde_linux/src/drivers/framebuffer/intel/lx_emul.cc
index 23b148447..d4e90be9e 100644
--- a/repos/dde_linux/src/drivers/framebuffer/intel/lx_emul.cc
+++ b/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 */
diff --git a/repos/dde_linux/src/drivers/wifi/main.cc b/repos/dde_linux/src/drivers/wifi/main.cc
index 678d7426d..db0b0bbb8 100644
--- a/repos/dde_linux/src/drivers/wifi/main.cc
+++ b/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>
 
diff --git a/repos/dde_linux/src/include/lx_kit/internal/pci_dev.h b/repos/dde_linux/src/include/lx_kit/internal/pci_dev.h
index 16790777c..6a500f3b3 100644
--- a/repos/dde_linux/src/include/lx_kit/internal/pci_dev.h
+++ b/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 */
diff --git a/repos/dde_linux/src/lib/usb/spec/arm/platform_device.cc b/repos/dde_linux/src/lib/usb/spec/arm/platform_device.cc
index a61bc55a0..66c636529 100644
--- a/repos/dde_linux/src/lib/usb/spec/arm/platform_device.cc
+++ b/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>
diff --git a/repos/dde_linux/src/lib/usb/spec/arndale/platform.cc b/repos/dde_linux/src/lib/usb/spec/arndale/platform.cc
index 869be0221..4d1a29307 100644
--- a/repos/dde_linux/src/lib/usb/spec/arndale/platform.cc
+++ b/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>
diff --git a/repos/dde_linux/src/lib/usb/spec/odroid_x2/platform.cc b/repos/dde_linux/src/lib/usb/spec/odroid_x2/platform.cc
index d2289f962..30f0d3625 100644
--- a/repos/dde_linux/src/lib/usb/spec/odroid_x2/platform.cc
+++ b/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>
diff --git a/repos/dde_linux/src/lib/wpa_supplicant/reporter.cc b/repos/dde_linux/src/lib/wpa_supplicant/reporter.cc
index 8d7262f43..035c46413 100644
--- a/repos/dde_linux/src/lib/wpa_supplicant/reporter.cc
+++ b/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>
 
diff --git a/repos/dde_linux/src/lx_kit/mapped_io_mem_range.cc b/repos/dde_linux/src/lx_kit/mapped_io_mem_range.cc
index 44e5bbd4f..699161fea 100644
--- a/repos/dde_linux/src/lx_kit/mapped_io_mem_range.cc
+++ b/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>
diff --git a/repos/dde_linux/src/server/usb_terminal/main.cc b/repos/dde_linux/src/server/usb_terminal/main.cc
index 8a9f6e66c..e1391a9cb 100644
--- a/repos/dde_linux/src/server/usb_terminal/main.cc
+++ b/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>
diff --git a/repos/dde_linux/src/test/framebuffer/intel/main.cc b/repos/dde_linux/src/test/framebuffer/intel/main.cc
index cacffef0d..dbfd547da 100644
--- a/repos/dde_linux/src/test/framebuffer/intel/main.cc
+++ b/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>
 
diff --git a/repos/gems/include/gems/chunky_texture.h b/repos/gems/include/gems/chunky_texture.h
index 880ffe50b..7024eb0c3 100644
--- a/repos/gems/include/gems/chunky_texture.h
+++ b/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>
diff --git a/repos/gems/include/gems/local_reporter.h b/repos/gems/include/gems/local_reporter.h
index 0c22e2b11..2a25d51db 100644
--- a/repos/gems/include/gems/local_reporter.h
+++ b/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>
 
diff --git a/repos/gems/include/gems/nitpicker_buffer.h b/repos/gems/include/gems/nitpicker_buffer.h
index 7070c0a5c..bfb6f65d0 100644
--- a/repos/gems/include/gems/nitpicker_buffer.h
+++ b/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>
diff --git a/repos/gems/include/nano3d/scene.h b/repos/gems/include/nano3d/scene.h
index a00485ee1..490e171a8 100644
--- a/repos/gems/include/nano3d/scene.h
+++ b/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 {
diff --git a/repos/gems/src/app/cpu_load_display/main.cc b/repos/gems/src/app/cpu_load_display/main.cc
index 24a54ce77..1a86de04f 100644
--- a/repos/gems/src/app/cpu_load_display/main.cc
+++ b/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>
diff --git a/repos/gems/src/app/launcher/dialog_nitpicker.h b/repos/gems/src/app/launcher/dialog_nitpicker.h
index b01a46c87..1f712a23d 100644
--- a/repos/gems/src/app/launcher/dialog_nitpicker.h
+++ b/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>
diff --git a/repos/gems/src/app/launcher/main.cc b/repos/gems/src/app/launcher/main.cc
index 1b10dfa3e..0d0238d85 100644
--- a/repos/gems/src/app/launcher/main.cc
+++ b/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 */
diff --git a/repos/gems/src/app/mixer_gui_qt/main.cpp b/repos/gems/src/app/mixer_gui_qt/main.cpp
index 8556f867d..6ee4f02af 100644
--- a/repos/gems/src/app/mixer_gui_qt/main.cpp
+++ b/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>
diff --git a/repos/gems/src/app/mixer_gui_qt/main_window.cpp b/repos/gems/src/app/mixer_gui_qt/main_window.cpp
index 10988f394..ead3aca84 100644
--- a/repos/gems/src/app/mixer_gui_qt/main_window.cpp
+++ b/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>
diff --git a/repos/gems/src/app/themed_decorator/window.h b/repos/gems/src/app/themed_decorator/window.h
index f6c3c6e89..0675b6aca 100644
--- a/repos/gems/src/app/themed_decorator/window.h
+++ b/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 */
diff --git a/repos/gems/src/server/cpu_sampler/main.cc b/repos/gems/src/server/cpu_sampler/main.cc
index e9557eb8e..31def469d 100644
--- a/repos/gems/src/server/cpu_sampler/main.cc
+++ b/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>
diff --git a/repos/gems/src/server/file_terminal/main.cc b/repos/gems/src/server/file_terminal/main.cc
index a29bc0431..d8ba2211f 100644
--- a/repos/gems/src/server/file_terminal/main.cc
+++ b/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>
diff --git a/repos/gems/src/server/tcp_terminal/main.cc b/repos/gems/src/server/tcp_terminal/main.cc
index 876f67dfe..aa8bba879 100644
--- a/repos/gems/src/server/tcp_terminal/main.cc
+++ b/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 */
diff --git a/repos/gems/src/server/terminal_mux/main.cc b/repos/gems/src/server/terminal_mux/main.cc
index f05ec8b2f..d87b03f7f 100644
--- a/repos/gems/src/server/terminal_mux/main.cc
+++ b/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 */
diff --git a/repos/libports/src/app/acpica/os.cc b/repos/libports/src/app/acpica/os.cc
index 0ae78f192..e063371d7 100644
--- a/repos/libports/src/app/acpica/os.cc
+++ b/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>
diff --git a/repos/libports/src/lib/acpica/scan_root.cc b/repos/libports/src/lib/acpica/scan_root.cc
index b41bd7ebb..204f95641 100644
--- a/repos/libports/src/lib/acpica/scan_root.cc
+++ b/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"
 
diff --git a/repos/libports/src/lib/qemu-usb/host.cc b/repos/libports/src/lib/qemu-usb/host.cc
index ef74402d7..c46cd7412 100644
--- a/repos/libports/src/lib/qemu-usb/host.cc
+++ b/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>
diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qgenodeclipboard.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qgenodeclipboard.h
index 7b8400c9f..280d01515 100644
--- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qgenodeclipboard.h
+++ b/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>
 
diff --git a/repos/libports/src/server/acpi_input/main.cc b/repos/libports/src/server/acpi_input/main.cc
index 5a0ab9a4b..98ae5d48a 100644
--- a/repos/libports/src/server/acpi_input/main.cc
+++ b/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;
diff --git a/repos/libports/src/server/ffat_fs/main.cc b/repos/libports/src/server/ffat_fs/main.cc
index fff1c3f37..59b0cc3ba 100644
--- a/repos/libports/src/server/ffat_fs/main.cc
+++ b/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>
diff --git a/repos/libports/src/server/fuse_fs/fuse_fs_main.cc b/repos/libports/src/server/fuse_fs/fuse_fs_main.cc
index 1d23d1b08..35efa958f 100644
--- a/repos/libports/src/server/fuse_fs/fuse_fs_main.cc
+++ b/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>
diff --git a/repos/os/include/input/component.h b/repos/os/include/input/component.h
index 86ef305c4..68148de9c 100644
--- a/repos/os/include/input/component.h
+++ b/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>
diff --git a/repos/os/include/nic/component.h b/repos/os/include/nic/component.h
index 7bfae695d..dd186bbbd 100644
--- a/repos/os/include/nic/component.h
+++ b/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>
diff --git a/repos/os/include/nitpicker_session/client.h b/repos/os/include/nitpicker_session/client.h
index 7eaa24417..0cc7e32c8 100644
--- a/repos/os/include/nitpicker_session/client.h
+++ b/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; }
 
diff --git a/repos/os/include/os/attached_dataspace.h b/repos/os/include/os/attached_dataspace.h
index 467426444..b87a258a1 100644
--- a/repos/os/include/os/attached_dataspace.h
+++ b/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_
 
diff --git a/repos/os/include/os/attached_io_mem_dataspace.h b/repos/os/include/os/attached_io_mem_dataspace.h
index e9bf07b14..1032f2850 100644
--- a/repos/os/include/os/attached_io_mem_dataspace.h
+++ b/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_
 
diff --git a/repos/os/include/os/attached_mmio.h b/repos/os/include/os/attached_mmio.h
index d9e83417d..18fef142c 100644
--- a/repos/os/include/os/attached_mmio.h
+++ b/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; }
diff --git a/repos/os/include/os/attached_ram_dataspace.h b/repos/os/include/os/attached_ram_dataspace.h
index 21cbbceae..e065d63f2 100644
--- a/repos/os/include/os/attached_ram_dataspace.h
+++ b/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_
 
diff --git a/repos/os/include/os/attached_rom_dataspace.h b/repos/os/include/os/attached_rom_dataspace.h
index 0ff075745..a41536d05 100644
--- a/repos/os/include/os/attached_rom_dataspace.h
+++ b/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_
 
diff --git a/repos/os/include/os/child_policy_dynamic_rom.h b/repos/os/include/os/child_policy_dynamic_rom.h
index 9b44787ef..e119a8805 100644
--- a/repos/os/include/os/child_policy_dynamic_rom.h
+++ b/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; }
 
diff --git a/repos/os/include/os/config.h b/repos/os/include/os/config.h
index 857c0a575..15ac9be49 100644
--- a/repos/os/include/os/config.h
+++ b/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_
 
diff --git a/repos/os/include/os/reporter.h b/repos/os/include/os/reporter.h
index 806b95a0e..019553bbd 100644
--- a/repos/os/include/os/reporter.h
+++ b/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>
 
diff --git a/repos/os/include/os/session_policy.h b/repos/os/include/os/session_policy.h
index 6588637bc..47b6a7fea 100644
--- a/repos/os/include/os/session_policy.h
+++ b/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;
diff --git a/repos/os/include/os/signal_rpc_dispatcher.h b/repos/os/include/os/signal_rpc_dispatcher.h
index cda4d2635..adaa9c0d4 100644
--- a/repos/os/include/os/signal_rpc_dispatcher.h
+++ b/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
  *
diff --git a/repos/os/include/terminal_session/client.h b/repos/os/include/terminal_session/client.h
index bb801f541..c56576f14 100644
--- a/repos/os/include/terminal_session/client.h
+++ b/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>
 
diff --git a/repos/os/src/app/rom_to_file/main.cc b/repos/os/src/app/rom_to_file/main.cc
index 0ab1062ec..55a4eef79 100644
--- a/repos/os/src/app/rom_to_file/main.cc
+++ b/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>
diff --git a/repos/os/src/app/usb_report_filter/main.cc b/repos/os/src/app/usb_report_filter/main.cc
index ab5acb475..8c27f4114 100644
--- a/repos/os/src/app/usb_report_filter/main.cc
+++ b/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>
diff --git a/repos/os/src/drivers/framebuffer/spec/imx53/driver.h b/repos/os/src/drivers/framebuffer/spec/imx53/driver.h
index d53288e9e..a10eeb813 100644
--- a/repos/os/src/drivers/framebuffer/spec/imx53/driver.h
+++ b/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>
diff --git a/repos/os/src/drivers/framebuffer/spec/imx53/ipu.h b/repos/os/src/drivers/framebuffer/spec/imx53/ipu.h
index ee66cf503..17f7bce18 100644
--- a/repos/os/src/drivers/framebuffer/spec/imx53/ipu.h
+++ b/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
diff --git a/repos/os/src/drivers/framebuffer/spec/omap4/driver.h b/repos/os/src/drivers/framebuffer/spec/omap4/driver.h
index 11d6f6647..7edc46405 100644
--- a/repos/os/src/drivers/framebuffer/spec/omap4/driver.h
+++ b/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>
 
diff --git a/repos/os/src/drivers/gpio/spec/exynos4/gpio.h b/repos/os/src/drivers/gpio/spec/exynos4/gpio.h
index 882d1160e..8299b120c 100644
--- a/repos/os/src/drivers/gpio/spec/exynos4/gpio.h
+++ b/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>
diff --git a/repos/os/src/drivers/gpio/spec/imx53/gpio.h b/repos/os/src/drivers/gpio/spec/imx53/gpio.h
index 774b117b0..e35b12307 100644
--- a/repos/os/src/drivers/gpio/spec/imx53/gpio.h
+++ b/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
diff --git a/repos/os/src/drivers/gpio/spec/omap4/gpio.h b/repos/os/src/drivers/gpio/spec/omap4/gpio.h
index c7cca1dee..7690d368e 100644
--- a/repos/os/src/drivers/gpio/spec/omap4/gpio.h
+++ b/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
diff --git a/repos/os/src/drivers/gpio/spec/rpi/gpio.h b/repos/os/src/drivers/gpio/spec/rpi/gpio.h
index 08d617d87..6a8102136 100644
--- a/repos/os/src/drivers/gpio/spec/rpi/gpio.h
+++ b/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>
 
diff --git a/repos/os/src/drivers/input/spec/imx53/egalax_ts.h b/repos/os/src/drivers/input/spec/imx53/egalax_ts.h
index 2a66c7eeb..8088f318a 100644
--- a/repos/os/src/drivers/input/spec/imx53/egalax_ts.h
+++ b/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>
diff --git a/repos/os/src/drivers/input/spec/imx53/mpr121.h b/repos/os/src/drivers/input/spec/imx53/mpr121.h
index af5bb4a79..3db4a1b99 100644
--- a/repos/os/src/drivers/input/spec/imx53/mpr121.h
+++ b/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>
diff --git a/repos/os/src/drivers/nic/spec/gem/buffer_descriptor.h b/repos/os/src/drivers/nic/spec/gem/buffer_descriptor.h
index 70c55c3ef..d2826562a 100644
--- a/repos/os/src/drivers/nic/spec/gem/buffer_descriptor.h
+++ b/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;
diff --git a/repos/os/src/drivers/platform/spec/imx53/ccm.h b/repos/os/src/drivers/platform/spec/imx53/ccm.h
index c33cefffa..3fbaa6754 100644
--- a/repos/os/src/drivers/platform/spec/imx53/ccm.h
+++ b/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
diff --git a/repos/os/src/drivers/platform/spec/imx53/iim.h b/repos/os/src/drivers/platform/spec/imx53/iim.h
index b4e77df15..b4add3a55 100644
--- a/repos/os/src/drivers/platform/spec/imx53/iim.h
+++ b/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
diff --git a/repos/os/src/drivers/platform/spec/imx53/iomux.h b/repos/os/src/drivers/platform/spec/imx53/iomux.h
index 523510804..f2b74a894 100644
--- a/repos/os/src/drivers/platform/spec/imx53/iomux.h
+++ b/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
diff --git a/repos/os/src/drivers/platform/spec/imx53/src.h b/repos/os/src/drivers/platform/spec/imx53/src.h
index 4c1af9c23..75683e3ae 100644
--- a/repos/os/src/drivers/platform/spec/imx53/src.h
+++ b/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
diff --git a/repos/os/src/drivers/platform/spec/rpi/mbox.h b/repos/os/src/drivers/platform/spec/rpi/mbox.h
index 883290f75..505decd45 100644
--- a/repos/os/src/drivers/platform/spec/rpi/mbox.h
+++ b/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>
diff --git a/repos/os/src/drivers/sd_card/adma2.h b/repos/os/src/drivers/sd_card/adma2.h
index 7f80fbed4..86a983314 100644
--- a/repos/os/src/drivers/sd_card/adma2.h
+++ b/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
 {
diff --git a/repos/os/src/drivers/sd_card/spec/exynos5/driver.h b/repos/os/src/drivers/sd_card/spec/exynos5/driver.h
index 0000e3dc4..de218b5d5 100644
--- a/repos/os/src/drivers/sd_card/spec/exynos5/driver.h
+++ b/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>
diff --git a/repos/os/src/drivers/timer/fiasco/time_source.cc b/repos/os/src/drivers/timer/fiasco/time_source.cc
index 4e70c9870..0add20879 100644
--- a/repos/os/src/drivers/timer/fiasco/time_source.cc
+++ b/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 {
diff --git a/repos/os/src/drivers/timer/nova/time_source.cc b/repos/os/src/drivers/timer/nova/time_source.cc
index a701b9390..199e1644f 100644
--- a/repos/os/src/drivers/timer/nova/time_source.cc
+++ b/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>
diff --git a/repos/os/src/drivers/uart/main.cc b/repos/os/src/drivers/uart/main.cc
index 37995b378..7c620e710 100644
--- a/repos/os/src/drivers/uart/main.cc
+++ b/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>
diff --git a/repos/os/src/lib/config/config.cc b/repos/os/src/lib/config/config.cc
index f1d2e832f..2bde75861 100644
--- a/repos/os/src/lib/config/config.cc
+++ b/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;
 
diff --git a/repos/os/src/server/dynamic_rom/main.cc b/repos/os/src/server/dynamic_rom/main.cc
index cfaed7044..a4d316ef2 100644
--- a/repos/os/src/server/dynamic_rom/main.cc
+++ b/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>
diff --git a/repos/os/src/server/iso9660/main.cc b/repos/os/src/server/iso9660/main.cc
index 7cd2b9474..4c316f4ac 100644
--- a/repos/os/src/server/iso9660/main.cc
+++ b/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>
diff --git a/repos/os/src/server/loader/rom.h b/repos/os/src/server/loader/rom.h
index d1788cf6a..2dc36b2bf 100644
--- a/repos/os/src/server/loader/rom.h
+++ b/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 {
 
diff --git a/repos/os/src/server/log_report/main.cc b/repos/os/src/server/log_report/main.cc
index 6cc8b5c47..162311e69 100644
--- a/repos/os/src/server/log_report/main.cc
+++ b/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 {
diff --git a/repos/os/src/server/log_terminal/main.cc b/repos/os/src/server/log_terminal/main.cc
index 3005d583b..94d145595 100644
--- a/repos/os/src/server/log_terminal/main.cc
+++ b/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>
 
diff --git a/repos/os/src/server/part_blk/main.cc b/repos/os/src/server/part_blk/main.cc
index 646797536..c1109ac94 100644
--- a/repos/os/src/server/part_blk/main.cc
+++ b/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"
diff --git a/repos/os/src/server/ram_fs/main.cc b/repos/os/src/server/ram_fs/main.cc
index 498a50f77..2c08f7f34 100644
--- a/repos/os/src/server/ram_fs/main.cc
+++ b/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 */
diff --git a/repos/os/src/server/terminal_crosslink/terminal_session_component.h b/repos/os/src/server/terminal_crosslink/terminal_session_component.h
index afc0214c1..2b27caa66 100644
--- a/repos/os/src/server/terminal_crosslink/terminal_session_component.h
+++ b/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>
 
diff --git a/repos/os/src/server/trace_fs/main.cc b/repos/os/src/server/trace_fs/main.cc
index 138799292..f23e84e4c 100644
--- a/repos/os/src/server/trace_fs/main.cc
+++ b/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>
diff --git a/repos/os/src/server/tz_vmm/include/serial_driver.h b/repos/os/src/server/tz_vmm/include/serial_driver.h
index a08d4442b..2016bf60e 100644
--- a/repos/os/src/server/tz_vmm/include/serial_driver.h
+++ b/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>
diff --git a/repos/os/src/test/dynamic_config/server/main.cc b/repos/os/src/test/dynamic_config/server/main.cc
index c4ffbc42d..65dbe2ba4 100644
--- a/repos/os/src/test/dynamic_config/server/main.cc
+++ b/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>
diff --git a/repos/os/src/test/fb_bench/main.cc b/repos/os/src/test/fb_bench/main.cc
index 02f73c267..867ff01dc 100644
--- a/repos/os/src/test/fb_bench/main.cc
+++ b/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>
diff --git a/repos/os/src/test/framebuffer/main.cc b/repos/os/src/test/framebuffer/main.cc
index a556f1d96..f1fcc1d5c 100644
--- a/repos/os/src/test/framebuffer/main.cc
+++ b/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>
 
 
diff --git a/repos/os/src/test/iso/main.cc b/repos/os/src/test/iso/main.cc
index 2932f4e11..a6b19fecf 100644
--- a/repos/os/src/test/iso/main.cc
+++ b/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;
 
diff --git a/repos/os/src/test/sd_card_bench/main.cc b/repos/os/src/test/sd_card_bench/main.cc
index 1ec6f272f..d9a5fd4cc 100644
--- a/repos/os/src/test/sd_card_bench/main.cc
+++ b/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 */
diff --git a/repos/ports/src/app/vbox_pointer/policy.cc b/repos/ports/src/app/vbox_pointer/policy.cc
index c9781c0f3..33468be70 100644
--- a/repos/ports/src/app/vbox_pointer/policy.cc
+++ b/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>