diff --git a/repos/base-linux/src/base/env/rm_session_mmap.cc b/repos/base-linux/src/base/env/rm_session_mmap.cc
index 8b5b32427e..58ff015004 100644
--- a/repos/base-linux/src/base/env/rm_session_mmap.cc
+++ b/repos/base-linux/src/base/env/rm_session_mmap.cc
@@ -33,12 +33,12 @@
  */
 
 /* Genode includes */
-#include <base/local_capability.h>
 #include <base/thread.h>
 #include <linux_dataspace/client.h>
 #include <linux_syscalls.h>
 
 /* base-internal includes */
+#include <base/internal/local_capability.h>
 #include <base/internal/platform_env.h>
 #include <base/internal/context_area.h>
 
diff --git a/repos/base-linux/src/base/rm_session_client.cc b/repos/base-linux/src/base/rm_session_client.cc
index 5df0fc9057..6cc58eba5d 100644
--- a/repos/base-linux/src/base/rm_session_client.cc
+++ b/repos/base-linux/src/base/rm_session_client.cc
@@ -11,11 +11,15 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#include <base/local_capability.h>
+/* Genode includes */
 #include <rm_session/client.h>
 
+/* base-internal includes */
+#include <base/internal/local_capability.h>
+
 using namespace Genode;
 
+
 /**
  * Return pointer to locally implemented RM session
  *
diff --git a/repos/base-linux/include/base/local_capability.h b/repos/base-linux/src/include/base/internal/local_capability.h
similarity index 100%
rename from repos/base-linux/include/base/local_capability.h
rename to repos/base-linux/src/include/base/internal/local_capability.h
diff --git a/repos/base-linux/src/include/base/internal/platform_env.h b/repos/base-linux/src/include/base/internal/platform_env.h
index 7afc2eb3fd..9cc75c1aa4 100644
--- a/repos/base-linux/src/include/base/internal/platform_env.h
+++ b/repos/base-linux/src/include/base/internal/platform_env.h
@@ -23,11 +23,11 @@
 
 /* Genode includes */
 #include <util/misc_math.h>
-#include <base/local_capability.h>
 #include <base/heap.h>
 #include <linux_cpu_session/client.h>
 
 /* base-internal includes */
+#include <base/internal/local_capability.h>
 #include <base/internal/platform_env_common.h>
 
 
diff --git a/repos/base-linux/include/linux_cpu_session/client.h b/repos/base-linux/src/include/linux_cpu_session/client.h
similarity index 100%
rename from repos/base-linux/include/linux_cpu_session/client.h
rename to repos/base-linux/src/include/linux_cpu_session/client.h
diff --git a/repos/base-linux/include/linux_cpu_session/linux_cpu_session.h b/repos/base-linux/src/include/linux_cpu_session/linux_cpu_session.h
similarity index 100%
rename from repos/base-linux/include/linux_cpu_session/linux_cpu_session.h
rename to repos/base-linux/src/include/linux_cpu_session/linux_cpu_session.h
diff --git a/repos/base-linux/include/linux_dataspace/client.h b/repos/base-linux/src/include/linux_dataspace/client.h
similarity index 100%
rename from repos/base-linux/include/linux_dataspace/client.h
rename to repos/base-linux/src/include/linux_dataspace/client.h
diff --git a/repos/base-linux/include/linux_dataspace/linux_dataspace.h b/repos/base-linux/src/include/linux_dataspace/linux_dataspace.h
similarity index 100%
rename from repos/base-linux/include/linux_dataspace/linux_dataspace.h
rename to repos/base-linux/src/include/linux_dataspace/linux_dataspace.h
diff --git a/repos/base-linux/include/linux_native_pd/client.h b/repos/base-linux/src/include/linux_native_pd/client.h
similarity index 100%
rename from repos/base-linux/include/linux_native_pd/client.h
rename to repos/base-linux/src/include/linux_native_pd/client.h
diff --git a/repos/base-linux/include/linux_native_pd/linux_native_pd.h b/repos/base-linux/src/include/linux_native_pd/linux_native_pd.h
similarity index 100%
rename from repos/base-linux/include/linux_native_pd/linux_native_pd.h
rename to repos/base-linux/src/include/linux_native_pd/linux_native_pd.h