diff --git a/repos/base-fiasco/recipes/src/base-fiasco/content.mk b/repos/base-fiasco/recipes/src/base-fiasco/content.mk
index 1c494bd998..cc4c522144 100644
--- a/repos/base-fiasco/recipes/src/base-fiasco/content.mk
+++ b/repos/base-fiasco/recipes/src/base-fiasco/content.mk
@@ -21,6 +21,5 @@ content:
 	for spec in x86_32; do \
 	  mv lib/mk/spec/$$spec/ld-fiasco.mk lib/mk/spec/$$spec/ld.mk; \
 	  done;
-	sed -i "s/ld-fiasco/ld/"     src/lib/ld/fiasco/target.mk
 	sed -i "s/fiasco_timer_drv/timer/" src/timer/fiasco/target.mk
 
diff --git a/repos/base-fiasco/src/lib/ld/fiasco/target.mk b/repos/base-fiasco/src/lib/ld/fiasco/target.mk
deleted file mode 100644
index 060986f382..0000000000
--- a/repos/base-fiasco/src/lib/ld/fiasco/target.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET = ld-fiasco
-LIBS = ld-fiasco
diff --git a/repos/base-foc/recipes/src/base-foc_content.inc b/repos/base-foc/recipes/src/base-foc_content.inc
index b4b26e44df..7d97f7d1e8 100644
--- a/repos/base-foc/recipes/src/base-foc_content.inc
+++ b/repos/base-foc/recipes/src/base-foc_content.inc
@@ -39,5 +39,4 @@ content:
 	for spec in x86_32 x86_64 arm arm_64; do \
 	  mv lib/mk/spec/$$spec/ld-foc.mk lib/mk/spec/$$spec/ld.mk; \
 	  done;
-	sed -i "s/ld-foc/ld/"           src/lib/ld/foc/target.mk
 	sed -i "s/foc_timer_drv/timer/" src/timer/foc/target.mk
diff --git a/repos/base-foc/src/lib/ld/foc/target.mk b/repos/base-foc/src/lib/ld/foc/target.mk
deleted file mode 100644
index ef4453cc43..0000000000
--- a/repos/base-foc/src/lib/ld/foc/target.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET = ld-foc
-LIBS = ld-foc
diff --git a/repos/base-hw/recipes/src/base-hw_content.inc b/repos/base-hw/recipes/src/base-hw_content.inc
index f26b8981e6..adc04050e8 100644
--- a/repos/base-hw/recipes/src/base-hw_content.inc
+++ b/repos/base-hw/recipes/src/base-hw_content.inc
@@ -180,7 +180,6 @@ generalize_target_names: $(CONTENT)
 	# apply kernel-agnostic convention of naming the timer and ld.lib.so
 	for subdir in ${call selected_content,LD_MK_DIRS}; do \
 		mv $$subdir/ld-hw.mk $$subdir/ld.mk; done
-	sed -i "s/ld-hw/ld/"           src/lib/ld/hw/target.mk
 	sed -i "s/hw_timer_drv/timer/" src/timer/hw/target.mk
 	# supplement BOARD definition that normally comes form the build dir
 	sed -i "s/\?= unknown/:= $(BOARD)/" src/core/hw/target.mk
@@ -189,5 +188,4 @@ generalize_target_names: $(CONTENT)
 	sed -i "1aREQUIRES := $(ARCH)"      src/core/hw/target.mk
 	sed -i "1aREQUIRES     := $(ARCH)"  src/bootstrap/hw/target.mk
 	sed -i "/REQUIRES/s/hw/hw $(ARCH)/" src/timer/hw/target.mk
-	sed -i "1aREQUIRES := $(ARCH)"      src/lib/ld/hw/target.mk
 
diff --git a/repos/base-hw/src/lib/ld/hw/target.mk b/repos/base-hw/src/lib/ld/hw/target.mk
deleted file mode 100644
index da9b4cb18f..0000000000
--- a/repos/base-hw/src/lib/ld/hw/target.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET = ld-hw
-LIBS = ld-hw
diff --git a/repos/base-linux/recipes/src/base-linux/content.mk b/repos/base-linux/recipes/src/base-linux/content.mk
index 2751459570..ac78f59846 100644
--- a/repos/base-linux/recipes/src/base-linux/content.mk
+++ b/repos/base-linux/recipes/src/base-linux/content.mk
@@ -10,7 +10,6 @@ content:
 	  mv lib/mk/spec/$$spec/ld-linux.mk lib/mk/spec/$$spec/ld.mk; done;
 	sed -i "/TARGET/s/core-linux/core/"       src/core/linux/target.mk
 	sed -i "s/BOARD.*unknown/BOARD := linux/" lib/mk/core-linux.inc
-	sed -i "s/ld-linux/ld/"                   src/lib/ld/linux/target.mk
 	sed -i "s/linux_timer_drv/timer/"         src/timer/linux/target.mk
 	rm -rf src/initramfs
 
diff --git a/repos/base-linux/src/lib/ld/linux/target.mk b/repos/base-linux/src/lib/ld/linux/target.mk
deleted file mode 100644
index dbbcd910ba..0000000000
--- a/repos/base-linux/src/lib/ld/linux/target.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET = ld-linux.lib
-LIBS   = ld-linux
-
-BUILD_ARTIFACTS := ld-linux.lib.so
diff --git a/repos/base-nova/recipes/src/base-nova/content.mk b/repos/base-nova/recipes/src/base-nova/content.mk
index cf557b5dbe..41278a28a1 100644
--- a/repos/base-nova/recipes/src/base-nova/content.mk
+++ b/repos/base-nova/recipes/src/base-nova/content.mk
@@ -15,8 +15,7 @@ src/kernel/nova: src/kernel
 
 content:
 	for spec in x86_32 x86_64; do \
-	  mv lib/mk/spec/$$spec/ld-nova.mk   lib/mk/spec/$$spec/ld.mk; \
+	  mv lib/mk/spec/$$spec/ld-nova.mk lib/mk/spec/$$spec/ld.mk; \
 	  done;
-	sed -i "s/ld-nova/ld/"           src/lib/ld/nova/target.mk
 	sed -i "s/nova_timer_drv/timer/" src/timer/nova/target.mk
 
diff --git a/repos/base-nova/src/lib/ld/nova/target.mk b/repos/base-nova/src/lib/ld/nova/target.mk
deleted file mode 100644
index f9615eec76..0000000000
--- a/repos/base-nova/src/lib/ld/nova/target.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET = ld-nova
-LIBS = ld-nova
diff --git a/repos/base-okl4/recipes/src/base-okl4/content.mk b/repos/base-okl4/recipes/src/base-okl4/content.mk
index 39d7d59d8a..4caca8c8cd 100644
--- a/repos/base-okl4/recipes/src/base-okl4/content.mk
+++ b/repos/base-okl4/recipes/src/base-okl4/content.mk
@@ -19,8 +19,7 @@ src/kernel/okl4: src/kernel
 
 content:
 	for spec in x86_32; do \
-	  mv lib/mk/spec/$$spec/ld-okl4.mk   lib/mk/spec/$$spec/ld.mk; \
+	  mv lib/mk/spec/$$spec/ld-okl4.mk lib/mk/spec/$$spec/ld.mk; \
 	  done;
-	sed -i "s/ld-okl4/ld/"          src/lib/ld/okl4/target.mk
 	sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc
 
diff --git a/repos/base-okl4/src/lib/ld/okl4/target.mk b/repos/base-okl4/src/lib/ld/okl4/target.mk
deleted file mode 100644
index 1d041e3cd2..0000000000
--- a/repos/base-okl4/src/lib/ld/okl4/target.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET = ld-okl4
-LIBS = ld-okl4
diff --git a/repos/base-pistachio/recipes/src/base-pistachio/content.mk b/repos/base-pistachio/recipes/src/base-pistachio/content.mk
index b8c9dbb474..c33056fc45 100644
--- a/repos/base-pistachio/recipes/src/base-pistachio/content.mk
+++ b/repos/base-pistachio/recipes/src/base-pistachio/content.mk
@@ -21,6 +21,5 @@ content:
 	for spec in x86_32; do \
 	  mv lib/mk/spec/$$spec/ld-pistachio.mk lib/mk/spec/$$spec/ld.mk; \
 	  done;
-	sed -i "s/ld-pistachio/ld/"     src/lib/ld/pistachio/target.mk
 	sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc
 
diff --git a/repos/base-pistachio/src/lib/ld/pistachio/target.mk b/repos/base-pistachio/src/lib/ld/pistachio/target.mk
deleted file mode 100644
index af224bfef8..0000000000
--- a/repos/base-pistachio/src/lib/ld/pistachio/target.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET = ld-pistachio
-LIBS = ld-pistachio
diff --git a/repos/base-sel4/recipes/src/base-sel4-imx6q_sabrelite/content.mk b/repos/base-sel4/recipes/src/base-sel4-imx6q_sabrelite/content.mk
index 82d866de9c..3e4a0c2acb 100644
--- a/repos/base-sel4/recipes/src/base-sel4-imx6q_sabrelite/content.mk
+++ b/repos/base-sel4/recipes/src/base-sel4-imx6q_sabrelite/content.mk
@@ -35,7 +35,6 @@ etc/board.conf:
 
 content:
 	mv lib/mk/spec/arm/ld-sel4.mk lib/mk/spec/arm/ld.mk;
-	sed -i "s/ld-sel4/ld/"          src/lib/ld/sel4/target.mk
 	sed -i "s/imx6_timer_drv/timer/" src/timer/epit/imx6/target.inc
 	find lib/mk/spec -name kernel-sel4-*.mk -o -name syscall-sel4-*.mk |\
 		grep -v "sel4-imx6q_sabrelite.mk" | xargs rm -rf
diff --git a/repos/base-sel4/recipes/src/base-sel4-imx7d_sabre/content.mk b/repos/base-sel4/recipes/src/base-sel4-imx7d_sabre/content.mk
index bb357a3ed8..d339aec070 100644
--- a/repos/base-sel4/recipes/src/base-sel4-imx7d_sabre/content.mk
+++ b/repos/base-sel4/recipes/src/base-sel4-imx7d_sabre/content.mk
@@ -35,7 +35,6 @@ etc/board.conf:
 
 content:
 	mv lib/mk/spec/arm/ld-sel4.mk lib/mk/spec/arm/ld.mk;
-	sed -i "s/ld-sel4/ld/"          src/lib/ld/sel4/target.mk
 	sed -i "s/imx7_timer_drv/timer/" src/timer/gpt/imx7/target.inc
 	find lib/mk/spec -name kernel-sel4-*.mk -o -name syscall-sel4-*.mk |\
 		grep -v "sel4-imx7d_sabre.mk" | xargs rm -rf
