From 42575d33205f88a6f4fdf68ebbc3518840981b1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondr=CC=8Cej=20Sury=CC=81?= <ondrej@sury.org>
Date: Wed, 29 May 2013 10:51:54 +0200
Subject: [PATCH] Use config.h in the same way for same experience in all
 sources.

Move (and sometimes add) #include <config.h> at the top of
all *.c files.

Remove all #include ["<]config.h[">] from headers files.

Change-Id: I1df07602d0240affd95e12fccd122558300d2145
---
 src/common/base32hex.c               |  1 +
 src/common/base64.c                  |  1 +
 src/common/dSFMT-params.h            |  2 --
 src/common/dSFMT.c                   |  2 ++
 src/common/dSFMT.h                   |  2 --
 src/common/descriptor.c              |  1 +
 src/common/errcode.c                 |  1 +
 src/common/errors.c                  |  1 +
 src/common/evqueue.c                 |  2 +-
 src/common/evsched.c                 |  2 +-
 src/common/fdset.c                   |  2 +-
 src/common/fdset.h                   |  1 -
 src/common/getline.c                 |  3 +--
 src/common/hattrie/ahtable.c         |  1 +
 src/common/hattrie/hat-trie.c        |  1 +
 src/common/hattrie/murmurhash3.c     |  1 +
 src/common/heap.c                    |  1 +
 src/common/latency.c                 |  1 +
 src/common/lists.c                   |  1 +
 src/common/mempattern.c              |  2 +-
 src/common/mempool.c                 |  2 ++
 src/common/mempool.h                 |  1 -
 src/common/print.c                   |  1 +
 src/common/prng.c                    |  1 +
 src/common/queue.c                   |  3 ++-
 src/common/ref.c                     |  1 +
 src/common/slab/slab.c               |  2 +-
 src/common/sockaddr.c                |  1 +
 src/knot/common.h                    |  1 -
 src/knot/conf/conf.c                 |  3 ++-
 src/knot/conf/extra.c                |  1 +
 src/knot/conf/includes.c             |  3 ++-
 src/knot/conf/logconf.c              |  1 +
 src/knot/ctl/remote.c                |  1 +
 src/knot/ctl/remote.h                |  1 -
 src/knot/other/debug.h               |  2 --
 src/knot/server/notify.c             |  1 +
 src/knot/server/rrl.c                |  1 +
 src/knot/server/udp-handler.c        |  2 +-
 src/knot/server/zones.c              |  1 +
 src/knot/zone/semantic-check.c       | 17 +++++++++++++++++
 src/knot/zone/zone-dump.c            |  3 +--
 src/libknot/binary.c                 |  1 +
 src/libknot/common.h                 |  1 -
 src/libknot/consts.c                 |  1 +
 src/libknot/edns.c                   |  1 +
 src/libknot/nameserver/chaos.c       |  1 +
 src/libknot/nameserver/name-server.c |  1 +
 src/libknot/nsec3.c                  |  1 +
 src/libknot/packet/packet.c          |  1 +
 src/libknot/packet/query.c           |  1 +
 src/libknot/packet/response.c        |  1 +
 src/libknot/rrset-dump.c             |  1 +
 src/libknot/rrset.c                  |  2 +-
 src/libknot/sign/bnutils.c           |  1 +
 src/libknot/sign/dnssec.c            | 17 +++++++++++++++++
 src/libknot/sign/key.c               |  1 +
 src/libknot/sign/sig0.c              | 17 +++++++++++++++++
 src/libknot/tsig-op.c                |  1 +
 src/libknot/tsig.c                   |  1 +
 src/libknot/updates/changesets.c     |  1 +
 src/libknot/updates/ddns.c           |  1 +
 src/libknot/updates/xfr-in.c         |  1 +
 src/libknot/util/debug.h             |  1 -
 src/libknot/util/tolower.c           |  1 +
 src/libknot/zone/zone-contents.c     |  1 +
 src/libknot/zone/zone-diff.c         |  2 +-
 src/libknot/zone/zone-tree.c         |  1 +
 src/tests/common/acl_tests.c         |  1 +
 src/tests/common/base32hex_tests.c   |  1 +
 src/tests/common/base64_tests.c      |  1 +
 src/tests/common/descriptor_tests.c  |  1 +
 src/tests/common/events_tests.c      |  1 +
 src/tests/common/fdset_tests.c       |  1 +
 src/tests/common/hattrie_tests.c     |  1 +
 src/tests/common/skiplist_tests.c    |  1 +
 src/tests/common/slab_tests.c        |  1 +
 src/tests/knot/conf_tests.c          |  1 +
 src/tests/knot/dthreads_tests.c      |  2 ++
 src/tests/knot/journal_tests.c       |  2 ++
 src/tests/knot/rrl_tests.c           |  1 +
 src/tests/knot/server_tests.c        |  2 ++
 src/tests/libknot/dname_tests.c      |  1 +
 src/tests/libknot/rrset_tests.c      |  1 +
 src/tests/libknot/sign_tests.c       |  1 +
 src/tests/libknot/wire_tests.c       |  1 +
 src/tests/libknot/ztree_tests.c      |  1 +
 src/tests/xfr_tests.c                |  2 +-
 src/tests/zscanner/zscanner_tests.c  |  2 +-
 src/utils/common/exec.c              |  1 +
 src/utils/common/msg.c               |  1 +
 src/utils/common/netio.c             |  1 +
 src/utils/common/params.c            |  1 +
 src/utils/common/resolv.c            |  1 +
 src/utils/common/token.c             |  1 +
 src/utils/dig/dig_exec.c             |  1 +
 src/utils/dig/dig_main.c             |  1 +
 src/utils/dig/dig_params.c           |  1 +
 src/utils/host/host_main.c           |  1 +
 src/utils/host/host_params.c         |  1 +
 src/utils/nsupdate/nsupdate_exec.c   |  1 +
 src/utils/nsupdate/nsupdate_main.c   |  1 +
 src/utils/nsupdate/nsupdate_params.c |  1 +
 src/zscanner/file_loader.c           |  1 +
 src/zscanner/scanner_functions.c     |  1 +
 src/zscanner/test/processing.c       |  1 +
 src/zscanner/test/tests.c            |  1 +
 src/zscanner/test/zscanner-tool.c    |  1 +
 tests/chkjournal.c                   |  2 ++
 109 files changed, 157 insertions(+), 29 deletions(-)

