diff --git a/src/grib_accessor_class_data_complex_packing.cc b/src/grib_accessor_class_data_complex_packing.cc
index 06b2bcbb8..f8595a858 100644
--- a/src/grib_accessor_class_data_complex_packing.cc
+++ b/src/grib_accessor_class_data_complex_packing.cc
@@ -10,7 +10,7 @@
 
 #include "grib_ieeefloat.h"
 #include "grib_scaling.h"
-#include <math.h>
+#include <cmath>
 #include <algorithm>
 /*
    This is used by make_class.pl
diff --git a/src/grib_accessor_class_data_g2bifourier_packing.cc b/src/grib_accessor_class_data_g2bifourier_packing.cc
index 76980612e..bc9abe56f 100644
--- a/src/grib_accessor_class_data_g2bifourier_packing.cc
+++ b/src/grib_accessor_class_data_g2bifourier_packing.cc
@@ -15,7 +15,7 @@
 #include "grib_scaling.h"
 #include "grib_api_internal.h"
 #include "grib_optimize_decimal_factor.h"
-#include <math.h>
+#include <cmath>
 #include <algorithm>
 
 /*
diff --git a/src/grib_accessor_class_data_sh_packed.cc b/src/grib_accessor_class_data_sh_packed.cc
index db2f63ce8..b1c24e6cd 100644
--- a/src/grib_accessor_class_data_sh_packed.cc
+++ b/src/grib_accessor_class_data_sh_packed.cc
@@ -10,7 +10,7 @@
 
 #include "grib_scaling.h"
 #include "grib_api_internal.h"
-#include <math.h>
+#include <cmath>
 /*
    This is used by make_class.pl
 
diff --git a/src/grib_accessor_class_data_sh_unpacked.cc b/src/grib_accessor_class_data_sh_unpacked.cc
index 604c3947f..0b7499118 100644
--- a/src/grib_accessor_class_data_sh_unpacked.cc
+++ b/src/grib_accessor_class_data_sh_unpacked.cc
@@ -10,7 +10,7 @@
 
 #include "grib_scaling.h"
 #include "grib_api_internal.h"
-#include <math.h>
+#include <cmath>
 /*
    This is used by make_class.pl
 
diff --git a/src/grib_accessor_class_from_scale_factor_scaled_value.cc b/src/grib_accessor_class_from_scale_factor_scaled_value.cc
index edf8b1d48..21a41a1e3 100644
--- a/src/grib_accessor_class_from_scale_factor_scaled_value.cc
+++ b/src/grib_accessor_class_from_scale_factor_scaled_value.cc
@@ -9,7 +9,7 @@
  */
 
 #include "grib_api_internal.h"
-#include <math.h>
+#include <cmath>
 #ifdef ECCODES_ON_WINDOWS
  #include <stdint.h>
 #endif
diff --git a/src/grib_accessor_class_g2grid.cc b/src/grib_accessor_class_g2grid.cc
index 69a8bb6bf..cbb6bdd20 100644
--- a/src/grib_accessor_class_g2grid.cc
+++ b/src/grib_accessor_class_g2grid.cc
@@ -13,7 +13,7 @@
  ***********************************************/
 
 #include "grib_api_internal.h"
-#include <math.h>
+#include <cmath>
 /*
    This is used by make_class.pl
 
diff --git a/src/grib_geography.cc b/src/grib_geography.cc
index 84b1029f3..b385ceb10 100644
--- a/src/grib_geography.cc
+++ b/src/grib_geography.cc
@@ -13,7 +13,7 @@
  ***************************************************************************/
 #include "grib_api_internal.h"
 
-#include <math.h>
+#include <cmath>
 #include <algorithm>
 
 #define NUMBER(x) (sizeof(x) / sizeof(x[0]))
diff --git a/src/grib_header_compute.cc b/src/grib_header_compute.cc
index 41180a1b2..d8723742e 100644
--- a/src/grib_header_compute.cc
+++ b/src/grib_header_compute.cc
@@ -15,7 +15,7 @@
 */
 
 #include "grib_api_internal.h"
-#include <math.h>
+#include <cmath>
 #include <signal.h>
 #include <cctype>
 #include <stdlib.h>
diff --git a/src/grib_iterator_class_gaussian.cc b/src/grib_iterator_class_gaussian.cc
index 366505b71..ede3dba7f 100644
--- a/src/grib_iterator_class_gaussian.cc
+++ b/src/grib_iterator_class_gaussian.cc
@@ -12,7 +12,7 @@
  **************************************/
 
 #include "grib_api_internal.h"
