@@ -27,16 +27,11 @@
 
 #include <sys/epoll.h>
 
 #import "OFEpollKernelEventObserver.h"
 #import "OFArray.h"
-#import "OFKernelEventObserver+Private.h"
-#import "OFKernelEventObserver.h"
 #import "OFMapTable.h"
-#ifdef OF_HAVE_THREADS
-# import "OFMutex.h"
-#endif
 #import "OFNull.h"
 
 #import "OFInitializationFailedException.h"
 #import "OFObserveFailedException.h"
 
@@ -156,32 +151,32 @@
 		[_FDToEvents setObject: (void *)events
 				forKey: (void *)((intptr_t)fd + 1)];
 	}
 }
 
-- (void)of_addObjectForReading: (id <OFReadyForReadingObserving>)object
+- (void)addObjectForReading: (id <OFReadyForReadingObserving>)object
 {
 	[self of_addObject: object
 	    fileDescriptor: object.fileDescriptorForReading
 		    events: EPOLLIN];
 }
 
-- (void)of_addObjectForWriting: (id <OFReadyForWritingObserving>)object
+- (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
 {
 	[self of_addObject: object
 	    fileDescriptor: object.fileDescriptorForWriting
 		    events: EPOLLOUT];
 }
 
-- (void)of_removeObjectForReading: (id <OFReadyForReadingObserving>)object
+- (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
 {
 	[self of_removeObject: object
 	       fileDescriptor: object.fileDescriptorForReading
 		       events: EPOLLIN];
 }
 
-- (void)of_removeObjectForWriting: (id <OFReadyForWritingObserving>)object
+- (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)object
 {
 	[self of_removeObject: object
 	       fileDescriptor: object.fileDescriptorForWriting
 		       events: EPOLLOUT];
 }
@@ -190,12 +185,10 @@
 {
 	OFNull *nullObject = [OFNull null];
 	struct epoll_event eventList[EVENTLIST_SIZE];
 	int events;
 
-	[self of_processQueue];
-
 	if ([self of_processReadBuffers])
 		return;
 
 	events = epoll_wait(_epfd, eventList, EVENTLIST_SIZE,
 	    (timeInterval != -1 ? timeInterval * 1000 : -1));