From: Aki Tuomi <cmouse@cmouse.fi>
Date: Tue, 24 Feb 2015 07:44:16 +0000 (+0200)
Subject: Include config.h only in .cc files
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~113^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=870a0fe4b5d567e16ad53bc8940db95e9e9ceef9;p=thirdparty%2Fpdns.git

Include config.h only in .cc files

Including config.h in header files can make it difficult to make
the header files public in future, also, including config.h only
in compilation units ensures it's only included once.
---

diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc
index 74696f0aad..0605c30dfb 100644
--- a/modules/bindbackend/bindbackend2.cc
+++ b/modules/bindbackend/bindbackend2.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <errno.h>
 #include <string>
 #include <set>
diff --git a/modules/bindbackend/binddnssec.cc b/modules/bindbackend/binddnssec.cc
index c5c63700c7..a4f7172508 100644
--- a/modules/bindbackend/binddnssec.cc
+++ b/modules/bindbackend/binddnssec.cc
@@ -19,11 +19,13 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "bindbackend2.hh"
 #include "pdns/dnsrecords.hh"
 #include "pdns/bind-dnssec.schema.sqlite3.sql.h"
 #include <boost/foreach.hpp>
-#include "config.h"
 #include "pdns/arguments.hh"
 
 #ifndef HAVE_SQLITE3
diff --git a/modules/geobackend/geobackend.cc b/modules/geobackend/geobackend.cc
index 15550247ab..5d7eb18fc9 100644
--- a/modules/geobackend/geobackend.cc
+++ b/modules/geobackend/geobackend.cc
@@ -5,6 +5,9 @@
  *         $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <fstream>
 #include <sstream>
 #include <sys/types.h>
diff --git a/modules/geobackend/ippreftree.cc b/modules/geobackend/ippreftree.cc
index db078f044c..fa0ee46489 100644
--- a/modules/geobackend/ippreftree.cc
+++ b/modules/geobackend/ippreftree.cc
@@ -5,6 +5,9 @@
  *         $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <sstream>
 
 #include "ippreftree.hh"
diff --git a/modules/geoipbackend/geoipbackend.cc b/modules/geoipbackend/geoipbackend.cc
index 023d322c4b..dccbc2fd0f 100644
--- a/modules/geoipbackend/geoipbackend.cc
+++ b/modules/geoipbackend/geoipbackend.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "geoipbackend.hh"
 #include <sstream>
 #include <regex.h>
diff --git a/modules/geoipbackend/geoipbackend.hh b/modules/geoipbackend/geoipbackend.hh
index 4c2e8acdf6..b4f4614630 100644
--- a/modules/geoipbackend/geoipbackend.hh
+++ b/modules/geoipbackend/geoipbackend.hh
@@ -1,7 +1,6 @@
 #ifndef PDNS_GEOIPBACKEND_HH
 #define PDNS_GEOIPBACKEND_HH
 
-#include "config.h"
 #include "pdns/namespaces.hh"
 
 #include <vector>
diff --git a/modules/gmysqlbackend/gmysqlbackend.cc b/modules/gmysqlbackend/gmysqlbackend.cc
index 5485b4b853..4f7425c352 100644
--- a/modules/gmysqlbackend/gmysqlbackend.cc
+++ b/modules/gmysqlbackend/gmysqlbackend.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string>
 #include <map>
 #include "pdns/namespaces.hh"
diff --git a/modules/gmysqlbackend/smysql.cc b/modules/gmysqlbackend/smysql.cc
index 6510dde468..3dedab2cd7 100644
--- a/modules/gmysqlbackend/smysql.cc
+++ b/modules/gmysqlbackend/smysql.cc
@@ -1,6 +1,9 @@
 /* Copyright 2001 Netherlabs BV, bert.hubert@netherlabs.nl. See LICENSE
    for more information.
    $Id$  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "smysql.hh"
 #include <string>
 #include <iostream>
diff --git a/modules/goraclebackend/goraclebackend.cc b/modules/goraclebackend/goraclebackend.cc
index fe2d5ec8c0..1f4d9f6473 100644
--- a/modules/goraclebackend/goraclebackend.cc
+++ b/modules/goraclebackend/goraclebackend.cc
@@ -1,4 +1,7 @@
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string>
 #include <map>
 #include "pdns/namespaces.hh"
diff --git a/modules/goraclebackend/soracle.cc b/modules/goraclebackend/soracle.cc
index 0759dfd290..42e675ed75 100644
--- a/modules/goraclebackend/soracle.cc
+++ b/modules/goraclebackend/soracle.cc
@@ -1,6 +1,9 @@
 /* Copyright 2005 Netherlabs BV, bert.hubert@netherlabs.nl. See LICENSE
    for more information. */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "soracle.hh"
 #include <string>
 #include <iostream>
diff --git a/modules/gpgsqlbackend/gpgsqlbackend.cc b/modules/gpgsqlbackend/gpgsqlbackend.cc
index 6cc824e1fa..01162c6dfa 100644
--- a/modules/gpgsqlbackend/gpgsqlbackend.cc
+++ b/modules/gpgsqlbackend/gpgsqlbackend.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string>
 #include <map>
 #include "pdns/namespaces.hh"
diff --git a/modules/gpgsqlbackend/spgsql.cc b/modules/gpgsqlbackend/spgsql.cc
index f30a3dadd4..3e19fa8482 100644
--- a/modules/gpgsqlbackend/spgsql.cc
+++ b/modules/gpgsqlbackend/spgsql.cc
@@ -1,5 +1,8 @@
 /* Copyright 2003 - 2005 Netherlabs BV, bert.hubert@netherlabs.nl. See LICENSE 
    for more information. */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string>
 #include "spgsql.hh"
 
diff --git a/modules/gsqlite3backend/gsqlite3backend.cc b/modules/gsqlite3backend/gsqlite3backend.cc
index 7a03716b88..c6a2b91b7b 100644
--- a/modules/gsqlite3backend/gsqlite3backend.cc
+++ b/modules/gsqlite3backend/gsqlite3backend.cc
@@ -4,6 +4,9 @@
 // Copyright (C) 2011, PowerDNS.COM BV
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "pdns/utility.hh"
 #include <map>
 #include <unistd.h>
diff --git a/modules/ldapbackend/ldapbackend.cc b/modules/ldapbackend/ldapbackend.cc
index 0eda8630b5..aafa4dd01b 100644
--- a/modules/ldapbackend/ldapbackend.cc
+++ b/modules/ldapbackend/ldapbackend.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "ldapbackend.hh"
 
 
diff --git a/modules/ldapbackend/ldapbackend.hh b/modules/ldapbackend/ldapbackend.hh
index b48b971a4f..ca9db96ff3 100644
--- a/modules/ldapbackend/ldapbackend.hh
+++ b/modules/ldapbackend/ldapbackend.hh
@@ -36,9 +36,6 @@
 #include "powerldap.hh"
 #include "utils.hh"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 
 
 #ifndef LDAPBACKEND_HH
diff --git a/modules/ldapbackend/powerldap.cc b/modules/ldapbackend/powerldap.cc
index 18006462a1..dcb01b6769 100644
--- a/modules/ldapbackend/powerldap.cc
+++ b/modules/ldapbackend/powerldap.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "powerldap.hh"
 #include "pdns/misc.hh"
 #include <sys/time.h>
diff --git a/modules/ldapbackend/powerldap.hh b/modules/ldapbackend/powerldap.hh
index a2ae07987d..b585eff8ba 100644
--- a/modules/ldapbackend/powerldap.hh
+++ b/modules/ldapbackend/powerldap.hh
@@ -29,9 +29,6 @@
 #include <lber.h>
 #include <ldap.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 
 
 
