From 23c3bcc71191ae25d10e45284e7e44f982fcfff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
Date: Thu, 11 Feb 2021 14:25:58 +0100
Subject: [PATCH] Stop including dnstap headers from <dns/dnstap.h>

The <fstrm.h> and <protobuf-c/protobuf-c.h> headers are only directly
included where used and we stopped exposing those headers from libdns
headers.
---
 bin/named/main.c             | 4 ++++
 bin/named/server.c           | 4 ++++
 lib/bind9/check.c            | 4 ++++
 lib/dns/dnstap.c             | 3 +--
 lib/dns/include/dns/dnstap.h | 6 ------
 lib/dns/tests/dnstap_test.c  | 2 ++
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/bin/named/main.c b/bin/named/main.c
index cfdc941e05..c8ea183269 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -18,6 +18,10 @@
 #include <string.h>
 #include <uv.h>
 
+#ifdef HAVE_DNSTAP
+#include <protobuf-c/protobuf-c.h>
+#endif
+
 #include <isc/app.h>
 #include <isc/attributes.h>
 #include <isc/backtrace.h>
diff --git a/bin/named/server.c b/bin/named/server.c
index c2afd5523a..4659815ffb 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -20,6 +20,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#ifdef HAVE_DNSTAP
+#include <fstrm.h>
+#endif
+
 #include <isc/aes.h>
 #include <isc/app.h>
 #include <isc/attributes.h>
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index e789aaadd1..67f2f96642 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -15,6 +15,10 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
+#ifdef HAVE_DNSTAP
+#include <fstrm.h>
+#endif
+
 #include <isc/aes.h>
 #include <isc/base64.h>
 #include <isc/buffer.h>
diff --git a/lib/dns/dnstap.c b/lib/dns/dnstap.c
index 44fb25e73c..2688b30a33 100644
--- a/lib/dns/dnstap.c
+++ b/lib/dns/dnstap.c
@@ -47,12 +47,11 @@
 #error DNSTAP not configured.
 #endif /* HAVE_DNSTAP */
 
+#include <fstrm.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include <protobuf-c/protobuf-c.h>
-
 #include <isc/buffer.h>
 #include <isc/file.h>
 #include <isc/log.h>
diff --git a/lib/dns/include/dns/dnstap.h b/lib/dns/include/dns/dnstap.h
index 9a13525bf3..14e042c3c6 100644
--- a/lib/dns/include/dns/dnstap.h
+++ b/lib/dns/include/dns/dnstap.h
@@ -26,13 +26,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#ifdef HAVE_DNSTAP
-#include <fstrm.h>
-
-#include <protobuf-c/protobuf-c.h>
-#else  /* ifdef HAVE_DNSTAP */
 struct fstrm_iothr_options;
-#endif /* HAVE_DNSTAP */
 
 #include <isc/log.h>
 #include <isc/refcount.h>
diff --git a/lib/dns/tests/dnstap_test.c b/lib/dns/tests/dnstap_test.c
index b41cd14fd4..5c46eda56d 100644
--- a/lib/dns/tests/dnstap_test.c
+++ b/lib/dns/tests/dnstap_test.c
@@ -37,6 +37,8 @@
 
 #ifdef HAVE_DNSTAP
 
+#include <fstrm.h>
+
 #include <protobuf-c/protobuf-c.h>
 
 #define TAPFILE "testdata/dnstap/dnstap.file"