From 32eddfc189108fa93e31761e13150594c7a79d2b Mon Sep 17 00:00:00 2001
From: David Lawrence <source@isc.org>
Date: Fri, 28 Apr 2000 03:53:48 +0000
Subject: [PATCH]  120.   [cleanup]       <isc/socket.h> does not need
 <isc/boolean.h>,                         <isc/bufferlist.h>, <isc/task.h>,
 <isc/mem.h> or                         <isc/net.h>.

---
 CHANGES                      | 4 ++++
 bin/named/interfacemgr.c     | 5 +++--
 lib/dns/dispatch.c           | 1 +
 lib/dns/tcpmsg.c             | 1 +
 lib/isc/include/isc/socket.h | 6 ------
 lib/isc/unix/socket.c        | 4 +++-
 lib/omapi/connection.c       | 3 ++-
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8188cbf33e..898aa95553 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+ 120.   [cleanup]       <isc/socket.h> does not need <isc/boolean.h>,
+                        <isc/bufferlist.h>, <isc/task.h>, <isc/mem.h> or
+                        <isc/net.h>.
+
  119.	[cleanup]	structure definitions for generic rdata stuctures do
 			not have _generic_ in their names.
 
diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c
index 622f189874..2021f20b23 100644
--- a/bin/named/interfacemgr.c
+++ b/bin/named/interfacemgr.c
@@ -25,12 +25,13 @@
 
 #include <isc/assertions.h>
 #include <isc/error.h>
+#include <isc/interfaceiter.h>
 #include <isc/mem.h>
+#include <isc/net.h>
 #include <isc/result.h>
 #include <isc/socket.h>
+#include <isc/task.h>
 #include <isc/types.h>
-#include <isc/net.h>
-#include <isc/interfaceiter.h>
 #include <isc/util.h>
 
 #include <dns/acl.h>
diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 6e9c4472d7..6ea090ef09 100644
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -28,6 +28,7 @@
 #include <isc/mem.h>
 #include <isc/mutex.h>
 #include <isc/socket.h>
+#include <isc/task.h>
 #include <isc/util.h>
 
 #include <dns/events.h>
diff --git a/lib/dns/tcpmsg.c b/lib/dns/tcpmsg.c
index c7249df0cf..2394961a5b 100644
--- a/lib/dns/tcpmsg.c
+++ b/lib/dns/tcpmsg.c
@@ -27,6 +27,7 @@
 #include <isc/error.h>
 #include <isc/mem.h>
 #include <isc/socket.h>
+#include <isc/task.h>
 #include <isc/util.h>
 
 #include <dns/events.h>
diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index 7210ce9fcf..6bd9184e22 100644
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -61,16 +61,10 @@
 
 #include <isc/lang.h>
 #include <isc/types.h>
-#include <isc/boolean.h>
-#include <isc/bufferlist.h>
-#include <isc/result.h>
 #include <isc/event.h>
 #include <isc/eventclass.h>
-#include <isc/task.h>
 #include <isc/time.h>
 #include <isc/region.h>
-#include <isc/mem.h>
-#include <isc/net.h>
 #include <isc/sockaddr.h>
 
 ISC_LANG_BEGINDECLS
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 1315c53307..124b3dfa56 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -32,13 +32,15 @@
 
 #include <isc/assertions.h>
 #include <isc/buffer.h>
+#include <isc/bufferlist.h>
 #include <isc/condition.h>
 #include <isc/error.h>
 #include <isc/list.h>
-#include <isc/mutex.h>
+#include <isc/mem.h>
 #include <isc/net.h>
 #include <isc/region.h>
 #include <isc/socket.h>
+#include <isc/task.h>
 #include <isc/thread.h>
 #include <isc/util.h>
 
diff --git a/lib/omapi/connection.c b/lib/omapi/connection.c
index d9dc6bc41d..3a695b99ff 100644
--- a/lib/omapi/connection.c
+++ b/lib/omapi/connection.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: connection.c,v 1.22 2000/04/28 02:08:15 tale Exp $ */
+/* $Id: connection.c,v 1.23 2000/04/28 03:53:48 tale Exp $ */
 
 /* Principal Author: DCL */
 
@@ -30,6 +30,7 @@
 #include <string.h>		/* memset */
 
 #include <isc/assertions.h>
+#include <isc/bufferlist.h>
 #include <isc/error.h>
 #include <isc/netdb.h>