diff --git a/modules/lmdbbackend/lmdbbackend.cc b/modules/lmdbbackend/lmdbbackend.cc
index eb3c57b800..6d4acb6ee5 100644
--- a/modules/lmdbbackend/lmdbbackend.cc
+++ b/modules/lmdbbackend/lmdbbackend.cc
@@ -12,6 +12,9 @@
  * script which generates a simple zone.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "pdns/utility.hh"
 #include "pdns/dnsbackend.hh"
 #include "pdns/dns.hh"
diff --git a/modules/luabackend/dnssec.cc b/modules/luabackend/dnssec.cc
index 0988b28871..401bdcdc1f 100644
--- a/modules/luabackend/dnssec.cc
+++ b/modules/luabackend/dnssec.cc
@@ -16,6 +16,9 @@
 */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "luabackend.hh"
 
 #include "pdns/logger.hh"
diff --git a/modules/luabackend/lua_functions.cc b/modules/luabackend/lua_functions.cc
index b30c13f4dd..1a8483155b 100644
--- a/modules/luabackend/lua_functions.cc
+++ b/modules/luabackend/lua_functions.cc
@@ -17,6 +17,9 @@
 
 #define LUABACKEND_EXTERN_F_HH
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "luabackend.hh"
 
 #include "pdns/logger.hh"
diff --git a/modules/luabackend/luabackend.cc b/modules/luabackend/luabackend.cc
index 9391e6253d..cfddf4f7c8 100644
--- a/modules/luabackend/luabackend.cc
+++ b/modules/luabackend/luabackend.cc
@@ -15,6 +15,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "luabackend.hh"
 #include "pdns/logger.hh"
 
diff --git a/modules/luabackend/master.cc b/modules/luabackend/master.cc
index d607e24475..fd9a9a817a 100644
--- a/modules/luabackend/master.cc
+++ b/modules/luabackend/master.cc
@@ -16,6 +16,9 @@
 */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "luabackend.hh"
 
 #include "pdns/logger.hh"
diff --git a/modules/luabackend/minimal.cc b/modules/luabackend/minimal.cc
index cc4247fbdf..d92a7d9f82 100644
--- a/modules/luabackend/minimal.cc
+++ b/modules/luabackend/minimal.cc
@@ -15,6 +15,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "luabackend.hh"
 
 #include "pdns/logger.hh"
diff --git a/modules/luabackend/private.cc b/modules/luabackend/private.cc
index 270265c163..9ee1cf169c 100644
--- a/modules/luabackend/private.cc
+++ b/modules/luabackend/private.cc
@@ -15,6 +15,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "luabackend.hh"
 
 #include "pdns/logger.hh"
diff --git a/modules/luabackend/reload.cc b/modules/luabackend/reload.cc
index 34db96a07d..6a74ab13b2 100644
--- a/modules/luabackend/reload.cc
+++ b/modules/luabackend/reload.cc
@@ -16,6 +16,9 @@
 */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "luabackend.hh"
 
 #include "pdns/logger.hh"
diff --git a/modules/luabackend/slave.cc b/modules/luabackend/slave.cc
index 729286cb01..8f60b14b87 100644
--- a/modules/luabackend/slave.cc
+++ b/modules/luabackend/slave.cc
@@ -16,6 +16,9 @@
 */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "luabackend.hh"
 
 #include "pdns/logger.hh"
diff --git a/modules/luabackend/supermaster.cc b/modules/luabackend/supermaster.cc
index a877352f5f..9360356d47 100644
--- a/modules/luabackend/supermaster.cc
+++ b/modules/luabackend/supermaster.cc
@@ -16,6 +16,9 @@
 */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "luabackend.hh"
 
 #include "pdns/logger.hh"
diff --git a/modules/mydnsbackend/mydnsbackend.cc b/modules/mydnsbackend/mydnsbackend.cc
index a46e350d76..80ee38a345 100644
--- a/modules/mydnsbackend/mydnsbackend.cc
+++ b/modules/mydnsbackend/mydnsbackend.cc
@@ -19,6 +19,9 @@
  * If you do not know what mydns is: http://mydns.bboy.net/
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string>
 #include <map>
 #include <unistd.h>
diff --git a/modules/opendbxbackend/odbxbackend.cc b/modules/opendbxbackend/odbxbackend.cc
index 80df4debfe..fd6cc1987b 100644
--- a/modules/opendbxbackend/odbxbackend.cc
+++ b/modules/opendbxbackend/odbxbackend.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "odbxbackend.hh"
 
 
diff --git a/modules/opendbxbackend/odbxprivate.cc b/modules/opendbxbackend/odbxprivate.cc
index a5f1bec855..399f5f076e 100644
--- a/modules/opendbxbackend/odbxprivate.cc
+++ b/modules/opendbxbackend/odbxprivate.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "odbxbackend.hh"
 
 
diff --git a/modules/oraclebackend/oraclebackend.cc b/modules/oraclebackend/oraclebackend.cc
index 7d2cdc450b..40cfa58d93 100644
--- a/modules/oraclebackend/oraclebackend.cc
+++ b/modules/oraclebackend/oraclebackend.cc
@@ -9,6 +9,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string>
 #include <stdexcept>
 
diff --git a/modules/pipebackend/coprocess.cc b/modules/pipebackend/coprocess.cc
index ee1415f370..06860ff0bf 100644
--- a/modules/pipebackend/coprocess.cc
+++ b/modules/pipebackend/coprocess.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "coprocess.hh"
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/modules/pipebackend/pipebackend.cc b/modules/pipebackend/pipebackend.cc
index b8f68d764f..adf74ed9dd 100644
--- a/modules/pipebackend/pipebackend.cc
+++ b/modules/pipebackend/pipebackend.cc
@@ -3,6 +3,9 @@
 // Version : $Id$ 
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string>
 #include <map>
 #include <unistd.h>
diff --git a/modules/randombackend/randombackend.cc b/modules/randombackend/randombackend.cc
index 1244410a22..b70dfa07db 100644
--- a/modules/randombackend/randombackend.cc
+++ b/modules/randombackend/randombackend.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "pdns/utility.hh"
 #include "pdns/dnsbackend.hh"
 #include "pdns/dns.hh"
diff --git a/modules/remotebackend/httpconnector.cc b/modules/remotebackend/httpconnector.cc
index b74d105a9d..e4c97e9935 100644
--- a/modules/remotebackend/httpconnector.cc
+++ b/modules/remotebackend/httpconnector.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "remotebackend.hh"
 #include <sys/socket.h>
 #include <unistd.h>
diff --git a/modules/remotebackend/pipeconnector.cc b/modules/remotebackend/pipeconnector.cc
index 140132a201..76962921d0 100644
--- a/modules/remotebackend/pipeconnector.cc
+++ b/modules/remotebackend/pipeconnector.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <sys/types.h>
 #include <sys/wait.h>
 #include "remotebackend.hh"
diff --git a/modules/remotebackend/remotebackend.cc b/modules/remotebackend/remotebackend.cc
index 47dbad905a..fe86a08958 100644
--- a/modules/remotebackend/remotebackend.cc
+++ b/modules/remotebackend/remotebackend.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "remotebackend.hh"
 #include <boost/foreach.hpp>
 
diff --git a/modules/remotebackend/test-remotebackend-http.cc b/modules/remotebackend/test-remotebackend-http.cc
index 4a84792e03..b375035724 100644
--- a/modules/remotebackend/test-remotebackend-http.cc
+++ b/modules/remotebackend/test-remotebackend-http.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "pdns/namespaces.hh"
 #include "pdns/dns.hh"
 #include "pdns/dnsbackend.hh"
