Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -1450,65 +1450,65 @@
 			#ifdef AF_IPX
 			egrep_cpp_yes
 			#endif
 		], [
 			AC_DEFINE(OF_HAVE_IPX, 1, [Whether we have IPX/SPX])
-			AC_SUBST(OFIPXSOCKET_M, OFIPXSocket.m)
-			AC_SUBST(OFIPXSOCKETTESTS_M, OFIPXSocketTests.m)
-			AC_SUBST(OFSPXSOCKET_M, OFSPXSocket.m)
-			AC_SUBST(OFSPXSOCKETTESTS_M, OFSPXSocketTests.m)
+			AC_SUBST(OF_IPX_SOCKET_M, OFIPXSocket.m)
+			AC_SUBST(OF_IPX_SOCKET_TESTS_M, OFIPXSocketTests.m)
+			AC_SUBST(OF_SPX_SOCKET_M, OFSPXSocket.m)
+			AC_SUBST(OF_SPX_SOCKET_TESTS_M, OFSPXSocketTests.m)
 		])
 	])
 
 	AC_CHECK_FUNCS(paccept accept4, break)
 
 	AC_CHECK_FUNCS(kqueue1 kqueue, [
 		AC_DEFINE(HAVE_KQUEUE, 1, [Whether we have kqueue])
-		AC_SUBST(OFKQUEUEKERNELEVENTOBSERVER_M,
+		AC_SUBST(OF_KQUEUE_KERNEL_EVENT_OBSERVER_M,
 			"OFKqueueKernelEventObserver.m")
 		break
 	])
 	AC_CHECK_FUNCS(epoll_create1 epoll_create, [
 		AC_DEFINE(HAVE_EPOLL, 1, [Whether we have epoll])
-		AC_SUBST(OFEPOLLKERNELEVENTOBSERVER_M,
+		AC_SUBST(OF_EPOLL_KERNEL_EVENT_OBSERVER_M,
 			"OFEpollKernelEventObserver.m")
 		break
 	])
 
 	AS_IF([test x"$with_wii" = x"yes"], [
 		AC_DEFINE(HAVE_POLL, 1, [Whether we have poll()])
-		AC_SUBST(OFPOLLKERNELEVENTOBSERVER_M,
+		AC_SUBST(OF_POLL_KERNEL_EVENT_OBSERVER_M,
 			"OFPollKernelEventObserver.m")
 	], [
 		AC_CHECK_HEADERS(poll.h)
 		AC_CHECK_FUNC(poll, [
 			AC_DEFINE(HAVE_POLL, 1, [Whether we have poll()])
-			AC_SUBST(OFPOLLKERNELEVENTOBSERVER_M,
+			AC_SUBST(OF_POLL_KERNEL_EVENT_OBSERVER_M,
 				"OFPollKernelEventObserver.m")
 		])
 	])
 
 	case "$host_os" in
 		amigaos* | mingw* | morphos*)
 			AC_DEFINE(HAVE_SELECT, 1,
 				[Whether we have select() or similar])
-			AC_SUBST(OFSELECTKERNELEVENTOBSERVER_M,
+			AC_SUBST(OF_SELECT_KERNEL_EVENT_OBSERVER_M,
 				"OFSelectKernelEventObserver.m")
 			;;
 		*)
 			AC_CHECK_HEADERS(sys/select.h)
 			AC_CHECK_FUNC(select, [
 				AC_DEFINE(HAVE_SELECT, 1,
 					[Whether we have select() or similar])
-				AC_SUBST(OFSELECTKERNELEVENTOBSERVER_M,
+				AC_SUBST(OF_SELECT_KERNEL_EVENT_OBSERVER_M,
 					"OFSelectKernelEventObserver.m")
 			])
 			;;
 	esac
 
 	AS_IF([test x"$enable_threads" != x"no"], [
-		AC_SUBST(OFHTTPCLIENTTESTS_M, "OFHTTPClientTests.m")
+		AC_SUBST(OF_HTTP_CLIENT_TESTS_M, "OFHTTPClientTests.m")
 	])
 
 	AC_SUBST(OFDNS, "ofdns")
 	AS_IF([test x"$enable_files" != x"no"], [
 		AC_SUBST(OFHTTP, "ofhttp")
@@ -1571,11 +1571,11 @@
 			])
 		])
 		;;
 esac
 AS_IF([test x"$have_processes" = x"yes"], [
-	AC_SUBST(OFPROCESS_M, "OFProcess.m")
+	AC_SUBST(OF_PROCESS_M, "OFProcess.m")
 	AC_DEFINE(OF_HAVE_PROCESSES, 1, [Whether we have processes])
 ])
 
 AC_CHECK_HEADERS_ONCE([complex.h sys/ioctl.h sys/ttycom.h])
 
@@ -1611,11 +1611,11 @@
 AC_TRY_COMPILE([], [
 	int (^foo)(int bar);
 	foo = ^ (int bar) { return 0; }
 ], [
 	OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS -Xclang -fblocks"
-	AC_SUBST(OFBLOCKTESTS_M, "OFBlockTests.m")
+	AC_SUBST(OF_BLOCK_TESTS_M, "OFBlockTests.m")
 	AC_MSG_RESULT(yes)
 ], [
 	AC_MSG_RESULT(no)
 	OBJCFLAGS="$old_OBJCFLAGS"
 ])

Index: extra.mk.in
==================================================================
--- extra.mk.in
+++ extra.mk.in
@@ -52,25 +52,24 @@
 LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LIB_A@
 LOOKUP_ASM_LOOKUP_ASM_A = @LOOKUP_ASM_LOOKUP_ASM_A@
 LOOKUP_ASM_LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LOOKUP_ASM_LIB_A@
 MAP_LDFLAGS = @MAP_LDFLAGS@
 OFARC = @OFARC@
-OFBLOCKTESTS_M = @OFBLOCKTESTS_M@
 OFDNS = @OFDNS@
-OFEPOLLKERNELEVENTOBSERVER_M = @OFEPOLLKERNELEVENTOBSERVER_M@
 OFHASH = @OFHASH@
 OFHTTP = @OFHTTP@
-OFHTTPCLIENTTESTS_M = @OFHTTPCLIENTTESTS_M@
-OFIPXSOCKETTESTS_M = @OFIPXSOCKETTESTS_M@
-OFIPXSOCKET_M = @OFIPXSOCKET_M@
-OFKQUEUEKERNELEVENTOBSERVER_M = @OFKQUEUEKERNELEVENTOBSERVER_M@
-OFPOLLKERNELEVENTOBSERVER_M = @OFPOLLKERNELEVENTOBSERVER_M@
-OFPROCESS_M = @OFPROCESS_M@
-OFSELECTKERNELEVENTOBSERVER_M = @OFSELECTKERNELEVENTOBSERVER_M@
-OFSPXSOCKETTESTS_M = @OFSPXSOCKETTESTS_M@
-OFSPXSOCKET_M = @OFSPXSOCKET_M@
-OFSTDIOSTREAM_WIN32CONSOLE_M = @OFSTDIOSTREAM_WIN32CONSOLE_M@
+OF_BLOCK_TESTS_M = @OF_BLOCK_TESTS_M@
+OF_EPOLL_KERNEL_EVENT_OBSERVER_M = @OF_EPOLL_KERNEL_EVENT_OBSERVER_M@
+OF_HTTP_CLIENT_TESTS_M = @OF_HTTP_CLIENT_TESTS_M@
+OF_IPX_SOCKET_M = @OF_IPX_SOCKET_M@
+OF_IPX_SOCKET_TESTS_M = @OF_IPX_SOCKET_TESTS_M@
+OF_KQUEUE_KERNEL_EVENT_OBSERVER_M = @OF_KQUEUE_KERNEL_EVENT_OBSERVER_M@
+OF_POLL_KERNEL_EVENT_OBSERVER_M = @OF_POLL_KERNEL_EVENT_OBSERVER_M@
+OF_PROCESS_M = @OF_PROCESS_M@
+OF_SELECT_KERNEL_EVENT_OBSERVER_M = @OF_SELECT_KERNEL_EVENT_OBSERVER_M@
+OF_SPX_SOCKET_M = @OF_SPX_SOCKET_M@
+OF_SPX_SOCKET_TESTS_M = @OF_SPX_SOCKET_TESTS_M@
 REEXPORT_RUNTIME = @REEXPORT_RUNTIME@
 REEXPORT_RUNTIME_FRAMEWORK = @REEXPORT_RUNTIME_FRAMEWORK@
 RUNTIME = @RUNTIME@
 RUNTIME_FRAMEWORK_LIBS = @RUNTIME_FRAMEWORK_LIBS@
 RUNTIME_LIBS = @RUNTIME_LIBS@

Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -65,11 +65,11 @@
        OFObject.m			\
        OFObject+KeyValueCoding.m	\
        OFObject+Serialization.m		\
        OFOptionsParser.m		\
        OFPair.m				\
-       ${OFPROCESS_M}			\
+       ${OF_PROCESS_M}			\
        OFRIPEMD160Hash.m		\
        OFRunLoop.m			\
        OFSandbox.m			\
        OFSecureData.m			\
        OFSeekableStream.m		\
@@ -143,12 +143,12 @@
 	       OFHTTPCookie.m			\
 	       OFHTTPCookieManager.m		\
 	       OFHTTPRequest.m			\
 	       OFHTTPResponse.m			\
 	       OFHTTPServer.m			\
-	       ${OFIPXSOCKET_M}			\
-	       ${OFSPXSOCKET_M}			\
+	       ${OF_IPX_SOCKET_M}		\
+	       ${OF_SPX_SOCKET_M}		\
 	       OFSequencedPacketSocket.m	\
 	       OFStreamSocket.m			\
 	       OFTCPSocket.m			\
 	       OFUDPSocket.m			\
 	       socket.m
@@ -215,14 +215,14 @@
 	      OFINIFileSettings.m
 SRCS_SOCKETS += OFDNSResolverSettings.m			\
 		OFHTTPURLHandler.m			\
 		OFHostAddressResolver.m			\
 		OFKernelEventObserver.m			\
-		${OFEPOLLKERNELEVENTOBSERVER_M}		\
-		${OFKQUEUEKERNELEVENTOBSERVER_M}	\
-		${OFPOLLKERNELEVENTOBSERVER_M}		\
-		${OFSELECTKERNELEVENTOBSERVER_M}
+		${OF_EPOLL_KERNEL_EVENT_OBSERVER_M}	\
+		${OF_KQUEUE_KERNEL_EVENT_OBSERVER_M}	\
+		${OF_POLL_KERNEL_EVENT_OBSERVER_M}	\
+		${OF_SELECT_KERNEL_EVENT_OBSERVER_M}
 
 OBJS_EXTRA = ${RUNTIME_RUNTIME_A}	\
 	     ${EXCEPTIONS_EXCEPTIONS_A} \
 	     ${ENCODINGS_ENCODINGS_A}	\
 	     ${FORWARDING_FORWARDING_A}	\

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -11,11 +11,11 @@
 STATIC_LIB_NOINST = ${TESTS_STATIC_LIB}
 SRCS = ForwardingTests.m		\
        OFASN1DERRepresentationTests.m	\
        OFASN1DERValueTests.m		\
        OFArrayTests.m			\
-       ${OFBLOCKTESTS_M}		\
+       ${OF_BLOCK_TESTS_M}		\
        OFCharacterSetTests.m		\
        OFDataTests.m			\
        OFDateTests.m			\
        OFDictionaryTests.m		\
        OFInvocationTests.m		\
@@ -54,16 +54,16 @@
 	     OFSHA256HashTests.m	\
 	     OFSHA384HashTests.m	\
 	     OFSHA512HashTests.m
 SRCS_PLUGINS = OFPluginTests.m
 SRCS_SOCKETS = OFDNSResolverTests.m		\
-	       ${OFHTTPCLIENTTESTS_M}		\
+	       ${OF_HTTP_CLIENT_TESTS_M}	\
 	       OFHTTPCookieTests.m		\
 	       OFHTTPCookieManagerTests.m	\
-	       ${OFIPXSOCKETTESTS_M}		\
+	       ${OF_IPX_SOCKET_TESTS_M}		\
 	       OFKernelEventObserverTests.m	\
-	       ${OFSPXSOCKETTESTS_M}		\
+	       ${OF_SPX_SOCKET_TESTS_M}		\
 	       OFTCPSocketTests.m		\
 	       OFUDPSocketTests.m		\
 	       SocketTests.m
 SRCS_THREADS = OFThreadTests.m
 SRCS_WINDOWS = OFWindowsRegistryKeyTests.m