Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -102,15 +102,13 @@
 	AC_SUBST(EXCEPTIONS_EXCEPTIONS_A, "exceptions/exceptions.a")
 ])
 
 AC_DEFINE_UNQUOTED(PLUGIN_SUFFIX, "$PLUGIN_SUFFIX", [Suffix for plugins])
 AS_IF([test x"$PLUGIN_SUFFIX" != x""], [
-	AC_SUBST(OFPLUGIN_M, "OFPlugin.m")
-	AC_SUBST(OFPLUGINTESTS_M, "OFPluginTests.m")
+	AC_SUBST(USE_SRCS_PLUGINS, '${SRCS_PLUGINS}')
 	AC_SUBST(TESTPLUGIN, "plugin")
 	AC_DEFINE(OF_PLUGINS, 1, [Whether we have plugin support])
-	AC_SUBST(OFPLUGINS_DEF, "-DOF_PLUGINS")
 ])
 
 objc_runtime="ObjFW runtime"
 AC_CHECK_HEADER(objc/objc.h)
 AC_MSG_CHECKING(which Objective C runtime to use)
@@ -455,21 +453,12 @@
 		])
 		;;
 	esac
 
 	AC_DEFINE(OF_THREADS, 1, [Whether we have threads])
-	AC_SUBST(THREADING_SOURCES, "	\
-		OFThread.m		\
-		OFThreadPool.m		\
-		OFTLSKey.m		\
-		OFMutex.m		\
-		OFRecursiveMutex.m	\
-		OFCondition.m		\
-	")
-	AC_SUBST(OFTHREADTESTS_M, "OFThreadTests.m")
-	AC_SUBST(OFHTTPCLIENTTESTS_M, "OFHTTPClientTests.m")
-	AC_SUBST(THREADING_H, "threading.h")
+	AC_SUBST(USE_SRCS_THREADS, '${SRCS_THREADS}')
+	AC_SUBST(USE_INCLUDES_THREADS, '${INCLUDES_THREADS}')
 
 	AC_MSG_CHECKING(whether __thread works)
 	AC_TRY_LINK([
 		/* It seems __thread is buggy with GCC 4.1 */
 		#if __GNUC__ == 4 && __GNUC_MINOR__ < 2

Index: extra.mk.in
==================================================================
--- extra.mk.in
+++ extra.mk.in
@@ -22,17 +22,13 @@
 INSTANCE_M = @INSTANCE_M@
 LOOKUP_S = @LOOKUP_S@
 OFBLOCKTESTS_M = @OFBLOCKTESTS_M@
 OBJC_PROPERTIES_M = @OBJC_PROPERTIES_M@
 OBJC_SYNC_M = @OBJC_SYNC_M@
-OFHTTPCLIENTTESTS_M = @OFHTTPCLIENTTESTS_M@
-OFPLUGIN_M = @OFPLUGIN_M@
-OFPLUGINTESTS_M = @OFPLUGINTESTS_M@
 OFSTREAMOBSERVER_KQUEUE_M = @OFSTREAMOBSERVER_KQUEUE_M@
 OFSTREAMOBSERVER_POLL_M = @OFSTREAMOBSERVER_POLL_M@
 OFSTREAMOBSERVER_SELECT_M = @OFSTREAMOBSERVER_SELECT_M@
-OFTHREADTESTS_M = @OFTHREADTESTS_M@
 PROPERTIESTESTS_M = @PROPERTIESTESTS_M@
 REEXPORT_LIBOBJC = @REEXPORT_LIBOBJC@
 RUNTIME = @RUNTIME@
 RUNTIME_A = @RUNTIME_A@
 RUNTIME_RUNTIME_A = @RUNTIME_RUNTIME_A@
@@ -39,7 +35,8 @@
 RUNTIME_RUNTIME_LIB_A = @RUNTIME_RUNTIME_LIB_A@
 RUNTIME_LIB_A = @RUNTIME_LIB_A@
 TESTPLUGIN = @TESTPLUGIN@
 TESTS = @TESTS@
 TEST_LAUNCHER = @TEST_LAUNCHER@
-THREADING_H = @THREADING_H@
-THREADING_SOURCES = @THREADING_SOURCES@
+USE_INCLUDES_THREADS = @USE_INCLUDES_THREADS@
+USE_SRCS_PLUGINS = @USE_SRCS_PLUGINS@
+USE_SRCS_THREADS = @USE_SRCS_THREADS@

Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -35,11 +35,10 @@
        OFMutableString.m		\
        OFNull.m				\
        OFNumber.m			\
        OFObject.m			\
        OFObject+Serialization.m		\
-       ${OFPLUGIN_M}			\
        OFProcess.m			\
        OFRunLoop.m			\
        OFSeekableStream.m		\
        OFSet.m				\
        OFSHA1Hash.m			\
@@ -66,16 +65,25 @@
        OFXMLElement+Serialization.m	\
        OFXMLElementBuilder.m		\
        OFXMLNode.m			\
        OFXMLParser.m			\
        OFXMLProcessingInstructions.m	\
-       ${THREADING_SOURCES}		\
        base64.m				\
        of_asprintf.m			\
        of_strptime.m			\
-       unicode.m
+       unicode.m			\
+       ${USE_SRCS_PLUGINS}		\
+       ${USE_SRCS_THREADS}
+SRCS_PLUGINS = OFPlugin.m
+SRCS_THREADS = OFCondition.m		\
+	       OFMutex.m		\
+	       OFRecursiveMutex.m	\
+	       OFThread.m		\
+	       OFThreadPool.m		\
+	       OFTLSKey.m
 
+INCLUDES_THREADS = threading.h
 INCLUDES := ${SRCS:.m=.h}		\
 	    OFCollection.h		\
 	    OFJSONRepresentation.h	\
 	    OFLocking.h			\
 	    OFSerialization.h		\
@@ -86,11 +94,11 @@
 	    ${ATOMIC_H}			\
 	    block.h			\
 	    instance.h			\
 	    macros.h			\
 	    objfw-defs.h		\
-	    ${THREADING_H}
+	    ${USE_INCLUDES_THREADS}
 
 SRCS += OFArray_adjacent.m		\
 	OFArray_adjacentSubarray.m	\
 	${AUTORELEASE_M}		\
 	${INSTANCE_M}			\

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -7,30 +7,32 @@
        OFArrayTests.m			\
        ${OFBLOCKTESTS_M}		\
        OFDataArrayTests.m		\
        OFDateTests.m			\
        OFDictionaryTests.m		\
-       ${OFHTTPCLIENTTESTS_M}		\
        OFJSONTests.m			\
        OFListTests.m			\
        OFMD5HashTests.m			\
        OFNumberTests.m			\
        OFObjectTests.m			\
-       ${OFPLUGINTESTS_M}		\
        OFSerializationTests.m		\
        OFSet.m				\
        OFSHA1HashTests.m		\
        OFStreamTests.m			\
        OFStringTests.m			\
        OFTCPSocketTests.m		\
-       ${OFTHREADTESTS_M}		\
        OFURLTests.m			\
        OFXMLElementBuilderTests.m	\
        OFXMLNodeTests.m			\
        OFXMLParserTests.m		\
        ${PROPERTIESTESTS_M}		\
-       TestsAppDelegate.m
+       TestsAppDelegate.m		\
+       ${USE_SRCS_PLUGINS}		\
+       ${USE_SRCS_THREADS}
+SRCS_PLUGINS = OFPluginTests.m
+SRCS_THREADS = OFThreadTests.m		\
+	       OFHTTPClientTests.m
 
 IOS_USER ?= mobile
 IOS_TMP ?= /tmp/objfw-test
 
 .PHONY: run run-tests run-on-ios