Fix up some more header includes

nmap.h

@@ -232,8 +232,6 @@
 
 #define MAX_DECOYS 128 /* How many decoys are allowed? */
 
-#define MAXFALLBACKS 20 /* How many comma separated fallbacks are allowed in the service-probes file? */
-
 /* TCP Options for TCP SYN probes: MSS 1460 */
 #define TCP_SYN_PROBE_OPTIONS "\x02\x04\x05\xb4"
 #define TCP_SYN_PROBE_OPTIONS_LEN (sizeof(TCP_SYN_PROBE_OPTIONS)-1)

nse_debug.cc

@@ -4,9 +4,10 @@ extern "C" {
   #include "lauxlib.h"
 }
 
-#include "nmap.h"
 #include "nse_debug.h"
 #include "output.h"
+#undef NDEBUG
+#include <assert.h>
 
 /* Print a Lua table. depth_limit is the limit on recursive printing of
    subtables. */

service_scan.h

@@ -135,7 +135,7 @@
 #define SERVICE_SCAN_H
 
 #include "portlist.h"
-#include "nmap.h"
+#include "scan_lists.h"
 
 #include <vector>
 
@@ -145,12 +145,17 @@
 # include <pcre.h>
 #endif
 
+#undef NDEBUG
+#include <assert.h>
+
 /**********************  DEFINES/ENUMS ***********************************/
 #define DEFAULT_SERVICEWAITMS 5000
 #define DEFAULT_TCPWRAPPEDMS 2000   // connections closed after this timeout are not considered "tcpwrapped"
 #define DEFAULT_CONNECT_TIMEOUT 5000
 #define DEFAULT_CONNECT_SSL_TIMEOUT 8000  // includes connect() + ssl negotiation
 #define SERVICEMATCH_REGEX 1
+#define MAXFALLBACKS 20 /* How many comma separated fallbacks are allowed in the service-probes file? */
+
 // #define SERVICEMATCH_STATIC 2 -- no longer supported
 
 /**********************  STRUCTURES  ***********************************/