@@ -1,9 +1,9 @@
 include ../extra.mk
 
 SUBDIRS = ${RUNTIME} exceptions encodings forwarding
-SUBDIRS_AFTER = ${BRIDGE} ${TLS}
+SUBDIRS_AFTER = ${BRIDGE} ${TLS} test
 DISTCLEAN = Info.plist objfw-defs.h
 
 SHARED_LIB = ${OBJFW_SHARED_LIB}
 STATIC_LIB = ${OBJFW_STATIC_LIB}
 FRAMEWORK = ${OBJFW_FRAMEWORK}
@@ -96,11 +96,10 @@
        OFString+JSONParsing.m		\
        OFString+PercentEncoding.m	\
        OFString+PropertyListParsing.m	\
        OFString+XMLEscaping.m		\
        OFString+XMLUnescaping.m		\
-       ${OF_SUBPROCESS_M}		\
        OFSystemInfo.m			\
        OFTarArchive.m			\
        OFTarArchiveEntry.m		\
        OFThread.m			\
        OFTimer.m			\
@@ -119,42 +118,57 @@
        OFZIPArchive.m			\
        OFZIPArchiveEntry.m		\
        ${USE_SRCS_FILES}		\
        ${USE_SRCS_PLUGINS}		\
        ${USE_SRCS_SOCKETS}		\
+       ${USE_SRCS_SUBPROCESSES}		\
        ${USE_SRCS_THREADS}		\
        ${USE_SRCS_WINDOWS}
 SRCS_FILES = OFFile.m			\
 	     OFString+PathAdditions.m
 SRCS_PLUGINS = OFPlugin.m
-SRCS_SOCKETS = OFDNSQuery.m			\
+SRCS_SOCKETS = OFAAAADNSResourceRecord.m	\
+	       OFADNSResourceRecord.m		\
+	       OFCNAMEDNSResourceRecord.m	\
+	       OFDNSQuery.m			\
 	       OFDNSResolver.m			\
 	       OFDNSResourceRecord.m		\
 	       OFDNSResponse.m			\
 	       OFDatagramSocket.m		\
+	       OFHINFODNSResourceRecord.m	\
 	       OFHTTPClient.m			\
 	       OFHTTPCookie.m			\
 	       OFHTTPCookieManager.m		\
 	       OFHTTPRequest.m			\
 	       OFHTTPResponse.m			\
 	       OFHTTPServer.m			\
+	       OFLOCDNSResourceRecord.m		\
+	       OFMXDNSResourceRecord.m		\
+	       OFNSDNSResourceRecord.m		\
+	       OFPTRDNSResourceRecord.m		\
+	       OFRPDNSResourceRecord.m		\
+	       OFSOADNSResourceRecord.m		\
+	       OFSRVDNSResourceRecord.m		\
 	       OFSequencedPacketSocket.m	\
 	       OFSocket.m			\
 	       OFStreamSocket.m			\
 	       OFSystemInfo+NetworkInterfaces.m	\
 	       OFTCPSocket.m			\
 	       OFTLSStream.m			\
+	       OFTXTDNSResourceRecord.m		\
 	       OFUDPSocket.m			\
+	       OFURIDNSResourceRecord.m		\
 	       ${USE_SRCS_APPLETALK}		\
 	       ${USE_SRCS_IPX}			\
 	       ${USE_SRCS_UNIX_SOCKETS}
 SRCS_APPLETALK = OFDDPSocket.m
 SRCS_IPX = OFIPXSocket.m	\
 	   OFSPXSocket.m	\
 	   OFSPXStreamSocket.m
 SRCS_UNIX_SOCKETS = OFUNIXDatagramSocket.m	\
 		    OFUNIXStreamSocket.m
+SRCS_SUBPROCESSES = OFSubprocess.m
 SRCS_THREADS = OFCondition.m		\
 	       OFMutex.m		\
 	       OFPlainCondition.m	\
 	       OFPlainMutex.m		\
 	       OFPlainThread.m		\