Remove include boost/format.hpp from namespaces.hh and only include it where used

diff --git a/pdns/dnscrypt.cc b/pdns/dnscrypt.cc
index 74d9182cfc6e972ffa9d93022771670f9aab667a..3a627c890250717ed3b5114a2740dc6afcf4c60e 100644 (file)
--- a/pdns/dnscrypt.cc
+++ b/pdns/dnscrypt.cc
@@ -22,6 +22,7 @@
 #include "config.h"
 #ifdef HAVE_DNSCRYPT
 #include <fstream>
+#include <boost/format.hpp>
 #include "dolog.hh"
 #include "dnscrypt.hh"
 #include "dnswriter.hh"

diff --git a/pdns/dnspcap.hh b/pdns/dnspcap.hh
index 1689ee92cedcde625254f66c62d0dc17c124cc6c..bdeb17676c93591dcb181a7aac6e202bfcf53329 100644 (file)
--- a/pdns/dnspcap.hh
+++ b/pdns/dnspcap.hh
@@ -42,8 +42,7 @@
 #else
 #include <net/ethernet.h>
 #endif
-#include <vector>
-#include <boost/format.hpp>
+
 #include "namespaces.hh"
 
 struct pdns_pcap_file_header {

diff --git a/pdns/dnsrecords.cc b/pdns/dnsrecords.cc
index 5e0d5333d0ee19de69902726676a529884278309..f9379e3a391b261b3c8d838b5c4788064f9b9a3d 100644 (file)
--- a/pdns/dnsrecords.cc
+++ b/pdns/dnsrecords.cc
@@ -22,6 +22,9 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
+#include <boost/format.hpp>
+
 #include "utility.hh"
 #include "dnsrecords.hh"
 #include "iputils.hh"

diff --git a/pdns/dnsscope.cc b/pdns/dnsscope.cc
index 6e7e5c4955dfbedc27d745992a76593be23d5de0..4b16569946d29b2b3c15775c1d407c3cb257e73e 100644 (file)
--- a/pdns/dnsscope.cc
+++ b/pdns/dnsscope.cc
@@ -31,6 +31,7 @@
 #include "dnspcap.hh"
 #include "dnsparser.hh"
 #include "dnsname.hh"
+#include <boost/format.hpp>
 #include <map>
 #include <set>
 #include <fstream>

diff --git a/pdns/dynlistener.cc b/pdns/dynlistener.cc
index 656538e98fa25f21e2693e069ea7b3a92c2f83ee..63d06bd36815a25e35c47b58c5c36ad7eff3e4d8 100644 (file)
--- a/pdns/dynlistener.cc
+++ b/pdns/dynlistener.cc
@@ -30,6 +30,7 @@
 #include <dlfcn.h>
 #include <unistd.h>
 #include <boost/algorithm/string.hpp>
+#include <boost/format.hpp>
 
 #include <sys/socket.h>
 #include <netinet/in.h>

diff --git a/pdns/filterpo.cc b/pdns/filterpo.cc
index 2253d37215d614f69f6b10d683bee149f71de8ca..de437e5dbac43dfaee73dce1c4b3d0178cec1913 100644 (file)
--- a/pdns/filterpo.cc
+++ b/pdns/filterpo.cc
@@ -22,6 +22,7 @@
 
 #include <cinttypes>
 #include <iostream>
+#include <boost/format.hpp>
 
 #include "filterpo.hh"
 #include "namespaces.hh"

diff --git a/pdns/iputils.cc b/pdns/iputils.cc
index ac2f737c8dbea44d8206653be94cb5de6cc9fdd5..8bc804020332f06a489c7b570928157f3a7b118d 100644 (file)
--- a/pdns/iputils.cc
+++ b/pdns/iputils.cc
@@ -22,8 +22,11 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
 #include "iputils.hh"
-#include <sys/socket.h> 
+
+#include <sys/socket.h>
+#include <boost/format.hpp>
 
 #if HAVE_GETIFADDRS
 #include <ifaddrs.h>

diff --git a/pdns/minicurl.cc b/pdns/minicurl.cc
index 91b561cd016ba6fb94271cc9a69e8bdea7028d81..d5981c4e417d9bf325dfda05b402bb56806d241a 100644 (file)
--- a/pdns/minicurl.cc
+++ b/pdns/minicurl.cc
@@ -25,6 +25,7 @@
 #include "minicurl.hh"
 #include <curl/curl.h>
 #include <stdexcept>
+#include <boost/format.hpp>
 
 void MiniCurl::init()
 {

diff --git a/pdns/misc.cc b/pdns/misc.cc
index ef02cdf14f64a3c3f7d369cea0081a1ccbb7ddf6..8a0d0565ef2260219711c6c245cda9ba9e123ff0 100644 (file)
--- a/pdns/misc.cc
+++ b/pdns/misc.cc
@@ -51,6 +51,7 @@
 #include "pdnsexception.hh"
 #include <sys/types.h>
 #include <boost/algorithm/string.hpp>
+#include <boost/format.hpp>
 #include "iputils.hh"
 #include "dnsparser.hh"
 #include <sys/types.h>

diff --git a/pdns/namespaces.hh b/pdns/namespaces.hh
index e4e3fa6b08bf9dbec4542d42bfd03f48f39b926b..5c8b4224a69742588ec119f552c01738055ee549 100644 (file)
--- a/pdns/namespaces.hh
+++ b/pdns/namespaces.hh
@@ -21,7 +21,6 @@
  */
 #pragma once
 
-#include <boost/format.hpp>
 #include <boost/optional.hpp>
 #include <iostream>
 #include <map>

diff --git a/pdns/rcpgenerator.cc b/pdns/rcpgenerator.cc
index 43bc488ce9b904c3d3d1bc0f93c06d63c00d76a4..4756ea624532a9997ef76fa91087c0e333ffd70f 100644 (file)
--- a/pdns/rcpgenerator.cc
+++ b/pdns/rcpgenerator.cc
@@ -30,6 +30,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/format.hpp>
 
 #include <iostream>
 #include "base32.hh"

diff --git a/pdns/responsestats.cc b/pdns/responsestats.cc
index 8397e6bab1e6d6eceeb675583994f29aa4499fde..0acc334132d33bbedd355257e7466448d700b722 100644 (file)
--- a/pdns/responsestats.cc
+++ b/pdns/responsestats.cc
@@ -1,8 +1,12 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
 #include "responsestats.hh"
+
 #include <limits>
+#include <boost/format.hpp>
+
 #include "namespaces.hh"
 #include "logger.hh"
 

diff --git a/pdns/sillyrecords.cc b/pdns/sillyrecords.cc
index f6197bf17f50f49360be8db99348be8229306824..d1319a1a4227e88125de9a5b3301691864c85dc3 100644 (file)
--- a/pdns/sillyrecords.cc
+++ b/pdns/sillyrecords.cc
@@ -1,6 +1,9 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
+#include <boost/format.hpp>
+
 #include "utility.hh"
 #include <cstdio>
 #include <math.h>

diff --git a/pdns/ws-api.cc b/pdns/ws-api.cc
index 5c48fdae1a203935927905053d54904ed230edea..08f3d5cbac758a780a04658a3b6040ea5fca5ba1 100644 (file)
--- a/pdns/ws-api.cc
+++ b/pdns/ws-api.cc
@@ -24,6 +24,8 @@
 #endif
 
 #include <boost/tokenizer.hpp>
+#include <boost/format.hpp>
+
 #include "namespaces.hh"
 #include "ws-api.hh"
 #include "json.hh"