* include/cygwin/cygserver.h: Add forward declarations of class

	transport_layer_base and class process_cache to reduce
	dependencies between header files.
	* include/cygwin/cygserver_process.h: Add include of
	"threaded_queue.h".
	* cygserver.cc: Remove unnecessary cygserver header files.
	* cygserver_client.cc: Ditto.
	* cygserver_process.cc: Ditto.
	* cygserver_shm.cc: Ditto.
	* cygserver_shm.h: Ditto.
	* cygserver_transport_pipes.cc: Ditto.
	* dcrt0.cc: Ditto.
	* fhandler_tty.cc: Ditto.
	* tty.cc: Ditto.

12 files changed, 40 insertions, 26 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 230f44185..41f16b989 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,22 @@
 2002-06-24  Conrad Scott  <conrad.scott@dsl.pipex.com>
 
+	* include/cygwin/cygserver.h: Add forward declarations of class
+	transport_layer_base and class process_cache to reduce
+	dependencies between header files.
+	* include/cygwin/cygserver_process.h: Add include of
+	"threaded_queue.h".
+	* cygserver.cc: Remove unnecessary cygserver header files.
+	* cygserver_client.cc: Ditto.
+	* cygserver_process.cc: Ditto.
+	* cygserver_shm.cc: Ditto.
+	* cygserver_shm.h: Ditto.
+	* cygserver_transport_pipes.cc: Ditto.
+	* dcrt0.cc: Ditto.
+	* fhandler_tty.cc: Ditto.
+	* tty.cc: Ditto.
+
+2002-06-24  Conrad Scott  <conrad.scott@dsl.pipex.com>
+
 	* cygserver_shm.h: Replace <sys/shm.h> with "cygwin_shm.h" after
 	merge from HEAD.
 	* cygwin_ipc.h: Update with changes to include/sys/ipc.h lost in
diff --git a/winsup/cygwin/cygserver.cc b/winsup/cygwin/cygserver.cc
index 48922d54a..32e93dc47 100755
--- a/winsup/cygwin/cygserver.cc
+++ b/winsup/cygwin/cygserver.cc
@@ -28,16 +28,12 @@ details. */
 
 #include <ostream.h>
 
-#include "cygwin_version.h"
 #include "cygerrno.h"
+#include "cygwin_version.h"
 
-#include "cygserver_shm.h"
 #include "cygwin/cygserver.h"
 #include "cygwin/cygserver_process.h"
 #include "cygwin/cygserver_transport.h"
-#include "cygwin/cygserver_transport_pipes.h"
-#include "cygwin/cygserver_transport_sockets.h"
-#include "threaded_queue.h"
 
 GENERIC_MAPPING access_mapping;
 
diff --git a/winsup/cygwin/cygserver_client.cc b/winsup/cygwin/cygserver_client.cc
index 277026d6f..c21744899 100755
--- a/winsup/cygwin/cygserver_client.cc
+++ b/winsup/cygwin/cygserver_client.cc
@@ -25,12 +25,10 @@ details. */
 #include <unistd.h>
 
 #include "cygerrno.h"
+#include "cygserver_shm.h"
 
-#include "cygwin/cygserver_transport.h"
-#include "cygwin/cygserver_transport_pipes.h"
-#include "cygwin/cygserver_transport_sockets.h"
 #include "cygwin/cygserver.h"
-#include "cygserver_shm.h"
+#include "cygwin/cygserver_transport.h"
 
 int cygserver_running = CYGSERVER_UNKNOWN;
 
diff --git a/winsup/cygwin/cygserver_process.cc b/winsup/cygwin/cygserver_process.cc
index c05f5d1a4..4ad80ed46 100755
--- a/winsup/cygwin/cygserver_process.cc
+++ b/winsup/cygwin/cygserver_process.cc
@@ -12,16 +12,17 @@
 
 #include "woutsup.h"
 
-#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/types.h>
+
+#include <errno.h>
 #include <netdb.h>
 #include <pthread.h>
