From d9a28c4a0dcaa2f6959abcbe4adf6e85fd015bbf Mon Sep 17 00:00:00 2001
From: Andreas Gustafsson <source@isc.org>
Date: Thu, 20 Jan 2000 01:14:33 +0000
Subject: [PATCH] remove needless #includes

---
 bin/named/include/named/zoneconf.h | 1 +
 lib/dns/include/dns/confcache.h    | 3 +--
 lib/dns/include/dns/confcommon.h   | 2 --
 lib/dns/include/dns/confkeys.h     | 6 +++---
 lib/dns/include/dns/confparser.h   | 2 +-
 lib/dns/include/dns/confresolv.h   | 3 +--
 lib/dns/include/dns/tsig.h         | 3 ++-
 lib/dns/include/dns/zoneconf.h     | 1 +
 8 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/bin/named/include/named/zoneconf.h b/bin/named/include/named/zoneconf.h
index 123f110037..2286b09fa6 100644
--- a/bin/named/include/named/zoneconf.h
+++ b/bin/named/include/named/zoneconf.h
@@ -18,6 +18,7 @@
 #ifndef NS_ZONECONF_H
 #define NS_ZONECONF_H 1
 
+#include <isc/log.h>
 #include <isc/types.h>
 
 #include <dns/acl.h>
diff --git a/lib/dns/include/dns/confcache.h b/lib/dns/include/dns/confcache.h
index e02f5ffd79..0aa1264bc1 100644
--- a/lib/dns/include/dns/confcache.h
+++ b/lib/dns/include/dns/confcache.h
@@ -52,8 +52,7 @@
 
 #include <config.h>
 
-#include <isc/mem.h>
-#include <isc/log.h>
+#include <isc/types.h>
 
 
 /***
diff --git a/lib/dns/include/dns/confcommon.h b/lib/dns/include/dns/confcommon.h
index 08b6630569..5f04a1c488 100644
--- a/lib/dns/include/dns/confcommon.h
+++ b/lib/dns/include/dns/confcommon.h
@@ -65,11 +65,9 @@
 #include <isc/int.h>
 #include <isc/result.h>
 #include <isc/types.h>
-#include <isc/mem.h>
 #include <isc/net.h>
 #include <isc/sockaddr.h>
 
-#include <dns/log.h>
 #include <dns/types.h>
 
 /* Constants used in the defintions of default logging channels and
diff --git a/lib/dns/include/dns/confkeys.h b/lib/dns/include/dns/confkeys.h
index 37f0e1529a..922bb442be 100644
--- a/lib/dns/include/dns/confkeys.h
+++ b/lib/dns/include/dns/confkeys.h
@@ -53,13 +53,13 @@
  *** Imports
  ***/
 
+#include <stdio.h>
+
 #include <config.h>
 
-#include <isc/mem.h>
+#include <isc/types.h>
 #include <isc/list.h>
 
-#include <dns/log.h>
-
 
 #define DNS_C_TKEY_MAGIC		0x544b4559 /* TKEY */
 #define DNS_C_TKEYLIST_MAGIC		0x544b4c53 /* TKLS */
diff --git a/lib/dns/include/dns/confparser.h b/lib/dns/include/dns/confparser.h
index b6f8b7315f..81141269bd 100644
--- a/lib/dns/include/dns/confparser.h
+++ b/lib/dns/include/dns/confparser.h
@@ -52,7 +52,7 @@
  ***/
 
 #include <config.h>
-#include <isc/log.h>
+#include <isc/types.h>
 
 #include <dns/confctx.h>
 
diff --git a/lib/dns/include/dns/confresolv.h b/lib/dns/include/dns/confresolv.h
index 1612815703..bb56a020fa 100644
--- a/lib/dns/include/dns/confresolv.h
+++ b/lib/dns/include/dns/confresolv.h
@@ -52,8 +52,7 @@
 
 #include <config.h>
 
-#include <isc/mem.h>
-#include <isc/log.h>
+#include <isc/types.h>
 
 /***
  *** Types
diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h
index 8e75069d60..ce1b8ddf83 100644
--- a/lib/dns/include/dns/tsig.h
+++ b/lib/dns/include/dns/tsig.h
@@ -18,8 +18,9 @@
 #ifndef DNS_TSIG_H
 #define DNS_TSIG_H 1
 
-#include <isc/mem.h>
+#include <isc/types.h>
 #include <isc/lang.h>
+#include <isc/log.h>
 
 #include <dns/types.h>
 #include <dns/name.h>
diff --git a/lib/dns/include/dns/zoneconf.h b/lib/dns/include/dns/zoneconf.h
index 123f110037..2286b09fa6 100644
--- a/lib/dns/include/dns/zoneconf.h
+++ b/lib/dns/include/dns/zoneconf.h
@@ -18,6 +18,7 @@
 #ifndef NS_ZONECONF_H
 #define NS_ZONECONF_H 1
 
+#include <isc/log.h>
 #include <isc/types.h>
 
 #include <dns/acl.h>