diff --git a/FPEngine.cc b/FPEngine.cc
index 0949f6a27..f00f0952e 100644
--- a/FPEngine.cc
+++ b/FPEngine.cc
@@ -133,6 +133,8 @@
 #include "FPModel.h"
 extern NmapOps o;
 
+#include <math.h>
+
 
 /******************************************************************************
  * Globals.                                                                   *
diff --git a/nmap.h b/nmap.h
index 62650aaf5..fcaef5526 100644
--- a/nmap.h
+++ b/nmap.h
@@ -233,7 +233,6 @@ void *realloc();
 /* Keep assert() defined for security reasons */
 #undef NDEBUG
 
-#include <math.h>
 #include <assert.h>
 
 #if HAVE_SYS_RESOURCE_H
diff --git a/nse_main.cc b/nse_main.cc
index cfc0f809b..fc2861415 100644
--- a/nse_main.cc
+++ b/nse_main.cc
@@ -21,6 +21,8 @@
 #include "nse_debug.h"
 #include "nse_lpeg.h"
 
+#include <math.h>
+
 #define NSE_MAIN "NSE_MAIN" /* the main function */
 
 /* Script Scan phases */
diff --git a/osscan2.cc b/osscan2.cc
index 05c84ba15..26e9f0bcb 100644
--- a/osscan2.cc
+++ b/osscan2.cc
@@ -136,6 +136,7 @@
 #include "struct_ip.h"
 
 #include <list>
+#include <math.h>
 
 extern NmapOps o;
 
diff --git a/timing.cc b/timing.cc
index 5bb04862f..5593de817 100644
--- a/timing.cc
+++ b/timing.cc
@@ -130,6 +130,8 @@
 #include "utils.h"
 #include "xml.h"
 
+#include <math.h>
+
 extern NmapOps o;
 
 /* Call this function on a newly allocated struct timeout_info to