Be paranoid about multiple inclusions (apparently some systems don't like

it for certain header files.)  Be a little bit more careful in setting
up the standard environment in config.h.  This is AIX portability work.

tftp/main.c

@@ -51,23 +51,9 @@ static const char *rcsid UNUSED =
 /*
  * TFTP User Program -- Command Interface.
  */
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/file.h>
-
-#include <netinet/in.h>
-
-#include <arpa/inet.h>
-
 #include <ctype.h>
-#include <errno.h>
 #include <netdb.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #include <fcntl.h>
 #ifdef WITH_READLINE
 #include <readline/readline.h>

tftp/tftp.c

@@ -50,21 +50,6 @@ static const char *rcsid UNUSED =
 /*
  * TFTP User Program -- Protocol Machines
  */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-
-#include <netinet/in.h>
-
-#include <arpa/tftp.h>
-
-#include <errno.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "extern.h"
 
 extern  struct sockaddr_in peeraddr;	/* filled in by main */

tftp/tftpsubs.c

@@ -56,15 +56,7 @@ static const char *rcsid UNUSED =
 			Jim Guyton 10/85
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/tftp.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 
 #define PKTSIZE MAX_SEGSIZE+4       /* should be moved to tftp.h */