Rearrange some headers to make sure that out nbase errno defines are seen early,

avoiding warning about symbol redefinitions. This is mostly moving "nmap.h" to
the top of the list.

MACLookup.cc

@@ -91,12 +91,13 @@
 
 /* $Id$ */
 
+#include "nmap.h"
+
 #include <map>
 
 /* Character pool memory allocation */
 #include "MACLookup.h"
 #include "NmapOps.h"
-#include "nmap.h"
 #include "nmap_error.h"
 #include "charpool.h"
 

nmap_dns.cc

@@ -148,12 +148,6 @@
 #include "nmap_winconfig.h"
 #endif
 
-#include <stdlib.h>
-#include <limits.h>
-#include <list>
-#include <vector>
-#include <algorithm>
-
 #include "nmap.h"
 #include "NmapOps.h"
 #include "nmap_dns.h"
@@ -163,6 +157,12 @@
 #include "timing.h"
 #include "Target.h"
 
+#include <stdlib.h>
+#include <limits.h>
+#include <list>
+#include <vector>
+#include <algorithm>
+
 extern NmapOps o;
 
 

nmap_tty.cc

@@ -91,6 +91,8 @@
 #include "nmap_config.h"
 #endif
 
+#include "nmap.h"
+
 #include <sys/types.h>
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>

nse_debug.cc

@@ -4,6 +4,7 @@ extern "C" {
   #include "lauxlib.h"
 }
 
+#include "nmap.h"
 #include "nse_debug.h"
 #include "output.h"
 

nse_fs.cc

@@ -4,19 +4,20 @@ extern "C" {
   #include "lauxlib.h"
 }
 
-#include <string>
+#include "nmap.h"
+#include "nse_fs.h"
+#include "nmap_error.h"
+#include "NmapOps.h"
+
+#include <errno.h>
 #include <string.h>
 
+#include <string>
+
 #ifndef WIN32
 #include "dirent.h"
 #endif
 
-#include "errno.h"
-#include "nse_fs.h"
-#include "nmap.h"
-#include "nmap_error.h"
-#include "NmapOps.h"
-
 #define DIR_METATABLE "dir"
 
 #ifndef MAXPATHLEN

output.cc

@@ -94,6 +94,7 @@
 
 /* $Id$ */
 
+#include "nmap.h"
 #include "output.h"
 #include "osscan.h"
 #include "NmapOps.h"

payload.cc

@@ -89,6 +89,8 @@
 
 /* $Id$ */
 
+#include "nmap.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>

portlist.cc

@@ -90,9 +90,9 @@
 /* $Id$ */
 
 
+#include "nmap.h"
 #include "portlist.h"
 #include "nmap_error.h"
-#include "nmap.h"
 #include "NmapOps.h"
 #include "services.h"
 #include "protocols.h"

portreasons.cc

@@ -90,7 +90,6 @@
  * Written by Eddie Bell <ejlbell@gmail.com> 2007
  */
 
-#include <iostream>
 #include "nmap.h"
 #include "portlist.h"
 #include "NmapOps.h"
@@ -101,6 +100,8 @@
 #include "winfix.h"
 #endif
 
+#include <iostream>
+
 extern NmapOps o;
 class PortList;
 

services.cc

@@ -90,15 +90,16 @@
 
 /* $Id$ */
 
-#include <list>
+#include "nmap.h"
-#include <map>
-
 #include "services.h"
 #include "NmapOps.h"
 #include "charpool.h"
 #include "nmap_error.h"
 #include "utils.h"
 
+#include <list>
+#include <map>
+
 /* This structure is the key for looking up services in the
    port/proto -> service map. */
 struct port_spec {

xml.cc

@@ -145,14 +145,15 @@ All writing is done with log_write(LOG_XML), so if LOG_XML hasn't been
 opened, calling these functions has no effect.
 */
 
+#include "nmap.h"
+#include "output.h"
+#include "xml.h"
+
 #include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <list>
 
-#include "output.h"
-#include "xml.h"
-
 struct xml_writer {
   /* Sanity checking: Don't open a new tag while still defining
      attributes for another, like "<elem1<elem2". */