@@ -35,10 +35,12 @@
 #import "OFData.h"
 #import "OFDate.h"
 #import "OFIPSocketAsyncConnector.h"
 #import "OFRunLoop.h"
 #import "OFRunLoop+Private.h"
+#import "OFSocket.h"
+#import "OFSocket+Private.h"
 #import "OFString.h"
 #import "OFTCPSocketSOCKS5Connector.h"
 #import "OFThread.h"
 
 #import "OFAlreadyConnectedException.h"
@@ -46,13 +48,10 @@
 #import "OFGetOptionFailedException.h"
 #import "OFNotImplementedException.h"
 #import "OFNotOpenException.h"
 #import "OFSetOptionFailedException.h"
 
-#import "socket.h"
-#import "socket_helpers.h"
-
 static const OFRunLoopMode connectRunLoopMode =
     @"OFTCPSocketConnectRunLoopMode";
 
 Class of_tls_socket_class = Nil;