diff --git a/api/gutil.cpp b/api/gutil.cpp
index 612ad186a3..04588366c2 100644
--- a/api/gutil.cpp
+++ b/api/gutil.cpp
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
+#include <cmath>
 #include <setjmp.h>
 
 #ifdef _WIN32
diff --git a/api/gutil_text.cpp b/api/gutil_text.cpp
index de164a2f87..689ea6e202 100644
--- a/api/gutil_text.cpp
+++ b/api/gutil_text.cpp
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
+#include <cmath>
 #include <setjmp.h>
 
 #ifdef _WIN32
diff --git a/client/client_state.cpp b/client/client_state.cpp
index 0c6cb8a6aa..370b855a29 100644
--- a/client/client_state.cpp
+++ b/client/client_state.cpp
@@ -26,7 +26,7 @@
 #include <ctime>
 #include <cstdarg>
 #include <cstring>
-#include <math.h>
+#include <cmath>
 #if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/client/sim.cpp b/client/sim.cpp
index 3ced39009e..05e8796687 100644
--- a/client/sim.cpp
+++ b/client/sim.cpp
@@ -55,7 +55,7 @@
 //  [--rec_half_life X]
 //      half-life of recent est credit
 
-#include <math.h>
+#include <cmath>
 
 #include "error_numbers.h"
 #include "str_util.h"
diff --git a/client/sim_util.cpp b/client/sim_util.cpp
index 39ea84efab..ec15ee261e 100644
--- a/client/sim_util.cpp
+++ b/client/sim_util.cpp
@@ -35,7 +35,7 @@
 #define finite _finite
 #endif
 
-#include <math.h>
+#include <cmath>
 
 #include "error_numbers.h"
 #include "filesys.h"
diff --git a/client/whetstone.cpp b/client/whetstone.cpp
index ba524c0cee..0aec5d1ce9 100644
--- a/client/whetstone.cpp
+++ b/client/whetstone.cpp
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <math.h>
+#include <cmath>
 #include <time.h>
 #endif
 
diff --git a/clientscr/ss_app.cpp b/clientscr/ss_app.cpp
index 8713605ee1..f14b2672fe 100644
--- a/clientscr/ss_app.cpp
+++ b/clientscr/ss_app.cpp
@@ -22,7 +22,7 @@
 #ifdef _WIN32
 #include "boinc_win.h"
 #else
-#include <math.h>
+#include <cmath>
 #endif
 #include <string>
 #include <vector>
diff --git a/db/boinc_db.cpp b/db/boinc_db.cpp
index 15c46f0cf6..e3241adcc3 100644
--- a/db/boinc_db.cpp
+++ b/db/boinc_db.cpp
@@ -22,7 +22,6 @@
 #include <ctime>
 #include <unistd.h>
 #include <cmath>
-#include <math.h>
 
 // For machines with finite() defined in ieeefp.h
 #if HAVE_IEEEFP_H
diff --git a/lib/parse.cpp b/lib/parse.cpp
index f49aa08c2a..ab62f56c59 100644
--- a/lib/parse.cpp
+++ b/lib/parse.cpp
@@ -31,7 +31,7 @@
 #include <cstring>
 #include <cstdlib>
 #include <string>
-#include <math.h>
+#include <cmath>
 #include <ctype.h>
 #include <errno.h>
 #if HAVE_IEEEFP_H
diff --git a/lib/str_util.cpp b/lib/str_util.cpp
index ba6a9ae31d..5062737c31 100644
--- a/lib/str_util.cpp
+++ b/lib/str_util.cpp
@@ -27,7 +27,7 @@
 #ifndef _WIN32
 #include "config.h"
 #include <string>
-#include <math.h>
+#include <cmath>
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/lib/util.cpp b/lib/util.cpp
index 18d7ab6ea4..a1981a103a 100644
--- a/lib/util.cpp
+++ b/lib/util.cpp
@@ -50,7 +50,7 @@
 #include <errno.h>
 #include <string>
 #include <cstring>
-#include <math.h>
+#include <cmath>
 #if HAVE_IEEEFP_H
 #include <ieeefp.h>
 extern "C" {
diff --git a/vda/vda_lib.cpp b/vda/vda_lib.cpp
index 963ef97daf..8bc99cd25f 100644
--- a/vda/vda_lib.cpp
+++ b/vda/vda_lib.cpp
@@ -19,7 +19,7 @@
 
 #include <algorithm>
 #include <limits.h>
-#include <math.h>
+#include <cmath>
 #include <set>
 #include <stdio.h>
 #include <vector>