Move some flag defines from services.h to scan_lists.h where they make more sense.

idle_scan.cc

@@ -166,7 +166,6 @@
 #include "nmap.h"
 #include "scan_lists.h"
 #include "NmapOps.h"
-#include "services.h"
 #include "Target.h"
 #include "nmap_error.h"
 #include "output.h"

protocols.cc

@@ -132,7 +132,6 @@
 
 #include "protocols.h"
 #include "NmapOps.h"
-#include "services.h"
 #include "charpool.h"
 #include "nmap_error.h"
 #include "utils.h"

scan_lists.h

@@ -129,6 +129,14 @@
 #ifndef SCAN_LISTS_H
 #define SCAN_LISTS_H
 
+/* just flags to indicate whether a particular port number should get tcp
+ * scanned, udp scanned, or both
+ */
+#define SCAN_TCP_PORT	(1 << 0)
+#define SCAN_UDP_PORT	(1 << 1)
+#define SCAN_SCTP_PORT	(1 << 2)
+#define SCAN_PROTOCOLS	(1 << 3)
+
 /* The various kinds of port/protocol scans we can have
  * Each element is to point to an array of port/protocol numbers
  */

services.h

@@ -142,14 +142,6 @@
 
 #define SERVICE_TABLE_SIZE 1024
 
-/* just flags to indicate whether a particular port number should get tcp
- * scanned, udp scanned, or both
- */
-#define SCAN_TCP_PORT	(1 << 0)
-#define SCAN_UDP_PORT	(1 << 1)
-#define SCAN_SCTP_PORT	(1 << 2)
-#define SCAN_PROTOCOLS	(1 << 3)
-
 int addportsfromservmask(char *mask, u8 *porttbl, int range_type);
 struct servent *nmap_getservbyport(int port, const char *proto);
 void gettoppts(double level, char *portlist, struct scan_lists * ports, char *exclude_list = NULL);