5 files changed, 2 insertions, 7 deletions
diff --git a/driver.c b/driver.c
index 7914ccd5..77344f15 100644
--- a/driver.c
+++ b/driver.c
@@ -37,7 +37,7 @@
 #ifdef KERBEROS_V4
 #include <krb.h>
 #include <des.h>
-#include <netinet/in.h>		/* must be included before "socket.h".*/
+#include <netinet/in.h>
 #include <netdb.h>
 #endif /* KERBEROS_V4 */
 #include  "socket.h"
diff --git a/imap.c b/imap.c
index 7fbac659..944c246b 100644
--- a/imap.c
+++ b/imap.c
@@ -13,7 +13,6 @@
 #if defined(STDC_HEADERS)
 #include  <stdlib.h>
 #endif
-#include  "socket.h"
 #include  "fetchmail.h"
 
 static int count, seen, recent, unseen, imap4;
@@ -164,7 +163,7 @@ static int imap_fetch(FILE *sockfp, int number, int *lenp)
      * If we're using IMAP4, we can fetch the message without setting its
      * seen flag.  This is good!  It means that if the protocol exchange
      * craps out during the message, it will still be marked `unseen' on
-     * the server 
+     * the server.
      */
     if (imap4)
 	gen_send(sockfp, "FETCH %d RFC822.PEEK", number);
diff --git a/pop2.c b/pop2.c
index 0ca40e04..4b389f20 100644
--- a/pop2.c
+++ b/pop2.c
@@ -11,7 +11,6 @@
 #if defined(STDC_HEADERS)
 #include <stdlib.h>
 #endif
-#include  "socket.h"
 #include  "fetchmail.h"
 
 static int pound_arg, equal_arg;
diff --git a/pop3.c b/pop3.c
index b5c9c4d7..f99b9f35 100644
--- a/pop3.c
+++ b/pop3.c
@@ -16,7 +16,6 @@
 #include  <stdlib.h>
 #endif
  
-#include  "socket.h"
 #include  "fetchmail.h"
 
 #define PROTOCOL_ERROR	{error(0, 0, "protocol error"); return(PS_ERROR);}
diff --git a/smtp.c b/smtp.c
index 733f7050..cee1841b 100644
--- a/smtp.c
+++ b/smtp.c
@@ -11,10 +11,8 @@
 
 #include <stdio.h>
 #include <config.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <string.h>
-#include "socket.h"
 #include "fetchmail.h"
 #include "smtp.h"