@@ -42,11 +42,10 @@
 
 #import "OFNull.h"
 
 #import "OFMethodSignature.h"
 #import "OFInvocation.h"
-#import "OFIntrospection.h"
 
 #import "OFNumber.h"
 #import "OFDate.h"
 #import "OFURL.h"
 #import "OFURLHandler.h"
@@ -73,12 +72,14 @@
 # import "OFStreamSocket.h"
 # import "OFTCPSocket.h"
 # import "OFUDPSocket.h"
 # import "OFTLSSocket.h"
 # import "OFKernelEventObserver.h"
-# import "OFDNSResolver.h"
+# import "OFDNSQuery.h"
 # import "OFDNSResourceRecord.h"
+# import "OFDNSResponse.h"
+# import "OFDNSResolver.h"
 #endif
 #ifdef OF_HAVE_SOCKETS
 # ifdef OF_HAVE_THREADS
 #  import "OFHTTPClient.h"
 # endif
@@ -132,11 +133,10 @@
 #import "OFException.h"
 #ifdef OF_HAVE_SOCKETS
 # import "OFAcceptFailedException.h"
 # import "OFAlreadyConnectedException.h"
 # import "OFBindFailedException.h"
-# import "OFResolveHostFailedException.h"
 #endif
 #import "OFChangeCurrentDirectoryPathFailedException.h"
 #import "OFChecksumMismatchException.h"
 #ifdef OF_HAVE_THREADS
 # import "OFConditionBroadcastFailedException.h"
@@ -150,10 +150,15 @@
 #import "OFCopyItemFailedException.h"
 #import "OFCreateDirectoryFailedException.h"
 #import "OFCreateSymbolicLinkFailedException.h"
 #ifdef OF_WINDOWS
 # import "OFCreateWindowsRegistryKeyFailedException.h"
+#endif
+#ifdef OF_HAVE_SOCKETS
+# import "OFDNSQueryFailedException.h"
+#endif
+#ifdef OF_WINDOWS
 # import "OFDeleteWindowsRegistryKeyFailedException.h"
 # import "OFDeleteWindowsRegistryValueFailedException.h"
 #endif
 #import "OFEnumerationMutationException.h"
 #ifdef OF_HAVE_FILES
@@ -196,10 +201,13 @@
 #import "OFOutOfMemoryException.h"
 #import "OFOutOfRangeException.h"
 #import "OFReadFailedException.h"
 #import "OFReadOrWriteFailedException.h"
 #import "OFRemoveItemFailedException.h"
+#ifdef OF_HAVE_SOCKETS
+# import "OFResolveHostFailedException.h"
+#endif
 #import "OFRetrieveItemAttributesFailedException.h"
 #import "OFSandboxActivationFailedException.h"
 #import "OFSeekFailedException.h"
 #import "OFSetItemAttributesFailedException.h"
 #import "OFSetOptionFailedException.h"