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

@@ -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>

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>

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>

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>

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>

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"