diff --git a/nmap.cc b/nmap.cc
index 77290a1e7..432946b50 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -132,19 +132,15 @@
 
 #include "nmap.h"
 #include "osscan.h"
-#include "osscan2.h"
 #include "scan_engine.h"
 #include "FPEngine.h"
 #include "idle_scan.h"
-#include "timing.h"
 #include "NmapOps.h"
 #include "MACLookup.h"
 #include "traceroute.h"
 #include "nmap_tty.h"
-#include "nmap_dns.h"
 #include "nmap_ftp.h"
 #include "services.h"
-#include "protocols.h"
 #include "targets.h"
 #include "tcpip.h"
 #include "TargetGroup.h"
diff --git a/portreasons.cc b/portreasons.cc
index e42e95ea4..06e491a70 100644
--- a/portreasons.cc
+++ b/portreasons.cc
@@ -131,8 +131,8 @@
  * Modified by Colin Rice <dah4k0r@gmail.com> 2011
  */
 
-#include "nmap.h"
 #include "portlist.h"
+#include "output.h"
 #include "NmapOps.h"
 #include "portreasons.h"
 #include "Target.h"
@@ -142,7 +142,6 @@
 #endif
 
 extern NmapOps o;
-class PortList;
 
 /* Set the ip_addr union to the AF_INET or AF_INET6 value stored in *ss as
    appropriate. Returns 0 on success or -1 if the address family of *ss is not
diff --git a/scan_engine.h b/scan_engine.h
index e954f7aba..6b80027d3 100644
--- a/scan_engine.h
+++ b/scan_engine.h
@@ -144,6 +144,7 @@
 #include <vector>
 #include <set>
 #include <algorithm>
+class Target;
 
 struct probespec_tcpdata {
   u16 dport;
diff --git a/xml.cc b/xml.cc
index 63a878a20..30e659d67 100644
--- a/xml.cc
+++ b/xml.cc
@@ -187,9 +187,9 @@ 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 <nbase.h>
 
 #include <assert.h>
 #include <stdarg.h>