diff --git a/base-linux/lib/mk/base-common.mk b/base-linux/lib/mk/base-common.mk
index 5eba2dd54..5077a5d61 100644
--- a/base-linux/lib/mk/base-common.mk
+++ b/base-linux/lib/mk/base-common.mk
@@ -4,7 +4,7 @@
 # \date   2013-02-14
 #
 
-LIBS += startup syscall
+LIBS += syscall
 
 SRC_CC += ipc/ipc.cc
 SRC_CC += avl_tree/avl_tree.cc
diff --git a/base-linux/lib/mk/base.inc b/base-linux/lib/mk/base.inc
new file mode 100644
index 000000000..0959490c5
--- /dev/null
+++ b/base-linux/lib/mk/base.inc
@@ -0,0 +1,20 @@
+#
+# \brief  Portions of base library that are exclusive to non-core processes
+# \author Norman Feske
+# \date   2013-02-14
+#
+# The content of this file is used for both native Genode as well as hybrid
+# Linux/Genode programs. Hence, it must be void of any thread-related code.
+#
+
+LIBS += base-common syscall cxx
+
+SRC_CC += console/log_console.cc
+SRC_CC += env/env.cc env/platform_env.cc env/context_area.cc
+
+INC_DIR += $(REP_DIR)/src/base/env $(BASE_DIR)/src/base/env
+
+vpath %.cc  $(REP_DIR)/src/base
+vpath %.cc $(BASE_DIR)/src/base
+
+# vi:set ft=make :
diff --git a/base-linux/lib/mk/base.mk b/base-linux/lib/mk/base.mk
index f9bb27827..518701d20 100644
--- a/base-linux/lib/mk/base.mk
+++ b/base-linux/lib/mk/base.mk
@@ -1,19 +1,16 @@
 #
-# \brief  Portions of base library that are exclusive to non-core processes
-# \author Norman Feske
-# \date   2013-02-14
-#
-# The content of this file is used for both native Genode as well as hybrid
-# Linux/Genode programs. Hence, it must be void of any thread-related code.
+# \brief  Base lib parts that are not used by hybrid applications
+# \author Sebastian Sumpf
+# \date   2014-02-21
 #
 
-LIBS += base-common syscall cxx
+LIBS   += startup cxx
+SRC_CC += thread.cc thread_linux.cc
+
+vpath %.cc  $(REP_DIR)/src/base/thread
+vpath %.cc $(BASE_DIR)/src/base/thread
+
+include $(REP_DIR)/lib/mk/base.inc
 
-SRC_CC += console/log_console.cc
-SRC_CC += env/env.cc env/platform_env.cc env/context_area.cc
-SRC_CC += thread/thread.cc thread/thread_linux.cc
 
-INC_DIR += $(REP_DIR)/src/base/env $(BASE_DIR)/src/base/env
 
-vpath %.cc  $(REP_DIR)/src/base
-vpath %.cc $(BASE_DIR)/src/base
diff --git a/base-linux/src/core/target.mk b/base-linux/src/core/target.mk
index 7d69d80c6..2c32c381f 100644
--- a/base-linux/src/core/target.mk
+++ b/base-linux/src/core/target.mk
@@ -1,6 +1,6 @@
 TARGET        = core
 REQUIRES      = linux
-LIBS          = cxx base-common syscall
+LIBS          = cxx base-common syscall startup
 
 GEN_CORE_DIR  = $(BASE_DIR)/src/core
 
diff --git a/base/mk/prg.mk b/base/mk/prg.mk
index 9b21abce4..3bd79dbbe 100644
--- a/base/mk/prg.mk
+++ b/base/mk/prg.mk
@@ -162,8 +162,9 @@ STATIC_LIBS := $(sort $(wildcard $(STATIC_LIBS)))
 # 'src/platform/lx_hybrid.cc'.
 #
 ifeq ($(USE_HOST_LD_SCRIPT),yes)
-STATIC_LIBS := $(filter-out $(LIB_CACHE_DIR)/base/base.lib.a, $(STATIC_LIBS))
-STATIC_LIBS := $(filter-out $(LIB_CACHE_DIR)/cxx/cxx.lib.a,   $(STATIC_LIBS))
+STATIC_LIBS := $(filter-out $(LIB_CACHE_DIR)/startup/startup.lib.a, $(STATIC_LIBS))
+STATIC_LIBS := $(filter-out $(LIB_CACHE_DIR)/base/base.lib.a,       $(STATIC_LIBS))
+STATIC_LIBS := $(filter-out $(LIB_CACHE_DIR)/cxx/cxx.lib.a,         $(STATIC_LIBS))
 endif
 
 #