diff --git a/FingerPrintResults.h b/FingerPrintResults.h
index 84945fe26..fb3f33081 100644
--- a/FingerPrintResults.h
+++ b/FingerPrintResults.h
@@ -128,8 +128,6 @@
 
 class FingerPrintResults;
 
-#include "nmap.h"
-#include "global_structures.h"
 #include "FPEngine.h"
 
 /* Maximum number of results allowed in one of these things ... */
diff --git a/NmapOps.h b/NmapOps.h
index 7f7657841..0b9c849ce 100644
--- a/NmapOps.h
+++ b/NmapOps.h
@@ -126,8 +126,6 @@
 #ifndef NMAP_OPS_H
 #define NMAP_OPS_H
 
-#include "nmap.h"
-#include "global_structures.h"
 #include "output.h"
 #include <nsock.h>
 #include <string>
diff --git a/NmapOutputTable.h b/NmapOutputTable.h
index 4ad08a7ce..ec6d6918d 100644
--- a/NmapOutputTable.h
+++ b/NmapOutputTable.h
@@ -126,7 +126,10 @@
 #ifndef NMAPOUTPUTTABLE_H
 #define NMAPOUTPUTTABLE_H
 
-#include "nmap.h"
+/* Keep assert() defined for security reasons */
+#undef NDEBUG
+
+#include <assert.h>
 
 /**********************  DEFINES/ENUMS ***********************************/
 
diff --git a/Target.h b/Target.h
index 2db40abe5..2d39b6c12 100644
--- a/Target.h
+++ b/Target.h
@@ -127,7 +127,6 @@
 #ifndef TARGET_H
 #define TARGET_H
 
-#include "nmap.h"
 #include "FingerPrintResults.h"
 #include "libnetutil/netutil.h"
 
diff --git a/TargetGroup.h b/TargetGroup.h
index 849214fef..1b27fd2d9 100644
--- a/TargetGroup.h
+++ b/TargetGroup.h
@@ -135,8 +135,6 @@
 #include <set>
 #include <string>
 
-#include "nmap.h"
-
 /* We use bit vectors to represent what values are allowed in an IPv4 octet.
    Each vector is built up of an array of bitvector_t (any convenient integer
    type). */
diff --git a/idle_scan.h b/idle_scan.h
index 710b57e4b..90edc64e5 100644
--- a/idle_scan.h
+++ b/idle_scan.h
@@ -130,8 +130,6 @@
 #ifndef IDLE_SCAN_H
 #define IDLE_SCAN_H
 
-#include "nmap.h"
-#include "global_structures.h"
 #include <nbase.h>
 
 class Target;
diff --git a/osscan.h b/osscan.h
index 1ea5dcb72..e3f8525ed 100644
--- a/osscan.h
+++ b/osscan.h
@@ -126,8 +126,6 @@
 #ifndef OSSCAN_H
 #define OSSCAN_H
 
-#include "nmap.h"
-#include "global_structures.h"
 #include "FingerPrintResults.h"
 #include "Target.h"
 
diff --git a/osscan2.h b/osscan2.h
index 697fa72e6..818502781 100644
--- a/osscan2.h
+++ b/osscan2.h
@@ -127,8 +127,6 @@
 #ifndef OSSCAN2_H
 #define OSSCAN2_H
 
-#include "nmap.h"
-#include "global_structures.h"
 #include "nbase.h"
 #include <vector>
 #include <list>
diff --git a/output.h b/output.h
index 6ef5b2579..12636f594 100644
--- a/output.h
+++ b/output.h
@@ -163,8 +163,6 @@
  "use \"-Pn -sT localhost\" though.\n\n"
 
 #include "portlist.h"
-#include "nmap.h"
-#include "global_structures.h"
 #include <nsock.h>
 
 #include <string>
diff --git a/portreasons.h b/portreasons.h
index 1b0eb8572..32fa8efb6 100644
--- a/portreasons.h
+++ b/portreasons.h
@@ -127,7 +127,7 @@
 #ifndef REASON_H
 #define REASON_H
 
-#include "nmap.h"
+#include "nbase.h"
 
 #ifdef WIN32
 #include "winsock2.h"
diff --git a/protocols.h b/protocols.h
index a1217477c..98a61a857 100644
--- a/protocols.h
+++ b/protocols.h
@@ -130,8 +130,6 @@
 #include <netdb.h>
 #endif
 
-#include "nmap.h"
-#include "global_structures.h"
 #include "nbase.h"
 
 #define PROTOCOL_TABLE_SIZE 256
diff --git a/scan_engine.h b/scan_engine.h
index 927734744..140d51034 100644
--- a/scan_engine.h
+++ b/scan_engine.h
@@ -127,8 +127,6 @@
 #ifndef SCAN_ENGINE_H
 #define SCAN_ENGINE_H
 
-#include "nmap.h"
-#include "global_structures.h"
 #include "timing.h"
 #include "tcpip.h"
 #include <list>
diff --git a/service_scan.h b/service_scan.h
index 13eadf76f..37373c3f5 100644
--- a/service_scan.h
+++ b/service_scan.h
@@ -127,8 +127,6 @@
 #ifndef SERVICE_SCAN_H
 #define SERVICE_SCAN_H
 
-#include "nmap.h"
-#include "global_structures.h"
 #include "portlist.h"
 
 #include <vector>
diff --git a/services.h b/services.h
index 3dffe0579..684c2279f 100644
--- a/services.h
+++ b/services.h
@@ -132,8 +132,6 @@
 #else
 #include <netdb.h>
 #endif
-#include "nmap.h"
-#include "global_structures.h"
 
 #include "nbase.h"
 
diff --git a/targets.h b/targets.h
index 8f488960a..8797a839f 100644
--- a/targets.h
+++ b/targets.h
@@ -147,10 +147,10 @@
 #include <sys/param.h> /* Defines MAXHOSTNAMELEN on BSD*/
 #endif
 
-#include "nmap.h"
-#include "global_structures.h"
 #include "TargetGroup.h"
 
+class Target;
+
 class TargetGroup {
 public:
   NetBlock *netblock;
diff --git a/tcpip.h b/tcpip.h
index c45abf82d..ef67e7b93 100644
--- a/tcpip.h
+++ b/tcpip.h
@@ -219,10 +219,7 @@ extern "C" {
 #include <signal.h>
 #include <dnet.h>
 
-
-
-#include "nmap.h"
-#include "global_structures.h"
+class Target;
 
 #ifndef INET_ADDRSTRLEN
 #define INET_ADDRSTRLEN 16
diff --git a/utils.h b/utils.h
index ad6726e52..3058c31de 100644
--- a/utils.h
+++ b/utils.h
@@ -130,7 +130,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include "nmap.h"
 #ifdef WIN32
 #include "mswin32\winclude.h"
 #else
@@ -162,7 +161,6 @@
 #include "nbase.h"
 
 #include "nmap_error.h"
-#include "global_structures.h"
 
 /* Arithmatic difference modulo 2^32 */
 #ifndef MOD_DIFF