Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -417,11 +417,11 @@
 AS_IF([test x"$build_framework" = x"yes"], [
 	TESTS_LIBS="-framework ObjFW \${RUNTIME_FRAMEWORK_LIBS} $TESTS_LIBS"
 	TESTS_LIBS="-F../src -F../src/runtime $TESTS_LIBS"
 ], [
 	TESTS_LIBS="\${RUNTIME_LIBS} $TESTS_LIBS"
-	TESTS_LIBS="-L../src/runtime -L../src/runtime/linklib $TESTS_LIBS"
+	TESTS_LIBS="-L../src/runtime $TESTS_LIBS"
 	TESTS_LIBS="-L../src -lobjfw $TESTS_LIBS"
 ])
 
 AC_ARG_ENABLE(static, AS_HELP_STRING([--enable-static], [build static library]))
 AS_IF([test x"$enable_shared" = x"no"], [

Index: tests/objc_sync/Makefile
==================================================================
--- tests/objc_sync/Makefile
+++ tests/objc_sync/Makefile
@@ -59,9 +59,7 @@
 	rm -f objfwrt${OBJFWRT_LIB_MAJOR}.dll; \
 	rm -f libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib; \
 	exit $$EXIT
 
 CPPFLAGS += -I../../src -I../../src/runtime -I../..
-LIBS := -L../../src -lobjfw						\
-	-L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS}	\
-	${LIBS}
+LIBS := -L../../src -lobjfw -L../../src/runtime ${RUNTIME_LIBS} ${LIBS}
 LD = ${OBJC}

Index: tests/terminal/Makefile
==================================================================
--- tests/terminal/Makefile
+++ tests/terminal/Makefile
@@ -59,9 +59,7 @@
 	rm -f objfwrt${OBJFWRT_LIB_MAJOR}.dll; \
 	rm -f libobjfwrt.${OBJFWRT_LIB_MAJOR}.dylib; \
 	exit $$EXIT
 
 CPPFLAGS += -I../../src -I../../src/exceptions -I../../src/runtime -I../..
-LIBS := -L../../src -lobjfw						\
-	-L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS}	\
-	${LIBS}
+LIBS := -L../../src -lobjfw -L../../src/runtime ${RUNTIME_LIBS} ${LIBS}
 LD = ${OBJC}

Index: utils/objfw-new/Makefile
==================================================================
--- utils/objfw-new/Makefile
+++ utils/objfw-new/Makefile
@@ -12,10 +12,8 @@
 
 CPPFLAGS += -I../../src					\
 	    -I../../src/runtime				\
 	    -I../../src/exceptions			\
 	    -I../..
-LIBS := -L../../src -lobjfw						\
-	-L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS}	\
-	${LIBS}
+LIBS := -L../../src -lobjfw -L../../src/runtime ${RUNTIME_LIBS} ${LIBS}
 LD = ${OBJC}
 LDFLAGS += ${LDFLAGS_RPATH}

Index: utils/ofarc/Makefile
==================================================================
--- utils/ofarc/Makefile
+++ utils/ofarc/Makefile
@@ -18,10 +18,8 @@
 CPPFLAGS += -I../../src							\
 	    -I../../src/runtime						\
 	    -I../../src/exceptions					\
 	    -I../..							\
 	    -DLOCALIZATION_DIR=\"${datadir}/ofarc/localization\"
-LIBS := -L../../src -lobjfw						\
-	-L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS}	\
-	${LIBS}
+LIBS := -L../../src -lobjfw -L../../src/runtime ${RUNTIME_LIBS} ${LIBS}
 LD = ${OBJC}
 LDFLAGS += ${LDFLAGS_RPATH}

Index: utils/ofdns/Makefile
==================================================================
--- utils/ofdns/Makefile
+++ utils/ofdns/Makefile
@@ -14,10 +14,8 @@
 CPPFLAGS += -I../../src							\
 	    -I../../src/runtime						\
 	    -I../../src/exceptions					\
 	    -I../..							\
 	    -DLOCALIZATION_DIR=\"${datadir}/ofdns/localization\"
-LIBS := -L../../src -lobjfw						\
-	-L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS}	\
-	${LIBS}
+LIBS := -L../../src -lobjfw -L../../src/runtime ${RUNTIME_LIBS} ${LIBS}
 LD = ${OBJC}
 LDFLAGS += ${LDFLAGS_RPATH}

Index: utils/ofhash/Makefile
==================================================================
--- utils/ofhash/Makefile
+++ utils/ofhash/Makefile
@@ -14,10 +14,8 @@
 CPPFLAGS += -I../../src							\
 	    -I../../src/runtime						\
 	    -I../../src/exceptions					\
 	    -I../..							\
 	    -DLOCALIZATION_DIR=\"${datadir}/ofhash/localization\"
-LIBS := -L../../src -lobjfw						\
-	-L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS}	\
-	${LIBS}
+LIBS := -L../../src -lobjfw -L../../src/runtime ${RUNTIME_LIBS} ${LIBS}
 LD = ${OBJC}
 LDFLAGS += ${LDFLAGS_RPATH}

Index: utils/ofhttp/Makefile
==================================================================
--- utils/ofhttp/Makefile
+++ utils/ofhttp/Makefile
@@ -17,9 +17,9 @@
 	    -I../../src/exceptions					\
 	    -I../../src/tls						\
 	    -I../..							\
 	    -DLOCALIZATION_DIR='"${datadir}/ofhttp/localization"'
 LIBS := -L../../src -L../../src/tls ${OFHTTP_LIBS} -lobjfw		\
-	-L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS}	\
+	-L../../src/runtime ${RUNTIME_LIBS}				\
 	${LIBS}
 LD = ${OBJC}
 LDFLAGS += ${LDFLAGS_RPATH}