diff --git a/src/KIM/kim_units.cpp b/src/KIM/kim_units.cpp
index 82bbc46227..1377e3c4ee 100644
--- a/src/KIM/kim_units.cpp
+++ b/src/KIM/kim_units.cpp
@@ -54,10 +54,9 @@
    Designed for use with the kim-api-2.0.2 (and newer) package
 ------------------------------------------------------------------------- */
 
-#include <iostream>
-#include <math.h>
-#include <string>
+#include <cmath>
 #include <map>
+#include <string>
 #include <utility>
 
 using namespace std;
diff --git a/src/nstencil_full_multi_2d.cpp b/src/nstencil_full_multi_2d.cpp
index 893798ce31..308eab71ee 100644
--- a/src/nstencil_full_multi_2d.cpp
+++ b/src/nstencil_full_multi_2d.cpp
@@ -18,7 +18,7 @@
 #include "nbin.h"
 #include "memory.h"
 #include "atom.h"
-#include <math.h>
+#include <cmath>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/nstencil_full_multi_3d.cpp b/src/nstencil_full_multi_3d.cpp
index 3265dac884..22e5f8b4e3 100644
--- a/src/nstencil_full_multi_3d.cpp
+++ b/src/nstencil_full_multi_3d.cpp
@@ -18,7 +18,7 @@
 #include "nbin.h"
 #include "memory.h"
 #include "atom.h"
-#include <math.h>
+#include <cmath>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/nstencil_half_multi_2d.cpp b/src/nstencil_half_multi_2d.cpp
index ebcf26b290..8bf6ce8404 100644
--- a/src/nstencil_half_multi_2d.cpp
+++ b/src/nstencil_half_multi_2d.cpp
@@ -18,7 +18,7 @@
 #include "nbin.h"
 #include "memory.h"
 #include "atom.h"
-#include <math.h>
+#include <cmath>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/nstencil_half_multi_2d_tri.cpp b/src/nstencil_half_multi_2d_tri.cpp
index 621e033fb6..ffddb55061 100644
--- a/src/nstencil_half_multi_2d_tri.cpp
+++ b/src/nstencil_half_multi_2d_tri.cpp
@@ -18,7 +18,7 @@
 #include "nbin.h"
 #include "memory.h"
 #include "atom.h"
-#include <math.h>
+#include <cmath>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/nstencil_half_multi_3d.cpp b/src/nstencil_half_multi_3d.cpp
index a3392f164a..d6fae6ebec 100644
--- a/src/nstencil_half_multi_3d.cpp
+++ b/src/nstencil_half_multi_3d.cpp
@@ -18,7 +18,7 @@
 #include "nbin.h"
 #include "memory.h"
 #include "atom.h"
-#include <math.h>
+#include <cmath>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/nstencil_half_multi_3d_tri.cpp b/src/nstencil_half_multi_3d_tri.cpp
index 160d04bd61..7625a58cd7 100644
--- a/src/nstencil_half_multi_3d_tri.cpp
+++ b/src/nstencil_half_multi_3d_tri.cpp
@@ -18,7 +18,7 @@
 #include "nbin.h"
 #include "memory.h"
 #include "atom.h"
-#include <math.h>
+#include <cmath>
 
 using namespace LAMMPS_NS;