diff --git a/include/dns.h b/include/dns.h
index dfc743c8e..5f63b3444 100644
--- a/include/dns.h
+++ b/include/dns.h
@@ -1,7 +1,3 @@
-/* OMG... OMG! WHAT AN INCLUDE HORROR !!! */
-#include <ares.h>
-#include <ares_version.h>
-
 typedef enum {
 	DNSREQ_CLIENT = 1,
 	DNSREQ_LINKCONF = 2,
diff --git a/include/struct.h b/include/struct.h
index 97138b73d..c7ba6c622 100644
--- a/include/struct.h
+++ b/include/struct.h
@@ -43,6 +43,8 @@
 #include <openssl/x509v3.h>
 #endif
 #include <jansson.h>
+#include <ares.h>
+#include <ares_version.h>
 #include "common.h"
 #include "sys.h"
 #include <stdio.h>
diff --git a/include/unrealircd.h b/include/unrealircd.h
index abd67c761..8905af9f6 100644
--- a/include/unrealircd.h
+++ b/include/unrealircd.h
@@ -30,6 +30,7 @@
 #include <fcntl.h>
 #include <signal.h>
 #include "h.h"
+#include "dns.h"
 #include "version.h"
 #ifdef USE_LIBCURL
  #include <curl/curl.h>
diff --git a/src/dns.c b/src/dns.c
index 55286ae52..6e61a8a07 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -19,7 +19,6 @@
  */
 
 #include "unrealircd.h"
-#include "dns.h"
 
 #if !defined(UNREAL_VERSION_TIME)
  #error "YOU MUST RUN ./Config WHENEVER YOU ARE UPGRADING UNREAL!!!!"
diff --git a/src/modules/blacklist.c b/src/modules/blacklist.c
index 7f8656fea..8e3333aab 100644
--- a/src/modules/blacklist.c
+++ b/src/modules/blacklist.c
@@ -18,7 +18,6 @@
  */
 
 #include "unrealircd.h"
-#include "dns.h"
 
 ModuleHeader MOD_HEADER
 = {
diff --git a/src/modules/rpc/rpc.c b/src/modules/rpc/rpc.c
index 7dbb9295b..fed872265 100644
--- a/src/modules/rpc/rpc.c
+++ b/src/modules/rpc/rpc.c
@@ -5,7 +5,6 @@
  */
    
 #include "unrealircd.h"
-#include "dns.h"
 
 ModuleHeader MOD_HEADER
   = {
diff --git a/src/modules/webserver.c b/src/modules/webserver.c
index 8c05259ac..91b5f70ad 100644
--- a/src/modules/webserver.c
+++ b/src/modules/webserver.c
@@ -5,7 +5,6 @@
  */
    
 #include "unrealircd.h"
-#include "dns.h"
 
 ModuleHeader MOD_HEADER
   = {
diff --git a/src/modules/websocket.c b/src/modules/websocket.c
index 2b7be4d5f..abd33a9f3 100644
--- a/src/modules/websocket.c
+++ b/src/modules/websocket.c
@@ -6,7 +6,6 @@
  */
    
 #include "unrealircd.h"
-#include "dns.h"
 
 #define WEBSOCKET_VERSION "1.1.0"
 
diff --git a/src/socket.c b/src/socket.c
index 0e06b98a5..deca8c29e 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -26,7 +26,6 @@
  */
 
 #include "unrealircd.h"
-#include "dns.h"
 
 int OpenFiles = 0;    /* GLOBAL - number of files currently open */
 int readcalls = 0;
diff --git a/src/url_curl.c b/src/url_curl.c
index 5835271a4..38018b81a 100644
--- a/src/url_curl.c
+++ b/src/url_curl.c
@@ -20,7 +20,6 @@
  */
 
 #include "unrealircd.h"
-#include "dns.h"
 
 extern char *TLSKeyPasswd;
 
diff --git a/src/url_unreal.c b/src/url_unreal.c
index efb2143c6..6def6ccfd 100644
--- a/src/url_unreal.c
+++ b/src/url_unreal.c
@@ -18,7 +18,6 @@
  */
 
 #include "unrealircd.h"
-#include "dns.h"
 
 /* Structs */