got rid of a lot of redundent header files as we now globally generate

prototypes automatically using "make proto". This is much less prone
to error than the old method of manually adding prototypes

12 files changed, 7 insertions, 19 deletions

diff --git a/source/smbd/chgpasswd.c b/source/smbd/chgpasswd.c
index dc0514c1ed7..809ac4d224c 100644
--- a/source/smbd/chgpasswd.c
+++ b/source/smbd/chgpasswd.c
@@ -27,7 +27,6 @@
    */
 
 #include "includes.h"
-#include "loadparm.h"
 
 extern int DEBUGLEVEL;
 
diff --git a/source/smbd/dir.c b/source/smbd/dir.c
index 32f2eb5e7de..55a59834685 100644
--- a/source/smbd/dir.c
+++ b/source/smbd/dir.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "loadparm.h"
 
 extern int DEBUGLEVEL;
 extern connection_struct Connections[];
diff --git a/source/smbd/ipc.c b/source/smbd/ipc.c
index 916b0fb88e8..594e067ddd4 100644
--- a/source/smbd/ipc.c
+++ b/source/smbd/ipc.c
@@ -24,8 +24,6 @@
    */
 
 #include "includes.h"
-#include "loadparm.h"
-#include "pcap.h"
 
 #ifdef CHECK_TYPES
 #undef CHECK_TYPES
diff --git a/source/smbd/mangle.c b/source/smbd/mangle.c
index a43e7f62451..cf1ece558c7 100644
--- a/source/smbd/mangle.c
+++ b/source/smbd/mangle.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "loadparm.h"
 
 extern int DEBUGLEVEL;
 extern int case_default;
diff --git a/source/smbd/message.c b/source/smbd/message.c
index 6a96b4c7a9c..b26a6605ed5 100644
--- a/source/smbd/message.c
+++ b/source/smbd/message.c
@@ -25,7 +25,6 @@
 
 
 #include "includes.h"
-#include "loadparm.h"
 
 /* look in server.c for some explanation of these variables */
 extern int DEBUGLEVEL;
diff --git a/source/smbd/password.c b/source/smbd/password.c
index c2fe8a4f0d4..ae548b82669 100644
--- a/source/smbd/password.c
+++ b/source/smbd/password.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "loadparm.h"
 
 extern int DEBUGLEVEL;
 extern int Protocol;
diff --git a/source/smbd/predict.c b/source/smbd/predict.c
index 8df381b367a..7f1692931c9 100644
--- a/source/smbd/predict.c
+++ b/source/smbd/predict.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "loadparm.h"
 
 extern int DEBUGLEVEL;
 
diff --git a/source/smbd/quotas.c b/source/smbd/quotas.c
index 4216aa1199f..6ba20faa6cd 100644
--- a/source/smbd/quotas.c
+++ b/source/smbd/quotas.c
@@ -273,7 +273,7 @@ BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize)
     return(False) ;
   
   devno = sbuf.st_dev ;
-DEBUG(5,("disk_quotas: looking for path \"%s\" devno=%o\n", path,devno));
+  DEBUG(5,("disk_quotas: looking for path \"%s\" devno=%o\n", path,devno));
   if ( devno != devno_cached ) {
     devno_cached = devno ;
 #if defined(SUNOS5)
@@ -284,7 +284,8 @@ DEBUG(5,("disk_quotas: looking for path \"%s\" devno=%o\n", path,devno));
     while (getmntent(fd, &mnt) == 0) {
       if ( stat(mnt.mnt_mountp,&sbuf) == -1 )
 	continue ;
-DEBUG(5,("disk_quotas: testing \"%s\" devno=%o\n", mnt.mnt_mountp,sbuf.st_dev));
+      DEBUG(5,("disk_quotas: testing \"%s\" devno=%o\n", 
+	       mnt.mnt_mountp,sbuf.st_dev));
       if (sbuf.st_dev == devno) {
 	found = True ;
 	break ;
@@ -302,7 +303,8 @@ DEBUG(5,("disk_quotas: testing \"%s\" devno=%o\n", mnt.mnt_mountp,sbuf.st_dev));
     while ((mnt = getmntent(fd)) != NULL) {
       if ( stat(mnt->mnt_dir,&sbuf) == -1 )
 	continue ;
-DEBUG(5,("disk_quotas: testing \"%s\" devno=%o\n", mnt->mnt_dir,sbuf.st_dev));
+      DEBUG(5,("disk_quotas: testing \"%s\" devno=%o\n", 
+	       mnt->mnt_dir,sbuf.st_dev));
       if (sbuf.st_dev == devno) {
 	found = True ;
 	break ;
@@ -324,7 +326,7 @@ DEBUG(5,("disk_quotas: testing \"%s\" devno=%o\n", mnt->mnt_dir,sbuf.st_dev));
   seteuid(0);
 
 #if defined(SUNOS5)
-DEBUG(5,("disk_quotas: looking for quotas file \"%s\"\n", name));
+  DEBUG(5,("disk_quotas: looking for quotas file \"%s\"\n", name));
   if((file=open(name, O_RDONLY))<0) {
     setuid(user_id);  /* Restore the original UID status */
     seteuid(euser_id);
@@ -336,7 +338,7 @@ DEBUG(5,("disk_quotas: looking for quotas file \"%s\"\n", name));
   ret = ioctl(file, Q_QUOTACTL, &command);
   close(file);
 #else
-DEBUG(5,("disk_quotas: trying quotactl on device \"%s\"\n", name));
+  DEBUG(5,("disk_quotas: trying quotactl on device \"%s\"\n", name));
   ret = quotactl(Q_GETQUOTA, name, euser_id, &D);
 #endif
 
diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index 4472e120aaa..43703982ec9 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -25,7 +25,6 @@
 
 
 #include "includes.h"
-#include "loadparm.h"
 #include "trans2.h"
 
 /* look in server.c for some explanation of these variables */
diff --git a/source/smbd/server.c b/source/smbd/server.c
index 25464d861c3..ecc8e4ce9c5 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -20,10 +20,7 @@
 */
 
 #include "includes.h"
-#include "loadparm.h"
-#include "pcap.h"
 #include "trans2.h"
-#include "reply.h"
 
 pstring servicesf = CONFIGFILE;
 extern pstring debugf;
diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index 60e9ae2b294..0b113a2ed0e 100644
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -22,7 +22,6 @@
 */
 
 #include "includes.h"
-#include "loadparm.h"
 #include "trans2.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/smbd/uid.c b/source/smbd/uid.c
index 625303350a6..555cd457e77 100644
--- a/source/smbd/uid.c
+++ b/source/smbd/uid.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "loadparm.h"
 
 extern int DEBUGLEVEL;