diff --git a/configure.ac b/configure.ac
index 74746484eda4..48f05ea1a4af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,7 +113,6 @@ PDNS_CHECK_LIBSODIUM
 PDNS_CHECK_CLOCK_GETTIME
 
 BOOST_REQUIRE([1.35])
-BOOST_FOREACH
 BOOST_PROGRAM_OPTIONS([mt])
 BOOST_SERIALIZATION([mt])
 
diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc
index 2912b7b5cc96..a8b71d32e0ef 100644
--- a/modules/bindbackend/bindbackend2.cc
+++ b/modules/bindbackend/bindbackend2.cc
@@ -33,7 +33,7 @@
 #include <fcntl.h>
 #include <sstream>
 #include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
+
 #include "pdns/dnsseckeeper.hh"
 #include "pdns/dnssecinfra.hh"
 #include "pdns/base32.hh"
diff --git a/modules/geoipbackend/geoipbackend.hh b/modules/geoipbackend/geoipbackend.hh
index f3fb44eba628..f3acc002c1ea 100644
--- a/modules/geoipbackend/geoipbackend.hh
+++ b/modules/geoipbackend/geoipbackend.hh
@@ -9,7 +9,7 @@
 #include <fstream>
 #include <yaml-cpp/yaml.h>
 #include <pthread.h>
-#include <boost/foreach.hpp>
+
 #include <GeoIP.h>
 #include <GeoIPCity.h>
 #include <sys/types.h>
diff --git a/modules/gpgsqlbackend/spgsql.cc b/modules/gpgsqlbackend/spgsql.cc
index 701a2c4f9739..4b494757344a 100644
--- a/modules/gpgsqlbackend/spgsql.cc
+++ b/modules/gpgsqlbackend/spgsql.cc
@@ -11,7 +11,7 @@
 #include "pdns/dns.hh"
 #include "pdns/namespaces.hh"
 #include <algorithm>
