diff --git a/repos/base-codezero/lib/mk/base-common.mk b/repos/base-codezero/lib/mk/base-common.mk
index 6ebb1c13b1..b26a57a4eb 100644
--- a/repos/base-codezero/lib/mk/base-common.mk
+++ b/repos/base-codezero/lib/mk/base-common.mk
@@ -7,8 +7,7 @@
 LIBS += cxx syscall startup
 
 SRC_CC += cap_copy.cc
-SRC_CC += ipc/ipc.cc ipc/pager.cc ipc/ipc_marshal_cap.cc
-SRC_CC += pager/pager.cc pager/common.cc
+SRC_CC += ipc/ipc.cc ipc/ipc_marshal_cap.cc
 SRC_CC += avl_tree/avl_tree.cc
 SRC_CC += allocator/slab.cc
 SRC_CC += allocator/allocator_avl.cc
diff --git a/repos/base-codezero/include/base/ipc_pager.h b/repos/base-codezero/src/core/include/ipc_pager.h
similarity index 96%
rename from repos/base-codezero/include/base/ipc_pager.h
rename to repos/base-codezero/src/core/include/ipc_pager.h
index d671ec90e1..dd0c243baf 100644
--- a/repos/base-codezero/include/base/ipc_pager.h
+++ b/repos/base-codezero/src/core/include/ipc_pager.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__IPC_PAGER_H_
-#define _INCLUDE__BASE__IPC_PAGER_H_
+#ifndef _CORE__INCLUDE__IPC_PAGER_H_
+#define _CORE__INCLUDE__IPC_PAGER_H_
 
 #include <base/cache.h>
 #include <base/ipc.h>
@@ -168,4 +168,4 @@ namespace Genode {
 	};
 }
 
-#endif /* _INCLUDE__BASE__IPC_PAGER_H_ */
+#endif /* _CORE__INCLUDE__IPC_PAGER_H_ */
diff --git a/repos/base-codezero/src/core/include/platform_thread.h b/repos/base-codezero/src/core/include/platform_thread.h
index ae2e8c3862..99aee77068 100644
--- a/repos/base-codezero/src/core/include/platform_thread.h
+++ b/repos/base-codezero/src/core/include/platform_thread.h
@@ -15,11 +15,11 @@
 #define _CORE__INCLUDE__PLATFORM_THREAD_H_
 
 /* Genode includes */
-#include <base/pager.h>
 #include <base/thread_state.h>
 #include <base/native_types.h>
 
 /* core includes */
+#include <pager.h>
 #include <address_space.h>
 
 namespace Genode {
diff --git a/repos/base-codezero/src/base/ipc/pager.cc b/repos/base-codezero/src/core/ipc_pager.cc
similarity index 99%
rename from repos/base-codezero/src/base/ipc/pager.cc
rename to repos/base-codezero/src/core/ipc_pager.cc
index b9a3265dca..c7694d2bca 100644
--- a/repos/base-codezero/src/base/ipc/pager.cc
+++ b/repos/base-codezero/src/core/ipc_pager.cc
@@ -12,10 +12,10 @@
  */
 
 /* Genode includes */
-#include <base/ipc_pager.h>
 #include <base/printf.h>
 
 /* Codezero includes */
+#include <ipc_pager.h>
 #include <codezero/syscalls.h>
 
 
diff --git a/repos/base-codezero/src/base/pager/pager.cc b/repos/base-codezero/src/core/pager.cc
similarity index 98%
rename from repos/base-codezero/src/base/pager/pager.cc
rename to repos/base-codezero/src/core/pager.cc
index 93075a7a0b..34b66ee0e6 100644
--- a/repos/base-codezero/src/base/pager/pager.cc
+++ b/repos/base-codezero/src/core/pager.cc
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-/* Genode includes */
-#include <base/pager.h>
+/* Core includes */
+#include <pager.h>
 
 using namespace Genode;
 
diff --git a/repos/base-codezero/src/core/target.inc b/repos/base-codezero/src/core/target.inc
index c2313dd040..9e724784f6 100644
--- a/repos/base-codezero/src/core/target.inc
+++ b/repos/base-codezero/src/core/target.inc
@@ -2,33 +2,35 @@ TARGET       = core
 
 GEN_CORE_DIR = $(BASE_DIR)/src/core
 
-SRC_CC      += \
-               main.cc \
-               ram_session_component.cc \
-               ram_session_support.cc \
-               rom_session_component.cc \
-               cap_session_component.cc \
+SRC_CC      += cap_session_component.cc \
+               context_area.cc \
+               core_mem_alloc.cc \
+               core_rm_session.cc \
                cpu_session_component.cc \
                cpu_session_support.cc \
-               pd_session_component.cc \
+               dataspace_component.cc \
+               dump_alloc.cc \
                io_mem_session_component.cc \
                io_mem_session_support.cc \
-               thread_start.cc \
-               platform_thread.cc \
+               ipc_pager.cc \
+               irq_session_component.cc \
+               main.cc \
+               pager.cc \
+               pager_common.cc \
+               pd_session_component.cc \
+               platform.cc \
                platform_pd.cc \
                platform_services.cc \
-               platform.cc \
-               dataspace_component.cc \
+               platform_thread.cc \
+               ram_session_component.cc \
+               ram_session_support.cc \
                rm_session_component.cc \
                rm_session_support.cc \
-               irq_session_component.cc \
+               rom_session_component.cc \
                signal_session_component.cc \
                signal_source_component.cc \
-               trace_session_component.cc \
-               core_rm_session.cc \
-               core_mem_alloc.cc \
-               dump_alloc.cc \
-               context_area.cc
+               thread_start.cc \
+               trace_session_component.cc
 
 LIBS        += core_printf base-common
 
@@ -56,4 +58,5 @@ vpath dataspace_component.cc      $(GEN_CORE_DIR)
 vpath core_mem_alloc.cc           $(GEN_CORE_DIR)
 vpath dump_alloc.cc               $(GEN_CORE_DIR)
 vpath context_area.cc             $(GEN_CORE_DIR)
+vpath pager_common.cc             $(GEN_CORE_DIR)
 vpath %.cc                        $(REP_DIR)/src/core
diff --git a/repos/base-fiasco/lib/mk/base-common.mk b/repos/base-fiasco/lib/mk/base-common.mk
index 90e493920b..517eed8409 100644
--- a/repos/base-fiasco/lib/mk/base-common.mk
+++ b/repos/base-fiasco/lib/mk/base-common.mk
@@ -7,8 +7,7 @@
 LIBS += cxx startup
 
 SRC_CC += cap_copy.cc
-SRC_CC += ipc/ipc.cc ipc/pager.cc ipc/ipc_marshal_cap.cc
-SRC_CC += pager/pager.cc pager/common.cc
+SRC_CC += ipc/ipc.cc ipc/ipc_marshal_cap.cc
 SRC_CC += avl_tree/avl_tree.cc
 SRC_CC += allocator/slab.cc
 SRC_CC += allocator/allocator_avl.cc
diff --git a/repos/base-fiasco/include/base/ipc_pager.h b/repos/base-fiasco/src/core/include/ipc_pager.h
similarity index 97%
rename from repos/base-fiasco/include/base/ipc_pager.h
rename to repos/base-fiasco/src/core/include/ipc_pager.h
index cdf0299be5..f8576e695d 100644
--- a/repos/base-fiasco/include/base/ipc_pager.h
+++ b/repos/base-fiasco/src/core/include/ipc_pager.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__IPC_PAGER_H_
-#define _INCLUDE__BASE__IPC_PAGER_H_
+#ifndef _CORE__INCLUDE__IPC_PAGER_H_
+#define _CORE__INCLUDE__IPC_PAGER_H_
 
 /* Genode includes */
 #include <base/cache.h>
@@ -172,4 +172,4 @@ namespace Genode {
 	};
 }
 
-#endif /* _INCLUDE__BASE__IPC_PAGER_H_ */
+#endif /* _CORE__INCLUDE__IPC_PAGER_H_ */
diff --git a/repos/base-fiasco/src/core/include/platform_thread.h b/repos/base-fiasco/src/core/include/platform_thread.h
index e134ec9aef..ad023fccdb 100644
--- a/repos/base-fiasco/src/core/include/platform_thread.h
+++ b/repos/base-fiasco/src/core/include/platform_thread.h
@@ -17,9 +17,9 @@
 /* Genode includes */
 #include <base/native_types.h>
 #include <base/thread_state.h>
-#include <base/pager.h>
 
 /* core includes */
+#include <pager.h>
 #include <platform_pd.h>
 #include <address_space.h>
 
