Strip tcpip.h of some unnecessary includes

osscan2.h

@@ -128,6 +128,8 @@
 #define OSSCAN2_H
 
 #include "nbase.h"
+#include <dnet.h>
+
 #include <vector>
 #include <list>
 #include "timing.h"

scan_engine.h

@@ -129,6 +129,8 @@
 
 #include "nmap.h" /* stype */
 
+#include <dnet.h>
+
 #include "timing.h"
 #include "tcpip.h"
 #include <list>

tcpip.cc

@@ -123,9 +123,8 @@
  ***************************************************************************/
 
 /* $Id$ */
-#ifdef WIN32
-#include "nmap_winconfig.h"
-#endif
+
+#include "nmap.h"
 
 #include "nbase.h"
 #include "portreasons.h"
@@ -138,15 +137,6 @@
 
 #include "struct_ip.h"
 
-#if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#if HAVE_UNISTD_H
-/* #include <sys/unistd.h> */
-#include <unistd.h>
-#endif
-
 #if HAVE_NETINET_IF_ETHER_H
 #ifndef NETINET_IF_ETHER_H
 #include <netinet/if_ether.h>

tcpip.h

@@ -128,96 +128,9 @@
 #ifndef TCPIP_H
 #define TCPIP_H
 
-#ifdef HAVE_CONFIG_H
-#include "nmap_config.h"
-#endif
-
 #include "nbase.h"
 
-#ifdef WIN32
-#include "mswin32\winclude.h"
-#else
-
-#ifdef STDC_HEADERS
-#include <stdlib.h>
-#else
-void *malloc();
-void *realloc();
-#endif
-
-#if STDC_HEADERS || HAVE_STRING_H
-#include <string.h>
-#if !STDC_HEADERS && HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#endif
-#if HAVE_STRINGS_H
-#include <strings.h>
-#endif
-
-#ifdef HAVE_BSTRING_H
-#include <bstring.h>
-#endif
-
-#include <ctype.h>
-#include <sys/types.h>
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h> /* Defines MAXHOSTNAMELEN on BSD*/
-#endif
-
-#if HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-#ifdef HAVE_RPC_TYPES_H
-#include <rpc/types.h>
-#endif
-
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-#if HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-#include <arpa/inet.h>
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <fcntl.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#include <sys/ioctl.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
 #include <pcap.h>
-#ifdef __cplusplus
-}
-#endif
-
-#if HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h>  /* SIOCGIFCONF for Solaris */
-#endif
-#endif /* WIN32 */
-
-#include <setjmp.h>
-#include <errno.h>
-#include <signal.h>
-#include <dnet.h>
 
 class Target;