diff --git a/modules/remotebackend/test-remotebackend-json.cc b/modules/remotebackend/test-remotebackend-json.cc
index 402986e8fa..536f8e0138 100644
--- a/modules/remotebackend/test-remotebackend-json.cc
+++ b/modules/remotebackend/test-remotebackend-json.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "pdns/namespaces.hh"
 #include "pdns/dns.hh"
 #include "pdns/dnsbackend.hh"
diff --git a/modules/remotebackend/test-remotebackend-pipe.cc b/modules/remotebackend/test-remotebackend-pipe.cc
index 687a454997..5a3b1d3a51 100644
--- a/modules/remotebackend/test-remotebackend-pipe.cc
+++ b/modules/remotebackend/test-remotebackend-pipe.cc
@@ -2,6 +2,9 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE unit
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
diff --git a/modules/remotebackend/test-remotebackend-post.cc b/modules/remotebackend/test-remotebackend-post.cc
index 3f093ac4c0..1580747d61 100644
--- a/modules/remotebackend/test-remotebackend-post.cc
+++ b/modules/remotebackend/test-remotebackend-post.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "pdns/namespaces.hh"
 #include "pdns/dns.hh"
 #include "pdns/dnsbackend.hh"
diff --git a/modules/remotebackend/test-remotebackend-unix.cc b/modules/remotebackend/test-remotebackend-unix.cc
index ab30b4fd3d..b95dfce944 100644
--- a/modules/remotebackend/test-remotebackend-unix.cc
+++ b/modules/remotebackend/test-remotebackend-unix.cc
@@ -2,6 +2,9 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE unit
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
diff --git a/modules/remotebackend/test-remotebackend-zeromq.cc b/modules/remotebackend/test-remotebackend-zeromq.cc
index 00af000daf..e7b2af4c5a 100644
--- a/modules/remotebackend/test-remotebackend-zeromq.cc
+++ b/modules/remotebackend/test-remotebackend-zeromq.cc
@@ -2,6 +2,9 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE unit
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
diff --git a/modules/remotebackend/test-remotebackend.cc b/modules/remotebackend/test-remotebackend.cc
index 0d64dd51b8..596135c31b 100644
--- a/modules/remotebackend/test-remotebackend.cc
+++ b/modules/remotebackend/test-remotebackend.cc
@@ -1,6 +1,9 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_NO_MAIN
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
diff --git a/modules/remotebackend/unixconnector.cc b/modules/remotebackend/unixconnector.cc
index 516e3b52de..ef2b40a813 100644
--- a/modules/remotebackend/unixconnector.cc
+++ b/modules/remotebackend/unixconnector.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "remotebackend.hh"
 #include <sys/socket.h>
 #include "pdns/lock.hh" 
diff --git a/modules/remotebackend/zmqconnector.cc b/modules/remotebackend/zmqconnector.cc
index 8e427c49f3..cd06baee8b 100644
--- a/modules/remotebackend/zmqconnector.cc
+++ b/modules/remotebackend/zmqconnector.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "remotebackend.hh"
 #ifdef REMOTEBACKEND_ZEROMQ
 
diff --git a/modules/tinydnsbackend/cdb.cc b/modules/tinydnsbackend/cdb.cc
index e67bea68bc..12ab64892a 100644
--- a/modules/tinydnsbackend/cdb.cc
+++ b/modules/tinydnsbackend/cdb.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "cdb.hh"
 #include <cdb.h>
 #include "pdns/misc.hh"
diff --git a/modules/tinydnsbackend/tinydnsbackend.cc b/modules/tinydnsbackend/tinydnsbackend.cc
index 74dae2da03..dede528938 100644
--- a/modules/tinydnsbackend/tinydnsbackend.cc
+++ b/modules/tinydnsbackend/tinydnsbackend.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "tinydnsbackend.hh"
 #include "pdns/lock.hh"
 #include <cdb.h>
diff --git a/pdns/arguments.cc b/pdns/arguments.cc
index 163537dbe5..ff72d7caa2 100644
--- a/pdns/arguments.cc
+++ b/pdns/arguments.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "arguments.hh"
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/compare.hpp>
diff --git a/pdns/auth-carbon.cc b/pdns/auth-carbon.cc
index 1d9ebea715..c9aa54ad56 100644
--- a/pdns/auth-carbon.cc
+++ b/pdns/auth-carbon.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "statbag.hh"
 #include "logger.hh"
 #include "iputils.hh"
diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc
index fc8e2148ee..fbe616eaf6 100644
--- a/pdns/backends/gsql/gsqlbackend.cc
+++ b/pdns/backends/gsql/gsqlbackend.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "pdns/dns.hh"
 #include "pdns/dnsbackend.hh"
 #include "gsqlbackend.hh"
diff --git a/pdns/base32.cc b/pdns/base32.cc
index b76442a96e..d887015794 100644
--- a/pdns/base32.cc
+++ b/pdns/base32.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <stdint.h>
 #include <stdio.h>
 #include <string>
diff --git a/pdns/base64.cc b/pdns/base64.cc
index 87bebd857b..68755733d5 100644
--- a/pdns/base64.cc
+++ b/pdns/base64.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "base64.hh"
 #include <boost/scoped_array.hpp>
 #include <polarssl/base64.h>
diff --git a/pdns/botan110signers.cc b/pdns/botan110signers.cc
index 648d243f99..d3a8299776 100644
--- a/pdns/botan110signers.cc
+++ b/pdns/botan110signers.cc
@@ -1,4 +1,7 @@
 // utf-8 UTF-8 utf8 UTF8
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <botan/botan.h>
 #include <botan/ecdsa.h>
 #include <botan/gost_3410.h>
diff --git a/pdns/botan18signers.cc b/pdns/botan18signers.cc
index 9cad576a76..af6a30d970 100644
--- a/pdns/botan18signers.cc
+++ b/pdns/botan18signers.cc
@@ -1,4 +1,7 @@
 // utf-8 UTF-8 utf8 UTF8
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <botan/botan.h>
 #include <botan/ecdsa.h>
 #include <botan/ecdsa_op.h>
diff --git a/pdns/botansigners.cc b/pdns/botansigners.cc
index bc1c4a7271..282192232c 100644
--- a/pdns/botansigners.cc
+++ b/pdns/botansigners.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <botan/botan.h>
 #include <botan/sha160.h>
 #include <botan/sha2_32.h>
diff --git a/pdns/calidns.cc b/pdns/calidns.cc
index 4806340c63..25b10860c9 100644
--- a/pdns/calidns.cc
+++ b/pdns/calidns.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <iostream>
 #include "dnsparser.hh"
 #include "sstuff.hh"
diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index edd9313caf..e14cf8bab8 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "common_startup.hh"
 #include "ws-auth.hh"
 #include "secpoll-auth.hh"
diff --git a/pdns/communicator.cc b/pdns/communicator.cc
index ea22b1bacd..46949793a2 100644
--- a/pdns/communicator.cc
+++ b/pdns/communicator.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "packetcache.hh"
 #include "utility.hh"
 #include <errno.h>
diff --git a/pdns/cryptoppsigners.cc b/pdns/cryptoppsigners.cc
index 2812dc88b4..0c4a95d86f 100644
--- a/pdns/cryptoppsigners.cc
+++ b/pdns/cryptoppsigners.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <cryptopp/osrng.h>
 #include <cryptopp/aes.h>
 #include <cryptopp/integer.h>
diff --git a/pdns/dbdnsseckeeper.cc b/pdns/dbdnsseckeeper.cc
index 10e2e8ce93..781f956ca5 100644
--- a/pdns/dbdnsseckeeper.cc
+++ b/pdns/dbdnsseckeeper.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "dnsseckeeper.hh"
 #include "dnssecinfra.hh"
 #include "ueberbackend.hh"
