diff --git a/FPEngine.cc b/FPEngine.cc
index 25bc40a1b..c6c87c845 100644
--- a/FPEngine.cc
+++ b/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 */
diff --git a/idle_scan.cc b/idle_scan.cc
index 8411313ed..06fd0b346 100644
--- a/idle_scan.cc
+++ b/idle_scan.cc
@@ -170,6 +170,7 @@
 #include "Target.h"
 #include "nmap_error.h"
 #include "output.h"
+#include "tcpip.h"
 
 #include "struct_ip.h"
 
diff --git a/nmap.cc b/nmap.cc
index d906d8f07..77290a1e7 100644
--- a/nmap.cc
+++ b/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"
diff --git a/nmap_dns.cc b/nmap_dns.cc
index f8d11d836..8b85ab8ed 100644
--- a/nmap_dns.cc
+++ b/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"
 
diff --git a/nse_nmaplib.cc b/nse_nmaplib.cc
index 00fe9fe2f..3734e078c 100644
--- a/nse_nmaplib.cc
+++ b/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"
diff --git a/osscan2.cc b/osscan2.cc
index bea94e8a1..10f8514c2 100644
--- a/osscan2.cc
+++ b/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"
diff --git a/osscan2.h b/osscan2.h
index 51df44b35..1311e01a6 100644
--- a/osscan2.h
+++ b/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;
diff --git a/output.cc b/output.cc
index fe5bbba4e..9b4c66eb8 100644
--- a/output.cc
+++ b/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"
diff --git a/scan_engine.cc b/scan_engine.cc
index 0e33364a4..99730161f 100644
--- a/scan_engine.cc
+++ b/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"
diff --git a/scan_engine.h b/scan_engine.h
index 2c8ec0187..e954f7aba 100644
--- a/scan_engine.h
+++ b/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>
diff --git a/scan_engine_connect.cc b/scan_engine_connect.cc
index 5c893adb2..221a62743 100644
--- a/scan_engine_connect.cc
+++ b/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() */
diff --git a/targets.cc b/targets.cc
index 5240038a9..4c0b8c172 100644
--- a/targets.cc
+++ b/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"
diff --git a/traceroute.cc b/traceroute.cc
index 91014c971..0e2b466ac 100644
--- a/traceroute.cc
+++ b/traceroute.cc
@@ -176,6 +176,7 @@ individually.
 #include "timing.h"
 #include "NmapOps.h"
 #include "Target.h"
+#include "tcpip.h"
 
 #include "struct_ip.h"