From 6f2bfa1945ed5d98cf8b4b65e1fd0fd9999f1df6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vladimir.cunat@nic.cz>
Date: Mon, 2 Jul 2018 14:05:07 +0200
Subject: [PATCH] simple include fixes

- <dnssec/**> -> <libdnssec/**>
- <zscanner/**> -> <libzscanner/**>
---
 daemon/engine.c        |  2 +-
 daemon/zimport.c       |  2 +-
 lib/cache/impl.h       |  4 ++--
 lib/dnssec.c           | 10 +++++-----
 lib/dnssec/nsec.c      |  3 ++-
 lib/dnssec/nsec3.c     |  6 +++---
 lib/dnssec/signature.c |  6 +++---
 lib/dnssec/signature.h |  2 +-
 lib/dnssec/ta.c        |  4 ++--
 lib/layer/validate.c   |  2 +-
 lib/zonecut.c          |  1 -
 modules/hints/hints.c  |  1 -
 12 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/daemon/engine.c b/daemon/engine.c
index 2a2afa313..9ea993e9f 100644
--- a/daemon/engine.c
+++ b/daemon/engine.c
@@ -22,7 +22,7 @@
 #include <grp.h>
 #include <pwd.h>
 #include <sys/param.h>
-#include <zscanner/scanner.h>
+#include <libzscanner/scanner.h>
 
 #include "daemon/engine.h"
 #include "daemon/bindings.h"
diff --git a/daemon/zimport.c b/daemon/zimport.c
index bc28a3d8d..b301cab6e 100644
--- a/daemon/zimport.c
+++ b/daemon/zimport.c
@@ -49,7 +49,7 @@
 #include <uv.h>
 #include <ucw/mempool.h>
 #include <libknot/rrset.h>
-#include <zscanner/scanner.h>
+#include <libzscanner/scanner.h>
 
 #include "lib/utils.h"
 #include "lib/dnssec/ta.h"
diff --git a/lib/cache/impl.h b/lib/cache/impl.h
index 3ef8e4c6f..da1c75a7f 100644
--- a/lib/cache/impl.h
+++ b/lib/cache/impl.h
@@ -23,8 +23,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <dnssec/error.h>
-#include <dnssec/nsec.h>
+#include <libdnssec/error.h>
+#include <libdnssec/nsec.h>
 #include <libknot/consts.h>
 #include <libknot/db/db.h>
 #include <libknot/dname.h>
diff --git a/lib/dnssec.c b/lib/dnssec.c
index 0734ab83a..568ad63ba 100644
--- a/lib/dnssec.c
+++ b/lib/dnssec.c
@@ -15,11 +15,11 @@
  */
 
 #include <assert.h>
-#include <dnssec/binary.h>
-#include <dnssec/crypto.h>
-#include <dnssec/error.h>
-#include <dnssec/key.h>
-#include <dnssec/sign.h>
+#include <libdnssec/binary.h>
+#include <libdnssec/crypto.h>
+#include <libdnssec/error.h>
+#include <libdnssec/key.h>
+#include <libdnssec/sign.h>
 #include <libknot/descriptor.h>
 #include <libknot/packet/wire.h>
 #include <libknot/rdataset.h>
diff --git a/lib/dnssec/nsec.c b/lib/dnssec/nsec.c
index 5b961dc42..454c36974 100644
--- a/lib/dnssec/nsec.c
+++ b/lib/dnssec/nsec.c
@@ -15,6 +15,7 @@
  */
 
 #include <assert.h>
+#include <stdlib.h>
 
 #include <libknot/descriptor.h>
 #include <libknot/dname.h>
@@ -22,7 +23,7 @@
 #include <libknot/rrset.h>
 #include <libknot/rrtype/nsec.h>
 #include <libknot/rrtype/rrsig.h>
-#include <dnssec/error.h>
+#include <libdnssec/error.h>
 
 #include "lib/defines.h"
 #include "lib/dnssec/nsec.h"