diff --git a/pdns/devpollmplexer.cc b/pdns/devpollmplexer.cc
index 984a0493ee..53c39f30d4 100644
--- a/pdns/devpollmplexer.cc
+++ b/pdns/devpollmplexer.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <sys/devpoll.h>
 #include "mplexer.hh"
 #include "sstuff.hh"
diff --git a/pdns/dns.cc b/pdns/dns.cc
index 1678f7072c..1b5a9b264c 100644
--- a/pdns/dns.cc
+++ b/pdns/dns.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "dns.hh"
 #include "misc.hh"
 #include "arguments.hh"
diff --git a/pdns/dns_random.cc b/pdns/dns_random.cc
index 8944ba2885..34a043ef04 100644
--- a/pdns/dns_random.cc
+++ b/pdns/dns_random.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <polarssl/aes.h>
 #include <iostream>
 #include <cstdlib>
diff --git a/pdns/dnsbackend.cc b/pdns/dnsbackend.cc
index a861c99ea2..5a935dfcc0 100644
--- a/pdns/dnsbackend.cc
+++ b/pdns/dnsbackend.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "utility.hh"
 #include "dnsbackend.hh"
 #include "arguments.hh"
diff --git a/pdns/dnsbulktest.cc b/pdns/dnsbulktest.cc
index 7673ee6cf5..1f09d1b88b 100644
--- a/pdns/dnsbulktest.cc
+++ b/pdns/dnsbulktest.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/accumulators/accumulators.hpp>
 #include <boost/array.hpp>
 #include <boost/accumulators/statistics.hpp>
diff --git a/pdns/dnsdemog.cc b/pdns/dnsdemog.cc
index 5518b96e62..bd3d1d2be2 100644
--- a/pdns/dnsdemog.cc
+++ b/pdns/dnsdemog.cc
@@ -1,4 +1,7 @@
 #define __FAVOR_BSD
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "statbag.hh"
 #include "dnspcap.hh"
 #include "dnsparser.hh"
diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc
index c84e53b9a8..defe002633 100644
--- a/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "ext/luawrapper/include/LuaContext.hpp"
 #include "sstuff.hh"
 #include "misc.hh"
diff --git a/pdns/dnsgram.cc b/pdns/dnsgram.cc
index 80eaedbde2..175951b801 100644
--- a/pdns/dnsgram.cc
+++ b/pdns/dnsgram.cc
@@ -1,4 +1,7 @@
 #define __FAVOR_BSD
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "statbag.hh"
 #include "dnspcap.hh"
 #include "dnsrecords.hh"
diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index 82beddd478..1aa4532f74 100644
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "utility.hh"
 #include <cstdio>
 #include <cstdlib>
diff --git a/pdns/dnspacket.hh b/pdns/dnspacket.hh
index 6a7f2bfe12..62405d880f 100644
--- a/pdns/dnspacket.hh
+++ b/pdns/dnspacket.hh
@@ -55,9 +55,6 @@
 #include "pdnsexception.hh"
 #include "dnsrecords.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
- #endif // HAVE_CONFIG_H
 
 
 class UeberBackend;
diff --git a/pdns/dnsparser.cc b/pdns/dnsparser.cc
index e06eae3409..e2f367a5a3 100644
--- a/pdns/dnsparser.cc
+++ b/pdns/dnsparser.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "dnsparser.hh"
 #include "dnswriter.hh"
 #include <boost/lexical_cast.hpp>
diff --git a/pdns/dnspcap.cc b/pdns/dnspcap.cc
index 7f4a9eeb66..5ca85d5ce9 100644
--- a/pdns/dnspcap.cc
+++ b/pdns/dnspcap.cc
@@ -1,4 +1,7 @@
 #define __FAVOR_BSD
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "dnspcap.hh"
 #include <boost/format.hpp>
 #include <fcntl.h>
diff --git a/pdns/dnsproxy.cc b/pdns/dnsproxy.cc
index dc324ce0b7..d8ff5339f0 100644
--- a/pdns/dnsproxy.cc
+++ b/pdns/dnsproxy.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "packetcache.hh"
 #include "utility.hh"
 #include "dnsproxy.hh"
diff --git a/pdns/dnsrecords.cc b/pdns/dnsrecords.cc
index 6a0b24aa44..a94d02c826 100644
--- a/pdns/dnsrecords.cc
+++ b/pdns/dnsrecords.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "utility.hh"
 #include "dnsrecords.hh"
 #include <boost/foreach.hpp>
diff --git a/pdns/dnsreplay.cc b/pdns/dnsreplay.cc
index 9e81356170..8abe25caeb 100644
--- a/pdns/dnsreplay.cc
+++ b/pdns/dnsreplay.cc
@@ -38,6 +38,9 @@ What to do with timeouts. We keep around at most 65536 outstanding answers.
 
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <bitset>
 #include "statbag.hh"
 #include "dnspcap.hh"
diff --git a/pdns/dnsscan.cc b/pdns/dnsscan.cc
index 8da65686dc..d5aaccad03 100644
--- a/pdns/dnsscan.cc
+++ b/pdns/dnsscan.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <bitset>
 #include "statbag.hh"
 #include "dnspcap.hh"
diff --git a/pdns/dnsscope.cc b/pdns/dnsscope.cc
index 4b36701bb1..d740b8edeb 100644
--- a/pdns/dnsscope.cc
+++ b/pdns/dnsscope.cc
@@ -1,4 +1,7 @@
 #define __FAVOR_BSD
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "statbag.hh"
 #include "dnspcap.hh"
 #include "dnsparser.hh"
diff --git a/pdns/dnssecinfra.cc b/pdns/dnssecinfra.cc
index 29ef7dcb9c..82d69733fc 100644
--- a/pdns/dnssecinfra.cc
+++ b/pdns/dnssecinfra.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "dnsparser.hh"
 #include "sstuff.hh"
 #include "misc.hh"
diff --git a/pdns/dnssecsigner.cc b/pdns/dnssecsigner.cc
index 7813ccb972..14060ad896 100644
--- a/pdns/dnssecsigner.cc
+++ b/pdns/dnssecsigner.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "dnssecinfra.hh"
 #include "namespaces.hh"
 #include <boost/foreach.hpp>
diff --git a/pdns/dnstcpbench.cc b/pdns/dnstcpbench.cc
index e7e5658edd..19fd8e2440 100644
--- a/pdns/dnstcpbench.cc
+++ b/pdns/dnstcpbench.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/accumulators/statistics/median.hpp>
 #include <boost/accumulators/statistics/mean.hpp>
 #include <boost/accumulators/accumulators.hpp>
diff --git a/pdns/dnswasher.cc b/pdns/dnswasher.cc
index e992f770bc..95bac86552 100644
--- a/pdns/dnswasher.cc
+++ b/pdns/dnswasher.cc
@@ -12,6 +12,9 @@ otherwise, obfuscate the response IP address
 */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "statbag.hh"
 #include "dnspcap.hh"
 
diff --git a/pdns/dnswriter.cc b/pdns/dnswriter.cc
index e38055ba5d..68252f2c6b 100644
--- a/pdns/dnswriter.cc
+++ b/pdns/dnswriter.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "dnswriter.hh"
 #include "misc.hh"
 #include "dnsparser.hh"
diff --git a/pdns/dumresp.cc b/pdns/dumresp.cc
index 8739715a05..679dc1b95d 100644
--- a/pdns/dumresp.cc
+++ b/pdns/dumresp.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "iputils.hh"
 #include "sstuff.hh"
 #include "statbag.hh"