diff --git a/src/common/base32hex.c b/src/common/base32hex.c
index 9ee59243e8..e1af3c7391 100644
--- a/src/common/base32hex.c
+++ b/src/common/base32hex.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "base32hex.h"
 #include "errcode.h"
 
diff --git a/src/common/base64.c b/src/common/base64.c
index 8a3443667f..3deee97f05 100644
--- a/src/common/base64.c
+++ b/src/common/base64.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "base64.h"
 #include "errcode.h"
 
diff --git a/src/common/dSFMT-params.h b/src/common/dSFMT-params.h
index 610eb6a4a9..3a4a8686d1 100644
--- a/src/common/dSFMT-params.h
+++ b/src/common/dSFMT-params.h
@@ -1,5 +1,3 @@
-#include <config.h>
-
 #ifndef DSFMT_PARAMS_H
 #define DSFMT_PARAMS_H
 
diff --git a/src/common/dSFMT.c b/src/common/dSFMT.c
index 17db828516..4b238b546e 100644
--- a/src/common/dSFMT.c
+++ b/src/common/dSFMT.c
@@ -11,6 +11,8 @@
  *
  * The new BSD License is applied to this software, see LICENSE.txt
  */
+
+#include <config.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/common/dSFMT.h b/src/common/dSFMT.h
index 8441b952b0..aaad33371a 100644
--- a/src/common/dSFMT.h
+++ b/src/common/dSFMT.h
@@ -28,8 +28,6 @@
  * unsigned int and 64-bit unsigned int in hexadecimal format.
  */
 
-#include <config.h>
-
 #ifndef DSFMT_H
 #define DSFMT_H
 
diff --git a/src/common/descriptor.c b/src/common/descriptor.c
index e713ba19c9..154a161c09 100644
--- a/src/common/descriptor.c
+++ b/src/common/descriptor.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "common/descriptor.h"
 #include "libknot/util/utils.h"		// knot_lookup_table_t
 
diff --git a/src/common/errcode.c b/src/common/errcode.c
index 1724f01f4e..54456b867a 100644
--- a/src/common/errcode.c
+++ b/src/common/errcode.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "common/errcode.h"
 #include "common/errors.h"
 
diff --git a/src/common/errors.c b/src/common/errors.c
index 11aff95a73..5215d205b7 100644
--- a/src/common/errors.c
+++ b/src/common/errors.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/common/evqueue.c b/src/common/evqueue.c
index c3a629685d..097d177deb 100644
--- a/src/common/evqueue.c
+++ b/src/common/evqueue.c
@@ -14,10 +14,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <config.h>
 
 #include "common/evqueue.h"
 #include "common/fdset.h"
diff --git a/src/common/evsched.c b/src/common/evsched.c
index c5eae1492e..7df2e0ce88 100644
--- a/src/common/evsched.c
+++ b/src/common/evsched.c
@@ -14,10 +14,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <sys/time.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <config.h>
 
 #include "common/evsched.h"
 
diff --git a/src/common/fdset.c b/src/common/fdset.c
index f7d2705692..ab357bdb03 100644
--- a/src/common/fdset.c
+++ b/src/common/fdset.c
@@ -14,12 +14,12 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <dlfcn.h>
 #include <string.h>
 #include <stdio.h>
 #include <time.h>
 #include <stdlib.h>
-#include <config.h>
 #include "common/fdset.h"
 
 /* Workarounds for clock_gettime() not available on some platforms. */
diff --git a/src/common/fdset.h b/src/common/fdset.h
index a589145ad4..e1facdb06e 100644
--- a/src/common/fdset.h
+++ b/src/common/fdset.h
@@ -32,7 +32,6 @@
 #ifndef _KNOTD_FDSET_H_
 #define _KNOTD_FDSET_H_
 
-#include "config.h"
 #include <stddef.h>
 #ifdef HAVE_SYS_SELECT_H
  #include <sys/select.h>
