diff --git a/repos/base-linux/src/test/lx_rmap/dynamic/target.mk b/repos/base-linux/src/test/lx_rmap/dynamic/target.mk
index f6a6516e0a..050de59559 100644
--- a/repos/base-linux/src/test/lx_rmap/dynamic/target.mk
+++ b/repos/base-linux/src/test/lx_rmap/dynamic/target.mk
@@ -1,5 +1,5 @@
TARGET = test-lx_rmap_dynamic
SRC_CC = main.cc
-LIBS = base ld
+LIBS = base
vpath main.cc $(PRG_DIR)/..
diff --git a/repos/base/recipes/src/test-timer/used_apis b/repos/base/recipes/src/test-timer/used_apis
index 3a7f09b08d..af3ee7a030 100644
--- a/repos/base/recipes/src/test-timer/used_apis
+++ b/repos/base/recipes/src/test-timer/used_apis
@@ -1,3 +1,2 @@
base
-os
timer_session
diff --git a/repos/dde_linux/recipes/src/vfs_lxip/used_apis b/repos/dde_linux/recipes/src/vfs_lxip/used_apis
index 1044b02b03..e914ef82ee 100644
--- a/repos/dde_linux/recipes/src/vfs_lxip/used_apis
+++ b/repos/dde_linux/recipes/src/vfs_lxip/used_apis
@@ -1,7 +1,6 @@
base
+nic_session
os
so
-libc
-vfs
timer_session
-nic_session
+vfs
diff --git a/repos/gems/src/app/mixer_gui_qt/target.mk b/repos/gems/src/app/mixer_gui_qt/target.mk
index 52b8a0d501..3cc8c754f1 100644
--- a/repos/gems/src/app/mixer_gui_qt/target.mk
+++ b/repos/gems/src/app/mixer_gui_qt/target.mk
@@ -4,6 +4,6 @@ include $(call select_from_repositories,src/app/qt5/tmpl/target_final.inc)
main_window.o: main_window.moc
-LIBS += qoost qt5_gui qt5_widgets qt5_core libc
+LIBS += qoost qt5_gui qt5_widgets qt5_core libc base
CC_CXX_WARN_STRICT =
diff --git a/repos/gems/src/test/tiled_wm/app/target.mk b/repos/gems/src/test/tiled_wm/app/target.mk
index 48ac9307d3..37cbb47f32 100644
--- a/repos/gems/src/test/tiled_wm/app/target.mk
+++ b/repos/gems/src/test/tiled_wm/app/target.mk
@@ -1 +1,3 @@
include $(PRG_DIR)/../target.inc
+
+LIBS += base
diff --git a/repos/gems/src/test/tiled_wm/overlay/target.mk b/repos/gems/src/test/tiled_wm/overlay/target.mk
index 48ac9307d3..37cbb47f32 100644
--- a/repos/gems/src/test/tiled_wm/overlay/target.mk
+++ b/repos/gems/src/test/tiled_wm/overlay/target.mk
@@ -1 +1,3 @@
include $(PRG_DIR)/../target.inc
+
+LIBS += base
diff --git a/repos/gems/src/test/tiled_wm/panel/target.mk b/repos/gems/src/test/tiled_wm/panel/target.mk
index 3b2def4254..68db2769a0 100644
--- a/repos/gems/src/test/tiled_wm/panel/target.mk
+++ b/repos/gems/src/test/tiled_wm/panel/target.mk
@@ -1,3 +1,5 @@
include $(PRG_DIR)/../target.inc
+LIBS += base
+
panel.o main.o: icon.h
diff --git a/repos/libports/recipes/src/curl/used_apis b/repos/libports/recipes/src/curl/used_apis
index 95cf9b8f98..863838b49d 100644
--- a/repos/libports/recipes/src/curl/used_apis
+++ b/repos/libports/recipes/src/curl/used_apis
@@ -3,4 +3,3 @@ libcrypto
zlib
libssh
libssl
-so
diff --git a/repos/libports/recipes/src/expat/used_apis b/repos/libports/recipes/src/expat/used_apis
index dccf4f6fb4..0a9ce4f3e2 100644
--- a/repos/libports/recipes/src/expat/used_apis
+++ b/repos/libports/recipes/src/expat/used_apis
@@ -1,2 +1 @@
-base
libc
diff --git a/repos/libports/recipes/src/freetype/used_apis b/repos/libports/recipes/src/freetype/used_apis
index 4011ccc3b3..0a9ce4f3e2 100644
--- a/repos/libports/recipes/src/freetype/used_apis
+++ b/repos/libports/recipes/src/freetype/used_apis
@@ -1,2 +1 @@
libc
-so
diff --git a/repos/libports/recipes/src/gmp/used_apis b/repos/libports/recipes/src/gmp/used_apis
index 26901dafc1..634b449163 100644
--- a/repos/libports/recipes/src/gmp/used_apis
+++ b/repos/libports/recipes/src/gmp/used_apis
@@ -1,3 +1,2 @@
libc
-so
gmp
diff --git a/repos/libports/recipes/src/icu/used_apis b/repos/libports/recipes/src/icu/used_apis
index 0f3a549fed..f155898419 100644
--- a/repos/libports/recipes/src/icu/used_apis
+++ b/repos/libports/recipes/src/icu/used_apis
@@ -1,5 +1,2 @@
-base
libc
-os
stdcxx
-timer_session
diff --git a/repos/libports/recipes/src/jbig2dec/used_apis b/repos/libports/recipes/src/jbig2dec/used_apis
index 3901f056ed..be431563cb 100644
--- a/repos/libports/recipes/src/jbig2dec/used_apis
+++ b/repos/libports/recipes/src/jbig2dec/used_apis
@@ -1,4 +1,3 @@
libc
libpng
-so
zlib
diff --git a/repos/libports/recipes/src/jpeg/used_apis b/repos/libports/recipes/src/jpeg/used_apis
index 4011ccc3b3..0a9ce4f3e2 100644
--- a/repos/libports/recipes/src/jpeg/used_apis
+++ b/repos/libports/recipes/src/jpeg/used_apis
@@ -1,2 +1 @@
libc
-so
diff --git a/repos/libports/recipes/src/libarchive/used_apis b/repos/libports/recipes/src/libarchive/used_apis
index 228b09f9aa..03b7e60ba9 100644
--- a/repos/libports/recipes/src/libarchive/used_apis
+++ b/repos/libports/recipes/src/libarchive/used_apis
@@ -1,4 +1,3 @@
libc
-so
-zlib
liblzma
+zlib
diff --git a/repos/libports/recipes/src/libcrypto/used_apis b/repos/libports/recipes/src/libcrypto/used_apis
index 4011ccc3b3..0a9ce4f3e2 100644
--- a/repos/libports/recipes/src/libcrypto/used_apis
+++ b/repos/libports/recipes/src/libcrypto/used_apis
@@ -1,2 +1 @@
libc
-so
diff --git a/repos/libports/recipes/src/libiconv/used_apis b/repos/libports/recipes/src/libiconv/used_apis
index 4011ccc3b3..0a9ce4f3e2 100644
--- a/repos/libports/recipes/src/libiconv/used_apis
+++ b/repos/libports/recipes/src/libiconv/used_apis
@@ -1,2 +1 @@
libc
-so
diff --git a/repos/libports/recipes/src/liblzma/used_apis b/repos/libports/recipes/src/liblzma/used_apis
index 4011ccc3b3..0a9ce4f3e2 100644
--- a/repos/libports/recipes/src/liblzma/used_apis
+++ b/repos/libports/recipes/src/liblzma/used_apis
@@ -1,2 +1 @@
libc
-so
diff --git a/repos/libports/recipes/src/libssh/used_apis b/repos/libports/recipes/src/libssh/used_apis
index 64f01ac8fc..76972fb39f 100644
--- a/repos/libports/recipes/src/libssh/used_apis
+++ b/repos/libports/recipes/src/libssh/used_apis
@@ -1,5 +1,4 @@
libc
-so
zlib
libcrypto
libssl
diff --git a/repos/libports/recipes/src/libssl/used_apis b/repos/libports/recipes/src/libssl/used_apis
index 73757376a7..5daf5f3d83 100644
--- a/repos/libports/recipes/src/libssl/used_apis
+++ b/repos/libports/recipes/src/libssl/used_apis
@@ -1,3 +1,2 @@
libc
libcrypto
-so
diff --git a/repos/libports/recipes/src/mpc/used_apis b/repos/libports/recipes/src/mpc/used_apis
index 87a02686ff..cb6e5d4313 100644
--- a/repos/libports/recipes/src/mpc/used_apis
+++ b/repos/libports/recipes/src/mpc/used_apis
@@ -1,4 +1,3 @@
gmp
mpfr
libc
-so
diff --git a/repos/libports/recipes/src/mpfr/used_apis b/repos/libports/recipes/src/mpfr/used_apis
index fbf466f49b..67141ee51d 100644
--- a/repos/libports/recipes/src/mpfr/used_apis
+++ b/repos/libports/recipes/src/mpfr/used_apis
@@ -1,3 +1,2 @@
gmp
libc
-so
diff --git a/repos/libports/recipes/src/mupdf/used_apis b/repos/libports/recipes/src/mupdf/used_apis
index 997c378570..c553f1d901 100644
--- a/repos/libports/recipes/src/mupdf/used_apis
+++ b/repos/libports/recipes/src/mupdf/used_apis
@@ -3,5 +3,4 @@ jbig2dec
jpeg
libc
openjpeg
-so
zlib
diff --git a/repos/libports/recipes/src/ncurses/used_apis b/repos/libports/recipes/src/ncurses/used_apis
index 4011ccc3b3..0a9ce4f3e2 100644
--- a/repos/libports/recipes/src/ncurses/used_apis
+++ b/repos/libports/recipes/src/ncurses/used_apis
@@ -1,2 +1 @@
libc
-so
diff --git a/repos/libports/recipes/src/openjpeg/used_apis b/repos/libports/recipes/src/openjpeg/used_apis
index 4011ccc3b3..0a9ce4f3e2 100644
--- a/repos/libports/recipes/src/openjpeg/used_apis
+++ b/repos/libports/recipes/src/openjpeg/used_apis
@@ -1,2 +1 @@
libc
-so
diff --git a/repos/libports/recipes/src/pcre/used_apis b/repos/libports/recipes/src/pcre/used_apis
index 4011ccc3b3..0a9ce4f3e2 100644
--- a/repos/libports/recipes/src/pcre/used_apis
+++ b/repos/libports/recipes/src/pcre/used_apis
@@ -1,2 +1 @@
libc
-so
diff --git a/repos/libports/recipes/src/pcre16/used_apis b/repos/libports/recipes/src/pcre16/used_apis
index dccf4f6fb4..0a9ce4f3e2 100644
--- a/repos/libports/recipes/src/pcre16/used_apis
+++ b/repos/libports/recipes/src/pcre16/used_apis
@@ -1,2 +1 @@
-base
libc
diff --git a/repos/libports/recipes/src/pdf_view/used_apis b/repos/libports/recipes/src/pdf_view/used_apis
index 995a9bfa8d..a3f390cd76 100644
--- a/repos/libports/recipes/src/pdf_view/used_apis
+++ b/repos/libports/recipes/src/pdf_view/used_apis
@@ -5,5 +5,3 @@ libc
mupdf
nitpicker_session
os
-so
-vfs
diff --git a/repos/libports/recipes/src/posix/used_apis b/repos/libports/recipes/src/posix/used_apis
index a40bb104a5..24ad7bab4c 100644
--- a/repos/libports/recipes/src/posix/used_apis
+++ b/repos/libports/recipes/src/posix/used_apis
@@ -1,5 +1,3 @@
base
-so
libc
-vfs
-os
+so
diff --git a/repos/libports/recipes/src/qt5_calculatorform/used_apis b/repos/libports/recipes/src/qt5_calculatorform/used_apis
index a7a7673390..66d7e58b5e 100644
--- a/repos/libports/recipes/src/qt5_calculatorform/used_apis
+++ b/repos/libports/recipes/src/qt5_calculatorform/used_apis
@@ -1,4 +1,3 @@
-base
libc
mesa
qt5_component
diff --git a/repos/libports/recipes/src/qt5_component/used_apis b/repos/libports/recipes/src/qt5_component/used_apis
index d8d4f82e87..24ad7bab4c 100644
--- a/repos/libports/recipes/src/qt5_component/used_apis
+++ b/repos/libports/recipes/src/qt5_component/used_apis
@@ -1,5 +1,3 @@
base
libc
-os
so
-vfs
diff --git a/repos/libports/recipes/src/qt5_core/used_apis b/repos/libports/recipes/src/qt5_core/used_apis
index 5eebb88483..ed9ae0b620 100644
--- a/repos/libports/recipes/src/qt5_core/used_apis
+++ b/repos/libports/recipes/src/qt5_core/used_apis
@@ -3,5 +3,4 @@ libc
os
so
stdcxx
-timer_session
zlib
diff --git a/repos/libports/recipes/src/test-expat/used_apis b/repos/libports/recipes/src/test-expat/used_apis
index 0918ee4fb0..7b52d4057a 100644
--- a/repos/libports/recipes/src/test-expat/used_apis
+++ b/repos/libports/recipes/src/test-expat/used_apis
@@ -1,4 +1,3 @@
-base
expat
posix
libc
diff --git a/repos/libports/recipes/src/test-libc/used_apis b/repos/libports/recipes/src/test-libc/used_apis
index ce85f15de1..30bd708b3d 100644
--- a/repos/libports/recipes/src/test-libc/used_apis
+++ b/repos/libports/recipes/src/test-libc/used_apis
@@ -1,3 +1,2 @@
-base
posix
libc
diff --git a/repos/libports/recipes/src/test-libc_connect/used_apis b/repos/libports/recipes/src/test-libc_connect/used_apis
index ce85f15de1..30bd708b3d 100644
--- a/repos/libports/recipes/src/test-libc_connect/used_apis
+++ b/repos/libports/recipes/src/test-libc_connect/used_apis
@@ -1,3 +1,2 @@
-base
posix
libc
diff --git a/repos/libports/recipes/src/test-libc_counter/used_apis b/repos/libports/recipes/src/test-libc_counter/used_apis
index ce85f15de1..30bd708b3d 100644
--- a/repos/libports/recipes/src/test-libc_counter/used_apis
+++ b/repos/libports/recipes/src/test-libc_counter/used_apis
@@ -1,3 +1,2 @@
-base
posix
libc
diff --git a/repos/libports/recipes/src/test-libc_execve/used_apis b/repos/libports/recipes/src/test-libc_execve/used_apis
index ce85f15de1..30bd708b3d 100644
--- a/repos/libports/recipes/src/test-libc_execve/used_apis
+++ b/repos/libports/recipes/src/test-libc_execve/used_apis
@@ -1,3 +1,2 @@
-base
posix
libc
diff --git a/repos/libports/recipes/src/test-libc_fork/used_apis b/repos/libports/recipes/src/test-libc_fork/used_apis
index ce85f15de1..30bd708b3d 100644
--- a/repos/libports/recipes/src/test-libc_fork/used_apis
+++ b/repos/libports/recipes/src/test-libc_fork/used_apis
@@ -1,3 +1,2 @@
-base
posix
libc
diff --git a/repos/libports/recipes/src/test-libc_getenv/used_apis b/repos/libports/recipes/src/test-libc_getenv/used_apis
index 2115aa2d67..0c483273a8 100644
--- a/repos/libports/recipes/src/test-libc_getenv/used_apis
+++ b/repos/libports/recipes/src/test-libc_getenv/used_apis
@@ -1,3 +1,2 @@
-base
libc
posix
diff --git a/repos/libports/recipes/src/test-libc_pipe/used_apis b/repos/libports/recipes/src/test-libc_pipe/used_apis
index 0cd0b4a803..0c483273a8 100644
--- a/repos/libports/recipes/src/test-libc_pipe/used_apis
+++ b/repos/libports/recipes/src/test-libc_pipe/used_apis
@@ -1,6 +1,2 @@
-base
-os
-so
libc
posix
-timer_session
diff --git a/repos/libports/recipes/src/test-libc_vfs/used_apis b/repos/libports/recipes/src/test-libc_vfs/used_apis
index c3ae17fabf..dccf4f6fb4 100644
--- a/repos/libports/recipes/src/test-libc_vfs/used_apis
+++ b/repos/libports/recipes/src/test-libc_vfs/used_apis
@@ -1,3 +1,2 @@
base
-vfs
libc
diff --git a/repos/libports/recipes/src/test-libc_vfs_block/used_apis b/repos/libports/recipes/src/test-libc_vfs_block/used_apis
index c3ae17fabf..dccf4f6fb4 100644
--- a/repos/libports/recipes/src/test-libc_vfs_block/used_apis
+++ b/repos/libports/recipes/src/test-libc_vfs_block/used_apis
@@ -1,3 +1,2 @@
base
-vfs
libc
diff --git a/repos/libports/recipes/src/test-netty/used_apis b/repos/libports/recipes/src/test-netty/used_apis
index 82f5b2f32d..dccf4f6fb4 100644
--- a/repos/libports/recipes/src/test-netty/used_apis
+++ b/repos/libports/recipes/src/test-netty/used_apis
@@ -1,5 +1,2 @@
base
-posix
libc
-os
-timer_session
diff --git a/repos/libports/recipes/src/test-pthread/used_apis b/repos/libports/recipes/src/test-pthread/used_apis
index e155825d21..ce85f15de1 100644
--- a/repos/libports/recipes/src/test-pthread/used_apis
+++ b/repos/libports/recipes/src/test-pthread/used_apis
@@ -1,5 +1,3 @@
base
-os
posix
libc
-timer_session
diff --git a/repos/libports/recipes/src/test-stdcxx/used_apis b/repos/libports/recipes/src/test-stdcxx/used_apis
index 58bac34268..f24a265cc1 100644
--- a/repos/libports/recipes/src/test-stdcxx/used_apis
+++ b/repos/libports/recipes/src/test-stdcxx/used_apis
@@ -1,4 +1,3 @@
-base
stdcxx
posix
libc
diff --git a/repos/libports/recipes/src/vesa_drv/used_apis b/repos/libports/recipes/src/vesa_drv/used_apis
index f987fe047f..6a2f674179 100644
--- a/repos/libports/recipes/src/vesa_drv/used_apis
+++ b/repos/libports/recipes/src/vesa_drv/used_apis
@@ -1,7 +1,6 @@
base
os
blit
-libc
platform_session
timer_session
framebuffer_session
diff --git a/repos/libports/recipes/src/vfs_jitterentropy/used_apis b/repos/libports/recipes/src/vfs_jitterentropy/used_apis
index 9593aa9496..fe36c12f89 100644
--- a/repos/libports/recipes/src/vfs_jitterentropy/used_apis
+++ b/repos/libports/recipes/src/vfs_jitterentropy/used_apis
@@ -1,6 +1,5 @@
base
+jitterentropy
os
so
-libc
vfs
-jitterentropy
diff --git a/repos/libports/recipes/src/zlib/used_apis b/repos/libports/recipes/src/zlib/used_apis
index 4011ccc3b3..0a9ce4f3e2 100644
--- a/repos/libports/recipes/src/zlib/used_apis
+++ b/repos/libports/recipes/src/zlib/used_apis
@@ -1,2 +1 @@
libc
-so
diff --git a/repos/libports/src/app/fetchurl/target.mk b/repos/libports/src/app/fetchurl/target.mk
index 0ef5399f94..8b77ef92d8 100644
--- a/repos/libports/src/app/fetchurl/target.mk
+++ b/repos/libports/src/app/fetchurl/target.mk
@@ -1,3 +1,3 @@
TARGET = fetchurl
-LIBS += curl libc ld
+LIBS += base curl libc
SRC_CC = component.cc
diff --git a/repos/libports/src/app/gcov/target.mk b/repos/libports/src/app/gcov/target.mk
index 25ca480e9e..3d35c68f77 100644
--- a/repos/libports/src/app/gcov/target.mk
+++ b/repos/libports/src/app/gcov/target.mk
@@ -28,7 +28,7 @@ ifeq ($(filter-out $(SPECS),x86_64),)
INC_DIR += $(GCOV_PORT_DIR)/include/x86_64/gcc
endif
-LIBS += base libc posix gmp stdcxx gcov-libcommon gcov-libcpp gcov-libiberty
+LIBS += libc posix gmp stdcxx gcov-libcommon gcov-libcpp gcov-libiberty
vpath %.cc $(GCOV_DIR)/gcc
diff --git a/repos/libports/src/app/qt5/tmpl/target_final.inc b/repos/libports/src/app/qt5/tmpl/target_final.inc
index b9050ddb7e..2d5277e607 100644
--- a/repos/libports/src/app/qt5/tmpl/target_final.inc
+++ b/repos/libports/src/app/qt5/tmpl/target_final.inc
@@ -20,7 +20,7 @@ vpath %.qrc $(abspath $(addprefix $(PRG_DIR)/,$(sort $(dir $(RESOURCES)))))
$(addsuffix .o,$(basename $(SRC_CC))): $(addprefix ui_,$(FORMS:.ui=.h))
-LIBS += libc base
+LIBS += libc
# QtCore
ifeq ($(findstring core, $(QT)), core)
diff --git a/repos/libports/src/test/expat/target.mk b/repos/libports/src/test/expat/target.mk
index d005296b42..5a62267cb6 100644
--- a/repos/libports/src/test/expat/target.mk
+++ b/repos/libports/src/test/expat/target.mk
@@ -1,5 +1,5 @@
TARGET = test-expat
SRC_CC = main.cc
-LIBS = base expat posix
+LIBS = expat posix
CC_CXX_WARN_STRICT =
diff --git a/repos/libports/src/test/libc/main.cc b/repos/libports/src/test/libc/main.cc
index 49170b16c5..6b1eadc2b8 100644
--- a/repos/libports/src/test/libc/main.cc
+++ b/repos/libports/src/test/libc/main.cc
@@ -17,9 +17,6 @@
* Mixing Genode headers and libC to see it they collide...
*/
-/* Genode includes */
-#include
-
/* libC includes */
extern "C" {
#include
diff --git a/repos/libports/src/test/libc/target.mk b/repos/libports/src/test/libc/target.mk
index 58ab32fa01..73578f7872 100644
--- a/repos/libports/src/test/libc/target.mk
+++ b/repos/libports/src/test/libc/target.mk
@@ -1,5 +1,5 @@
TARGET = test-libc
SRC_CC = main.cc
-LIBS = base posix
+LIBS = posix
CC_CXX_WARN_STRICT =
diff --git a/repos/libports/src/test/libc_component/target.mk b/repos/libports/src/test/libc_component/target.mk
index 86887dc168..70dd6419a7 100644
--- a/repos/libports/src/test/libc_component/target.mk
+++ b/repos/libports/src/test/libc_component/target.mk
@@ -1,5 +1,5 @@
TARGET = test-libc_component
SRC_CC = main.cc
-LIBS = libc
+LIBS = base libc
CC_CXX_WARN_STRICT =
diff --git a/repos/libports/src/test/libc_connect/target.mk b/repos/libports/src/test/libc_connect/target.mk
index 74d7cd1919..9511c1e234 100644
--- a/repos/libports/src/test/libc_connect/target.mk
+++ b/repos/libports/src/test/libc_connect/target.mk
@@ -1,5 +1,5 @@
TARGET = test-libc_connect
SRC_CC = main.cc
-LIBS = base libc posix
+LIBS = posix
CC_CXX_WARN_STRICT =
diff --git a/repos/libports/src/test/libc_counter/sink/target.mk b/repos/libports/src/test/libc_counter/sink/target.mk
index 335622e7d0..a0998708ee 100644
--- a/repos/libports/src/test/libc_counter/sink/target.mk
+++ b/repos/libports/src/test/libc_counter/sink/target.mk
@@ -1,5 +1,5 @@
TARGET = test-libc_counter-sink
SRC_CC = main.cc
-LIBS = base posix
+LIBS = posix
CC_CXX_WARN_STRICT =
diff --git a/repos/libports/src/test/libc_counter/source/target.mk b/repos/libports/src/test/libc_counter/source/target.mk
index 5da9b51907..ae1bdc0624 100644
--- a/repos/libports/src/test/libc_counter/source/target.mk
+++ b/repos/libports/src/test/libc_counter/source/target.mk
@@ -1,5 +1,5 @@
TARGET = test-libc_counter-source
SRC_CC = main.cc
-LIBS = base posix
+LIBS = posix
CC_CXX_WARN_STRICT =
diff --git a/repos/libports/src/test/libc_pipe/target.mk b/repos/libports/src/test/libc_pipe/target.mk
index 00bd7025ef..01cff6dcbd 100644
--- a/repos/libports/src/test/libc_pipe/target.mk
+++ b/repos/libports/src/test/libc_pipe/target.mk
@@ -1,5 +1,5 @@
TARGET = test-libc_pipe
-LIBS = base posix
+LIBS = posix
SRC_CC = main.cc
CC_CXX_WARN_STRICT =
diff --git a/repos/libports/src/test/libports/curl/target.mk b/repos/libports/src/test/libports/curl/target.mk
index 7f4026adc1..3683039e67 100644
--- a/repos/libports/src/test/libports/curl/target.mk
+++ b/repos/libports/src/test/libports/curl/target.mk
@@ -1,5 +1,5 @@
TARGET = test-curl
-LIBS = base curl
+LIBS = curl
SRC_CC = main.cc
vpath main.cc $(PRG_DIR)/..
diff --git a/repos/libports/src/test/libports/libiconv/target.mk b/repos/libports/src/test/libports/libiconv/target.mk
index 923ae9cf11..0eb5a12c55 100644
--- a/repos/libports/src/test/libports/libiconv/target.mk
+++ b/repos/libports/src/test/libports/libiconv/target.mk
@@ -1,5 +1,5 @@
TARGET = test-libiconv
-LIBS = base libiconv
+LIBS = libiconv
SRC_CC = main.cc
vpath main.cc $(PRG_DIR)/..
diff --git a/repos/libports/src/test/libports/libssh/target.mk b/repos/libports/src/test/libports/libssh/target.mk
index c9c0b05fc7..2f0b9a0cda 100644
--- a/repos/libports/src/test/libports/libssh/target.mk
+++ b/repos/libports/src/test/libports/libssh/target.mk
@@ -1,5 +1,5 @@
TARGET = test-libssh
-LIBS = base libcrypto libssh
+LIBS = libcrypto libssh
SRC_CC = main.cc
vpath main.cc $(PRG_DIR)/..
diff --git a/repos/libports/src/test/netty/netty.h b/repos/libports/src/test/netty/netty.h
index 0086087ec1..ba3657fbe0 100644
--- a/repos/libports/src/test/netty/netty.h
+++ b/repos/libports/src/test/netty/netty.h
@@ -18,7 +18,6 @@
#include
#include
#include
-#include
/* Libc includes */
#include
diff --git a/repos/libports/src/test/pthread/main.cc b/repos/libports/src/test/pthread/main.cc
index 45b9807fcf..0431aab7f4 100644
--- a/repos/libports/src/test/pthread/main.cc
+++ b/repos/libports/src/test/pthread/main.cc
@@ -25,7 +25,6 @@
/* Genode includes */
#include
#include
-#include
struct Thread_args {
diff --git a/repos/libports/src/test/stdcxx/target.mk b/repos/libports/src/test/stdcxx/target.mk
index 895b969cd2..4bfb8706f0 100644
--- a/repos/libports/src/test/stdcxx/target.mk
+++ b/repos/libports/src/test/stdcxx/target.mk
@@ -1,5 +1,5 @@
TARGET = test-stdcxx
SRC_CC = main.cc
-LIBS = base posix stdcxx
+LIBS = posix stdcxx
CC_CXX_WARN_STRICT =
diff --git a/repos/ports/recipes/src/arora/used_apis b/repos/ports/recipes/src/arora/used_apis
index 6afddecbf1..8b6bc482af 100644
--- a/repos/ports/recipes/src/arora/used_apis
+++ b/repos/ports/recipes/src/arora/used_apis
@@ -19,4 +19,3 @@ qt5_ui_tools
qt5_webkit
qt5_widgets
stdcxx
-vfs
diff --git a/repos/ports/recipes/src/bash/used_apis b/repos/ports/recipes/src/bash/used_apis
index 6abd7b790c..737e3c26a5 100644
--- a/repos/ports/recipes/src/bash/used_apis
+++ b/repos/ports/recipes/src/bash/used_apis
@@ -1,4 +1,3 @@
-base
libc
noux
posix
diff --git a/repos/ports/recipes/src/gcc_x86/used_apis b/repos/ports/recipes/src/gcc_x86/used_apis
index 84a19a3f60..65ef6bdb2e 100644
--- a/repos/ports/recipes/src/gcc_x86/used_apis
+++ b/repos/ports/recipes/src/gcc_x86/used_apis
@@ -1,4 +1,3 @@
-base
gmp
libc
mpc
@@ -6,4 +5,3 @@ mpfr
noux
posix
stdcxx
-so
diff --git a/repos/ports/recipes/src/libgetdns/used_apis b/repos/ports/recipes/src/libgetdns/used_apis
index 5cf6456af7..d605b5d2fb 100644
--- a/repos/ports/recipes/src/libgetdns/used_apis
+++ b/repos/ports/recipes/src/libgetdns/used_apis
@@ -1,8 +1,5 @@
-base
libc
libcrypto
libssl
-os
-vfs
libyaml
libgetdns
diff --git a/repos/ports/recipes/src/stubby/used_apis b/repos/ports/recipes/src/stubby/used_apis
index 800c41502d..762c067807 100644
--- a/repos/ports/recipes/src/stubby/used_apis
+++ b/repos/ports/recipes/src/stubby/used_apis
@@ -1,6 +1,3 @@
-base
-os
-vfs
libc
timer_session
report_session
diff --git a/repos/ports/recipes/src/tclsh/used_apis b/repos/ports/recipes/src/tclsh/used_apis
index 6abd7b790c..737e3c26a5 100644
--- a/repos/ports/recipes/src/tclsh/used_apis
+++ b/repos/ports/recipes/src/tclsh/used_apis
@@ -1,4 +1,3 @@
-base
libc
noux
posix
diff --git a/repos/ports/recipes/src/vbox5-nova/used_apis b/repos/ports/recipes/src/vbox5-nova/used_apis
index 1af55e4cb2..8ceb0e3ef1 100644
--- a/repos/ports/recipes/src/vbox5-nova/used_apis
+++ b/repos/ports/recipes/src/vbox5-nova/used_apis
@@ -1,19 +1,18 @@
-base-nova
-base
-os
-libc
-so
-vfs
-libiconv
-stdcxx
-timer_session
-usb_session
-terminal_session
audio_in_session
audio_out_session
-nic_session
-input_session
+base
+base-nova
framebuffer_session
-report_session
+input_session
+libc
+libiconv
+nic_session
nitpicker_session
+os
+report_session
rtc_session
+stdcxx
+terminal_session
+timer_session
+usb_session
+vfs
diff --git a/repos/ports/recipes/src/vbox5/used_apis b/repos/ports/recipes/src/vbox5/used_apis
index 4bd26ca9a3..7b56461173 100644
--- a/repos/ports/recipes/src/vbox5/used_apis
+++ b/repos/ports/recipes/src/vbox5/used_apis
@@ -1,19 +1,18 @@
-base
-os
-libc
-so
-vfs
-libiconv
-stdcxx
-timer_session
-usb_session
-terminal_session
audio_in_session
audio_out_session
-nic_session
-input_session
+base
framebuffer_session
-report_session
+input_session
+libc
+libiconv
+nic_session
nitpicker_session
+os
+report_session
rtc_session
+stdcxx
+terminal_session
+timer_session
+usb_session
+vfs
vm_session
diff --git a/repos/ports/src/noux-pkg/gcc/target.inc b/repos/ports/src/noux-pkg/gcc/target.inc
index 1538ab375f..9372c902d4 100644
--- a/repos/ports/src/noux-pkg/gcc/target.inc
+++ b/repos/ports/src/noux-pkg/gcc/target.inc
@@ -57,7 +57,7 @@ libgmp.a libmpfr.a libmpc.a libc.a:
Makefile: dummy_libs
-LIBS += libc libm posix stdcxx base
+LIBS += libc libm posix stdcxx
include $(call select_from_repositories,mk/noux.mk)
diff --git a/repos/ports/src/test/gdb_monitor/target.mk b/repos/ports/src/test/gdb_monitor/target.mk
index 6276efd50c..b2a5688267 100644
--- a/repos/ports/src/test/gdb_monitor/target.mk
+++ b/repos/ports/src/test/gdb_monitor/target.mk
@@ -1,6 +1,6 @@
TARGET = test-gdb_monitor
SRC_CC = main.cc
-LIBS = base posix
+LIBS = posix
CC_OLEVEL = -O0