@@ -28,18 +28,17 @@
 
 #import "OFUDPSocket.h"
 #import "OFUDPSocket+Private.h"
 #import "OFDNSResolver.h"
 #import "OFData.h"
+#import "OFSocket.h"
+#import "OFSocket+Private.h"
 #import "OFThread.h"
 
 #import "OFAlreadyConnectedException.h"
 #import "OFBindFailedException.h"
 
-#import "socket.h"
-#import "socket_helpers.h"
-
 @implementation OFUDPSocket
 @dynamic delegate;
 
 - (uint16_t)of_bindToAddress: (OFSocketAddress *)address
 		   extraType: (int)extraType OF_DIRECT