diff --git a/NmapOps.cc b/NmapOps.cc
index 92a26fe89..b8943fc11 100644
--- a/NmapOps.cc
+++ b/NmapOps.cc
@@ -126,7 +126,7 @@
 #include "nbase.h"
 #include "NmapOps.h"
 #include "services.h"
-#include "utils.h"
+#include "nmap_error.h"
 #ifdef WIN32
 #include "winfix.h"
 #endif
diff --git a/NmapOutputTable.cc b/NmapOutputTable.cc
index b68a621d6..110262699 100644
--- a/NmapOutputTable.cc
+++ b/NmapOutputTable.cc
@@ -128,7 +128,7 @@
 #endif
 
 #include "NmapOutputTable.h"
-#include "utils.h"
+#include "nmap_error.h"
 
 #include <stdlib.h>
 
diff --git a/idle_scan.cc b/idle_scan.cc
index f64675c95..b832b658d 100644
--- a/idle_scan.cc
+++ b/idle_scan.cc
@@ -158,7 +158,7 @@
 #include "NmapOps.h"
 #include "services.h"
 #include "Target.h"
-#include "utils.h"
+#include "nmap_error.h"
 #include "output.h"
 
 #include "struct_ip.h"
diff --git a/nmap_dns.cc b/nmap_dns.cc
index 91a5d0d9b..43f9c39d1 100644
--- a/nmap_dns.cc
+++ b/nmap_dns.cc
@@ -185,7 +185,7 @@
 #include "NmapOps.h"
 #include "nmap_dns.h"
 #include "nsock.h"
-#include "utils.h"
+#include "nmap_error.h"
 #include "nmap_tty.h"
 #include "timing.h"
 #include "Target.h"
diff --git a/nmap_tty.cc b/nmap_tty.cc
index 938062e2a..c3a4a4822 100644
--- a/nmap_tty.cc
+++ b/nmap_tty.cc
@@ -142,7 +142,6 @@
 #include <stdlib.h>
 
 #include "nmap_tty.h"
-#include "utils.h"
 #include "NmapOps.h"
 
 extern NmapOps o;
diff --git a/nse_dnet.cc b/nse_dnet.cc
index 23a60a2e0..b7ea001db 100644
--- a/nse_dnet.cc
+++ b/nse_dnet.cc
@@ -1,7 +1,6 @@
 #include "nsock.h"
 #include "nmap_error.h"
 #include "NmapOps.h"
-#include "utils.h"
 #include "tcpip.h"
 #include "protocols.h"
 #include "libnetutil/netutil.h"
diff --git a/nse_nsock.cc b/nse_nsock.cc
index 76f468dc8..3f5ab59ca 100644
--- a/nse_nsock.cc
+++ b/nse_nsock.cc
@@ -1,7 +1,6 @@
 #include "nsock.h"
 #include "nmap_error.h"
 #include "NmapOps.h"
-#include "utils.h"
 #include "tcpip.h"
 #include "protocols.h"
 #include "libnetutil/netutil.h"
diff --git a/osscan.cc b/osscan.cc
index 4109b558b..0af380ced 100644
--- a/osscan.cc
+++ b/osscan.cc
@@ -131,7 +131,6 @@
 #include "charpool.h"
 #include "Target.h"
 #include "nmap_error.h"
-#include "utils.h"
 
 #include <stdarg.h>
 #if TIME_WITH_SYS_TIME