diff --git a/repos/base-sel4/recipes/src/base-sel4-x86/content.mk b/repos/base-sel4/recipes/src/base-sel4-x86/content.mk
index 7d706f6fd2..cca289d09e 100644
--- a/repos/base-sel4/recipes/src/base-sel4-x86/content.mk
+++ b/repos/base-sel4/recipes/src/base-sel4-x86/content.mk
@@ -26,7 +26,6 @@ content:
 	for spec in x86_32 x86_64 arm; do \
 	  mv lib/mk/spec/$$spec/ld-sel4.mk lib/mk/spec/$$spec/ld.mk; \
 	  done;
-	sed -i "s/ld-sel4/ld/"          src/lib/ld/sel4/target.mk
 	sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc
 	find lib/mk/spec -name kernel-sel4-*.mk -o -name syscall-sel4-*.mk |\
 		grep -v "sel4-pc.mk" | xargs rm -rf
diff --git a/repos/base-sel4/src/lib/ld/sel4/target.mk b/repos/base-sel4/src/lib/ld/sel4/target.mk
deleted file mode 100644
index 4e78c9b5b4..0000000000
--- a/repos/base-sel4/src/lib/ld/sel4/target.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET = ld-sel4
-LIBS = ld-sel4
diff --git a/repos/dde_linux/run/nic_router_uplinks.run b/repos/dde_linux/run/nic_router_uplinks.run
index d6c9fed2b6..655600efb1 100644
--- a/repos/dde_linux/run/nic_router_uplinks.run
+++ b/repos/dde_linux/run/nic_router_uplinks.run
@@ -30,8 +30,8 @@ append build_components { server/nic_router }
 append build_components { server/dynamic_rom }
 append build_components { server/report_rom }
 append build_components { drivers/wifi/pc }
-append build_components { lib/vfs/wifi }
-append build_components { lib/vfs/jitterentropy }
+append build_components { lib/vfs_wifi }
+append build_components { lib/vfs_jitterentropy }
 append build_components { drivers/rtc }
 append build_components { drivers/nic }
 append build_components { app/ping }
diff --git a/repos/dde_linux/run/vfs_cfg.run b/repos/dde_linux/run/vfs_cfg.run
index abdf0eef57..657dbd7aca 100644
--- a/repos/dde_linux/run/vfs_cfg.run
+++ b/repos/dde_linux/run/vfs_cfg.run
@@ -5,7 +5,7 @@ if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 
 set build_components {
 	core init timer
-	lib/vfs/lxip
+	lib/vfs_lxip
 	server/vfs
 	server/dynamic_rom
 	server/nic_router
diff --git a/repos/dde_linux/run/vfs_lxip.inc b/repos/dde_linux/run/vfs_lxip.inc
index 8bd8988e0f..0febe00025 100644
--- a/repos/dde_linux/run/vfs_lxip.inc
+++ b/repos/dde_linux/run/vfs_lxip.inc
@@ -1,6 +1,6 @@
 proc append_socket_fs_build_components { } {
 	global build_components
-	append build_components { lib/vfs/lxip }
+	append build_components { lib/vfs_lxip }
 }
 
 proc socket_fs_plugin {} { return lxip }
diff --git a/repos/dde_linux/src/lib/vfs/lxip/target.mk b/repos/dde_linux/src/lib/vfs/lxip/target.mk
deleted file mode 100644
index 7806386e87..0000000000
--- a/repos/dde_linux/src/lib/vfs/lxip/target.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGET = dummy-vfs_lxip
-LIBS   = vfs_lxip
-
-BUILD_ARTIFACTS :=
-
-CC_CXX_WARN_STRICT =
diff --git a/repos/dde_rump/run/fs_rom_update_ext2.run b/repos/dde_rump/run/fs_rom_update_ext2.run
index 54d09f074a..d403b695a5 100644
--- a/repos/dde_rump/run/fs_rom_update_ext2.run
+++ b/repos/dde_rump/run/fs_rom_update_ext2.run
@@ -5,8 +5,8 @@ set build_components {
 	core init timer
 	app/rom_logger
 	app/rom_to_file
-	lib/vfs/rump
-	lib/vfs/import
+	lib/vfs_rump
+	lib/vfs_import
 	server/dynamic_rom
 	server/fs_rom
 	server/vfs_block
diff --git a/repos/dde_rump/run/libc_vfs_ext2.run b/repos/dde_rump/run/libc_vfs_ext2.run
index 21fd5071c6..653ea3d72c 100644
--- a/repos/dde_rump/run/libc_vfs_ext2.run
+++ b/repos/dde_rump/run/libc_vfs_ext2.run
@@ -1,7 +1,7 @@
 set mkfs_cmd  [installed_command mke2fs]
 set mkfs_opts "-F"
 
-set test_build_components "lib/vfs/rump"
+set test_build_components "lib/vfs_rump"
 
 set test_vfs_config "<rump fs=\"ext2fs\" ram=\"7M\" writeable=\"yes\"/>"
 
diff --git a/repos/dde_rump/run/libc_vfs_fs_ext2.run b/repos/dde_rump/run/libc_vfs_fs_ext2.run
index 55be02619e..205435e502 100644
--- a/repos/dde_rump/run/libc_vfs_fs_ext2.run
+++ b/repos/dde_rump/run/libc_vfs_fs_ext2.run
@@ -6,7 +6,7 @@ if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 set mkfs_cmd  [installed_command mke2fs]
 set mkfs_opts "-F"
 
-set test_build_components "lib/vfs/rump"
+set test_build_components "lib/vfs_rump"
 
 set test_vfs_config "<rump fs=\"ext2fs\" ram=\"7M\" writeable=\"yes\"/>"
 
diff --git a/repos/dde_rump/run/rump_ext2.run b/repos/dde_rump/run/rump_ext2.run
index c44c156c66..592c7e137a 100644
--- a/repos/dde_rump/run/rump_ext2.run
+++ b/repos/dde_rump/run/rump_ext2.run
@@ -20,8 +20,8 @@ set build_components {
 	core init timer
 	server/vfs_block
 	server/vfs
-	lib/vfs/rump
-	lib/vfs/import
+	lib/vfs_rump
+	lib/vfs_import
 	test/libc_vfs
 }
 
diff --git a/repos/dde_rump/run/rump_fat.run b/repos/dde_rump/run/rump_fat.run
index 51f48de579..7dda62dcde 100644
--- a/repos/dde_rump/run/rump_fat.run
+++ b/repos/dde_rump/run/rump_fat.run
@@ -15,8 +15,8 @@ set build_components {
 	core init timer
 	server/vfs_block
 	server/vfs
-	lib/vfs/rump
-	lib/vfs/import
+	lib/vfs_rump
+	lib/vfs_import
 	test/libc_vfs
 }
 
diff --git a/repos/dde_rump/run/rump_iso.run b/repos/dde_rump/run/rump_iso.run
index 901c0a0130..ea0ff8aa4a 100644
--- a/repos/dde_rump/run/rump_iso.run
+++ b/repos/dde_rump/run/rump_iso.run
@@ -15,7 +15,7 @@ set build_components {
 	server/fs_rom
 	server/vfs_block
 	server/vfs
-	lib/vfs/rump
+	lib/vfs_rump
 	test/iso
 }
 
diff --git a/repos/dde_rump/run/vfs_stress_ext2.run b/repos/dde_rump/run/vfs_stress_ext2.run
index 14f2565df9..9659b6821c 100644
--- a/repos/dde_rump/run/vfs_stress_ext2.run
+++ b/repos/dde_rump/run/vfs_stress_ext2.run
@@ -14,8 +14,8 @@ set build_components {
 	core init timer
 	test/vfs_stress
 	server/vfs_block
-	lib/vfs/rump
-	lib/vfs/import
+	lib/vfs_rump
+	lib/vfs_import
 }
 
 build $build_components
diff --git a/repos/dde_rump/run/vfs_stress_rump_fs.run b/repos/dde_rump/run/vfs_stress_rump_fs.run
index c6c916c198..936b901b88 100644
--- a/repos/dde_rump/run/vfs_stress_rump_fs.run
+++ b/repos/dde_rump/run/vfs_stress_rump_fs.run
@@ -15,8 +15,8 @@ set build_components {
 	test/vfs_stress
 	server/vfs
 	server/vfs_block
-	lib/vfs/rump
-	lib/vfs/import
+	lib/vfs_rump
+	lib/vfs_import
 }
 
 build $build_components
diff --git a/repos/dde_rump/src/lib/vfs/rump/target.mk b/repos/dde_rump/src/lib/vfs/rump/target.mk
deleted file mode 100644
index 806fbcc1bf..0000000000
--- a/repos/dde_rump/src/lib/vfs/rump/target.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET = rump_plugin
-LIBS = vfs_rump
-
-BUILD_ARTIFACTS :=
diff --git a/repos/demo/src/lib/libpng/target.mk b/repos/demo/src/lib/libpng/target.mk
deleted file mode 100644
index 5634026037..0000000000
--- a/repos/demo/src/lib/libpng/target.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-TARGET  = test-libpng_static
-SRC_CC  = main.cc
-INC_DIR = $(REP_DIR)/include/libpng \
-          $(REP_DIR)/include/mini_c \
-          $(REP_DIR)/include/libz
-CC_OPT += -DPNG_USER_CONFIG
-LIBS    = base libpng_static libz_static mini_c
diff --git a/repos/gems/recipes/src/cbe/content.mk b/repos/gems/recipes/src/cbe/content.mk
index c9b8af9713..c5272afb2f 100644
--- a/repos/gems/recipes/src/cbe/content.mk
+++ b/repos/gems/recipes/src/cbe/content.mk
@@ -57,7 +57,7 @@ MIRROR_FROM_REP_DIR := \
 
 CBE_DIR := $(call port_dir,$(REP_DIR)/ports/cbe)
 
-content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_CBE_DIR) LICENSE src/lib/cbe/target.mk
+content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_CBE_DIR) LICENSE
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
@@ -66,10 +66,5 @@ $(MIRROR_FROM_CBE_DIR):
 	mkdir -p $(dir $@)
 	cp -r $(CBE_DIR)/$@ $(dir $@)
 
-src/lib/cbe/target.mk:
-	mkdir -p $(dir $@)
-	echo "REQUIRES += x86_64" > $@
-	echo "LIBS += $(BUILD_LIBS)" >> $@
-
 LICENSE:
 	cp $(GENODE_DIR)/LICENSE $@
diff --git a/repos/gems/run/cbe_tester.run b/repos/gems/run/cbe_tester.run
index 82602925d9..d9baf910ea 100644
--- a/repos/gems/run/cbe_tester.run
+++ b/repos/gems/run/cbe_tester.run
@@ -55,10 +55,10 @@ append build_components {
 	server/report_rom
 	server/lx_fs
 	server/lx_block
-	lib/vfs/cbe_crypto/aes_cbc
-	lib/vfs/cbe_trust_anchor
-	lib/vfs/import
-	lib/vfs/jitterentropy
+	lib/vfs_cbe_crypto_aes_cbc
+	lib/vfs_cbe_trust_anchor
+	lib/vfs_import
+	lib/vfs_jitterentropy
 }
 
 build $build_components
