@@ -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}			\