diff --git a/repos/base-fiasco/src/core/platform.cc b/repos/base-fiasco/src/core/platform.cc
index 2f7f1e180..3570f44d0 100644
--- a/repos/base-fiasco/src/core/platform.cc
+++ b/repos/base-fiasco/src/core/platform.cc
@@ -14,9 +14,11 @@
 /* Genode includes */
 #include <base/printf.h>
 #include <base/allocator_avl.h>
-#include <base/crt0.h>
 #include <base/sleep.h>
 #include <util/misc_math.h>
+
+/* base-internal includes */
+#include <base/internal/crt0.h>
 #include <fiasco/thread_helper.h>
 
 /* core includes */
diff --git a/repos/base-foc/src/core/platform.cc b/repos/base-foc/src/core/platform.cc
index 59fb31ed6..3274d139a 100644
--- a/repos/base-foc/src/core/platform.cc
+++ b/repos/base-foc/src/core/platform.cc
@@ -15,10 +15,12 @@
 /* Genode includes */
 #include <base/printf.h>
 #include <base/allocator_avl.h>
-#include <base/crt0.h>
 #include <base/sleep.h>
 #include <util/misc_math.h>
 
+/* base-internal includes */
+#include <base/internal/crt0.h>
+
 /* core includes */
 #include <core_parent.h>
 #include <platform.h>
diff --git a/repos/base-foc/src/include/startup/internal/_main_parent_cap.h b/repos/base-foc/src/include/startup/internal/_main_parent_cap.h
index 7378518d6..0cfaec8d8 100644
--- a/repos/base-foc/src/include/startup/internal/_main_parent_cap.h
+++ b/repos/base-foc/src/include/startup/internal/_main_parent_cap.h
@@ -14,8 +14,12 @@
 #ifndef _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_
 #define _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_
 
+/* Genode includes */
 #include <base/native_types.h>
 