-#include <boost/foreach.hpp>
+
 
 class SPgSQLStatement: public SSqlStatement
 {
diff --git a/modules/remotebackend/httpconnector.cc b/modules/remotebackend/httpconnector.cc
index d18f88f3bb65..94cf24656028 100644
--- a/modules/remotebackend/httpconnector.cc
+++ b/modules/remotebackend/httpconnector.cc
@@ -5,7 +5,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <boost/foreach.hpp>
+
 #include <sstream>
 #include "rapidjson/stringbuffer.h"
 #include "rapidjson/writer.h"
diff --git a/modules/remotebackend/remotebackend.cc b/modules/remotebackend/remotebackend.cc
index ae9bd6e7a576..00d5b16106be 100644
--- a/modules/remotebackend/remotebackend.cc
+++ b/modules/remotebackend/remotebackend.cc
@@ -2,7 +2,7 @@
 #include "config.h"
 #endif
 #include "remotebackend.hh"
-#include <boost/foreach.hpp>
+
 
 static const char *kBackendId = "[RemoteBackend]";
 
diff --git a/modules/remotebackend/test-remotebackend-http.cc b/modules/remotebackend/test-remotebackend-http.cc
index b37503572418..05f36cd9b946 100644
--- a/modules/remotebackend/test-remotebackend-http.cc
+++ b/modules/remotebackend/test-remotebackend-http.cc
@@ -38,7 +38,7 @@ DNSBackend *be;
 
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
-#include <boost/foreach.hpp>
+
 #include <boost/tuple/tuple.hpp>
 
 struct RemotebackendSetup {
diff --git a/modules/remotebackend/test-remotebackend-json.cc b/modules/remotebackend/test-remotebackend-json.cc
index 536f8e013875..a020b9242770 100644
--- a/modules/remotebackend/test-remotebackend-json.cc
+++ b/modules/remotebackend/test-remotebackend-json.cc
@@ -38,7 +38,7 @@ DNSBackend *be;
 
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
-#include <boost/foreach.hpp>
+
 #include <boost/tuple/tuple.hpp>
 
 struct RemotebackendSetup {
diff --git a/modules/remotebackend/test-remotebackend-pipe.cc b/modules/remotebackend/test-remotebackend-pipe.cc
index 5a3b1d3a5122..fd1527b19228 100644
--- a/modules/remotebackend/test-remotebackend-pipe.cc
+++ b/modules/remotebackend/test-remotebackend-pipe.cc
@@ -7,7 +7,7 @@
 #endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
-#include <boost/foreach.hpp>
+
 #include <boost/tuple/tuple.hpp>
 #include "pdns/namespaces.hh"
 #include "pdns/dns.hh"
diff --git a/modules/remotebackend/test-remotebackend-post.cc b/modules/remotebackend/test-remotebackend-post.cc
index 1580747d61e4..f525887deac3 100644
--- a/modules/remotebackend/test-remotebackend-post.cc
+++ b/modules/remotebackend/test-remotebackend-post.cc
@@ -38,7 +38,7 @@ DNSBackend *be;
 
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
-#include <boost/foreach.hpp>
+
 #include <boost/tuple/tuple.hpp>
 
 struct RemotebackendSetup {
diff --git a/modules/remotebackend/test-remotebackend-unix.cc b/modules/remotebackend/test-remotebackend-unix.cc
index b95dfce944cb..dc8e3112d869 100644
--- a/modules/remotebackend/test-remotebackend-unix.cc
+++ b/modules/remotebackend/test-remotebackend-unix.cc
@@ -7,7 +7,7 @@
 #endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
-#include <boost/foreach.hpp>
+
 #include <boost/tuple/tuple.hpp>
 #include "pdns/namespaces.hh"
 #include "pdns/dns.hh"
diff --git a/modules/remotebackend/test-remotebackend-zeromq.cc b/modules/remotebackend/test-remotebackend-zeromq.cc
index e7b2af4c5a66..dd7de59cdd49 100644
--- a/modules/remotebackend/test-remotebackend-zeromq.cc
+++ b/modules/remotebackend/test-remotebackend-zeromq.cc
@@ -6,7 +6,7 @@
 #include "config.h"
 #endif
 #include <boost/assign/list_of.hpp>
-#include <boost/foreach.hpp>
+
 #include <boost/tuple/tuple.hpp>
 #include "pdns/namespaces.hh"
 #include "pdns/dns.hh"
diff --git a/modules/remotebackend/test-remotebackend.cc b/modules/remotebackend/test-remotebackend.cc
index b1bc9b457c16..4815d0f77a9d 100644
--- a/modules/remotebackend/test-remotebackend.cc
+++ b/modules/remotebackend/test-remotebackend.cc
@@ -6,7 +6,7 @@
 #endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
-#include <boost/foreach.hpp>
+
 #include <boost/tuple/tuple.hpp>
 #include "pdns/namespaces.hh"
 #include "pdns/dns.hh"
diff --git a/modules/remotebackend/zmqconnector.cc b/modules/remotebackend/zmqconnector.cc
index cd06baee8b52..c41520fb0447 100644
--- a/modules/remotebackend/zmqconnector.cc
+++ b/modules/remotebackend/zmqconnector.cc
@@ -7,7 +7,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <boost/foreach.hpp>
+
 #include <sstream>
 #include "rapidjson/stringbuffer.h"
 #include "rapidjson/writer.h"
diff --git a/modules/tinydnsbackend/tinydnsbackend.cc b/modules/tinydnsbackend/tinydnsbackend.cc
index 3d74d97dc6a9..e18a536dce05 100644
--- a/modules/tinydnsbackend/tinydnsbackend.cc
+++ b/modules/tinydnsbackend/tinydnsbackend.cc
@@ -9,7 +9,7 @@
 #include "pdns/dnspacket.hh"
 #include "pdns/dnsrecords.hh"
 #include <utility>
-#include <boost/foreach.hpp>
+
 
 static string backendname="[TinyDNSBackend] ";
 uint32_t TinyDNSBackend::s_lastId;
diff --git a/pdns/arguments.cc b/pdns/arguments.cc
index de2a2fb597aa..8e9294b4e6cd 100644
--- a/pdns/arguments.cc
+++ b/pdns/arguments.cc
@@ -26,7 +26,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/compare.hpp>
 #include <boost/algorithm/string/predicate.hpp>
-#include <boost/foreach.hpp>
+
 #include "namespaces.hh"
 #include "logger.hh"
 #include <sys/types.h>
diff --git a/pdns/auth-carbon.cc b/pdns/auth-carbon.cc
index dab3c713e6fb..1dbc0332683f 100644
--- a/pdns/auth-carbon.cc
+++ b/pdns/auth-carbon.cc
@@ -7,7 +7,7 @@
 #include "sstuff.hh"
 #include "arguments.hh"
 #include "common_startup.hh"
-#include <boost/foreach.hpp>
+
 #include "namespaces.hh"
 
 void* carbonDumpThread(void*)
diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index fa188d019b75..910fae6a65cb 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -28,7 +28,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include "dynhandler.hh"
-#include <boost/foreach.hpp>
+
 
 bool g_anyToTcp;
 typedef Distributor<DNSPacket,DNSPacket,PacketHandler> DNSDistributor;
diff --git a/pdns/dbdnsseckeeper.cc b/pdns/dbdnsseckeeper.cc
index 83d2d99f3ffb..393001541ffd 100644
--- a/pdns/dbdnsseckeeper.cc
+++ b/pdns/dbdnsseckeeper.cc
@@ -28,7 +28,7 @@
 #include "ueberbackend.hh"
 #include "statbag.hh"
 #include <iostream>
-#include <boost/foreach.hpp>
+
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fstream>
diff --git a/pdns/dnsdist-carbon.cc b/pdns/dnsdist-carbon.cc
index 3d21da725543..e88dbc71b8b6 100644
--- a/pdns/dnsdist-carbon.cc
+++ b/pdns/dnsdist-carbon.cc
@@ -4,7 +4,7 @@
 #include "iputils.hh"
 #include "dolog.hh"
 #include "sstuff.hh"
-#include <boost/foreach.hpp>
+
 #include "namespaces.hh"
 #undef L
 #include "dnsdist.hh"
diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index 8c693323e3a7..faffcc522f59 100644
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -33,7 +33,7 @@
 #include <boost/tokenizer.hpp>
 #include <boost/algorithm/string.hpp>
 #include <algorithm>
-#include <boost/foreach.hpp>
+
 #include "dnsseckeeper.hh"
 #include "dns.hh"
 #include "dnsbackend.hh"
diff --git a/pdns/dnsproxy.cc b/pdns/dnsproxy.cc
index 166d0f58b2a6..80710a3e4fee 100644
--- a/pdns/dnsproxy.cc
+++ b/pdns/dnsproxy.cc
@@ -31,7 +31,7 @@
 #include "dns.hh"
 #include "logger.hh"
 #include "statbag.hh"
-#include <boost/foreach.hpp>
+
 
 extern StatBag S;
 extern PacketCache PC;
diff --git a/pdns/dnsrecords.cc b/pdns/dnsrecords.cc
index d4758f643a44..c234b65fbfb8 100644
--- a/pdns/dnsrecords.cc
+++ b/pdns/dnsrecords.cc
@@ -26,7 +26,7 @@
 #include "utility.hh"
 #include "dnsrecords.hh"
 #include "iputils.hh"
-#include <boost/foreach.hpp>
+
 
 void DNSResourceRecord::setContent(const string &cont) {
   content = cont;
diff --git a/pdns/dnsscope.cc b/pdns/dnsscope.cc
index ff5cba0d0349..3bc84e325a8a 100644
--- a/pdns/dnsscope.cc
+++ b/pdns/dnsscope.cc
@@ -14,7 +14,7 @@
 #include <algorithm>
 #include "anadns.hh"
 #include <boost/program_options.hpp>
-#include <boost/foreach.hpp>
+
 #include <boost/logic/tribool.hpp>
 #include "arguments.hh"
 #include "namespaces.hh"
diff --git a/pdns/dnssecinfra.cc b/pdns/dnssecinfra.cc
index 4c09cd89ce16..917d0b1590b7 100644
--- a/pdns/dnssecinfra.cc
+++ b/pdns/dnssecinfra.cc
@@ -8,7 +8,7 @@
 #include "dnsrecords.hh"
 #include "statbag.hh"
 #include "iputils.hh"
-#include <boost/foreach.hpp>
+
 #include <boost/algorithm/string.hpp>
 #include "dnssecinfra.hh" 
 #include "dnsseckeeper.hh"
diff --git a/pdns/dnssecsigner.cc b/pdns/dnssecsigner.cc
index 962824024dd7..9b2e1f096b7c 100644
--- a/pdns/dnssecsigner.cc
+++ b/pdns/dnssecsigner.cc
@@ -24,7 +24,7 @@
 #endif
 #include "dnssecinfra.hh"
 #include "namespaces.hh"
-#include <boost/foreach.hpp>
+
 #include "md5.hh"
 #include "dnsseckeeper.hh"
 #include "dns_random.hh"
diff --git a/pdns/dnstcpbench.cc b/pdns/dnstcpbench.cc
index a2ce9024583e..5e2aee5df0ab 100644
--- a/pdns/dnstcpbench.cc
+++ b/pdns/dnstcpbench.cc
@@ -37,7 +37,7 @@
 #include <netinet/tcp.h>
 #include <boost/array.hpp>
 #include <boost/program_options.hpp>
-#include <boost/foreach.hpp>
+
 
 StatBag S;
 namespace po = boost::program_options;
diff --git a/pdns/dnswriter.cc b/pdns/dnswriter.cc
index f1b06965e163..dc03874bef82 100644
--- a/pdns/dnswriter.cc
+++ b/pdns/dnswriter.cc
@@ -4,7 +4,7 @@
 #include "dnswriter.hh"
 #include "misc.hh"
 #include "dnsparser.hh"
-#include <boost/foreach.hpp>
+
 #include <limits.h>
 
 DNSPacketWriter::DNSPacketWriter(vector<uint8_t>& content, const DNSName& qname, uint16_t  qtype, uint16_t qclass, uint8_t opcode)
diff --git a/pdns/gss_context.cc b/pdns/gss_context.cc
index e817c40fbe88..2dc548823c42 100644
--- a/pdns/gss_context.cc
+++ b/pdns/gss_context.cc
@@ -11,7 +11,7 @@
 #include "logger.hh"
 #include "lock.hh"
 #include "arguments.hh"
-#include <boost/foreach.hpp>
+
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
 #include "gss_context.hh"
diff --git a/pdns/inflighter.cc b/pdns/inflighter.cc
index 9729c9c1d85b..99a1e541aafe 100644
--- a/pdns/inflighter.cc
+++ b/pdns/inflighter.cc
@@ -4,7 +4,7 @@
 #include <vector>
 #include <deque>
 #include <iostream>
-#include <boost/foreach.hpp>
+
 #include <boost/multi_index_container.hpp>
 #include <boost/format.hpp>
 #include <sys/time.h>
diff --git a/pdns/ixplore.cc b/pdns/ixplore.cc
index dcdf10488791..08eecf3fa7c4 100644
--- a/pdns/ixplore.cc
+++ b/pdns/ixplore.cc
@@ -14,7 +14,7 @@
 #include "statbag.hh"
 #include "base32.hh"
 #include "dnssecinfra.hh"
-#include <boost/foreach.hpp>
+
 #include "dns_random.hh"
 #include "gss_context.hh"
 #include "zoneparser-tng.hh"
diff --git a/pdns/json.cc b/pdns/json.cc
index 431feb3503d0..2124f8d32337 100644
--- a/pdns/json.cc
+++ b/pdns/json.cc
@@ -25,7 +25,7 @@
 #include "json.hh"
 #include "namespaces.hh"
 #include "misc.hh"
-#include <boost/foreach.hpp>
+
 #include "rapidjson/document.h"
 #include "rapidjson/stringbuffer.h"
 #include "rapidjson/writer.h"
diff --git a/pdns/lua-auth.cc b/pdns/lua-auth.cc
index 2be0c3ac358b..e3a557653dfe 100644
--- a/pdns/lua-auth.cc
+++ b/pdns/lua-auth.cc
@@ -46,7 +46,7 @@ extern "C" {
 #include <string>
 #include <vector>
 #include <stdexcept>
-#include <boost/foreach.hpp>
+
 #include "logger.hh"
 #include "namespaces.hh"
 
diff --git a/pdns/lua-pdns.cc b/pdns/lua-pdns.cc
index 85dc2e518c65..22eaaacf2f8a 100644
--- a/pdns/lua-pdns.cc
+++ b/pdns/lua-pdns.cc
@@ -3,7 +3,7 @@
 #endif
 #include "lua-pdns.hh"
 // #include "syncres.hh"
-#include <boost/foreach.hpp>
+
 
 #if !defined(HAVE_LUA)
 
diff --git a/pdns/lua-recursor.cc b/pdns/lua-recursor.cc
index b5c9bd972d8c..56c02ca2169a 100644
--- a/pdns/lua-recursor.cc
+++ b/pdns/lua-recursor.cc
@@ -60,7 +60,7 @@ extern "C" {
 #include <string>
 #include <vector>
 #include <stdexcept>
-#include <boost/foreach.hpp>
+
 #include "logger.hh"
 #include "dnsparser.hh"
 #include "namespaces.hh"
diff --git a/pdns/mastercommunicator.cc b/pdns/mastercommunicator.cc
index 7a8802d73df1..638725c379ed 100644
--- a/pdns/mastercommunicator.cc
+++ b/pdns/mastercommunicator.cc
@@ -28,7 +28,7 @@
 #include "communicator.hh"
 #include <set>
 #include <boost/utility.hpp>
-#include <boost/foreach.hpp>
+
 #include "dnsbackend.hh"
 #include "ueberbackend.hh"
 #include "packethandler.hh"
diff --git a/pdns/mbedtlssigners.cc b/pdns/mbedtlssigners.cc
index f034773ae3e5..7ad0a0dd413b 100644
--- a/pdns/mbedtlssigners.cc
+++ b/pdns/mbedtlssigners.cc
@@ -14,7 +14,7 @@
 #include "mbedtlscompat.hh"
 #endif
 #include <boost/assign/std/vector.hpp> // for 'operator+=()'
-#include <boost/foreach.hpp>
+
 #include "sha.hh"
 #include "dnssecinfra.hh"
 using namespace boost::assign;
diff --git a/pdns/nameserver.hh b/pdns/nameserver.hh
index d33628296f84..dffd878f2dac 100644
--- a/pdns/nameserver.hh
+++ b/pdns/nameserver.hh
@@ -31,7 +31,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <vector>
-#include <boost/foreach.hpp>
+
 #include "statbag.hh"
 #include "namespaces.hh"
 #include "dnspacket.hh"
diff --git a/pdns/nsec3dig.cc b/pdns/nsec3dig.cc
index 15e4632cad58..51566099e365 100644
--- a/pdns/nsec3dig.cc
+++ b/pdns/nsec3dig.cc
@@ -9,7 +9,7 @@
 #include "statbag.hh"
 #include "base32.hh"
 #include "dnssecinfra.hh"
-#include <boost/foreach.hpp>
+
 
 StatBag S;
 
diff --git a/pdns/pdns_hw.cc b/pdns/pdns_hw.cc
index b0f13cc5eb9c..acfa45c860c6 100644
--- a/pdns/pdns_hw.cc
+++ b/pdns/pdns_hw.cc
@@ -7,7 +7,7 @@
 #include <boost/tuple/tuple_comparison.hpp>
 #include <boost/multi_index/key_extractors.hpp>
 #include <boost/multi_index/sequenced_index.hpp>
-#include <boost/foreach.hpp>
+
 #include <iostream>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 275ab6bf0871..4c4ee0c801b5 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -26,7 +26,7 @@
 #include <netdb.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <boost/foreach.hpp>
+
 #include "ws-recursor.hh"
 #include <pthread.h>
 #include "recpacketcache.hh"
diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index 54269906f529..e41e78baada2 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -6,7 +6,7 @@
 #include "statbag.hh"
 #include "base32.hh"
 #include "base64.hh"
-#include <boost/foreach.hpp>
+
 #include <boost/program_options.hpp>
 #include <boost/assign/std/vector.hpp>
 #include <boost/assign/list_of.hpp>
diff --git a/pdns/pkcs11signers.cc b/pdns/pkcs11signers.cc
index e42f12520c30..1ecaec880d6f 100644
--- a/pdns/pkcs11signers.cc
+++ b/pdns/pkcs11signers.cc
@@ -4,7 +4,7 @@
 #include <boost/assign/std/vector.hpp> // for 'operator+=()'
 #include <boost/assign/list_of.hpp>
 #include <boost/make_shared.hpp>
-#include <boost/foreach.hpp>
+
 #include <boost/format.hpp>
 #include <p11-kit/p11-kit.h>
 
diff --git a/pdns/rec-carbon.cc b/pdns/rec-carbon.cc
index bb92a37b681d..fbc776dbe4ae 100644
--- a/pdns/rec-carbon.cc
+++ b/pdns/rec-carbon.cc
@@ -8,7 +8,7 @@
 #include "logger.hh"
 #include "arguments.hh"
 #include "lock.hh"
-#include <boost/foreach.hpp>
+
 
 void doCarbonDump(void*)
 try
diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc
index 8bdcdd436c97..904341e64030 100644
--- a/pdns/rec_channel_rec.cc
+++ b/pdns/rec_channel_rec.cc
@@ -17,7 +17,7 @@
 #include <boost/tuple/tuple.hpp>
 #include <boost/format.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
+
 #include "version.hh"
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/pdns/recpacketcache.cc b/pdns/recpacketcache.cc
index de1e06587e21..470bb9591d3e 100644
--- a/pdns/recpacketcache.cc
+++ b/pdns/recpacketcache.cc
@@ -2,7 +2,7 @@
 #include "config.h"
 #endif
 #include <iostream>
-#include <boost/foreach.hpp>
+
 #include "recpacketcache.hh"
 #include "cachecleaner.hh"
 #include "dns.hh"
diff --git a/pdns/reczones.cc b/pdns/reczones.cc
index c09fdc339615..5c364c542e65 100644
--- a/pdns/reczones.cc
+++ b/pdns/reczones.cc
@@ -28,7 +28,7 @@
 #include "zoneparser-tng.hh"
 #include "logger.hh"
 #include "dnsrecords.hh"
-#include <boost/foreach.hpp>
+
 #include <thread>
 #include "ixfr.hh"
 #include "rpzloader.hh"
diff --git a/pdns/resolver.cc b/pdns/resolver.cc
index 691380b28061..aa2c502d54ce 100644
--- a/pdns/resolver.cc
+++ b/pdns/resolver.cc
@@ -45,7 +45,7 @@
 #include "dnswriter.hh"
 #include "dnsparser.hh"
 
-#include <boost/foreach.hpp>
+
 #include "dns_random.hh"
 #include <sys/poll.h>
 #include "gss_context.hh"
diff --git a/pdns/responsestats.cc b/pdns/responsestats.cc
index c9634c583cf9..3fc4286ae485 100644
--- a/pdns/responsestats.cc
+++ b/pdns/responsestats.cc
@@ -5,7 +5,7 @@
 #include <limits>
 #include "namespaces.hh"
 #include "logger.hh"
-#include <boost/foreach.hpp>
+
 #include "dnsparser.hh"
 
 ResponseStats::ResponseStats()
diff --git a/pdns/rfc2136handler.cc b/pdns/rfc2136handler.cc
index 87cbbe21d40d..de7a40e14ef2 100644
--- a/pdns/rfc2136handler.cc
+++ b/pdns/rfc2136handler.cc
@@ -8,7 +8,7 @@
 #include "dnsseckeeper.hh"
 #include "base64.hh"
 #include "base32.hh"
-#include <boost/foreach.hpp>
+
 #include "misc.hh"
 #include "arguments.hh"
 #include "resolver.hh"
diff --git a/pdns/saxfr.cc b/pdns/saxfr.cc
index 3f1a2422f229..d67a431c82a2 100644
--- a/pdns/saxfr.cc
+++ b/pdns/saxfr.cc
@@ -10,7 +10,7 @@
 #include "statbag.hh"
 #include "base32.hh"
 #include "dnssecinfra.hh"
-#include <boost/foreach.hpp>
+
 #include "dns_random.hh"
 #include "gss_context.hh"
 
diff --git a/pdns/secpoll-auth.cc b/pdns/secpoll-auth.cc
index d7e548b46689..5d4e3785cc15 100644
--- a/pdns/secpoll-auth.cc
+++ b/pdns/secpoll-auth.cc
@@ -8,7 +8,7 @@
 #include "version.hh"
 #include "dnsparser.hh"
 #include "misc.hh"
-#include <boost/foreach.hpp>
+
 #include "sstuff.hh"
 #include "dnswriter.hh"
 #include "dns_random.hh"
diff --git a/pdns/serialtweaker.cc b/pdns/serialtweaker.cc
index e699d39ad5b0..fbbecce26f3e 100644
--- a/pdns/serialtweaker.cc
+++ b/pdns/serialtweaker.cc
@@ -26,7 +26,7 @@
 #include "dnsseckeeper.hh"
 #include "dnspacket.hh"
 #include "namespaces.hh"
-#include <boost/foreach.hpp>
+
 
 uint32_t localtime_format_YYYYMMDDSS(time_t t, uint32_t seq)
 {
diff --git a/pdns/signingpipe.cc b/pdns/signingpipe.cc
index 4fb12e27ce91..2ffe5b3db27f 100644
--- a/pdns/signingpipe.cc
+++ b/pdns/signingpipe.cc
@@ -4,7 +4,7 @@
 #include "signingpipe.hh"
 #include "misc.hh"
 #include <poll.h>
-#include <boost/foreach.hpp>
+
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc
index 7f72064480cf..fb7bdf4310b8 100644
--- a/pdns/slavecommunicator.cc
+++ b/pdns/slavecommunicator.cc
@@ -39,7 +39,7 @@
 #include "dns.hh"
 #include "arguments.hh"
 #include "packetcache.hh"
-#include <boost/foreach.hpp>
+
 #include <boost/lexical_cast.hpp>
 #include "base64.hh"
 #include "inflighter.cc"
diff --git a/pdns/statbag.cc b/pdns/statbag.cc
index 88f96465299c..9d58e126cde2 100644
--- a/pdns/statbag.cc
+++ b/pdns/statbag.cc
@@ -32,7 +32,7 @@
 #include "arguments.hh"
 #include "lock.hh"
 #include "iputils.hh"
-#include <boost/foreach.hpp>
+
 
 #include "namespaces.hh"
 
diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 7486083e4584..31ab17f04283 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 #include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
+
 #include "lua-recursor.hh"
 #include "utility.hh"
 #include "syncres.hh"
diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index 47d78bff719c..bc6aff1d0c39 100644
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -35,7 +35,7 @@
 #include <string>
 #include "tcpreceiver.hh"
 #include "sstuff.hh"
-#include <boost/foreach.hpp>
+
 #include <errno.h>
 #include <signal.h>
 #include "base64.hh"
diff --git a/pdns/test-base32_cc.cc b/pdns/test-base32_cc.cc
index 9f03ce5d6735..8c538e5bd8cd 100644
--- a/pdns/test-base32_cc.cc
+++ b/pdns/test-base32_cc.cc
@@ -5,7 +5,7 @@
 #endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
-#include <boost/foreach.hpp>
+
 #include <boost/tuple/tuple.hpp>
 #include "base32.hh"
 
diff --git a/pdns/test-base64_cc.cc b/pdns/test-base64_cc.cc
index 9e9d53f699d9..029e664663de 100644
--- a/pdns/test-base64_cc.cc
+++ b/pdns/test-base64_cc.cc
@@ -5,7 +5,7 @@
 #endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/std/map.hpp>
-#include <boost/foreach.hpp>
+
 #include "base64.hh"
 
 using namespace boost;
diff --git a/pdns/test-bindparser_cc.cc b/pdns/test-bindparser_cc.cc
index 149ce0c91700..3779e33f01a3 100644
--- a/pdns/test-bindparser_cc.cc
+++ b/pdns/test-bindparser_cc.cc
@@ -8,7 +8,7 @@
 #include "misc.hh"
 #include "pdnsexception.hh"
 #include <utility>
-#include <boost/foreach.hpp>
+
 #include <sstream>
 #include <cstdlib>
 #include "dnsname.hh"
diff --git a/pdns/test-dns_random_hh.cc b/pdns/test-dns_random_hh.cc
index 137c465cfbd8..dfa77ef20f37 100644
--- a/pdns/test-dns_random_hh.cc
+++ b/pdns/test-dns_random_hh.cc
@@ -9,7 +9,7 @@
 #endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/std/map.hpp>
-#include <boost/foreach.hpp>
+
 #include <boost/accumulators/statistics/median.hpp>
 #include <boost/accumulators/statistics/mean.hpp>
 #include <boost/accumulators/accumulators.hpp>
diff --git a/pdns/test-dnsrecords_cc.cc b/pdns/test-dnsrecords_cc.cc
index adcc32c81888..b13425659155 100644
--- a/pdns/test-dnsrecords_cc.cc
+++ b/pdns/test-dnsrecords_cc.cc
@@ -5,7 +5,7 @@
 #endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
-#include <boost/foreach.hpp>
+
 #include <boost/tuple/tuple.hpp>
 #include <boost/scoped_ptr.hpp>
 #include "dnsrecords.hh"
diff --git a/pdns/test-md5_hh.cc b/pdns/test-md5_hh.cc
index 267b56a491f0..5d9e90898019 100644
--- a/pdns/test-md5_hh.cc
+++ b/pdns/test-md5_hh.cc
@@ -5,7 +5,7 @@
 #endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
-#include <boost/foreach.hpp>
+
 #include "md5.hh"
 #include "misc.hh"
 
diff --git a/pdns/test-misc_hh.cc b/pdns/test-misc_hh.cc
index 4b220f8781ff..aeadaae0398e 100644
--- a/pdns/test-misc_hh.cc
+++ b/pdns/test-misc_hh.cc
@@ -6,7 +6,7 @@
 #endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
-#include <boost/foreach.hpp>
+
 #include <boost/tuple/tuple.hpp>
 #include "misc.hh"
 #include "dns.hh"
diff --git a/pdns/test-sha_hh.cc b/pdns/test-sha_hh.cc
index c88e4229ef04..b2a16d9dc0d4 100644
--- a/pdns/test-sha_hh.cc
+++ b/pdns/test-sha_hh.cc
@@ -5,7 +5,7 @@
 #endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
-#include <boost/foreach.hpp>
+
 #include <boost/tuple/tuple.hpp>
 
 #include "sha.hh"
diff --git a/pdns/test-statbag_cc.cc b/pdns/test-statbag_cc.cc
index e4d69fc342d5..87ee6c732876 100644
--- a/pdns/test-statbag_cc.cc
+++ b/pdns/test-statbag_cc.cc
@@ -6,7 +6,7 @@
 #endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
-#include <boost/foreach.hpp>
+
 #include <boost/tuple/tuple.hpp>
 #include <stdint.h>
 #include "misc.hh"
diff --git a/pdns/test-zoneparser_tng_cc.cc b/pdns/test-zoneparser_tng_cc.cc
index e9955e615a1f..bc785186d0a8 100644
--- a/pdns/test-zoneparser_tng_cc.cc
+++ b/pdns/test-zoneparser_tng_cc.cc
@@ -5,7 +5,7 @@
 #endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
-#include <boost/foreach.hpp>
+
 #include <boost/tuple/tuple.hpp>
 #include <boost/iostreams/stream.hpp>
 #include <boost/iostreams/device/file.hpp>
diff --git a/pdns/ueberbackend.cc b/pdns/ueberbackend.cc
index 308d44d3d91a..482fb743e240 100644
--- a/pdns/ueberbackend.cc
+++ b/pdns/ueberbackend.cc
@@ -37,7 +37,7 @@
 #include <iostream>
 #include <sstream>
 #include <functional>
-#include <boost/foreach.hpp>
+
 #include "dns.hh"
 #include "arguments.hh"
 #include "dnsbackend.hh"
diff --git a/pdns/ws-api.cc b/pdns/ws-api.cc
index e708f4ab84cf..4e7a01ba17ae 100644
--- a/pdns/ws-api.cc
+++ b/pdns/ws-api.cc
@@ -21,7 +21,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <boost/foreach.hpp>
+
 #include <boost/tokenizer.hpp>
 #include <boost/circular_buffer.hpp>
 #include "namespaces.hh"
diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc
index 8a2d26832156..fecfd3484cb7 100644
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@ -35,7 +35,7 @@
 #include "comment.hh"
 #include "ueberbackend.hh"
 #include <boost/format.hpp>
-#include <boost/foreach.hpp>
+
 #include "namespaces.hh"
 #include "rapidjson/document.h"
 #include "rapidjson/stringbuffer.h"
diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc
index 7a996677d85d..497421aaff2f 100644
--- a/pdns/ws-recursor.cc
+++ b/pdns/ws-recursor.cc
@@ -24,7 +24,7 @@
 #endif
 #include "ws-recursor.hh"
 #include "json.hh"
-#include <boost/foreach.hpp>
+
 #include <string>
 #include "namespaces.hh"
 #include <iostream>
diff --git a/pdns/zone2json.cc b/pdns/zone2json.cc
index 8b2e814994a3..30b5fc5e90b3 100644
--- a/pdns/zone2json.cc
+++ b/pdns/zone2json.cc
@@ -44,7 +44,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <boost/foreach.hpp>
+
 #include "json11.hpp"
 
 using namespace json11;
diff --git a/pdns/zone2sql.cc b/pdns/zone2sql.cc
index 0b26a75755cf..aef679de340b 100644
--- a/pdns/zone2sql.cc
+++ b/pdns/zone2sql.cc
@@ -44,7 +44,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <boost/foreach.hpp>
+
 
 
 StatBag S;