diff --git a/lib/dnssec/nsec3.c b/lib/dnssec/nsec3.c
index 7dafda751..ef0944bbb 100644
--- a/lib/dnssec/nsec3.c
+++ b/lib/dnssec/nsec3.c
@@ -17,9 +17,9 @@
 #include <assert.h>
 #include <string.h>
 
-#include <dnssec/binary.h>
-#include <dnssec/error.h>
-#include <dnssec/nsec.h>
+#include <libdnssec/binary.h>
+#include <libdnssec/error.h>
+#include <libdnssec/nsec.h>
 #include <libknot/descriptor.h>
 #include <contrib/base32hex.h>
 #include <libknot/rrset.h>
diff --git a/lib/dnssec/signature.c b/lib/dnssec/signature.c
index 421ae1484..928520f16 100644
--- a/lib/dnssec/signature.c
+++ b/lib/dnssec/signature.c
@@ -18,9 +18,9 @@
 #include <assert.h>
 #include <string.h>
 
-#include <dnssec/error.h>
-#include <dnssec/key.h>
-#include <dnssec/sign.h>
+#include <libdnssec/error.h>
+#include <libdnssec/key.h>
+#include <libdnssec/sign.h>
 #include <libknot/descriptor.h>
 #include <libknot/packet/rrset-wire.h>
 #include <libknot/packet/wire.h>
diff --git a/lib/dnssec/signature.h b/lib/dnssec/signature.h
index 7bc2abe57..1e0f081ba 100644
--- a/lib/dnssec/signature.h
+++ b/lib/dnssec/signature.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <dnssec/key.h>
+#include <libdnssec/key.h>
 #include <libknot/rrset.h>
 
 /**
diff --git a/lib/dnssec/ta.c b/lib/dnssec/ta.c
index 28d26724f..2489d3482 100644
--- a/lib/dnssec/ta.c
+++ b/lib/dnssec/ta.c
@@ -19,8 +19,8 @@
 #include <libknot/rdataset.h>
 #include <libknot/rrset.h>
 #include <libknot/packet/wire.h>
-#include <dnssec/key.h>
-#include <dnssec/error.h>
+#include <libdnssec/key.h>
+#include <libdnssec/error.h>
 
 #include "lib/defines.h"
 #include "lib/dnssec/ta.h"
diff --git a/lib/layer/validate.c b/lib/layer/validate.c
index 11237cc8b..4c3f55817 100644
--- a/lib/layer/validate.c
+++ b/lib/layer/validate.c
@@ -24,7 +24,7 @@
 #include <libknot/packet/wire.h>
 #include <libknot/rrtype/rdname.h>
 #include <libknot/rrtype/rrsig.h>
-#include <dnssec/error.h>
+#include <libdnssec/error.h>
 
 #include "lib/dnssec/nsec.h"
 #include "lib/dnssec/nsec3.h"
diff --git a/lib/zonecut.c b/lib/zonecut.c
index cd11d2970..ae8425f5c 100644
--- a/lib/zonecut.c
+++ b/lib/zonecut.c
@@ -18,7 +18,6 @@
 #include <libknot/rrtype/rdname.h>
 #include <libknot/packet/wire.h>
 #include <libknot/descriptor.h>
-#include <libknot/rrtype/aaaa.h>
 
 #include "lib/zonecut.h"
 #include "lib/rplan.h"
diff --git a/modules/hints/hints.c b/modules/hints/hints.c
index 315678460..30f17861b 100644
--- a/modules/hints/hints.c
+++ b/modules/hints/hints.c
@@ -23,7 +23,6 @@
 
 #include <libknot/packet/pkt.h>
 #include <libknot/descriptor.h>
-#include <libknot/rrtype/aaaa.h>
 #include <ccan/json/json.h>
 #include <ucw/mempool.h>
 #include <contrib/cleanup.h>
-- 
2.47.2