diff --git a/src/common/getline.c b/src/common/getline.c
index 6a5e0ad26b..b2fa94e2f6 100644
--- a/src/common/getline.c
+++ b/src/common/getline.c
@@ -19,10 +19,9 @@
 #define _WITH_GETLINE
 #endif
 
+#include <config.h>
 #include "common/getline.h"
 
-#include "config.h"		// HAVE_
-
 #include <stdio.h>		// getline or fgetln
 #include <stdlib.h>		// free
 #include <string.h>		// memcpy
diff --git a/src/common/hattrie/ahtable.c b/src/common/hattrie/ahtable.c
index c9979c7feb..e8e2b4571f 100644
--- a/src/common/hattrie/ahtable.c
+++ b/src/common/hattrie/ahtable.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include <config.h>
 #include <assert.h>
 #include <string.h>
 #include "ahtable.h"
diff --git a/src/common/hattrie/hat-trie.c b/src/common/hattrie/hat-trie.c
index 1377837592..328a9d155a 100644
--- a/src/common/hattrie/hat-trie.c
+++ b/src/common/hattrie/hat-trie.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include <config.h>
 #include <stdint.h>
 #include <assert.h>
 #include <string.h>
diff --git a/src/common/hattrie/murmurhash3.c b/src/common/hattrie/murmurhash3.c
index 612f1f7e70..73de0aefa6 100644
--- a/src/common/hattrie/murmurhash3.c
+++ b/src/common/hattrie/murmurhash3.c
@@ -1,6 +1,7 @@
 /* This is MurmurHash3. The original C++ code was placed in the public domain
  * by its author, Austin Appleby. */
 
+#include <config.h>
 #include "murmurhash3.h"
 
 static inline uint32_t fmix(uint32_t h)
diff --git a/src/common/heap.c b/src/common/heap.c
index b6181b10e4..c8c7921e94 100644
--- a/src/common/heap.c
+++ b/src/common/heap.c
@@ -37,6 +37,7 @@
  * ------
  ***/
 
+#include <config.h>
 #include "heap.h"
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/common/latency.c b/src/common/latency.c
index 7f5f5f8462..ed4fb6756e 100644
--- a/src/common/latency.c
+++ b/src/common/latency.c
@@ -16,6 +16,7 @@
 
 #ifdef PROF_LATENCY
 
+#include <config.h>
 #include <sys/resource.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/src/common/lists.c b/src/common/lists.c
index 9672d630c0..e629e9dcc2 100644
--- a/src/common/lists.c
+++ b/src/common/lists.c
@@ -26,6 +26,7 @@
 
 #define _BIRD_LISTS_C_
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 #include "common/lists.h"
diff --git a/src/common/mempattern.c b/src/common/mempattern.c
index 96e2db198e..d0841eb093 100644
--- a/src/common/mempattern.c
+++ b/src/common/mempattern.c
@@ -14,11 +14,11 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/resource.h>
-#include <config.h>
 #include <stdarg.h>
 
 #include "mempattern.h"
diff --git a/src/common/mempool.c b/src/common/mempool.c
index 0ec1b5c56b..049b0161bb 100644
--- a/src/common/mempool.c
+++ b/src/common/mempool.c
@@ -8,6 +8,8 @@
  *	of the GNU Lesser General Public License.
  */
 
+#include <config.h>
+
 #undef LOCAL_DEBUG
 
 #include "mempool.h"
diff --git a/src/common/mempool.h b/src/common/mempool.h
index b0f0aaa8b2..af457b329b 100644
--- a/src/common/mempool.h
+++ b/src/common/mempool.h
@@ -13,7 +13,6 @@
 
 #include <string.h>
 #include <stdint.h>
-#include "config.h"
 
 #if __GNUC__ >= 4
 #define LIKE_MALLOC __attribute__((malloc))                             /** Function returns a "new" pointer **/
diff --git a/src/common/print.c b/src/common/print.c
index 7ebc0f59cb..dce5027533 100644
--- a/src/common/print.c
+++ b/src/common/print.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <ctype.h>
 #include "print.h"
diff --git a/src/common/prng.c b/src/common/prng.c
index b85a18eb33..eac1347140 100644
--- a/src/common/prng.c
+++ b/src/common/prng.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/common/queue.c b/src/common/queue.c
index 182a8ddf3f..26c6ed5cf7 100644
--- a/src/common/queue.c
+++ b/src/common/queue.c
@@ -20,9 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
+#include <config.h>
 #include "queue.h"
 #include "atomic.h"
-#include "config.h"
 #include <stdbool.h>
 #include <string.h>
 #include <assert.h>
diff --git a/src/common/ref.c b/src/common/ref.c
index 3b9c0336c8..a042665aac 100644
--- a/src/common/ref.c
+++ b/src/common/ref.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 
 #include "ref.h"
diff --git a/src/common/slab/slab.c b/src/common/slab/slab.c
index d3d059494b..7df05232d3 100644
--- a/src/common/slab/slab.c
+++ b/src/common/slab/slab.c
@@ -12,7 +12,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+*/
 
 #include <config.h>
 #include <stdio.h>
