merge soc07 r4822 - Reduce the number of build dependencies.

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

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

NmapOps.cc

@@ -101,6 +101,7 @@
 #include "nmap.h"
 #include "nbase.h"
 #include "NmapOps.h"
+#include "utils.h"
 #ifdef WIN32
 #include "winfix.h"
 #endif

NmapOps.h

@@ -99,6 +99,9 @@
 
 /* $Id$ */
 
+#include "nmap.h"
+#include "global_structures.h"
+#include "output.h"
 #include <string>
 
 class NmapOps {

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;
 

Target.h

@@ -111,6 +111,8 @@
 #endif
 
 #include "reason.h"
+#include "portlist.h"
+#include "tcpip.h"
 
 #ifndef INET6_ADDRSTRLEN
 #define INET6_ADDRSTRLEN 46

TargetGroup.cc

@@ -103,6 +103,7 @@
 
 #include "TargetGroup.h"
 #include "NmapOps.h"
+#include "nmap_error.h"
 
 extern NmapOps o;
 

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;

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);
 

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>
 

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

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"

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"

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

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;
 

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);

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;

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

nmap_tty.cc

@@ -115,7 +115,6 @@
 #endif
 #include <stdlib.h>
 
-#include "output.h"
 #include "nmap_tty.h"
 #include "NmapOps.h"
 

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;
 

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; \

nse_nsock.cc

@@ -5,7 +5,6 @@
 
 #include "nsock.h"
 #include "nmap_error.h"
-#include "osscan.h"
 #include "NmapOps.h"
 
 #include <stdio.h>

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>

osscan.h

@@ -104,7 +104,6 @@
 #define OSSCAN_H
 
 #include "nmap.h"
-#include "tcpip.h"
 #include "global_structures.h"
 #include "FingerPrintResults.h"
 

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>
 

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

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>
 

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"

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;
 

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;

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
 

reason.cc

@@ -104,6 +104,7 @@
 #include "portlist.h"
 #include "NmapOps.h"
 #include "reason.h"
+#include "Target.h"
 #ifdef WIN32
 #include "winfix.h"
 #endif

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;

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, 

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"
 

service_scan.h

@@ -105,6 +105,7 @@
 
 #include "nmap.h"
 #include "global_structures.h"
+#include "portlist.h"
 
 #include <vector>
 

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;

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
 

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;

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>

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"
 

timing.cc

@@ -103,6 +103,7 @@
 
 #include "timing.h"
 #include "NmapOps.h"
+#include "utils.h"
 
 extern NmapOps o;
 

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

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>