base: uniform base-internal header structure

This patch establishes a common organization of header files
internal to the base framework. The internal headers are located at
'<repository>/src/include/base/internal/'. This structure has been
choosen to make the nature of those headers immediately clear when
included:

  #include <base/internal/lock_helper.h>

Issue #1832

repos/base-linux/lib/mk/base-common.mk

@@ -23,11 +23,7 @@ SRC_CC += thread/trace.cc thread/thread_env.cc thread/context_allocator.cc
 SRC_CC += irq/platform.cc
 SRC_CC += sleep.cc
 
-INC_DIR +=  $(REP_DIR)/src/base/lock $(BASE_DIR)/src/base/lock
-INC_DIR +=  $(REP_DIR)/src/base/ipc
-INC_DIR +=  $(REP_DIR)/src/base/env $(BASE_DIR)/src/base/env
-INC_DIR +=  $(BASE_DIR)/src/lib/startup
-INC_DIR += $(BASE_DIR)/src/base/thread
+INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
 
 vpath %.cc $(REP_DIR)/src/base
 vpath %.cc $(BASE_DIR)/src/base

repos/base-linux/lib/mk/base.inc

@@ -13,7 +13,7 @@ SRC_CC += console/log_console.cc
 SRC_CC += env/env.cc env/platform_env.cc env/context_area.cc
 SRC_CC += server/rpc_cap_alloc.cc
 
-INC_DIR += $(REP_DIR)/src/base/env $(BASE_DIR)/src/base/env
+INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
 
 vpath %.cc  $(REP_DIR)/src/base
 vpath %.cc $(BASE_DIR)/src/base

repos/base-linux/lib/mk/base.mk

@@ -5,6 +5,7 @@
 #
 
 LIBS   += startup cxx
+
 SRC_CC += thread/thread.cc thread/myself.cc thread/thread_linux.cc
 SRC_CC += server/rpc_cap_alloc.cc
 

repos/base-linux/src/base/env/platform_env.cc

@@ -17,8 +17,8 @@
 #include <linux_dataspace/client.h>
 #include <linux_syscalls.h>
 
-/* local includes */
-#include <platform_env.h>
+/* base-internal includes */
+#include <base/internal/platform_env.h>
 
 using namespace Genode;
 

repos/base-linux/src/base/env/rm_session_mmap.cc

@@ -37,10 +37,10 @@
 #include <base/thread.h>
 #include <linux_dataspace/client.h>
 #include <linux_syscalls.h>
-#include <context_area.h>
 
-/* local includes */
-#include <platform_env.h>
+/* base-internal includes */
+#include <base/internal/platform_env.h>
+#include <base/internal/context_area.h>
 
 using namespace Genode;
 

repos/base-linux/src/base/ipc/ipc.cc

@@ -34,8 +34,8 @@
 #include <base/env.h>
 #include <linux_cpu_session/linux_cpu_session.h>
 
-/* local includes */
-#include <socket_descriptor_registry.h>
+/* base-internal includes */
+#include <base/internal/socket_descriptor_registry.h>
 
 /* Linux includes */
 #include <linux_syscalls.h>

repos/base-linux/src/core/context_area.cc

@@ -17,7 +17,8 @@
 #include <base/printf.h>
 #include <base/thread.h>
 
-#include <context_area.h>
+/* base-internal includes */
+#include <base/internal/context_area.h>
 
 
 /**

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

@@ -25,8 +25,8 @@
 #include <ram_session_component.h>
 #include <core_pd_session.h>
 
-/* internal base includes */
-#include <platform_env.h>
+/* base-internal includes */
+#include <base/internal/platform_env.h>
 
 
 namespace Genode {

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

@@ -19,8 +19,8 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-/* include from 'src/base/ipc' */
-#include <socket_descriptor_registry.h>
+/* base-internal includes */
+#include <base/internal/socket_descriptor_registry.h>
 
 /* core-local includes */
 #include <resource_path.h>

repos/base-linux/src/core/target.mk

@@ -31,11 +31,8 @@ SRC_CC        = main.cc \
 INC_DIR      += $(REP_DIR)/src/core/include \
                 $(GEN_CORE_DIR)/include \
                 $(REP_DIR)/src/platform \
-                $(REP_DIR)/src/base/ipc \
-                $(REP_DIR)/src/base/env \
-                $(BASE_DIR)/src/base/env \
-                $(REP_DIR)/src/base/console \
-                $(BASE_DIR)/src/base/thread \
+                $(REP_DIR)/src/include \
+                $(BASE_DIR)/src/include
 
 HOST_INC_DIR += /usr/include
 

repos/base-linux/src/include/base/internal/platform_env.h

@@ -27,8 +27,8 @@
 #include <base/heap.h>
 #include <linux_cpu_session/client.h>
 
-/* local includes (from 'base/src/base/env/') */
-#include <platform_env_common.h>
+/* base-internal includes */
+#include <base/internal/platform_env_common.h>
 
 
 namespace Genode {