diff --git a/repos/gems/run/text_painter.run b/repos/gems/run/text_painter.run
index 0b29af7992..abbebde446 100644
--- a/repos/gems/run/text_painter.run
+++ b/repos/gems/run/text_painter.run
@@ -93,7 +93,7 @@ install_config {
 
 </config>}
 
-build { server/vfs test/text_painter lib/vfs/ttf }
+build { server/vfs test/text_painter lib/vfs_ttf }
 
 set fd [open [run_dir]/genode/focus w]
 puts $fd "<focus label=\"gui_fb -> \" domain=\"default\"/>"
diff --git a/repos/gems/run/vfs_cbe.run b/repos/gems/run/vfs_cbe.run
index de7a0c94bc..4d44fdb21e 100644
--- a/repos/gems/run/vfs_cbe.run
+++ b/repos/gems/run/vfs_cbe.run
@@ -34,12 +34,12 @@ build {
 	timer
 	init
 	server/lx_fs
-	lib/vfs/cbe
-	lib/vfs/cbe_crypto/aes_cbc
-	lib/vfs/cbe_crypto/memcopy
-	lib/vfs/cbe_trust_anchor
-	lib/vfs/import
-	lib/vfs/pipe
+	lib/vfs_cbe
+	lib/vfs_cbe_crypto_aes_cbc
+	lib/vfs_cbe_crypto_memcopy
+	lib/vfs_cbe_trust_anchor
+	lib/vfs_import
+	lib/vfs_pipe
 	test/vfs_stress
 	test/libc
 	server/log_terminal
diff --git a/repos/gems/run/vfs_cbe_init.run b/repos/gems/run/vfs_cbe_init.run
index 9871156793..8feb899f0f 100644
--- a/repos/gems/run/vfs_cbe_init.run
+++ b/repos/gems/run/vfs_cbe_init.run
@@ -33,7 +33,7 @@ append build_components {
 
 	app/cbe_init_trust_anchor
 	app/cbe_init
-	lib/vfs/cbe_trust_anchor
+	lib/vfs_cbe_trust_anchor
 }
 
 build $build_components
diff --git a/repos/gems/run/vfs_import.run b/repos/gems/run/vfs_import.run
index 6f2346bcea..226378f67c 100644
--- a/repos/gems/run/vfs_import.run
+++ b/repos/gems/run/vfs_import.run
@@ -3,7 +3,7 @@ if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	exit 0
 }
 
-build { app/sequence server/vfs lib/vfs/import test/libc }
+build { app/sequence server/vfs lib/vfs_import test/libc }
 
 create_boot_directory
 
diff --git a/repos/gems/src/lib/cpu_sampler_platform-foc/target.mk b/repos/gems/src/lib/cpu_sampler_platform-foc/target.mk
deleted file mode 100644
index 608795f52a..0000000000
--- a/repos/gems/src/lib/cpu_sampler_platform-foc/target.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET = cpu_sampler_platform-foc
-LIBS   = cpu_sampler_platform-foc
-
-CC_CXX_WARN_STRICT =
diff --git a/repos/gems/src/lib/cpu_sampler_platform-generic/target.mk b/repos/gems/src/lib/cpu_sampler_platform-generic/target.mk
deleted file mode 100644
index c5fb6e353f..0000000000
--- a/repos/gems/src/lib/cpu_sampler_platform-generic/target.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET = cpu_sampler_platform-generic
-LIBS   = cpu_sampler_platform-generic
-
-CC_CXX_WARN_STRICT =
diff --git a/repos/gems/src/lib/cpu_sampler_platform-nova/target.mk b/repos/gems/src/lib/cpu_sampler_platform-nova/target.mk
deleted file mode 100644
index 8316496f5b..0000000000
--- a/repos/gems/src/lib/cpu_sampler_platform-nova/target.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET = cpu_sampler_platform-nova
-LIBS   = cpu_sampler_platform-nova
-
-CC_CXX_WARN_STRICT =
diff --git a/repos/gems/src/lib/vfs/audit/target.mk b/repos/gems/src/lib/vfs/audit/target.mk
deleted file mode 100644
index f18d7b3788..0000000000
--- a/repos/gems/src/lib/vfs/audit/target.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET = dummy-vfs_audit
-LIBS = vfs_audit
-
-BUILD_ARTIFACTS :=
diff --git a/repos/gems/src/lib/vfs/cbe/target.mk b/repos/gems/src/lib/vfs/cbe/target.mk
deleted file mode 100644
index 6f9ef45af1..0000000000
--- a/repos/gems/src/lib/vfs/cbe/target.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET := lib-vfs-cbe
-REQUIRES = x86_64
-LIBS = vfs_cbe
-
-BUILD_ARTIFACTS :=
diff --git a/repos/gems/src/lib/vfs/cbe_crypto/aes_cbc/target.mk b/repos/gems/src/lib/vfs/cbe_crypto/aes_cbc/target.mk
deleted file mode 100644
index 3ae9ca776d..0000000000
--- a/repos/gems/src/lib/vfs/cbe_crypto/aes_cbc/target.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET := lib-vfs-cbe_crypto-aes_cbc
-REQUIRES = x86_64
-LIBS = vfs_cbe_crypto_aes_cbc
diff --git a/repos/gems/src/lib/vfs/cbe_crypto/memcopy/target.mk b/repos/gems/src/lib/vfs/cbe_crypto/memcopy/target.mk
deleted file mode 100644
index 2056779d98..0000000000
--- a/repos/gems/src/lib/vfs/cbe_crypto/memcopy/target.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET := lib-vfs-cbe_crypto-memcopy
-REQUIRES = x86_64
-LIBS = vfs_cbe_crypto_memcopy
diff --git a/repos/gems/src/lib/vfs/cbe_trust_anchor/target.mk b/repos/gems/src/lib/vfs/cbe_trust_anchor/target.mk
deleted file mode 100644
index b2cdea8241..0000000000
--- a/repos/gems/src/lib/vfs/cbe_trust_anchor/target.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET := lib-vfs-cbe_trust_anchor
-REQUIRES = x86_64
-LIBS = vfs_cbe_trust_anchor
-
-BUILD_ARTIFACTS :=
diff --git a/repos/gems/src/lib/vfs/gpu/target.mk b/repos/gems/src/lib/vfs/gpu/target.mk
deleted file mode 100644
index e9e3b042f4..0000000000
--- a/repos/gems/src/lib/vfs/gpu/target.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-LIBS = vfs_gpu
-
-BUILD_ARTIFACTS :=
diff --git a/repos/gems/src/lib/vfs/import/target.mk b/repos/gems/src/lib/vfs/import/target.mk
deleted file mode 100644
index fb15587c9a..0000000000
--- a/repos/gems/src/lib/vfs/import/target.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET = dummy-vfs_import
-LIBS   = vfs_import
-
-BUILD_ARTIFACTS :=
diff --git a/repos/gems/src/lib/vfs/pipe/target.mk b/repos/gems/src/lib/vfs/pipe/target.mk
deleted file mode 100644
index adb1db499e..0000000000
--- a/repos/gems/src/lib/vfs/pipe/target.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET = dummy-vfs_pipe
-LIBS   = vfs_pipe base
-
-BUILD_ARTIFACTS :=
diff --git a/repos/gems/src/lib/vfs/trace/target.mk b/repos/gems/src/lib/vfs/trace/target.mk
deleted file mode 100644
index 2ac95e2cde..0000000000
--- a/repos/gems/src/lib/vfs/trace/target.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-LIBS = vfs_trace
-
-BUILD_ARTIFACTS :=
diff --git a/repos/gems/src/lib/vfs/ttf/target.mk b/repos/gems/src/lib/vfs/ttf/target.mk
deleted file mode 100644
index 5c7e547164..0000000000
--- a/repos/gems/src/lib/vfs/ttf/target.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET = dummy-vfs_ttf
-LIBS = vfs_ttf
-
-BUILD_ARTIFACTS :=
diff --git a/repos/libports/recipes/api/libgcov/content.mk b/repos/libports/recipes/api/libgcov/content.mk
index d309a4f5fd..38f2ef1bb0 100644
--- a/repos/libports/recipes/api/libgcov/content.mk
+++ b/repos/libports/recipes/api/libgcov/content.mk
@@ -22,7 +22,6 @@ src/gcov:
 
 src/lib/gcov:
 	$(mirror_from_rep_dir)
-	echo "LIBS = libgcov" > $@/target.mk
 
 LICENSE:
 	cp $(PORT_DIR)/src/gcov/COPYING $@
diff --git a/repos/libports/recipes/src/curl/content.mk b/repos/libports/recipes/src/curl/content.mk
index 4af15e8206..a1a4e1b049 100644
--- a/repos/libports/recipes/src/curl/content.mk
+++ b/repos/libports/recipes/src/curl/content.mk
@@ -8,11 +8,6 @@ content: $(MIRROR_FROM_REP_DIR)
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-content: src/lib/curl/target.mk
-
-src/lib/curl/target.mk: src/lib/curl
-	echo "LIBS += curl" > $@
-
 PORT_DIR := $(call port_dir,$(REP_DIR)/ports/curl)
 
 content: src/lib/curl
diff --git a/repos/libports/recipes/src/expat/content.mk b/repos/libports/recipes/src/expat/content.mk
index dd777dcc7f..4e1557d5d3 100644
--- a/repos/libports/recipes/src/expat/content.mk
+++ b/repos/libports/recipes/src/expat/content.mk
@@ -1,14 +1,10 @@
 MIRROR_FROM_REP_DIR := lib/mk/expat.mk
 
-content: $(MIRROR_FROM_REP_DIR) src/lib/expat/target.mk
+content: $(MIRROR_FROM_REP_DIR)
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-src/lib/expat/target.mk:
-	mkdir -p $(dir $@)
-	echo "LIBS = expat" > $@
-
 PORT_DIR := $(call port_dir,$(REP_DIR)/ports/expat)
 
 MIRROR_FROM_PORT_DIR := src/lib/expat/contrib \
