DEVEL15-windows-afsd-headers-20070627

remove unneeded headers and shuffle order where necessary

(cherry picked from commit 9ca8794ed4561e977df075a636869f308ef1f778)

diff --git a/src/WINNT/afsd/afsd.h b/src/WINNT/afsd/afsd.h
index 966849b..8388238 100644 (file)
--- a/src/WINNT/afsd/afsd.h
+++ b/src/WINNT/afsd/afsd.h
@@ -40,8 +40,8 @@ BOOL APIENTRY About(HWND, unsigned int, unsigned int, long);
 #endif /* DISKCACHE95 */
 #include "cm_conn.h"
 #include "cm_aclent.h"
-#include "cm_cell.h"
 #include "cm_server.h"
+#include "cm_cell.h"
 #include "cm_scache.h"
 #include "cm_volume.h"
 #include "cm_dcache.h"

diff --git a/src/WINNT/afsd/cm_cell.h b/src/WINNT/afsd/cm_cell.h
index 02a9cae..6515e5d 100644 (file)
--- a/src/WINNT/afsd/cm_cell.h
+++ b/src/WINNT/afsd/cm_cell.h
@@ -10,8 +10,6 @@
 #ifndef __CELL_H_ENV_
 #define __CELL_H_ENV_ 1
 
-#include "cm_server.h"
-
 #define CELL_MAXNAMELEN                 256
 
 #define CM_CELL_MAGIC    ('C' | 'E' <<8 | 'L'<<16 | 'L'<<24)

diff --git a/src/WINNT/afsd/cm_config.c b/src/WINNT/afsd/cm_config.c
index ab8e5d7..23db7f0 100644 (file)
--- a/src/WINNT/afsd/cm_config.c
+++ b/src/WINNT/afsd/cm_config.c
@@ -7,10 +7,6 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <afs/param.h>
-#include <afs/stds.h>
-#include <afs/cellconfig.h>
-
 #ifndef DJGPP
 #include <windows.h>
 #include <winsock2.h>
@@ -25,11 +21,18 @@
 #include "afsd.h"
 #include <WINNT\afssw.h>
 #include <WINNT\afsreg.h>
+
+#include <afs/param.h>
+#include <afs/stds.h>
+#include <afs/cellconfig.h>
+
 #ifdef AFS_AFSDB_ENV
 #include "cm_dns.h"
 #include <afs/afsint.h>
 #endif
 
+
+
 /* TODO: these should be pulled in from dirpath.h */
 #if !defined(DJGPP) && !defined(AFS_WIN95_ENV)
 #define AFS_THISCELL "ThisCell"

diff --git a/src/WINNT/afsd/cm_ioctl.c b/src/WINNT/afsd/cm_ioctl.c
index c012f6d..d825843 100644 (file)
--- a/src/WINNT/afsd/cm_ioctl.c
+++ b/src/WINNT/afsd/cm_ioctl.c
@@ -32,7 +32,6 @@
 #include <WINNT\afsreg.h>
 
 #include "smb.h"
-#include "cm_server.h"
 
 #ifndef DJGPP
 #include <rx/rxkad.h>