@@ -30,26 +30,25 @@
 #import "OFCharacterSet.h"
 #import "OFLocale.h"
 #ifdef OF_HAVE_THREADS
 # import "OFMutex.h"
 #endif
+#import "OFOnce.h"
+#import "OFSocket.h"
+#import "OFSocket+Private.h"
 #import "OFString.h"
+#ifdef OF_HAVE_THREADS
+# import "OFTLSKey.h"
+#endif
 
 #import "OFException.h"  /* For some E* -> WSAE* defines */
 #import "OFInitializationFailedException.h"
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
 #import "OFLockFailedException.h"
 #import "OFUnlockFailedException.h"
 
-#import "socket.h"
-#import "socket_helpers.h"
-#ifdef OF_HAVE_THREADS
-# import "tlskey.h"
-#endif
-#import "once.h"
-
 #ifdef OF_AMIGAOS
 # include <proto/exec.h>
 #endif
 
 #ifdef OF_NINTENDO_3DS