Remove unneeded nmap.h and global_structures.h includes in .h files

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 ... */

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>

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 ***********************************/
 

Target.h

@@ -127,7 +127,6 @@
 #ifndef TARGET_H
 #define TARGET_H
 
-#include "nmap.h"
 #include "FingerPrintResults.h"
 #include "libnetutil/netutil.h"
 

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). */

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;

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"
 

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>

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>

portreasons.h

@@ -127,7 +127,7 @@
 #ifndef REASON_H
 #define REASON_H
 
-#include "nmap.h"
+#include "nbase.h"
 
 #ifdef WIN32
 #include "winsock2.h"

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

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>

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>

services.h

@@ -132,8 +132,6 @@
 #else
 #include <netdb.h>
 #endif
-#include "nmap.h"
-#include "global_structures.h"
 
 #include "nbase.h"
 

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;

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

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