remove tcpip.h from other headers' includes

FPEngine.cc

@@ -139,6 +139,7 @@
 #include "osscan.h"
 #include "linear.h"
 #include "FPModel.h"
+#include "tcpip.h"
 extern NmapOps o;
 #ifdef WIN32
 /* from libdnet's intf-win32.c */

idle_scan.cc

@@ -170,6 +170,7 @@
 #include "Target.h"
 #include "nmap_error.h"
 #include "output.h"
+#include "tcpip.h"
 
 #include "struct_ip.h"
 

nmap.cc

@@ -146,6 +146,7 @@
 #include "services.h"
 #include "protocols.h"
 #include "targets.h"
+#include "tcpip.h"
 #include "TargetGroup.h"
 #include "Target.h"
 #include "service_scan.h"

nmap_dns.cc

@@ -191,6 +191,7 @@
 #include "nsock.h"
 #include "nmap_error.h"
 #include "nmap_tty.h"
+#include "tcpip.h"
 #include "timing.h"
 #include "Target.h"
 

nse_nmaplib.cc

@@ -13,6 +13,7 @@ extern "C" {
 #include "FingerPrintResults.h"
 #include "Target.h"
 #include "TargetGroup.h"
+#include "tcpip.h"
 #include "portlist.h"
 #include "service_scan.h"
 #include "nmap_dns.h"

osscan2.cc

@@ -135,6 +135,7 @@
 #include "osscan2.h"
 #include "timing.h"
 #include "NmapOps.h"
+#include "tcpip.h"
 #include "Target.h"
 #include "utils.h"
 #include "FPEngine.h"

osscan2.h

@@ -136,11 +136,11 @@
 
 #include "nbase.h"
 #include <dnet.h>
+#include <pcap.h>
 
 #include <vector>
 #include <list>
 #include "timing.h"
-#include "tcpip.h"
 struct FingerPrint;
 struct FingerTest;
 class FingerPrintResultsIPv4;

output.cc

@@ -144,6 +144,7 @@
 #include "portreasons.h"
 #include "protocols.h"
 #include "FingerPrintResults.h"
+#include "tcpip.h"
 #include "Target.h"
 #include "utils.h"
 #include "xml.h"

scan_engine.cc

@@ -140,6 +140,7 @@
 #include "scan_engine_connect.h"
 #include "scan_engine_raw.h"
 #include "timing.h"
+#include "tcpip.h"
 #include "NmapOps.h"
 #include "nmap_tty.h"
 #include "payload.h"

scan_engine.h

@@ -139,7 +139,7 @@
 #include <dnet.h>
 
 #include "timing.h"
-#include "tcpip.h"
+#include <pcap.h>
 #include <list>
 #include <vector>
 #include <set>

scan_engine_connect.cc

@@ -131,6 +131,7 @@
 /* $Id$ */
 
 #include "nmap_error.h"
+#include "tcpip.h"
 #include "Target.h"
 #include "scan_engine_connect.h"
 #include "libnetutil/netutil.h" /* for max_sd() */

targets.cc

@@ -135,6 +135,7 @@
 #include "nbase/nbase_addrset.h"
 #include "targets.h"
 #include "timing.h"
+#include "tcpip.h"
 #include "NmapOps.h"
 #include "TargetGroup.h"
 #include "Target.h"

traceroute.cc

@@ -176,6 +176,7 @@ individually.
 #include "timing.h"
 #include "NmapOps.h"
 #include "Target.h"
+#include "tcpip.h"
 
 #include "struct_ip.h"