@@ -114,15 +114,13 @@
 SRCS_FILES = OFFile.m			\
 	     OFFileManager.m		\
 	     OFINICategory.m		\
 	     OFINIFile.m		\
 	     OFSettings.m
-SRCS_FILES_NOINCLUDE = OFURLHandler_file.m
 SRCS_PLUGINS = OFPlugin.m
 SRCS_SOCKETS = OFHTTPClient.m			\
 	       OFHTTPServer.m			\
-	       OFKernelEventObserver.m		\
 	       OFStreamSocket.m			\
 	       OFTCPSocket.m			\
 	       OFUDPSocket.m			\
 	       resolver.m			\
 	       socket.m
@@ -141,10 +139,11 @@
 		  atomic_x86.h
 INCLUDES := ${SRCS:.m=.h}			\
 	    OFCollection.h			\
 	    OFCryptoHash.h			\
 	    OFJSONRepresentation.h		\
+	    OFKernelEventObserver.h		\
 	    OFKeyValueCoding.h			\
 	    OFLocking.h				\
 	    OFMessagePackRepresentation.h	\
 	    OFSerialization.h			\
 	    OFTLSSocket.h			\
@@ -171,14 +170,15 @@
 	OFMutableString_UTF8.m		\
 	OFSet_hashtable.m		\
 	OFString_UTF8.m			\
 	${AUTORELEASE_M}		\
 	${FOUNDATION_COMPAT_M}		\
-	${INSTANCE_M}			\
-	${USE_SRCS_FILES_NOINCLUDE}
-SRCS_FILES += OFSettings_INIFile.m
-SRCS_SOCKETS += ${OFKERNELEVENTOBSERVER_EPOLL_M}	\
+	${INSTANCE_M}
+SRCS_FILES += OFSettings_INIFile.m	\
+	      OFURLHandler_file.m
+SRCS_SOCKETS += OFKernelEventObserver.m			\
+		${OFKERNELEVENTOBSERVER_EPOLL_M}	\
 		${OFKERNELEVENTOBSERVER_KQUEUE_M}	\
 		${OFKERNELEVENTOBSERVER_POLL_M}		\
 		${OFKERNELEVENTOBSERVER_SELECT_M}	\
 		OFTCPSocket+SOCKS5.m