@@ -31,12 +31,10 @@
 
 #include <sys/time.h>
 
 #import "OFSelectKernelEventObserver.h"
 #import "OFArray.h"
-#import "OFKernelEventObserver+Private.h"
-#import "OFKernelEventObserver.h"
 
 #import "OFInitializationFailedException.h"
 #import "OFObserveFailedException.h"
 #import "OFOutOfRangeException.h"
 
@@ -71,11 +69,11 @@
 #endif
 
 	return self;
 }
 
-- (void)of_addObjectForReading: (id <OFReadyForReadingObserving>)object
+- (void)addObjectForReading: (id <OFReadyForReadingObserving>)object
 {
 	int fd = object.fileDescriptorForReading;
 
 	if (fd < 0 || fd > INT_MAX - 1)
 		@throw [OFOutOfRangeException exception];
@@ -89,11 +87,11 @@
 		_maxFD = fd;
 
 	FD_SET((of_socket_t)fd, &_readFDs);
 }
 
-- (void)of_addObjectForWriting: (id <OFReadyForWritingObserving>)object
+- (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
 {
 	int fd = object.fileDescriptorForWriting;
 
 	if (fd < 0 || fd > INT_MAX - 1)
 		@throw [OFOutOfRangeException exception];
@@ -107,11 +105,11 @@
 		_maxFD = fd;
 
 	FD_SET((of_socket_t)fd, &_writeFDs);
 }
 
-- (void)of_removeObjectForReading: (id <OFReadyForReadingObserving>)object
+- (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
 {
 	/* TODO: Adjust _maxFD */
 
 	int fd = object.fileDescriptorForReading;
 
@@ -124,11 +122,11 @@
 #endif
 
 	FD_CLR((of_socket_t)fd, &_readFDs);
 }
 
-- (void)of_removeObjectForWriting: (id <OFReadyForWritingObserving>)object
+- (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)object
 {
 	/* TODO: Adjust _maxFD */
 
 	int fd = object.fileDescriptorForWriting;
 
@@ -153,12 +151,10 @@
 #ifdef OF_AMIGAOS
 	ULONG execSignalMask, cancelSignal;
 #endif
 	size_t count;
 
-	[self of_processQueue];
-
 	if ([self of_processReadBuffers])
 		return;
 
 #ifdef FD_COPY
 	FD_COPY(&_readFDs, &readFDs);