diff --git a/pdns/dynhandler.cc b/pdns/dynhandler.cc
index 51d52328dd..de76b508d6 100644
--- a/pdns/dynhandler.cc
+++ b/pdns/dynhandler.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "packetcache.hh"
 #include "utility.hh"
 #include "dynhandler.hh"
diff --git a/pdns/dynhandler.hh b/pdns/dynhandler.hh
index 4573b09ac2..4f112dec76 100644
--- a/pdns/dynhandler.hh
+++ b/pdns/dynhandler.hh
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-#include "config.h"
 #include <unistd.h>
 
 #include "namespaces.hh"
diff --git a/pdns/dynlistener.cc b/pdns/dynlistener.cc
index 5b3c8c1261..d853594145 100644
--- a/pdns/dynlistener.cc
+++ b/pdns/dynlistener.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <cstring>
 #include <string>
 #include <map>
diff --git a/pdns/dynloader.cc b/pdns/dynloader.cc
index bb2e4596ca..5457b2a7e2 100644
--- a/pdns/dynloader.cc
+++ b/pdns/dynloader.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <iostream>
 #include <cstdio>
 #include <cstring>
@@ -38,7 +41,6 @@
 #include "misc.hh"
 #include "dynmessenger.hh"
 #include "arguments.hh"
-#include "config.h"
 #include "statbag.hh"
 #include "misc.hh"
 #include "namespaces.hh"
diff --git a/pdns/dynmessenger.cc b/pdns/dynmessenger.cc
index fb52ca5c3c..001d7a4f2a 100644
--- a/pdns/dynmessenger.cc
+++ b/pdns/dynmessenger.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "dynmessenger.hh"
 #include <cstdio>
 #include <cstdlib>
diff --git a/pdns/ed25519signers.cc b/pdns/ed25519signers.cc
index ed31dbcb6a..176bbeb0ee 100644
--- a/pdns/ed25519signers.cc
+++ b/pdns/ed25519signers.cc
@@ -1,5 +1,8 @@
 // utf-8 UTF-8 utf8 UTF8
 extern "C" {
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "ext/ed25519/crypto_sign.h"
 }
 #include "dnssecinfra.hh"
diff --git a/pdns/ednssubnet.cc b/pdns/ednssubnet.cc
index fafd9b92c4..ed9084f2e4 100644
--- a/pdns/ednssubnet.cc
+++ b/pdns/ednssubnet.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "ednssubnet.hh"
 #include "dns.hh"
 
diff --git a/pdns/epollmplexer.cc b/pdns/epollmplexer.cc
index dcb195fa4d..c647ae9900 100644
--- a/pdns/epollmplexer.cc
+++ b/pdns/epollmplexer.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "mplexer.hh"
 #include "sstuff.hh"
 #include <iostream>
diff --git a/pdns/inflighter.cc b/pdns/inflighter.cc
index f1698ba333..9729c9c1d8 100644
--- a/pdns/inflighter.cc
+++ b/pdns/inflighter.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <vector>
 #include <deque>
 #include <iostream>
diff --git a/pdns/iputils.cc b/pdns/iputils.cc
index 5ea22f9790..2022db2123 100644
--- a/pdns/iputils.cc
+++ b/pdns/iputils.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "iputils.hh"
 #include <sys/socket.h> 
 
diff --git a/pdns/json.cc b/pdns/json.cc
index 8e24ca508b..ac00f3a5cd 100644
--- a/pdns/json.cc
+++ b/pdns/json.cc
@@ -19,6 +19,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "json.hh"
 #include "namespaces.hh"
 #include "misc.hh"
diff --git a/pdns/kqueuemplexer.cc b/pdns/kqueuemplexer.cc
index c078457316..6d469baae4 100644
--- a/pdns/kqueuemplexer.cc
+++ b/pdns/kqueuemplexer.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "mplexer.hh"
 #include "sstuff.hh"
 #include <iostream>
diff --git a/pdns/logger.cc b/pdns/logger.cc
index 95019049b7..2202372422 100644
--- a/pdns/logger.cc
+++ b/pdns/logger.cc
@@ -19,8 +19,10 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#include "logger.hh"
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+#include "logger.hh"
 #include "misc.hh"
 #ifndef RECURSOR
 #include "statbag.hh"
diff --git a/pdns/logger.hh b/pdns/logger.hh
index e1d1d826fb..f74f4a1acf 100644
--- a/pdns/logger.hh
+++ b/pdns/logger.hh
@@ -27,7 +27,6 @@
 #include <ctime>
 #include <iostream>
 #include <sstream>
-#include "config.h"
 #include <syslog.h>
 #include <pthread.h>
 
diff --git a/pdns/lua-auth.cc b/pdns/lua-auth.cc
index 6b6b6a472b..f103f9e0ae 100644
--- a/pdns/lua-auth.cc
+++ b/pdns/lua-auth.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "lua-auth.hh"
 
 #if !defined(HAVE_LUA)
