@@ -29,15 +29,10 @@
 #include <sys/event.h>
 #include <sys/time.h>
 
 #import "OFKqueueKernelEventObserver.h"
 #import "OFArray.h"
-#import "OFKernelEventObserver.h"
-#import "OFKernelEventObserver+Private.h"
-#ifdef OF_HAVE_THREADS
-# import "OFMutex.h"
-#endif
 
 #import "OFInitializationFailedException.h"
 #import "OFObserveFailedException.h"
 #import "OFOutOfRangeException.h"
 
@@ -84,11 +79,11 @@
 	close(_kernelQueue);
 
 	[super dealloc];
 }
 
-- (void)of_addObjectForReading: (id <OFReadyForReadingObserving>)object
+- (void)addObjectForReading: (id <OFReadyForReadingObserving>)object
 {
 	struct kevent event;
 
 	memset(&event, 0, sizeof(event));
 	event.ident = object.fileDescriptorForReading;
@@ -103,11 +98,11 @@
 	if (kevent(_kernelQueue, &event, 1, NULL, 0, NULL) != 0)
 		@throw [OFObserveFailedException exceptionWithObserver: self
 								 errNo: errno];
 }
 
-- (void)of_addObjectForWriting: (id <OFReadyForWritingObserving>)object
+- (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
 {
 	struct kevent event;
 
 	memset(&event, 0, sizeof(event));
 	event.ident = object.fileDescriptorForWriting;
@@ -122,11 +117,11 @@
 	if (kevent(_kernelQueue, &event, 1, NULL, 0, NULL) != 0)
 		@throw [OFObserveFailedException exceptionWithObserver: self
 								 errNo: errno];
 }
 
-- (void)of_removeObjectForReading: (id <OFReadyForReadingObserving>)object
+- (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
 {
 	struct kevent event;
 
 	memset(&event, 0, sizeof(event));
 	event.ident = object.fileDescriptorForReading;
@@ -136,11 +131,11 @@
 	if (kevent(_kernelQueue, &event, 1, NULL, 0, NULL) != 0)
 		@throw [OFObserveFailedException exceptionWithObserver: self
 								 errNo: errno];
 }
 
-- (void)of_removeObjectForWriting: (id <OFReadyForWritingObserving>)object
+- (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)object
 {
 	struct kevent event;
 
 	memset(&event, 0, sizeof(event));
 	event.ident = object.fileDescriptorForWriting;
@@ -156,12 +151,10 @@
 {
 	struct timespec timeout;
 	struct kevent eventList[EVENTLIST_SIZE];
 	int events;
 
-	[self of_processQueue];
-
 	if ([self of_processReadBuffers])
 		return;
 
 	timeout.tv_sec = (time_t)timeInterval;
 	timeout.tv_nsec = (timeInterval - timeout.tv_sec) * 1000000000;