-#include <threaded_queue.h>
-#include <cygwin/cygserver_process.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "cygwin/cygserver_process.h"
 
 /* the cache structures and classes are designed for one cache per server process.
  * To make multiple process caches, a redesign will be needed
diff --git a/winsup/cygwin/cygserver_shm.cc b/winsup/cygwin/cygserver_shm.cc
index 06456095f..64cfc11b6 100755
--- a/winsup/cygwin/cygserver_shm.cc
+++ b/winsup/cygwin/cygserver_shm.cc
@@ -20,9 +20,11 @@
 
 #include "cygerrno.h"
 #include "cygserver_shm.h"
-#include "cygwin/cygserver_process.h"
 #include "security.h"
-#include "threaded_queue.h"
+
+#include "cygwin/cygserver.h"
+#include "cygwin/cygserver_process.h"
+#include "cygwin/cygserver_transport.h"
 
 // FIXME IS THIS CORRECT
 /* Implementation notes: We use two shared memory regions per key:
diff --git a/winsup/cygwin/cygserver_shm.h b/winsup/cygwin/cygserver_shm.h
index 2475c3628..27a49d7c1 100644
--- a/winsup/cygwin/cygserver_shm.h
+++ b/winsup/cygwin/cygserver_shm.h
@@ -12,9 +12,7 @@ details. */
 #include <sys/types.h>
 
 #include "cygwin_shm.h"
-#include "threaded_queue.h"
-#include "cygwin/cygserver_process.h"
-#include "cygwin/cygserver_transport.h"
+
 #include "cygwin/cygserver.h"
 
 /* Values for the client_request_shm::parameters.in.type field. */
diff --git a/winsup/cygwin/cygserver_transport_pipes.cc b/winsup/cygwin/cygserver_transport_pipes.cc
index 408e05d10..d256fd92a 100755
--- a/winsup/cygwin/cygserver_transport_pipes.cc
+++ b/winsup/cygwin/cygserver_transport_pipes.cc
@@ -17,7 +17,6 @@
 #include "winsup.h"
 #endif
 
-#include <sys/socket.h>
 #include <sys/types.h>
 
 #include <assert.h>
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 4f4f9c393..afec2173e 100644
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -33,7 +33,6 @@ details. */
 #include "shared_info.h"
 #include "cygwin_version.h"
 #include "dll_init.h"
-#include "cygwin/cygserver_transport.h"
 #include "cygwin/cygserver.h"
 
 #define MAX_AT_FILE_LEVEL 10
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index fe4ea6911..725585d31 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -24,7 +24,6 @@ details. */
 #include "pinfo.h"
 #include "cygheap.h"
 #include "shared_info.h"
-#include "cygwin/cygserver_transport.h"
 #include "cygwin/cygserver.h"
 
 /* Tty master stuff */
diff --git a/winsup/cygwin/include/cygwin/cygserver.h b/winsup/cygwin/include/cygwin/cygserver.h
index 1197fc466..0e5d32f61 100755
--- a/winsup/cygwin/include/cygwin/cygserver.h
+++ b/winsup/cygwin/include/cygwin/cygserver.h
@@ -34,6 +34,12 @@ typedef enum {
  * class client_request
  *---------------------------------------------------------------------------*/
 
+class transport_layer_base;
+
+#ifndef __INSIDE_CYGWIN__
+class process_cache;
+#endif
+
 class client_request
 {
 protected:
diff --git a/winsup/cygwin/include/cygwin/cygserver_process.h b/winsup/cygwin/include/cygwin/cygserver_process.h
index 41f36c078..d1139272a 100755
--- a/winsup/cygwin/include/cygwin/cygserver_process.h
+++ b/winsup/cygwin/include/cygwin/cygserver_process.h
@@ -13,7 +13,7 @@ details. */
 #ifndef _CYGSERVER_PROCESS_
 #define _CYGSERVER_PROCESS_
 
-/* needs threaded_queue.h */
+#include "threaded_queue.h"
 
 class process_cleanup:public queue_request
 {
diff --git a/winsup/cygwin/tty.cc b/winsup/cygwin/tty.cc
index 418b816f3..c9d2938e3 100644
--- a/winsup/cygwin/tty.cc
+++ b/winsup/cygwin/tty.cc
@@ -22,7 +22,6 @@ details. */
 #include "dtable.h"
 #include "cygheap.h"
 #include "pinfo.h"
-#include "cygwin/cygserver_transport.h"
 #include "cygwin/cygserver.h"
 #include "shared_info.h"