diff --git a/FingerPrintResults.h b/FingerPrintResults.h
index 3d3f6008f..986e17fa5 100644
--- a/FingerPrintResults.h
+++ b/FingerPrintResults.h
@@ -105,6 +105,7 @@
 class FingerPrintResults;
 
 #include "nmap.h"
+#include "global_structures.h"
 
 /* Maximum number of results allowed in one of these things ... */
 #define MAX_FP_RESULTS 36
diff --git a/MACLookup.cc b/MACLookup.cc
index 8d22b7fd5..20b547ade 100644
--- a/MACLookup.cc
+++ b/MACLookup.cc
@@ -105,6 +105,7 @@
 #include "MACLookup.h"
 #include "nmap.h"
 #include "nmap_error.h"
+#include "charpool.h"
 
 struct MAC_entry {
   int prefix; /* -1 means none set */
diff --git a/NmapOps.cc b/NmapOps.cc
index dccad7985..35644b347 100644
--- a/NmapOps.cc
+++ b/NmapOps.cc
@@ -101,6 +101,7 @@
 #include "nmap.h"
 #include "nbase.h"
 #include "NmapOps.h"
+#include "utils.h"
 #ifdef WIN32
 #include "winfix.h"
 #endif
diff --git a/NmapOps.h b/NmapOps.h
index 98cdb8ca6..a49c557d9 100644
--- a/NmapOps.h
+++ b/NmapOps.h
@@ -99,6 +99,9 @@
 
 /* $Id$ */
 
+#include "nmap.h"
+#include "global_structures.h"
+#include "output.h"
 #include <string>
 
 class NmapOps {
diff --git a/Target.cc b/Target.cc
index 2a73cd575..d084f9fb3 100644
--- a/Target.cc
+++ b/Target.cc
@@ -106,9 +106,10 @@
 
 #include "Target.h"
 #include <dnet.h>
-#include "osscan.h"
 #include "nbase.h"
 #include "NmapOps.h"
+#include "utils.h"
+#include "nmap_error.h"
 
 extern NmapOps o;
 
diff --git a/Target.h b/Target.h
index f9142a242..077846098 100644
--- a/Target.h
+++ b/Target.h
@@ -111,6 +111,8 @@
 #endif
 
 #include "reason.h"
+#include "portlist.h"
+#include "tcpip.h"
 
 #ifndef INET6_ADDRSTRLEN
 #define INET6_ADDRSTRLEN 46
diff --git a/TargetGroup.cc b/TargetGroup.cc
index 8ce807da1..f86f3a88a 100644
--- a/TargetGroup.cc
+++ b/TargetGroup.cc
@@ -103,6 +103,7 @@
 
 #include "TargetGroup.h"
 #include "NmapOps.h"
+#include "nmap_error.h"
 
 extern NmapOps o;
 
diff --git a/charpool.cc b/charpool.cc
index 2d227f3ce..9dcbccecf 100644
--- a/charpool.cc
+++ b/charpool.cc
@@ -99,9 +99,11 @@
 
 /* $Id$ */
 
+#include "nbase.h"
 
 /* Character pool memory allocation */
 #include "charpool.h"
+#include "nmap_error.h"
 
 static char *charpool[16];
 static int currentcharpool;
diff --git a/charpool.h b/charpool.h
index 647e7ddcf..44a769e47 100644
--- a/charpool.h
+++ b/charpool.h
@@ -102,9 +102,6 @@
 #ifndef CHARPOOL_H
 #define CHARPOOL_H
 
-#include "utils.h"
-#include "nmap_error.h"
-
 void *cp_alloc(int sz);
 char *cp_strdup(const char *src);
 
diff --git a/idle_scan.cc b/idle_scan.cc
index e28a42864..64642d0c0 100644
--- a/idle_scan.cc
+++ b/idle_scan.cc
@@ -104,11 +104,12 @@
 /* $Id$ */
 
 #include "idle_scan.h"
-#include "scan_engine.h"
 #include "timing.h"
 #include "osscan.h"
 #include "nmap.h"
 #include "NmapOps.h"
+#include "Target.h"
+#include "utils.h"
 
 #include <stdio.h>
 
diff --git a/idle_scan.h b/idle_scan.h
index 9820fe317..fbb85fe10 100644
--- a/idle_scan.h
+++ b/idle_scan.h
@@ -106,11 +106,12 @@
 #ifndef IDLE_SCAN_H
 #define IDLE_SCAN_H
 
-#include "portlist.h"
-#include "tcpip.h"
+#include "nmap.h"
 #include "global_structures.h"
 #include <nbase.h>
 
+class Target;
+
 /* Handles the scan types where no positive-acknowledgement of open
    port is received (those scans are in pos_scan).  Super_scan
    includes scans such as FIN/XMAS/NULL/Maimon/UDP and IP Proto scans */
diff --git a/main.cc b/main.cc
index ae9776fbf..aa764078d 100644
--- a/main.cc
+++ b/main.cc
@@ -100,11 +100,8 @@
 /* $Id$ */
 
 #include "nmap.h"
-#include "osscan.h"
-#include "scan_engine.h"
-#include "idle_scan.h"
-#include "timing.h"
 #include "NmapOps.h"
+#include "utils.h"
 
 #ifdef MTRACE
 #include "mcheck.h"
diff --git a/nmap.cc b/nmap.cc
index 98c2f1f3f..c985e906a 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -110,6 +110,14 @@
 #include "traceroute.h"
 #include "nmap_tty.h"
 #include "nmap_dns.h"
+#include "services.h"
+#include "protocols.h"
+#include "targets.h"
+#include "TargetGroup.h"
+#include "service_scan.h"
+#include "charpool.h"
+#include "nmap_error.h"
+#include "utils.h"
 
 #ifndef NOLUA
 #include "nse_main.h"
diff --git a/nmap.h b/nmap.h
index 9b6060456..436ba0b97 100644
--- a/nmap.h
+++ b/nmap.h
@@ -405,19 +405,7 @@ void *realloc();
 
 /********************** LOCAL INCLUDES *****************************/
 
-#include "output.h"
-#include "portlist.h"
-#include "tcpip.h"
 #include "global_structures.h"
-#include "nmap_error.h"
-#include "utils.h"
-#include "services.h"
-#include "protocols.h"
-#include "nmap_rpc.h"
-#include "targets.h"
-#include "Target.h"
-#include "TargetGroup.h"
-#include "service_scan.h"
 
 /***********************STRUCTURES**********************************/
 
diff --git a/nmap_dns.cc b/nmap_dns.cc
index 83cf66ae1..dd47b56d8 100644
--- a/nmap_dns.cc
+++ b/nmap_dns.cc
@@ -169,6 +169,8 @@
 #include "nsock.h"
 #include "utils.h"
 #include "nmap_tty.h"
+#include "timing.h"
+#include "Target.h"
 
 extern NmapOps o;
 
diff --git a/nmap_dns.h b/nmap_dns.h
index 3ee5d3919..8370e9e4e 100644
--- a/nmap_dns.h
+++ b/nmap_dns.h
@@ -95,7 +95,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "Target.h"
+class Target;
 
 void nmap_mass_rdns(Target ** targets, int num_targets);
 const char *lookup_cached_host(u32 ip);
diff --git a/nmap_rpc.cc b/nmap_rpc.cc
index 2ea56fb39..1cbb97a9c 100644
--- a/nmap_rpc.cc
+++ b/nmap_rpc.cc
@@ -104,6 +104,11 @@
 
 #include "nmap_rpc.h"
 #include "NmapOps.h"
+#include "Target.h"
+#include "charpool.h"
+#include "timing.h"
+#include "nmap_error.h"
+#include "utils.h"
 
 extern NmapOps o;
 static struct rpc_info ri;
diff --git a/nmap_rpc.h b/nmap_rpc.h
index b1a842e39..6e2189486 100644
--- a/nmap_rpc.h
+++ b/nmap_rpc.h
@@ -106,10 +106,7 @@
 
 #include "nmap.h"
 #include "global_structures.h"
-#include "charpool.h"
-#include "nmap_error.h"
-#include "utils.h"
-#include "timing.h"
+#include "portlist.h"
 
 /* rpc related #define's */
 #define RECORD_MARKING 4        /* length of recoder marking (bytes)     */
diff --git a/nmap_tty.cc b/nmap_tty.cc
index f5d71c269..5c2569c49 100644
--- a/nmap_tty.cc
+++ b/nmap_tty.cc
@@ -115,7 +115,6 @@
 #endif
 #include <stdlib.h>
 
-#include "output.h"
 #include "nmap_tty.h"
 #include "NmapOps.h"
 
diff --git a/nse_main.cc b/nse_main.cc
index f5b5d056a..422ff15a8 100644
--- a/nse_main.cc
+++ b/nse_main.cc
@@ -15,11 +15,11 @@ extern "C" {
 
 #include "nmap.h"
 #include "nmap_error.h"
-#include "osscan.h"
 #include "portlist.h"
 #include "nsock.h"
 #include "NmapOps.h"
 #include "timing.h"
+#include "Target.h"
 
 extern NmapOps o;
 
diff --git a/nse_nmaplib.cc b/nse_nmaplib.cc
index ecc404ecb..e6635bd8e 100644
--- a/nse_nmaplib.cc
+++ b/nse_nmaplib.cc
@@ -6,6 +6,8 @@
 #include "nmap_error.h"
 #include "osscan.h"
 #include "NmapOps.h"
+#include "nmap_rpc.h"
+#include "Target.h"
 
 #define SCRIPT_ENGINE_GETSTRING(name) \
 	char* name; \
diff --git a/nse_nsock.cc b/nse_nsock.cc
index a87760793..39606b912 100644
--- a/nse_nsock.cc
+++ b/nse_nsock.cc
@@ -5,7 +5,6 @@
 
 #include "nsock.h"
 #include "nmap_error.h"
-#include "osscan.h"
 #include "NmapOps.h"
 
 #include <stdio.h>
diff --git a/osscan.cc b/osscan.cc
index c1c1bc9cd..2021b026f 100644
--- a/osscan.cc
+++ b/osscan.cc
@@ -104,6 +104,10 @@
 #include "timing.h"
 #include "NmapOps.h"
 #include "nmap_tty.h"
+#include "charpool.h"
+#include "Target.h"
+#include "nmap_error.h"
+#include "utils.h"
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
diff --git a/osscan.h b/osscan.h
index 52c3ffcf1..b697bc2d2 100644
--- a/osscan.h
+++ b/osscan.h
@@ -104,7 +104,6 @@
 #define OSSCAN_H
 
 #include "nmap.h"
-#include "tcpip.h"
 #include "global_structures.h"
 #include "FingerPrintResults.h"
 
diff --git a/osscan2.cc b/osscan2.cc
index 4fd06f2b7..7b7912d1d 100644
--- a/osscan2.cc
+++ b/osscan2.cc
@@ -104,6 +104,8 @@
 #include "osscan2.h"
 #include "timing.h"
 #include "NmapOps.h"
+#include "Target.h"
+#include "utils.h"
 #include <dnet.h>
 #include <list>
 
diff --git a/osscan2.h b/osscan2.h
index f45606f90..2ec3f0613 100644
--- a/osscan2.h
+++ b/osscan2.h
@@ -104,10 +104,11 @@
 #define OSSCAN2_H
 
 #include "nmap.h"
-#include "tcpip.h"
 #include "global_structures.h"
-#include "FingerPrintResults.h"
-#include "osscan.h"
+#include "nbase.h"
+#include <vector>
+
+class Target;
 
 /**********************  PROTOTYPES  ***********************************/
 
diff --git a/output.cc b/output.cc
index 5c2f885b8..185a28944 100644
--- a/output.cc
+++ b/output.cc
@@ -109,6 +109,10 @@
 #include "NmapOutputTable.h"
 #include "MACLookup.h"
 #include "reason.h"
+#include "protocols.h"
+#include "nmap_rpc.h"
+#include "Target.h"
+#include "utils.h"
 
 #include <string>
 
diff --git a/output.h b/output.h
index c30aed7e7..2248d7ef8 100644
--- a/output.h
+++ b/output.h
@@ -120,7 +120,7 @@
 #define LOG_NAMES {"normal", "machine", "$Cr!pT |<!dd!3", "XML"}
 
 #include "portlist.h"
-#include "tcpip.h"
+#include "nmap.h"
 #include "global_structures.h"
 
 /* Prints the familiar Nmap tabular output showing the "interesting"
diff --git a/portlist.cc b/portlist.cc
index cb856cad2..64c991a01 100644
--- a/portlist.cc
+++ b/portlist.cc
@@ -103,6 +103,9 @@
 #include "nmap_error.h"
 #include "nmap.h"
 #include "NmapOps.h"
+#include "services.h"
+#include "nmap_rpc.h"
+#include "tcpip.h"
 
 using namespace std;
 
diff --git a/protocols.cc b/protocols.cc
index aa0d6c234..9cfb4099b 100644
--- a/protocols.cc
+++ b/protocols.cc
@@ -101,6 +101,10 @@
 
 #include "protocols.h"
 #include "NmapOps.h"
+#include "services.h"
+#include "charpool.h"
+#include "nmap_error.h"
+#include "utils.h"
 
 extern NmapOps o;
 static int numipprots = 0;
diff --git a/protocols.h b/protocols.h
index 8ce5acfc9..18da30346 100644
--- a/protocols.h
+++ b/protocols.h
@@ -108,9 +108,7 @@
 
 #include "nmap.h"
 #include "global_structures.h"
-#include "charpool.h"
-#include "nmap_error.h"
-#include "utils.h"
+#include "nbase.h"
 
 #define PROTOCOL_TABLE_SIZE 256
 
diff --git a/reason.cc b/reason.cc
index 1d8fd3209..bfa996f01 100644
--- a/reason.cc
+++ b/reason.cc
@@ -104,6 +104,7 @@
 #include "portlist.h"
 #include "NmapOps.h"
 #include "reason.h"
+#include "Target.h"
 #ifdef WIN32
 #include "winfix.h"
 #endif
diff --git a/scan_engine.cc b/scan_engine.cc
index 4df57b950..1caaab52e 100644
--- a/scan_engine.cc
+++ b/scan_engine.cc
@@ -109,6 +109,9 @@
 #include "timing.h"
 #include "NmapOps.h"
 #include "nmap_tty.h"
+#include "nmap_rpc.h"
+#include "Target.h"
+#include "utils.h"
 #include <list>
 
 using namespace std;
diff --git a/scan_engine.h b/scan_engine.h
index 32d56b1bf..0eb3c422c 100644
--- a/scan_engine.h
+++ b/scan_engine.h
@@ -103,9 +103,9 @@
 #ifndef SCAN_ENGINE_H
 #define SCAN_ENGINE_H
 
-#include "portlist.h"
-#include "tcpip.h"
+#include "nmap.h"
 #include "global_structures.h"
+#include <vector>
 
 /* 3rd generation Nmap scanning function.  Handles most Nmap port scan types */
 void ultra_scan(std::vector<Target *> &Targets, struct scan_lists *ports, 
diff --git a/service_scan.cc b/service_scan.cc
index 3c3244ba2..dcbfb4c5a 100644
--- a/service_scan.cc
+++ b/service_scan.cc
@@ -105,6 +105,8 @@
 #include "timing.h"
 #include "NmapOps.h"
 #include "nsock.h"
+#include "Target.h"
+#include "utils.h"
 
 #include "nmap_tty.h"
 
diff --git a/service_scan.h b/service_scan.h
index e918a45f7..d4860a893 100644
--- a/service_scan.h
+++ b/service_scan.h
@@ -105,6 +105,7 @@
 
 #include "nmap.h"
 #include "global_structures.h"
+#include "portlist.h"
 
 #include <vector>
 
diff --git a/services.cc b/services.cc
index 6cfa279ad..c71622fae 100644
--- a/services.cc
+++ b/services.cc
@@ -101,6 +101,9 @@
 
 #include "services.h"
 #include "NmapOps.h"
+#include "charpool.h"
+#include "nmap_error.h"
+#include "utils.h"
 
 extern NmapOps o;
 static int numtcpports = 0;
diff --git a/services.h b/services.h
index 8b7f291d0..3d38be57d 100644
--- a/services.h
+++ b/services.h
@@ -110,9 +110,8 @@
 #endif
 #include "nmap.h"
 #include "global_structures.h"
-#include "charpool.h"
-#include "nmap_error.h"
-#include "utils.h"
+
+#include "nbase.h"
 
 #define SERVICE_TABLE_SIZE 1024
 
diff --git a/targets.cc b/targets.cc
index 050df867a..d0333dd3f 100644
--- a/targets.cc
+++ b/targets.cc
@@ -103,13 +103,13 @@
 
 #include "targets.h"
 #include "timing.h"
-#include "osscan.h"
 #include "NmapOps.h"
 #include "TargetGroup.h"
 #include "Target.h"
 #include "scan_engine.h"
 #include "nmap_dns.h"
 #include "nmap_tty.h"
+#include "utils.h"
 
 using namespace std;
 extern NmapOps o;
diff --git a/tcpip.cc b/tcpip.cc
index 6d56f9f6e..5940bfb2e 100644
--- a/tcpip.cc
+++ b/tcpip.cc
@@ -106,6 +106,8 @@
 #include <dnet.h>
 #include "tcpip.h"
 #include "NmapOps.h"
+#include "Target.h"
+#include "utils.h"
 
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
diff --git a/tcpip.h b/tcpip.h
index 8fb874daa..2f851b8ca 100644
--- a/tcpip.h
+++ b/tcpip.h
@@ -223,8 +223,6 @@ extern "C" {
 
 typedef enum { devt_ethernet, devt_loopback, devt_p2p, devt_other  } devtype;
 
-#include "nmap_error.h"
-#include "utils.h"
 #include "nmap.h"
 #include "global_structures.h"
 
diff --git a/timing.cc b/timing.cc
index 55154f4dc..f732329e1 100644
--- a/timing.cc
+++ b/timing.cc
@@ -103,6 +103,7 @@
 
 #include "timing.h"
 #include "NmapOps.h"
+#include "utils.h"
 
 extern NmapOps o;
 
diff --git a/timing.h b/timing.h
index 2ba888fdf..520982872 100644
--- a/timing.h
+++ b/timing.h
@@ -104,7 +104,7 @@
 #ifndef NMAP_TIMING_H
 #define NMAP_TIMING_H
 
-#include "tcpip.h"
+#include "nmap.h"
 #include "global_structures.h"
 
 /* Call this function on a newly allocated struct timeout_info to
diff --git a/traceroute.cc b/traceroute.cc
index 406a0de06..6752b1012 100644
--- a/traceroute.cc
+++ b/traceroute.cc
@@ -178,6 +178,9 @@
 #include "nmap_tty.h"
 #include "nmap_dns.h"
 #include "osscan2.h"
+#include "protocols.h"
+#include "timing.h"
+#include "utils.h"
 #include <algorithm>
 #include <stdlib.h>