@@ -20,17 +20,16 @@
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
 #endif
 
 #import "OFIPXSocket.h"
+#import "OFSocket.h"
+#import "OFSocket+Private.h"
 
 #import "OFAlreadyConnectedException.h"
 #import "OFBindFailedException.h"
 
-#import "socket.h"
-#import "socket_helpers.h"
-
 @implementation OFIPXSocket
 @dynamic delegate;
 
 - (OFSocketAddress)bindToPort: (uint16_t)port packetType: (uint8_t)packetType
 {