@@ -26,12 +26,14 @@
 # include <fcntl.h>
 #endif
 
 #import "OFDatagramSocket.h"
 #import "OFData.h"
-#import "OFRunLoop+Private.h"
 #import "OFRunLoop.h"
+#import "OFRunLoop+Private.h"
+#import "OFSocket.h"
+#import "OFSocket+Private.h"
 
 #import "OFGetOptionFailedException.h"
 #import "OFInitializationFailedException.h"
 #import "OFNotOpenException.h"
 #import "OFOutOfRangeException.h"
@@ -38,13 +40,10 @@
 #import "OFReadFailedException.h"
 #import "OFSetOptionFailedException.h"
 #import "OFSetOptionFailedException.h"
 #import "OFWriteFailedException.h"
 
-#import "socket.h"
-#import "socket_helpers.h"
-
 @implementation OFDatagramSocket
 @synthesize delegate = _delegate;
 
 + (void)initialize
 {