diff --git a/pdns/lua-iputils.cc b/pdns/lua-iputils.cc
index 9656459023..95a98bba10 100644
--- a/pdns/lua-iputils.cc
+++ b/pdns/lua-iputils.cc
@@ -1,4 +1,6 @@
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #ifdef HAVE_LUA
 extern "C" {
 #include <lua.h>
diff --git a/pdns/lua-pdns.cc b/pdns/lua-pdns.cc
index c8bcefb026..7bc06467db 100644
--- a/pdns/lua-pdns.cc
+++ b/pdns/lua-pdns.cc
@@ -1,7 +1,9 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "lua-pdns.hh"
 // #include "syncres.hh"
 #include <boost/foreach.hpp>
-#include "config.h"
 
 #if !defined(HAVE_LUA)
 
diff --git a/pdns/lua-recursor.cc b/pdns/lua-recursor.cc
index de402f49db..3ff659f799 100644
--- a/pdns/lua-recursor.cc
+++ b/pdns/lua-recursor.cc
@@ -1,5 +1,7 @@
-#include "lua-recursor.hh"
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+#include "lua-recursor.hh"
 // to avoid including all of syncres.hh
 int directResolve(const std::string& qname, const QType& qtype, int qclass, vector<DNSResourceRecord>& ret);
 
diff --git a/pdns/lwres.cc b/pdns/lwres.cc
index c60ed8a32c..fe4eb9dea4 100644
--- a/pdns/lwres.cc
+++ b/pdns/lwres.cc
@@ -21,6 +21,9 @@
 */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "utility.hh"
 #include "lwres.hh"
 #include <iostream>
diff --git a/pdns/mastercommunicator.cc b/pdns/mastercommunicator.cc
index cb3a6770b9..3c80120075 100644
--- a/pdns/mastercommunicator.cc
+++ b/pdns/mastercommunicator.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "packetcache.hh"
 #include "utility.hh"
 #include <errno.h>
diff --git a/pdns/misc.cc b/pdns/misc.cc
index e155bc9bc1..872a72237d 100644
--- a/pdns/misc.cc
+++ b/pdns/misc.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netdb.h>
diff --git a/pdns/mtasker.cc b/pdns/mtasker.cc
index 4ea7770564..087dcbecb7 100644
--- a/pdns/mtasker.cc
+++ b/pdns/mtasker.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "mtasker.hh"
 #include "misc.hh"
 #include <stdio.h>
diff --git a/pdns/nameserver.cc b/pdns/nameserver.cc
index 4dc9323321..37ed3c9839 100644
--- a/pdns/nameserver.cc
+++ b/pdns/nameserver.cc
@@ -19,6 +19,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "utility.hh"
 #include <cstdio>
 #include <cstring>
diff --git a/pdns/notify.cc b/pdns/notify.cc
index 6f1eaed5b5..70f20f8877 100644
--- a/pdns/notify.cc
+++ b/pdns/notify.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <bitset>
 #include "dnsparser.hh"
 #include "iputils.hh"
diff --git a/pdns/nproxy.cc b/pdns/nproxy.cc
index 44b916e43e..7237a16b35 100644
--- a/pdns/nproxy.cc
+++ b/pdns/nproxy.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <bitset>
 #include "dnsparser.hh"
 #include "iputils.hh"
diff --git a/pdns/nsec3dig.cc b/pdns/nsec3dig.cc
index 5cee2908d3..d3bcdaa4f4 100644
--- a/pdns/nsec3dig.cc
+++ b/pdns/nsec3dig.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "dnsparser.hh"
 #include "sstuff.hh"
 #include "misc.hh"
diff --git a/pdns/nsecrecords.cc b/pdns/nsecrecords.cc
index 15b2efa2a4..9dc4994e32 100644
--- a/pdns/nsecrecords.cc
+++ b/pdns/nsecrecords.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "dnsrecords.hh"
 
 void NSECRecordContent::report(void)
diff --git a/pdns/packetcache.cc b/pdns/packetcache.cc
index 5c7f013d0a..4ef5d2621d 100644
--- a/pdns/packetcache.cc
+++ b/pdns/packetcache.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "utility.hh"
 #include "packetcache.hh"
 #include "logger.hh"
diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index c727c31996..ef5599d414 100644
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "packetcache.hh"
 #include "utility.hh"
 #include "base32.hh"
diff --git a/pdns/pdns_hw.cc b/pdns/pdns_hw.cc
index 88299707b9..b0f13cc5eb 100644
--- a/pdns/pdns_hw.cc
+++ b/pdns/pdns_hw.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/lexical_cast.hpp>
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/ordered_index.hpp>
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 4ffbd16100..df4276cf21 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <netdb.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index 851610589b..bac88672e3 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "dnsseckeeper.hh"
 #include "dnssecinfra.hh"
 #include "statbag.hh"
diff --git a/pdns/pkcs11signers.cc b/pdns/pkcs11signers.cc
index 6dd3c669f8..c703b2e5e7 100644
--- a/pdns/pkcs11signers.cc
+++ b/pdns/pkcs11signers.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <polarssl/rsa.h>
 #include <polarssl/base64.h>
 #include <polarssl/entropy.h>
diff --git a/pdns/polarrsakeyinfra.cc b/pdns/polarrsakeyinfra.cc
index 5bdee4d5bf..bba0193960 100644
--- a/pdns/polarrsakeyinfra.cc
+++ b/pdns/polarrsakeyinfra.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <polarssl/rsa.h>
 #include <polarssl/base64.h>
 #include <sha.hh>
diff --git a/pdns/pollmplexer.cc b/pdns/pollmplexer.cc
index 4e6fd49ade..5b38341bb6 100644
--- a/pdns/pollmplexer.cc
+++ b/pdns/pollmplexer.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "mplexer.hh"
 #include "sstuff.hh"
 #include <iostream>
diff --git a/pdns/portsmplexer.cc b/pdns/portsmplexer.cc
index db032e9954..03ad0ed0d7 100644
--- a/pdns/portsmplexer.cc
+++ b/pdns/portsmplexer.cc
@@ -1,4 +1,7 @@
 #if defined(__sun__) && defined(__svr4__)
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <port.h>
 #include <sys/port_impl.h>
 #endif
diff --git a/pdns/qtype.cc b/pdns/qtype.cc
index ed7bf4fd06..c53db7dd54 100644
--- a/pdns/qtype.cc
+++ b/pdns/qtype.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "utility.hh"
 #include "dns.hh"
 #include <iostream>
diff --git a/pdns/randomhelper.cc b/pdns/randomhelper.cc
index 89c1f6643e..9ea1b22c1f 100644
--- a/pdns/randomhelper.cc
+++ b/pdns/randomhelper.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "misc.hh"
 #include "logger.hh"
 #include <sys/types.h>
diff --git a/pdns/rcpgenerator.cc b/pdns/rcpgenerator.cc
index a3b4354bc7..7a0111e174 100644
--- a/pdns/rcpgenerator.cc
+++ b/pdns/rcpgenerator.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "rcpgenerator.hh"
 #include "dnsparser.hh"
 #include "misc.hh"
diff --git a/pdns/rec-carbon.cc b/pdns/rec-carbon.cc
index 69d01120ac..d27a7c2a3e 100644
--- a/pdns/rec-carbon.cc
+++ b/pdns/rec-carbon.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "mtasker.hh"
 #include "syncres.hh"
 #include "rec_channel.hh"
diff --git a/pdns/rec_channel.cc b/pdns/rec_channel.cc
index d566c06a71..77a5d68bac 100644
--- a/pdns/rec_channel.cc
+++ b/pdns/rec_channel.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "rec_channel.hh"
 #include <sys/socket.h>
 #include <cerrno>
diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc
index 4c0dc19a71..44bca9b2c1 100644
--- a/pdns/rec_channel_rec.cc
+++ b/pdns/rec_channel_rec.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "utility.hh"
 #include "rec_channel.hh"
 #include <boost/lexical_cast.hpp>
diff --git a/pdns/rec_control.cc b/pdns/rec_control.cc
index fb30046d97..eb45651e1e 100644
--- a/pdns/rec_control.cc
+++ b/pdns/rec_control.cc
@@ -19,11 +19,13 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "rec_channel.hh"
 #include <iostream>
 #include "pdnsexception.hh"
 #include "arguments.hh"
-#include "config.h"
 
 #include "namespaces.hh"
 
diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index 3925f95e80..7df07ca2c1 100644
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "packetcache.hh"
 
 #include <cstdio>
@@ -44,7 +47,6 @@
 #include <fstream>
 #include <boost/algorithm/string.hpp>
 
-#include "config.h"
 #include "dns.hh"
 #include "dnsbackend.hh"
 #include "ueberbackend.hh"
diff --git a/pdns/recpacketcache.cc b/pdns/recpacketcache.cc
index c9e89d12b1..f22a4c6638 100644
--- a/pdns/recpacketcache.cc
+++ b/pdns/recpacketcache.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <iostream>
 #include <boost/foreach.hpp>
 #include "recpacketcache.hh"
diff --git a/pdns/recursor_cache.cc b/pdns/recursor_cache.cc
index dda3f42666..8b1a173858 100644
--- a/pdns/recursor_cache.cc
+++ b/pdns/recursor_cache.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "recursor_cache.hh"
 #include "misc.hh"
 #include <iostream>
@@ -11,7 +14,6 @@
 #include "namespaces.hh"
 #include "namespaces.hh"
 
-#include "config.h"
 
 DNSResourceRecord String2DNSRR(const string& qname, const QType& qt, const string& serial, uint32_t ttd)
 {
diff --git a/pdns/reczones.cc b/pdns/reczones.cc
index acf09ce910..a6e3291449 100644
--- a/pdns/reczones.cc
+++ b/pdns/reczones.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "syncres.hh"
 #include "arguments.hh"
 #include "zoneparser-tng.hh"
diff --git a/pdns/resolver.cc b/pdns/resolver.cc
index cd207248c2..cc0fd05d16 100644
--- a/pdns/resolver.cc
+++ b/pdns/resolver.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "packetcache.hh"
 #include "utility.hh"
 #include "resolver.hh"
diff --git a/pdns/responsestats.cc b/pdns/responsestats.cc
index bbaaed0878..ff4168da39 100644
--- a/pdns/responsestats.cc
+++ b/pdns/responsestats.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "responsestats.hh"
 #include <limits>
 #include "namespaces.hh"
diff --git a/pdns/rfc2136handler.cc b/pdns/rfc2136handler.cc
index a90a7ed15b..4b254378e1 100644
--- a/pdns/rfc2136handler.cc
+++ b/pdns/rfc2136handler.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "packethandler.hh"
 #include "qtype.hh"
 #include "dnspacket.hh"
diff --git a/pdns/saxfr.cc b/pdns/saxfr.cc
index 290c362e44..b2fbf89252 100644
--- a/pdns/saxfr.cc
+++ b/pdns/saxfr.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "dnsparser.hh"
 #include "sstuff.hh"
 #include "misc.hh"
diff --git a/pdns/sdig.cc b/pdns/sdig.cc
index e4e9e9c759..5cc0d3134e 100644
--- a/pdns/sdig.cc
+++ b/pdns/sdig.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "dnsparser.hh"
 #include "sstuff.hh"
 #include "misc.hh"
diff --git a/pdns/secpoll-auth.cc b/pdns/secpoll-auth.cc
index cf9cc8ff56..06a6453965 100644
--- a/pdns/secpoll-auth.cc
+++ b/pdns/secpoll-auth.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "secpoll-auth.hh"
 
 #include "logger.hh"
diff --git a/pdns/secpoll-recursor.cc b/pdns/secpoll-recursor.cc
index ffd227b7fa..c44d665fde 100644
--- a/pdns/secpoll-recursor.cc
+++ b/pdns/secpoll-recursor.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "secpoll-recursor.hh"
 #include "syncres.hh"
 #include "logger.hh"
diff --git a/pdns/selectmplexer.cc b/pdns/selectmplexer.cc
index 99f191ef71..bb20b095e1 100644
--- a/pdns/selectmplexer.cc
+++ b/pdns/selectmplexer.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "mplexer.hh"
 #include "sstuff.hh"
 #include <iostream>
diff --git a/pdns/serialtweaker.cc b/pdns/serialtweaker.cc
index e502bf0451..c6c4a1775b 100644
--- a/pdns/serialtweaker.cc
+++ b/pdns/serialtweaker.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "dnsseckeeper.hh"
 #include "dnspacket.hh"
 #include "namespaces.hh"
diff --git a/pdns/signingpipe.cc b/pdns/signingpipe.cc
index 3b21b97b9b..9feb08e901 100644
--- a/pdns/signingpipe.cc
+++ b/pdns/signingpipe.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "signingpipe.hh"
 #include "misc.hh"
 #include <poll.h>
diff --git a/pdns/sillyrecords.cc b/pdns/sillyrecords.cc
index 6553ec65a9..0009dea9c8 100644
--- a/pdns/sillyrecords.cc
+++ b/pdns/sillyrecords.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "utility.hh"
 #include <cstdio>
 #include <math.h>
diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc
index e28513da54..9c3fb69f17 100644
--- a/pdns/slavecommunicator.cc
+++ b/pdns/slavecommunicator.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "packetcache.hh"
 #include "utility.hh"
 #include "dnssecinfra.hh"
diff --git a/pdns/speedtest.cc b/pdns/speedtest.cc
index 3a7f1c9eeb..8176f50b27 100644
--- a/pdns/speedtest.cc
+++ b/pdns/speedtest.cc
@@ -1,10 +1,10 @@
+#include "config.h"
 #include "dnsparser.hh"
 #include "sstuff.hh"
 #include "misc.hh"
 #include "dnswriter.hh"
 #include "dnsrecords.hh"
 #include <boost/format.hpp>
-#include "config.h"
 #ifndef RECURSOR
 #include "statbag.hh"
 #include "base64.hh"
diff --git a/pdns/ssqlite3.cc b/pdns/ssqlite3.cc
index 618c3f8a70..c910e04d23 100644
--- a/pdns/ssqlite3.cc
+++ b/pdns/ssqlite3.cc
@@ -4,6 +4,9 @@
 // Copyright (C) 2003, Michel Stol <michel@powerdns.com>
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string>
 #include <sstream>
 #include "ssqlite3.hh"
diff --git a/pdns/statbag.cc b/pdns/statbag.cc
index 188e71b3a7..8799c7ff0b 100644
--- a/pdns/statbag.cc
+++ b/pdns/statbag.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "utility.hh"
 #include "statbag.hh"
 #include "pdnsexception.hh"
diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 8a478ae9cd..25083d4071 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
 #include "lua-recursor.hh"
diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index 675e21ff3f..de2e8c1280 100644
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "packetcache.hh"
 #include "utility.hh"
 #include "dnssecinfra.hh"
diff --git a/pdns/test-base32_cc.cc b/pdns/test-base32_cc.cc
index e192b3237a..24be0ca447 100644
--- a/pdns/test-base32_cc.cc
+++ b/pdns/test-base32_cc.cc
@@ -1,5 +1,8 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_NO_MAIN
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
diff --git a/pdns/test-base64_cc.cc b/pdns/test-base64_cc.cc
index bc9a3cb685..60a915f074 100644
--- a/pdns/test-base64_cc.cc
+++ b/pdns/test-base64_cc.cc
@@ -1,5 +1,8 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_NO_MAIN
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/std/map.hpp>
 #include <boost/foreach.hpp>
diff --git a/pdns/test-bindparser_cc.cc b/pdns/test-bindparser_cc.cc
index b3eb768a16..6a6470fd3a 100644
--- a/pdns/test-bindparser_cc.cc
+++ b/pdns/test-bindparser_cc.cc
@@ -1,6 +1,9 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_NO_MAIN
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/test/unit_test.hpp>
 #include "bindparserclasses.hh"
 #include "misc.hh"
diff --git a/pdns/test-dns_random_hh.cc b/pdns/test-dns_random_hh.cc
index 7c839b3416..5e9eb4df31 100644
--- a/pdns/test-dns_random_hh.cc
+++ b/pdns/test-dns_random_hh.cc
@@ -1,5 +1,8 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_NO_MAIN
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/std/map.hpp>
 #include <boost/foreach.hpp>
diff --git a/pdns/test-dnsrecords_cc.cc b/pdns/test-dnsrecords_cc.cc
index 341e6297bd..a16e703394 100644
--- a/pdns/test-dnsrecords_cc.cc
+++ b/pdns/test-dnsrecords_cc.cc
@@ -1,5 +1,8 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_NO_MAIN
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
diff --git a/pdns/test-iputils_hh.cc b/pdns/test-iputils_hh.cc
index 43a0b67d57..ea6523a035 100644
--- a/pdns/test-iputils_hh.cc
+++ b/pdns/test-iputils_hh.cc
@@ -1,5 +1,8 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_NO_MAIN
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/test/unit_test.hpp>
 #include "iputils.hh"
 
diff --git a/pdns/test-md5_hh.cc b/pdns/test-md5_hh.cc
index 132ff44b2f..267b56a491 100644
--- a/pdns/test-md5_hh.cc
+++ b/pdns/test-md5_hh.cc
@@ -1,5 +1,8 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_NO_MAIN
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
diff --git a/pdns/test-misc_hh.cc b/pdns/test-misc_hh.cc
index 8732264f3e..7f4b2c85d0 100644
--- a/pdns/test-misc_hh.cc
+++ b/pdns/test-misc_hh.cc
@@ -1,6 +1,9 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_NO_MAIN
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
diff --git a/pdns/test-nameserver_cc.cc b/pdns/test-nameserver_cc.cc
index 8417b5532d..7ab8a6805c 100644
--- a/pdns/test-nameserver_cc.cc
+++ b/pdns/test-nameserver_cc.cc
@@ -1,6 +1,9 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_NO_MAIN
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/test/unit_test.hpp>
 #include "iputils.hh"
 #include "nameserver.hh"
diff --git a/pdns/test-packetcache_cc.cc b/pdns/test-packetcache_cc.cc
index 9121014eb4..fd1144d1e9 100644
--- a/pdns/test-packetcache_cc.cc
+++ b/pdns/test-packetcache_cc.cc
@@ -1,6 +1,9 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_NO_MAIN
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include "iputils.hh"
diff --git a/pdns/test-rcpgenerator_cc.cc b/pdns/test-rcpgenerator_cc.cc
index 96e150e892..42bcfe2bea 100644
--- a/pdns/test-rcpgenerator_cc.cc
+++ b/pdns/test-rcpgenerator_cc.cc
@@ -1,6 +1,9 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_NO_MAIN
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/test/unit_test.hpp>
 #include "rcpgenerator.hh"
 #include "misc.hh"
diff --git a/pdns/test-sha_hh.cc b/pdns/test-sha_hh.cc
index 40af08c0b3..9ff1bb07dc 100644
--- a/pdns/test-sha_hh.cc
+++ b/pdns/test-sha_hh.cc
@@ -1,5 +1,8 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_NO_MAIN
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
diff --git a/pdns/test-statbag_cc.cc b/pdns/test-statbag_cc.cc
index 48b82ea5b2..e4d69fc342 100644
--- a/pdns/test-statbag_cc.cc
+++ b/pdns/test-statbag_cc.cc
@@ -1,6 +1,9 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_NO_MAIN
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
diff --git a/pdns/test-zoneparser_tng_cc.cc b/pdns/test-zoneparser_tng_cc.cc
index 506fcdff39..de673f0a9c 100644
--- a/pdns/test-zoneparser_tng_cc.cc
+++ b/pdns/test-zoneparser_tng_cc.cc
@@ -1,5 +1,8 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_NO_MAIN
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
diff --git a/pdns/testrunner.cc b/pdns/testrunner.cc
index 15a9d43aa4..68cbdcaf0e 100644
--- a/pdns/testrunner.cc
+++ b/pdns/testrunner.cc
@@ -2,6 +2,9 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE unit
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "packetcache.hh"
 StatBag S;
 PacketCache PC;
diff --git a/pdns/toysdig.cc b/pdns/toysdig.cc
index 707007c05a..da63fa2f88 100644
--- a/pdns/toysdig.cc
+++ b/pdns/toysdig.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "dnsparser.hh"
 #include "sstuff.hh"
 #include "misc.hh"
diff --git a/pdns/tsig-tests.cc b/pdns/tsig-tests.cc
index 34d85d3146..ecf52836c3 100644
--- a/pdns/tsig-tests.cc
+++ b/pdns/tsig-tests.cc
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "dnsparser.hh"
 #include "dnswriter.hh"
 #include "sstuff.hh"
diff --git a/pdns/ueberbackend.cc b/pdns/ueberbackend.cc
index 8117370b1f..629cbdbd0b 100644
--- a/pdns/ueberbackend.cc
+++ b/pdns/ueberbackend.cc
@@ -19,15 +19,15 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/archive/binary_iarchive.hpp>
 #include <boost/archive/binary_oarchive.hpp>
 
 #include "packetcache.hh"
 #include "utility.hh"
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif // HAVE_CONFIG_H
 
 #include <string>
 #include <map>
diff --git a/pdns/unix_semaphore.cc b/pdns/unix_semaphore.cc
index 7064bc98dc..45e9339bfc 100644
--- a/pdns/unix_semaphore.cc
+++ b/pdns/unix_semaphore.cc
@@ -21,6 +21,9 @@
 */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "utility.hh"
 #include <cstring>
 #include <fcntl.h>
diff --git a/pdns/unix_utility.cc b/pdns/unix_utility.cc
index 673e9098f5..562e718b02 100644
--- a/pdns/unix_utility.cc
+++ b/pdns/unix_utility.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "utility.hh"
 #include <cstring>
 #include <fcntl.h>
diff --git a/pdns/version.cc b/pdns/version.cc
index 1b33d595cf..0c04e5e09c 100644
--- a/pdns/version.cc
+++ b/pdns/version.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "logger.hh"
 #include "version.hh"
 #include "version_generated.h"
diff --git a/pdns/webserver.cc b/pdns/webserver.cc
index 308da1394d..48c1eb0a63 100644
--- a/pdns/webserver.cc
+++ b/pdns/webserver.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "utility.hh"
 #include "webserver.hh"
 #include "misc.hh"
diff --git a/pdns/ws-api.cc b/pdns/ws-api.cc
index faae37af0a..41389f3664 100644
--- a/pdns/ws-api.cc
+++ b/pdns/ws-api.cc
@@ -18,13 +18,15 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <boost/foreach.hpp>
 #include <boost/tokenizer.hpp>
 #include <boost/circular_buffer.hpp>
 #include "namespaces.hh"
 #include "ws-api.hh"
 #include "json.hh"
-#include "config.h"
 #include "version.hh"
 #include "arguments.hh"
 #include <stdio.h>
diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc
index b07d2a98fb..5214619dc2 100644
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@ -18,6 +18,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "utility.hh"
 #include "dynlistener.hh"
 #include "ws-auth.hh"
@@ -44,9 +47,6 @@
 #include "zoneparser-tng.hh"
 #include "common_startup.hh"
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif // HAVE_CONFIG_H
 
 using namespace rapidjson;
 
diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc
index 05ddb694a5..15dbac9a4b 100644
--- a/pdns/ws-recursor.cc
+++ b/pdns/ws-recursor.cc
@@ -19,6 +19,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "ws-recursor.hh"
 #include "json.hh"
 #include <boost/foreach.hpp>
diff --git a/pdns/zone2json.cc b/pdns/zone2json.cc
index 6141215b80..cc883d3de1 100644
--- a/pdns/zone2json.cc
+++ b/pdns/zone2json.cc
@@ -21,6 +21,9 @@
 */
 /* accepts a named.conf or a zone as parameter and outputs heaps of sql */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <unistd.h>
 #include <string>
 #include <map>
diff --git a/pdns/zone2ldap.cc b/pdns/zone2ldap.cc
index 4dd7e9f24e..c81f254990 100644
--- a/pdns/zone2ldap.cc
+++ b/pdns/zone2ldap.cc
@@ -19,6 +19,9 @@
 */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <map>
 #include <string>
 #include <iostream>
diff --git a/pdns/zone2lmdb.cc b/pdns/zone2lmdb.cc
index 5693fbae1c..36279b346b 100644
--- a/pdns/zone2lmdb.cc
+++ b/pdns/zone2lmdb.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <unistd.h>
 #include <string>
 #include <map>
diff --git a/pdns/zone2sql.cc b/pdns/zone2sql.cc
index 317fd8bfbb..a2a0e8803d 100644
--- a/pdns/zone2sql.cc
+++ b/pdns/zone2sql.cc
@@ -21,6 +21,9 @@
 */
 /* accepts a named.conf or a zone as parameter and outputs heaps of sql */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <unistd.h>
 #include <string>
 #include <map>
diff --git a/pdns/zoneparser-tng.cc b/pdns/zoneparser-tng.cc
index 4dd41b69e6..a6c90b63ac 100644
--- a/pdns/zoneparser-tng.cc
+++ b/pdns/zoneparser-tng.cc
@@ -20,6 +20,9 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "dnsparser.hh"
 #include "sstuff.hh"
 #include "misc.hh"