Reduce include files to much smaller set

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>

diff --git a/pdns/recursordist/lwres.cc b/pdns/recursordist/lwres.cc
index f07744605519b3c07110467c32ea0df581533461..2e53937a5a92d7c0ed17910decf4af510f52266c 100644 (file)
--- a/pdns/recursordist/lwres.cc
+++ b/pdns/recursordist/lwres.cc
@@ -19,42 +19,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
-#include "utility.hh"
+
 #include "lwres.hh"
-#include <iostream>
-#include "dnsrecords.hh"
-#include <cerrno>
-#include "misc.hh"
-#include <algorithm>
-#include <sstream>
-#include <cstring>
-#include <string>
-#include <vector>
-#include "dns.hh"
-#include "qtype.hh"
-#include "pdnsexception.hh"
 #include "arguments.hh"
-#include "sstuff.hh"
-#include "syncres.hh"
-#include "dnswriter.hh"
-#include "dnsparser.hh"
-#include "logger.hh"
-#include "dns_random.hh"
-#include <boost/scoped_array.hpp>
-#include <boost/algorithm/string.hpp>
-#include "validate-recursor.hh"
-#include "ednssubnet.hh"
 #include "query-local-address.hh"
-#include "tcpiohandler.hh"
-#include "ednsoptions.hh"
 #include "ednspadding.hh"
 #include "rec-protozero.hh"
-#include "uuid-utils.hh"
+#include "logging.hh"
 #include "rec-tcpout.hh"
 #include "rec-cookiestore.hh"
+#include "syncres.hh"
+#include "resolve-context.hh"
+#include "remote_logger.hh"
 
 static bool g_cookies = false;
 

diff --git a/pdns/recursordist/lwres.hh b/pdns/recursordist/lwres.hh
index 846751445870c142ac80d7c94c04dcdd6c42db42..33617820a5eca18c291ae812ffb6aa7682dd7008 100644 (file)
--- a/pdns/recursordist/lwres.hh
+++ b/pdns/recursordist/lwres.hh
@@ -20,31 +20,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #pragma once
+
 #include <string>
-#include <vector>
-#include <sys/types.h>
-#include "misc.hh"
-#include "iputils.hh"
-#include <netdb.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <sys/uio.h>
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include "dnsparser.hh"
-#include <arpa/inet.h>
-#undef res_mkquery
 
-#include "pdnsexception.hh"
-#include "dns.hh"
-#include "namespaces.hh"
-#include "remote_logger.hh"
-#include "fstrm_logger.hh"
-#include "resolve-context.hh"
-#include "noinitvector.hh"
 #include "logger.hh"
 #include "logr.hh"
+#include "pdnsexception.hh"
+#include "noinitvector.hh"
+
+class RemoteLoggerInterface;
+class RemoteLogger;
+class FrameStreamLogger;
+struct DNSRecord;
+struct ResolveContext;
 
 // Helper to be defined by main program: queue data and log based on return value of queueData()
 void remoteLoggerQueueData(RemoteLoggerInterface&, const std::string&);

diff --git a/pdns/recursordist/rec-main.hh b/pdns/recursordist/rec-main.hh
index 7657127f6aa7c2cdc1f29b2696adf6bb27ec7ce0..bcdb4dcb1e29cda2914d935f2fc3f66c8d9274bb 100644 (file)
--- a/pdns/recursordist/rec-main.hh
+++ b/pdns/recursordist/rec-main.hh
@@ -40,6 +40,7 @@
 #include "recpacketcache.hh"
 #include "ratelimitedlog.hh"
 #include "protozero-trace.hh"
+#include "remote_logger.hh"
 
 #ifdef NOD_ENABLED
 #include "nod.hh"

diff --git a/pdns/recursordist/resolve-context.hh b/pdns/recursordist/resolve-context.hh
index 354d81226a73deada7c09903f09f9a70bba79217..06262b7a277756883cb9978baa058a3070286afc 100644 (file)
--- a/pdns/recursordist/resolve-context.hh
+++ b/pdns/recursordist/resolve-context.hh
@@ -26,7 +26,6 @@
 
 #include <boost/uuid/uuid.hpp>
 #include <boost/optional.hpp>
-#include <functional>
 
 #include "dnsname.hh"
 

diff --git a/pdns/recursordist/syncres.cc b/pdns/recursordist/syncres.cc
index 8d1f23860a0b6391fb024981b928e1d30a9e8ebe..c5676555af3e87a300909a51692c390f383e23a6 100644 (file)
--- a/pdns/recursordist/syncres.cc
+++ b/pdns/recursordist/syncres.cc
@@ -19,12 +19,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include <optional>
-#ifdef HAVE_CONFIG_H
-#include <utility>
 
 #include "config.h"
-#endif
+
+#include <optional>
+#include <utility>
 
 #include "arguments.hh"
 #include "aggressive_nsec.hh"
@@ -42,6 +41,7 @@
 #include "rec-taskqueue.hh"
 #include "shuffle.hh"
 #include "rec-nsspeeds.hh"
+#include "resolve-context.hh"
 
 rec::GlobalCounters g_Counters;
 thread_local rec::TCounters t_Counters(g_Counters);