diff --git a/src/common/sockaddr.c b/src/common/sockaddr.c
index 72b92acb6f..4444343462 100644
--- a/src/common/sockaddr.c
+++ b/src/common/sockaddr.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
diff --git a/src/knot/common.h b/src/knot/common.h
index 36097e2826..f677f93d56 100644
--- a/src/knot/common.h
+++ b/src/knot/common.h
@@ -29,7 +29,6 @@
 
 #include <signal.h>
 #include <stdint.h>
-#include <config.h>
 
 /*
  * Common types and constants.
diff --git a/src/knot/conf/conf.c b/src/knot/conf/conf.c
index 7ab2a16376..80cf0f2813 100644
--- a/src/knot/conf/conf.c
+++ b/src/knot/conf/conf.c
@@ -12,8 +12,9 @@
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+*/
 
+#include <config.h>
 #include <assert.h>
 #include <stdarg.h>
 #include <string.h>
diff --git a/src/knot/conf/extra.c b/src/knot/conf/extra.c
index ef43e6cfbf..c172a1521f 100644
--- a/src/knot/conf/extra.c
+++ b/src/knot/conf/extra.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
diff --git a/src/knot/conf/includes.c b/src/knot/conf/includes.c
index de9c9c15bf..2ca54c9047 100644
--- a/src/knot/conf/includes.c
+++ b/src/knot/conf/includes.c
@@ -12,8 +12,9 @@
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+*/
 
+#include <config.h>
 #include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/src/knot/conf/logconf.c b/src/knot/conf/logconf.c
index fa37273edc..273a597995 100644
--- a/src/knot/conf/logconf.c
+++ b/src/knot/conf/logconf.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/knot/ctl/remote.c b/src/knot/ctl/remote.c
index e4150a891c..054c0c78a0 100644
--- a/src/knot/ctl/remote.c
+++ b/src/knot/ctl/remote.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "remote.h"
 #include "common/log.h"
 #include "common/fdset.h"
diff --git a/src/knot/ctl/remote.h b/src/knot/ctl/remote.h
index 533801247f..4d4ae0d939 100644
--- a/src/knot/ctl/remote.h
+++ b/src/knot/ctl/remote.h
@@ -27,7 +27,6 @@
 #ifndef _KNOTD_REMOTE_H_
 #define _KNOTD_REMOTE_H_
 
-#include <config.h>
 #include "knot/conf/conf.h"
 #include "libknot/packet/packet.h"
 #include "libknot/rrset.h"
diff --git a/src/knot/other/debug.h b/src/knot/other/debug.h
index 955043c6ea..b5fd9bcd10 100644
--- a/src/knot/other/debug.h
+++ b/src/knot/other/debug.h
@@ -27,8 +27,6 @@
 #ifndef _KNOTD_DEBUG_H_
 #define _KNOTD_DEBUG_H_
 
-#include "config.h" /* autoconf generated */
-
 #ifdef KNOTD_SERVER_DEBUG
   #define KNOTD_THREADS_DEBUG
   #define KNOTD_JOURNAL_DEBUG
diff --git a/src/knot/server/notify.c b/src/knot/server/notify.c
index d1dbd3fd81..e6c95649fd 100644
--- a/src/knot/server/notify.c
+++ b/src/knot/server/notify.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <assert.h>
 
 #include "knot/server/notify.h"
diff --git a/src/knot/server/rrl.c b/src/knot/server/rrl.c
index d37691eaf2..30dd5ace91 100644
--- a/src/knot/server/rrl.c
+++ b/src/knot/server/rrl.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <time.h>
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/src/knot/server/udp-handler.c b/src/knot/server/udp-handler.c
index a189b370ab..3ed57c5b8e 100644
--- a/src/knot/server/udp-handler.c
+++ b/src/knot/server/udp-handler.c
@@ -14,8 +14,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <dlfcn.h>
 #include <config.h>
+#include <dlfcn.h>
 #include <time.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/src/knot/server/zones.c b/src/knot/server/zones.c
