Removed some #includes of unistd.h and stdio.h because they're

in h/nmh.h.

diff --git a/sbr/getpass.c b/sbr/getpass.c
index f3ae829..95e9178 100644 (file)
--- a/sbr/getpass.c
+++ b/sbr/getpass.c
@@ -31,10 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include <h/mh.h>
 #include <termios.h>
-#include <unistd.h>   /* for isatty() */
-#include "h/mh.h"     /* for adios() */
 
 /* We don't use MAX_PASS here because the maximum password length on a remote
    POP daemon will have nothing to do with the length on our OS.  256 is

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 80b93a9..0e83ac8 100644 (file)
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -28,12 +28,9 @@
 #ifdef HAVE_FLOCK
 # include <sys/file.h>
 #endif
-#ifdef HAVE_LOCKF
-# include <unistd.h>
-#endif
 
 #if defined(HAVE_LIBLOCKFILE)
-#include <lockfile.h>
+# include <lockfile.h>
 #endif
 
 #ifdef LOCKDIR

diff --git a/sbr/message_id.c b/sbr/message_id.c
index ce65ed9..c20bc1c 100644 (file)
--- a/sbr/message_id.c
+++ b/sbr/message_id.c
@@ -8,9 +8,7 @@
  */
 
 #include <h/mh.h>
-#include <unistd.h>    /* for getpid() */
 #include <sys/time.h>  /* for gettimeofday() */
-#include <stdio.h>
 
 
 static enum {