diff --git a/FPEngine.cc b/FPEngine.cc
index 5046b9d9a..a9f767e7d 100644
--- a/FPEngine.cc
+++ b/FPEngine.cc
@@ -126,6 +126,7 @@
 
 #include "FPEngine.h"
 #include "Target.h"
+#include "FingerPrintResults.h"
 #include "NmapOps.h"
 #include "nmap_error.h"
 #include "osscan.h"
diff --git a/Target.cc b/Target.cc
index 96aa77919..baf6874b4 100644
--- a/Target.cc
+++ b/Target.cc
@@ -129,6 +129,7 @@
 #endif
 
 #include "Target.h"
+#include "FingerPrintResults.h" /* for ~FingerPrintResults() */
 #include <dnet.h>
 #include "nbase.h"
 #include "NmapOps.h"
diff --git a/Target.h b/Target.h
index 1906e865f..58c572306 100644
--- a/Target.h
+++ b/Target.h
@@ -127,7 +127,6 @@
 #ifndef TARGET_H
 #define TARGET_H
 
-#include "FingerPrintResults.h"
 #include "libnetutil/netutil.h"
 
 #ifndef NOLUA
@@ -139,6 +138,7 @@
 #include "tcpip.h"
 #include "scan_engine.h"
 #include "osscan2.h"
+class FingerPrintResults;
 
 #include <list>
 #include <string>
diff --git a/idle_scan.cc b/idle_scan.cc
index b832b658d..ebabfe9bc 100644
--- a/idle_scan.cc
+++ b/idle_scan.cc
@@ -151,6 +151,8 @@
         Windows 8 Enterprise 32 bit | Global, incremental by 2
 */
 
+#include "libnetutil/npacket.h"
+
 #include "idle_scan.h"
 #include "timing.h"
 #include "osscan2.h"
diff --git a/nmap.cc b/nmap.cc
index 75514cf47..132e58532 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -127,6 +127,7 @@
 #include "osscan.h"
 #include "osscan2.h"
 #include "scan_engine.h"
+#include "FPEngine.h"
 #include "idle_scan.h"
 #include "timing.h"
 #include "NmapOps.h"
diff --git a/nse_nmaplib.cc b/nse_nmaplib.cc
index e241b9cc0..1364e9672 100644
--- a/nse_nmaplib.cc
+++ b/nse_nmaplib.cc
@@ -10,6 +10,7 @@ extern "C" {
 #include "nmap.h"
 #include "nmap_error.h"
 #include "NmapOps.h"
+#include "FingerPrintResults.h"
 #include "Target.h"
 #include "TargetGroup.h"
 #include "portlist.h"
diff --git a/osscan.cc b/osscan.cc
index 0af380ced..745139a68 100644
--- a/osscan.cc
+++ b/osscan.cc
@@ -129,6 +129,7 @@
 #include "NmapOps.h"
 #include "nmap_tty.h"
 #include "charpool.h"
+#include "FingerPrintResults.h"
 #include "Target.h"
 #include "nmap_error.h"
 
diff --git a/osscan2.cc b/osscan2.cc
index 91be091db..74e31fc34 100644
--- a/osscan2.cc
+++ b/osscan2.cc
@@ -131,6 +131,7 @@
 #include "Target.h"
 #include "utils.h"
 #include "FPEngine.h"
+#include "FingerPrintResults.h"
 #include <dnet.h>
 
 #include "struct_ip.h"
diff --git a/output.cc b/output.cc
index a0663ac4a..c035e5af3 100644
--- a/output.cc
+++ b/output.cc
@@ -136,6 +136,7 @@
 #include "MACLookup.h"
 #include "portreasons.h"
 #include "protocols.h"
+#include "FingerPrintResults.h"
 #include "Target.h"
 #include "utils.h"
 #include "xml.h"