index c7b8949186..659f59d4a2 100644
--- a/src/knot/server/zones.c
+++ b/src/knot/server/zones.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/knot/zone/semantic-check.c b/src/knot/zone/semantic-check.c
index 4bf5a61426..44374c9f87 100644
--- a/src/knot/zone/semantic-check.c
+++ b/src/knot/zone/semantic-check.c
@@ -1,3 +1,20 @@
+/*  Copyright (C) 2011 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <config.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <sys/types.h>
diff --git a/src/knot/zone/zone-dump.c b/src/knot/zone/zone-dump.c
index 081f5199b7..aa630efef5 100644
--- a/src/knot/zone/zone-dump.c
+++ b/src/knot/zone/zone-dump.c
@@ -14,11 +14,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "knot/zone/zone-dump.h"
-
 #include <config.h>
 #include <inttypes.h>
 
+#include "knot/zone/zone-dump.h"
 #include "common/descriptor.h"
 #include "knot/conf/conf.h"
 #include "knot/server/zones.h"
diff --git a/src/libknot/binary.c b/src/libknot/binary.c
index b9777ed63d..aba35607ef 100644
--- a/src/libknot/binary.c
+++ b/src/libknot/binary.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/libknot/common.h b/src/libknot/common.h
index 7892985c5c..b5bb956150 100644
--- a/src/libknot/common.h
+++ b/src/libknot/common.h
@@ -24,7 +24,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
 #include "common/errcode.h"
 #include "common/mempattern.h"
 
diff --git a/src/libknot/consts.c b/src/libknot/consts.c
index 4b5aa3aa92..5471d76af8 100644
--- a/src/libknot/consts.c
+++ b/src/libknot/consts.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include <libknot/consts.h>
 
 knot_lookup_table_t knot_opcode_names[] = {
diff --git a/src/libknot/edns.c b/src/libknot/edns.c
index 5990f70cce..015100e8e4 100644
--- a/src/libknot/edns.c
+++ b/src/libknot/edns.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/src/libknot/nameserver/chaos.c b/src/libknot/nameserver/chaos.c
index 389da12c3d..e5484821e8 100644
--- a/src/libknot/nameserver/chaos.c
+++ b/src/libknot/nameserver/chaos.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <strings.h>
 
 #include "chaos.h"
diff --git a/src/libknot/nameserver/name-server.c b/src/libknot/nameserver/name-server.c
index 873541338f..e635836164 100644
--- a/src/libknot/nameserver/name-server.c
+++ b/src/libknot/nameserver/name-server.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <assert.h>
 #include <sys/time.h>
diff --git a/src/libknot/nsec3.c b/src/libknot/nsec3.c
index eb5d69f108..3dd2e31786 100644
--- a/src/libknot/nsec3.c
+++ b/src/libknot/nsec3.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdint.h>
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/libknot/packet/packet.c b/src/libknot/packet/packet.c
index 4cea44b623..52ed72b779 100644
--- a/src/libknot/packet/packet.c
+++ b/src/libknot/packet/packet.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <assert.h>
 #include <stdlib.h>
 
diff --git a/src/libknot/packet/query.c b/src/libknot/packet/query.c
index c20ae15a52..4bededc9f1 100644
--- a/src/libknot/packet/query.c
+++ b/src/libknot/packet/query.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include "packet/query.h"
 #include "util/wire.h"
diff --git a/src/libknot/packet/response.c b/src/libknot/packet/response.c
index fde996ba00..067b4f81d1 100644
--- a/src/libknot/packet/response.c
+++ b/src/libknot/packet/response.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <stdint.h>
 
diff --git a/src/libknot/rrset-dump.c b/src/libknot/rrset-dump.c
index 15905816bc..0cd876b83a 100644
--- a/src/libknot/rrset-dump.c
+++ b/src/libknot/rrset-dump.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "libknot/rrset-dump.h"
 
 #include <stdlib.h>			// free
diff --git a/src/libknot/rrset.c b/src/libknot/rrset.c
index 65bef6373a..24ddb8894b 100644
--- a/src/libknot/rrset.c
+++ b/src/libknot/rrset.c
@@ -1,4 +1,4 @@
-	/*  Copyright (C) 2011 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) 2011 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/src/libknot/sign/bnutils.c b/src/libknot/sign/bnutils.c
index d209ca67d8..c328f4436e 100644
--- a/src/libknot/sign/bnutils.c
+++ b/src/libknot/sign/bnutils.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/libknot/sign/dnssec.c b/src/libknot/sign/dnssec.c
index ece6844b4d..7c524cbc79 100644
--- a/src/libknot/sign/dnssec.c
+++ b/src/libknot/sign/dnssec.c
@@ -1,3 +1,20 @@
+/*  Copyright (C) 2011 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <config.h>
 #include "common/descriptor.h"
 #include "common/errcode.h"
 #include "sign/bnutils.h"
diff --git a/src/libknot/sign/key.c b/src/libknot/sign/key.c
index 8ae5aa59dd..7b92e9ce6b 100644
--- a/src/libknot/sign/key.c
+++ b/src/libknot/sign/key.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include <assert.h>
 #include <ctype.h>
 #include <stddef.h>
diff --git a/src/libknot/sign/sig0.c b/src/libknot/sign/sig0.c
index 18fd0d55a5..d1f1ea93cc 100644
--- a/src/libknot/sign/sig0.c
+++ b/src/libknot/sign/sig0.c
@@ -1,3 +1,20 @@
+/*  Copyright (C) 2011 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <config.h>
 #include "sign/dnssec.h"
 #include "sign/sig0.h"
 #include "common/errcode.h"
diff --git a/src/libknot/tsig-op.c b/src/libknot/tsig-op.c
index b9b000a3a9..e6b11162a2 100644
--- a/src/libknot/tsig-op.c
+++ b/src/libknot/tsig-op.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <assert.h>
 #include <stdint.h>
 #include <openssl/hmac.h>
diff --git a/src/libknot/tsig.c b/src/libknot/tsig.c
index 5cb1dc1cb9..fd59709859 100644
--- a/src/libknot/tsig.c
+++ b/src/libknot/tsig.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/src/libknot/updates/changesets.c b/src/libknot/updates/changesets.c
index b00ae6fb07..1f7997cf6b 100644
--- a/src/libknot/updates/changesets.c
+++ b/src/libknot/updates/changesets.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/src/libknot/updates/ddns.c b/src/libknot/updates/ddns.c
index 0dcf43cbfe..d81ec72615 100644
--- a/src/libknot/updates/ddns.c
+++ b/src/libknot/updates/ddns.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <inttypes.h>
diff --git a/src/libknot/updates/xfr-in.c b/src/libknot/updates/xfr-in.c
index 77d2b05cb1..3928a7f1db 100644
--- a/src/libknot/updates/xfr-in.c
+++ b/src/libknot/updates/xfr-in.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <assert.h>
 #include <urcu.h>
 
diff --git a/src/libknot/util/debug.h b/src/libknot/util/debug.h
index 31935dd22c..c994f985d2 100644
--- a/src/libknot/util/debug.h
+++ b/src/libknot/util/debug.h
@@ -32,7 +32,6 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "config.h" /* autoconf generated */
 #include "common/log.h"
 
 /*
diff --git a/src/libknot/util/tolower.c b/src/libknot/util/tolower.c
index d71c4678d4..d8ca17d0ac 100644
--- a/src/libknot/util/tolower.c
+++ b/src/libknot/util/tolower.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "util/tolower.h"
 
 const uint8_t char_table[CHAR_TABLE_SIZE] = {
diff --git a/src/libknot/zone/zone-contents.c b/src/libknot/zone/zone-contents.c
index d125ac029d..72e2129d80 100644
--- a/src/libknot/zone/zone-contents.c
+++ b/src/libknot/zone/zone-contents.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <assert.h>
 
 #include "zone/zone-contents.h"
diff --git a/src/libknot/zone/zone-diff.c b/src/libknot/zone/zone-diff.c
index f86b726b1b..009aa31c4a 100644
--- a/src/libknot/zone/zone-diff.c
+++ b/src/libknot/zone/zone-diff.c
@@ -14,8 +14,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
 #include <config.h>
+#include <assert.h>
 #include <stdlib.h>
 #include <inttypes.h>
 
diff --git a/src/libknot/zone/zone-tree.c b/src/libknot/zone/zone-tree.c
index 5d40449591..a7e3d9f288 100644
--- a/src/libknot/zone/zone-tree.c
+++ b/src/libknot/zone/zone-tree.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/tests/common/acl_tests.c b/src/tests/common/acl_tests.c
index dc490fc80a..f8ab106a3e 100644
--- a/src/tests/common/acl_tests.c
+++ b/src/tests/common/acl_tests.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 
diff --git a/src/tests/common/base32hex_tests.c b/src/tests/common/base32hex_tests.c
index cc33ec5128..1303e4405d 100644
--- a/src/tests/common/base32hex_tests.c
+++ b/src/tests/common/base32hex_tests.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "tests/common/base32hex_tests.h"
 
 #include <stdlib.h>
diff --git a/src/tests/common/base64_tests.c b/src/tests/common/base64_tests.c
index c5398d728a..0893c0949d 100644
--- a/src/tests/common/base64_tests.c
+++ b/src/tests/common/base64_tests.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "tests/common/base64_tests.h"
 
 #include <stdlib.h>
diff --git a/src/tests/common/descriptor_tests.c b/src/tests/common/descriptor_tests.c
index f294d7a46a..9d752f552b 100644
--- a/src/tests/common/descriptor_tests.c
+++ b/src/tests/common/descriptor_tests.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "tests/common/descriptor_tests.h"
 
 #include <stdlib.h>
diff --git a/src/tests/common/events_tests.c b/src/tests/common/events_tests.c
index a9b3de6b7f..713bb5a056 100644
--- a/src/tests/common/events_tests.c
+++ b/src/tests/common/events_tests.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <sys/time.h>
diff --git a/src/tests/common/fdset_tests.c b/src/tests/common/fdset_tests.c
index f8872c68f0..d7b29fa528 100644
--- a/src/tests/common/fdset_tests.c
+++ b/src/tests/common/fdset_tests.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <sys/time.h>
diff --git a/src/tests/common/hattrie_tests.c b/src/tests/common/hattrie_tests.c
index 7df50744d8..941f38cc97 100644
--- a/src/tests/common/hattrie_tests.c
+++ b/src/tests/common/hattrie_tests.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
 #include <time.h>
 
diff --git a/src/tests/common/skiplist_tests.c b/src/tests/common/skiplist_tests.c
index 4fe99ec8bd..68ad139bc2 100644
--- a/src/tests/common/skiplist_tests.c
+++ b/src/tests/common/skiplist_tests.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <time.h>
 
 #include "tests/common/skiplist_tests.h"
diff --git a/src/tests/common/slab_tests.c b/src/tests/common/slab_tests.c
index a5de1c25cb..ad2eee1357 100644
--- a/src/tests/common/slab_tests.c
+++ b/src/tests/common/slab_tests.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <time.h>
diff --git a/src/tests/knot/conf_tests.c b/src/tests/knot/conf_tests.c
index eb1c5914bc..0904a4e2a7 100644
--- a/src/tests/knot/conf_tests.c
+++ b/src/tests/knot/conf_tests.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 
 #include "tests/knot/conf_tests.h"
diff --git a/src/tests/knot/dthreads_tests.c b/src/tests/knot/dthreads_tests.c
index efc3f63c39..247f66e91c 100644
--- a/src/tests/knot/dthreads_tests.c
+++ b/src/tests/knot/dthreads_tests.c
@@ -13,6 +13,8 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+#include <config.h>
 #include <pthread.h>
 #include <sched.h>
 #include <sys/select.h>
diff --git a/src/tests/knot/journal_tests.c b/src/tests/knot/journal_tests.c
index 658b4a14d1..0146e5f475 100644
--- a/src/tests/knot/journal_tests.c
+++ b/src/tests/knot/journal_tests.c
@@ -13,6 +13,8 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+#include <config.h>
 #include <string.h>
 
 #include "tests/knot/journal_tests.h"
diff --git a/src/tests/knot/rrl_tests.c b/src/tests/knot/rrl_tests.c
index 9cb46f88d5..db0bbb9952 100644
--- a/src/tests/knot/rrl_tests.c
+++ b/src/tests/knot/rrl_tests.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include "tests/knot/rrl_tests.h"
diff --git a/src/tests/knot/server_tests.c b/src/tests/knot/server_tests.c
index 5ae04d8071..d84d2c9dc3 100644
--- a/src/tests/knot/server_tests.c
+++ b/src/tests/knot/server_tests.c
@@ -13,6 +13,8 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+#include <config.h>
 #include "tests/knot/server_tests.h"
 #include "knot/server/server.h"
 
diff --git a/src/tests/libknot/dname_tests.c b/src/tests/libknot/dname_tests.c
index 64fd836341..73ca67de96 100644
--- a/src/tests/libknot/dname_tests.c
+++ b/src/tests/libknot/dname_tests.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "tests/libknot/dname_tests.h"
 #include "libknot/dname.h"
 
diff --git a/src/tests/libknot/rrset_tests.c b/src/tests/libknot/rrset_tests.c
index 6db8c1a2c4..d140681017 100644
--- a/src/tests/libknot/rrset_tests.c
+++ b/src/tests/libknot/rrset_tests.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <assert.h>
 #include <stdint.h>
 #include <inttypes.h>
diff --git a/src/tests/libknot/sign_tests.c b/src/tests/libknot/sign_tests.c
index a32ce32898..6b77218bf0 100644
--- a/src/tests/libknot/sign_tests.c
+++ b/src/tests/libknot/sign_tests.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "tests/libknot/sign_tests.h"
 #include "libknot/sign/key.h"
 #include "libknot/sign/key.c" // testing static functions
diff --git a/src/tests/libknot/wire_tests.c b/src/tests/libknot/wire_tests.c
index a56d3f91d3..7e4d001395 100644
--- a/src/tests/libknot/wire_tests.c
+++ b/src/tests/libknot/wire_tests.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "tests/libknot/wire_tests.h"
 #include "libknot/util/utils.h"
 
diff --git a/src/tests/libknot/ztree_tests.c b/src/tests/libknot/ztree_tests.c
index e592c6027b..53506af7b6 100644
--- a/src/tests/libknot/ztree_tests.c
+++ b/src/tests/libknot/ztree_tests.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "tests/libknot/ztree_tests.h"
 #include "libknot/zone/zone-tree.h"
 
diff --git a/src/tests/xfr_tests.c b/src/tests/xfr_tests.c
index 77db11cc48..70360d14d4 100644
--- a/src/tests/xfr_tests.c
+++ b/src/tests/xfr_tests.c
@@ -21,8 +21,8 @@
  *    binary that an integrity check should be done
 */
 