-#include <math.h>
+#include <cmath>
 
 /*
    This is used by make_class.pl
diff --git a/src/grib_iterator_class_gaussian_reduced.cc b/src/grib_iterator_class_gaussian_reduced.cc
index 95608dd91..44ca0c385 100644
--- a/src/grib_iterator_class_gaussian_reduced.cc
+++ b/src/grib_iterator_class_gaussian_reduced.cc
@@ -14,7 +14,7 @@
 
 
 #include "grib_api_internal.h"
-#include <math.h>
+#include <cmath>
 
 /*
    This is used by make_class.pl
diff --git a/src/grib_iterator_class_lambert_azimuthal_equal_area.cc b/src/grib_iterator_class_lambert_azimuthal_equal_area.cc
index f77b23afc..f9b76d702 100644
--- a/src/grib_iterator_class_lambert_azimuthal_equal_area.cc
+++ b/src/grib_iterator_class_lambert_azimuthal_equal_area.cc
@@ -9,7 +9,7 @@
  */
 
 #include "grib_api_internal.h"
-#include <math.h>
+#include <cmath>
 
 /*
    This is used by make_class.pl
diff --git a/src/grib_iterator_class_lambert_conformal.cc b/src/grib_iterator_class_lambert_conformal.cc
index 8c5fed223..61e17d97c 100644
--- a/src/grib_iterator_class_lambert_conformal.cc
+++ b/src/grib_iterator_class_lambert_conformal.cc
@@ -9,7 +9,7 @@
  */
 
 #include "grib_api_internal.h"
-#include <math.h>
+#include <cmath>
 
 /*
    This is used by make_class.pl
diff --git a/src/grib_iterator_class_latlon_reduced.cc b/src/grib_iterator_class_latlon_reduced.cc
index 90154ff22..c27dcb2d1 100644
--- a/src/grib_iterator_class_latlon_reduced.cc
+++ b/src/grib_iterator_class_latlon_reduced.cc
@@ -14,7 +14,7 @@
 
 
 #include "grib_api_internal.h"
-#include <math.h>
+#include <cmath>
 
 /*
    This is used by make_class.pl
diff --git a/src/grib_iterator_class_mercator.cc b/src/grib_iterator_class_mercator.cc
index fd67bd833..bd60e3424 100644
--- a/src/grib_iterator_class_mercator.cc
+++ b/src/grib_iterator_class_mercator.cc
@@ -9,7 +9,7 @@
  */
 
 #include "grib_api_internal.h"
-#include <math.h>
+#include <cmath>
 
 /*
    This is used by make_class.pl
diff --git a/src/grib_iterator_class_polar_stereographic.cc b/src/grib_iterator_class_polar_stereographic.cc
index 1f8b0d17b..fe1d03202 100644
--- a/src/grib_iterator_class_polar_stereographic.cc
+++ b/src/grib_iterator_class_polar_stereographic.cc
@@ -9,7 +9,7 @@
  */
 
 #include "grib_api_internal.h"
-#include <math.h>
+#include <cmath>
 
 /*
    This is used by make_class.pl
diff --git a/src/grib_iterator_class_regular.cc b/src/grib_iterator_class_regular.cc
index ddbaa3044..cc870e70a 100644
--- a/src/grib_iterator_class_regular.cc
+++ b/src/grib_iterator_class_regular.cc
@@ -9,7 +9,7 @@
  */
 
 #include "grib_api_internal.h"
-#include <math.h>
+#include <cmath>
 
 /*
    This is used by make_class.pl
diff --git a/src/grib_iterator_class_space_view.cc b/src/grib_iterator_class_space_view.cc
index 70299278b..ce8294d0d 100644
--- a/src/grib_iterator_class_space_view.cc
+++ b/src/grib_iterator_class_space_view.cc
@@ -9,7 +9,7 @@
  */
 
 #include "grib_api_internal.h"
-#include <math.h>
+#include <cmath>
 
 /*
    This is used by make_class.pl
diff --git a/src/grib_optimize_decimal_factor.cc b/src/grib_optimize_decimal_factor.cc
index 342bb974a..ea6ac3a08 100644
--- a/src/grib_optimize_decimal_factor.cc
+++ b/src/grib_optimize_decimal_factor.cc
@@ -11,7 +11,7 @@
 #include "grib_scaling.h"
 #include "grib_api_internal.h"
 #include "grib_optimize_decimal_factor.h"
-#include <math.h>
+#include <cmath>
 #include <float.h>
 #include <string.h>
 
diff --git a/tools/grib_to_netcdf.cc b/tools/grib_to_netcdf.cc
index a9af32dbd..29df9d385 100644
--- a/tools/grib_to_netcdf.cc
+++ b/tools/grib_to_netcdf.cc
@@ -12,7 +12,7 @@
 
 #ifdef HAVE_NETCDF
 
-#include <math.h>
+#include <cmath>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>