Eliminate some unnecessary headers.

svn path=/trunk/; revision=129

4 files changed, 8 insertions, 52 deletions

diff --git a/driver.c b/driver.c
index a37ab807..53b41e5a 100644
--- a/driver.c
+++ b/driver.c
@@ -12,20 +12,10 @@
  ***********************************************************************/
 
 #include  <config.h>
-#include  <varargs.h>
-
 #include  <stdio.h>
-#if defined(STDC_HEADERS)
-#include  <string.h>
-#endif
-#if defined(HAVE_UNISTD_H)
-#include  <unistd.h>
-#endif
-
-#include  <sys/time.h>
-#include  <ctype.h>
-#include  <errno.h>
 #include  <malloc.h>
+#include  <varargs.h>
+#include  <sys/time.h>
 
 #include  "socket.h"
 #include  "fetchmail.h"
diff --git a/imap.c b/imap.c
index 87dfe199..5cc5e054 100644
--- a/imap.c
+++ b/imap.c
@@ -12,28 +12,17 @@
  ***********************************************************************/
 
 #include  <config.h>
-#include  <varargs.h>
-
 #include  <stdio.h>
-#if defined(STDC_HEADERS)
-#include  <string.h>
-#endif
-#if defined(HAVE_UNISTD_H)
-#include  <unistd.h>
-#endif
-#include  <errno.h>
-
 #include  "socket.h"
 #include  "fetchmail.h"
 
-static int count, first;
-
 /*********************************************************************
 
  Method declarations for IMAP 
 
  *********************************************************************/
 
+static int count, first;
 static int exists, unseen, recent;
 
 int imap_ok (argbuf,socket)
@@ -176,7 +165,7 @@ int number;
 static struct method imap =
 {
     "IMAP",				/* Internet Message Access Protocol */
-    143,				/* standard IMAP3bis/IMAP4 port */
+    143,				/* standard IMAP2bis/IMAP4 port */
     1,					/* this is a tagged protocol */
     0,					/* no message delimiter */
     imap_ok,				/* parse command response */
@@ -196,3 +185,4 @@ struct hostrec *queryctl;
     return(do_protocol(queryctl, &imap));
 }
 
+
diff --git a/pop2.c b/pop2.c
index 16fbb73d..322a7c4d 100644
--- a/pop2.c
+++ b/pop2.c
@@ -1,4 +1,4 @@
-/* Copyright 1993-95 by Carl Harris, Jr. Copyright 1996 by Eric S. Raymond
+/* Copyright 1996 by Eric S. Raymond
  * All rights reserved.
  * For license terms, see the file COPYING in this directory.
  */
@@ -6,31 +6,16 @@
 /***********************************************************************
   module:       pop2.c
   project:      fetchmail
-  programmer:   Carl Harris, ceharris@mal.com
-		Hacks and bug fixes by esr.
-  description:  POP2 client code.
+  programmer:   Eric S. Raymond
+  description:  POP2 method code.
 
  ***********************************************************************/
 
 #include  <config.h>
-
 #include  <stdio.h>
-#if defined(STDC_HEADERS)
-#include  <string.h>
-#endif
-#if defined(HAVE_UNISTD_H)
-#include  <unistd.h>
-#endif
-
-#include  <sys/time.h>
-#include  <errno.h>
-
 #include  "socket.h"
 #include  "fetchmail.h"
 
-#if HAVE_PROTOTYPES
-#endif
-
 /*********************************************************************
 
  Method declarations for POP2
diff --git a/pop3.c b/pop3.c
index af62b958..6ff42df2 100644
--- a/pop3.c
+++ b/pop3.c
@@ -13,16 +13,7 @@
  ***********************************************************************/
 
 #include  <config.h>
-
 #include  <stdio.h>
-#if defined(STDC_HEADERS)
-#include  <string.h>
-#endif
-#if defined(HAVE_UNISTD_H)
-#include  <unistd.h>
-#endif
-#include  <errno.h>
-
 #include  "socket.h"
 #include  "fetchmail.h"