-#include <time.h>
 #include <config.h>
+#include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/tests/zscanner/zscanner_tests.c b/src/tests/zscanner/zscanner_tests.c
index c1ae23b154..3d755ede63 100644
--- a/src/tests/zscanner/zscanner_tests.c
+++ b/src/tests/zscanner/zscanner_tests.c
@@ -14,10 +14,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "tests/zscanner/zscanner_tests.h"
 
 #include <stdlib.h>
-#include <config.h>
 
 static int zscanner_tests_count(int argc, char *argv[]);
 static int zscanner_tests_run(int argc, char *argv[]);
diff --git a/src/utils/common/exec.c b/src/utils/common/exec.c
index 87fd116c66..0a9c1a9f28 100644
--- a/src/utils/common/exec.c
+++ b/src/utils/common/exec.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include "utils/common/exec.h"
 
 #include <stdlib.h>			// free
diff --git a/src/utils/common/msg.c b/src/utils/common/msg.c
index a1b61a60e3..412bee805e 100644
--- a/src/utils/common/msg.c
+++ b/src/utils/common/msg.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
diff --git a/src/utils/common/netio.c b/src/utils/common/netio.c
index 5fd1df7b06..e3f8a52dc4 100644
--- a/src/utils/common/netio.c
+++ b/src/utils/common/netio.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include "utils/common/netio.h"
 
 #include <stdlib.h>			// free
