@@ -26,16 +26,16 @@
 #import "OFEnumerator.h"
 
 #import "OFNumber.h"
 
 #import "OFStream.h"
+#import "OFStreamObserver.h"
 
 #import "OFFile.h"
 
-#import "OFSocket.h"
+#import "OFStreamSocket.h"
 #import "OFTCPSocket.h"
-#import "OFSocketObserver.h"
 
 #import "OFHash.h"
 #import "OFMD5Hash.h"
 #import "OFSHA1Hash.h"