diff --git a/repos/base-fiasco/src/base/ipc/pager.cc b/repos/base-fiasco/src/core/ipc_pager.cc
similarity index 95%
rename from repos/base-fiasco/src/base/ipc/pager.cc
rename to repos/base-fiasco/src/core/ipc_pager.cc
index 62f8b457f1..5451adb292 100644
--- a/repos/base-fiasco/src/base/ipc/pager.cc
+++ b/repos/base-fiasco/src/core/ipc_pager.cc
@@ -11,9 +11,12 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#include <base/ipc_pager.h>
+/* Genode includes */
 #include <base/printf.h>
 
+/* Core includes */
+#include <ipc_pager.h>
+
 namespace Fiasco {
 #include <l4/sys/ipc.h>
 #include <l4/sys/syscalls.h>
diff --git a/repos/base-fiasco/src/base/pager/pager.cc b/repos/base-fiasco/src/core/pager.cc
similarity index 98%
rename from repos/base-fiasco/src/base/pager/pager.cc
rename to repos/base-fiasco/src/core/pager.cc
index a8b407743d..9e1f8bc30b 100644
--- a/repos/base-fiasco/src/base/pager/pager.cc
+++ b/repos/base-fiasco/src/core/pager.cc
@@ -14,7 +14,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#include <base/pager.h>
+/* Core includes */
+#include <pager.h>
 
 namespace Fiasco {
 #include <l4/sys/ipc.h>
diff --git a/repos/base-fiasco/src/core/target.inc b/repos/base-fiasco/src/core/target.inc
index de3d42a162..9f205b361e 100644
--- a/repos/base-fiasco/src/core/target.inc
+++ b/repos/base-fiasco/src/core/target.inc
@@ -2,33 +2,36 @@ TARGET       = core
 
 GEN_CORE_DIR = $(BASE_DIR)/src/core
 
-SRC_CC      += main.cc \
-               multiboot_info.cc \
-               ram_session_component.cc \
-               ram_session_support.cc \
-               rom_session_component.cc \
-               cap_session_component.cc \
+SRC_CC      += cap_session_component.cc \
+               context_area.cc \
+               core_printf.cc \
                cpu_session_component.cc \
                cpu_session_support.cc \
-               pd_session_component.cc \
+               dataspace_component.cc \
+               dump_alloc.cc \
                io_mem_session_component.cc \
                io_mem_session_support.cc \
-               thread_start.cc \
-               platform_thread.cc \
+               io_port_session_component.cc \
+               ipc_pager.cc \
+               irq_session_component.cc \
+               main.cc \
+               multiboot_info.cc \
+               pager.cc \
+               pager_common.cc \
+               pd_session_component.cc \
+               platform.cc \
                platform_pd.cc \
                platform_services.cc \
-               platform.cc \
-               dataspace_component.cc \
+               platform_thread.cc \
+               ram_session_component.cc \
+               ram_session_support.cc \
                rm_session_component.cc \
                rm_session_support.cc \
-               io_port_session_component.cc \
-               irq_session_component.cc \
+               rom_session_component.cc \
                signal_session_component.cc \
                signal_source_component.cc \
-               trace_session_component.cc \
-               dump_alloc.cc \
-               context_area.cc \
-               core_printf.cc
+               thread_start.cc \
+               trace_session_component.cc
 
 INC_DIR     += $(REP_DIR)/src/core/include \
                $(GEN_CORE_DIR)/include \
@@ -55,5 +58,6 @@ vpath trace_session_component.cc  $(GEN_CORE_DIR)
 vpath dataspace_component.cc      $(GEN_CORE_DIR)
 vpath dump_alloc.cc               $(GEN_CORE_DIR)
 vpath context_area.cc             $(GEN_CORE_DIR)
+vpath pager_common.cc             $(GEN_CORE_DIR)
 vpath core_printf.cc              $(BASE_DIR)/src/base/console
 vpath %.cc                        $(REP_DIR)/src/core
diff --git a/repos/base-foc/lib/mk/arm/base-common.mk b/repos/base-foc/lib/mk/arm/base-common.mk
deleted file mode 100644
index 05e75393ed..0000000000
--- a/repos/base-foc/lib/mk/arm/base-common.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-include $(REP_DIR)/lib/mk/base-common.inc
-
-SRC_CC += ipc/arm/pager.cc ipc/arm/pager_exception.cc
diff --git a/repos/base-foc/lib/mk/base-common.inc b/repos/base-foc/lib/mk/base-common.mk
similarity index 92%
rename from repos/base-foc/lib/mk/base-common.inc
rename to repos/base-foc/lib/mk/base-common.mk
index 7af66d7ff8..ff486abc9a 100644
--- a/repos/base-foc/lib/mk/base-common.inc
+++ b/repos/base-foc/lib/mk/base-common.mk
@@ -6,8 +6,7 @@
 
 LIBS += cxx syscall startup
 
-SRC_CC += ipc/ipc.cc ipc/pager.cc
-SRC_CC += pager/pager.cc pager/common.cc
+SRC_CC += ipc/ipc.cc
 SRC_CC += avl_tree/avl_tree.cc
 SRC_CC += allocator/slab.cc
 SRC_CC += allocator/allocator_avl.cc
diff --git a/repos/base-foc/lib/mk/x86_32/base-common.mk b/repos/base-foc/lib/mk/x86_32/base-common.mk
deleted file mode 100644
index fd290b51d7..0000000000
--- a/repos/base-foc/lib/mk/x86_32/base-common.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-include $(REP_DIR)/lib/mk/base-common.inc
-
-SRC_CC += ipc/x86_32/pager.cc ipc/x86/pager_exception.cc
diff --git a/repos/base-foc/lib/mk/x86_64/base-common.mk b/repos/base-foc/lib/mk/x86_64/base-common.mk
deleted file mode 100644
index 73a62387dd..0000000000
--- a/repos/base-foc/lib/mk/x86_64/base-common.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-include $(REP_DIR)/lib/mk/base-common.inc
-
-SRC_CC += ipc/x86_64/pager.cc ipc/x86/pager_exception.cc
diff --git a/repos/base-foc/src/base/ipc/arm/pager_exception.cc b/repos/base-foc/src/base/ipc/arm/pager_exception.cc
deleted file mode 100644
index 276d949462..0000000000
--- a/repos/base-foc/src/base/ipc/arm/pager_exception.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * \brief  ARM-specific pager support for Fiasco.OC
- * \author Stefan Kalkowski
- * \date   2011-08-24
- */
-
-/*
- * Copyright (C) 2011-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.
- */
-
-#include <base/ipc_pager.h>
-
-namespace Fiasco {
-#include <l4/sys/utcb.h>
-}
-
-enum Exceptions { EX_REGS = 0x500000 };
-
-
-void Genode::Ipc_pager::_parse_exception()
-{
-	if (Fiasco::l4_utcb_exc()->err == EX_REGS)
-		_type = PAUSE;
-	else
-		_type = EXCEPTION;
-}
diff --git a/repos/base-foc/src/base/ipc/arm/pager.cc b/repos/base-foc/src/core/arm/ipc_pager.cc
similarity index 83%
rename from repos/base-foc/src/base/ipc/arm/pager.cc
rename to repos/base-foc/src/core/arm/ipc_pager.cc
index fde164d325..3988a3b3ea 100644
--- a/repos/base-foc/src/base/ipc/arm/pager.cc
+++ b/repos/base-foc/src/core/arm/ipc_pager.cc
@@ -13,8 +13,23 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-/* Genode includes */
-#include <base/ipc_pager.h>
+/* core includes */
+#include <ipc_pager.h>
+
+namespace Fiasco {
+#include <l4/sys/utcb.h>
+}
+
+enum Exceptions { EX_REGS = 0x500000 };
+
+
+void Genode::Ipc_pager::_parse_exception()
+{
+	if (Fiasco::l4_utcb_exc()->err == EX_REGS)
+		_type = PAUSE;
+	else
+		_type = EXCEPTION;
+}
 
 
 void Genode::Ipc_pager::get_regs(Thread_state *state)
diff --git a/repos/base-foc/src/core/arm/target.inc b/repos/base-foc/src/core/arm/target.inc
new file mode 100644
index 0000000000..04bc355c53
--- /dev/null
+++ b/repos/base-foc/src/core/arm/target.inc
@@ -0,0 +1,7 @@
+REQUIRES += arm
+SRC_CC   += arm/platform_arm.cc \
+            arm/ipc_pager.cc
+
+include $(REP_DIR)/src/core/target.inc
+
+vpath platform_services.cc $(GEN_CORE_DIR)
diff --git a/repos/base-foc/src/core/arndale/target.mk b/repos/base-foc/src/core/arndale/target.mk
index 4b79b46f82..fa429be73f 100644
--- a/repos/base-foc/src/core/arndale/target.mk
+++ b/repos/base-foc/src/core/arndale/target.mk
@@ -1,8 +1,4 @@
-include $(PRG_DIR)/../target.inc
-
 LD_TEXT_ADDR = 0x80100000
+REQUIRES    += foc_arndale
 
-REQUIRES += arm foc_arndale
-SRC_CC   += arm/platform_arm.cc
-
-vpath platform_services.cc $(GEN_CORE_DIR)
+include $(REP_DIR)/src/core/arm/target.inc
diff --git a/repos/base-foc/src/core/imx53/target.mk b/repos/base-foc/src/core/imx53/target.mk
index f26500ed68..b7772af4ec 100644
--- a/repos/base-foc/src/core/imx53/target.mk
+++ b/repos/base-foc/src/core/imx53/target.mk
@@ -1,9 +1,4 @@
-include $(PRG_DIR)/../target.inc
-
-REQUIRES += arm foc_imx53
-SRC_CC   += arm/platform_arm.cc
-
 LD_TEXT_ADDR = 0x70140000
+REQUIRES    += foc_imx53
 
-vpath platform_services.cc $(GEN_CORE_DIR)
-
+include $(REP_DIR)/src/core/arm/target.inc
diff --git a/repos/base-foc/src/core/include/cpu_session_component.h b/repos/base-foc/src/core/include/cpu_session_component.h
index 7661c0134e..06b097e9f7 100644
--- a/repos/base-foc/src/core/include/cpu_session_component.h
+++ b/repos/base-foc/src/core/include/cpu_session_component.h
@@ -21,11 +21,11 @@
 #include <base/allocator_guard.h>
 #include <base/tslab.h>
 #include <base/lock.h>
-#include <base/pager.h>
 #include <base/rpc_server.h>
 #include <foc_cpu_session/foc_cpu_session.h>
 
 /* core includes */
+#include <pager.h>
 #include <platform_thread.h>
 #include <trace/control_area.h>
 #include <trace/source_registry.h>
diff --git a/repos/base-foc/include/base/ipc_pager.h b/repos/base-foc/src/core/include/ipc_pager.h
similarity index 97%
rename from repos/base-foc/include/base/ipc_pager.h
rename to repos/base-foc/src/core/include/ipc_pager.h
index af621377e2..6c6a56c0c2 100644
--- a/repos/base-foc/include/base/ipc_pager.h
+++ b/repos/base-foc/src/core/include/ipc_pager.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__IPC_PAGER_H_
-#define _INCLUDE__BASE__IPC_PAGER_H_
+#ifndef _CORE__INCLUDE__IPC_PAGER_H_
+#define _CORE__INCLUDE__IPC_PAGER_H_
 
 /* Genode includes */
 #include <base/cache.h>
@@ -198,4 +198,4 @@ namespace Genode {
 	};
 }
 
-#endif /* _INCLUDE__BASE__IPC_PAGER_H_ */
+#endif /* _CORE__INCLUDE__IPC_PAGER_H_ */
diff --git a/repos/base-foc/src/core/include/platform.h b/repos/base-foc/src/core/include/platform.h
index 41b582f39b..8629234382 100644
--- a/repos/base-foc/src/core/include/platform.h
+++ b/repos/base-foc/src/core/include/platform.h
@@ -19,9 +19,9 @@
 /* Genode includes */
 #include <base/sync_allocator.h>
 #include <base/allocator_avl.h>
-#include <base/pager.h>
 
 /* Core includes */
+#include <pager.h>
 #include <cap_id_alloc.h>
 #include <platform_generic.h>
 #include <platform_thread.h>
diff --git a/repos/base-foc/src/core/include/platform_thread.h b/repos/base-foc/src/core/include/platform_thread.h
index fe4da4fdce..62bce146bc 100644
--- a/repos/base-foc/src/core/include/platform_thread.h
+++ b/repos/base-foc/src/core/include/platform_thread.h
@@ -18,9 +18,9 @@
 /* Genode includes */
 #include <base/native_types.h>
 #include <base/thread_state.h>
-#include <base/pager.h>
 
 /* core includes */
+#include <pager.h>
 #include <platform_pd.h>
 #include <cap_session_component.h>
 #include <cap_mapping.h>
diff --git a/repos/base-foc/src/base/ipc/pager.cc b/repos/base-foc/src/core/ipc_pager.cc
similarity index 98%
rename from repos/base-foc/src/base/ipc/pager.cc
rename to repos/base-foc/src/core/ipc_pager.cc
index d0c98a0a9f..811f9829cd 100644
--- a/repos/base-foc/src/base/ipc/pager.cc
+++ b/repos/base-foc/src/core/ipc_pager.cc
@@ -11,10 +11,13 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#include <base/ipc_pager.h>
+/* Genode includes */
 #include <base/printf.h>
 #include <base/thread.h>
 
+/* Core includes */
+#include <ipc_pager.h>
+
 namespace Fiasco {
 #include <l4/sys/ipc.h>
 }
diff --git a/repos/base-foc/src/base/pager/pager.cc b/repos/base-foc/src/core/pager.cc
similarity index 99%
rename from repos/base-foc/src/base/pager/pager.cc
rename to repos/base-foc/src/core/pager.cc
index 5121f2738a..9b646bf8f9 100644
--- a/repos/base-foc/src/base/pager/pager.cc
+++ b/repos/base-foc/src/core/pager.cc
@@ -16,11 +16,13 @@
  */
 
 /* Genode includes */
-#include <base/pager.h>
 #include <base/env.h>
 #include <base/printf.h>
 #include <base/lock.h>
 
+/* Core includes */
+#include <pager.h>
+
 /* Fiasco.OC includes */
 namespace Fiasco {
 #include <l4/sys/factory.h>
diff --git a/repos/base-foc/src/core/panda/target.mk b/repos/base-foc/src/core/panda/target.mk
index c48250925c..72b633b348 100644
--- a/repos/base-foc/src/core/panda/target.mk
+++ b/repos/base-foc/src/core/panda/target.mk
@@ -1,8 +1,4 @@
-include $(PRG_DIR)/../target.inc
-
 LD_TEXT_ADDR = 0x80140000
+REQUIRES    += foc_panda
 
-REQUIRES += arm foc_panda
-SRC_CC   += arm/platform_arm.cc
-
-vpath platform_services.cc $(GEN_CORE_DIR)
+include $(REP_DIR)/src/core/arm/target.inc
diff --git a/repos/base-foc/src/core/pbxa9/target.mk b/repos/base-foc/src/core/pbxa9/target.mk
index a031b0dacf..62475b338d 100644
--- a/repos/base-foc/src/core/pbxa9/target.mk
+++ b/repos/base-foc/src/core/pbxa9/target.mk
@@ -1,9 +1,4 @@
-include $(PRG_DIR)/../target.inc
-
-REQUIRES += arm foc_pbxa9
-SRC_CC   += arm/platform_arm.cc
-
 LD_TEXT_ADDR = 0x70490000
+REQUIRES    += foc_pbxa9
 
-vpath platform_services.cc $(GEN_CORE_DIR)
-
+include $(REP_DIR)/src/core/arm/target.inc
diff --git a/repos/base-foc/src/core/target.inc b/repos/base-foc/src/core/target.inc
index ba2114ec4d..a06c8e9cfc 100644
--- a/repos/base-foc/src/core/target.inc
+++ b/repos/base-foc/src/core/target.inc
@@ -1,23 +1,25 @@
 TARGET       = core
-REQUIRES     = foc
-
-LD_TEXT_ADDR = 0x500000
+REQUIRES    += foc
 
 GEN_CORE_DIR = $(BASE_DIR)/src/core
 
 LIBS        += base-common
 
-SRC_CC       = cap_session_component.cc \
+SRC_CC      += cap_session_component.cc \
                context_area.cc \
+               core_printf.cc \
                cpu_session_component.cc \
                cpu_session_extension.cc \
                dataspace_component.cc \
                dump_alloc.cc \
                io_mem_session_component.cc \
                io_mem_session_support.cc \
+               ipc_pager.cc \
                irq_session_component.cc \
                main.cc \
                multiboot_info.cc \
+               pager.cc \
+               pager_common.cc \
                pd_session_component.cc \
                pd_session_extension.cc \
                platform.cc \
@@ -31,9 +33,8 @@ SRC_CC       = cap_session_component.cc \
                rom_session_component.cc \
                signal_session_component.cc \
                signal_source_component.cc \
-               trace_session_component.cc \
                thread_start.cc \
-               core_printf.cc
+               trace_session_component.cc
 
 INC_DIR     += $(REP_DIR)/src/core/include \
                $(GEN_CORE_DIR)/include \
@@ -58,6 +59,7 @@ vpath rm_session_component.cc     $(GEN_CORE_DIR)
 vpath rom_session_component.cc    $(GEN_CORE_DIR)
 vpath signal_session_component.cc $(GEN_CORE_DIR)
 vpath trace_session_component.cc  $(GEN_CORE_DIR)
+vpath pager_common.cc             $(GEN_CORE_DIR)
 vpath core_printf.cc              $(BASE_DIR)/src/base/console
 vpath %.cc                        $(REP_DIR)/src/core
 vpath %.cc                        $(REP_DIR)/src/base/thread
diff --git a/repos/base-foc/src/core/vea9x4/target.mk b/repos/base-foc/src/core/vea9x4/target.mk
index 6292d97a80..f327d753f9 100644
--- a/repos/base-foc/src/core/vea9x4/target.mk
+++ b/repos/base-foc/src/core/vea9x4/target.mk
@@ -1,9 +1,4 @@
-include $(PRG_DIR)/../target.inc
-
-REQUIRES += arm foc_vea9x4
-SRC_CC   += arm/platform_arm.cc
-
 LD_TEXT_ADDR = 0x60490000
+REQUIRES    += foc_vea9x4
 
-vpath platform_services.cc $(GEN_CORE_DIR)
-
+include $(REP_DIR)/src/core/arm/target.inc
diff --git a/repos/base-foc/src/base/ipc/x86/pager_exception.cc b/repos/base-foc/src/core/x86/ipc_pager.cc
similarity index 92%
rename from repos/base-foc/src/base/ipc/x86/pager_exception.cc
rename to repos/base-foc/src/core/x86/ipc_pager.cc
index 3c9774e60b..6e97b13ee3 100644
--- a/repos/base-foc/src/base/ipc/x86/pager_exception.cc
+++ b/repos/base-foc/src/core/x86/ipc_pager.cc
@@ -11,7 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#include <base/ipc_pager.h>
+/* core includes */
+#include <ipc_pager.h>
 
 namespace Fiasco {
 #include <l4/sys/utcb.h>
diff --git a/repos/base-foc/src/core/x86/platform_x86.cc b/repos/base-foc/src/core/x86/platform.cc
similarity index 100%
rename from repos/base-foc/src/core/x86/platform_x86.cc
rename to repos/base-foc/src/core/x86/platform.cc
diff --git a/repos/base-foc/src/core/x86/target.inc b/repos/base-foc/src/core/x86/target.inc
new file mode 100644
index 0000000000..2e58981c56
--- /dev/null
+++ b/repos/base-foc/src/core/x86/target.inc
@@ -0,0 +1,10 @@
+LD_TEXT_ADDR = 0x500000
+REQUIRES    += x86
+SRC_CC      += io_port_session_component.cc \
+               x86/ipc_pager.cc \
+               x86/platform.cc
+
+vpath io_port_session_component.cc $(BASE_DIR)/src/core/x86
+vpath platform_services.cc         $(BASE_DIR)/src/core/x86
+
+include $(REP_DIR)/src/core/target.inc
diff --git a/repos/base-foc/src/core/x86/target.mk b/repos/base-foc/src/core/x86/target.mk
deleted file mode 100644
index f04ab9298c..0000000000
--- a/repos/base-foc/src/core/x86/target.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(PRG_DIR)/../target.inc
-
-REQUIRES += x86
-
-SRC_CC   += io_port_session_component.cc \
-            x86/platform_x86.cc
-
-vpath io_port_session_component.cc $(GEN_CORE_DIR)/x86
-vpath platform_services.cc         $(GEN_CORE_DIR)/x86
diff --git a/repos/base-foc/src/base/ipc/x86_32/pager.cc b/repos/base-foc/src/core/x86_32/ipc_pager.cc
similarity index 95%
rename from repos/base-foc/src/base/ipc/x86_32/pager.cc
rename to repos/base-foc/src/core/x86_32/ipc_pager.cc
index 7ce713c766..6a390047d6 100644
--- a/repos/base-foc/src/base/ipc/x86_32/pager.cc
+++ b/repos/base-foc/src/core/x86_32/ipc_pager.cc
@@ -13,8 +13,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-/* Genode includes */
-#include <base/ipc_pager.h>
+/* core includes */
+#include <ipc_pager.h>
 
 
 void Genode::Ipc_pager::get_regs(Genode::Thread_state *state)
diff --git a/repos/base-foc/src/core/x86_32/target.mk b/repos/base-foc/src/core/x86_32/target.mk
new file mode 100644
index 0000000000..2c69daa978
--- /dev/null
+++ b/repos/base-foc/src/core/x86_32/target.mk
@@ -0,0 +1,4 @@
+REQUIRES += foc_x86_32
+SRC_CC   += x86_32/ipc_pager.cc
+
+include $(REP_DIR)/src/core/x86/target.inc
diff --git a/repos/base-foc/src/base/ipc/x86_64/pager.cc b/repos/base-foc/src/core/x86_64/ipc_pager.cc
similarity index 96%
rename from repos/base-foc/src/base/ipc/x86_64/pager.cc
rename to repos/base-foc/src/core/x86_64/ipc_pager.cc
index c49638c166..1024e38450 100644
--- a/repos/base-foc/src/base/ipc/x86_64/pager.cc
+++ b/repos/base-foc/src/core/x86_64/ipc_pager.cc
@@ -13,8 +13,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-/* Genode includes */
-#include <base/ipc_pager.h>
+/* core includes */
+#include <ipc_pager.h>
 
 
 void Genode::Ipc_pager::get_regs(Thread_state *state)
diff --git a/repos/base-foc/src/core/x86_64/target.mk b/repos/base-foc/src/core/x86_64/target.mk
new file mode 100644
index 0000000000..52cffcf2cb
--- /dev/null
+++ b/repos/base-foc/src/core/x86_64/target.mk
@@ -0,0 +1,4 @@
+REQUIRES += foc_x86_64
+SRC_CC   += x86_64/ipc_pager.cc
+
+include $(REP_DIR)/src/core/x86/target.inc
diff --git a/repos/base-hw/include/base/pager.h b/repos/base-hw/src/core/include/pager.h
similarity index 98%
rename from repos/base-hw/include/base/pager.h
rename to repos/base-hw/src/core/include/pager.h
index 81a7a0fbc1..fc35766354 100644
--- a/repos/base-hw/include/base/pager.h
+++ b/repos/base-hw/src/core/include/pager.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BASE__PAGER_H_
-#define _BASE__PAGER_H_
+#ifndef _CORE__INCLUDE__PAGER_H_
+#define _CORE__INCLUDE__PAGER_H_
 
 /* Genode includes */
 #include <base/thread.h>
@@ -351,4 +351,4 @@ class Genode::Pager_activation : public Pager_activation_base
 		}
 };
 
-#endif /* _BASE__PAGER_H_ */
+#endif /* _CORE__INCLUDE__PAGER_H_ */
diff --git a/repos/base-hw/src/core/pager.cc b/repos/base-hw/src/core/pager.cc
index cc544bd7de..5ba6c7613d 100644
--- a/repos/base-hw/src/core/pager.cc
+++ b/repos/base-hw/src/core/pager.cc
@@ -12,10 +12,10 @@
  */
 
 /* Genode includes */
-#include <base/pager.h>
 #include <base/printf.h>
 
 /* core includes*/
+#include <pager.h>
 #include <platform_thread.h>
 #include <platform_pd.h>
 
diff --git a/repos/base-hw/src/core/rm_session_support.cc b/repos/base-hw/src/core/rm_session_support.cc
index dba6e7b6db..8cd7857189 100644
--- a/repos/base-hw/src/core/rm_session_support.cc
+++ b/repos/base-hw/src/core/rm_session_support.cc
@@ -12,10 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-/* Genode includes */
-#include <base/pager.h>
-
 /* core includes */
+#include <pager.h>
 #include <rm_session_component.h>
 #include <platform.h>
 #include <platform_pd.h>
diff --git a/repos/base-linux/src/core/include/cpu_session_component.h b/repos/base-linux/src/core/include/cpu_session_component.h
index f3dfe8bfb8..ee57872ed8 100644
--- a/repos/base-linux/src/core/include/cpu_session_component.h
+++ b/repos/base-linux/src/core/include/cpu_session_component.h
@@ -19,11 +19,11 @@
 #include <util/list.h>
 #include <base/allocator_guard.h>
 #include <base/lock.h>
-#include <base/pager.h>
 #include <base/rpc_server.h>
 #include <linux_cpu_session/linux_cpu_session.h>
 
 /* core includes */
+#include <pager.h>
 #include <cpu_thread_allocator.h>
 #include <platform_thread.h>
 #include <trace/control_area.h>
diff --git a/repos/base-linux/include/base/pager.h b/repos/base-linux/src/core/include/pager.h
similarity index 92%
rename from repos/base-linux/include/base/pager.h
rename to repos/base-linux/src/core/include/pager.h
index 6aeece0c48..4eedab99ea 100644
--- a/repos/base-linux/include/base/pager.h
+++ b/repos/base-linux/src/core/include/pager.h
@@ -14,8 +14,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__PAGER_H_
-#define _INCLUDE__BASE__PAGER_H_
+#ifndef _CORE__INCLUDE__PAGER_H_
+#define _CORE__INCLUDE__PAGER_H_
 
 #include <base/signal.h>
 #include <pager/capability.h>
@@ -55,4 +55,4 @@ namespace Genode {
 	template <int FOO> class Pager_activation : public Pager_activation_base { };
 }
 
-#endif /* _INCLUDE__BASE__PAGER_H_ */
+#endif /* _CORE__INCLUDE__PAGER_H_ */
diff --git a/repos/base-linux/src/core/include/platform_thread.h b/repos/base-linux/src/core/include/platform_thread.h
index 0a45b66059..a0fb696085 100644
--- a/repos/base-linux/src/core/include/platform_thread.h
+++ b/repos/base-linux/src/core/include/platform_thread.h
@@ -16,10 +16,13 @@
 #ifndef _CORE__INCLUDE__LINUX__PLATFORM_THREAD_H_
 #define _CORE__INCLUDE__LINUX__PLATFORM_THREAD_H_
 
-#include <base/pager.h>
+/* Genode includes */
 #include <base/thread_state.h>
 #include <cpu_session/cpu_session.h>
 
+/* Core includes */
+#include <pager.h>
+
 namespace Genode {
 
 	class Platform_thread;
diff --git a/repos/base-linux/src/core/include/rm_session_component.h b/repos/base-linux/src/core/include/rm_session_component.h
index 5f79c13b99..2e92f5812d 100644
--- a/repos/base-linux/src/core/include/rm_session_component.h
+++ b/repos/base-linux/src/core/include/rm_session_component.h
@@ -16,12 +16,14 @@
 #ifndef _CORE__INCLUDE__LINUX__RM_SESSION_COMPONENT_H_
 #define _CORE__INCLUDE__LINUX__RM_SESSION_COMPONENT_H_
 
-/* Genode */
-#include <base/pager.h>
+/* Genode includes */
 #include <base/allocator.h>
 #include <base/rpc_server.h>
 #include <rm_session/rm_session.h>
 
+/* Core includes */
+#include <pager.h>
+
 namespace Genode {
 
 	struct Rm_client;
diff --git a/repos/base-nova/lib/mk/base-common.inc b/repos/base-nova/lib/mk/base-common.mk
similarity index 96%
rename from repos/base-nova/lib/mk/base-common.inc
rename to repos/base-nova/lib/mk/base-common.mk
index c7309a228c..0342a1bab9 100644
--- a/repos/base-nova/lib/mk/base-common.inc
+++ b/repos/base-nova/lib/mk/base-common.mk
@@ -6,7 +6,7 @@
 
 LIBS += cxx startup
 
-SRC_CC += ipc/ipc.cc ipc/pager.cc
+SRC_CC += ipc/ipc.cc
 SRC_CC += avl_tree/avl_tree.cc
 SRC_CC += allocator/slab.cc
 SRC_CC += allocator/allocator_avl.cc
diff --git a/repos/base-nova/lib/mk/x86_32/base-common.mk b/repos/base-nova/lib/mk/x86_32/base-common.mk
deleted file mode 100644
index 4879b1d231..0000000000
--- a/repos/base-nova/lib/mk/x86_32/base-common.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-include $(REP_DIR)/lib/mk/base-common.inc
-
-SRC_CC += pager/x86_32/pager.cc
diff --git a/repos/base-nova/lib/mk/x86_32/core.mk b/repos/base-nova/lib/mk/x86_32/core.mk
new file mode 100644
index 0000000000..dc7caecfd0
--- /dev/null
+++ b/repos/base-nova/lib/mk/x86_32/core.mk
@@ -0,0 +1,5 @@
+SRC_CC  += pager.cc
+
+INC_DIR  = $(REP_DIR)/src/core/include
+
+vpath %.cc $(REP_DIR)/src/core/spec/x86_32
diff --git a/repos/base-nova/lib/mk/x86_64/base-common.mk b/repos/base-nova/lib/mk/x86_64/base-common.mk
deleted file mode 100644
index 5bccc9814c..0000000000
--- a/repos/base-nova/lib/mk/x86_64/base-common.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-include $(REP_DIR)/lib/mk/base-common.inc
-
-SRC_CC += pager/x86_64/pager.cc
diff --git a/repos/base-nova/lib/mk/x86_64/core.mk b/repos/base-nova/lib/mk/x86_64/core.mk
new file mode 100644
index 0000000000..6d7324c6c1
--- /dev/null
+++ b/repos/base-nova/lib/mk/x86_64/core.mk
@@ -0,0 +1,5 @@
+SRC_CC += pager.cc
+
+INC_DIR = $(REP_DIR)/src/core/include
+
+vpath %.cc $(REP_DIR)/src/core/spec/x86_64
diff --git a/repos/base-nova/src/core/include/cpu_session_component.h b/repos/base-nova/src/core/include/cpu_session_component.h
index 1bdc0189b9..1ea59c1409 100644
--- a/repos/base-nova/src/core/include/cpu_session_component.h
+++ b/repos/base-nova/src/core/include/cpu_session_component.h
@@ -21,11 +21,11 @@
 #include <base/allocator_guard.h>
 #include <base/tslab.h>
 #include <base/lock.h>
-#include <base/pager.h>
 #include <base/rpc_server.h>
 #include <nova_cpu_session/nova_cpu_session.h>
 
 /* core includes */
+#include <pager.h>
 #include <platform_thread.h>
 #include <trace/control_area.h>
 #include <trace/source_registry.h>
diff --git a/repos/base-nova/include/base/ipc_pager.h b/repos/base-nova/src/core/include/ipc_pager.h
similarity index 95%
rename from repos/base-nova/include/base/ipc_pager.h
rename to repos/base-nova/src/core/include/ipc_pager.h
index 9deffb8ccc..43d09998d9 100644
--- a/repos/base-nova/include/base/ipc_pager.h
+++ b/repos/base-nova/src/core/include/ipc_pager.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__IPC_PAGER_H_
-#define _INCLUDE__BASE__IPC_PAGER_H_
+#ifndef _CORE__INCLUDE__IPC_PAGER_H_
+#define _CORE__INCLUDE__IPC_PAGER_H_
 
 /* Genode includes */
 #include <base/cache.h>
@@ -138,4 +138,4 @@ namespace Genode {
 	};
 }
 
-#endif /* _INCLUDE__BASE__IPC_PAGER_H_ */
+#endif /* _CORE__INCLUDE__IPC_PAGER_H_ */
diff --git a/repos/base-nova/include/base/pager.h b/repos/base-nova/src/core/include/pager.h
similarity index 98%
rename from repos/base-nova/include/base/pager.h
rename to repos/base-nova/src/core/include/pager.h
index 07ce11abd2..84c43ccb78 100644
--- a/repos/base-nova/include/base/pager.h
+++ b/repos/base-nova/src/core/include/pager.h
@@ -11,16 +11,20 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__PAGER_H_
-#define _INCLUDE__BASE__PAGER_H_
+#ifndef _CORE__INCLUDE__PAGER_H_
+#define _CORE__INCLUDE__PAGER_H_
 
+/* Genode includes */
 #include <base/thread.h>
 #include <base/object_pool.h>
-#include <base/ipc_pager.h>
 #include <base/capability.h>
 #include <cap_session/cap_session.h>
 #include <pager/capability.h>
 
+/* Core includes */
+#include <ipc_pager.h>
+
+
 namespace Genode {
 
 	class Pager_entrypoint;
@@ -401,4 +405,4 @@ namespace Genode {
 	};
 }
 
-#endif /* _INCLUDE__BASE__PAGER_H_ */
+#endif /* _CORE__INCLUDE__PAGER_H_ */
diff --git a/repos/base-nova/src/core/include/platform_thread.h b/repos/base-nova/src/core/include/platform_thread.h
index cc8763a6cc..048c8bb0c0 100644
--- a/repos/base-nova/src/core/include/platform_thread.h
+++ b/repos/base-nova/src/core/include/platform_thread.h
@@ -20,9 +20,9 @@
 #include <base/thread_state.h>
 #include <base/native_types.h>
 #include <base/thread.h>
-#include <base/pager.h>
 
 /* core includes */
+#include <pager.h>
 #include <address_space.h>
 
 namespace Genode {
diff --git a/repos/base-nova/src/base/ipc/pager.cc b/repos/base-nova/src/core/ipc_pager.cc
similarity index 97%
rename from repos/base-nova/src/base/ipc/pager.cc
rename to repos/base-nova/src/core/ipc_pager.cc
index fd1a8df3da..38bba8a325 100644
--- a/repos/base-nova/src/base/ipc/pager.cc
+++ b/repos/base-nova/src/core/ipc_pager.cc
@@ -12,12 +12,15 @@
  */
 
 /* Genode includes */
-#include <base/ipc_pager.h>
 #include <base/thread.h>
 
+/* Core includes */
+#include <ipc_pager.h>
+
 /* NOVA includes */
 #include <nova/syscalls.h>
 
+
 enum { verbose_page_fault = false };
 
 using namespace Genode;
diff --git a/repos/base-nova/src/base/pager/pager.cc b/repos/base-nova/src/core/pager.cc
similarity index 99%
rename from repos/base-nova/src/base/pager/pager.cc
rename to repos/base-nova/src/core/pager.cc
index 298742800a..cf2d19b418 100644
--- a/repos/base-nova/src/base/pager/pager.cc
+++ b/repos/base-nova/src/core/pager.cc
@@ -14,13 +14,13 @@
  */
 
 /* Genode includes */
-#include <base/pager.h>
 #include <base/sleep.h>
-
 #include <util/construct_at.h>
-
 #include <rm_session/rm_session.h>
 
+/* Core includes */
+#include <pager.h>
+
 /* NOVA includes */
 #include <nova/syscalls.h>
 #include <nova_util.h> /* map_local */
diff --git a/repos/base-nova/src/core/platform_thread.cc b/repos/base-nova/src/core/platform_thread.cc
index bd5b8ecb61..7ecdf69bce 100644
--- a/repos/base-nova/src/core/platform_thread.cc
+++ b/repos/base-nova/src/core/platform_thread.cc
@@ -15,9 +15,9 @@
 
 /* Genode includes */
 #include <base/printf.h>
-#include <base/ipc_pager.h>
 
 /* core includes */
+#include <ipc_pager.h>
 #include <platform_thread.h>
 #include <platform_pd.h>
 #include <util.h>
diff --git a/repos/base-nova/src/base/pager/x86_32/pager.cc b/repos/base-nova/src/core/spec/x86_32/pager.cc
similarity index 93%
rename from repos/base-nova/src/base/pager/x86_32/pager.cc
rename to repos/base-nova/src/core/spec/x86_32/pager.cc
index 1b2d32ccb8..13f618532f 100644
--- a/repos/base-nova/src/base/pager/x86_32/pager.cc
+++ b/repos/base-nova/src/core/spec/x86_32/pager.cc
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-/* Genode includes */
-#include <base/pager.h>
+/* Core includes */
+#include <pager.h>
 
 /* NOVA includes */
 #include <nova/syscalls.h>
diff --git a/repos/base-nova/src/base/pager/x86_64/pager.cc b/repos/base-nova/src/core/spec/x86_64/pager.cc
similarity index 95%
rename from repos/base-nova/src/base/pager/x86_64/pager.cc
rename to repos/base-nova/src/core/spec/x86_64/pager.cc
index c5ad519e69..c268660ca0 100644
--- a/repos/base-nova/src/base/pager/x86_64/pager.cc
+++ b/repos/base-nova/src/core/spec/x86_64/pager.cc
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-/* Genode includes */
-#include <base/pager.h>
+/* Core includes */
+#include <pager.h>
 
 /* NOVA includes */
 #include <nova/syscalls.h>
diff --git a/repos/base-nova/src/core/target.inc b/repos/base-nova/src/core/target.inc
index d585d076a6..d7fe801d60 100644
--- a/repos/base-nova/src/core/target.inc
+++ b/repos/base-nova/src/core/target.inc
@@ -1,38 +1,39 @@
 TARGET       = core
-LIBS         = base-common
+LIBS         = base-common core
 
 GEN_CORE_DIR = $(BASE_DIR)/src/core
 
-SRC_CC       = main.cc \
-               ram_session_component.cc \
-               ram_session_support.cc \
-               rom_session_component.cc \
+SRC_CC       = context_area.cc \
+               core_mem_alloc.cc \
+               core_printf.cc \
+               core_rm_session.cc \
                cpu_session_component.cc \
+               cpu_session_extension.cc \
                cpu_session_support.cc \
-               pd_session_component.cc \
+               dataspace_component.cc \
+               dump_alloc.cc \
+               echo.cc \
                io_mem_session_component.cc \
                io_mem_session_support.cc \
-               thread_start.cc \
-               platform_thread.cc \
-               platform_pd.cc \
+               io_port_session_component.cc \
+               ipc_pager.cc \
+               irq_session_component.cc \
+               main.cc \
+               pager.cc \
+               pd_session_component.cc \
+               pd_session_extension.cc \
                platform.cc \
+               platform_pd.cc \
                platform_services.cc \
-               core_mem_alloc.cc \
-               dataspace_component.cc \
+               platform_thread.cc \
+               ram_session_component.cc \
+               ram_session_support.cc \
                rm_session_component.cc \
                rm_session_support.cc \
-               io_port_session_component.cc \
-               irq_session_component.cc \
+               rom_session_component.cc \
                signal_session_component.cc \
-               trace_session_component.cc \
-               core_rm_session.cc \
-               context_area.cc \
-               echo.cc \
-               dump_alloc.cc \
-               cpu_session_extension.cc \
-               pd_session_extension.cc \
-               core_printf.cc \
-               pager.cc
+               thread_start.cc \
+               trace_session_component.cc
 
 INC_DIR      = $(REP_DIR)/src/core/include \
                $(REP_DIR)/src/base/console \
@@ -58,4 +59,3 @@ vpath platform_services.cc         $(GEN_CORE_DIR)/x86
 vpath context_area.cc              $(GEN_CORE_DIR)
 vpath core_printf.cc               $(BASE_DIR)/src/base/console
 vpath %.cc                         $(REP_DIR)/src/core
-vpath pager.cc                     $(REP_DIR)/src/base/pager
diff --git a/repos/base-okl4/lib/mk/base-common.mk b/repos/base-okl4/lib/mk/base-common.mk
index 8f8ab959f8..a01aceb8c6 100644
--- a/repos/base-okl4/lib/mk/base-common.mk
+++ b/repos/base-okl4/lib/mk/base-common.mk
@@ -7,8 +7,7 @@
 LIBS += cxx startup
 
 SRC_CC += cap_copy.cc
-SRC_CC += ipc/ipc.cc ipc/pager.cc ipc/ipc_marshal_cap.cc
-SRC_CC += pager/pager.cc pager/common.cc
+SRC_CC += ipc/ipc.cc ipc/ipc_marshal_cap.cc
 SRC_CC += avl_tree/avl_tree.cc
 SRC_CC += allocator/slab.cc
 SRC_CC += allocator/allocator_avl.cc
diff --git a/repos/base-okl4/include/base/ipc_pager.h b/repos/base-okl4/src/core/include/ipc_pager.h
similarity index 97%
rename from repos/base-okl4/include/base/ipc_pager.h
rename to repos/base-okl4/src/core/include/ipc_pager.h
index e2c2c67f7a..4654c83b77 100644
--- a/repos/base-okl4/include/base/ipc_pager.h
+++ b/repos/base-okl4/src/core/include/ipc_pager.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__IPC_PAGER_H_
-#define _INCLUDE__BASE__IPC_PAGER_H_
+#ifndef _CORE__INCLUDE__IPC_PAGER_H_
+#define _CORE__INCLUDE__IPC_PAGER_H_
 
 #include <base/cache.h>
 #include <base/ipc.h>
@@ -185,4 +185,4 @@ namespace Genode {
 	};
 }
 
-#endif /* _INCLUDE__BASE__IPC_PAGER_H_ */
+#endif /* _CORE__INCLUDE__IPC_PAGER_H_ */
diff --git a/repos/base-okl4/src/core/include/platform_thread.h b/repos/base-okl4/src/core/include/platform_thread.h
index 4762f94f1f..1c15b277d6 100644
--- a/repos/base-okl4/src/core/include/platform_thread.h
+++ b/repos/base-okl4/src/core/include/platform_thread.h
@@ -15,11 +15,11 @@
 #define _CORE__INCLUDE__PLATFORM_THREAD_H_
 
 /* Genode includes */
-#include <base/pager.h>
 #include <base/thread_state.h>
 #include <base/native_types.h>
 
 /* core includes */
+#include <pager.h>
 #include <platform_pd.h>
 #include <address_space.h>
 
diff --git a/repos/base-okl4/src/base/ipc/pager.cc b/repos/base-okl4/src/core/ipc_pager.cc
similarity index 98%
rename from repos/base-okl4/src/base/ipc/pager.cc
rename to repos/base-okl4/src/core/ipc_pager.cc
index 92c9fdce73..7314b08ef9 100644
--- a/repos/base-okl4/src/base/ipc/pager.cc
+++ b/repos/base-okl4/src/core/ipc_pager.cc
@@ -11,9 +11,12 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#include <base/ipc_pager.h>
+/* Genode includes */
 #include <base/printf.h>
 
+/* Core includes */
+#include <ipc_pager.h>
+
 namespace Okl4 { extern "C" {
 #include <l4/message.h>
 #include <l4/ipc.h>
diff --git a/repos/base-okl4/src/base/pager/pager.cc b/repos/base-okl4/src/core/pager.cc
similarity index 98%
rename from repos/base-okl4/src/base/pager/pager.cc
rename to repos/base-okl4/src/core/pager.cc
index 63ddd2de73..d1e28953f3 100644
--- a/repos/base-okl4/src/base/pager/pager.cc
+++ b/repos/base-okl4/src/core/pager.cc
@@ -11,7 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#include <base/pager.h>
+/* Core includes */
+#include <pager.h>
 
 using namespace Genode;
 
diff --git a/repos/base-okl4/src/core/target.inc b/repos/base-okl4/src/core/target.inc
index 6585aa38e6..e6c3eac31f 100644
--- a/repos/base-okl4/src/core/target.inc
+++ b/repos/base-okl4/src/core/target.inc
@@ -4,34 +4,37 @@ LIBS += boot_info base-common
 
 GEN_CORE_DIR = $(BASE_DIR)/src/core
 
-SRC_CC += main.cc \
-          ram_session_component.cc \
-          ram_session_support.cc \
-          rom_session_component.cc \
-          cap_session_component.cc \
-          cpu_session_component.cc \
-          cpu_session_support.cc \
-          pd_session_component.cc \
-          okl4_pd_session_component.cc \
-          io_mem_session_component.cc \
-          io_mem_session_support.cc \
-          thread_start.cc \
-          platform_thread.cc \
-          platform_pd.cc \
-          platform.cc \
-          platform_services.cc \
-          dataspace_component.cc \
-          rm_session_component.cc \
-          rm_session_support.cc \
-          irq_session_component.cc \
-          signal_session_component.cc \
-          signal_source_component.cc \
-          trace_session_component.cc \
-          core_rm_session.cc \
+SRC_CC += cap_session_component.cc \
+          context_area.cc \
           core_mem_alloc.cc \
           core_printf.cc \
+          core_rm_session.cc \
+          cpu_session_component.cc \
+          cpu_session_support.cc \
+          dataspace_component.cc \
           dump_alloc.cc \
-          context_area.cc
+          io_mem_session_component.cc \
+          io_mem_session_support.cc \
+          ipc_pager.cc \
+          irq_session_component.cc \
+          main.cc \
+          okl4_pd_session_component.cc \
+          pager.cc \
+          pager_common.cc \
+          pd_session_component.cc \
+          platform.cc \
+          platform_pd.cc \
+          platform_services.cc \
+          platform_thread.cc \
+          ram_session_component.cc \
+          ram_session_support.cc \
+          rm_session_component.cc \
+          rm_session_support.cc \
+          rom_session_component.cc \
+          signal_session_component.cc \
+          signal_source_component.cc \
+          thread_start.cc \
+          trace_session_component.cc
 
 INC_DIR += $(REP_DIR)/src/core/include \
            $(GEN_CORE_DIR)/include \
@@ -58,6 +61,7 @@ vpath dataspace_component.cc      $(GEN_CORE_DIR)
 vpath core_mem_alloc.cc           $(GEN_CORE_DIR)
 vpath dump_alloc.cc               $(GEN_CORE_DIR)
 vpath context_area.cc             $(GEN_CORE_DIR)
+vpath pager_common.cc             $(GEN_CORE_DIR)
 vpath %.cc                        $(REP_DIR)/src/core
 vpath core_printf.cc              $(BASE_DIR)/src/base/console
 
diff --git a/repos/base-pistachio/lib/mk/base-common.mk b/repos/base-pistachio/lib/mk/base-common.mk
index c2567c91a1..8f8ee9880f 100644
--- a/repos/base-pistachio/lib/mk/base-common.mk
+++ b/repos/base-pistachio/lib/mk/base-common.mk
@@ -7,8 +7,7 @@
 LIBS += cxx startup syscall
 
 SRC_CC += cap_copy.cc
-SRC_CC += ipc/ipc.cc ipc/pager.cc ipc/ipc_marshal_cap.cc
-SRC_CC += pager/pager.cc pager/common.cc
+SRC_CC += ipc/ipc.cc ipc/ipc_marshal_cap.cc
 SRC_CC += avl_tree/avl_tree.cc
 SRC_CC += allocator/slab.cc
 SRC_CC += allocator/allocator_avl.cc
diff --git a/repos/base-pistachio/include/base/ipc_pager.h b/repos/base-pistachio/src/core/include/ipc_pager.h
similarity index 97%
rename from repos/base-pistachio/include/base/ipc_pager.h
rename to repos/base-pistachio/src/core/include/ipc_pager.h
index 5c006c4721..4f5e8b2c2e 100644
--- a/repos/base-pistachio/include/base/ipc_pager.h
+++ b/repos/base-pistachio/src/core/include/ipc_pager.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__IPC_PAGER_H_
-#define _INCLUDE__BASE__IPC_PAGER_H_
+#ifndef _CORE__INCLUDE__IPC_PAGER_H_
+#define _CORE__INCLUDE__IPC_PAGER_H_
 
 /* Genode includes */
 #include <base/cache.h>
@@ -186,4 +186,4 @@ namespace Genode {
 	};
 }
 
-#endif /* _INCLUDE__BASE__IPC_PAGER_H_ */
+#endif /* _CORE__INCLUDE__IPC_PAGER_H_ */
diff --git a/repos/base-pistachio/src/core/include/platform_thread.h b/repos/base-pistachio/src/core/include/platform_thread.h
index 1632cda63b..42797a7c5c 100644
--- a/repos/base-pistachio/src/core/include/platform_thread.h
+++ b/repos/base-pistachio/src/core/include/platform_thread.h
@@ -16,10 +16,10 @@
 
 /* Genode includes */
 #include <base/native_types.h>
-#include <base/pager.h>
 #include <base/thread_state.h>
 
 /* core includes */
+#include <pager.h>
 #include <platform_pd.h>
 #include <address_space.h>
 
diff --git a/repos/base-pistachio/src/base/ipc/pager.cc b/repos/base-pistachio/src/core/ipc_pager.cc
similarity index 97%
rename from repos/base-pistachio/src/base/ipc/pager.cc
rename to repos/base-pistachio/src/core/ipc_pager.cc
index 078693ef65..6771a912ac 100644
--- a/repos/base-pistachio/src/base/ipc/pager.cc
+++ b/repos/base-pistachio/src/core/ipc_pager.cc
@@ -11,10 +11,13 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#include <base/ipc_pager.h>
+/* Genode includes */
 #include <base/printf.h>
 #include <base/sleep.h>
 
+/* Core includes */
+#include <ipc_pager.h>
+
 namespace Pistachio
 {
 #include <l4/message.h>
diff --git a/repos/base-pistachio/src/base/pager/pager.cc b/repos/base-pistachio/src/core/pager.cc
similarity index 98%
rename from repos/base-pistachio/src/base/pager/pager.cc
rename to repos/base-pistachio/src/core/pager.cc
index 1241cfce0f..e6a0461877 100644
--- a/repos/base-pistachio/src/base/pager/pager.cc
+++ b/repos/base-pistachio/src/core/pager.cc
@@ -14,7 +14,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#include <base/pager.h>
+/* Core includes */
+#include <pager.h>
 
 using namespace Genode;
 
diff --git a/repos/base-pistachio/src/core/target.inc b/repos/base-pistachio/src/core/target.inc
index c4472e67a9..3130cf763c 100644
--- a/repos/base-pistachio/src/core/target.inc
+++ b/repos/base-pistachio/src/core/target.inc
@@ -4,33 +4,36 @@ LIBS         = base-common
 
 GEN_CORE_DIR = $(BASE_DIR)/src/core
 
-SRC_CC       = main.cc \
-               multiboot_info.cc \
-               ram_session_component.cc \
-               ram_session_support.cc \
-               rom_session_component.cc \
-               cap_session_component.cc \
-               cpu_session_component.cc \
-               cpu_session_platform.cc \
-               pd_session_component.cc \
-               io_mem_session_component.cc \
-               io_mem_session_support.cc \
-               thread_start.cc \
-               platform_thread.cc \
-               platform_pd.cc \
-               platform.cc \
-               platform_services.cc \
-               dataspace_component.cc \
-               rm_session_component.cc \
-               rm_session_support.cc \
-               irq_session_component.cc \
-               signal_session_component.cc \
-               signal_source_component.cc \
-               trace_session_component.cc \
-               dump_alloc.cc \
+SRC_CC       = cap_session_component.cc \
                context_area.cc \
                core_printf.cc \
-               kip.cc
+               cpu_session_component.cc \
+               cpu_session_platform.cc \
+               dataspace_component.cc \
+               dump_alloc.cc \
+               io_mem_session_component.cc \
+               io_mem_session_support.cc \
+               ipc_pager.cc \
+               irq_session_component.cc \
+               kip.cc \
+               main.cc \
+               multiboot_info.cc \
+               pd_session_component.cc \
+               pager.cc \
+               pager_common.cc \
+               platform.cc \
+               platform_pd.cc \
+               platform_services.cc \
+               platform_thread.cc \
+               ram_session_component.cc \
+               ram_session_support.cc \
+               rm_session_component.cc \
+               rm_session_support.cc \
+               rom_session_component.cc \
+               signal_session_component.cc \
+               signal_source_component.cc \
+               thread_start.cc \
+               trace_session_component.cc
 
 INC_DIR     += $(REP_DIR)/src/core/include \
                $(REP_DIR)/src/base/console \
@@ -54,6 +57,7 @@ vpath trace_session_component.cc  $(GEN_CORE_DIR)
 vpath dataspace_component.cc      $(GEN_CORE_DIR)
 vpath dump_alloc.cc               $(GEN_CORE_DIR)
 vpath context_area.cc             $(GEN_CORE_DIR)
+vpath pager_common.cc             $(GEN_CORE_DIR)
 vpath core_printf.cc              $(BASE_DIR)/src/base/console
 vpath kip.cc                      $(REP_DIR)/src/base/kip
 vpath %.cc                        $(REP_DIR)/src/core
diff --git a/repos/base-sel4/src/core/include/install_mapping.h b/repos/base-sel4/src/core/include/install_mapping.h
index ae8002e7f8..f43a5b035d 100644
--- a/repos/base-sel4/src/core/include/install_mapping.h
+++ b/repos/base-sel4/src/core/include/install_mapping.h
@@ -14,9 +14,9 @@
 #ifndef _CORE__INCLUDE__INSTALL_MAPPING_H_
 #define _CORE__INCLUDE__INSTALL_MAPPING_H_
 
-/* Genode includes */
-#include <base/ipc_pager.h>
-#include <base/pager.h>
+/* Core includes */
+#include <ipc_pager.h>
+#include <pager.h>
 
 namespace Genode {
 
diff --git a/repos/base-sel4/include/base/ipc_pager.h b/repos/base-sel4/src/core/include/ipc_pager.h
similarity index 96%
rename from repos/base-sel4/include/base/ipc_pager.h
rename to repos/base-sel4/src/core/include/ipc_pager.h
index c72f3bfaf4..beaa4bad9e 100644
--- a/repos/base-sel4/include/base/ipc_pager.h
+++ b/repos/base-sel4/src/core/include/ipc_pager.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__IPC_PAGER_H_
-#define _INCLUDE__BASE__IPC_PAGER_H_
+#ifndef _CORE__INCLUDE__IPC_PAGER_H_
+#define _CORE__INCLUDE__IPC_PAGER_H_
 
 #include <base/cache.h>
 #include <base/ipc.h>
@@ -156,4 +156,4 @@ namespace Genode {
 	};
 }
 
-#endif /* _INCLUDE__BASE__IPC_PAGER_H_ */
+#endif /* _CORE__INCLUDE__IPC_PAGER_H_ */
diff --git a/repos/base-sel4/src/core/include/platform_thread.h b/repos/base-sel4/src/core/include/platform_thread.h
index cd57e07634..2e64ad0604 100644
--- a/repos/base-sel4/src/core/include/platform_thread.h
+++ b/repos/base-sel4/src/core/include/platform_thread.h
@@ -15,13 +15,13 @@
 #define _CORE__INCLUDE__PLATFORM_THREAD_H_
 
 /* Genode includes */
-#include <base/pager.h>
 #include <base/thread_state.h>
 #include <base/native_types.h>
 #include <util/string.h>
-#include <base/ipc_pager.h>
 
 /* core includes */
+#include <pager.h>
+#include <ipc_pager.h>
 #include <address_space.h>
 #include <thread_sel4.h>
 #include <install_mapping.h>
diff --git a/repos/base-sel4/src/core/pager.cc b/repos/base-sel4/src/core/pager.cc
index d4090005a6..1b0b177ee1 100644
--- a/repos/base-sel4/src/core/pager.cc
+++ b/repos/base-sel4/src/core/pager.cc
@@ -12,10 +12,10 @@
  */
 
 /* Genode includes */
-#include <base/pager.h>
 #include <base/sleep.h>
 
 /* core includes */
+#include <pager.h>
 #include <core_capability_space.h>
 #include <install_mapping.h>
 
diff --git a/repos/base/src/core/include/cpu_session_component.h b/repos/base/src/core/include/cpu_session_component.h
index 82d8083535..63b7c37f3f 100644
--- a/repos/base/src/core/include/cpu_session_component.h
+++ b/repos/base/src/core/include/cpu_session_component.h
@@ -18,11 +18,11 @@
 #include <util/list.h>
 #include <base/allocator_guard.h>
 #include <base/lock.h>
-#include <base/pager.h>
 #include <base/rpc_server.h>
 #include <cpu_session/cpu_session.h>
 
 /* core includes */
+#include <pager.h>
 #include <cpu_thread_allocator.h>
 #include <platform_thread.h>
 #include <trace/control_area.h>
diff --git a/repos/base/include/base/pager.h b/repos/base/src/core/include/pager.h
similarity index 97%
rename from repos/base/include/base/pager.h
rename to repos/base/src/core/include/pager.h
index 8876c07fad..85a5ff69c4 100644
--- a/repos/base/include/base/pager.h
+++ b/repos/base/src/core/include/pager.h
@@ -12,12 +12,12 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__PAGER_H_
-#define _INCLUDE__BASE__PAGER_H_
+#ifndef _CORE__INCLUDE__PAGER_H_
+#define _CORE__INCLUDE__PAGER_H_
 
 #include <base/thread.h>
 #include <base/thread_state.h>
-#include <base/ipc_pager.h>
+#include <ipc_pager.h>
 #include <base/printf.h>
 #include <base/object_pool.h>
 #include <base/signal.h>
@@ -222,4 +222,4 @@ class Genode::Pager_activation : public Pager_activation_base
 		{ start(); }
 };
 
-#endif /* _INCLUDE__BASE__PAGER_H_ */
+#endif /* _CORE__INCLUDE__PAGER_H_ */
diff --git a/repos/base/src/core/include/rm_session_component.h b/repos/base/src/core/include/rm_session_component.h
index 78ae702924..2288034545 100644
--- a/repos/base/src/core/include/rm_session_component.h
+++ b/repos/base/src/core/include/rm_session_component.h
@@ -19,7 +19,7 @@
 #include <base/stdint.h>
 #include <base/lock.h>
 #include <base/capability.h>
-#include <base/pager.h>
+#include <pager.h>
 #include <base/allocator_avl.h>
 #include <base/allocator_guard.h>
 #include <base/sync_allocator.h>
diff --git a/repos/base/src/base/pager/common.cc b/repos/base/src/core/pager_common.cc
similarity index 93%
rename from repos/base/src/base/pager/common.cc
rename to repos/base/src/core/pager_common.cc
index 8e746c052a..c145e8a5e5 100644
--- a/repos/base/src/base/pager/common.cc
+++ b/repos/base/src/core/pager_common.cc
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-/* Genode includes */
-#include <base/pager.h>
+/* core includes */
+#include <pager.h>
 
 using namespace Genode;