diff --git a/src/utils/common/params.c b/src/utils/common/params.c
index b0c1cd2450..f5a0a80794 100644
--- a/src/utils/common/params.c
+++ b/src/utils/common/params.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include "utils/common/params.h"
 
 #include <stdio.h>
diff --git a/src/utils/common/resolv.c b/src/utils/common/resolv.c
index 09d4fb1095..864a2a9838 100644
--- a/src/utils/common/resolv.c
+++ b/src/utils/common/resolv.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include "utils/common/resolv.h"
 
 #include <stdio.h>			// fopen
diff --git a/src/utils/common/token.c b/src/utils/common/token.c
index 3463dbbfbc..457a7c0fd3 100644
--- a/src/utils/common/token.c
+++ b/src/utils/common/token.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include "utils/common/token.h"
 
 #include <stdio.h>
diff --git a/src/utils/dig/dig_exec.c b/src/utils/dig/dig_exec.c
index 908c2e1625..77323743be 100644
--- a/src/utils/dig/dig_exec.c
+++ b/src/utils/dig/dig_exec.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include "utils/dig/dig_exec.h"
 
 #include <stdlib.h>			// free
diff --git a/src/utils/dig/dig_main.c b/src/utils/dig/dig_main.c
index 9bf68bd37c..b9b2f6d7b7 100644
--- a/src/utils/dig/dig_main.c
+++ b/src/utils/dig/dig_main.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include <stdlib.h>			// EXIT_FAILURE
 
 #include "common/errcode.h"		// KNOT_EOK