+/* base-internal includes */
+#include <base/internal/crt0.h>
+
 namespace Genode {
 
 	/**
diff --git a/repos/base-hw/src/include/startup/internal/_main_parent_cap.h b/repos/base-hw/src/include/startup/internal/_main_parent_cap.h
index 2c8ac855c..995eadb20 100644
--- a/repos/base-hw/src/include/startup/internal/_main_parent_cap.h
+++ b/repos/base-hw/src/include/startup/internal/_main_parent_cap.h
@@ -17,9 +17,10 @@
 /* Genode includes */
 #include <parent/capability.h>
 
-namespace Hw {
-	extern Genode::Untyped_capability _parent_cap;
-}
+/* base-internal includes */
+#include <base/internal/crt0.h>
+
+namespace Hw { extern Genode::Untyped_capability _parent_cap; }
 
 namespace Genode {
 
diff --git a/repos/base-linux/src/base/process/process.cc b/repos/base-linux/src/base/process/process.cc
index ab885c797..074d90717 100644
--- a/repos/base-linux/src/base/process/process.cc
+++ b/repos/base-linux/src/base/process/process.cc
@@ -12,14 +12,14 @@
  */
 
 /* Genode includes */
-#include <base/elf.h>
 #include <base/env.h>
 #include <base/process.h>
 #include <base/printf.h>
 #include <linux_native_pd/client.h>
 
-/* framework-internal includes */
+/* base-internal includes */
 #include <linux_syscalls.h>
+#include <base/internal/elf.h>
 
 
 using namespace Genode;
diff --git a/repos/base-linux/src/lib/lx_hybrid/lx_hybrid.cc b/repos/base-linux/src/lib/lx_hybrid/lx_hybrid.cc
index 5eb3ddb26..d49ce0f40 100644
--- a/repos/base-linux/src/lib/lx_hybrid/lx_hybrid.cc
+++ b/repos/base-linux/src/lib/lx_hybrid/lx_hybrid.cc
@@ -11,7 +11,7 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#include <base/crt0.h>
+//#include <base/crt0.h>
 #include <base/printf.h>
 #include <linux_syscalls.h>
 #include <linux_cpu_session/linux_cpu_session.h>
diff --git a/repos/base-linux/src/test/lx_rmap/main.cc b/repos/base-linux/src/test/lx_rmap/main.cc
index a9f8b51bf..6f8cedebd 100644
--- a/repos/base-linux/src/test/lx_rmap/main.cc
+++ b/repos/base-linux/src/test/lx_rmap/main.cc
@@ -14,14 +14,12 @@
 /* Genode includes */
 #include <base/printf.h>
 #include <base/env.h>
-#include <base/crt0.h>
 #include <base/sleep.h>
 #include <base/thread.h>
 #include <util/misc_math.h>
 #include <rm_session/connection.h>
 
 
-
 static void blob() __attribute__((used));
 static void blob()
 {
diff --git a/repos/base-okl4/src/core/platform.cc b/repos/base-okl4/src/core/platform.cc
index 3198f8c2c..13eaf2b1a 100644
--- a/repos/base-okl4/src/core/platform.cc
+++ b/repos/base-okl4/src/core/platform.cc
@@ -14,10 +14,12 @@
 /* Genode includes */
 #include <base/printf.h>
 #include <base/allocator_avl.h>
-#include <base/crt0.h>
 #include <base/sleep.h>
 #include <util/misc_math.h>
 
+/* base-internal includes */
+#include <base/internal/crt0.h>
+
 /* core includes */
 #include <core_parent.h>
 #include <platform.h>
diff --git a/repos/base-pistachio/src/core/platform.cc b/repos/base-pistachio/src/core/platform.cc
index efd073d1e..2ff6b76ef 100644
--- a/repos/base-pistachio/src/core/platform.cc
+++ b/repos/base-pistachio/src/core/platform.cc
@@ -14,11 +14,13 @@
 /* Genode includes */
 #include <base/printf.h>
 #include <base/allocator_avl.h>
-#include <base/crt0.h>
 #include <base/sleep.h>
 #include <base/capability.h>
 #include <util/misc_math.h>
 
+/* base-internal includes */
+#include <base/internal/crt0.h>
+
 /* core includes */
 #include <core_parent.h>
 #include <map_local.h>
diff --git a/repos/base/src/base/elf/elf_binary.cc b/repos/base/src/base/elf/elf_binary.cc
index 50e77d829..2ab60aca1 100644
--- a/repos/base/src/base/elf/elf_binary.cc
+++ b/repos/base/src/base/elf/elf_binary.cc
@@ -15,11 +15,11 @@
 
 /* Genode includes */
 #include <base/printf.h>
-#include <base/elf.h>
 #include <util/string.h>
 
 /* base-internal includes */
 #include <base/internal/elf_format.h>
+#include <base/internal/elf.h>
 
 using namespace Genode;
 
diff --git a/repos/base/src/base/env/reinitialize.cc b/repos/base/src/base/env/reinitialize.cc
index e264be794..6436bf13a 100644
--- a/repos/base/src/base/env/reinitialize.cc
+++ b/repos/base/src/base/env/reinitialize.cc
@@ -12,14 +12,14 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-/* base-internal includes */
-#include <base/internal/platform_env.h>
-
 /* Genode includes */
 #include <util/construct_at.h>
-#include <base/crt0.h>
 #include <rm_session/connection.h>
 
+/* base-internal includes */
+#include <base/internal/platform_env.h>
+#include <base/internal/crt0.h>
+
 void prepare_reinit_main_thread();
 
 void reinit_main_thread();
diff --git a/repos/base/src/base/process/process.cc b/repos/base/src/base/process/process.cc
index 8dd5248d7..27d899272 100644
--- a/repos/base/src/base/process/process.cc
+++ b/repos/base/src/base/process/process.cc
@@ -12,13 +12,16 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+/* Genode includes */
 #include <base/process.h>
-#include <base/elf.h>
 #include <base/env.h>
 #include <base/printf.h>
 #include <ram_session/client.h>
 #include <dataspace/client.h>
 
+/* base-internal includes */
+#include <base/internal/elf.h>
+
 using namespace Genode;
 
 Dataspace_capability Process::_dynamic_linker_cap;
diff --git a/repos/base/include/base/crt0.h b/repos/base/src/include/base/internal/crt0.h
similarity index 100%
rename from repos/base/include/base/crt0.h
rename to repos/base/src/include/base/internal/crt0.h
diff --git a/repos/base/include/base/elf.h b/repos/base/src/include/base/internal/elf.h
similarity index 100%
rename from repos/base/include/base/elf.h
rename to repos/base/src/include/base/internal/elf.h
diff --git a/repos/base/src/include/startup/internal/_main_parent_cap.h b/repos/base/src/include/startup/internal/_main_parent_cap.h
index 63192cf22..16c12e234 100644
--- a/repos/base/src/include/startup/internal/_main_parent_cap.h
+++ b/repos/base/src/include/startup/internal/_main_parent_cap.h
@@ -17,6 +17,9 @@
 #ifndef _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_
 #define _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_
 
+/* base-internal includes */
+#include <base/internal/crt0.h>
+
 namespace Genode {
 
 	/**
diff --git a/repos/base/src/lib/startup/_main.cc b/repos/base/src/lib/startup/_main.cc
index 1d04ab108..90c8ad430 100644
--- a/repos/base/src/lib/startup/_main.cc
+++ b/repos/base/src/lib/startup/_main.cc
@@ -19,13 +19,13 @@
  */
 
 /* Genode includes */
-#include <base/crt0.h>
 #include <base/env.h>
 #include <base/sleep.h>
 #include <base/printf.h>
 
 /* platform-specific local helper functions */
 #include <startup/internal/_main_parent_cap.h>
+#include <base/internal/crt0.h>
 
 
 using namespace Genode;
diff --git a/repos/os/src/server/tz_vmm/include/vm_base.h b/repos/os/src/server/tz_vmm/include/vm_base.h
index 26aad675b..ad27b5383 100644
--- a/repos/os/src/server/tz_vmm/include/vm_base.h
+++ b/repos/os/src/server/tz_vmm/include/vm_base.h
@@ -15,7 +15,6 @@
 #define _SRC__SERVER__VMM__INCLUDE__VM_H_
 
 /* Genode includes */
-#include <base/elf.h>
 #include <dataspace/client.h>
 #include <io_mem_session/connection.h>
 #include <rom_session/connection.h>