1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00

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

This commit is contained in:
dmiller
2015-06-23 00:09:05 +00:00
parent cfe8893304
commit dfa969f3a2
17 changed files with 8 additions and 33 deletions

View File

@@ -128,8 +128,6 @@
class FingerPrintResults; class FingerPrintResults;
#include "nmap.h"
#include "global_structures.h"
#include "FPEngine.h" #include "FPEngine.h"
/* Maximum number of results allowed in one of these things ... */ /* Maximum number of results allowed in one of these things ... */

View File

@@ -126,8 +126,6 @@
#ifndef NMAP_OPS_H #ifndef NMAP_OPS_H
#define NMAP_OPS_H #define NMAP_OPS_H
#include "nmap.h"
#include "global_structures.h"
#include "output.h" #include "output.h"
#include <nsock.h> #include <nsock.h>
#include <string> #include <string>

View File

@@ -126,7 +126,10 @@
#ifndef NMAPOUTPUTTABLE_H #ifndef NMAPOUTPUTTABLE_H
#define NMAPOUTPUTTABLE_H #define NMAPOUTPUTTABLE_H
#include "nmap.h" /* Keep assert() defined for security reasons */
#undef NDEBUG
#include <assert.h>
/********************** DEFINES/ENUMS ***********************************/ /********************** DEFINES/ENUMS ***********************************/

View File

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

View File

@@ -135,8 +135,6 @@
#include <set> #include <set>
#include <string> #include <string>
#include "nmap.h"
/* We use bit vectors to represent what values are allowed in an IPv4 octet. /* 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 Each vector is built up of an array of bitvector_t (any convenient integer
type). */ type). */

View File

@@ -130,8 +130,6 @@
#ifndef IDLE_SCAN_H #ifndef IDLE_SCAN_H
#define IDLE_SCAN_H #define IDLE_SCAN_H
#include "nmap.h"
#include "global_structures.h"
#include <nbase.h> #include <nbase.h>
class Target; class Target;

View File

@@ -126,8 +126,6 @@
#ifndef OSSCAN_H #ifndef OSSCAN_H
#define OSSCAN_H #define OSSCAN_H
#include "nmap.h"
#include "global_structures.h"
#include "FingerPrintResults.h" #include "FingerPrintResults.h"
#include "Target.h" #include "Target.h"

View File

@@ -127,8 +127,6 @@
#ifndef OSSCAN2_H #ifndef OSSCAN2_H
#define OSSCAN2_H #define OSSCAN2_H
#include "nmap.h"
#include "global_structures.h"
#include "nbase.h" #include "nbase.h"
#include <vector> #include <vector>
#include <list> #include <list>

View File

@@ -163,8 +163,6 @@
"use \"-Pn -sT localhost\" though.\n\n" "use \"-Pn -sT localhost\" though.\n\n"
#include "portlist.h" #include "portlist.h"
#include "nmap.h"
#include "global_structures.h"
#include <nsock.h> #include <nsock.h>
#include <string> #include <string>

View File

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

View File

@@ -130,8 +130,6 @@
#include <netdb.h> #include <netdb.h>
#endif #endif
#include "nmap.h"
#include "global_structures.h"
#include "nbase.h" #include "nbase.h"
#define PROTOCOL_TABLE_SIZE 256 #define PROTOCOL_TABLE_SIZE 256

View File

@@ -127,8 +127,6 @@
#ifndef SCAN_ENGINE_H #ifndef SCAN_ENGINE_H
#define SCAN_ENGINE_H #define SCAN_ENGINE_H
#include "nmap.h"
#include "global_structures.h"
#include "timing.h" #include "timing.h"
#include "tcpip.h" #include "tcpip.h"
#include <list> #include <list>

View File

@@ -127,8 +127,6 @@
#ifndef SERVICE_SCAN_H #ifndef SERVICE_SCAN_H
#define SERVICE_SCAN_H #define SERVICE_SCAN_H
#include "nmap.h"
#include "global_structures.h"
#include "portlist.h" #include "portlist.h"
#include <vector> #include <vector>

View File

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

View File

@@ -147,10 +147,10 @@
#include <sys/param.h> /* Defines MAXHOSTNAMELEN on BSD*/ #include <sys/param.h> /* Defines MAXHOSTNAMELEN on BSD*/
#endif #endif
#include "nmap.h"
#include "global_structures.h"
#include "TargetGroup.h" #include "TargetGroup.h"
class Target;
class TargetGroup { class TargetGroup {
public: public:
NetBlock *netblock; NetBlock *netblock;

View File

@@ -219,10 +219,7 @@ extern "C" {
#include <signal.h> #include <signal.h>
#include <dnet.h> #include <dnet.h>
class Target;
#include "nmap.h"
#include "global_structures.h"
#ifndef INET_ADDRSTRLEN #ifndef INET_ADDRSTRLEN
#define INET_ADDRSTRLEN 16 #define INET_ADDRSTRLEN 16

View File

@@ -130,7 +130,6 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>
#include "nmap.h"
#ifdef WIN32 #ifdef WIN32
#include "mswin32\winclude.h" #include "mswin32\winclude.h"
#else #else
@@ -162,7 +161,6 @@
#include "nbase.h" #include "nbase.h"
#include "nmap_error.h" #include "nmap_error.h"
#include "global_structures.h"
/* Arithmatic difference modulo 2^32 */ /* Arithmatic difference modulo 2^32 */
#ifndef MOD_DIFF #ifndef MOD_DIFF