diff --git a/src/utils/dig/dig_params.c b/src/utils/dig/dig_params.c
index d44b1c57b7..64995b70d5 100644
--- a/src/utils/dig/dig_params.c
+++ b/src/utils/dig/dig_params.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include "utils/dig/dig_params.h"
 
 #include <string.h>			// strncmp
diff --git a/src/utils/host/host_main.c b/src/utils/host/host_main.c
index 0ac92fe32f..492a1bbbd1 100644
--- a/src/utils/host/host_main.c
+++ b/src/utils/host/host_main.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include <stdlib.h>			// EXIT_FAILURE
 
 #include "common/errcode.h"		// KNOT_EOK
diff --git a/src/utils/host/host_params.c b/src/utils/host/host_params.c
index 4863859870..ba6d965068 100644
--- a/src/utils/host/host_params.c
+++ b/src/utils/host/host_params.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include "utils/host/host_params.h"
 
 #include <string.h>			// strncmp
diff --git a/src/utils/nsupdate/nsupdate_exec.c b/src/utils/nsupdate/nsupdate_exec.c
index 3cc283d4d5..c891ca7138 100644
--- a/src/utils/nsupdate/nsupdate_exec.c
+++ b/src/utils/nsupdate/nsupdate_exec.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include <stdio.h>
 #include <errno.h>
 #include <assert.h>
diff --git a/src/utils/nsupdate/nsupdate_main.c b/src/utils/nsupdate/nsupdate_main.c
index 8bb56aeb87..590b4b98b7 100644
--- a/src/utils/nsupdate/nsupdate_main.c
+++ b/src/utils/nsupdate/nsupdate_main.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include <stdlib.h>				// EXIT_FAILURE
 
 #include "common/errcode.h"			// KNOT_EOK
diff --git a/src/utils/nsupdate/nsupdate_params.c b/src/utils/nsupdate/nsupdate_params.c
index 31481ca882..e7d9433685 100644
--- a/src/utils/nsupdate/nsupdate_params.c
+++ b/src/utils/nsupdate/nsupdate_params.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include <string.h>
 #include <stdio.h>
 #include <getopt.h>
diff --git a/src/zscanner/file_loader.c b/src/zscanner/file_loader.c
index 90e1b7028a..39955f009d 100644
--- a/src/zscanner/file_loader.c
+++ b/src/zscanner/file_loader.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "zscanner/file_loader.h"
 
 #include <inttypes.h>			// PRIu64
diff --git a/src/zscanner/scanner_functions.c b/src/zscanner/scanner_functions.c
index bd6cab70a2..3d5685670a 100644
--- a/src/zscanner/scanner_functions.c
+++ b/src/zscanner/scanner_functions.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "zscanner/scanner_functions.h"
 
 #include <stdint.h>
diff --git a/src/zscanner/test/processing.c b/src/zscanner/test/processing.c
index c3a7218da8..8c532595eb 100644
--- a/src/zscanner/test/processing.c
+++ b/src/zscanner/test/processing.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "zscanner/scanner_functions.h"
 
 #include <inttypes.h>			// PRIu64
diff --git a/src/zscanner/test/tests.c b/src/zscanner/test/tests.c
index 103bf114c8..fdd87ccf6d 100644
--- a/src/zscanner/test/tests.c
+++ b/src/zscanner/test/tests.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "zscanner/test/tests.h"
 
 #include <inttypes.h>			// PRIu64
diff --git a/src/zscanner/test/zscanner-tool.c b/src/zscanner/test/zscanner-tool.c
index fa93b797e0..4ac4907eca 100644
--- a/src/zscanner/test/zscanner-tool.c
+++ b/src/zscanner/test/zscanner-tool.c
@@ -14,6 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 #include <inttypes.h>			// PRIu64
 #include <stdio.h>			// printf
 #include <stdlib.h>			// atoi
diff --git a/tests/chkjournal.c b/tests/chkjournal.c
index 5bc287a717..f8ff83dd13 100644
--- a/tests/chkjournal.c
+++ b/tests/chkjournal.c
@@ -29,6 +29,8 @@
      $ cd tests
      $ make chkjournal-i386
  */
+
+#include <config.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
-- 
GitLab