diff --git a/repos/libports/recipes/src/ffi/content.mk b/repos/libports/recipes/src/ffi/content.mk
index 73e48139e9..2543358c86 100644
--- a/repos/libports/recipes/src/ffi/content.mk
+++ b/repos/libports/recipes/src/ffi/content.mk
@@ -10,7 +10,6 @@ src/lib/ffi:
 	mkdir -p $@
 	cp -r $(PORT_DIR)/src/lib/ffi/* $@
 	cp -r $(REP_DIR)/src/lib/ffi/* $@
-	echo "LIBS = ffi" > $@/target.mk
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
diff --git a/repos/libports/recipes/src/freetype/content.mk b/repos/libports/recipes/src/freetype/content.mk
index 6ee93d7f08..ace9828cc4 100644
--- a/repos/libports/recipes/src/freetype/content.mk
+++ b/repos/libports/recipes/src/freetype/content.mk
@@ -5,7 +5,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/freetype)
 src/lib/freetype:
 	mkdir -p $(dir $@)
 	cp -r $(PORT_DIR)/src/lib/freetype $@
-	echo "LIBS = freetype" > $@/target.mk
 
 include/freetype-genode:
 	$(mirror_from_rep_dir)
diff --git a/repos/libports/recipes/src/gmp/content.mk b/repos/libports/recipes/src/gmp/content.mk
index 383b2c3716..502e04a2a6 100644
--- a/repos/libports/recipes/src/gmp/content.mk
+++ b/repos/libports/recipes/src/gmp/content.mk
@@ -59,7 +59,6 @@ src/lib/gmp:
 	mkdir -p $@
 	cp -r $(PORT_SRC_DIR)/* $@
 	cp -r $(REP_DIR)/src/lib/gmp/* $@
-	echo "LIBS = gmp" > $@/target.mk
 
 LICENSE:
 	cp $(PORT_SRC_DIR)/COPYING $@
diff --git a/repos/libports/recipes/src/icu/content.mk b/repos/libports/recipes/src/icu/content.mk
index 2fa3b431d5..dafd8ba4cb 100644
--- a/repos/libports/recipes/src/icu/content.mk
+++ b/repos/libports/recipes/src/icu/content.mk
@@ -5,7 +5,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/icu)
 src/lib/icu:
 	mkdir -p $@
 	cp -a $(PORT_DIR)/src/lib/icu/* $@/
-	echo "LIBS = icu" > $@/target.mk
 
 lib/mk/icu.mk:
 	$(mirror_from_rep_dir)
diff --git a/repos/libports/recipes/src/jbig2dec/content.mk b/repos/libports/recipes/src/jbig2dec/content.mk
index 330060df76..17a6c191bb 100644
--- a/repos/libports/recipes/src/jbig2dec/content.mk
+++ b/repos/libports/recipes/src/jbig2dec/content.mk
@@ -5,7 +5,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/jbig2dec)
 src/lib/jbig2dec:
 	mkdir -p $@
 	cp -a $(PORT_DIR)/src/lib/jbig2dec/* $@/
-	echo "LIBS = jbig2dec" > $@/target.mk
 
 lib/mk/%.mk:
 	$(mirror_from_rep_dir)
diff --git a/repos/libports/recipes/src/jpeg/content.mk b/repos/libports/recipes/src/jpeg/content.mk
index 3013409349..35b89cc6da 100644
--- a/repos/libports/recipes/src/jpeg/content.mk
+++ b/repos/libports/recipes/src/jpeg/content.mk
@@ -5,7 +5,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/jpeg)
 src/lib/jpeg:
 	mkdir -p $(dir $@)
 	cp -r $(PORT_DIR)/src/lib/jpeg $@
-	echo "LIBS = jpeg" > $@/target.mk
 
 lib/mk/%.mk:
 	$(mirror_from_rep_dir)
diff --git a/repos/libports/recipes/src/libarchive/content.mk b/repos/libports/recipes/src/libarchive/content.mk
index 23d0d0006f..8204e55e45 100644
--- a/repos/libports/recipes/src/libarchive/content.mk
+++ b/repos/libports/recipes/src/libarchive/content.mk
@@ -9,7 +9,6 @@ src/lib/libarchive:
 	mkdir -p $@
 	cp -r $(PORT_DIR)/src/lib/libarchive/* $@
 	cp $(REP_DIR)/src/lib/libarchive/* $@
-	echo "LIBS = libarchive" > $@/target.mk
 
 lib/mk/libarchive.mk:
 	$(mirror_from_rep_dir)
diff --git a/repos/libports/recipes/src/libc/content.mk b/repos/libports/recipes/src/libc/content.mk
index af9a9a3413..86f6e6e014 100644
--- a/repos/libports/recipes/src/libc/content.mk
+++ b/repos/libports/recipes/src/libc/content.mk
@@ -1,4 +1,4 @@
-content: include/libc-plugin src/lib/libc/target.mk lib/mk LICENSE
+content: include/libc-plugin src/lib/libc lib/mk LICENSE
 
 LIBC_PORT_DIR := $(call port_dir,$(REP_DIR)/ports/libc)
 LIBM_PORT_DIR := $(LIBC_PORT_DIR)
@@ -8,10 +8,6 @@ src/lib/libc:
 	cp -r $(LIBC_PORT_DIR)/src/lib/libc/* $@
 	cp -r $(REP_DIR)/src/lib/libc/* $@
 
-# target.mk for triggering the build of both libraries libc and libm
-src/lib/libc/target.mk: src/lib/libc
-	echo "LIBS += libc libm" > $@
-
 include/libc-plugin include/libc/sys/ucontext.h:
 	$(mirror_from_rep_dir)
 
diff --git a/repos/libports/recipes/src/libdrm/content.mk b/repos/libports/recipes/src/libdrm/content.mk
index 58fed75624..08f2c526d5 100644
--- a/repos/libports/recipes/src/libdrm/content.mk
+++ b/repos/libports/recipes/src/libdrm/content.mk
@@ -11,15 +11,11 @@ MIRROR_FROM_REP_DIR := lib/mk/libdrm.mk \
                        src/lib/libdrm/ioctl_dispatch.cc \
                        src/lib/libdrm/ioctl_lima.cc
 
-content: $(MIRROR_FROM_REP_DIR) src/lib/libdrm/target.mk
+content: $(MIRROR_FROM_REP_DIR)
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-src/lib/libdrm/target.mk:
-	mkdir -p $(dir $@)
-	echo "LIBS = libdrm" > $@
-
 PORT_DIR := $(call port_dir,$(REP_DIR)/ports/libdrm)
 
 MIRROR_FROM_PORT_DIR := $(addprefix src/lib/libdrm/,\
diff --git a/repos/libports/recipes/src/libiconv/content.mk b/repos/libports/recipes/src/libiconv/content.mk
index a8e156d43a..43721cf690 100644
--- a/repos/libports/recipes/src/libiconv/content.mk
+++ b/repos/libports/recipes/src/libiconv/content.mk
@@ -17,7 +17,6 @@ src/lib/libiconv:
 	mkdir -p $@
 	cp -r $(PORT_DIR)/src/lib/libiconv/* $@
 	cp -r $(REP_DIR)/src/lib/libiconv/private $@
-	echo "LIBS = libiconv" > $@/target.mk
 
 content: LICENSE
 
diff --git a/repos/libports/recipes/src/liblzma/content.mk b/repos/libports/recipes/src/liblzma/content.mk
index 71f42d2f81..56367905d6 100644
--- a/repos/libports/recipes/src/liblzma/content.mk
+++ b/repos/libports/recipes/src/liblzma/content.mk
@@ -8,7 +8,6 @@ include:
 src/lib/liblzma:
 	mkdir -p $@
 	cp $(REP_DIR)/src/lib/liblzma/config.h $@
-	echo "LIBS = liblzma" > $@/target.mk
 
 src/xz:
 	mkdir -p $@
diff --git a/repos/libports/recipes/src/libpng/content.mk b/repos/libports/recipes/src/libpng/content.mk
index 57bba3ed7d..934dce5c21 100644
--- a/repos/libports/recipes/src/libpng/content.mk
+++ b/repos/libports/recipes/src/libpng/content.mk
@@ -5,7 +5,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/libpng)
 src/lib/libpng:
 	$(mirror_from_rep_dir)
 	cp -r $(PORT_DIR)/src/lib/libpng/* $@
-	echo "LIBS = libpng" > $@/target.mk
 
 lib/mk/libpng.mk lib/mk/libpng.inc lib/mk/spec/arm_v8/libpng.mk:
 	$(mirror_from_rep_dir)
diff --git a/repos/libports/recipes/src/libqgenodeviewwidget/content.mk b/repos/libports/recipes/src/libqgenodeviewwidget/content.mk
index 01dd2e58ce..2d90418a74 100644
--- a/repos/libports/recipes/src/libqgenodeviewwidget/content.mk
+++ b/repos/libports/recipes/src/libqgenodeviewwidget/content.mk
@@ -1,14 +1,10 @@
 MIRROR_FROM_REP_DIR := lib/mk/libqgenodeviewwidget.mk \
                        src/lib/qgenodeviewwidget
 
-content: $(MIRROR_FROM_REP_DIR) LICENSE src/lib/qgenodeviewwidget/target.mk
+content: $(MIRROR_FROM_REP_DIR) LICENSE
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-src/lib/qgenodeviewwidget/target.mk:
-	mkdir -p $(dir $@)
-	echo "LIBS = libqgenodeviewwidget" > $@
-
 LICENSE:
 	cp $(GENODE_DIR)/LICENSE $@
diff --git a/repos/libports/recipes/src/libqpluginwidget/content.mk b/repos/libports/recipes/src/libqpluginwidget/content.mk
index 181990123f..4ab0384681 100644
--- a/repos/libports/recipes/src/libqpluginwidget/content.mk
+++ b/repos/libports/recipes/src/libqpluginwidget/content.mk
@@ -1,14 +1,10 @@
 MIRROR_FROM_REP_DIR := lib/mk/libqpluginwidget.mk \
                        src/lib/qpluginwidget
 
-content: $(MIRROR_FROM_REP_DIR) LICENSE src/lib/qpluginwidget/target.mk
+content: $(MIRROR_FROM_REP_DIR) LICENSE
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-src/lib/qpluginwidget/target.mk:
-	mkdir -p $(dir $@)
-	echo "LIBS = libqpluginwidget" > $@
-
 LICENSE:
 	cp $(GENODE_DIR)/LICENSE $@
diff --git a/repos/libports/recipes/src/libsparkcrypto/content.mk b/repos/libports/recipes/src/libsparkcrypto/content.mk
index 0d3c22cdf9..859b2f4ff7 100644
--- a/repos/libports/recipes/src/libsparkcrypto/content.mk
+++ b/repos/libports/recipes/src/libsparkcrypto/content.mk
@@ -79,9 +79,3 @@ content: LICENSE
 
 LICENSE:
 	echo "BSD-3-Clause-Attribution, see libsparkcrypto/README.rst" > $@
-
-content: src/lib/libsparkcrypto/target.mk
-
-src/lib/libsparkcrypto/target.mk:
-	mkdir -p $(dir $@)
-	echo "LIBS = libsparkcrypto" > $@
diff --git a/repos/libports/recipes/src/libssh/content.mk b/repos/libports/recipes/src/libssh/content.mk
index 013ef7a3da..cf215f29b9 100644
--- a/repos/libports/recipes/src/libssh/content.mk
+++ b/repos/libports/recipes/src/libssh/content.mk
@@ -1,4 +1,4 @@
-content: src/lib/libssh/target.mk lib/mk LICENSE
+content: src/lib/libssh lib/mk LICENSE
 
 PORT_DIR := $(call port_dir,$(REP_DIR)/ports/libssh)
 
@@ -7,9 +7,6 @@ src/lib/libssh:
 	cp -r $(PORT_DIR)/src/lib/libssh/* $@
 	cp -r $(REP_DIR)/src/lib/libssh/config.h $@
 
-src/lib/libssh/target.mk: src/lib/libssh
-	echo "LIBS += libssh" > $@
-
 lib/mk:
 	mkdir -p $@
 	cp $(REP_DIR)/lib/mk/libssh.mk $@
diff --git a/repos/libports/recipes/src/libusb/content.mk b/repos/libports/recipes/src/libusb/content.mk
index 8e154f94e4..fe6121c7bd 100644
--- a/repos/libports/recipes/src/libusb/content.mk
+++ b/repos/libports/recipes/src/libusb/content.mk
@@ -10,7 +10,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/libusb)
 src/lib/libusb:
 	mkdir -p $(dir $@)
 	cp -r $(PORT_DIR)/src/lib/libusb $@
-	echo "LIBS = libusb" > $@/target.mk
 	$(mirror_from_rep_dir)
 
 $(MIRROR_FROM_REP_DIR):
diff --git a/repos/libports/recipes/src/libuvc/content.mk b/repos/libports/recipes/src/libuvc/content.mk
index 1e97c7aa13..590045575e 100644
--- a/repos/libports/recipes/src/libuvc/content.mk
+++ b/repos/libports/recipes/src/libuvc/content.mk
@@ -8,7 +8,6 @@ src/lib/libuvc:
 	mkdir -p $(dir $@)
 	cp -r $(PORT_DIR)/src/lib/libuvc $@
 	rm -rf $@/.git
-	echo "LIBS = libuvc" > $@/target.mk
 
 include:
 	mkdir -p $@
diff --git a/repos/libports/recipes/src/libyuv/content.mk b/repos/libports/recipes/src/libyuv/content.mk
index f4e76d4de5..9b83f440e6 100644
--- a/repos/libports/recipes/src/libyuv/content.mk
+++ b/repos/libports/recipes/src/libyuv/content.mk
@@ -11,13 +11,11 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/libyuv)
 src/lib/libyuv:
 	mkdir -p $@
 	cp -r $(PORT_DIR)/src/lib/libyuv/source $@
-	echo "LIBS = libyuv" > $@/target.mk
 
 include:
 	mkdir -p $@
 	cp -a $(PORT_DIR)/include/* $@
 
-
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
diff --git a/repos/libports/recipes/src/mesa/content.mk b/repos/libports/recipes/src/mesa/content.mk
index 21fc2bfd8a..355218e4bf 100644
--- a/repos/libports/recipes/src/mesa/content.mk
+++ b/repos/libports/recipes/src/mesa/content.mk
@@ -31,15 +31,11 @@ MIRROR_FROM_REP_DIR := \
                        lib/mk/spec/x86_64/mesa.mk \
                        src/lib/mesa
 
-content: $(MIRROR_FROM_REP_DIR) src/lib/mesa/target.mk
+content: $(MIRROR_FROM_REP_DIR)
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-src/lib/mesa/target.mk:
-	mkdir -p $(dir $@)
-	echo "LIBS = mesa" > $@
-
 PORT_DIR := $(call port_dir,$(REP_DIR)/ports/mesa)
 
 MIRROR_FROM_PORT_DIR := src/lib/mesa/src generated
diff --git a/repos/libports/recipes/src/mupdf/content.mk b/repos/libports/recipes/src/mupdf/content.mk
index 011a0d56a1..3c3d5dcbbf 100644
--- a/repos/libports/recipes/src/mupdf/content.mk
+++ b/repos/libports/recipes/src/mupdf/content.mk
@@ -5,7 +5,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/mupdf)
 src/lib/mupdf:
 	mkdir -p $(dir $@)
 	cp -r $(PORT_DIR)/src/lib/mupdf $@
-	echo "LIBS = mupdf" > $@/target.mk
 
 lib/mk/%.mk:
 	$(mirror_from_rep_dir)
diff --git a/repos/libports/recipes/src/ncurses/content.mk b/repos/libports/recipes/src/ncurses/content.mk
index 5ef2e6d994..7107d4e485 100644
--- a/repos/libports/recipes/src/ncurses/content.mk
+++ b/repos/libports/recipes/src/ncurses/content.mk
@@ -5,7 +5,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/ncurses)
 src/lib/ncurses:
 	mkdir -p $@
 	cp -r $(PORT_DIR)/src/lib/ncurses/* $@
-	echo "LIBS = ncurses" > $@/target.mk
 
 lib/mk/ncurses.mk:
 	$(mirror_from_rep_dir)
diff --git a/repos/libports/recipes/src/openjpeg/content.mk b/repos/libports/recipes/src/openjpeg/content.mk
index 3c835333ba..b25b40cf66 100644
--- a/repos/libports/recipes/src/openjpeg/content.mk
+++ b/repos/libports/recipes/src/openjpeg/content.mk
@@ -5,7 +5,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/openjpeg)
 src/lib/openjpeg:
 	mkdir -p $(dir $@)
 	cp -r $(PORT_DIR)/src/lib/openjpeg $@
-	echo "LIBS = openjpeg" > $@/target.mk
 
 lib/mk/%.mk:
 	$(mirror_from_rep_dir)
diff --git a/repos/libports/recipes/src/openssl/content.mk b/repos/libports/recipes/src/openssl/content.mk
index 7772fe0d7a..1f9ab3c2d0 100644
--- a/repos/libports/recipes/src/openssl/content.mk
+++ b/repos/libports/recipes/src/openssl/content.mk
@@ -11,12 +11,6 @@ content: $(MIRROR_FROM_REP_DIR)
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-content: src/lib/openssl/target.mk
-
-src/lib/openssl/target.mk: src/lib/openssl
-	mkdir -p $(dir $@)
-	echo "LIBS += libcrypto libssl" > $@
-
 PORT_DIR := $(call port_dir,$(REP_DIR)/ports/openssl)
 
 content: src/lib/openssl
diff --git a/repos/libports/recipes/src/pcre/content.mk b/repos/libports/recipes/src/pcre/content.mk
index dae4ed37b1..8432441459 100644
--- a/repos/libports/recipes/src/pcre/content.mk
+++ b/repos/libports/recipes/src/pcre/content.mk
@@ -6,7 +6,6 @@ src/lib/pcre:
 	mkdir -p $@
 	cp -a $(PORT_DIR)/src/lib/pcre/* $@
 	cp -a $(REP_DIR)/src/lib/pcre/* $@
-	echo "LIBS = pcre" > $@/target.mk
 
 lib/mk/pcre.mk:
 	$(mirror_from_rep_dir)
diff --git a/repos/libports/recipes/src/pcre16/content.mk b/repos/libports/recipes/src/pcre16/content.mk
index 3bd3eabc11..8c43d0699f 100644
--- a/repos/libports/recipes/src/pcre16/content.mk
+++ b/repos/libports/recipes/src/pcre16/content.mk
@@ -6,7 +6,6 @@ src/lib/pcre:
 	mkdir -p $@
 	cp -a $(PORT_DIR)/src/lib/pcre/* $@
 	cp -a $(REP_DIR)/src/lib/pcre/* $@
-	echo "LIBS = pcre16" > $@/target.mk
 
 lib/mk/pcre16.mk:
 	$(mirror_from_rep_dir)
diff --git a/repos/libports/recipes/src/pcsc-lite/content.mk b/repos/libports/recipes/src/pcsc-lite/content.mk
index 9d080989d5..1569be42d8 100644
--- a/repos/libports/recipes/src/pcsc-lite/content.mk
+++ b/repos/libports/recipes/src/pcsc-lite/content.mk
@@ -43,18 +43,6 @@ content: $(MIRROR_FROM_REP_DIR)
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-content: src/lib/pcsc-lite/target.mk
-
-src/lib/pcsc-lite/target.mk:
-	mkdir -p $(dir $@)
-	echo "LIBS = pcsc-lite" > $@
-
-content: src/lib/ccid/target.mk
-
-src/lib/ccid/target.mk:
-	mkdir -p $(dir $@)
-	echo "LIBS = ccid" > $@
-
 content: LICENSE
 
 LICENSE:
diff --git a/repos/libports/recipes/src/posix/content.mk b/repos/libports/recipes/src/posix/content.mk
index 9c937d11e0..603dc50643 100644
--- a/repos/libports/recipes/src/posix/content.mk
+++ b/repos/libports/recipes/src/posix/content.mk
@@ -1,14 +1,10 @@
 MIRROR_FROM_REP_DIR := lib/mk/posix.mk src/lib/posix
 
-content: $(MIRROR_FROM_REP_DIR) LICENSE src/lib/posix/target.mk
+content: $(MIRROR_FROM_REP_DIR) LICENSE
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-src/lib/posix/target.mk:
-	mkdir -p $(dir $@)
-	echo "LIBS = posix" > $@
-
 LICENSE:
 	cp $(GENODE_DIR)/LICENSE $@
 
diff --git a/repos/libports/recipes/src/qt5_base/content.mk b/repos/libports/recipes/src/qt5_base/content.mk
index d6378a1e31..0bb6ccac65 100644
--- a/repos/libports/recipes/src/qt5_base/content.mk
+++ b/repos/libports/recipes/src/qt5_base/content.mk
@@ -1,14 +1,10 @@
 MIRROR_FROM_REP_DIR := lib/mk/qt5_base.mk
 
-content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_base/target.mk
+content: $(MIRROR_FROM_REP_DIR)
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-src/lib/qt5_base/target.mk:
-	mkdir -p $(dir $@)
-	echo "LIBS = qt5_base" > $@
-
 PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
 
 MIRROR_FROM_PORT_DIR := src/lib/qt5/qtbase
diff --git a/repos/libports/recipes/src/qt5_component/content.mk b/repos/libports/recipes/src/qt5_component/content.mk
index b41763cbc8..27f492420c 100644
--- a/repos/libports/recipes/src/qt5_component/content.mk
+++ b/repos/libports/recipes/src/qt5_component/content.mk
@@ -1,15 +1,10 @@
 MIRROR_FROM_REP_DIR := lib/mk/qt5_component.mk \
                        src/lib/qt5_component/qt_component.cc
 
-content: $(MIRROR_FROM_REP_DIR) LICENSE src/lib/qt5_component/target.mk
+content: $(MIRROR_FROM_REP_DIR) LICENSE
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-src/lib/qt5_component/target.mk:
-	mkdir -p $(dir $@)
-	echo "LIBS = qt5_component" > $@
-
 LICENSE:
 	cp $(GENODE_DIR)/LICENSE $@
-
diff --git a/repos/libports/recipes/src/qt5_declarative/content.mk b/repos/libports/recipes/src/qt5_declarative/content.mk
index 53a9af087f..f741863ff0 100644
--- a/repos/libports/recipes/src/qt5_declarative/content.mk
+++ b/repos/libports/recipes/src/qt5_declarative/content.mk
@@ -1,14 +1,10 @@
 MIRROR_FROM_REP_DIR := lib/mk/qt5_declarative.mk
 
-content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_declarative/target.mk
+content: $(MIRROR_FROM_REP_DIR)
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-src/lib/qt5_declarative/target.mk:
-	mkdir -p $(dir $@)
-	echo "LIBS = qt5_declarative" > $@
-
 PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
 
 MIRROR_FROM_PORT_DIR := src/lib/qt5/qtdeclarative
diff --git a/repos/libports/recipes/src/qt5_graphicaleffects/content.mk b/repos/libports/recipes/src/qt5_graphicaleffects/content.mk
index b084e529d7..45c9e4ab1a 100644
--- a/repos/libports/recipes/src/qt5_graphicaleffects/content.mk
+++ b/repos/libports/recipes/src/qt5_graphicaleffects/content.mk
@@ -1,14 +1,10 @@
 MIRROR_FROM_REP_DIR := lib/mk/qt5_graphicaleffects.mk
 
-content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_graphicaleffects/target.mk
+content: $(MIRROR_FROM_REP_DIR)
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-src/lib/qt5_graphicaleffects/target.mk:
-	mkdir -p $(dir $@)
-	echo "LIBS = qt5_graphicaleffects" > $@
-
 PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
 
 MIRROR_FROM_PORT_DIR := src/lib/qt5/qtgraphicaleffects
diff --git a/repos/libports/recipes/src/qt5_quickcontrols/content.mk b/repos/libports/recipes/src/qt5_quickcontrols/content.mk
index 37f5d15097..8cf841f090 100644
--- a/repos/libports/recipes/src/qt5_quickcontrols/content.mk
+++ b/repos/libports/recipes/src/qt5_quickcontrols/content.mk
@@ -1,14 +1,10 @@
 MIRROR_FROM_REP_DIR := lib/mk/qt5_quickcontrols.mk
 
-content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_quickcontrols/target.mk
+content: $(MIRROR_FROM_REP_DIR)
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-src/lib/qt5_quickcontrols/target.mk:
-	mkdir -p $(dir $@)
-	echo "LIBS = qt5_quickcontrols" > $@
-
 PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
 
 MIRROR_FROM_PORT_DIR := src/lib/qt5/qtquickcontrols
diff --git a/repos/libports/recipes/src/qt5_quickcontrols2/content.mk b/repos/libports/recipes/src/qt5_quickcontrols2/content.mk
index 42f4ef72cf..8b764635f1 100644
--- a/repos/libports/recipes/src/qt5_quickcontrols2/content.mk
+++ b/repos/libports/recipes/src/qt5_quickcontrols2/content.mk
@@ -1,14 +1,10 @@
 MIRROR_FROM_REP_DIR := lib/mk/qt5_quickcontrols2.mk
 
-content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_quickcontrols2/target.mk
+content: $(MIRROR_FROM_REP_DIR)
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-src/lib/qt5_quickcontrols2/target.mk:
-	mkdir -p $(dir $@)
-	echo "LIBS = qt5_quickcontrols2" > $@
-
 PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
 
 MIRROR_FROM_PORT_DIR := src/lib/qt5/qtquickcontrols2
diff --git a/repos/libports/recipes/src/qt5_svg/content.mk b/repos/libports/recipes/src/qt5_svg/content.mk
index 0b1c104e9e..5eec4583c5 100644
--- a/repos/libports/recipes/src/qt5_svg/content.mk
+++ b/repos/libports/recipes/src/qt5_svg/content.mk
@@ -1,14 +1,10 @@
 MIRROR_FROM_REP_DIR := lib/mk/qt5_svg.mk
 
-content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_svg/target.mk
+content: $(MIRROR_FROM_REP_DIR)
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-src/lib/qt5_svg/target.mk:
-	mkdir -p $(dir $@)
-	echo "LIBS = qt5_svg" > $@
-
 PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
 
 MIRROR_FROM_PORT_DIR := src/lib/qt5/qtsvg
diff --git a/repos/libports/recipes/src/qt5_virtualkeyboard/content.mk b/repos/libports/recipes/src/qt5_virtualkeyboard/content.mk
index 329fceec80..3d77606630 100644
--- a/repos/libports/recipes/src/qt5_virtualkeyboard/content.mk
+++ b/repos/libports/recipes/src/qt5_virtualkeyboard/content.mk
@@ -1,14 +1,10 @@
 MIRROR_FROM_REP_DIR := lib/mk/qt5_virtualkeyboard.mk
 
-content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_virtualkeyboard/target.mk
+content: $(MIRROR_FROM_REP_DIR)
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-src/lib/qt5_virtualkeyboard/target.mk:
-	mkdir -p $(dir $@)
-	echo "LIBS = qt5_virtualkeyboard" > $@
-
 PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5)
 
 MIRROR_FROM_PORT_DIR := src/lib/qt5/qtvirtualkeyboard
diff --git a/repos/libports/recipes/src/sanitizer/content.mk b/repos/libports/recipes/src/sanitizer/content.mk
index 6299fcce4f..bd902c5efa 100644
--- a/repos/libports/recipes/src/sanitizer/content.mk
+++ b/repos/libports/recipes/src/sanitizer/content.mk
@@ -13,7 +13,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/sanitizer)
 src/lib/sanitizer:
 	mkdir -p $@
 	cp -r $(PORT_DIR)/src/lib/sanitizer/* $@
-	echo "LIBS = libsanitizer_common libubsan" > $@/target.mk
 
 content: LICENSE
 
diff --git a/repos/libports/recipes/src/spark/content.mk b/repos/libports/recipes/src/spark/content.mk
index b1d2bdf9bf..1b079ab24b 100644
--- a/repos/libports/recipes/src/spark/content.mk
+++ b/repos/libports/recipes/src/spark/content.mk
@@ -71,9 +71,3 @@ content: $(MIRROR_FROM_REP_DIR)
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
-
-content: src/lib/spark/target.mk
-
-src/lib/spark/target.mk:
-	mkdir -p $(dir $@)
-	echo "LIBS = spark" > $@
diff --git a/repos/libports/recipes/src/stdcxx/content.mk b/repos/libports/recipes/src/stdcxx/content.mk
index 78d1e7c35f..38c840d8a3 100644
--- a/repos/libports/recipes/src/stdcxx/content.mk
+++ b/repos/libports/recipes/src/stdcxx/content.mk
@@ -4,14 +4,11 @@ MIRROR_FROM_REP_DIR := lib/mk/stdcxx-c++98.mk \
 
 MIRROR_FROM_PORT_DIR := src/lib/stdcxx
 
-content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_PORT_DIR) src/lib/stdcxx/target.mk
+content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_PORT_DIR)
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
-src/lib/stdcxx/target.mk: $(MIRROR_FROM_PORT_DIR)
-	echo "LIBS = stdcxx" > $@
-
 PORT_DIR := $(call port_dir,$(REP_DIR)/ports/stdcxx)
 
 $(MIRROR_FROM_PORT_DIR):
diff --git a/repos/libports/recipes/src/zlib/content.mk b/repos/libports/recipes/src/zlib/content.mk
index 6ae1a807aa..b200740119 100644
--- a/repos/libports/recipes/src/zlib/content.mk
+++ b/repos/libports/recipes/src/zlib/content.mk
@@ -5,7 +5,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/zlib)
 src/lib/zlib:
 	mkdir -p $@
 	cp -r $(PORT_DIR)/src/lib/zlib/* $@
-	echo "LIBS = zlib" > $@/target.mk
 
 lib/mk/zlib.mk:
 	$(mirror_from_rep_dir)
diff --git a/repos/libports/run/fs_rom_update_fat.run b/repos/libports/run/fs_rom_update_fat.run
index a009d2863e..9ae4876ff9 100644
--- a/repos/libports/run/fs_rom_update_fat.run
+++ b/repos/libports/run/fs_rom_update_fat.run
@@ -5,8 +5,8 @@ set build_components {
 	core init timer
 	app/rom_logger
 	app/rom_to_file
-	lib/vfs/fatfs
-	lib/vfs/import
+	lib/vfs_fatfs
+	lib/vfs_import
 	server/dynamic_rom
 	server/fs_rom
 	server/vfs_block
diff --git a/repos/libports/run/libc_block.run b/repos/libports/run/libc_block.run
index 0bdb124524..1e46c7a2b7 100644
--- a/repos/libports/run/libc_block.run
+++ b/repos/libports/run/libc_block.run
@@ -8,7 +8,7 @@ create_boot_directory
 build {
 	core init timer
 	server/vfs_block
-	lib/vfs/import
+	lib/vfs_import
 	test/libc_block
 }
 
diff --git a/repos/libports/run/libc_select.run b/repos/libports/run/libc_select.run
index bc56c3c30a..d27bdd8794 100644
--- a/repos/libports/run/libc_select.run
+++ b/repos/libports/run/libc_select.run
@@ -1,7 +1,7 @@
 set build_components {
 	core init timer server/terminal_crosslink
 	test/libc_select test/libc_counter
-	lib/vfs/pipe
+	lib/vfs_pipe
 }
 
 build $build_components
diff --git a/repos/libports/run/libc_vfs_fat.run b/repos/libports/run/libc_vfs_fat.run
index 8ea6c53b83..a5c17123ec 100644
--- a/repos/libports/run/libc_vfs_fat.run
+++ b/repos/libports/run/libc_vfs_fat.run
@@ -1,7 +1,7 @@
 set mkfs_cmd   [installed_command mkfs.vfat]
 set mkfs_opts  "-F32 -nlibc_vfs"
 
-set test_build_components lib/vfs/fatfs
+set test_build_components lib/vfs_fatfs
 set test_vfs_config "<fatfs/>"
 set test_boot_modules vfs_fatfs.lib.so
 
diff --git a/repos/libports/run/libc_vfs_fs_fat.run b/repos/libports/run/libc_vfs_fs_fat.run
index d6079385c1..f1ac461c1a 100644
--- a/repos/libports/run/libc_vfs_fs_fat.run
+++ b/repos/libports/run/libc_vfs_fs_fat.run
@@ -6,7 +6,7 @@ if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 set mkfs_cmd   [installed_command mkfs.vfat]
 set mkfs_opts  "-F32 -nlibc_vfs"
 
-set test_build_components lib/vfs/fatfs
+set test_build_components lib/vfs_fatfs
 set test_vfs_config "<fatfs/>"
 set test_boot_modules vfs_fatfs.lib.so
 
diff --git a/repos/libports/run/libc_vfs_select.run b/repos/libports/run/libc_vfs_select.run
index 83d12fd4f3..f7d6949688 100644
--- a/repos/libports/run/libc_vfs_select.run
+++ b/repos/libports/run/libc_vfs_select.run
@@ -1,7 +1,7 @@
 set build_components {
 	core init timer server/terminal_crosslink server/vfs
 	test/libc_select test/libc_counter
-	lib/vfs/pipe
+	lib/vfs_pipe
 }
 
 build $build_components
diff --git a/repos/libports/run/lwip_lx.run b/repos/libports/run/lwip_lx.run
index e0cdc92afa..723518b9fa 100644
--- a/repos/libports/run/lwip_lx.run
+++ b/repos/libports/run/lwip_lx.run
@@ -30,7 +30,7 @@ build {
 	core init timer
 	drivers/nic
 	test/lwip/http_srv
-	lib/vfs/lwip
+	lib/vfs_lwip
 	server/nic_router
 	server/report_rom
 }
diff --git a/repos/libports/run/mesa.inc b/repos/libports/run/mesa.inc
index 5503fb0e97..43f7dc4b7c 100644
--- a/repos/libports/run/mesa.inc
+++ b/repos/libports/run/mesa.inc
@@ -26,12 +26,12 @@ import_from_depot $imports
 
 set build_components {
 	drivers/gpu/intel
-	lib/mesa/softpipe
+	lib/mesa_softpipe
 	core init timer
 }
 
-lappend_if $use_iris    build_components lib/mesa/iris
-lappend_if $use_etnaviv build_components lib/mesa/etnaviv
+lappend_if $use_iris    build_components lib/mesa_iris
+lappend_if $use_etnaviv build_components lib/mesa_etnaviv
 lappend_if $use_etnaviv build_components drivers/gpu/etnaviv
 lappend build_components $demo_component
 
diff --git a/repos/libports/run/nic_router.inc b/repos/libports/run/nic_router.inc
index fd8539c946..d7db704bfb 100644
--- a/repos/libports/run/nic_router.inc
+++ b/repos/libports/run/nic_router.inc
@@ -5,7 +5,7 @@ if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 
 set targets "core init timer server/nic_router server/nic_bridge
              test/lwip/http_srv test/lwip/http_clnt test/lwip/udp
-             server/nic_loopback lib/vfs/lwip "
+             server/nic_loopback lib/vfs_lwip "
 
 proc client_bin { prot } {
 	if {$prot == "udp"}  { return "test-lwip-udp-client" }
diff --git a/repos/libports/run/oss.run b/repos/libports/run/oss.run
index e41c34ac67..c6c070d4e7 100644
--- a/repos/libports/run/oss.run
+++ b/repos/libports/run/oss.run
@@ -11,7 +11,7 @@ if {[have_include "power_on/qemu"]} {
 set build_components {
 	core init timer
 	drivers/audio
-	lib/vfs/oss test/oss
+	lib/vfs_oss test/oss
 }
 
 source ${genode_dir}/repos/base/run/platform_drv.inc
diff --git a/repos/libports/run/smartcard.run b/repos/libports/run/smartcard.run
index cfa92347f7..dc850c612a 100644
--- a/repos/libports/run/smartcard.run
+++ b/repos/libports/run/smartcard.run
@@ -26,8 +26,8 @@ set build_components {
 	core init timer
 	drivers/usb_host
 	test/smartcard
-	lib/vfs/libusb
-	lib/vfs/pipe
+	lib/vfs_libusb
+	lib/vfs_pipe
 }
 
 source ${genode_dir}/repos/base/run/platform_drv.inc
diff --git a/repos/libports/run/vfs_lwip.inc b/repos/libports/run/vfs_lwip.inc
index c972685d63..dfcd3b9acc 100644
--- a/repos/libports/run/vfs_lwip.inc
+++ b/repos/libports/run/vfs_lwip.inc
@@ -1,6 +1,6 @@
 proc append_socket_fs_build_components { } {
 	global build_components
-	append build_components { lib/vfs/lwip }
+	append build_components { lib/vfs_lwip }
 }
 
 proc socket_fs_plugin {} { return lwip }
diff --git a/repos/libports/src/lib/mesa/etnaviv/target.mk b/repos/libports/src/lib/mesa/etnaviv/target.mk
deleted file mode 100644
index 7a8d51a642..0000000000
--- a/repos/libports/src/lib/mesa/etnaviv/target.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-REQUIRES := arm_v8a
-TARGET   := dummy-mesa_gpu-etnaviv
-LIBS     := mesa_gpu-etnaviv
diff --git a/repos/libports/src/lib/mesa/iris/target.mk b/repos/libports/src/lib/mesa/iris/target.mk
deleted file mode 100644
index c0da6330d9..0000000000
--- a/repos/libports/src/lib/mesa/iris/target.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-REQUIRES := x86
-
-TARGET = dummy-mesa_gpu-iris
-LIBS   = mesa_gpu-iris
diff --git a/repos/libports/src/lib/mesa/lima/target.mk b/repos/libports/src/lib/mesa/lima/target.mk
deleted file mode 100644
index cff12952c1..0000000000
--- a/repos/libports/src/lib/mesa/lima/target.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-REQUIRES := arm_v8a
-TARGET   := dummy-mesa_gpu-lima
-LIBS     := mesa_gpu-lima
diff --git a/repos/libports/src/lib/mesa/softpipe/target.mk b/repos/libports/src/lib/mesa/softpipe/target.mk
deleted file mode 100644
index 682115dbee..0000000000
--- a/repos/libports/src/lib/mesa/softpipe/target.mk
+++ /dev/null
@@ -1 +0,0 @@
-LIBS := mesa_gpu-softpipe
diff --git a/repos/libports/src/lib/vfs/fatfs/target.mk b/repos/libports/src/lib/vfs/fatfs/target.mk
deleted file mode 100644
index bee93b557c..0000000000
--- a/repos/libports/src/lib/vfs/fatfs/target.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGET = dummy-vfs_fatfs
-LIBS = vfs_fatfs
-
-BUILD_ARTIFACTS :=
-
-CC_CXX_WARN_STRICT =
diff --git a/repos/libports/src/lib/vfs/jitterentropy/target.mk b/repos/libports/src/lib/vfs/jitterentropy/target.mk
deleted file mode 100644
index bd2594b30b..0000000000
--- a/repos/libports/src/lib/vfs/jitterentropy/target.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGET = dummy-vfs_jitterentropy
-LIBS = vfs_jitterentropy
-
-BUILD_ARTIFACTS :=
-
-CC_CXX_WARN_STRICT =
diff --git a/repos/libports/src/lib/vfs/libusb/target.mk b/repos/libports/src/lib/vfs/libusb/target.mk
deleted file mode 100644
index 73c07409c7..0000000000
--- a/repos/libports/src/lib/vfs/libusb/target.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGET = dummy-vfs_libusb
-LIBS = vfs_libusb
-
-BUILD_ARTIFACTS :=
-
-CC_CXX_WARN_STRICT =
diff --git a/repos/libports/src/lib/vfs/lwip/target.mk b/repos/libports/src/lib/vfs/lwip/target.mk
deleted file mode 100644
index 1049802bb0..0000000000
--- a/repos/libports/src/lib/vfs/lwip/target.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET = dummy-vfs_lwip
-LIBS = vfs_lwip
-
-BUILD_ARTIFACTS :=
diff --git a/repos/libports/src/lib/vfs/oss/target.mk b/repos/libports/src/lib/vfs/oss/target.mk
deleted file mode 100644
index 836274ded1..0000000000
--- a/repos/libports/src/lib/vfs/oss/target.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET = dummy-vfs_oss
-LIBS = vfs_oss
-
-BUILD_ARTIFACTS :=
diff --git a/repos/os/recipes/src/sandbox/content.mk b/repos/os/recipes/src/sandbox/content.mk
index 0bfc4af807..956e67fc9f 100644
--- a/repos/os/recipes/src/sandbox/content.mk
+++ b/repos/os/recipes/src/sandbox/content.mk
@@ -6,8 +6,3 @@ content: $(MIRROR_FROM_REP_DIR)
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
-
-content: src/lib/sandbox/target.mk
-
-src/lib/sandbox/target.mk:
-	echo "LIBS += sandbox" > $@
diff --git a/repos/os/run/test.run b/repos/os/run/test.run
index f9599e9132..98e649575e 100644
--- a/repos/os/run/test.run
+++ b/repos/os/run/test.run
@@ -229,7 +229,7 @@ foreach rom [content_rom_modules] {
 
 	# handle vfs plugin shared-object targets
 	if {[regexp "^vfs_(.+).lib.so$" $rom dummy plugin]} {
-		lappend build_targets lib/vfs/$plugin
+		lappend build_targets lib/vfs_$plugin
 		continue
 	}
 
diff --git a/repos/os/run/vfs_block.run b/repos/os/run/vfs_block.run
index e54e061e10..55243f5a64 100644
--- a/repos/os/run/vfs_block.run
+++ b/repos/os/run/vfs_block.run
@@ -6,7 +6,7 @@ set build_components {
 	server/vfs
 	server/vfs_block
 	app/block_tester
-	lib/vfs/import
+	lib/vfs_import
 }
 
 source ${genode_dir}/repos/base/run/platform_drv.inc
diff --git a/repos/os/src/lib/vfs/capture/target.mk b/repos/os/src/lib/vfs/capture/target.mk
deleted file mode 100644
index 31e9307f89..0000000000
--- a/repos/os/src/lib/vfs/capture/target.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET = dummy-vfs_capture
-LIBS   = vfs_capture
-
-BUILD_ARTIFACTS :=
diff --git a/repos/os/src/lib/vfs/tap/target.mk b/repos/os/src/lib/vfs/tap/target.mk
deleted file mode 100644
index 46dfa30eca..0000000000
--- a/repos/os/src/lib/vfs/tap/target.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET = dummy-vfs_tap
-LIBS = vfs_tap
-
-BUILD_ARTIFACTS :=
diff --git a/repos/pc/run/intel_fb.run b/repos/pc/run/intel_fb.run
index 9fee27180e..bcae18868a 100644
--- a/repos/pc/run/intel_fb.run
+++ b/repos/pc/run/intel_fb.run
@@ -24,7 +24,7 @@ set build_components {
 	server/report_rom
 	server/vfs
 	server/fs_rom
-	lib/vfs/import
+	lib/vfs_import
 }
 
 
diff --git a/repos/pc/run/wifi.run b/repos/pc/run/wifi.run
index 2955fce6cf..2e87c25e43 100644
--- a/repos/pc/run/wifi.run
+++ b/repos/pc/run/wifi.run
@@ -71,9 +71,9 @@ set build_components {
 	server/dynamic_rom
 	server/nic_router
 	test/lwip/http_srv
-	lib/vfs/wifi
-	lib/vfs/jitterentropy
-	lib/vfs/lwip
+	lib/vfs_wifi
+	lib/vfs_jitterentropy
+	lib/vfs_lwip
 }
 
 source ${genode_dir}/repos/base/run/platform_drv.inc
diff --git a/repos/pc/src/lib/vfs/wifi/target.mk b/repos/pc/src/lib/vfs/wifi/target.mk
deleted file mode 100644
index b469808922..0000000000
--- a/repos/pc/src/lib/vfs/wifi/target.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-LIBS := vfs_wifi
-
-BUILD_ARTIFACTS :=
diff --git a/repos/ports/run/gdb_monitor.run b/repos/ports/run/gdb_monitor.run
index 28686f7b33..f09bffcb5c 100644
--- a/repos/ports/run/gdb_monitor.run
+++ b/repos/ports/run/gdb_monitor.run
@@ -23,7 +23,7 @@ set build_components {
 	drivers/uart
 	app/gdb_monitor
 	test/gdb_monitor
-	lib/vfs/pipe
+	lib/vfs_pipe
 }
 
 lappend build_components "lib/gdbserver_platform-$::env(KERNEL)"
diff --git a/repos/ports/run/gdb_monitor_interactive.run b/repos/ports/run/gdb_monitor_interactive.run
index 8b608b80ad..bc1c2f624d 100644
--- a/repos/ports/run/gdb_monitor_interactive.run
+++ b/repos/ports/run/gdb_monitor_interactive.run
@@ -19,7 +19,7 @@ set build_components {
 	drivers/uart
 	app/gdb_monitor
 	test/gdb_monitor
-	lib/vfs/pipe
+	lib/vfs_pipe
 }
 
 lappend build_components "lib/gdbserver_platform-$::env(KERNEL)"
diff --git a/repos/ports/run/gdb_monitor_target_config.run b/repos/ports/run/gdb_monitor_target_config.run
index 2bff522aac..4040dc609d 100644
--- a/repos/ports/run/gdb_monitor_target_config.run
+++ b/repos/ports/run/gdb_monitor_target_config.run
@@ -18,7 +18,7 @@ set build_components {
 	drivers/uart
 	app/gdb_monitor
 	test/gdb_monitor_target_config
-	lib/vfs/pipe
+	lib/vfs_pipe
 }
 
 lappend build_components "lib/gdbserver_platform-$::env(KERNEL)"
diff --git a/repos/ports/run/tool_chain_auto.run b/repos/ports/run/tool_chain_auto.run
index 2e9df0dabb..8d350d9985 100644
--- a/repos/ports/run/tool_chain_auto.run
+++ b/repos/ports/run/tool_chain_auto.run
@@ -78,7 +78,7 @@ set pkgs "$binutils $gcc"
 foreach pkg $pkgs {
 	lappend_if [expr ![file exists bin/$pkg]] build_components noux-pkg/$pkg }
 
-lappend build_components "lib/vfs/pipe"
+lappend build_components "lib/vfs_pipe"
 lappend build_components "server/vfs"
 
 build $build_components
diff --git a/repos/ports/run/vbox5_genode_usb_hid_raw.run b/repos/ports/run/vbox5_genode_usb_hid_raw.run
index ee50ff7c80..a7ffb3b3de 100644
--- a/repos/ports/run/vbox5_genode_usb_hid_raw.run
+++ b/repos/ports/run/vbox5_genode_usb_hid_raw.run
@@ -19,7 +19,7 @@ set build_components {
 	drivers/usb_host
 	server/log_terminal
 	server/fs_rom
-	server/vfs lib/vfs/import
+	server/vfs lib/vfs_import
 	server/report_rom
 	app/usb_report_filter
 	virtualbox5
diff --git a/repos/ports/run/vbox_share.inc b/repos/ports/run/vbox_share.inc
index 6fd75276bf..cc8e536207 100644
--- a/repos/ports/run/vbox_share.inc
+++ b/repos/ports/run/vbox_share.inc
@@ -104,7 +104,7 @@ set build_components {
 	server/event_filter
 	server/report_rom server/fs_rom server/vfs
 	server/tcp_terminal drivers/nic
-	lib/vfs/lwip lib/vfs/pipe lib/vfs/import
+	lib/vfs_lwip lib/vfs_pipe lib/vfs_import
 	server/nic_router
 }
 
diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc
index 6e50e9da21..ea0884506b 100644
--- a/repos/ports/run/virtualbox_auto.inc
+++ b/repos/ports/run/virtualbox_auto.inc
@@ -57,7 +57,7 @@ lappend_if [expr $use_vbox5]  build_components virtualbox5
 lappend_if [expr $use_ps2]    build_components drivers/ps2
 lappend_if [expr $use_usb]    build_components app/usb_report_filter
 lappend_if [have_spec x86]    build_components drivers/rtc
-lappend_if [expr $use_ram_fs || $use_usb] build_components lib/vfs/import
+lappend_if [expr $use_ram_fs || $use_usb] build_components lib/vfs_import
 lappend_if [expr $use_cpu_load] build_components app/trace_subject_reporter
 lappend_if [expr $use_cpu_load] build_components app/cpu_load_display
 lappend_if [expr $use_cpu_load] build_components app/top
diff --git a/repos/ports/src/lib/gdbserver_platform-nova/target.mk b/repos/ports/src/lib/gdbserver_platform-nova/target.mk
deleted file mode 100644
index 383999edd5..0000000000
--- a/repos/ports/src/lib/gdbserver_platform-nova/target.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET = gdbserver_platform-nova
-LIBS   = gdbserver_platform-nova
-
-CC_CXX_WARN_STRICT =
diff --git a/tool/run/boot_dir/fiasco b/tool/run/boot_dir/fiasco
index 8fddda0e61..e3f29af063 100644
--- a/tool/run/boot_dir/fiasco
+++ b/tool/run/boot_dir/fiasco
@@ -21,7 +21,7 @@ proc run_boot_dir {binaries} {
 	set kernel_arg ""
 	set ld_arg     ""
 	if {![file exists [run_dir]/genode/fiasco]}    { set kernel_arg "kernel/fiasco" }
-	if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg     "lib/ld/fiasco" }
+	if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg     "lib/ld-fiasco" }
 	set targets "$kernel_arg $ld_arg"
 
 	if {[llength $targets]} { build $targets }
diff --git a/tool/run/boot_dir/foc b/tool/run/boot_dir/foc
index e529c4aad6..e8a7673b59 100644
--- a/tool/run/boot_dir/foc
+++ b/tool/run/boot_dir/foc
@@ -65,7 +65,7 @@ proc run_boot_dir_x86 {binaries} {
 	set kernel_arg ""
 	set ld_arg     ""
 	if {![file exists [run_dir]/genode/foc]}       { set kernel_arg "kernel/foc" }
-	if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg     "lib/ld/foc" }
+	if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg     "lib/ld-foc" }
 	set targets "$kernel_arg $ld_arg"
 
 	if {[llength $targets]} { build $targets }
@@ -157,7 +157,7 @@ proc run_boot_dir_arm { binaries } {
 
 	global run_target
 
-	build { lib/ld/foc kernel/foc }
+	build { lib/ld-foc kernel/foc }
 
 	build_core_image $binaries
 
diff --git a/tool/run/boot_dir/linux b/tool/run/boot_dir/linux
index d79fd23c54..6d29be5c45 100644
--- a/tool/run/boot_dir/linux
+++ b/tool/run/boot_dir/linux
@@ -10,11 +10,18 @@ proc run_boot_dir {binaries} {
 
 	set missing_boot_modules { }
 	foreach binary $binaries {
+
 		set src_binary_path "[pwd]/bin/[kernel_specific_binary $binary]"
+
+		set dst_binary "[kernel_specific_binary $binary]"
+		if {$dst_binary == "core-linux"}      { set dst_binary "core" }
+		if {$dst_binary == "ld-linux.lib.so"} { set dst_binary "ld.lib.so" }
+		if {$dst_binary == "linux_timer_drv"} { set dst_binary "timer" }
+
 		if {[file exists $src_binary_path]} {
-			exec ln -sf $src_binary_path [run_dir]/genode/$binary
+			exec ln -sf $src_binary_path [run_dir]/genode/$dst_binary
 		} else {
-			lappend missing_boot_modules [kernel_specific_binary $binary]
+			lappend missing_boot_modules $binary
 		}
 	}
 	if {[llength $missing_boot_modules]} {
diff --git a/tool/run/boot_dir/nova b/tool/run/boot_dir/nova
index 06d05ce1be..5c95b1ed25 100644
--- a/tool/run/boot_dir/nova
+++ b/tool/run/boot_dir/nova
@@ -37,7 +37,7 @@ proc run_boot_dir {binaries} {
 	set ld_arg     ""
 	if {![file exists [run_dir]/genode/hypervisor]}  { set kernel_arg kernel }
 	if {![file exists [run_dir]/genode/core-nova.a]} { set core_arg   core/nova }
-	if {![file exists [run_dir]/genode/ld.lib.so]}   { set ld_arg     lib/ld/nova }
+	if {![file exists [run_dir]/genode/ld.lib.so]}   { set ld_arg     lib/ld-nova }
 
 	set targets "$kernel_arg $core_arg $ld_arg"
 	if {[llength $targets]} { build $targets }
diff --git a/tool/run/boot_dir/pistachio b/tool/run/boot_dir/pistachio
index db2d2afc80..f6f5004c5b 100644
--- a/tool/run/boot_dir/pistachio
+++ b/tool/run/boot_dir/pistachio
@@ -20,7 +20,7 @@ proc run_boot_dir {binaries} {
 	set kernel_arg ""
 	set ld_arg     ""
 	if {![file exists [run_dir]/genode/pistachio]} { set kernel_arg "kernel/pistachio" }
-	if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg     "lib/ld/pistachio" }
+	if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg     "lib/ld-pistachio" }
 	set targets "$kernel_arg $ld_arg"
 
 	if {[llength $targets]} { build $targets }
diff --git a/tool/run/boot_dir/sel4 b/tool/run/boot_dir/sel4
index 75a077630e..2787eeb701 100644
--- a/tool/run/boot_dir/sel4
+++ b/tool/run/boot_dir/sel4
@@ -33,7 +33,7 @@ proc run_boot_dir {binaries} {
 	set kernel_arg ""
 	set ld_arg     ""
 	if {![file exists [run_dir]/genode/sel4]}      { set kernel_arg "kernel/sel4" }
-	if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg     "lib/ld/sel4" }
+	if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg     "lib/ld-sel4" }
 	set targets "$kernel_arg $ld_arg"
 
 	if {[llength $targets]} { build $targets }