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