diff --git a/src/ASPHERE/compute_temp_asphere.cpp b/src/ASPHERE/compute_temp_asphere.cpp
index b6d37db6ce91693d9c4592b8e501f37b33546df2..011d8cae80f662d668223f7f43af71fc162df413 100644
--- a/src/ASPHERE/compute_temp_asphere.cpp
+++ b/src/ASPHERE/compute_temp_asphere.cpp
@@ -16,7 +16,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
 #include "compute_temp_asphere.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/ASPHERE/fix_nh_asphere.cpp b/src/ASPHERE/fix_nh_asphere.cpp
index 2eee28dc1ce1ead9da818fb1e12832c06d8e5ef3..828c064a526cb3c8b0c3eb9c8e9341b7db3eed11 100644
--- a/src/ASPHERE/fix_nh_asphere.cpp
+++ b/src/ASPHERE/fix_nh_asphere.cpp
@@ -15,9 +15,9 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "math_extra.h"
 #include "fix_nh_asphere.h"
 #include "atom.h"
diff --git a/src/ASPHERE/fix_nph_asphere.cpp b/src/ASPHERE/fix_nph_asphere.cpp
index e0558ef4f24cd29af20311b03cfaef7528fb540a..5f201a8463e325c2ff9bdeae85a1e6687907fd77 100644
--- a/src/ASPHERE/fix_nph_asphere.cpp
+++ b/src/ASPHERE/fix_nph_asphere.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_nph_asphere.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/ASPHERE/fix_npt_asphere.cpp b/src/ASPHERE/fix_npt_asphere.cpp
index 205630376af2d49b7ef5bf6d3a439f6f5ffd1e1a..5d528911698f2c045c763163ec2c8912ec1661c5 100644
--- a/src/ASPHERE/fix_npt_asphere.cpp
+++ b/src/ASPHERE/fix_npt_asphere.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_npt_asphere.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/ASPHERE/fix_nve_asphere.cpp b/src/ASPHERE/fix_nve_asphere.cpp
index 2ac3f95c5398220c1d981844a82fd5d0a4b5ab3a..a33848f1a1dac5c143c411414a8eba0c8a50c683 100644
--- a/src/ASPHERE/fix_nve_asphere.cpp
+++ b/src/ASPHERE/fix_nve_asphere.cpp
@@ -15,9 +15,9 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include "fix_nve_asphere.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/ASPHERE/fix_nve_asphere_noforce.cpp b/src/ASPHERE/fix_nve_asphere_noforce.cpp
index 34fb57159c69612c19dacd5e1246f6a180532428..d944b68f35a425cceae1f6faec6ed3b5e70a68ac 100644
--- a/src/ASPHERE/fix_nve_asphere_noforce.cpp
+++ b/src/ASPHERE/fix_nve_asphere_noforce.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_nve_asphere_noforce.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/ASPHERE/fix_nve_line.cpp b/src/ASPHERE/fix_nve_line.cpp
index 554242fb5b4209d797d91c0dbf1f61b6a0594e37..c145e99fcb1a608e540941eb2b6402a58e6a5a33 100644
--- a/src/ASPHERE/fix_nve_line.cpp
+++ b/src/ASPHERE/fix_nve_line.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include "fix_nve_line.h"
 #include "atom.h"
 #include "atom_vec_line.h"
diff --git a/src/ASPHERE/fix_nve_tri.cpp b/src/ASPHERE/fix_nve_tri.cpp
index f859ce08c81b75b29adc72ddba388edd406931b6..d06063d905940276941a14f1d3f46e1f95a0ff5d 100644
--- a/src/ASPHERE/fix_nve_tri.cpp
+++ b/src/ASPHERE/fix_nve_tri.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include "fix_nve_tri.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/ASPHERE/fix_nvt_asphere.cpp b/src/ASPHERE/fix_nvt_asphere.cpp
index f43e731c23851520a03f4bd3775d410fff6660d8..5ef91923ebb396b008b07d274c90c625670713e7 100644
--- a/src/ASPHERE/fix_nvt_asphere.cpp
+++ b/src/ASPHERE/fix_nvt_asphere.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_nvt_asphere.h"
 #include "group.h"
 #include "modify.h"
diff --git a/src/ASPHERE/pair_gayberne.cpp b/src/ASPHERE/pair_gayberne.cpp
index 9ff87326ed7a0f88d156a99e1c0123b48fe89d8b..857541957e6512ffad74bdccfb351c3a6a8acd0d 100644
--- a/src/ASPHERE/pair_gayberne.cpp
+++ b/src/ASPHERE/pair_gayberne.cpp
@@ -15,10 +15,10 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_gayberne.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/ASPHERE/pair_line_lj.cpp b/src/ASPHERE/pair_line_lj.cpp
index 83a6f4ea8c998ccef44ac408d3d7b523dc9be061..963ff985c478e3c29a2e11ed8bf3fc37dd5fe536 100644
--- a/src/ASPHERE/pair_line_lj.cpp
+++ b/src/ASPHERE/pair_line_lj.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_line_lj.h"
 #include "atom.h"
 #include "atom_vec_line.h"
diff --git a/src/ASPHERE/pair_resquared.cpp b/src/ASPHERE/pair_resquared.cpp
index caa031a1e83933f1e271216def61b81ee5355337..c477b1b8cfbfdf1a4faa721831874bcb009a7ae1 100644
--- a/src/ASPHERE/pair_resquared.cpp
+++ b/src/ASPHERE/pair_resquared.cpp
@@ -15,10 +15,10 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_resquared.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/ASPHERE/pair_tri_lj.cpp b/src/ASPHERE/pair_tri_lj.cpp
index 4f30b40e9a8976d9abb98913c7d4b30c5ae78278..142caf376425b34bd5f0cad23b76a9436f4ea8be 100644
--- a/src/ASPHERE/pair_tri_lj.cpp
+++ b/src/ASPHERE/pair_tri_lj.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_tri_lj.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/BODY/body_nparticle.cpp b/src/BODY/body_nparticle.cpp
index 7e3e6f463cd44d5cea74317a7842a5f1aa87ef39..684e5768dae00176fa05eaacf75cf43c1cb60468 100644
--- a/src/BODY/body_nparticle.cpp
+++ b/src/BODY/body_nparticle.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "body_nparticle.h"
 #include "math_extra.h"
 #include "atom_vec_body.h"
diff --git a/src/BODY/compute_body_local.cpp b/src/BODY/compute_body_local.cpp
index e72dd59b25fb214cd6ae536333f2367dfdc1b3c4..df8a76d0fedc1f5951572999615ff9ae67ffbaf5 100644
--- a/src/BODY/compute_body_local.cpp
+++ b/src/BODY/compute_body_local.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "compute_body_local.h"
 #include "atom.h"
 #include "atom_vec_body.h"
diff --git a/src/BODY/compute_temp_body.cpp b/src/BODY/compute_temp_body.cpp
index ec992cea22490b5b05b455980636e48696c16a47..5446fb6d644497a2e9331c745f21e58bc5487644 100644
--- a/src/BODY/compute_temp_body.cpp
+++ b/src/BODY/compute_temp_body.cpp
@@ -17,7 +17,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
 #include "compute_temp_body.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/BODY/fix_nh_body.cpp b/src/BODY/fix_nh_body.cpp
index a1865dfd182af602bd63d26e778fa5c22f463869..97398424193f37d0b4f34e6268ec09b2ad5e60c4 100644
--- a/src/BODY/fix_nh_body.cpp
+++ b/src/BODY/fix_nh_body.cpp
@@ -16,9 +16,9 @@
    based on FixNHAsphere
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "math_extra.h"
 #include "fix_nh_body.h"
 #include "atom.h"
diff --git a/src/BODY/fix_nph_body.cpp b/src/BODY/fix_nph_body.cpp
index 99e33a3d22e90d814f9e92415e63024ee04e45dc..e647488bce9ae3de2cc3e232aa7a5bbb8c796679 100644
--- a/src/BODY/fix_nph_body.cpp
+++ b/src/BODY/fix_nph_body.cpp
@@ -15,7 +15,7 @@
    Contributing author: Trung Dac Nguyen (ndactrung@gmail.com)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_nph_body.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/BODY/fix_npt_body.cpp b/src/BODY/fix_npt_body.cpp
index 077a7babd4866ad99e060723ae4cb503d6bc8194..3c30e9e4e92f3825cd3d89da1a46a6f3798f9130 100644
--- a/src/BODY/fix_npt_body.cpp
+++ b/src/BODY/fix_npt_body.cpp
@@ -15,7 +15,7 @@
    Contributing author: Trung Dac Nguyen (ndactrung@gmail.com)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_npt_body.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/BODY/fix_nve_body.cpp b/src/BODY/fix_nve_body.cpp
index edc88ed3b4213fb5eae64a1283e5b1bb88bf14fa..0606723cb77d558c8500c5469e16d64773f962fd 100644
--- a/src/BODY/fix_nve_body.cpp
+++ b/src/BODY/fix_nve_body.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include "fix_nve_body.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/BODY/fix_nvt_body.cpp b/src/BODY/fix_nvt_body.cpp
index 464f42eae91d5cada1c2c0cf8c9b4f6eedce065b..273b5e7fffd2ac3bf0750ed6cfd2548b4f4f4465 100644
--- a/src/BODY/fix_nvt_body.cpp
+++ b/src/BODY/fix_nvt_body.cpp
@@ -15,7 +15,7 @@
    Contributing author: Trung Dac Nguyen (ndactrung@gmail.com)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_nvt_body.h"
 #include "group.h"
 #include "modify.h"
diff --git a/src/BODY/pair_body.cpp b/src/BODY/pair_body.cpp
index b1be99731018e2f30ebaa4258a679abb93944472..8c12c0cf36aa0384c50e3745b45c969c8aa29cc2 100644
--- a/src/BODY/pair_body.cpp
+++ b/src/BODY/pair_body.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_body.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/CLASS2/angle_class2.cpp b/src/CLASS2/angle_class2.cpp
index 7dfdaa17f48dbca47b0dfa17bd4eeddf4b06eb85..24f41bfd587e00d1ec3ae121a9511c0dcf712641 100644
--- a/src/CLASS2/angle_class2.cpp
+++ b/src/CLASS2/angle_class2.cpp
@@ -15,9 +15,9 @@
    Contributing author: Eric Simon (Cray)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "angle_class2.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/CLASS2/angle_class2.h b/src/CLASS2/angle_class2.h
index 1d595d5f6ac8737d58def4dff9109a4d13a09b26..d18f71e1eb74b9a8c852cebc8895b05195e9c90a 100644
--- a/src/CLASS2/angle_class2.h
+++ b/src/CLASS2/angle_class2.h
@@ -20,7 +20,7 @@ AngleStyle(class2,AngleClass2)
 #ifndef LMP_ANGLE_CLASS2_H
 #define LMP_ANGLE_CLASS2_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle.h"
 
 namespace LAMMPS_NS {
diff --git a/src/CLASS2/bond_class2.cpp b/src/CLASS2/bond_class2.cpp
index b016de0206f5ae52ca61677512a44364d27e92e9..c3dc09715c9c341b57a73e274251cdc35bdeb0da 100644
--- a/src/CLASS2/bond_class2.cpp
+++ b/src/CLASS2/bond_class2.cpp
@@ -15,8 +15,8 @@
    Contributing author: Eric Simon (Cray)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "bond_class2.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/CLASS2/bond_class2.h b/src/CLASS2/bond_class2.h
index 51e2c939a77432100f4833378d53e2dff652c826..f8e294e2b0dae71441151db5aa820db19e441c89 100644
--- a/src/CLASS2/bond_class2.h
+++ b/src/CLASS2/bond_class2.h
@@ -20,7 +20,7 @@ BondStyle(class2,BondClass2)
 #ifndef LMP_BOND_CLASS2_H
 #define LMP_BOND_CLASS2_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "bond.h"
 
 namespace LAMMPS_NS {
diff --git a/src/CLASS2/dihedral_class2.cpp b/src/CLASS2/dihedral_class2.cpp
index b79f574829e3c40d3e4f4f2abdbe56a462d22612..c6360dd84643b95fc1996e4cd10e8005b5d3c8b8 100644
--- a/src/CLASS2/dihedral_class2.cpp
+++ b/src/CLASS2/dihedral_class2.cpp
@@ -15,9 +15,9 @@
    Contributing author: Eric Simon (Cray)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "dihedral_class2.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/CLASS2/dihedral_class2.h b/src/CLASS2/dihedral_class2.h
index e8309dad7a94d2b1ebc91c08291185445006297c..9ccf6623a06533c40f823d9cbbdf04b6eda576d0 100644
--- a/src/CLASS2/dihedral_class2.h
+++ b/src/CLASS2/dihedral_class2.h
@@ -20,7 +20,7 @@ DihedralStyle(class2,DihedralClass2)
 #ifndef LMP_DIHEDRAL_CLASS2_H
 #define LMP_DIHEDRAL_CLASS2_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "dihedral.h"
 
 namespace LAMMPS_NS {
diff --git a/src/CLASS2/improper_class2.cpp b/src/CLASS2/improper_class2.cpp
index e7c4aa94be8ae6c9fadf0b3938055234e0b694d3..3b3811584d07e4f71a53b986084cd735841decbd 100644
--- a/src/CLASS2/improper_class2.cpp
+++ b/src/CLASS2/improper_class2.cpp
@@ -15,9 +15,9 @@
    Contributing author: Eric Simon (Cray)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "improper_class2.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/CLASS2/improper_class2.h b/src/CLASS2/improper_class2.h
index f814da96c545daee13babb3ca34f53bc03b235ca..f155f67c5c8169fa4125c3f6a19700a3e2ef2129 100644
--- a/src/CLASS2/improper_class2.h
+++ b/src/CLASS2/improper_class2.h
@@ -20,7 +20,7 @@ ImproperStyle(class2,ImproperClass2)
 #ifndef LMP_IMPROPER_CLASS2_H
 #define LMP_IMPROPER_CLASS2_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "improper.h"
 
 namespace LAMMPS_NS {
diff --git a/src/CLASS2/pair_lj_class2.cpp b/src/CLASS2/pair_lj_class2.cpp
index 0b90b2717e314cda29d441465214b2767dff152d..e255807ab6a5f217f076892d9a695d5d5d4cd787 100644
--- a/src/CLASS2/pair_lj_class2.cpp
+++ b/src/CLASS2/pair_lj_class2.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
 #include "pair_lj_class2.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/CLASS2/pair_lj_class2_coul_cut.cpp b/src/CLASS2/pair_lj_class2_coul_cut.cpp
index 395953e0a9c7a70fa9bb9d3cd8c4834c1923a714..5cd5ad0e32cc1ae4df4242144d4438c3f9996a7b 100644
--- a/src/CLASS2/pair_lj_class2_coul_cut.cpp
+++ b/src/CLASS2/pair_lj_class2_coul_cut.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
 #include "pair_lj_class2_coul_cut.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/CLASS2/pair_lj_class2_coul_long.cpp b/src/CLASS2/pair_lj_class2_coul_long.cpp
index 9278703e2a4685898b97a4d0e1ebf3bca6a6b2ff..bf892bc894fd699a1d368a409b0c609bffef0134 100644
--- a/src/CLASS2/pair_lj_class2_coul_long.cpp
+++ b/src/CLASS2/pair_lj_class2_coul_long.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_class2_coul_long.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/COLLOID/fix_wall_colloid.cpp b/src/COLLOID/fix_wall_colloid.cpp
index 651e0da4f8e195f7f9abdec004acf44753ba2667..095d01eef3019b6a5735c93dfa5fb093feeca65d 100644
--- a/src/COLLOID/fix_wall_colloid.cpp
+++ b/src/COLLOID/fix_wall_colloid.cpp
@@ -15,8 +15,8 @@
    Contributing authors: Jeremy Lechman (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "fix_wall_colloid.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/COLLOID/pair_brownian.cpp b/src/COLLOID/pair_brownian.cpp
index 2bf01303b44aa1193d9e885fc3f49e8ec27f5463..e532c06c863f28eba94c5b93cd8a8ef01dd78a23 100644
--- a/src/COLLOID/pair_brownian.cpp
+++ b/src/COLLOID/pair_brownian.cpp
@@ -15,10 +15,10 @@
    Contributing authors: Amit Kumar and Michael Bybee (UIUC)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_brownian.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/COLLOID/pair_brownian_poly.cpp b/src/COLLOID/pair_brownian_poly.cpp
index 84c56109d13cbb6f788cd65135a8ca9a268ca853..c6d5def2fafd80be6e70052159ef9b6803effd74 100644
--- a/src/COLLOID/pair_brownian_poly.cpp
+++ b/src/COLLOID/pair_brownian_poly.cpp
@@ -16,10 +16,10 @@
                          Dave Heine (Corning), polydispersity
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_brownian_poly.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/COLLOID/pair_colloid.cpp b/src/COLLOID/pair_colloid.cpp
index 983b973e0e096e245d1b3eb9d3b1aae48888a165..4448d6e110ec8ca21840eab06258692e356ca650 100644
--- a/src/COLLOID/pair_colloid.cpp
+++ b/src/COLLOID/pair_colloid.cpp
@@ -15,10 +15,10 @@
    Contributing author: Pieter in 't Veld (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_colloid.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/COLLOID/pair_lubricate.cpp b/src/COLLOID/pair_lubricate.cpp
index 93cb48a15db6355f79d25264a9dd0bed35681101..5410a4c7731b493bd456f1a6e8658362a9ad6adf 100644
--- a/src/COLLOID/pair_lubricate.cpp
+++ b/src/COLLOID/pair_lubricate.cpp
@@ -16,10 +16,10 @@
                          Amit Kumar and Michael Bybee (UIUC)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lubricate.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/COLLOID/pair_lubricateU.cpp b/src/COLLOID/pair_lubricateU.cpp
index 5d0a4243a7fbb59e021dea3c9179146730c264c8..11fb2131577c6f32a20358fc9a769038d20e0075 100644
--- a/src/COLLOID/pair_lubricateU.cpp
+++ b/src/COLLOID/pair_lubricateU.cpp
@@ -16,10 +16,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lubricateU.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/COLLOID/pair_lubricateU_poly.cpp b/src/COLLOID/pair_lubricateU_poly.cpp
index 428aa41cb6f9c2000549db290f45d813d6805d45..90ac848d2653479a34bcf2850d214fe8340b5a14 100644
--- a/src/COLLOID/pair_lubricateU_poly.cpp
+++ b/src/COLLOID/pair_lubricateU_poly.cpp
@@ -18,10 +18,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lubricateU_poly.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/COLLOID/pair_lubricate_poly.cpp b/src/COLLOID/pair_lubricate_poly.cpp
index 2561ca3637317cfe1b640d070b866ece285566cd..0ed87c37be8834d051163d8da2666d5a860fdc19 100644
--- a/src/COLLOID/pair_lubricate_poly.cpp
+++ b/src/COLLOID/pair_lubricate_poly.cpp
@@ -17,10 +17,10 @@
                          Dave Heine (Corning), polydispersity
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lubricate_poly.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/COLLOID/pair_yukawa_colloid.cpp b/src/COLLOID/pair_yukawa_colloid.cpp
index 87fa7f542285d4285e7229a0b61a893ea4d50eb8..5965fd3aa86913824e3a21be449d607a89f87e83 100644
--- a/src/COLLOID/pair_yukawa_colloid.cpp
+++ b/src/COLLOID/pair_yukawa_colloid.cpp
@@ -15,8 +15,8 @@
    Contributing authors: Randy Schunk (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "pair_yukawa_colloid.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/COMPRESS/dump_atom_gz.cpp b/src/COMPRESS/dump_atom_gz.cpp
index dfd23e2b4a8bc17d859f62a276591ebd28cb925e..fb605b74cee56bae62e53ab4f0251f7e612d3aa1 100644
--- a/src/COMPRESS/dump_atom_gz.cpp
+++ b/src/COMPRESS/dump_atom_gz.cpp
@@ -16,7 +16,7 @@
 #include "error.h"
 #include "update.h"
 
-#include <string.h>
+#include <cstring>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/COMPRESS/dump_cfg_gz.cpp b/src/COMPRESS/dump_cfg_gz.cpp
index 6f653e73ee2dcf545994c4e95d72a72c48115dd8..a1ffa92ec859958c616a310c7705c088f35114c0 100644
--- a/src/COMPRESS/dump_cfg_gz.cpp
+++ b/src/COMPRESS/dump_cfg_gz.cpp
@@ -17,7 +17,7 @@
 #include "error.h"
 #include "update.h"
 
-#include <string.h>
+#include <cstring>
 
 using namespace LAMMPS_NS;
 #define UNWRAPEXPAND 10.0
diff --git a/src/COMPRESS/dump_custom_gz.cpp b/src/COMPRESS/dump_custom_gz.cpp
index 1905577a12bbc5ca50decffa659bb300d6068160..52d67445be0ca940fdafc3b08ef8ba9bb93c51ab 100644
--- a/src/COMPRESS/dump_custom_gz.cpp
+++ b/src/COMPRESS/dump_custom_gz.cpp
@@ -16,7 +16,7 @@
 #include "error.h"
 #include "update.h"
 
-#include <string.h>
+#include <cstring>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/COMPRESS/dump_xyz_gz.cpp b/src/COMPRESS/dump_xyz_gz.cpp
index 1a4474cba2929ff918777bf3de04c8326425befc..047ad8652f9587bdba8d306be030a357711ccc78 100644
--- a/src/COMPRESS/dump_xyz_gz.cpp
+++ b/src/COMPRESS/dump_xyz_gz.cpp
@@ -16,7 +16,7 @@
 #include "error.h"
 #include "update.h"
 
-#include <string.h>
+#include <cstring>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/CORESHELL/compute_temp_cs.cpp b/src/CORESHELL/compute_temp_cs.cpp
index d2345684dc61ff6dbb17c49286a77f9daf939a27..03ebfa154d5e2bf78dd6c0e731f5a6f4e2e92a8f 100644
--- a/src/CORESHELL/compute_temp_cs.cpp
+++ b/src/CORESHELL/compute_temp_cs.cpp
@@ -17,9 +17,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
 #include "compute_temp_cs.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/CORESHELL/pair_born_coul_dsf_cs.cpp b/src/CORESHELL/pair_born_coul_dsf_cs.cpp
index 4a5c9da07e0256f4c11ee44c7868b3785045e6a6..549c7c03481c6c4481085fe0a414780291687302 100644
--- a/src/CORESHELL/pair_born_coul_dsf_cs.cpp
+++ b/src/CORESHELL/pair_born_coul_dsf_cs.cpp
@@ -16,10 +16,10 @@
    References: Fennell and Gezelter, JCP 124, 234104 (2006)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_born_coul_dsf_cs.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/CORESHELL/pair_born_coul_long_cs.cpp b/src/CORESHELL/pair_born_coul_long_cs.cpp
index 7d0d9c9416a4ad46ded5be36dbbaadd6a474ab38..76f6eb387df5f2df2ca8e7b4f3c05afc3ae78574 100644
--- a/src/CORESHELL/pair_born_coul_long_cs.cpp
+++ b/src/CORESHELL/pair_born_coul_long_cs.cpp
@@ -15,10 +15,10 @@
    Contributing author: Hendrik Heenen (hendrik.heenen@mytum.de)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_born_coul_long_cs.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/CORESHELL/pair_born_coul_wolf_cs.cpp b/src/CORESHELL/pair_born_coul_wolf_cs.cpp
index f39e2ca81631b7ce85ce8b70b4649c1fcaf34f07..84179ce50ab7a8d20e27042480ccade65d331dd3 100644
--- a/src/CORESHELL/pair_born_coul_wolf_cs.cpp
+++ b/src/CORESHELL/pair_born_coul_wolf_cs.cpp
@@ -12,10 +12,10 @@
 ------------------------------------------------------------------------- */
 
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_born_coul_wolf_cs.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/CORESHELL/pair_buck_coul_long_cs.cpp b/src/CORESHELL/pair_buck_coul_long_cs.cpp
index 822ec1049725ac2d2470b653ec9e68adc178702a..ea072d44a13d8a88fbc80e31f6339fdbe37e538d 100644
--- a/src/CORESHELL/pair_buck_coul_long_cs.cpp
+++ b/src/CORESHELL/pair_buck_coul_long_cs.cpp
@@ -15,10 +15,10 @@
    Contributing author: Hendrik Heenen (hendrik.heenen@mytum.de)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_buck_coul_long_cs.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/CORESHELL/pair_coul_long_cs.cpp b/src/CORESHELL/pair_coul_long_cs.cpp
index 9177e9a0613ce7b61f3028fbad65d7076861664e..b21465384199c5a58a8fa3c03a700c29faadef17 100644
--- a/src/CORESHELL/pair_coul_long_cs.cpp
+++ b/src/CORESHELL/pair_coul_long_cs.cpp
@@ -15,10 +15,10 @@
    Contributing author: Hendrik Heenen (hendrik.heenen@mytum.de)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_long_cs.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/CORESHELL/pair_coul_wolf_cs.cpp b/src/CORESHELL/pair_coul_wolf_cs.cpp
index 5f277dcdd2e49e8b8bb37b639c4c9109c624388e..b50f14833e9664552022c3d54d36c4e2f953cc28 100644
--- a/src/CORESHELL/pair_coul_wolf_cs.cpp
+++ b/src/CORESHELL/pair_coul_wolf_cs.cpp
@@ -12,10 +12,10 @@
 ------------------------------------------------------------------------- */
 
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_wolf_cs.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/CORESHELL/pair_lj_cut_coul_long_cs.cpp b/src/CORESHELL/pair_lj_cut_coul_long_cs.cpp
index c660eee3bc19569578aae1aa5e661d2ca301d2cd..8caefc0e66096283ca363c207a6290bfcea5183d 100644
--- a/src/CORESHELL/pair_lj_cut_coul_long_cs.cpp
+++ b/src/CORESHELL/pair_lj_cut_coul_long_cs.cpp
@@ -15,10 +15,10 @@
    Contributing author: Hendrik Heenen (hendrik.heenen@mytum.de)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_coul_long_cs.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/DIPOLE/atom_vec_dipole.cpp b/src/DIPOLE/atom_vec_dipole.cpp
index 5d69f03376b976fee756534660b8510bbe03162c..c304ae3bc660598eb421e2d67c4af4400886ec55 100644
--- a/src/DIPOLE/atom_vec_dipole.cpp
+++ b/src/DIPOLE/atom_vec_dipole.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "atom_vec_dipole.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/DIPOLE/pair_lj_cut_dipole_cut.cpp b/src/DIPOLE/pair_lj_cut_dipole_cut.cpp
index af987bf2585f962d6c18f8fec4acd7306210cc8f..6af9b457246fb0bc446dfcc37ef1449806b745da 100644
--- a/src/DIPOLE/pair_lj_cut_dipole_cut.cpp
+++ b/src/DIPOLE/pair_lj_cut_dipole_cut.cpp
@@ -11,8 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_dipole_cut.h"
 #include "atom.h"
 #include "neighbor.h"
@@ -22,7 +23,6 @@
 #include "memory.h"
 #include "error.h"
 #include "update.h"
-#include <string.h>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/DIPOLE/pair_lj_cut_dipole_long.cpp b/src/DIPOLE/pair_lj_cut_dipole_long.cpp
index 63f48bea8116b026b29af9dee1d74d2726f21c08..817a120e3d084b9301095d2364e8402586a04b57 100644
--- a/src/DIPOLE/pair_lj_cut_dipole_long.cpp
+++ b/src/DIPOLE/pair_lj_cut_dipole_long.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_dipole_long.h"
 #include "atom.h"
 #include "comm.h"
@@ -26,7 +26,6 @@
 #include "memory.h"
 #include "error.h"
 #include "update.h"
-#include <string.h>
 
 
 using namespace LAMMPS_NS;
diff --git a/src/DIPOLE/pair_lj_long_dipole_long.cpp b/src/DIPOLE/pair_lj_long_dipole_long.cpp
index 262727c5b600de8d2554a4a3ab9e673bf6137f2b..1635bd4f636f33d3b4f678aef45a4d2b4727fe2f 100644
--- a/src/DIPOLE/pair_lj_long_dipole_long.cpp
+++ b/src/DIPOLE/pair_lj_long_dipole_long.cpp
@@ -15,10 +15,10 @@
    Contributing author: Pieter J. in 't Veld and Stan Moore (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "math_const.h"
 #include "math_vector.h"
 #include "pair_lj_long_dipole_long.h"
diff --git a/src/GPU/fix_gpu.cpp b/src/GPU/fix_gpu.cpp
index 87db73bd12d64bd792d684d3903c9b713f642b48..268a7410329176672eee4a6e8ca8a3428b77aa50 100644
--- a/src/GPU/fix_gpu.cpp
+++ b/src/GPU/fix_gpu.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "fix_gpu.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/GPU/pair_beck_gpu.cpp b/src/GPU/pair_beck_gpu.cpp
index c81318664086f895c7665d7bece4e25cd0ec40f8..f929dd437f8b808f4551850446ba7027b3d55799 100644
--- a/src/GPU/pair_beck_gpu.cpp
+++ b/src/GPU/pair_beck_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_beck_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 #include "math_special.h"
 
diff --git a/src/GPU/pair_born_coul_long_gpu.cpp b/src/GPU/pair_born_coul_long_gpu.cpp
index b6a7e57038f6c217233768c265b513c124539f65..c3c3fee40c804314cb982db435a86731f2cb03f2 100644
--- a/src/GPU/pair_born_coul_long_gpu.cpp
+++ b/src/GPU/pair_born_coul_long_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_born_coul_long_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -33,7 +34,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "kspace.h"
 #include "gpu_extra.h"
 
diff --git a/src/GPU/pair_born_coul_wolf_gpu.cpp b/src/GPU/pair_born_coul_wolf_gpu.cpp
index 931252be6bf92693a548fc9bc73aefb37d9a2ad7..df1922d76a00968b83490a639489faefb127b665 100644
--- a/src/GPU/pair_born_coul_wolf_gpu.cpp
+++ b/src/GPU/pair_born_coul_wolf_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing authors: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_born_coul_wolf_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -33,7 +34,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_born_gpu.cpp b/src/GPU/pair_born_gpu.cpp
index 46729ab77c577059c256d4ce7200079d4bf7fb54..92a7a85997fcaa6609e1f40a553accd0361affb8 100644
--- a/src/GPU/pair_born_gpu.cpp
+++ b/src/GPU/pair_born_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_born_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_buck_coul_cut_gpu.cpp b/src/GPU/pair_buck_coul_cut_gpu.cpp
index e74020dd3a61f653cdaf008987480f1033cf2da7..6396e301e3f56e0fddcd040a4520b345bd34098f 100644
--- a/src/GPU/pair_buck_coul_cut_gpu.cpp
+++ b/src/GPU/pair_buck_coul_cut_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing authors: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_buck_coul_cut_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_buck_coul_long_gpu.cpp b/src/GPU/pair_buck_coul_long_gpu.cpp
index c2a37fc3dc5fef8859aab5f8f2e84db58afdde23..73821cee8aaf826ac341655a2c48518bf9b0507f 100644
--- a/src/GPU/pair_buck_coul_long_gpu.cpp
+++ b/src/GPU/pair_buck_coul_long_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_buck_coul_long_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "kspace.h"
 #include "gpu_extra.h"
 
diff --git a/src/GPU/pair_buck_gpu.cpp b/src/GPU/pair_buck_gpu.cpp
index 1e9b838ec805301151c0f7fa892fa6f0bf4aded4..20302e4f1a14246b4e76037af59791cd380bd5c2 100644
--- a/src/GPU/pair_buck_gpu.cpp
+++ b/src/GPU/pair_buck_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_buck_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_colloid_gpu.cpp b/src/GPU/pair_colloid_gpu.cpp
index d4e8224238375a1fd0b432a522c57c9370d48b9e..7bbac32ed3c287c13785fa31db863d48b33285ba 100644
--- a/src/GPU/pair_colloid_gpu.cpp
+++ b/src/GPU/pair_colloid_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_colloid_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_coul_cut_gpu.cpp b/src/GPU/pair_coul_cut_gpu.cpp
index c66a0a8ef4b3891f82e96ad867d0382b4684cd7e..d5d9b10abba4d1a676cfcb804d2aaadafc9c80cc 100644
--- a/src/GPU/pair_coul_cut_gpu.cpp
+++ b/src/GPU/pair_coul_cut_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_cut_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_coul_debye_gpu.cpp b/src/GPU/pair_coul_debye_gpu.cpp
index 2b5d608fc7f142d84270deae65e7cefc54e11f76..9fd28bf9c5f01863c6a6e28c999b5f4b9e2da97c 100644
--- a/src/GPU/pair_coul_debye_gpu.cpp
+++ b/src/GPU/pair_coul_debye_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ndtrung@umich.edu)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_debye_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_coul_dsf_gpu.cpp b/src/GPU/pair_coul_dsf_gpu.cpp
index d2d060281c23eeaf36f5fecae7ae5baecc7db906..75168c3cd96d3c2538d78e64de00d5a0dbb06206 100644
--- a/src/GPU/pair_coul_dsf_gpu.cpp
+++ b/src/GPU/pair_coul_dsf_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_dsf_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 #define MY_PIS 1.77245385090551602729
diff --git a/src/GPU/pair_coul_long_gpu.cpp b/src/GPU/pair_coul_long_gpu.cpp
index 465d82232f54da2ad4b5687a2c548530652764d0..2f12e41b0cc6af68cfe0a792357c88b9c19c3b87 100644
--- a/src/GPU/pair_coul_long_gpu.cpp
+++ b/src/GPU/pair_coul_long_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Axel Kohlmeyer (Temple)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_long_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "kspace.h"
 #include "gpu_extra.h"
 
diff --git a/src/GPU/pair_dpd_gpu.cpp b/src/GPU/pair_dpd_gpu.cpp
index c82ed97485851fada7d1f71ab12c21c880d44664..293a82ffa9eaddd5aaf0dde87e468f35bcea0531 100644
--- a/src/GPU/pair_dpd_gpu.cpp
+++ b/src/GPU/pair_dpd_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_dpd_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -33,7 +34,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_dpd_tstat_gpu.cpp b/src/GPU/pair_dpd_tstat_gpu.cpp
index e051a13a0b2f947570d803a25bb584d69a5bb3f0..bf02570f439dbd8f06b786d5b89d112f2dceac06 100644
--- a/src/GPU/pair_dpd_tstat_gpu.cpp
+++ b/src/GPU/pair_dpd_tstat_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_dpd_tstat_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -33,7 +34,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_eam_alloy_gpu.cpp b/src/GPU/pair_eam_alloy_gpu.cpp
index 9b42b0a14fab56b44652942973fd122a7fe113da..3a8e440bdc0c88164e3e3f8c3ea17def4659bb4e 100644
--- a/src/GPU/pair_eam_alloy_gpu.cpp
+++ b/src/GPU/pair_eam_alloy_gpu.cpp
@@ -15,9 +15,9 @@
    Contributing authors: Trung Dac Nguyen (ORNL), W. Michael Brown (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_eam_alloy_gpu.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/GPU/pair_eam_fs_gpu.cpp b/src/GPU/pair_eam_fs_gpu.cpp
index c29b49631ce210121df7479b3fc60867bca31438..51681d563bc94894015219bb7d3dd5a69fbc436a 100644
--- a/src/GPU/pair_eam_fs_gpu.cpp
+++ b/src/GPU/pair_eam_fs_gpu.cpp
@@ -15,9 +15,9 @@
    Contributing authors: Trung Dac Nguyen (ORNL), W. Michael Brown (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_eam_fs_gpu.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/GPU/pair_eam_gpu.cpp b/src/GPU/pair_eam_gpu.cpp
index ea75ff8ca843637285083729e015f637063a3784..e2eb9dacedd2c5d7c95e9cbe029b4bb14dc4bc74 100644
--- a/src/GPU/pair_eam_gpu.cpp
+++ b/src/GPU/pair_eam_gpu.cpp
@@ -15,10 +15,10 @@
    Contributing authors: Trung Dac Nguyen (ORNL), W. Michael Brown (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_eam_gpu.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/GPU/pair_eam_gpu.h b/src/GPU/pair_eam_gpu.h
index 2c4731d9cf105b93a118756c4b62ee9062391b03..099529f3df90c766d0385dcb0319294b6f28c4b4 100644
--- a/src/GPU/pair_eam_gpu.h
+++ b/src/GPU/pair_eam_gpu.h
@@ -20,7 +20,7 @@ PairStyle(eam/gpu,PairEAMGPU)
 #ifndef LMP_PAIR_EAM_GPU_H
 #define LMP_PAIR_EAM_GPU_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pair_eam.h"
 
 namespace LAMMPS_NS {
diff --git a/src/GPU/pair_gauss_gpu.cpp b/src/GPU/pair_gauss_gpu.cpp
index 01cc63a9f9a49c378b7318cb36b9b6143269d853..f99a10a6809e5abbce5504dc2705650a3347ec7e 100644
--- a/src/GPU/pair_gauss_gpu.cpp
+++ b/src/GPU/pair_gauss_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_gauss_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_gayberne_gpu.cpp b/src/GPU/pair_gayberne_gpu.cpp
index aae8fb2b7118e593edcf495e52229bfbfe5e4f8b..8bd5eb073fd6f18e9f6f4b4b7ce67539bf38fd53 100644
--- a/src/GPU/pair_gayberne_gpu.cpp
+++ b/src/GPU/pair_gayberne_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_gayberne_gpu.h"
 #include "math_extra.h"
 #include "atom.h"
@@ -34,7 +35,6 @@
 #include "universe.h"
 #include "domain.h"
 #include "update.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_lj96_cut_gpu.cpp b/src/GPU/pair_lj96_cut_gpu.cpp
index 813daa4da24f33c4cf535146cd03a3d941fa866b..800f13ef60f3157eb55b08269f321abecce7228d 100644
--- a/src/GPU/pair_lj96_cut_gpu.cpp
+++ b/src/GPU/pair_lj96_cut_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj96_cut_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_lj_charmm_coul_long_gpu.cpp b/src/GPU/pair_lj_charmm_coul_long_gpu.cpp
index b951567f45db68eb2a1699dfc4696bfcd6463e52..8c806053d4f2fb71a34047d1277c9bbd5956ec4b 100644
--- a/src/GPU/pair_lj_charmm_coul_long_gpu.cpp
+++ b/src/GPU/pair_lj_charmm_coul_long_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_charmm_coul_long_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "kspace.h"
 #include "gpu_extra.h"
 
diff --git a/src/GPU/pair_lj_class2_coul_long_gpu.cpp b/src/GPU/pair_lj_class2_coul_long_gpu.cpp
index f7c874cb65e7ed50aa385be7da882e906acde79c..214ff306db0d8ac22903357f2bf20ac324963d6a 100644
--- a/src/GPU/pair_lj_class2_coul_long_gpu.cpp
+++ b/src/GPU/pair_lj_class2_coul_long_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_class2_coul_long_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "kspace.h"
 #include "gpu_extra.h"
 
diff --git a/src/GPU/pair_lj_class2_gpu.cpp b/src/GPU/pair_lj_class2_gpu.cpp
index cc6866db1ca7a07bb79e05e1a5396db7211c5d97..61b0a8caf134695d96be363a4e90ed93396bfc5e 100644
--- a/src/GPU/pair_lj_class2_gpu.cpp
+++ b/src/GPU/pair_lj_class2_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_class2_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_lj_cubic_gpu.cpp b/src/GPU/pair_lj_cubic_gpu.cpp
index 516ac7d15432abfd7f3cd5d4fcb4bd774beb5153..366c33191b4f249afde0e133356783b3bac5d991 100644
--- a/src/GPU/pair_lj_cubic_gpu.cpp
+++ b/src/GPU/pair_lj_cubic_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ndactrung@gmail.com)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cubic_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_lj_cut_coul_cut_gpu.cpp b/src/GPU/pair_lj_cut_coul_cut_gpu.cpp
index 840c07680f44a450a7beb240a1ec50223f64dfe2..baafcd2d62f936b8bc370ba96e99f8b1fd7ce4a3 100644
--- a/src/GPU/pair_lj_cut_coul_cut_gpu.cpp
+++ b/src/GPU/pair_lj_cut_coul_cut_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_coul_cut_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_lj_cut_coul_debye_gpu.cpp b/src/GPU/pair_lj_cut_coul_debye_gpu.cpp
index 39108d8558f1bd5dca8549e1c7de5c979fc1ebd6..662375da2c6c6dc77872518f4a623e47133d2ec9 100644
--- a/src/GPU/pair_lj_cut_coul_debye_gpu.cpp
+++ b/src/GPU/pair_lj_cut_coul_debye_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_coul_debye_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_lj_cut_coul_dsf_gpu.cpp b/src/GPU/pair_lj_cut_coul_dsf_gpu.cpp
index efca1a2c511d0ea45f521d2975a7337e603e7ec6..c8e68140a1a520c8efd3fe6b371d5833756faa04 100644
--- a/src/GPU/pair_lj_cut_coul_dsf_gpu.cpp
+++ b/src/GPU/pair_lj_cut_coul_dsf_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_coul_dsf_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 #define MY_PIS 1.77245385090551602729
diff --git a/src/GPU/pair_lj_cut_coul_long_gpu.cpp b/src/GPU/pair_lj_cut_coul_long_gpu.cpp
index 0c09cb1d51a39beb952f85c4a29950d077df56f6..3cccb898cc4d57e6c5b565ca47f6dcdd77e4486a 100644
--- a/src/GPU/pair_lj_cut_coul_long_gpu.cpp
+++ b/src/GPU/pair_lj_cut_coul_long_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_coul_long_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "kspace.h"
 #include "gpu_extra.h"
 
diff --git a/src/GPU/pair_lj_cut_coul_msm_gpu.cpp b/src/GPU/pair_lj_cut_coul_msm_gpu.cpp
index 7d8be01e814398c630b4564ae44c79d0d469812a..04ffe245b24756dba88990345c625fa09b23b2f3 100644
--- a/src/GPU/pair_lj_cut_coul_msm_gpu.cpp
+++ b/src/GPU/pair_lj_cut_coul_msm_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_coul_msm_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -33,7 +34,6 @@
 #include "update.h"
 #include "domain.h"
 #include "kspace.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_lj_cut_dipole_cut_gpu.cpp b/src/GPU/pair_lj_cut_dipole_cut_gpu.cpp
index 3b5f0c12830543ffa77f8914d063b92d4aa55ab9..1f4528cb88e4a73864553ed57506960595f8697d 100644
--- a/src/GPU/pair_lj_cut_dipole_cut_gpu.cpp
+++ b/src/GPU/pair_lj_cut_dipole_cut_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_dipole_cut_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_lj_cut_gpu.cpp b/src/GPU/pair_lj_cut_gpu.cpp
index feba9ed88bb20a81e7ff3b016c36b636d8c4b388..af654bcc5dd0b09c90b0ac126b534d0f76d83aad 100644
--- a/src/GPU/pair_lj_cut_gpu.cpp
+++ b/src/GPU/pair_lj_cut_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_lj_expand_gpu.cpp b/src/GPU/pair_lj_expand_gpu.cpp
index 43ec1ec45a0dc2ba63ba8b2b49d5755aaf711bcc..f0a9f67b10f3d1b4ee85163f66781871d24b96c3 100644
--- a/src/GPU/pair_lj_expand_gpu.cpp
+++ b/src/GPU/pair_lj_expand_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Inderaj Bains (NVIDIA), ibains@nvidia.com
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_expand_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_lj_gromacs_gpu.cpp b/src/GPU/pair_lj_gromacs_gpu.cpp
index d749eacba3301f07c8589d8968f586e625364e45..f2006798291751e5188406ec16e8e3f071844eac 100644
--- a/src/GPU/pair_lj_gromacs_gpu.cpp
+++ b/src/GPU/pair_lj_gromacs_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_gromacs_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "kspace.h"
 #include "gpu_extra.h"
 
diff --git a/src/GPU/pair_lj_sdk_coul_long_gpu.cpp b/src/GPU/pair_lj_sdk_coul_long_gpu.cpp
index 77c0dc06601887f0d3451c9c3cd49480bb11e218..4dbd8874d65751c50da0398776f96389d7043860 100644
--- a/src/GPU/pair_lj_sdk_coul_long_gpu.cpp
+++ b/src/GPU/pair_lj_sdk_coul_long_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_sdk_coul_long_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "kspace.h"
 #include "gpu_extra.h"
 
diff --git a/src/GPU/pair_lj_sdk_gpu.cpp b/src/GPU/pair_lj_sdk_gpu.cpp
index 67103181d53a852325a7c5ee8411fbb037695f52..84d224a8c4caca209b43828e2f9c8ab6ae4ddd03 100644
--- a/src/GPU/pair_lj_sdk_gpu.cpp
+++ b/src/GPU/pair_lj_sdk_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_sdk_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_lj_sf_dipole_sf_gpu.cpp b/src/GPU/pair_lj_sf_dipole_sf_gpu.cpp
index 5b22bebf7f357b0de570d8d15c29d821ddbab3a4..a5ebb1dbc1774234aacade666c565889b686f9ff 100644
--- a/src/GPU/pair_lj_sf_dipole_sf_gpu.cpp
+++ b/src/GPU/pair_lj_sf_dipole_sf_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_sf_dipole_sf_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_mie_cut_gpu.cpp b/src/GPU/pair_mie_cut_gpu.cpp
index 4857928a27c3d5b1d7aa23eb797669c341f81528..5919b054668e58b9c5dc497735207a0d4d335855 100644
--- a/src/GPU/pair_mie_cut_gpu.cpp
+++ b/src/GPU/pair_mie_cut_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_mie_cut_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_morse_gpu.cpp b/src/GPU/pair_morse_gpu.cpp
index b72a6afaf4c72fcdf98b0dab1759e8bbe2cf2760..81ea7c818ae9fbfa625d5538e8e2860c14c30f70 100644
--- a/src/GPU/pair_morse_gpu.cpp
+++ b/src/GPU/pair_morse_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_morse_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_resquared_gpu.cpp b/src/GPU/pair_resquared_gpu.cpp
index d83a63c467115af4b1df7427c5430715b85c98b1..34bd0ec22feb2f03c904330f50a5194ff7157ce2 100644
--- a/src/GPU/pair_resquared_gpu.cpp
+++ b/src/GPU/pair_resquared_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_resquared_gpu.h"
 #include "math_extra.h"
 #include "atom.h"
@@ -34,7 +35,6 @@
 #include "universe.h"
 #include "domain.h"
 #include "update.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_soft_gpu.cpp b/src/GPU/pair_soft_gpu.cpp
index aa0268025c186100f0c6255e8a9efb336965c7a3..cc0ea7263353de6d62918d7ed3bb35657143a0d9 100644
--- a/src/GPU/pair_soft_gpu.cpp
+++ b/src/GPU/pair_soft_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_soft_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 #include "math_const.h"
 
diff --git a/src/GPU/pair_sw_gpu.cpp b/src/GPU/pair_sw_gpu.cpp
index d2d21a131a2659d62a9336076e97ade12b318d78..5368bee95904ffd1cf805bfcc5936d4846b028f9 100644
--- a/src/GPU/pair_sw_gpu.cpp
+++ b/src/GPU/pair_sw_gpu.cpp
@@ -15,10 +15,10 @@
    Contributing author: Mike Brown (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_sw_gpu.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/GPU/pair_table_gpu.cpp b/src/GPU/pair_table_gpu.cpp
index b0a38eb461e1a2826ada524a7ea70aaaf59b9567..c5aef996db4bbee0af580e9348fa1b4b0e69b20c 100644
--- a/src/GPU/pair_table_gpu.cpp
+++ b/src/GPU/pair_table_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing authors: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_table_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 #define LOOKUP 0
diff --git a/src/GPU/pair_tersoff_gpu.cpp b/src/GPU/pair_tersoff_gpu.cpp
index 41d8e6b75145390a1e115fe844131393240a6054..535b56163ea2036e326f453cfcac254f139bad0d 100644
--- a/src/GPU/pair_tersoff_gpu.cpp
+++ b/src/GPU/pair_tersoff_gpu.cpp
@@ -15,10 +15,10 @@
    Contributing author: Trung Dac Nguyen (ndactrung@gmail.com)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_tersoff_gpu.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/GPU/pair_tersoff_mod_gpu.cpp b/src/GPU/pair_tersoff_mod_gpu.cpp
index 25ea2cb99f95f6514da5d721cdae9777ea5912ba..f8b6c50db5620853641d9bce6caad90df3b4f6b2 100644
--- a/src/GPU/pair_tersoff_mod_gpu.cpp
+++ b/src/GPU/pair_tersoff_mod_gpu.cpp
@@ -15,10 +15,10 @@
    Contributing author: Trung Dac Nguyen (ndactrung@gmail.com)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_tersoff_mod_gpu.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/GPU/pair_tersoff_zbl_gpu.cpp b/src/GPU/pair_tersoff_zbl_gpu.cpp
index b4b679b7d03e5a28722bab02180d8c981b9421aa..b45503d759e47931137e5892352c279d902fa197 100644
--- a/src/GPU/pair_tersoff_zbl_gpu.cpp
+++ b/src/GPU/pair_tersoff_zbl_gpu.cpp
@@ -15,10 +15,10 @@
    Contributing author: Trung Dac Nguyen (ndactrung@gmail.com)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_tersoff_zbl_gpu.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/GPU/pair_ufm_gpu.cpp b/src/GPU/pair_ufm_gpu.cpp
index ad66c3871fa5a2a03820ce60e344f1c222294655..40e8df33239bfeaeb2db9be4f7b63e416001971d 100644
--- a/src/GPU/pair_ufm_gpu.cpp
+++ b/src/GPU/pair_ufm_gpu.cpp
@@ -17,9 +17,10 @@
             Maurice de Koning (Unicamp/Brazil) - dekoning@ifi.unicamp.br
  ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_ufm_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -34,7 +35,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_vashishta_gpu.cpp b/src/GPU/pair_vashishta_gpu.cpp
index 7d21aaa581763d7da631cebf1dbb42cfbce8f098..00dbac5f1eac4942e9ccc4624047dd138c04dc3e 100644
--- a/src/GPU/pair_vashishta_gpu.cpp
+++ b/src/GPU/pair_vashishta_gpu.cpp
@@ -15,10 +15,10 @@
    Contributing author: Anders Hafreager (UiO)
 ------------------------------------------------------------------------- */
 #include <limits>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_vashishta_gpu.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/GPU/pair_yukawa_colloid_gpu.cpp b/src/GPU/pair_yukawa_colloid_gpu.cpp
index 4041bd2ebfb19e53343535e02a5f460f4862f5d7..0332e5f755f491bc34de0645d22994907306d8a3 100644
--- a/src/GPU/pair_yukawa_colloid_gpu.cpp
+++ b/src/GPU/pair_yukawa_colloid_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_yukawa_colloid_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_yukawa_gpu.cpp b/src/GPU/pair_yukawa_gpu.cpp
index fcb0ae56bcc6376e62b77d9f80b1137ac4f5dd19..dda4250f0702ca71daba67519ad5dd22fcb3dec4 100644
--- a/src/GPU/pair_yukawa_gpu.cpp
+++ b/src/GPU/pair_yukawa_gpu.cpp
@@ -15,9 +15,10 @@
    Contributing author: Trung Dac Nguyen (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_yukawa_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -32,7 +33,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pair_zbl_gpu.cpp b/src/GPU/pair_zbl_gpu.cpp
index f1f6bdd44bcdb2e8ad12a03ca21c5c3fe273de48..daca79c8e3454d812cf684365bd18db79b22387e 100644
--- a/src/GPU/pair_zbl_gpu.cpp
+++ b/src/GPU/pair_zbl_gpu.cpp
@@ -16,9 +16,10 @@
 ------------------------------------------------------------------------- */
 
 #include "lmptype.h"
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_zbl_gpu.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -33,7 +34,6 @@
 #include "universe.h"
 #include "update.h"
 #include "domain.h"
-#include <string.h>
 #include "gpu_extra.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/GPU/pppm_gpu.cpp b/src/GPU/pppm_gpu.cpp
index b2b529f7ef1183494439c23c0c932ee11105bd2e..1f7c4239f8d5fff7793663440d460d536493d3bd 100644
--- a/src/GPU/pppm_gpu.cpp
+++ b/src/GPU/pppm_gpu.cpp
@@ -16,10 +16,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 #include "pppm_gpu.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/GRANULAR/fix_freeze.cpp b/src/GRANULAR/fix_freeze.cpp
index 3cfee675b26ec51f07d01f6e2a87f86f499a70ea..0f581be01c4718b52e6fa9b686329c2c26fc34b4 100644
--- a/src/GRANULAR/fix_freeze.cpp
+++ b/src/GRANULAR/fix_freeze.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_freeze.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/GRANULAR/fix_pour.cpp b/src/GRANULAR/fix_pour.cpp
index c4e03a24a97609d6dffd22e43a72f3aea8b5b0f9..835d6c42ddd49aff7d3d24c07b9729ac3b6060ac 100644
--- a/src/GRANULAR/fix_pour.cpp
+++ b/src/GRANULAR/fix_pour.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_pour.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/GRANULAR/fix_wall_gran.cpp b/src/GRANULAR/fix_wall_gran.cpp
index 033c35dbacc0e96bb910cd1c3e6b2fa261eb815a..368ff99fb75929303f85b7a2bf8ffaaacc3a37ed 100644
--- a/src/GRANULAR/fix_wall_gran.cpp
+++ b/src/GRANULAR/fix_wall_gran.cpp
@@ -16,9 +16,9 @@
                          Dan Bolintineanu (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_wall_gran.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/GRANULAR/fix_wall_gran_region.cpp b/src/GRANULAR/fix_wall_gran_region.cpp
index d1c5d4c9c771f8a73bd0d95165ee362976f50509..12fa25714ccbbf8447cbda043ee8ba00d0d66c14 100644
--- a/src/GRANULAR/fix_wall_gran_region.cpp
+++ b/src/GRANULAR/fix_wall_gran_region.cpp
@@ -15,9 +15,9 @@
    Contributing authors: Dan Bolintineanu (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_wall_gran_region.h"
 #include "region.h"
 #include "atom.h"
diff --git a/src/GRANULAR/pair_gran_hertz_history.cpp b/src/GRANULAR/pair_gran_hertz_history.cpp
index 9723531625fdf44b81fa727538a394f9f24a157e..9d4f5c1a9b8a703d4dd83600e84186a6f140f5fe 100644
--- a/src/GRANULAR/pair_gran_hertz_history.cpp
+++ b/src/GRANULAR/pair_gran_hertz_history.cpp
@@ -15,10 +15,10 @@
    Contributing authors: Leo Silbert (SNL), Gary Grest (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 #include "pair_gran_hertz_history.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/GRANULAR/pair_gran_hooke.cpp b/src/GRANULAR/pair_gran_hooke.cpp
index 66e1c3dd7a8bc09a2b8649e388fce6ff832b0cdd..4937c2fe8b1142816d20c03f8548b208b594a860 100644
--- a/src/GRANULAR/pair_gran_hooke.cpp
+++ b/src/GRANULAR/pair_gran_hooke.cpp
@@ -15,9 +15,9 @@
    Contributing authors: Leo Silbert (SNL), Gary Grest (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include "pair_gran_hooke.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/GRANULAR/pair_gran_hooke_history.cpp b/src/GRANULAR/pair_gran_hooke_history.cpp
index 4f120150ded77ccfdaf5e839f2b5cc68a39ddfd7..d70c7391e2ba896961640895ce98e07acc6a0cd5 100644
--- a/src/GRANULAR/pair_gran_hooke_history.cpp
+++ b/src/GRANULAR/pair_gran_hooke_history.cpp
@@ -15,10 +15,10 @@
    Contributing authors: Leo Silbert (SNL), Gary Grest (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_gran_hooke_history.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/KOKKOS/angle_charmm_kokkos.cpp b/src/KOKKOS/angle_charmm_kokkos.cpp
index f048738489ea8efd7ce749c5477fdf1a391b3f6f..4a81f4f49436817027af36c6be411749d6a57a75 100644
--- a/src/KOKKOS/angle_charmm_kokkos.cpp
+++ b/src/KOKKOS/angle_charmm_kokkos.cpp
@@ -15,8 +15,8 @@
    Contributing author: Stan Moore (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_charmm_kokkos.h"
 #include "atom_kokkos.h"
 #include "neighbor_kokkos.h"
diff --git a/src/KOKKOS/angle_class2_kokkos.cpp b/src/KOKKOS/angle_class2_kokkos.cpp
index 670cfa152d44ac7fe3b8e1e121d42354bf1bcd8b..870603791bd657d5d6e7157ae77bdd1002705c79 100644
--- a/src/KOKKOS/angle_class2_kokkos.cpp
+++ b/src/KOKKOS/angle_class2_kokkos.cpp
@@ -15,8 +15,8 @@
    Contributing author: Ray Shan (Materials Design)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_class2_kokkos.h"
 #include "atom_kokkos.h"
 #include "neighbor_kokkos.h"
diff --git a/src/KOKKOS/angle_harmonic_kokkos.cpp b/src/KOKKOS/angle_harmonic_kokkos.cpp
index dd5a1e26c7c55d135a5e37a0619dace64b49dbb1..d8e5659e1efd9103c512163d9cd3c88868c84238 100644
--- a/src/KOKKOS/angle_harmonic_kokkos.cpp
+++ b/src/KOKKOS/angle_harmonic_kokkos.cpp
@@ -15,8 +15,8 @@
    Contributing author: Stan Moore (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_harmonic_kokkos.h"
 #include "atom_kokkos.h"
 #include "neighbor_kokkos.h"
diff --git a/src/KOKKOS/atom_vec_angle_kokkos.cpp b/src/KOKKOS/atom_vec_angle_kokkos.cpp
index 8ff6d721a8a7b1fd4a8b06fdd7f534d0720530eb..352fec57fbbbff1c2510cabb0dda4aed7dc5082c 100644
--- a/src/KOKKOS/atom_vec_angle_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_angle_kokkos.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "atom_vec_angle_kokkos.h"
 #include "atom_kokkos.h"
 #include "comm_kokkos.h"
diff --git a/src/KOKKOS/atom_vec_atomic_kokkos.cpp b/src/KOKKOS/atom_vec_atomic_kokkos.cpp
index 0b96d8dbadc98f8fcf3559e21464d6102b8af088..6aba49e5f3a5b9689b19ce109c5a2534d44c8fd8 100644
--- a/src/KOKKOS/atom_vec_atomic_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_atomic_kokkos.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "atom_vec_atomic_kokkos.h"
 #include "atom_kokkos.h"
 #include "comm_kokkos.h"
diff --git a/src/KOKKOS/atom_vec_bond_kokkos.cpp b/src/KOKKOS/atom_vec_bond_kokkos.cpp
index adad4f767bb1d2e9a55021c32a71c3bb0b450d24..c884d23880504c533d7b9d545898a6a319c93149 100644
--- a/src/KOKKOS/atom_vec_bond_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_bond_kokkos.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "atom_vec_bond_kokkos.h"
 #include "atom_kokkos.h"
 #include "comm_kokkos.h"
diff --git a/src/KOKKOS/atom_vec_charge_kokkos.cpp b/src/KOKKOS/atom_vec_charge_kokkos.cpp
index 3e50870c8f9db9a399355ef60724d6ac85f41ee2..11e46d1274165b4b58e509deb545dfc7848bf42a 100644
--- a/src/KOKKOS/atom_vec_charge_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_charge_kokkos.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "atom_vec_charge_kokkos.h"
 #include "atom_kokkos.h"
 #include "comm_kokkos.h"
diff --git a/src/KOKKOS/atom_vec_dpd_kokkos.cpp b/src/KOKKOS/atom_vec_dpd_kokkos.cpp
index 06ca2083dce28372a6d9a05235ef224766420208..539f8e673698b67b570bad160ff45648c01c2567 100644
--- a/src/KOKKOS/atom_vec_dpd_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_dpd_kokkos.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "atom_vec_dpd_kokkos.h"
 #include "atom_kokkos.h"
 #include "comm_kokkos.h"
diff --git a/src/KOKKOS/atom_vec_full_kokkos.cpp b/src/KOKKOS/atom_vec_full_kokkos.cpp
index 6492a264ac153d330c2d1670b67c790c7b163aa6..a6ae1e0cccebd8e87b9af5213e1583756c48347a 100644
--- a/src/KOKKOS/atom_vec_full_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_full_kokkos.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "atom_vec_full_kokkos.h"
 #include "atom_kokkos.h"
 #include "comm_kokkos.h"
diff --git a/src/KOKKOS/atom_vec_hybrid_kokkos.cpp b/src/KOKKOS/atom_vec_hybrid_kokkos.cpp
index 67dce07b80d79323c0a822e64fcdc9847cb5bcac..7e1cc200d36bec7d4c9571fb403ca8f4dbd0c242 100644
--- a/src/KOKKOS/atom_vec_hybrid_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_hybrid_kokkos.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "atom_vec_hybrid_kokkos.h"
 #include "atom_kokkos.h"
 #include "domain.h"
diff --git a/src/KOKKOS/atom_vec_hybrid_kokkos.h b/src/KOKKOS/atom_vec_hybrid_kokkos.h
index 988de7fa2124e452d8db4bafae5a3db3c6457317..1bbbd26319af9da9a7c90de4600d78fefe63f6c6 100644
--- a/src/KOKKOS/atom_vec_hybrid_kokkos.h
+++ b/src/KOKKOS/atom_vec_hybrid_kokkos.h
@@ -20,7 +20,7 @@ AtomStyle(hybrid/kk,AtomVecHybridKokkos)
 #ifndef LMP_ATOM_VEC_HYBRID_KOKKOS_H
 #define LMP_ATOM_VEC_HYBRID_KOKKOS_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "atom_vec_kokkos.h"
 #include "kokkos_type.h"
 
diff --git a/src/KOKKOS/atom_vec_molecular_kokkos.cpp b/src/KOKKOS/atom_vec_molecular_kokkos.cpp
index 1a0c03cca5631ce58a86321757d5610323319336..9537320976298f4bf2a17cc0bd3bb6e93b703a76 100644
--- a/src/KOKKOS/atom_vec_molecular_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_molecular_kokkos.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "atom_vec_molecular_kokkos.h"
 #include "atom_kokkos.h"
 #include "comm_kokkos.h"
diff --git a/src/KOKKOS/bond_class2_kokkos.cpp b/src/KOKKOS/bond_class2_kokkos.cpp
index 80f2a6dfbbe8b6e423d0b5fd7174f53f7eeb2da1..f5af93a22aaa666ae8ac03ec4c09d3f3a6530d92 100644
--- a/src/KOKKOS/bond_class2_kokkos.cpp
+++ b/src/KOKKOS/bond_class2_kokkos.cpp
@@ -15,8 +15,8 @@
    Contributing author: Ray Shan (Materials Design)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "bond_class2_kokkos.h"
 #include "atom_kokkos.h"
 #include "neighbor_kokkos.h"
diff --git a/src/KOKKOS/bond_fene_kokkos.cpp b/src/KOKKOS/bond_fene_kokkos.cpp
index 20c20542083b35c289d8efdab2f3dce5adc95077..30faf4cee03589161158e3bc9a58a09a6ea2d574 100644
--- a/src/KOKKOS/bond_fene_kokkos.cpp
+++ b/src/KOKKOS/bond_fene_kokkos.cpp
@@ -15,8 +15,8 @@
    Contributing author: Stan Moore (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "bond_fene_kokkos.h"
 #include "atom_kokkos.h"
 #include "neighbor_kokkos.h"
diff --git a/src/KOKKOS/bond_harmonic_kokkos.cpp b/src/KOKKOS/bond_harmonic_kokkos.cpp
index e277104ddb317217dfd5dcddeef9bac584b4dd6f..8aa71b9eb3ec2491ef6c710be6a6763fc776f218 100644
--- a/src/KOKKOS/bond_harmonic_kokkos.cpp
+++ b/src/KOKKOS/bond_harmonic_kokkos.cpp
@@ -15,8 +15,8 @@
    Contributing author: Stan Moore (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "bond_harmonic_kokkos.h"
 #include "atom_kokkos.h"
 #include "neighbor_kokkos.h"
diff --git a/src/KOKKOS/comm_tiled_kokkos.cpp b/src/KOKKOS/comm_tiled_kokkos.cpp
index 33cd8eaa6e9eabc518a163d1ffbe68bbe0cffc30..4809f4cff2eebae63bcd002d0199d8e2fba1c0bc 100644
--- a/src/KOKKOS/comm_tiled_kokkos.cpp
+++ b/src/KOKKOS/comm_tiled_kokkos.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "comm_tiled_kokkos.h"
 #include "comm_brick.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/compute_temp_kokkos.cpp b/src/KOKKOS/compute_temp_kokkos.cpp
index 2ea67a1fb135a695a1e37b3c5d3e0de2ae82762e..fec3d89fffa8169e975373c3f20f258af3ee0b47 100644
--- a/src/KOKKOS/compute_temp_kokkos.cpp
+++ b/src/KOKKOS/compute_temp_kokkos.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
 #include "compute_temp_kokkos.h"
 #include "atom_kokkos.h"
 #include "update.h"
diff --git a/src/KOKKOS/dihedral_charmm_kokkos.cpp b/src/KOKKOS/dihedral_charmm_kokkos.cpp
index 13e3a6d2d1c600d62fd6cbeb56efa0f88b5553c1..41593ffbda6bebe72e4bf7d68bc250760c757d0c 100644
--- a/src/KOKKOS/dihedral_charmm_kokkos.cpp
+++ b/src/KOKKOS/dihedral_charmm_kokkos.cpp
@@ -15,8 +15,8 @@
    Contributing author: Stan Moore (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "dihedral_charmm_kokkos.h"
 #include "atom_kokkos.h"
 #include "comm.h"
diff --git a/src/KOKKOS/dihedral_class2_kokkos.cpp b/src/KOKKOS/dihedral_class2_kokkos.cpp
index b96e4c99af9893f644459e79b36b0bd87e90f865..f656fcf756ad5611985fb0739ff31136ef681971 100644
--- a/src/KOKKOS/dihedral_class2_kokkos.cpp
+++ b/src/KOKKOS/dihedral_class2_kokkos.cpp
@@ -15,8 +15,8 @@
    Contributing author: Ray Shan (Materials Design)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "dihedral_class2_kokkos.h"
 #include "atom_kokkos.h"
 #include "comm.h"
diff --git a/src/KOKKOS/dihedral_opls_kokkos.cpp b/src/KOKKOS/dihedral_opls_kokkos.cpp
index 4349aff48df93848f097bd1130c758ec6be91951..62c481fa9c3ee17ac92fbc17ec70fa6c1e833079 100644
--- a/src/KOKKOS/dihedral_opls_kokkos.cpp
+++ b/src/KOKKOS/dihedral_opls_kokkos.cpp
@@ -15,8 +15,8 @@
    Contributing author: Stan Moore (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "dihedral_opls_kokkos.h"
 #include "atom_kokkos.h"
 #include "comm.h"
diff --git a/src/KOKKOS/fix_deform_kokkos.cpp b/src/KOKKOS/fix_deform_kokkos.cpp
index 52953207340546890af19b6470f91f4b4b4c1f82..050364979550f25b74be0961ce5930ba4aa62f1d 100644
--- a/src/KOKKOS/fix_deform_kokkos.cpp
+++ b/src/KOKKOS/fix_deform_kokkos.cpp
@@ -15,9 +15,9 @@
    Contributing author: Pieter in 't Veld (SNL)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "fix_deform_kokkos.h"
 #include "atom_kokkos.h"
 #include "update.h"
diff --git a/src/KOKKOS/fix_dpd_energy_kokkos.cpp b/src/KOKKOS/fix_dpd_energy_kokkos.cpp
index e6878afed4ba44287e1efecb138b7f7c95272314..b12c6a476e0939d26da6c4d20a37cb56fe072e0c 100644
--- a/src/KOKKOS/fix_dpd_energy_kokkos.cpp
+++ b/src/KOKKOS/fix_dpd_energy_kokkos.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include "fix_dpd_energy_kokkos.h"
 #include "atom_masks.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/fix_eos_table_rx_kokkos.cpp b/src/KOKKOS/fix_eos_table_rx_kokkos.cpp
index fb4ca443a9dac49a9566733a0db474e2022b2fc7..39f612ec46e002fbaaab31ae42221b5b6fdf9e72 100644
--- a/src/KOKKOS/fix_eos_table_rx_kokkos.cpp
+++ b/src/KOKKOS/fix_eos_table_rx_kokkos.cpp
@@ -15,15 +15,15 @@
    Contributing author: Stan Moore (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_eos_table_rx_kokkos.h"
 #include "atom_kokkos.h"
 #include "error.h"
 #include "force.h"
 #include "memory_kokkos.h"
 #include "comm.h"
-#include <math.h>
+#include <cmath>
 #include "modify.h"
 #include "atom_masks.h"
 
@@ -387,7 +387,7 @@ void FixEOStableRXKokkos<DeviceType>::temperature_lookup(int id, double ui, doub
   // Apply the Secant Method
   for(it=0; it<maxit; it++){
     if(fabs(f2-f1) < MY_EPSILON){
-      if(isnan(f1) || isnan(f2)) k_error_flag.template view<DeviceType>()() = 2;
+      if(std::isnan(f1) || std::isnan(f2)) k_error_flag.template view<DeviceType>()() = 2;
       temp = t1;
       temp = MAX(temp,lo);
       temp = MIN(temp,hi);
@@ -403,7 +403,7 @@ void FixEOStableRXKokkos<DeviceType>::temperature_lookup(int id, double ui, doub
     f2 = u2 - ui;
   }
   if(it==maxit){
-    if(isnan(f1) || isnan(f2) || isnan(ui) || isnan(thetai) || isnan(t1) || isnan(t2))
+    if(std::isnan(f1) || std::isnan(f2) || std::isnan(ui) || std::isnan(thetai) || std::isnan(t1) || std::isnan(t2))
       k_error_flag.template view<DeviceType>()() = 2;
     else
       k_error_flag.template view<DeviceType>()() = 3;
diff --git a/src/KOKKOS/fix_langevin_kokkos.cpp b/src/KOKKOS/fix_langevin_kokkos.cpp
index 108c3b692ad7f4fcb176a407a558c5dca3685ca8..24d505e08d46854b3b72660436070ef1f9688a78 100644
--- a/src/KOKKOS/fix_langevin_kokkos.cpp
+++ b/src/KOKKOS/fix_langevin_kokkos.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
    ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include "fix_langevin_kokkos.h"
 #include "atom_masks.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/fix_momentum_kokkos.cpp b/src/KOKKOS/fix_momentum_kokkos.cpp
index 9ffe67a46ba7615efd9255f6a95500bcbe69af6e..9af7e79da88663490c30c31c494f0ca4ef49b86e 100644
--- a/src/KOKKOS/fix_momentum_kokkos.cpp
+++ b/src/KOKKOS/fix_momentum_kokkos.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_momentum_kokkos.h"
 #include "atom_kokkos.h"
 #include "atom_masks.h"
diff --git a/src/KOKKOS/fix_nh_kokkos.cpp b/src/KOKKOS/fix_nh_kokkos.cpp
index 345259e35519b24a6b6b669c175fc9e5bdeaf746..679690ea82215c9a389ff9b417c74385a35a163e 100644
--- a/src/KOKKOS/fix_nh_kokkos.cpp
+++ b/src/KOKKOS/fix_nh_kokkos.cpp
@@ -15,9 +15,9 @@
    Contributing author: Stan Moore (SNL)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "fix_nh_kokkos.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/KOKKOS/fix_nph_kokkos.cpp b/src/KOKKOS/fix_nph_kokkos.cpp
index 34fc212c0f996adbed0597d479e63bcc929722f1..ed825ad9ee448a156ecf5e91b1fd329c94a79fa5 100644
--- a/src/KOKKOS/fix_nph_kokkos.cpp
+++ b/src/KOKKOS/fix_nph_kokkos.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_nph_kokkos.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/KOKKOS/fix_npt_kokkos.cpp b/src/KOKKOS/fix_npt_kokkos.cpp
index c99a322a01679f0667c1de85d51c1d3afacc8ab3..b33e733aee707b8c4f572cc3ae93a14d09fc7eab 100644
--- a/src/KOKKOS/fix_npt_kokkos.cpp
+++ b/src/KOKKOS/fix_npt_kokkos.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_npt_kokkos.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/KOKKOS/fix_nve_kokkos.cpp b/src/KOKKOS/fix_nve_kokkos.cpp
index c071447eb7872e72f51055e8ab5232a574f29545..cb3eadcd9009f8e7a4426dae6a2bc0c459592111 100644
--- a/src/KOKKOS/fix_nve_kokkos.cpp
+++ b/src/KOKKOS/fix_nve_kokkos.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include "fix_nve_kokkos.h"
 #include "atom_masks.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/fix_nvt_kokkos.cpp b/src/KOKKOS/fix_nvt_kokkos.cpp
index 9628ff023126b13286d3c5594050bf501c5e322d..8b2d9362745c98812b367b9df82054ac883158bf 100644
--- a/src/KOKKOS/fix_nvt_kokkos.cpp
+++ b/src/KOKKOS/fix_nvt_kokkos.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_nvt_kokkos.h"
 #include "group.h"
 #include "modify.h"
diff --git a/src/KOKKOS/fix_property_atom_kokkos.cpp b/src/KOKKOS/fix_property_atom_kokkos.cpp
index fb3f5a3f341fbcf4f51ab555c1686a0f7de2d147..12f27f99322aaa863da3b77243715183dd951db6 100644
--- a/src/KOKKOS/fix_property_atom_kokkos.cpp
+++ b/src/KOKKOS/fix_property_atom_kokkos.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_property_atom_kokkos.h"
 #include "atom_kokkos.h"
 #include "comm.h"
diff --git a/src/KOKKOS/fix_qeq_reax_kokkos.cpp b/src/KOKKOS/fix_qeq_reax_kokkos.cpp
index ca2525d4f0783f14851fe4c9c69b5fbd57fac32e..52822856ee014cbb5b13b09ef87e3f54186a4a53 100644
--- a/src/KOKKOS/fix_qeq_reax_kokkos.cpp
+++ b/src/KOKKOS/fix_qeq_reax_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (SNL), Stan Moore (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "fix_qeq_reax_kokkos.h"
 #include "kokkos.h"
 #include "atom.h"
diff --git a/src/KOKKOS/fix_reaxc_bonds_kokkos.cpp b/src/KOKKOS/fix_reaxc_bonds_kokkos.cpp
index 586daadd55e64c3922f52ee16faa454f7b723da5..9aed0b9ae4052490b798aad062c3856b0d225b81 100644
--- a/src/KOKKOS/fix_reaxc_bonds_kokkos.cpp
+++ b/src/KOKKOS/fix_reaxc_bonds_kokkos.cpp
@@ -15,8 +15,8 @@
    Contributing author: Stan Moore (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_ave_atom.h"
 #include "fix_reaxc_bonds_kokkos.h"
 #include "atom.h"
diff --git a/src/KOKKOS/fix_reaxc_species_kokkos.cpp b/src/KOKKOS/fix_reaxc_species_kokkos.cpp
index a676c7ef27ae81cf7ec39e8467e7ecdceb816e06..bd92251960608a2bdfa6cb47c8a3180ae2356cec 100644
--- a/src/KOKKOS/fix_reaxc_species_kokkos.cpp
+++ b/src/KOKKOS/fix_reaxc_species_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing authors: Stan Moore (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <math.h>
+#include <cstdlib>
+#include <cmath>
 #include "atom.h"
-#include <string.h>
+#include <cstring>
 #include "fix_ave_atom.h"
 #include "fix_reaxc_species_kokkos.h"
 #include "domain.h"
diff --git a/src/KOKKOS/fix_rx_kokkos.cpp b/src/KOKKOS/fix_rx_kokkos.cpp
index 22450e19d948ac53a64837c021bf6c32c879968a..f636f6454d17874737a9e951bb271da0755328b9 100644
--- a/src/KOKKOS/fix_rx_kokkos.cpp
+++ b/src/KOKKOS/fix_rx_kokkos.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include "fix_rx_kokkos.h"
 #include "atom_masks.h"
 #include "atom_kokkos.h"
@@ -30,7 +30,7 @@
 #include "domain.h"
 #include "kokkos.h"
 
-#include <float.h> // DBL_EPSILON
+#include <cfloat> // DBL_EPSILON
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/KOKKOS/fix_setforce_kokkos.cpp b/src/KOKKOS/fix_setforce_kokkos.cpp
index e99160989497381ef63985fad512ec3e2d3af664..5150c71249dd7611e006241ba735de2176329ef9 100644
--- a/src/KOKKOS/fix_setforce_kokkos.cpp
+++ b/src/KOKKOS/fix_setforce_kokkos.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "fix_setforce_kokkos.h"
 #include "atom_kokkos.h"
 #include "update.h"
diff --git a/src/KOKKOS/fix_shardlow_kokkos.cpp b/src/KOKKOS/fix_shardlow_kokkos.cpp
index e973e5c99f5d4035207689c297c0ba1bb4f92cd3..70055bf8c9df4fd0f70f32b83e012e9eec0132c9 100644
--- a/src/KOKKOS/fix_shardlow_kokkos.cpp
+++ b/src/KOKKOS/fix_shardlow_kokkos.cpp
@@ -33,9 +33,9 @@
    135, 204105.
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "fix_shardlow_kokkos.h"
 #include "atom.h"
 #include "atom_masks.h"
@@ -44,7 +44,7 @@
 #include "update.h"
 #include "respa.h"
 #include "error.h"
-#include <math.h>
+#include <cmath>
 #include "atom_vec.h"
 #include "comm.h"
 #include "neighbor.h"
diff --git a/src/KOKKOS/fix_shardlow_kokkos.h b/src/KOKKOS/fix_shardlow_kokkos.h
index 4e87de6910d7724a0bc1a736cb15b2b5d56c1049..0469f6033d33ad49d14282a61b9a16f008d55742 100644
--- a/src/KOKKOS/fix_shardlow_kokkos.h
+++ b/src/KOKKOS/fix_shardlow_kokkos.h
@@ -22,7 +22,6 @@ FixStyle(shardlow/kk/host,FixShardlowKokkos<LMPHostType>)
 #ifndef LMP_FIX_SHARDLOW_KOKKOS_H
 #define LMP_FIX_SHARDLOW_KOKKOS_H
 
-#include "float.h"
 #include "fix_shardlow.h"
 #include "kokkos_type.h"
 #include "neigh_list_kokkos.h"
diff --git a/src/KOKKOS/fix_wall_lj93_kokkos.cpp b/src/KOKKOS/fix_wall_lj93_kokkos.cpp
index 602922d0ecae3426ba666dadf375ad26fd6adc99..3aaa45f8a8d0237be4cad83bd12d4f0ecfa81b8a 100644
--- a/src/KOKKOS/fix_wall_lj93_kokkos.cpp
+++ b/src/KOKKOS/fix_wall_lj93_kokkos.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "fix_wall_lj93_kokkos.h"
 #include "atom_kokkos.h"
 #include "error.h"
diff --git a/src/KOKKOS/fix_wall_reflect_kokkos.cpp b/src/KOKKOS/fix_wall_reflect_kokkos.cpp
index cd7a2c59b78ae84c3c0ae58f34c3998705b442d1..2516ac6577000b6f0c0de347b5e5dc60f0868b92 100644
--- a/src/KOKKOS/fix_wall_reflect_kokkos.cpp
+++ b/src/KOKKOS/fix_wall_reflect_kokkos.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_wall_reflect_kokkos.h"
 #include "atom_kokkos.h"
 #include "comm.h"
diff --git a/src/KOKKOS/improper_class2_kokkos.cpp b/src/KOKKOS/improper_class2_kokkos.cpp
index 28f57608bbce990793b47b5f66f95d28dbec6ec5..fdb890be5481969c48b885b3f99f0b54d97e4f38 100644
--- a/src/KOKKOS/improper_class2_kokkos.cpp
+++ b/src/KOKKOS/improper_class2_kokkos.cpp
@@ -16,8 +16,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "improper_class2_kokkos.h"
 #include "atom_kokkos.h"
 #include "comm.h"
diff --git a/src/KOKKOS/improper_harmonic_kokkos.cpp b/src/KOKKOS/improper_harmonic_kokkos.cpp
index f1a0ac3631c1a862dab0172b4f58dadcfeff8038..9f4e8b9440f52cbfa10262623544ac25bce78c4b 100644
--- a/src/KOKKOS/improper_harmonic_kokkos.cpp
+++ b/src/KOKKOS/improper_harmonic_kokkos.cpp
@@ -16,8 +16,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "improper_harmonic_kokkos.h"
 #include "atom_kokkos.h"
 #include "comm.h"
diff --git a/src/KOKKOS/kokkos.cpp b/src/KOKKOS/kokkos.cpp
index 5f81078afdfb97f62404d9574f464afd3c8ab764..35b99ce19b0351bf730258467528faab7659dbaf 100644
--- a/src/KOKKOS/kokkos.cpp
+++ b/src/KOKKOS/kokkos.cpp
@@ -11,11 +11,11 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <signal.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <cctype>
+#include <csignal>
 #include <unistd.h>
 #include "kokkos.h"
 #include "lammps.h"
diff --git a/src/KOKKOS/math_special_kokkos.cpp b/src/KOKKOS/math_special_kokkos.cpp
index a8c35b12b8838ca3a83fe42c646851532523af89..127168ef8bae1bce35a2031fce6077e9d0020e1e 100644
--- a/src/KOKKOS/math_special_kokkos.cpp
+++ b/src/KOKKOS/math_special_kokkos.cpp
@@ -1,6 +1,6 @@
 
-#include <math.h>
-#include <stdint.h>
+#include <cmath>
+#include <cstdint>
 #include "math_special_kokkos.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/KOKKOS/math_special_kokkos.h b/src/KOKKOS/math_special_kokkos.h
index 254b452eab786bc7dcac5255d7f98fec27bc31a7..d10d164bcfbc510cbe17c3f091c9ca1fb8d7b5f1 100644
--- a/src/KOKKOS/math_special_kokkos.h
+++ b/src/KOKKOS/math_special_kokkos.h
@@ -14,7 +14,7 @@
 #ifndef LMP_MATH_SPECIAL_KOKKOS_H
 #define LMP_MATH_SPECIAL_KOKKOS_H
 
-#include <math.h>
+#include <cmath>
 #include "kokkos_type.h"
 
 namespace LAMMPS_NS {
diff --git a/src/KOKKOS/neigh_bond_kokkos.cpp b/src/KOKKOS/neigh_bond_kokkos.cpp
index 3ecc8b5e516c8243a36a668fcdceb7b434e7145c..4dd39a1d383cb5da9063a5c439ca725d511d7c48 100644
--- a/src/KOKKOS/neigh_bond_kokkos.cpp
+++ b/src/KOKKOS/neigh_bond_kokkos.cpp
@@ -28,7 +28,7 @@
 #include "error.h"
 #include "modify.h"
 #include "fix.h"
-#include <string.h>
+#include <cstring>
 #include "atom_masks.h"
 #include "domain.h"
 
diff --git a/src/KOKKOS/neighbor_kokkos.h b/src/KOKKOS/neighbor_kokkos.h
index 137c071e87a7f078647f34ca43c73254c9ab916b..5c98c4d26db2d74b70747f705f0e9f755bae8edd 100644
--- a/src/KOKKOS/neighbor_kokkos.h
+++ b/src/KOKKOS/neighbor_kokkos.h
@@ -18,7 +18,7 @@
 #include "neigh_list_kokkos.h"
 #include "neigh_bond_kokkos.h"
 #include "kokkos_type.h"
-#include <math.h>
+#include <cmath>
 
 namespace LAMMPS_NS {
 
diff --git a/src/KOKKOS/pair_buck_coul_cut_kokkos.cpp b/src/KOKKOS/pair_buck_coul_cut_kokkos.cpp
index ba3eda64ddee4e389b771f5e47168c98c5a6fa08..9c12d2c978f7a385dfb11f82e34b55984cc0ec76 100644
--- a/src/KOKKOS/pair_buck_coul_cut_kokkos.cpp
+++ b/src/KOKKOS/pair_buck_coul_cut_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_buck_coul_cut_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_buck_coul_long_kokkos.cpp b/src/KOKKOS/pair_buck_coul_long_kokkos.cpp
index 19af349a63588a464f4e1785be291510fd91acfa..4978d3d7fc3b210ecb98dbd55413014aff67ae8a 100644
--- a/src/KOKKOS/pair_buck_coul_long_kokkos.cpp
+++ b/src/KOKKOS/pair_buck_coul_long_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_buck_coul_long_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_buck_kokkos.cpp b/src/KOKKOS/pair_buck_kokkos.cpp
index fcf14533dc991d469ad1c0e65951ca80d515b0b2..8785700186a94aa2a081873348c69b9712715e6c 100644
--- a/src/KOKKOS/pair_buck_kokkos.cpp
+++ b/src/KOKKOS/pair_buck_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Stan Moore (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_buck_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_coul_cut_kokkos.cpp b/src/KOKKOS/pair_coul_cut_kokkos.cpp
index e20e243c09aefb7313cbe13ce50a498356ea405d..b6e36d4f0ddaae5d9db211607c0493623d0b76b7 100644
--- a/src/KOKKOS/pair_coul_cut_kokkos.cpp
+++ b/src/KOKKOS/pair_coul_cut_kokkos.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_cut_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_coul_debye_kokkos.cpp b/src/KOKKOS/pair_coul_debye_kokkos.cpp
index 729b24ff29d2a8ca40e54ed0ad9c95d17ec8873a..5d15be7d769a16ff4185a8db0acb7c76d562538f 100644
--- a/src/KOKKOS/pair_coul_debye_kokkos.cpp
+++ b/src/KOKKOS/pair_coul_debye_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_debye_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_coul_dsf_kokkos.cpp b/src/KOKKOS/pair_coul_dsf_kokkos.cpp
index f77e63bbf0551b0412b21e0b7631c098ff082f78..a714f665f7f14e3424c66f5aadaf5b6c355a4c54 100644
--- a/src/KOKKOS/pair_coul_dsf_kokkos.cpp
+++ b/src/KOKKOS/pair_coul_dsf_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Stan Moore (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_dsf_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_coul_long_kokkos.cpp b/src/KOKKOS/pair_coul_long_kokkos.cpp
index f2ade3f367c0e01b8118d454a3d0259618cffddf..1e8c6c5f4e69f7f0f78ff927f9757c35b2046195 100644
--- a/src/KOKKOS/pair_coul_long_kokkos.cpp
+++ b/src/KOKKOS/pair_coul_long_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_long_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_coul_wolf_kokkos.cpp b/src/KOKKOS/pair_coul_wolf_kokkos.cpp
index 0f3e9b94290918dd78cb8940cc762d5e82494977..2bff824c3dd395e602d08243da7a5426805e9303 100644
--- a/src/KOKKOS/pair_coul_wolf_kokkos.cpp
+++ b/src/KOKKOS/pair_coul_wolf_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Stan Moore (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_wolf_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_dpd_fdt_energy_kokkos.cpp b/src/KOKKOS/pair_dpd_fdt_energy_kokkos.cpp
index 7d71719e0a115d99cf25a3a89a91487f9042edc2..2f08d7525365d3c2cc03239dd44116f2c7e25257 100644
--- a/src/KOKKOS/pair_dpd_fdt_energy_kokkos.cpp
+++ b/src/KOKKOS/pair_dpd_fdt_energy_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Stan Moore (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "atom_kokkos.h"
 #include "atom_vec.h"
 #include "comm.h"
diff --git a/src/KOKKOS/pair_eam_alloy_kokkos.cpp b/src/KOKKOS/pair_eam_alloy_kokkos.cpp
index f263cbb6d90be1cd34d5f0f9abab2b4e04174794..f21ea2335dd36c00429064fd3924dd78055ce88f 100644
--- a/src/KOKKOS/pair_eam_alloy_kokkos.cpp
+++ b/src/KOKKOS/pair_eam_alloy_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing authors: Stan Moore (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "kokkos.h"
 #include "pair_kokkos.h"
 #include "pair_eam_alloy_kokkos.h"
diff --git a/src/KOKKOS/pair_eam_alloy_kokkos.h b/src/KOKKOS/pair_eam_alloy_kokkos.h
index a962f559085d767f10c1b347a83b9d006c68a548..584839967218b3d8ea1079c9cbf7a2ea597436e4 100644
--- a/src/KOKKOS/pair_eam_alloy_kokkos.h
+++ b/src/KOKKOS/pair_eam_alloy_kokkos.h
@@ -23,7 +23,7 @@ PairStyle(eam/alloy/kk/host,PairEAMAlloyKokkos<LMPHostType>)
 #ifndef LMP_PAIR_EAM_ALLOY_KOKKOS_H
 #define LMP_PAIR_EAM_ALLOY_KOKKOS_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "kokkos_base.h"
 #include "pair_kokkos.h"
 #include "pair_eam.h"
diff --git a/src/KOKKOS/pair_eam_fs_kokkos.cpp b/src/KOKKOS/pair_eam_fs_kokkos.cpp
index 05ec1a644b829cc587ca30a4f99148d78dbeeb11..627b56b84ac10e76e9c189d80abde07fe2b8678f 100644
--- a/src/KOKKOS/pair_eam_fs_kokkos.cpp
+++ b/src/KOKKOS/pair_eam_fs_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing authors: Stan Moore (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "kokkos.h"
 #include "pair_kokkos.h"
 #include "pair_eam_fs_kokkos.h"
diff --git a/src/KOKKOS/pair_eam_fs_kokkos.h b/src/KOKKOS/pair_eam_fs_kokkos.h
index ec87e44ece248f93f0193684311f3587be8ec5d3..ce0b572ea2054113b32064e748a970027b66ab35 100644
--- a/src/KOKKOS/pair_eam_fs_kokkos.h
+++ b/src/KOKKOS/pair_eam_fs_kokkos.h
@@ -23,7 +23,7 @@ PairStyle(eam/fs/kk/host,PairEAMFSKokkos<LMPHostType>)
 #ifndef LMP_PAIR_EAM_FS_KOKKOS_H
 #define LMP_PAIR_EAM_FS_KOKKOS_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "kokkos_base.h"
 #include "pair_kokkos.h"
 #include "pair_eam.h"
diff --git a/src/KOKKOS/pair_eam_kokkos.cpp b/src/KOKKOS/pair_eam_kokkos.cpp
index ffa65acb87db22116d32361ea1c049ae38c69e0a..1bfb8255dc68b089bc7362501691a577970d4af4 100644
--- a/src/KOKKOS/pair_eam_kokkos.cpp
+++ b/src/KOKKOS/pair_eam_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing authors: Stan Moore (SNL), Christian Trott (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "kokkos.h"
 #include "pair_kokkos.h"
 #include "pair_eam_kokkos.h"
diff --git a/src/KOKKOS/pair_eam_kokkos.h b/src/KOKKOS/pair_eam_kokkos.h
index 34a4795ec54e97986b9cd39e0e79e7932d5d6bd4..c821750da54a0c2faf2eeb49ad0689f016bf1e41 100644
--- a/src/KOKKOS/pair_eam_kokkos.h
+++ b/src/KOKKOS/pair_eam_kokkos.h
@@ -23,7 +23,7 @@ PairStyle(eam/kk/host,PairEAMKokkos<LMPHostType>)
 #ifndef LMP_PAIR_EAM_KOKKOS_H
 #define LMP_PAIR_EAM_KOKKOS_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "kokkos_base.h"
 #include "pair_kokkos.h"
 #include "pair_eam.h"
diff --git a/src/KOKKOS/pair_exp6_rx_kokkos.cpp b/src/KOKKOS/pair_exp6_rx_kokkos.cpp
index 65b36635a34f88f1eb1ca6eaf6abfae2c1681086..160128ad83e06ce84a56e0e7a1851ad00f52c694 100644
--- a/src/KOKKOS/pair_exp6_rx_kokkos.cpp
+++ b/src/KOKKOS/pair_exp6_rx_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Stan Moore (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_exp6_rx_kokkos.h"
 #include "atom.h"
 #include "comm.h"
@@ -30,7 +30,7 @@
 #include "error.h"
 #include "modify.h"
 #include "fix.h"
-#include <float.h>
+#include <cfloat>
 #include "atom_masks.h"
 #include "neigh_request.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_hybrid_kokkos.cpp b/src/KOKKOS/pair_hybrid_kokkos.cpp
index db757f6ce1847806d266de13037d99b6489732a3..03ad77c34af8d0cc2b7760224ba7eac6814a9043 100644
--- a/src/KOKKOS/pair_hybrid_kokkos.cpp
+++ b/src/KOKKOS/pair_hybrid_kokkos.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
 #include "pair_hybrid_kokkos.h"
 #include "atom_kokkos.h"
 #include "force.h"
diff --git a/src/KOKKOS/pair_hybrid_kokkos.h b/src/KOKKOS/pair_hybrid_kokkos.h
index 62d325925b87e188245feb813279c26871769caa..94e034f8757618105b8b64cf37af7ec2d0b13dd6 100644
--- a/src/KOKKOS/pair_hybrid_kokkos.h
+++ b/src/KOKKOS/pair_hybrid_kokkos.h
@@ -20,7 +20,7 @@ PairStyle(hybrid/kk,PairHybridKokkos)
 #ifndef LMP_PAIR_HYBRID_KOKKOS_H
 #define LMP_PAIR_HYBRID_KOKKOS_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pair_hybrid.h"
 #include "pair_kokkos.h"
 #include "kokkos_type.h"
diff --git a/src/KOKKOS/pair_hybrid_overlay_kokkos.cpp b/src/KOKKOS/pair_hybrid_overlay_kokkos.cpp
index aa5d8951552889d492dba8405924d495eb2d63c4..a2c3edab6596061f39cda2e3fb4e1527e36dcd9c 100644
--- a/src/KOKKOS/pair_hybrid_overlay_kokkos.cpp
+++ b/src/KOKKOS/pair_hybrid_overlay_kokkos.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
 #include "pair_hybrid_overlay_kokkos.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/KOKKOS/pair_lj_charmm_coul_charmm_implicit_kokkos.cpp b/src/KOKKOS/pair_lj_charmm_coul_charmm_implicit_kokkos.cpp
index 70f0c3e00a639b532c236e62f9072e6e3c60e16a..d0d290d1f1c437df18718504e150b6a39f8fdf4c 100644
--- a/src/KOKKOS/pair_lj_charmm_coul_charmm_implicit_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_charmm_coul_charmm_implicit_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_charmm_coul_charmm_implicit_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.cpp b/src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.cpp
index 0316b65aedd6754dee21ace6cbc406a5c4ae00a7..2203dfa2a01821771943a3afa7c19ff32cb2ece2 100644
--- a/src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_charmm_coul_charmm_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_lj_charmm_coul_long_kokkos.cpp b/src/KOKKOS/pair_lj_charmm_coul_long_kokkos.cpp
index 4d27373824b3ce4b778d54f31b9eb6ad3214f3db..e1ecfbac3c14ce9fe31151077a0ff99a58d8195b 100644
--- a/src/KOKKOS/pair_lj_charmm_coul_long_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_charmm_coul_long_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_charmm_coul_long_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_lj_class2_coul_cut_kokkos.cpp b/src/KOKKOS/pair_lj_class2_coul_cut_kokkos.cpp
index 3f355b1b160bf34df464b833cf1c938e76f5a17e..abd0183e213b679560f8ea685b5da048d9c5580f 100644
--- a/src/KOKKOS/pair_lj_class2_coul_cut_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_class2_coul_cut_kokkos.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_class2_coul_cut_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_lj_class2_coul_long_kokkos.cpp b/src/KOKKOS/pair_lj_class2_coul_long_kokkos.cpp
index 47976ec610aecdef5d6c41bd9d612533e6bc16aa..5f850689d427154ddaeed02d0f23ae6650ca2cdb 100644
--- a/src/KOKKOS/pair_lj_class2_coul_long_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_class2_coul_long_kokkos.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_class2_coul_long_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_lj_class2_kokkos.cpp b/src/KOKKOS/pair_lj_class2_kokkos.cpp
index 5beb520c00feb1971f5248e4ab31a7442133faa7..063753f1f8ccba97326bb580cdd74dd83aab66df 100644
--- a/src/KOKKOS/pair_lj_class2_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_class2_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_class2_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_lj_cut_coul_cut_kokkos.cpp b/src/KOKKOS/pair_lj_cut_coul_cut_kokkos.cpp
index 86e37bea77a6ffadf9ab082a36005ebca6da8aba..a2067f8cf90f4dac64a3d3dadd4be69ff8e51323 100644
--- a/src/KOKKOS/pair_lj_cut_coul_cut_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_cut_coul_cut_kokkos.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_coul_cut_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_lj_cut_coul_debye_kokkos.cpp b/src/KOKKOS/pair_lj_cut_coul_debye_kokkos.cpp
index 76e488c68667e4ac7b19150ba70e876ebc81fe7e..277f1f658c2feabbdcff1ab678f4c8e08dc19d20 100644
--- a/src/KOKKOS/pair_lj_cut_coul_debye_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_cut_coul_debye_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_coul_debye_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.cpp b/src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.cpp
index b64d9fa31a9101425b3b995c9ec711126b0e422f..165bd972763ef52019096ed66566af34ebb552fd 100644
--- a/src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_coul_dsf_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_lj_cut_coul_long_kokkos.cpp b/src/KOKKOS/pair_lj_cut_coul_long_kokkos.cpp
index 77a604534e2ae907a16db82ed013c26af2ec1042..d02e83eb116060f95ed7177a29e9424e8865d3e1 100644
--- a/src/KOKKOS/pair_lj_cut_coul_long_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_cut_coul_long_kokkos.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_coul_long_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_lj_cut_kokkos.cpp b/src/KOKKOS/pair_lj_cut_kokkos.cpp
index 2a228fb168be97184fda12d80b012745b286fa80..daaab8d29ea45cc19c73f8c8b26a5ed8826684f6 100644
--- a/src/KOKKOS/pair_lj_cut_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_cut_kokkos.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_lj_expand_kokkos.cpp b/src/KOKKOS/pair_lj_expand_kokkos.cpp
index aca7202b78be66a04ce7443e7eb4f34c34a6a6e0..55c8b200efc4c411b629503b47836b227ce9860e 100644
--- a/src/KOKKOS/pair_lj_expand_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_expand_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_expand_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_lj_gromacs_coul_gromacs_kokkos.cpp b/src/KOKKOS/pair_lj_gromacs_coul_gromacs_kokkos.cpp
index 1cc8d9b3e2f042cd468afe8b4f151872e97215c7..b7fb5acccb7d147bc04e8498ae3a1808d9c2a169 100644
--- a/src/KOKKOS/pair_lj_gromacs_coul_gromacs_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_gromacs_coul_gromacs_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_gromacs_coul_gromacs_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_lj_gromacs_kokkos.cpp b/src/KOKKOS/pair_lj_gromacs_kokkos.cpp
index f0ad9357694dc64b163f6a5d9c3307159a43ee48..5d2725ccddf7dd778271d7155b08b50a88af8754 100644
--- a/src/KOKKOS/pair_lj_gromacs_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_gromacs_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_gromacs_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_lj_sdk_kokkos.cpp b/src/KOKKOS/pair_lj_sdk_kokkos.cpp
index aa579d5dc12995475731589da686ee4271867db9..8f719582fa981d4d856cabc4cc8b19740531a22f 100644
--- a/src/KOKKOS/pair_lj_sdk_kokkos.cpp
+++ b/src/KOKKOS/pair_lj_sdk_kokkos.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_sdk_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_morse_kokkos.cpp b/src/KOKKOS/pair_morse_kokkos.cpp
index dd555b6eb9cf937be79a1377096a4687b026ca92..97c5f9be84ae10ecf3a1c98a8880701da08556d9 100644
--- a/src/KOKKOS/pair_morse_kokkos.cpp
+++ b/src/KOKKOS/pair_morse_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing authors: Stefan Paquay (Eindhoven University of Technology)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_morse_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_multi_lucy_rx_kokkos.cpp b/src/KOKKOS/pair_multi_lucy_rx_kokkos.cpp
index 7cb869a8a558bc524d172bf31b529554cfd0866d..a6af26cb0ffa891584ad622d2c6510e190f03b09 100644
--- a/src/KOKKOS/pair_multi_lucy_rx_kokkos.cpp
+++ b/src/KOKKOS/pair_multi_lucy_rx_kokkos.cpp
@@ -22,10 +22,10 @@
 ------------------------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
+#include <cmath>
 #include "math_const.h"
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "pair_multi_lucy_rx_kokkos.h"
 #include "atom_kokkos.h"
 #include "force.h"
diff --git a/src/KOKKOS/pair_reaxc_kokkos.cpp b/src/KOKKOS/pair_reaxc_kokkos.cpp
index 9352d8367c441919accde7f5a2c286f739ac26cb..bb9f8ab417fab2f659f17f18b58ad38b51861279 100644
--- a/src/KOKKOS/pair_reaxc_kokkos.cpp
+++ b/src/KOKKOS/pair_reaxc_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (SNL), Stan Moore (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_reaxc_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_reaxc_kokkos.h b/src/KOKKOS/pair_reaxc_kokkos.h
index e69b80c2a7f5bcabdc982c2e133952def3910e1b..5175e274a8998f45ee6d8f40116f1bf47f671af3 100644
--- a/src/KOKKOS/pair_reaxc_kokkos.h
+++ b/src/KOKKOS/pair_reaxc_kokkos.h
@@ -23,7 +23,7 @@ PairStyle(reax/c/kk/host,PairReaxCKokkos<LMPHostType>)
 #ifndef LMP_PAIR_REAXC_KOKKOS_H
 #define LMP_PAIR_REAXC_KOKKOS_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pair_kokkos.h"
 #include "pair_reaxc.h"
 #include "neigh_list_kokkos.h"
diff --git a/src/KOKKOS/pair_snap_kokkos_impl.h b/src/KOKKOS/pair_snap_kokkos_impl.h
index d79cfef24b599a2d347b17aeed9e2512b4249679..a024e5cbd19238a739663870c8e21fcabaea0a41 100644
--- a/src/KOKKOS/pair_snap_kokkos_impl.h
+++ b/src/KOKKOS/pair_snap_kokkos_impl.h
@@ -15,9 +15,9 @@
    Contributing authors: Christian Trott (SNL), Stan Moore (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "pair_snap_kokkos.h"
 #include "atom_kokkos.h"
 #include "error.h"
diff --git a/src/KOKKOS/pair_sw_kokkos.cpp b/src/KOKKOS/pair_sw_kokkos.cpp
index a19e2fc271d0292e6e6c2d9d487c29a82c886135..8f4903c76794a4c7a1d38b5bbbf1b53894788bda 100644
--- a/src/KOKKOS/pair_sw_kokkos.cpp
+++ b/src/KOKKOS/pair_sw_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Stan Moore (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_sw_kokkos.h"
 #include "kokkos.h"
 #include "pair_kokkos.h"
diff --git a/src/KOKKOS/pair_table_kokkos.cpp b/src/KOKKOS/pair_table_kokkos.cpp
index e3e4ee01f397c750636fde67868fc7bf17f9555d..7b06f814bb4624874ca16f313f9faeda83cea9db 100644
--- a/src/KOKKOS/pair_table_kokkos.cpp
+++ b/src/KOKKOS/pair_table_kokkos.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "pair_table_kokkos.h"
 #include "kokkos.h"
 #include "atom.h"
diff --git a/src/KOKKOS/pair_table_rx_kokkos.cpp b/src/KOKKOS/pair_table_rx_kokkos.cpp
index 0b1e0ee9e6f6adbaaef11d5011287269d8f4ed64..30ca54986b7d378d1ed88e26cf86597f8a775709 100644
--- a/src/KOKKOS/pair_table_rx_kokkos.cpp
+++ b/src/KOKKOS/pair_table_rx_kokkos.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "pair_table_rx_kokkos.h"
 #include "kokkos.h"
 #include "atom.h"
diff --git a/src/KOKKOS/pair_tersoff_kokkos.cpp b/src/KOKKOS/pair_tersoff_kokkos.cpp
index 1fb97f913f8d560d7c9c3605fe577d08efffe711..cb4def2d373b4d3950334997b98ab09ffe0efe14 100644
--- a/src/KOKKOS/pair_tersoff_kokkos.cpp
+++ b/src/KOKKOS/pair_tersoff_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (SNL) and Christian Trott (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_tersoff_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_tersoff_kokkos.h b/src/KOKKOS/pair_tersoff_kokkos.h
index f40d28b72bd96549f2fd53cd6ac191acda55d0fa..2dac2c5991fe1ba733b7ae1bedb7c9e640c1b645 100644
--- a/src/KOKKOS/pair_tersoff_kokkos.h
+++ b/src/KOKKOS/pair_tersoff_kokkos.h
@@ -23,7 +23,7 @@ PairStyle(tersoff/kk/host,PairTersoffKokkos<LMPHostType>)
 #ifndef LMP_PAIR_TERSOFF_KOKKOS_H
 #define LMP_PAIR_TERSOFF_KOKKOS_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pair_kokkos.h"
 #include "pair_tersoff.h"
 #include "neigh_list_kokkos.h"
diff --git a/src/KOKKOS/pair_tersoff_mod_kokkos.cpp b/src/KOKKOS/pair_tersoff_mod_kokkos.cpp
index a30e1229f2a6959d35d462ff006e8ceabb07747b..0d150f83e4a084a8d92a24a79f806aecea3e34c3 100644
--- a/src/KOKKOS/pair_tersoff_mod_kokkos.cpp
+++ b/src/KOKKOS/pair_tersoff_mod_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_tersoff_mod_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_tersoff_mod_kokkos.h b/src/KOKKOS/pair_tersoff_mod_kokkos.h
index c9995b2904349a03dffbe32bd7f234c2bf4f5225..dd5efb50f1da33e7743f6c8c4d51c5e1e9086dee 100644
--- a/src/KOKKOS/pair_tersoff_mod_kokkos.h
+++ b/src/KOKKOS/pair_tersoff_mod_kokkos.h
@@ -23,7 +23,7 @@ PairStyle(tersoff/mod/kk/host,PairTersoffMODKokkos<LMPHostType>)
 #ifndef LMP_PAIR_TERSOFF_MOD_KOKKOS_H
 #define LMP_PAIR_TERSOFF_MOD_KOKKOS_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pair_kokkos.h"
 #include "pair_tersoff_mod.h"
 #include "neigh_list_kokkos.h"
diff --git a/src/KOKKOS/pair_tersoff_zbl_kokkos.cpp b/src/KOKKOS/pair_tersoff_zbl_kokkos.cpp
index aeefbf67f688caf403ca4e6a10d9a49ffc3e08cf..2fb9675db60efa9b5ebda7e81dee5e1271d021fd 100644
--- a/src/KOKKOS/pair_tersoff_zbl_kokkos.cpp
+++ b/src/KOKKOS/pair_tersoff_zbl_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_tersoff_zbl_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_tersoff_zbl_kokkos.h b/src/KOKKOS/pair_tersoff_zbl_kokkos.h
index 92239532be72bae61ab223999f29a45d6ccab54d..45982bd420b5b860291a54e29ecf0f9f79581063 100644
--- a/src/KOKKOS/pair_tersoff_zbl_kokkos.h
+++ b/src/KOKKOS/pair_tersoff_zbl_kokkos.h
@@ -23,7 +23,7 @@ PairStyle(tersoff/zbl/kk/host,PairTersoffZBLKokkos<LMPHostType>)
 #ifndef LMP_PAIR_TERSOFF_ZBL_KOKKOS_H
 #define LMP_PAIR_TERSOFF_ZBL_KOKKOS_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pair_kokkos.h"
 #include "pair_tersoff_zbl.h"
 #include "neigh_list_kokkos.h"
diff --git a/src/KOKKOS/pair_vashishta_kokkos.cpp b/src/KOKKOS/pair_vashishta_kokkos.cpp
index 2e4989356eab8b296f8ff87e882907101e82ae91..3d4bd22a3cb33913e7b8e96eb4bff020e7a27627 100644
--- a/src/KOKKOS/pair_vashishta_kokkos.cpp
+++ b/src/KOKKOS/pair_vashishta_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing author: Anders Hafreager (UiO), andershaf@gmail.com
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_vashishta_kokkos.h"
 #include "kokkos.h"
 #include "pair_kokkos.h"
diff --git a/src/KOKKOS/pair_yukawa_kokkos.cpp b/src/KOKKOS/pair_yukawa_kokkos.cpp
index 6560ec9684b3f88abb0143aeb39ca791de02affb..8fc2fda1207a74c21ebda02a136348a796142b28 100644
--- a/src/KOKKOS/pair_yukawa_kokkos.cpp
+++ b/src/KOKKOS/pair_yukawa_kokkos.cpp
@@ -14,8 +14,8 @@
 /* ----------------------------------------------------------------------
    Contributing authors: Stefan Paquay (Brandeis University)
 ------------------------------------------------------------------------- */
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "pair_yukawa_kokkos.h"
 #include "kokkos.h"
 #include "atom_kokkos.h"
diff --git a/src/KOKKOS/pair_zbl_kokkos.cpp b/src/KOKKOS/pair_zbl_kokkos.cpp
index 0ed9e62dfff2d496dde2d9cac65ab31423cb0982..f57d5eaad0cccf6751a839a96e3926270cfcb7a3 100644
--- a/src/KOKKOS/pair_zbl_kokkos.cpp
+++ b/src/KOKKOS/pair_zbl_kokkos.cpp
@@ -15,10 +15,10 @@
    Contributing authors: Stan Moore (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_zbl_kokkos.h"
 #include "atom_kokkos.h"
 #include "comm.h"
diff --git a/src/KOKKOS/pppm_kokkos.cpp b/src/KOKKOS/pppm_kokkos.cpp
index a28e462044ac7a4f1b674b620c7c3102a846c9aa..13683d148f91d351dfe166da79925ebd20be9a35 100644
--- a/src/KOKKOS/pppm_kokkos.cpp
+++ b/src/KOKKOS/pppm_kokkos.cpp
@@ -16,10 +16,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 #include "pppm_kokkos.h"
 #include "atom_kokkos.h"
 #include "comm.h"
@@ -1579,7 +1579,7 @@ void PPPMKokkos<DeviceType>::particle_map()
   k_flag.template modify<LMPHostType>();
   k_flag.template sync<DeviceType>();
 
-  if (!ISFINITE(boxlo[0]) || !ISFINITE(boxlo[1]) || !ISFINITE(boxlo[2]))
+  if (!std::isfinite(boxlo[0]) || !std::isfinite(boxlo[1]) || !std::isfinite(boxlo[2]))
     error->one(FLERR,"Non-numeric box dimensions - simulation unstable");
 
   copymode = 1;
diff --git a/src/KOKKOS/region_block_kokkos.cpp b/src/KOKKOS/region_block_kokkos.cpp
index eed4272f2302b7244be637409054ddac7a4d59f9..8ff6e8937d0919f905599c7b95bb6c01a9f7c0d6 100644
--- a/src/KOKKOS/region_block_kokkos.cpp
+++ b/src/KOKKOS/region_block_kokkos.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "region_block_kokkos.h"
 #include "domain.h"
 #include "force.h"
diff --git a/src/KOKKOS/sna_kokkos_impl.h b/src/KOKKOS/sna_kokkos_impl.h
index ccc4010f68af839e39f59a0277231e618b1d6d0e..25561fef5d0decf60f4ab6d74d3e8cf20693c9ff 100644
--- a/src/KOKKOS/sna_kokkos_impl.h
+++ b/src/KOKKOS/sna_kokkos_impl.h
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include "sna_kokkos.h"
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/verlet_kokkos.cpp b/src/KOKKOS/verlet_kokkos.cpp
index fe11e6b3fa4986459ad9847ec3f41b6d72ccd72e..136e543a2cd708501004d2f94290b21454dabe0a 100644
--- a/src/KOKKOS/verlet_kokkos.cpp
+++ b/src/KOKKOS/verlet_kokkos.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "verlet_kokkos.h"
 #include "neighbor.h"
 #include "domain.h"
diff --git a/src/KSPACE/ewald.cpp b/src/KSPACE/ewald.cpp
index 766520172b46e0c5103c7821bad3dc70c612ff3a..0ced09eb93610c42a13bdabe19f5067081735f25 100644
--- a/src/KSPACE/ewald.cpp
+++ b/src/KSPACE/ewald.cpp
@@ -19,10 +19,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
+#include <cmath>
 #include "ewald.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/KSPACE/ewald_disp.cpp b/src/KSPACE/ewald_disp.cpp
index e0424b0d932b7d4adbd50a5272695abe08da1fb9..fb48edc117ae48ce986ba9f794bcc58bfe0b062f 100644
--- a/src/KSPACE/ewald_disp.cpp
+++ b/src/KSPACE/ewald_disp.cpp
@@ -16,10 +16,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 #include "ewald_disp.h"
 #include "math_vector.h"
 #include "math_const.h"
diff --git a/src/KSPACE/fft3d.cpp b/src/KSPACE/fft3d.cpp
index 2a0d85bac655ff24000fb8755c4b531a47358763..6da7f197ee7024bb3a6457f33a21138ad24d0a73 100644
--- a/src/KSPACE/fft3d.cpp
+++ b/src/KSPACE/fft3d.cpp
@@ -20,9 +20,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 #include "fft3d.h"
 #include "remap.h"
 
diff --git a/src/KSPACE/fix_tune_kspace.cpp b/src/KSPACE/fix_tune_kspace.cpp
index 5ce867778d838eab52147a2edd55c76fd809048e..399e551b57dff8afea6a128bb88f6713572168a5 100644
--- a/src/KSPACE/fix_tune_kspace.cpp
+++ b/src/KSPACE/fix_tune_kspace.cpp
@@ -15,8 +15,8 @@
    Contributing author: Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "fix_tune_kspace.h"
 #include "update.h"
 #include "domain.h"
diff --git a/src/KSPACE/fix_tune_kspace.h b/src/KSPACE/fix_tune_kspace.h
index 3311bd1d430ee35c12c9c20aaa090d975efc8611..6f40fc8711e32f501237ef8f629dc3065beaea60 100644
--- a/src/KSPACE/fix_tune_kspace.h
+++ b/src/KSPACE/fix_tune_kspace.h
@@ -20,7 +20,7 @@ FixStyle(tune/kspace,FixTuneKspace)
 #ifndef LMP_FIX_TUNE_KSPACE_H
 #define LMP_FIX_TUNE_KSPACE_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/KSPACE/kissfft.h b/src/KSPACE/kissfft.h
index ec6ef97feab0eb3017fa15eae33c0a4d5a58a49d..4e15f494a972f817a23208d53b6d5c80e1f121ad 100644
--- a/src/KSPACE/kissfft.h
+++ b/src/KSPACE/kissfft.h
@@ -16,9 +16,9 @@
 #ifndef LMP_FFT_KISSFFT
 #define LMP_FFT_KISSFFT
 
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
 
 #if defined(_OPENMP)
 #include <omp.h>
diff --git a/src/KSPACE/msm.cpp b/src/KSPACE/msm.cpp
index c151095a6724e827f101b057be6de2b9420517cb..cc1ea027eec3a115ebc58400663863194ca3b93e 100644
--- a/src/KSPACE/msm.cpp
+++ b/src/KSPACE/msm.cpp
@@ -16,10 +16,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 #include "msm.h"
 #include "atom.h"
 #include "comm.h"
@@ -1442,7 +1442,7 @@ void MSM::particle_map()
 
   int flag = 0;
 
-  if (!ISFINITE(boxlo[0]) || !ISFINITE(boxlo[1]) || !ISFINITE(boxlo[2]))
+  if (!std::isfinite(boxlo[0]) || !std::isfinite(boxlo[1]) || !std::isfinite(boxlo[2]))
     error->one(FLERR,"Non-numeric box dimensions - simulation unstable");
 
   for (int i = 0; i < nlocal; i++) {
diff --git a/src/KSPACE/msm_cg.cpp b/src/KSPACE/msm_cg.cpp
index 3354593ec86f58ad533427bf336ee2bd3df58b2f..3ae3d627251c02951bdf62c6653c535c87e6814f 100644
--- a/src/KSPACE/msm_cg.cpp
+++ b/src/KSPACE/msm_cg.cpp
@@ -16,10 +16,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "atom.h"
 #include "gridcomm.h"
 #include "domain.h"
@@ -314,7 +314,7 @@ void MSMCG::particle_map()
   int flag = 0;
   int i;
 
-  if (!ISFINITE(boxlo[0]) || !ISFINITE(boxlo[1]) || !ISFINITE(boxlo[2]))
+  if (!std::isfinite(boxlo[0]) || !std::isfinite(boxlo[1]) || !std::isfinite(boxlo[2]))
     error->one(FLERR,"Non-numeric box dimensions - simulation unstable");
 
   for (int j = 0; j < num_charged; j++) {
diff --git a/src/KSPACE/pair_born_coul_long.cpp b/src/KSPACE/pair_born_coul_long.cpp
index 479128ef2b4ad070a5b567543652c6b93762d881..d55a5a3afe7e239480daa22f17712a020c44cc2f 100644
--- a/src/KSPACE/pair_born_coul_long.cpp
+++ b/src/KSPACE/pair_born_coul_long.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ahmed Ismail (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_born_coul_long.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/KSPACE/pair_born_coul_msm.cpp b/src/KSPACE/pair_born_coul_msm.cpp
index 6ed120cdc575341614e92e9d82ea2f2c654383a8..775d26df95e131fe812069c8124555739cee2f70 100644
--- a/src/KSPACE/pair_born_coul_msm.cpp
+++ b/src/KSPACE/pair_born_coul_msm.cpp
@@ -15,10 +15,10 @@
    Contributing author: Stan Moore (SNL), Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_born_coul_msm.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/KSPACE/pair_buck_coul_long.cpp b/src/KSPACE/pair_buck_coul_long.cpp
index 95496409b98fb21387c939da1dca06104445c3af..a37e4ab4e9429180b786d6d110512355ae3f4095 100644
--- a/src/KSPACE/pair_buck_coul_long.cpp
+++ b/src/KSPACE/pair_buck_coul_long.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_buck_coul_long.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/KSPACE/pair_buck_coul_msm.cpp b/src/KSPACE/pair_buck_coul_msm.cpp
index e33bdc839c3dfaf4e97223381ba5121450170566..fc72f1a4d6886b275a8b195a162364f85ae50ddf 100644
--- a/src/KSPACE/pair_buck_coul_msm.cpp
+++ b/src/KSPACE/pair_buck_coul_msm.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_buck_coul_msm.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/KSPACE/pair_buck_long_coul_long.cpp b/src/KSPACE/pair_buck_long_coul_long.cpp
index 7781e24a5ee8febd641a3af783bf9ede7ad47582..55825b56571c492eca8c3262a75916e29f82ae60 100644
--- a/src/KSPACE/pair_buck_long_coul_long.cpp
+++ b/src/KSPACE/pair_buck_long_coul_long.cpp
@@ -15,10 +15,10 @@
    Contributing author: Pieter J. in 't Veld (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "math_vector.h"
 #include "pair_buck_long_coul_long.h"
 #include "atom.h"
diff --git a/src/KSPACE/pair_coul_long.cpp b/src/KSPACE/pair_coul_long.cpp
index 988694153afa952e71a403f859a0106860496a5a..4b10782ee646c23268fb5603cacb3f730336f1ba 100644
--- a/src/KSPACE/pair_coul_long.cpp
+++ b/src/KSPACE/pair_coul_long.cpp
@@ -15,10 +15,10 @@
    Contributing author: Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_long.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/KSPACE/pair_coul_msm.cpp b/src/KSPACE/pair_coul_msm.cpp
index 62daee9a13695636aa3f10153bf7e4a2603f143d..f5cd9a04452a2a6c16a03e15527c47c331d11913 100644
--- a/src/KSPACE/pair_coul_msm.cpp
+++ b/src/KSPACE/pair_coul_msm.cpp
@@ -15,10 +15,10 @@
    Contributing authors: Stan Moore (SNL), Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_msm.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/KSPACE/pair_lj_charmm_coul_long.cpp b/src/KSPACE/pair_lj_charmm_coul_long.cpp
index daa493cef06e6327966c9dfb490a33c071ff8a22..749d9657aacc6c0418ed04b059a737a031e3dfc0 100644
--- a/src/KSPACE/pair_lj_charmm_coul_long.cpp
+++ b/src/KSPACE/pair_lj_charmm_coul_long.cpp
@@ -15,10 +15,10 @@
    Contributing author: Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_charmm_coul_long.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/KSPACE/pair_lj_charmm_coul_msm.cpp b/src/KSPACE/pair_lj_charmm_coul_msm.cpp
index 00617c0bf2331a51ba721cc9a8ba05ba5209f2ec..aecadcf127394e0b89dcbf56605e5e34ad7cfc81 100644
--- a/src/KSPACE/pair_lj_charmm_coul_msm.cpp
+++ b/src/KSPACE/pair_lj_charmm_coul_msm.cpp
@@ -15,10 +15,10 @@
    Contributing authors: Paul Crozier (SNL), Stan Moore (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_charmm_coul_msm.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/KSPACE/pair_lj_charmmfsw_coul_long.cpp b/src/KSPACE/pair_lj_charmmfsw_coul_long.cpp
index 4a37ddb81fa29989b06eb0934637ed77cf7931ff..614980117e4e8b9c45de65a80b8547a6b42f9d0b 100644
--- a/src/KSPACE/pair_lj_charmmfsw_coul_long.cpp
+++ b/src/KSPACE/pair_lj_charmmfsw_coul_long.cpp
@@ -19,10 +19,10 @@
      additional assistance from Robert A. Latour, Clemson University
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_charmmfsw_coul_long.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/KSPACE/pair_lj_cut_coul_long.cpp b/src/KSPACE/pair_lj_cut_coul_long.cpp
index 3096df2b01626e1fbfd255c176ed0803bf07817c..c9530fe157f5fcfa012b8fdb7ea49a9d2dc4c0aa 100644
--- a/src/KSPACE/pair_lj_cut_coul_long.cpp
+++ b/src/KSPACE/pair_lj_cut_coul_long.cpp
@@ -15,10 +15,10 @@
    Contributing author: Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_coul_long.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/KSPACE/pair_lj_cut_coul_msm.cpp b/src/KSPACE/pair_lj_cut_coul_msm.cpp
index 9f901db9fcfbb2375734877b0a918368cd49d5cb..78c364bd6aae4a416945e22e207bc28985ba0471 100644
--- a/src/KSPACE/pair_lj_cut_coul_msm.cpp
+++ b/src/KSPACE/pair_lj_cut_coul_msm.cpp
@@ -15,10 +15,10 @@
    Contributing authors: Stan Moore (SNL), Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_coul_msm.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/KSPACE/pair_lj_cut_tip4p_long.cpp b/src/KSPACE/pair_lj_cut_tip4p_long.cpp
index 588d21ac66be082e4bb9c8412bddd39261fc54fa..d622a83b394e95e48195cb037ba35ab67536e3b6 100644
--- a/src/KSPACE/pair_lj_cut_tip4p_long.cpp
+++ b/src/KSPACE/pair_lj_cut_tip4p_long.cpp
@@ -16,10 +16,10 @@
    simpler force assignment added by Rolf Isele-Holder (Aachen University)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_tip4p_long.h"
 #include "angle.h"
 #include "atom.h"
diff --git a/src/KSPACE/pair_lj_long_coul_long.cpp b/src/KSPACE/pair_lj_long_coul_long.cpp
index f6f6ebd6a2988e1faa00495d348818d2579aea47..32d6d9e0a3e82e602d838beade4b656496e689b3 100644
--- a/src/KSPACE/pair_lj_long_coul_long.cpp
+++ b/src/KSPACE/pair_lj_long_coul_long.cpp
@@ -17,10 +17,10 @@
    University New Orleans)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "math_vector.h"
 #include "pair_lj_long_coul_long.h"
 #include "atom.h"
diff --git a/src/KSPACE/pair_lj_long_tip4p_long.cpp b/src/KSPACE/pair_lj_long_tip4p_long.cpp
index 6dd552c819d2bbd918508240ae5fe2a03c2f7015..78316b9daad147c3fb7b236760c13a99a08c89dd 100644
--- a/src/KSPACE/pair_lj_long_tip4p_long.cpp
+++ b/src/KSPACE/pair_lj_long_tip4p_long.cpp
@@ -16,10 +16,10 @@
                          Rolf Isele-Holder (Aachen University)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_long_tip4p_long.h"
 #include "angle.h"
 #include "atom.h"
diff --git a/src/KSPACE/pair_tip4p_long.cpp b/src/KSPACE/pair_tip4p_long.cpp
index 1dd57ce822c90751b523397f29ec636eaaffa49b..ac428d483af745221d89146d9de6f576c0923c8d 100644
--- a/src/KSPACE/pair_tip4p_long.cpp
+++ b/src/KSPACE/pair_tip4p_long.cpp
@@ -16,10 +16,10 @@
    simpler force assignment added by Rolf Isele-Holder (Aachen University)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_tip4p_long.h"
 #include "angle.h"
 #include "atom.h"
diff --git a/src/KSPACE/pppm.cpp b/src/KSPACE/pppm.cpp
index bc82dce5320a7e8ea87d75dc6d29b18a86561263..132389b7d619b22d8f71cb0caf696e12498ab10c 100644
--- a/src/KSPACE/pppm.cpp
+++ b/src/KSPACE/pppm.cpp
@@ -19,10 +19,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 #include "pppm.h"
 #include "atom.h"
 #include "comm.h"
@@ -1913,7 +1913,7 @@ void PPPM::particle_map()
 
   int flag = 0;
 
-  if (!ISFINITE(boxlo[0]) || !ISFINITE(boxlo[1]) || !ISFINITE(boxlo[2]))
+  if (!std::isfinite(boxlo[0]) || !std::isfinite(boxlo[1]) || !std::isfinite(boxlo[2]))
     error->one(FLERR,"Non-numeric box dimensions - simulation unstable");
 
   for (int i = 0; i < nlocal; i++) {
diff --git a/src/KSPACE/pppm_cg.cpp b/src/KSPACE/pppm_cg.cpp
index 9489224e03031b8c279e05a5365a3ad9a58bb572..ca7abc9b5adc60454c4f7e4a24d501980005d679 100644
--- a/src/KSPACE/pppm_cg.cpp
+++ b/src/KSPACE/pppm_cg.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "atom.h"
 #include "gridcomm.h"
@@ -284,7 +284,7 @@ void PPPMCG::particle_map()
 
   double **x = atom->x;
 
-  if (!ISFINITE(boxlo[0]) || !ISFINITE(boxlo[1]) || !ISFINITE(boxlo[2]))
+  if (!std::isfinite(boxlo[0]) || !std::isfinite(boxlo[1]) || !std::isfinite(boxlo[2]))
     error->one(FLERR,"Non-numeric box dimensions - simulation unstable");
 
   int flag = 0;
diff --git a/src/KSPACE/pppm_disp.cpp b/src/KSPACE/pppm_disp.cpp
index 3e764cc3e7f6f3104f2d0a0722a4e72b5399ebe5..4fbc20c0fc80d8d338308c22724a49a5ff3fbdb9 100644
--- a/src/KSPACE/pppm_disp.cpp
+++ b/src/KSPACE/pppm_disp.cpp
@@ -17,10 +17,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 #include "pppm_disp.h"
 #include "math_const.h"
 #include "atom.h"
@@ -4278,7 +4278,7 @@ void PPPMDisp::particle_map(double delx, double dely, double delz,
   double **x = atom->x;
   int nlocal = atom->nlocal;
 
-  if (!ISFINITE(boxlo[0]) || !ISFINITE(boxlo[1]) || !ISFINITE(boxlo[2]))
+  if (!std::isfinite(boxlo[0]) || !std::isfinite(boxlo[1]) || !std::isfinite(boxlo[2]))
     error->one(FLERR,"Non-numeric box dimensions - simulation unstable");
 
   int flag = 0;
diff --git a/src/KSPACE/pppm_disp_tip4p.cpp b/src/KSPACE/pppm_disp_tip4p.cpp
index 686ed3df8ea0903979b2ef8e49289b46072d2507..1a25b300fc34b3db42bc5fb66342d2282704cb55 100644
--- a/src/KSPACE/pppm_disp_tip4p.cpp
+++ b/src/KSPACE/pppm_disp_tip4p.cpp
@@ -16,7 +16,7 @@
                          Rolf Isele-Holder (Aachen University)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pppm_disp_tip4p.h"
 #include "pppm_disp.h"
 #include "atom.h"
@@ -78,7 +78,7 @@ void PPPMDispTIP4P::particle_map_c(double delx, double dely, double delz,
   double **x = atom->x;
   int nlocal = atom->nlocal;
 
-  if (!ISFINITE(boxlo[0]) || !ISFINITE(boxlo[1]) || !ISFINITE(boxlo[2]))
+  if (!std::isfinite(boxlo[0]) || !std::isfinite(boxlo[1]) || !std::isfinite(boxlo[2]))
     error->one(FLERR,"Non-numeric box dimensions - simulation unstable");
 
   int flag = 0;
diff --git a/src/KSPACE/pppm_stagger.cpp b/src/KSPACE/pppm_stagger.cpp
index 49c84e58c0b4f36c8be56d758fa2759a0c478c2b..6d3308a05b1d02d1db2344075577676f59d21fd6 100644
--- a/src/KSPACE/pppm_stagger.cpp
+++ b/src/KSPACE/pppm_stagger.cpp
@@ -16,10 +16,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 #include "pppm_stagger.h"
 #include "atom.h"
 #include "gridcomm.h"
@@ -680,7 +680,7 @@ void PPPMStagger::particle_map()
   double **x = atom->x;
   int nlocal = atom->nlocal;
 
-  if (!ISFINITE(boxlo[0]) || !ISFINITE(boxlo[1]) || !ISFINITE(boxlo[2]))
+  if (!std::isfinite(boxlo[0]) || !std::isfinite(boxlo[1]) || !std::isfinite(boxlo[2]))
     error->one(FLERR,"Non-numeric box dimensions - simulation unstable");
 
   int flag = 0;
diff --git a/src/KSPACE/pppm_tip4p.cpp b/src/KSPACE/pppm_tip4p.cpp
index e807f7e2e98a8ecbddca91fdc6ddb0d29c3ff46d..08fc8c711cdb869e45dffefe6da6cae176d2ad69 100644
--- a/src/KSPACE/pppm_tip4p.cpp
+++ b/src/KSPACE/pppm_tip4p.cpp
@@ -15,7 +15,7 @@
    Contributing authors: Amalie Frischknecht and Ahmed Ismail (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pppm_tip4p.h"
 #include "atom.h"
 #include "domain.h"
@@ -73,7 +73,7 @@ void PPPMTIP4P::particle_map()
   double **x = atom->x;
   int nlocal = atom->nlocal;
 
-  if (!ISFINITE(boxlo[0]) || !ISFINITE(boxlo[1]) || !ISFINITE(boxlo[2]))
+  if (!std::isfinite(boxlo[0]) || !std::isfinite(boxlo[1]) || !std::isfinite(boxlo[2]))
     error->one(FLERR,"Non-numeric box dimensions - simulation unstable");
 
   int flag = 0;
diff --git a/src/KSPACE/remap.cpp b/src/KSPACE/remap.cpp
index 86522f3f2f7f166c6e34e6043047998d0178cc37..81dd692f4f91a44cebfdf68ab2ca79d8d37f0973 100644
--- a/src/KSPACE/remap.cpp
+++ b/src/KSPACE/remap.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include "remap.h"
 
 #define PACK_DATA FFT_SCALAR
diff --git a/src/LATTE/fix_latte.cpp b/src/LATTE/fix_latte.cpp
index 4594f26f8f8c182901ed564895e5814d77cb5e06..c2bfa1a5a1f1ba6500b4da5baa4633833abb6d1b 100644
--- a/src/LATTE/fix_latte.cpp
+++ b/src/LATTE/fix_latte.cpp
@@ -15,8 +15,8 @@
    Contributing author: Christian Negre (LANL)
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include "fix_latte.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MANYBODY/fix_qeq_comb.cpp b/src/MANYBODY/fix_qeq_comb.cpp
index c0d36d8fac60f3df808ab251ac409c9c52457d44..b8d9c7e6dfb7b0c739f5195e538f7c4c399625db 100644
--- a/src/MANYBODY/fix_qeq_comb.cpp
+++ b/src/MANYBODY/fix_qeq_comb.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "pair_comb.h"
 #include "pair_comb3.h"
 #include "fix_qeq_comb.h"
diff --git a/src/MANYBODY/fix_qeq_comb.h b/src/MANYBODY/fix_qeq_comb.h
index 384ea4bbccacd267300b1e8d36620f722affd0a5..dd4c9f729085ad8bc107b748036c57b57cc8c515 100644
--- a/src/MANYBODY/fix_qeq_comb.h
+++ b/src/MANYBODY/fix_qeq_comb.h
@@ -20,7 +20,7 @@ FixStyle(qeq/comb,FixQEQComb)
 #ifndef LMP_FIX_QEQ_COMB_H
 #define LMP_FIX_QEQ_COMB_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MANYBODY/pair_adp.cpp b/src/MANYBODY/pair_adp.cpp
index 579675c4a020a1d08c60bb39b785a250e3edd8e8..d0b4d197583d260ccf42592dbb7b5921b0384d9d 100644
--- a/src/MANYBODY/pair_adp.cpp
+++ b/src/MANYBODY/pair_adp.cpp
@@ -16,10 +16,10 @@
                          Chandra Veer Singh (Cornell)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_adp.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/MANYBODY/pair_airebo.cpp b/src/MANYBODY/pair_airebo.cpp
index fd5691fecbc508cb7456e7885cac98db39f3a184..3be27354c15c46929e4700e8f453f2f1cce45c5e 100644
--- a/src/MANYBODY/pair_airebo.cpp
+++ b/src/MANYBODY/pair_airebo.cpp
@@ -20,10 +20,10 @@
      Thomas C. O'Connor (JHU) 2014
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <mpi.h>
 #include "pair_airebo.h"
 #include "atom.h"
diff --git a/src/MANYBODY/pair_airebo.h b/src/MANYBODY/pair_airebo.h
index d9628f3bb30893590c26d6260d1cb1e2da10acc7..c7c9b07357c2ae11bbd6a48ac427d6e435f1257e 100644
--- a/src/MANYBODY/pair_airebo.h
+++ b/src/MANYBODY/pair_airebo.h
@@ -22,7 +22,7 @@ PairStyle(airebo,PairAIREBO)
 
 #include "pair.h"
 #include "my_page.h"
-#include <math.h>
+#include <cmath>
 #include "math_const.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MANYBODY/pair_bop.cpp b/src/MANYBODY/pair_bop.cpp
index 04d7cd41531a87dc4505a969dd14c69f9e974302..87a23dff99c4c16bd88fd68101f0b0103f08ab39 100644
--- a/src/MANYBODY/pair_bop.cpp
+++ b/src/MANYBODY/pair_bop.cpp
@@ -32,10 +32,10 @@
    Rules"_http://lammps.sandia.gov/open_source.html
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <mpi.h>
 #include "pair_bop.h"
 #include "atom.h"
@@ -49,7 +49,7 @@
 #include "neigh_request.h"
 #include "memory.h"
 #include "error.h"
-#include <ctype.h>
+#include <cctype>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/MANYBODY/pair_bop.h b/src/MANYBODY/pair_bop.h
index ec6448db47c19cc53616a1945ecd74fff619c267..3bd9b8cea970da0ea9ede32c54c3290cf10c4644 100644
--- a/src/MANYBODY/pair_bop.h
+++ b/src/MANYBODY/pair_bop.h
@@ -26,7 +26,7 @@ PairStyle(bop,PairBOP)
 #define LMP_PAIR_BOP_H
 
 #include "pair.h"
-#include <time.h>
+#include <ctime>
 #include "update.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MANYBODY/pair_comb.cpp b/src/MANYBODY/pair_comb.cpp
index 5a2b4c25403bb99d85c579640c663a312493c4e1..de686d4bcf5e68ebf9dedaf9aacc72dd3a3e8c65 100644
--- a/src/MANYBODY/pair_comb.cpp
+++ b/src/MANYBODY/pair_comb.cpp
@@ -18,10 +18,10 @@
    and Aidan Thompson's Tersoff code in LAMMPS
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_comb.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MANYBODY/pair_comb3.cpp b/src/MANYBODY/pair_comb3.cpp
index 743511e753201a7c7ee0afdd5e7b6f535ab05277..e38a05c6edffb4eab8a6e34089c86762d94971de 100644
--- a/src/MANYBODY/pair_comb3.cpp
+++ b/src/MANYBODY/pair_comb3.cpp
@@ -17,10 +17,10 @@
                       Dundar Yilmaz (dundar.yilmaz@zirve.edu.tr)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_comb3.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MANYBODY/pair_eam.cpp b/src/MANYBODY/pair_eam.cpp
index 29a627e1d09b9406eb7372dfd33f28fb1110b355..9e70b19eea753ee8174808c5e063390123f6ba47 100644
--- a/src/MANYBODY/pair_eam.cpp
+++ b/src/MANYBODY/pair_eam.cpp
@@ -15,10 +15,10 @@
    Contributing authors: Stephen Foiles (SNL), Murray Daw (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_eam.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/MANYBODY/pair_eam.h b/src/MANYBODY/pair_eam.h
index 63fdde9fc5a7a060e00ec704c2522fad0526a79a..234552157b305e7c439d0b04bf529c5c07a62934 100644
--- a/src/MANYBODY/pair_eam.h
+++ b/src/MANYBODY/pair_eam.h
@@ -20,7 +20,7 @@ PairStyle(eam,PairEAM)
 #ifndef LMP_PAIR_EAM_H
 #define LMP_PAIR_EAM_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pair.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MANYBODY/pair_eam_alloy.cpp b/src/MANYBODY/pair_eam_alloy.cpp
index e22b4642a82d5609710c287fbabda4fe67792fd1..eed38f79e9f75c9a258dec18edff32307dbdfaf9 100644
--- a/src/MANYBODY/pair_eam_alloy.cpp
+++ b/src/MANYBODY/pair_eam_alloy.cpp
@@ -15,9 +15,9 @@
    Contributing authors: Stephen Foiles (SNL), Murray Daw (SNL)
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_eam_alloy.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MANYBODY/pair_eam_fs.cpp b/src/MANYBODY/pair_eam_fs.cpp
index 2817e13f8a3b96d9121983e3710e0e29f64cb0eb..2b5d530d3a962e2c15b3e8dbc3d05ba2d59ac3f4 100644
--- a/src/MANYBODY/pair_eam_fs.cpp
+++ b/src/MANYBODY/pair_eam_fs.cpp
@@ -15,9 +15,9 @@
    Contributing authors: Tim Lau (MIT)
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_eam_fs.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MANYBODY/pair_eim.cpp b/src/MANYBODY/pair_eim.cpp
index e2d8a88aee67c9ddb852865d29b095097145f14a..b810d444fc6483cde6a87733b9376557efce7739 100644
--- a/src/MANYBODY/pair_eim.cpp
+++ b/src/MANYBODY/pair_eim.cpp
@@ -15,10 +15,10 @@
    Contributing author: Xiaowang Zhou (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_eim.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/MANYBODY/pair_eim.h b/src/MANYBODY/pair_eim.h
index 9b2d518a2a20d97af6ed3cc25cdb56c2ea10198f..50f9934c44b94ad6c74533bba1e9684ddfe15ade 100644
--- a/src/MANYBODY/pair_eim.h
+++ b/src/MANYBODY/pair_eim.h
@@ -20,7 +20,7 @@ PairStyle(eim,PairEIM)
 #ifndef LMP_PAIR_EIM_H
 #define LMP_PAIR_EIM_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pair.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MANYBODY/pair_gw.cpp b/src/MANYBODY/pair_gw.cpp
index 8befa42d1c6ec5f022eb18ddf7c435253e9a0a1e..35f092b580e4693e45db8bbda6b0a12d20a094ac 100644
--- a/src/MANYBODY/pair_gw.cpp
+++ b/src/MANYBODY/pair_gw.cpp
@@ -16,10 +16,10 @@
    based on PairTersoff by Aidan Thompson (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_gw.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MANYBODY/pair_gw_zbl.cpp b/src/MANYBODY/pair_gw_zbl.cpp
index a4e1ccb1f994b4a612b2eba8e9baf737891d6edb..81d4866e84f6a654dd057b9ea892ae9f6ce12505 100644
--- a/src/MANYBODY/pair_gw_zbl.cpp
+++ b/src/MANYBODY/pair_gw_zbl.cpp
@@ -16,10 +16,10 @@
    Based on PairTersoffZBL by Aidan Thompson (SNL) and David Farrell (NWU)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_gw_zbl.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/MANYBODY/pair_lcbop.cpp b/src/MANYBODY/pair_lcbop.cpp
index 414f2adb741f4cbef4338eb2cbbec7eaee21bd4f..d334defcc607447a357b6a2da1d215d6dcd6cba5 100644
--- a/src/MANYBODY/pair_lcbop.cpp
+++ b/src/MANYBODY/pair_lcbop.cpp
@@ -16,10 +16,10 @@
      based on pair_airebo by Ase Henry (MIT)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <mpi.h>
 #include "pair_lcbop.h"
 #include "atom.h"
diff --git a/src/MANYBODY/pair_lcbop.h b/src/MANYBODY/pair_lcbop.h
index c099c7c4a1be2e64f5a664551b05c77fcaf718bf..0d7c7a51b17e220abc290d9d348398894c2dc08c 100644
--- a/src/MANYBODY/pair_lcbop.h
+++ b/src/MANYBODY/pair_lcbop.h
@@ -22,7 +22,7 @@ PairStyle(lcbop,PairLCBOP)
 
 #include "pair.h"
 #include "my_page.h"
-#include <math.h>
+#include <cmath>
 #include "math_const.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MANYBODY/pair_nb3b_harmonic.cpp b/src/MANYBODY/pair_nb3b_harmonic.cpp
index 0b930c73608c1996a9e58f279332a19ac5f50bf9..36be9c2b90758b075a7566f6c469d038049c2f5d 100644
--- a/src/MANYBODY/pair_nb3b_harmonic.cpp
+++ b/src/MANYBODY/pair_nb3b_harmonic.cpp
@@ -16,10 +16,10 @@
    (based on Stillinger-Weber pair style)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_nb3b_harmonic.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MANYBODY/pair_polymorphic.cpp b/src/MANYBODY/pair_polymorphic.cpp
index 9ceceed076825d4d81c4a90c85c9a40969a8def1..2afb08b7a1e6e56059a44c3e862d047bb95566be 100644
--- a/src/MANYBODY/pair_polymorphic.cpp
+++ b/src/MANYBODY/pair_polymorphic.cpp
@@ -16,10 +16,10 @@
    This modifies from pair_tersoff.cpp by Aidan Thompson (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_polymorphic.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MANYBODY/pair_polymorphic.h b/src/MANYBODY/pair_polymorphic.h
index 3b5407f802938e4e78cf42e9a5669278ea92a402..32f1c5414a6714847f2877a643224d50544cf89f 100644
--- a/src/MANYBODY/pair_polymorphic.h
+++ b/src/MANYBODY/pair_polymorphic.h
@@ -21,7 +21,7 @@ PairStyle(polymorphic,PairPolymorphic)
 #define LMP_PAIR_POLYMORPHIC_H
 
 #include "pair.h"
-#include <math.h>
+#include <cmath>
 
 namespace LAMMPS_NS {
 
diff --git a/src/MANYBODY/pair_sw.cpp b/src/MANYBODY/pair_sw.cpp
index da2f5da37e003119d2f77521f883bbb28630bc20..6fbc00204c3ba8e046262799357281d8730e4d22 100644
--- a/src/MANYBODY/pair_sw.cpp
+++ b/src/MANYBODY/pair_sw.cpp
@@ -15,10 +15,10 @@
    Contributing author: Aidan Thompson (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_sw.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MANYBODY/pair_tersoff.cpp b/src/MANYBODY/pair_tersoff.cpp
index 047c59fc87797802531951c2f6abf81ca5c6e716..507b07e29a21fc1031b1c25269f35da942d19715 100644
--- a/src/MANYBODY/pair_tersoff.cpp
+++ b/src/MANYBODY/pair_tersoff.cpp
@@ -15,10 +15,10 @@
    Contributing author: Aidan Thompson (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_tersoff.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MANYBODY/pair_tersoff_mod.cpp b/src/MANYBODY/pair_tersoff_mod.cpp
index a90cf3bb77fbcbce5f9609aa507ec3e44ffb023b..73297fb53451640d9cf105de3367d49b5cb78c82 100644
--- a/src/MANYBODY/pair_tersoff_mod.cpp
+++ b/src/MANYBODY/pair_tersoff_mod.cpp
@@ -16,10 +16,10 @@
                         Vitaly Dozhdikov (JIHT of RAS) - MOD addition
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_tersoff_mod.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MANYBODY/pair_tersoff_mod.h b/src/MANYBODY/pair_tersoff_mod.h
index 42a3a2b26c96ca2511ef0968b70177234bc88860..162603bc5ca42d16fe513e949b609583d74c83bd 100644
--- a/src/MANYBODY/pair_tersoff_mod.h
+++ b/src/MANYBODY/pair_tersoff_mod.h
@@ -21,7 +21,7 @@ PairStyle(tersoff/mod,PairTersoffMOD)
 #define LMP_PAIR_TERSOFF_MOD_H
 
 #include "pair_tersoff.h"
-#include <math.h>
+#include <cmath>
 
 namespace LAMMPS_NS {
 
diff --git a/src/MANYBODY/pair_tersoff_mod_c.cpp b/src/MANYBODY/pair_tersoff_mod_c.cpp
index c0d6cb164a2d98dc13449c591e7e7e96cddaad7e..0d0016664a1dd93c1a981ae95af29958ef012c1f 100644
--- a/src/MANYBODY/pair_tersoff_mod_c.cpp
+++ b/src/MANYBODY/pair_tersoff_mod_c.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ganga P Purja Pun (George Mason University, Fairfax)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_tersoff_mod_c.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MANYBODY/pair_tersoff_zbl.cpp b/src/MANYBODY/pair_tersoff_zbl.cpp
index 15163c2bf9843607dde1f65d8e78d0abdef78957..1692c88a5087b1f970a63a3b4dce00705a5358f6 100644
--- a/src/MANYBODY/pair_tersoff_zbl.cpp
+++ b/src/MANYBODY/pair_tersoff_zbl.cpp
@@ -16,10 +16,10 @@
                         David Farrell (NWU) - ZBL addition
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_tersoff_zbl.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/MANYBODY/pair_vashishta.cpp b/src/MANYBODY/pair_vashishta.cpp
index bc594d9b4daf614bc0bc3afe835bb86bd0dfcd82..8506c9a69fd79f35f362f5f24f65854cf34e5537 100644
--- a/src/MANYBODY/pair_vashishta.cpp
+++ b/src/MANYBODY/pair_vashishta.cpp
@@ -16,10 +16,10 @@
                          Aidan Thompson (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_vashishta.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MANYBODY/pair_vashishta_table.cpp b/src/MANYBODY/pair_vashishta_table.cpp
index 88a7040d761d6127bd2f08a3e727dcbfd9b7f169..1055db99fa8b06df3e880280d839aafd19ef1650 100644
--- a/src/MANYBODY/pair_vashishta_table.cpp
+++ b/src/MANYBODY/pair_vashishta_table.cpp
@@ -15,10 +15,10 @@
    Contributing author: Anders Hafreager (UiO), andershaf@gmail.com
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_vashishta_table.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MC/fix_atom_swap.cpp b/src/MC/fix_atom_swap.cpp
index 100600c0daeb2c169b6ed0a9ed66243315603e1e..4d9377022b265fe1488bf241e4ac69f3c1185252 100644
--- a/src/MC/fix_atom_swap.cpp
+++ b/src/MC/fix_atom_swap.cpp
@@ -16,10 +16,10 @@
                          Alexander Stukowski
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <float.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cfloat>
+#include <cstdlib>
+#include <cstring>
 #include "fix_atom_swap.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/MC/fix_atom_swap.h b/src/MC/fix_atom_swap.h
index 74720d6222e1dcdf9cfc3a4d054c60a609cd9c43..19895704f186dd87325acfcefc56d6ad902863ff 100644
--- a/src/MC/fix_atom_swap.h
+++ b/src/MC/fix_atom_swap.h
@@ -20,7 +20,7 @@ FixStyle(atom/swap,FixAtomSwap)
 #ifndef LMP_FIX_MCSWAP_H
 #define LMP_FIX_MCSWAP_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MC/fix_bond_break.cpp b/src/MC/fix_bond_break.cpp
index 711f764282b92737b6b98fda94c9cbd4ffe16fd2..9a5b59b60188b89d2cf671a1a3fbf1db1e265daa 100644
--- a/src/MC/fix_bond_break.cpp
+++ b/src/MC/fix_bond_break.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include <mpi.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "fix_bond_break.h"
 #include "update.h"
 #include "respa.h"
diff --git a/src/MC/fix_bond_create.cpp b/src/MC/fix_bond_create.cpp
index 789f1794f1864f1823def41669bb5250b452ce08..8e9db6a18b130819adbbf280fdbdae9ce2c9fea4 100644
--- a/src/MC/fix_bond_create.cpp
+++ b/src/MC/fix_bond_create.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include <mpi.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "fix_bond_create.h"
 #include "update.h"
 #include "respa.h"
diff --git a/src/MC/fix_bond_swap.cpp b/src/MC/fix_bond_swap.cpp
index d5b7394dd1e799ea32299f82233b29d641baf7df..d6df4d9a960343520e610280e5941600584b6050 100644
--- a/src/MC/fix_bond_swap.cpp
+++ b/src/MC/fix_bond_swap.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_bond_swap.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/MC/fix_gcmc.cpp b/src/MC/fix_gcmc.cpp
index f2c41c9ccf0559ee3103c99d62994d95e2af907d..08fe7de5cb4a12402698e60410e9936609d8bf49 100644
--- a/src/MC/fix_gcmc.cpp
+++ b/src/MC/fix_gcmc.cpp
@@ -15,9 +15,9 @@
    Contributing author: Paul Crozier, Aidan Thompson (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_gcmc.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/MC/fix_gcmc.h b/src/MC/fix_gcmc.h
index e8de53215fcd319bb0ecc62fb42c2ec11071c150..5d0b7aab8fab5377f2ec065110b76fce99816851 100644
--- a/src/MC/fix_gcmc.h
+++ b/src/MC/fix_gcmc.h
@@ -20,7 +20,7 @@ FixStyle(gcmc,FixGCMC)
 #ifndef LMP_FIX_GCMC_H
 #define LMP_FIX_GCMC_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MC/fix_tfmc.cpp b/src/MC/fix_tfmc.cpp
index 60ded5fd4470edab95493552700d820111323b9c..b8217103535a2e08826fffa134c831e3856bdffe 100644
--- a/src/MC/fix_tfmc.cpp
+++ b/src/MC/fix_tfmc.cpp
@@ -17,9 +17,9 @@
 
 #include "fix_tfmc.h"
 #include <mpi.h>
-#include <string.h>
-#include <math.h>
-#include <float.h>
+#include <cstring>
+#include <cmath>
+#include <cfloat>
 #include "atom.h"
 #include "force.h"
 #include "update.h"
diff --git a/src/MC/pair_dsmc.cpp b/src/MC/pair_dsmc.cpp
index d3327eea296b943a8c49e0bf57d270b6a7917944..02f9754c2a2fdd1a78565931d607010ca66e1a49 100644
--- a/src/MC/pair_dsmc.cpp
+++ b/src/MC/pair_dsmc.cpp
@@ -15,10 +15,11 @@
    Contributing authors: Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <climits>
 #include "pair_dsmc.h"
 #include "atom.h"
 #include "comm.h"
@@ -28,7 +29,6 @@
 #include "domain.h"
 #include "update.h"
 #include "random_mars.h"
-#include <limits.h>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/MEAM/pair_meam.cpp b/src/MEAM/pair_meam.cpp
index fa47944cd50944c4e5c631b8088c42a51c519f86..687055aa6a6735fceb1749c4124ae73797dc8d9f 100644
--- a/src/MEAM/pair_meam.cpp
+++ b/src/MEAM/pair_meam.cpp
@@ -15,10 +15,10 @@
    Contributing author: Greg Wagner (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_meam.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/MISC/compute_msd_nongauss.cpp b/src/MISC/compute_msd_nongauss.cpp
index 4639fa7916c116ef0f4786819c716b0cf91474b3..f6291f4204e0633921c69f63c3f0709922e7fe24 100644
--- a/src/MISC/compute_msd_nongauss.cpp
+++ b/src/MISC/compute_msd_nongauss.cpp
@@ -15,7 +15,7 @@
    Contributing authors: Rob Hoy
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_msd_nongauss.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/MISC/compute_ti.cpp b/src/MISC/compute_ti.cpp
index 9f1b2898bbe67ea3d3fc1f73bef1db7c46bd42bc..d2e43a9f69ffd417afd1668b983b2225960816b1 100644
--- a/src/MISC/compute_ti.cpp
+++ b/src/MISC/compute_ti.cpp
@@ -17,7 +17,7 @@
 
 #include <mpi.h>
 #include "atom.h"
-#include <string.h>
+#include <cstring>
 #include "compute_ti.h"
 #include "update.h"
 #include "modify.h"
diff --git a/src/MISC/dump_xtc.cpp b/src/MISC/dump_xtc.cpp
index 674e480f9e697fd0b2049d208fa79094e2b99ff8..a82cba20bde3fd4e1c05bac4525abe898d61fbae 100644
--- a/src/MISC/dump_xtc.cpp
+++ b/src/MISC/dump_xtc.cpp
@@ -22,11 +22,11 @@
                            support for groups
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <climits>
 #include "dump_xtc.h"
 #include "domain.h"
 #include "atom.h"
diff --git a/src/MISC/fix_deposit.cpp b/src/MISC/fix_deposit.cpp
index 023ec797df0099d3724beac106ebfdb5f8f39497..4215df07a62c3ef7d1f8e276ef9a8015bf581d41 100644
--- a/src/MISC/fix_deposit.cpp
+++ b/src/MISC/fix_deposit.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_deposit.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/MISC/fix_deposit.h b/src/MISC/fix_deposit.h
index 46de781d8998f4c47a4bc0f75c8ff83afcee27ac..38958b80e7a2af9f0d2d088d5b716f4b575ebe19 100644
--- a/src/MISC/fix_deposit.h
+++ b/src/MISC/fix_deposit.h
@@ -20,7 +20,7 @@ FixStyle(deposit,FixDeposit)
 #ifndef LMP_FIX_DEPOSIT_H
 #define LMP_FIX_DEPOSIT_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MISC/fix_efield.cpp b/src/MISC/fix_efield.cpp
index c0384adc410e64d6c8b337ca9e551bb5bcb5e753..1fa141e2bf3c9ea821436fc46a105dbbf034dd6b 100644
--- a/src/MISC/fix_efield.cpp
+++ b/src/MISC/fix_efield.cpp
@@ -16,9 +16,9 @@
                         Stan Moore (Sandia) for dipole terms
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_efield.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/MISC/fix_evaporate.cpp b/src/MISC/fix_evaporate.cpp
index 54d1090892eeb75cc84dd704e987489d14ba7c6e..1bf7a15f1fe02372998cad59e425529e7470a822 100644
--- a/src/MISC/fix_evaporate.cpp
+++ b/src/MISC/fix_evaporate.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_evaporate.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/MISC/fix_gld.cpp b/src/MISC/fix_gld.cpp
index 90579388cc9cb953d6447d40cf2a95ea6514ef45..370730133ee1cc77eaa9dde98bb91ebb5e8bc01c 100644
--- a/src/MISC/fix_gld.cpp
+++ b/src/MISC/fix_gld.cpp
@@ -16,9 +16,9 @@
                          Andrew Baczewski (Michigan State/SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include "fix_gld.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/MISC/fix_oneway.cpp b/src/MISC/fix_oneway.cpp
index 758beed5536f273e331a2b814e2cc81b606d4593..73853775a30c2d8db9710101c366a6e714bd3903 100644
--- a/src/MISC/fix_oneway.cpp
+++ b/src/MISC/fix_oneway.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (ICTP, Italy)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_oneway.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/MISC/fix_orient_bcc.cpp b/src/MISC/fix_orient_bcc.cpp
index 0cb0f96aa8d722bffed2edb04999cb7a36c41217..c5ba6514a90c566688e530f85d65415039586b22 100644
--- a/src/MISC/fix_orient_bcc.cpp
+++ b/src/MISC/fix_orient_bcc.cpp
@@ -18,9 +18,9 @@
             (https://dx.doi.org/10.6084/m9.figshare.1488628.v1
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include <mpi.h>
 #include "fix_orient_bcc.h"
 #include "atom.h"
diff --git a/src/MISC/fix_orient_fcc.cpp b/src/MISC/fix_orient_fcc.cpp
index 6743132cfa2e0f1d862626e4b4a1de040f9d45b7..5786571a89e9a9ccb8445ee2bc4c5582af8c22f6 100644
--- a/src/MISC/fix_orient_fcc.cpp
+++ b/src/MISC/fix_orient_fcc.cpp
@@ -15,9 +15,9 @@
    Contributing authors: Koenraad Janssens and David Olmsted (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include <mpi.h>
 #include "fix_orient_fcc.h"
 #include "atom.h"
diff --git a/src/MISC/fix_thermal_conductivity.cpp b/src/MISC/fix_thermal_conductivity.cpp
index b9e70e9c009cb4bdb57146a953ecaa43abfa8138..f1aec3ff6991a1adb129c54d90b0198dbee2831d 100644
--- a/src/MISC/fix_thermal_conductivity.cpp
+++ b/src/MISC/fix_thermal_conductivity.cpp
@@ -16,10 +16,10 @@
                         for swapping atoms of different masses
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include <mpi.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "fix_thermal_conductivity.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/MISC/fix_ttm.cpp b/src/MISC/fix_ttm.cpp
index bb13b166fbcf4ceb7ea645a55e709067e5c2c075..7ffd979e5089ca391990427693276bc30c74b5a4 100644
--- a/src/MISC/fix_ttm.cpp
+++ b/src/MISC/fix_ttm.cpp
@@ -17,9 +17,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_ttm.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/MISC/fix_viscosity.cpp b/src/MISC/fix_viscosity.cpp
index 3f6d5e33d1ac6eb3dea29b23ca693d7056a51fd3..8e33c1c6148ec4ca20fab9219cf7348722b65ddb 100644
--- a/src/MISC/fix_viscosity.cpp
+++ b/src/MISC/fix_viscosity.cpp
@@ -16,10 +16,10 @@
                         for swapping atoms of different masses
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include <mpi.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "fix_viscosity.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/MISC/pair_nm_cut.cpp b/src/MISC/pair_nm_cut.cpp
index b9bf6ac477052d400a1340620465d731ee3c5774..83d734de0f4e492f8ffdadf2c771aaaaf250b248 100644
--- a/src/MISC/pair_nm_cut.cpp
+++ b/src/MISC/pair_nm_cut.cpp
@@ -15,10 +15,10 @@
    Contributing Author: Julien Devemy (ICCF)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_nm_cut.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MISC/pair_nm_cut_coul_cut.cpp b/src/MISC/pair_nm_cut_coul_cut.cpp
index 78c77a648f906da56b38848436e0ec45aa485eb5..0c9a43f4dc94fc5b4a8e9d2c705be0bad3cc2438 100644
--- a/src/MISC/pair_nm_cut_coul_cut.cpp
+++ b/src/MISC/pair_nm_cut_coul_cut.cpp
@@ -15,10 +15,10 @@
    Contributing Author: Julien Devemy (ICCF)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_nm_cut_coul_cut.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MISC/pair_nm_cut_coul_long.cpp b/src/MISC/pair_nm_cut_coul_long.cpp
index 8e0da40eac78d4689e666325a27da008d4667b3e..3296f8fd92b62ae567c7790ffbf0d98c62cd021a 100644
--- a/src/MISC/pair_nm_cut_coul_long.cpp
+++ b/src/MISC/pair_nm_cut_coul_long.cpp
@@ -15,10 +15,10 @@
    Contributing Author: Julien Devemy (ICCF)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_nm_cut_coul_long.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MISC/xdr_compat.cpp b/src/MISC/xdr_compat.cpp
index 9483070fee919f50b14e1b2dd1f0b8384988bbda..3987aa02fc2e0252cdd1eff3ceaf0b2113cd72c1 100644
--- a/src/MISC/xdr_compat.cpp
+++ b/src/MISC/xdr_compat.cpp
@@ -1,6 +1,6 @@
-#include <stdlib.h>
-#include <limits.h>
-#include <string.h>
+#include <cstdlib>
+#include <climits>
+#include <cstring>
 #include "xdr_compat.h"
 
 /* This file is needed for systems, that do not provide XDR support
diff --git a/src/MISC/xdr_compat.h b/src/MISC/xdr_compat.h
index 605374c47fc7172f42dad2a89137628e2b8bc236..30622350807b7d871a9870e17b45cc4890e38646 100644
--- a/src/MISC/xdr_compat.h
+++ b/src/MISC/xdr_compat.h
@@ -1,9 +1,9 @@
 #ifndef LMP_XDR_COMPAT_H
 #define LMP_XDR_COMPAT_H
 
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <climits>
+#include <cstdio>
+#include <cstdlib>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/MOLECULE/angle_charmm.cpp b/src/MOLECULE/angle_charmm.cpp
index c7284add8ccfa765b96a70e27d861b454de67cc2..3608601c1fdb73ccf0c20b9910ee3101c32bdbfe 100644
--- a/src/MOLECULE/angle_charmm.cpp
+++ b/src/MOLECULE/angle_charmm.cpp
@@ -15,8 +15,8 @@
    Contributing author: Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_charmm.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/angle_charmm.h b/src/MOLECULE/angle_charmm.h
index fa27866be38750ae04cf08ddaab0d6fed5ab479e..82c9e42fbabc92f6a1a4be186aeccfa095e5bcc2 100644
--- a/src/MOLECULE/angle_charmm.h
+++ b/src/MOLECULE/angle_charmm.h
@@ -20,7 +20,7 @@ AngleStyle(charmm,AngleCharmm)
 #ifndef LMP_ANGLE_CHARMM_H
 #define LMP_ANGLE_CHARMM_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/angle_cosine.cpp b/src/MOLECULE/angle_cosine.cpp
index f064a34f20d17aa02f07c90ef152ab87246d8357..e3472dfd7a6b3050a0ab2690764efb8ffaece032 100644
--- a/src/MOLECULE/angle_cosine.cpp
+++ b/src/MOLECULE/angle_cosine.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_cosine.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/angle_cosine.h b/src/MOLECULE/angle_cosine.h
index a6581f11bde0bd01e2c5459000df9495c146a9da..ac50a67468ea875df965388fc1a52be35c8db2b7 100644
--- a/src/MOLECULE/angle_cosine.h
+++ b/src/MOLECULE/angle_cosine.h
@@ -20,7 +20,7 @@ AngleStyle(cosine,AngleCosine)
 #ifndef LMP_ANGLE_COSINE_H
 #define LMP_ANGLE_COSINE_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/angle_cosine_delta.cpp b/src/MOLECULE/angle_cosine_delta.cpp
index fe482eb3ebef6fe18160c602c143ed3712747700..6f4f5c20d71198cb00b2b5469e43c0fefee0fe2f 100644
--- a/src/MOLECULE/angle_cosine_delta.cpp
+++ b/src/MOLECULE/angle_cosine_delta.cpp
@@ -15,8 +15,8 @@
    Contributing author: Axel Kohlmeyer (Temple U), akohlmey at gmail.com
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_cosine_delta.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/angle_cosine_delta.h b/src/MOLECULE/angle_cosine_delta.h
index b29064e35eadbcb2d4fd6ad8efc6b4994fef5995..1e19ecaf7962e4883403a51e34d3707df5e1693e 100644
--- a/src/MOLECULE/angle_cosine_delta.h
+++ b/src/MOLECULE/angle_cosine_delta.h
@@ -20,7 +20,7 @@ AngleStyle(cosine/delta,AngleCosineDelta)
 #ifndef LMP_ANGLE_COSINE_DELTA_H
 #define LMP_ANGLE_COSINE_DELTA_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle_cosine_squared.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/angle_cosine_periodic.cpp b/src/MOLECULE/angle_cosine_periodic.cpp
index 77fb335b785c769c6494012e2e5798b29ca44555..4e620b436e4f0a3a505d683e792e1ea8fc5cc3a0 100644
--- a/src/MOLECULE/angle_cosine_periodic.cpp
+++ b/src/MOLECULE/angle_cosine_periodic.cpp
@@ -15,8 +15,8 @@
    Contributing author: Tod A Pascal (Caltech)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_cosine_periodic.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/angle_cosine_periodic.h b/src/MOLECULE/angle_cosine_periodic.h
index 9b7f06227241f929095e0b00f153c413f98e05e3..e131e85101e8d452bca29cc4389bd268baf5a8d2 100644
--- a/src/MOLECULE/angle_cosine_periodic.h
+++ b/src/MOLECULE/angle_cosine_periodic.h
@@ -20,7 +20,7 @@ AngleStyle(cosine/periodic, AngleCosinePeriodic)
 #ifndef LMP_ANGLE_PERIODIC_H
 #define LMP_ANGLE_PERIODIC_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/angle_cosine_squared.cpp b/src/MOLECULE/angle_cosine_squared.cpp
index bc38d76dcdb4fded224f9994d08f756c8532255b..c261f3482d2a24917cebf64bbd21ed6df1329f62 100644
--- a/src/MOLECULE/angle_cosine_squared.cpp
+++ b/src/MOLECULE/angle_cosine_squared.cpp
@@ -15,8 +15,8 @@
    Contributing author: Naveen Michaud-Agrawal (Johns Hopkins U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_cosine_squared.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/angle_cosine_squared.h b/src/MOLECULE/angle_cosine_squared.h
index b9f79f923fb794e5c4c0842c2da44023d9db18ec..8e8c84c0f99c98a107d8072cdfac53badf04c3b7 100644
--- a/src/MOLECULE/angle_cosine_squared.h
+++ b/src/MOLECULE/angle_cosine_squared.h
@@ -20,7 +20,7 @@ AngleStyle(cosine/squared,AngleCosineSquared)
 #ifndef LMP_ANGLE_COSINE_SQUARED_H
 #define LMP_ANGLE_COSINE_SQUARED_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/angle_harmonic.cpp b/src/MOLECULE/angle_harmonic.cpp
index 7e8b57b04fad7748eeaf0ce0f1ee75a743992425..c7fe8d7a1fb47e6ec36744e90b88b7722be6c0af 100644
--- a/src/MOLECULE/angle_harmonic.cpp
+++ b/src/MOLECULE/angle_harmonic.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_harmonic.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/angle_harmonic.h b/src/MOLECULE/angle_harmonic.h
index 177e7cbadb7b404167bbdf91484a342c8ae6c211..ff8bd55fc00f217009ae3e606de45c18873cb796 100644
--- a/src/MOLECULE/angle_harmonic.h
+++ b/src/MOLECULE/angle_harmonic.h
@@ -20,7 +20,7 @@ AngleStyle(harmonic,AngleHarmonic)
 #ifndef LMP_ANGLE_HARMONIC_H
 #define LMP_ANGLE_HARMONIC_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/angle_table.cpp b/src/MOLECULE/angle_table.cpp
index 6e145efa10850909b288d8e0941ecc27c641a979..235e9b4d5b379c480026b052e0fb63d7a175810a 100644
--- a/src/MOLECULE/angle_table.cpp
+++ b/src/MOLECULE/angle_table.cpp
@@ -15,9 +15,9 @@
    Contributing author: Chuanfu Luo (luochuanfu@gmail.com)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "angle_table.h"
 #include "atom.h"
 #include "neighbor.h"
@@ -609,7 +609,7 @@ double AngleTable::splint(double *xa, double *ya, double *y2a, int n, double x)
 
 void AngleTable::uf_lookup(int type, double x, double &u, double &f)
 {
-  if (!ISFINITE(x)) {
+  if (!std::isfinite(x)) {
     error->one(FLERR,"Illegal angle in angle style table");
   }
 
@@ -644,7 +644,7 @@ void AngleTable::uf_lookup(int type, double x, double &u, double &f)
 
 void AngleTable::u_lookup(int type, double x, double &u)
 {
-  if (!ISFINITE(x)) {
+  if (!std::isfinite(x)) {
     error->one(FLERR,"Illegal angle in angle style table");
   }
 
diff --git a/src/MOLECULE/angle_table.h b/src/MOLECULE/angle_table.h
index 984c5dc640eafb82eacdcc85ef1e3842f2754c89..0088ace39b7a709a4da82d1a069c6a73d923956b 100644
--- a/src/MOLECULE/angle_table.h
+++ b/src/MOLECULE/angle_table.h
@@ -20,7 +20,7 @@ AngleStyle(table,AngleTable)
 #ifndef LMP_ANGLE_TABLE_H
 #define LMP_ANGLE_TABLE_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/atom_vec_angle.cpp b/src/MOLECULE/atom_vec_angle.cpp
index 7053f0eb30b7b1976282bf16f49f5c87d0ae35a5..6eb5b50fd2265e0559b68637f2dafd58d1b0eae0 100644
--- a/src/MOLECULE/atom_vec_angle.cpp
+++ b/src/MOLECULE/atom_vec_angle.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "atom_vec_angle.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MOLECULE/atom_vec_bond.cpp b/src/MOLECULE/atom_vec_bond.cpp
index bae924c28add23da39dc550f7c3ea1427607e1b6..6a7b3585b4a17d07bcd45a68a174f98ede2c486d 100644
--- a/src/MOLECULE/atom_vec_bond.cpp
+++ b/src/MOLECULE/atom_vec_bond.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "atom_vec_bond.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MOLECULE/atom_vec_full.cpp b/src/MOLECULE/atom_vec_full.cpp
index ba85a1280b46545963ab5f700508ae433cd38621..d682abf7994705eb2ff93d4eeb25c170842d0f1e 100644
--- a/src/MOLECULE/atom_vec_full.cpp
+++ b/src/MOLECULE/atom_vec_full.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "atom_vec_full.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MOLECULE/atom_vec_molecular.cpp b/src/MOLECULE/atom_vec_molecular.cpp
index 23786d7641a7464f63ddd93a910fa110fc50ee5a..6e903a936eb8177db81606880bd23655739f64dc 100644
--- a/src/MOLECULE/atom_vec_molecular.cpp
+++ b/src/MOLECULE/atom_vec_molecular.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "atom_vec_molecular.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MOLECULE/atom_vec_template.cpp b/src/MOLECULE/atom_vec_template.cpp
index 5d3b0a326492fe1ca1aef37be2d20b2e2a762c1a..3172804b95b1009c2349192d10ffe2233744bfc3 100644
--- a/src/MOLECULE/atom_vec_template.cpp
+++ b/src/MOLECULE/atom_vec_template.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "atom_vec_template.h"
 #include "atom.h"
 #include "molecule.h"
diff --git a/src/MOLECULE/bond_fene.cpp b/src/MOLECULE/bond_fene.cpp
index 5d58f2683a0a4969663776323761d101d50bb31b..b6da72bfaf6b6968609ed1670a14149b66cd5be3 100644
--- a/src/MOLECULE/bond_fene.cpp
+++ b/src/MOLECULE/bond_fene.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "bond_fene.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/bond_fene.h b/src/MOLECULE/bond_fene.h
index 6124478567e8bfd550c1a90af645b800a2572660..678ae165d66ffd59347e8451d8f95fd8f1465e39 100644
--- a/src/MOLECULE/bond_fene.h
+++ b/src/MOLECULE/bond_fene.h
@@ -20,7 +20,7 @@ BondStyle(fene,BondFENE)
 #ifndef LMP_BOND_FENE_H
 #define LMP_BOND_FENE_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "bond.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/bond_fene_expand.cpp b/src/MOLECULE/bond_fene_expand.cpp
index 033f8d6502ef91d2fcb53b9b25a972bfa01eb391..26b699d7bfdcca6cdd8d1ecb2d87e0d610c4ac38 100644
--- a/src/MOLECULE/bond_fene_expand.cpp
+++ b/src/MOLECULE/bond_fene_expand.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "bond_fene_expand.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/bond_fene_expand.h b/src/MOLECULE/bond_fene_expand.h
index 1971c6f428037558dace9aa741f85dcc0ad06d89..cb316ac5f2b366cd534e1429088eaffe6cce15e9 100644
--- a/src/MOLECULE/bond_fene_expand.h
+++ b/src/MOLECULE/bond_fene_expand.h
@@ -20,7 +20,7 @@ BondStyle(fene/expand,BondFENEExpand)
 #ifndef LMP_BOND_FENE_EXPAND_H
 #define LMP_BOND_FENE_EXPAND_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "bond.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/bond_gromos.cpp b/src/MOLECULE/bond_gromos.cpp
index 4e409b7a72d686a7c573801a7bdaba608548ffd7..8e989259afa750eabdf5f44ac2ef91ab8f943b58 100644
--- a/src/MOLECULE/bond_gromos.cpp
+++ b/src/MOLECULE/bond_gromos.cpp
@@ -15,9 +15,9 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "bond_gromos.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/bond_gromos.h b/src/MOLECULE/bond_gromos.h
index dafe85e92b2e671427d3c1e8e8e68e6ab38b0202..c26ad64b3d6ad5bcdeaaa3b8f94303299e7b0e82 100644
--- a/src/MOLECULE/bond_gromos.h
+++ b/src/MOLECULE/bond_gromos.h
@@ -20,7 +20,7 @@ BondStyle(gromos,BondGromos)
 #ifndef LMP_BOND_GROMOS_H
 #define LMP_BOND_GROMOS_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "bond.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/bond_harmonic.cpp b/src/MOLECULE/bond_harmonic.cpp
index 0763d7d3e24667be3c3d81adbd236c16c3a54c7b..e7f510d2de9c59607351eba0b80ac51ce19a7831 100644
--- a/src/MOLECULE/bond_harmonic.cpp
+++ b/src/MOLECULE/bond_harmonic.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "bond_harmonic.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/bond_harmonic.h b/src/MOLECULE/bond_harmonic.h
index a0fd24577a8988e18fcb7a676a0041c353c52191..73f6a9f774cbb373fa9161701cf6680822b23c29 100644
--- a/src/MOLECULE/bond_harmonic.h
+++ b/src/MOLECULE/bond_harmonic.h
@@ -20,7 +20,7 @@ BondStyle(harmonic,BondHarmonic)
 #ifndef LMP_BOND_HARMONIC_H
 #define LMP_BOND_HARMONIC_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "bond.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/bond_morse.cpp b/src/MOLECULE/bond_morse.cpp
index 3204a0ca6183b003e0ec012083a8cd817f6e6f2c..35be50e8df9b6eebd071933953b1298c9d6e8ad3 100644
--- a/src/MOLECULE/bond_morse.cpp
+++ b/src/MOLECULE/bond_morse.cpp
@@ -15,8 +15,8 @@
    Contributing author: Jeff Greathouse (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "bond_morse.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/bond_morse.h b/src/MOLECULE/bond_morse.h
index 74379c91ee766b50996ad32d97219bfbb7d31ecd..c4d60bc21768c1ffe3ddf806d26dfea6dd475a95 100644
--- a/src/MOLECULE/bond_morse.h
+++ b/src/MOLECULE/bond_morse.h
@@ -20,7 +20,7 @@ BondStyle(morse,BondMorse)
 #ifndef LMP_BOND_MORSE_H
 #define LMP_BOND_MORSE_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "bond.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/bond_nonlinear.cpp b/src/MOLECULE/bond_nonlinear.cpp
index edd9dcd4e5c9e8e8be20a2ea85c1ee5b3fb13a3a..3926c3494b3666e0a30af5b5c51bd00bc92476ca 100644
--- a/src/MOLECULE/bond_nonlinear.cpp
+++ b/src/MOLECULE/bond_nonlinear.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "bond_nonlinear.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/bond_nonlinear.h b/src/MOLECULE/bond_nonlinear.h
index 5d2448b112b45d24229f5e1768911fe211b82f18..175421264b91e11b0f71453716bb11c774f00d34 100644
--- a/src/MOLECULE/bond_nonlinear.h
+++ b/src/MOLECULE/bond_nonlinear.h
@@ -20,7 +20,7 @@ BondStyle(nonlinear,BondNonlinear)
 #ifndef LMP_BOND_NONLINEAR_H
 #define LMP_BOND_NONLINEAR_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "bond.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/bond_quartic.cpp b/src/MOLECULE/bond_quartic.cpp
index 2a3e395a77f81f9c92b59f6137d0cfbdc6c13a26..f581c7f33155e6d0059d0925e6be5524680e2574 100644
--- a/src/MOLECULE/bond_quartic.cpp
+++ b/src/MOLECULE/bond_quartic.cpp
@@ -15,8 +15,8 @@
    Contributing authors: Chris Lorenz and Mark Stevens (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "bond_quartic.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/bond_quartic.h b/src/MOLECULE/bond_quartic.h
index 21bd7f00b4055a92e407fb0e4429b9de778f2e26..2aaa76e2c374e531637455f612af56ab30bcc3d8 100644
--- a/src/MOLECULE/bond_quartic.h
+++ b/src/MOLECULE/bond_quartic.h
@@ -20,7 +20,7 @@ BondStyle(quartic,BondQuartic)
 #ifndef LMP_BOND_QUARTIC_H
 #define LMP_BOND_QUARTIC_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "bond.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/bond_table.cpp b/src/MOLECULE/bond_table.cpp
index 4f8db66757c5b71fa392e3c84ee5d5d6f76ec946..7515f713df7db4d3e07fe0019f4fec10e93303a0 100644
--- a/src/MOLECULE/bond_table.cpp
+++ b/src/MOLECULE/bond_table.cpp
@@ -15,9 +15,9 @@
    Contributing author: Chuanfu Luo (luochuanfu@gmail.com)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "bond_table.h"
 #include "atom.h"
 #include "neighbor.h"
@@ -590,7 +590,7 @@ double BondTable::splint(double *xa, double *ya, double *y2a, int n, double x)
 
 void BondTable::uf_lookup(int type, double x, double &u, double &f)
 {
-  if (!ISFINITE(x)) {
+  if (!std::isfinite(x)) {
     error->one(FLERR,"Illegal bond in bond style table");
   }
 
@@ -633,7 +633,7 @@ void BondTable::uf_lookup(int type, double x, double &u, double &f)
 
 void BondTable::u_lookup(int type, double x, double &u)
 {
-  if (!ISFINITE(x)) {
+  if (!std::isfinite(x)) {
     error->one(FLERR,"Illegal bond in bond style table");
   }
 
diff --git a/src/MOLECULE/bond_table.h b/src/MOLECULE/bond_table.h
index ee053d497bb4b2960b1ec174e86ae90b152aa05c..5766239167c26dbc80ef62e08d52da29b26bb50f 100644
--- a/src/MOLECULE/bond_table.h
+++ b/src/MOLECULE/bond_table.h
@@ -20,7 +20,7 @@ BondStyle(table,BondTable)
 #ifndef LMP_BOND_TABLE_H
 #define LMP_BOND_TABLE_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "bond.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/dihedral_charmm.cpp b/src/MOLECULE/dihedral_charmm.cpp
index 35953a6ac456185b8b87a49b5b7c5be772e2d3e5..2372fae38b696a01b61cdce87cc83c62e60ee50c 100644
--- a/src/MOLECULE/dihedral_charmm.cpp
+++ b/src/MOLECULE/dihedral_charmm.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "dihedral_charmm.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MOLECULE/dihedral_charmm.h b/src/MOLECULE/dihedral_charmm.h
index 2f8a6a667924473d0b8ecd0e3ec19f426355c13d..349bee73d8ae938f70a31ad13ff327ab25c95928 100644
--- a/src/MOLECULE/dihedral_charmm.h
+++ b/src/MOLECULE/dihedral_charmm.h
@@ -20,7 +20,7 @@ DihedralStyle(charmm,DihedralCharmm)
 #ifndef LMP_DIHEDRAL_CHARMM_H
 #define LMP_DIHEDRAL_CHARMM_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "dihedral.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/dihedral_charmmfsw.cpp b/src/MOLECULE/dihedral_charmmfsw.cpp
index d33db36fda302c9d01c88c9a3bcf23cc17322915..99a53336205f3b5f20623320dd8fa8b092a40073 100644
--- a/src/MOLECULE/dihedral_charmmfsw.cpp
+++ b/src/MOLECULE/dihedral_charmmfsw.cpp
@@ -19,9 +19,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "dihedral_charmmfsw.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MOLECULE/dihedral_charmmfsw.h b/src/MOLECULE/dihedral_charmmfsw.h
index 3c93f8abcf127edc56cb8d8ba16b6374ed94a961..dd31067a8dba9bd39b01373fba5b3dc29da842d4 100644
--- a/src/MOLECULE/dihedral_charmmfsw.h
+++ b/src/MOLECULE/dihedral_charmmfsw.h
@@ -20,7 +20,7 @@ DihedralStyle(charmmfsw,DihedralCharmmfsw)
 #ifndef LMP_DIHEDRAL_CHARMMFSW_H
 #define LMP_DIHEDRAL_CHARMMFSW_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "dihedral.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/dihedral_harmonic.cpp b/src/MOLECULE/dihedral_harmonic.cpp
index 82c5fe31507d667359a208a00bb43056af1eef6a..cb122f4bc2b7166ae84a70f3199c0a042dfddcbd 100644
--- a/src/MOLECULE/dihedral_harmonic.cpp
+++ b/src/MOLECULE/dihedral_harmonic.cpp
@@ -16,8 +16,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "dihedral_harmonic.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MOLECULE/dihedral_harmonic.h b/src/MOLECULE/dihedral_harmonic.h
index db8789675d8c87f3e076ed9284d6c8cea69025ce..20312612568ae92681d8a79649069e9496028896 100644
--- a/src/MOLECULE/dihedral_harmonic.h
+++ b/src/MOLECULE/dihedral_harmonic.h
@@ -20,7 +20,7 @@ DihedralStyle(harmonic,DihedralHarmonic)
 #ifndef LMP_DIHEDRAL_HARMONIC_H
 #define LMP_DIHEDRAL_HARMONIC_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "dihedral.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/dihedral_helix.cpp b/src/MOLECULE/dihedral_helix.cpp
index 43794bd6aabfacca837f8b9a57e10452b46f2a70..f50895dbee7b2addd92d27311256d6b4e35932f3 100644
--- a/src/MOLECULE/dihedral_helix.cpp
+++ b/src/MOLECULE/dihedral_helix.cpp
@@ -17,8 +17,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "dihedral_helix.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/dihedral_helix.h b/src/MOLECULE/dihedral_helix.h
index 61aef1d2ecadeb27b892797b774847650ccb6e06..47756a26721d8129493d534103d72c9de801184d 100644
--- a/src/MOLECULE/dihedral_helix.h
+++ b/src/MOLECULE/dihedral_helix.h
@@ -20,7 +20,7 @@ DihedralStyle(helix,DihedralHelix)
 #ifndef LMP_DIHEDRAL_HELIX_H
 #define LMP_DIHEDRAL_HELIX_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "dihedral.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/dihedral_multi_harmonic.cpp b/src/MOLECULE/dihedral_multi_harmonic.cpp
index 3a4be46fc7876360636365724968ca6fc007a710..97dab8b50173aee61c1e0958ba3f3799d459865e 100644
--- a/src/MOLECULE/dihedral_multi_harmonic.cpp
+++ b/src/MOLECULE/dihedral_multi_harmonic.cpp
@@ -15,8 +15,8 @@
    Contributing author: Mathias Puetz (SNL) and friends
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "dihedral_multi_harmonic.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/dihedral_multi_harmonic.h b/src/MOLECULE/dihedral_multi_harmonic.h
index 8f40b56a5ffb80ae428c8f059246173abb4b9d66..28a38e61ab4a0f2f52e29ffe7a88f171cc967090 100644
--- a/src/MOLECULE/dihedral_multi_harmonic.h
+++ b/src/MOLECULE/dihedral_multi_harmonic.h
@@ -20,7 +20,7 @@ DihedralStyle(multi/harmonic,DihedralMultiHarmonic)
 #ifndef LMP_DIHEDRAL_MULTI_HARMONIC_H
 #define LMP_DIHEDRAL_MULTI_HARMONIC_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "dihedral.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/dihedral_opls.cpp b/src/MOLECULE/dihedral_opls.cpp
index c3a7ee6aa7f9a4388f058b39587b4e695702020b..b5103413b227d2402f4e9e3f563632ac2b914f9a 100644
--- a/src/MOLECULE/dihedral_opls.cpp
+++ b/src/MOLECULE/dihedral_opls.cpp
@@ -15,8 +15,8 @@
    Contributing author: Mark Stevens (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "dihedral_opls.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MOLECULE/dihedral_opls.h b/src/MOLECULE/dihedral_opls.h
index 0a127d3ac178ebffb97a616dc64acb19abea91df..378dec1a6a930db5733fe20ee444f318fba81dfe 100644
--- a/src/MOLECULE/dihedral_opls.h
+++ b/src/MOLECULE/dihedral_opls.h
@@ -20,7 +20,7 @@ DihedralStyle(opls,DihedralOPLS)
 #ifndef LMP_DIHEDRAL_OPLS_H
 #define LMP_DIHEDRAL_OPLS_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "dihedral.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/fix_cmap.cpp b/src/MOLECULE/fix_cmap.cpp
index f4bc6c1ee645ee98fa9b77b680dc5c7fefe32b07..5ef2e662abfb6cc618cb8c377fef940385410b38 100644
--- a/src/MOLECULE/fix_cmap.cpp
+++ b/src/MOLECULE/fix_cmap.cpp
@@ -28,10 +28,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 #include "fix_cmap.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/MOLECULE/improper_cvff.cpp b/src/MOLECULE/improper_cvff.cpp
index 45740d7880f0b57409d8de9c73872d7176861cf7..641eea74a88f63aa40084d3d38b08f90c5a9c1c9 100644
--- a/src/MOLECULE/improper_cvff.cpp
+++ b/src/MOLECULE/improper_cvff.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "improper_cvff.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MOLECULE/improper_cvff.h b/src/MOLECULE/improper_cvff.h
index 8e997e3ff4a5f8caf9f1ca75ed1661055f4ed9fc..d4c30cc2eead856bc70d8215add5d9a58b9942df 100644
--- a/src/MOLECULE/improper_cvff.h
+++ b/src/MOLECULE/improper_cvff.h
@@ -20,7 +20,7 @@ ImproperStyle(cvff,ImproperCvff)
 #ifndef LMP_IMPROPER_CVFF_H
 #define LMP_IMPROPER_CVFF_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "improper.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/improper_harmonic.cpp b/src/MOLECULE/improper_harmonic.cpp
index c482055c76f8c57b4acb7e1dee7af71066663d11..091bd463163488cba7a36dac2e114e1e272e6a0e 100644
--- a/src/MOLECULE/improper_harmonic.cpp
+++ b/src/MOLECULE/improper_harmonic.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "improper_harmonic.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MOLECULE/improper_harmonic.h b/src/MOLECULE/improper_harmonic.h
index b5132ab7ffc636f6f0f0d411ab0a951ebd4c048c..be9b25f3b6929ced0877a647a2d561f9e864453c 100644
--- a/src/MOLECULE/improper_harmonic.h
+++ b/src/MOLECULE/improper_harmonic.h
@@ -20,7 +20,7 @@ ImproperStyle(harmonic,ImproperHarmonic)
 #ifndef LMP_IMPROPER_HARMONIC_H
 #define LMP_IMPROPER_HARMONIC_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "improper.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/improper_umbrella.cpp b/src/MOLECULE/improper_umbrella.cpp
index 8a9b0b44345711174b26c84799ac13b7793c5081..31d7cba54dca313ae2016fe477b9882e0787f515 100644
--- a/src/MOLECULE/improper_umbrella.cpp
+++ b/src/MOLECULE/improper_umbrella.cpp
@@ -16,8 +16,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "improper_umbrella.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MOLECULE/improper_umbrella.h b/src/MOLECULE/improper_umbrella.h
index f590a63c3277f7e2b4fe63988e0c06391eabb9bc..dc2262d01c31d48713c74bdcd1d347c7f8c98d15 100644
--- a/src/MOLECULE/improper_umbrella.h
+++ b/src/MOLECULE/improper_umbrella.h
@@ -20,7 +20,7 @@ ImproperStyle(umbrella,ImproperUmbrella)
 #ifndef LMP_IMPROPER_UMBRELLA_H
 #define LMP_IMPROPER_UMBRELLA_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "improper.h"
 
 namespace LAMMPS_NS {
diff --git a/src/MOLECULE/pair_hbond_dreiding_lj.cpp b/src/MOLECULE/pair_hbond_dreiding_lj.cpp
index ecb4883cb364b07afbb56208e62c73afe91c50b2..26ff499dec6cd0dd2b6b8bb6ad15c95fb97032ca 100644
--- a/src/MOLECULE/pair_hbond_dreiding_lj.cpp
+++ b/src/MOLECULE/pair_hbond_dreiding_lj.cpp
@@ -15,10 +15,10 @@
    Contributing author: Tod A Pascal (Caltech)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_hbond_dreiding_lj.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/MOLECULE/pair_hbond_dreiding_morse.cpp b/src/MOLECULE/pair_hbond_dreiding_morse.cpp
index 83b03f9a2fb9c6565c4cac14a685ea7e270d9a27..749053164cf5746602ac31e933ac533659e51609 100644
--- a/src/MOLECULE/pair_hbond_dreiding_morse.cpp
+++ b/src/MOLECULE/pair_hbond_dreiding_morse.cpp
@@ -15,10 +15,10 @@
    Contributing author: Tod A Pascal (Caltech)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_hbond_dreiding_morse.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/MOLECULE/pair_lj_charmm_coul_charmm.cpp b/src/MOLECULE/pair_lj_charmm_coul_charmm.cpp
index 3700de00b0fe380a96abaf358ab0e06f0416ab5a..688c675815ad7efa3fa4bd6fec4e08a7e79108ca 100644
--- a/src/MOLECULE/pair_lj_charmm_coul_charmm.cpp
+++ b/src/MOLECULE/pair_lj_charmm_coul_charmm.cpp
@@ -15,10 +15,10 @@
    Contributing author: Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_charmm_coul_charmm.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/MOLECULE/pair_lj_charmm_coul_charmm_implicit.cpp b/src/MOLECULE/pair_lj_charmm_coul_charmm_implicit.cpp
index 3421f88eb3c1edc1217f53da2f093ccde2aaa4e5..6c083a49b09ac84ca950abe8c4ca83d6f7e2123c 100644
--- a/src/MOLECULE/pair_lj_charmm_coul_charmm_implicit.cpp
+++ b/src/MOLECULE/pair_lj_charmm_coul_charmm_implicit.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "pair_lj_charmm_coul_charmm_implicit.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/MOLECULE/pair_lj_charmmfsw_coul_charmmfsh.cpp b/src/MOLECULE/pair_lj_charmmfsw_coul_charmmfsh.cpp
index 7da6d59d32f5ef2a1ae49b59226312968a6f080e..4b9147c1698a3a3eaab1ede1a648380ceb180dac 100644
--- a/src/MOLECULE/pair_lj_charmmfsw_coul_charmmfsh.cpp
+++ b/src/MOLECULE/pair_lj_charmmfsw_coul_charmmfsh.cpp
@@ -19,10 +19,10 @@
      with additional assistance from Robert A. Latour, Clemson University
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_charmmfsw_coul_charmmfsh.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/MOLECULE/pair_lj_cut_tip4p_cut.cpp b/src/MOLECULE/pair_lj_cut_tip4p_cut.cpp
index c616a9fa83af793eb095daff37b8e69ce20da915..92dead8435237b593d154d0f8337d8f1d6207240 100644
--- a/src/MOLECULE/pair_lj_cut_tip4p_cut.cpp
+++ b/src/MOLECULE/pair_lj_cut_tip4p_cut.cpp
@@ -15,9 +15,9 @@
    Contributing author: Pavel Elkind (Gothenburg University)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_tip4p_cut.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/MOLECULE/pair_tip4p_cut.cpp b/src/MOLECULE/pair_tip4p_cut.cpp
index 954bd35435604f118a77d05b70f25100cfa887a7..e9f52b87246c3ef076818253b160893d019c44b6 100644
--- a/src/MOLECULE/pair_tip4p_cut.cpp
+++ b/src/MOLECULE/pair_tip4p_cut.cpp
@@ -15,8 +15,8 @@
    Contributing author: Pavel Elkind (Gothenburg University)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "pair_tip4p_cut.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/MPIIO/dump_atom_mpiio.cpp b/src/MPIIO/dump_atom_mpiio.cpp
index 75702ed9b0d7179aa1e9ee075d087be0b3ad9dc5..4422ef1cdfb5c16df75cdd8ff745d67a212d889d 100644
--- a/src/MPIIO/dump_atom_mpiio.cpp
+++ b/src/MPIIO/dump_atom_mpiio.cpp
@@ -15,7 +15,7 @@
    Contributing author: Paul Coffman (IBM)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "dump_atom_mpiio.h"
 #include "domain.h"
 #include "atom.h"
diff --git a/src/MPIIO/dump_atom_mpiio.h b/src/MPIIO/dump_atom_mpiio.h
index 265f9a3b0200c48249f0cdd0494453b7fe359d78..ad49fa11823a21354c0340b335a01129e20fd97b 100644
--- a/src/MPIIO/dump_atom_mpiio.h
+++ b/src/MPIIO/dump_atom_mpiio.h
@@ -21,7 +21,7 @@ DumpStyle(atom/mpiio,DumpAtomMPIIO)
 #define LMP_DUMP_ATOM_MPIIO_H
 
 #include "dump_atom.h"
-#include <stdlib.h>
+#include <cstdlib>
 
 namespace LAMMPS_NS {
 
diff --git a/src/MPIIO/dump_cfg_mpiio.cpp b/src/MPIIO/dump_cfg_mpiio.cpp
index 1cca047bb2aaa3f055fcdf2257efc5eb7e73e8ac..5086d1dc6cdf70cd93ad2f44760ca3c8795fc64b 100644
--- a/src/MPIIO/dump_cfg_mpiio.cpp
+++ b/src/MPIIO/dump_cfg_mpiio.cpp
@@ -15,9 +15,9 @@
    Contributing author: Paul Coffman (IBM)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "dump_cfg_mpiio.h"
 #include "atom.h"
 #include "domain.h"
@@ -34,7 +34,6 @@
 #ifdef LMP_USER_IO_TIMER
 #include <sys/times.h>
 #include <hwi/include/bqc/A2_inlines.h>
-#include <stdlib.h>
 long dumpCFGTimestamps[10];
 #endif
 
diff --git a/src/MPIIO/dump_custom_mpiio.cpp b/src/MPIIO/dump_custom_mpiio.cpp
index 0b282b77efad41a25da336c34483ef51e098665e..2da6dd700d1348a15a96f68c14d6363b0a04ce14 100644
--- a/src/MPIIO/dump_custom_mpiio.cpp
+++ b/src/MPIIO/dump_custom_mpiio.cpp
@@ -15,9 +15,9 @@
    Contributing author: Paul Coffman (IBM)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "dump_custom_mpiio.h"
 #include "atom.h"
 #include "force.h"
@@ -32,7 +32,6 @@
 #include "fix.h"
 #include "memory.h"
 #include "error.h"
-#include <stdlib.h>
 
 #if defined(_OPENMP)
 #include <omp.h>
diff --git a/src/MPIIO/dump_xyz_mpiio.cpp b/src/MPIIO/dump_xyz_mpiio.cpp
index cc87fe881c468ffbc84269558e96abd1b8c4d426..4725efccd14b990d28ea7afe6991c40117f5d688 100644
--- a/src/MPIIO/dump_xyz_mpiio.cpp
+++ b/src/MPIIO/dump_xyz_mpiio.cpp
@@ -15,9 +15,9 @@
    Contributing author: Paul Coffman (IBM)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "dump_xyz_mpiio.h"
 #include "atom.h"
 #include "force.h"
@@ -32,7 +32,6 @@
 #include "fix.h"
 #include "memory.h"
 #include "error.h"
-#include <stdlib.h>
 
 #if defined(_OPENMP)
 #include <omp.h>
diff --git a/src/MPIIO/restart_mpiio.cpp b/src/MPIIO/restart_mpiio.cpp
index 8ad1dccdca9fe60fb5a29fdb2f5cf20d328eb4d2..804df211dc4579957b14fa1b3e94b0bcf36c73f6 100644
--- a/src/MPIIO/restart_mpiio.cpp
+++ b/src/MPIIO/restart_mpiio.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
+#include <climits>
 #include "restart_mpiio.h"
 #include "error.h"
-#include <limits.h>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/MSCG/fix_mscg.cpp b/src/MSCG/fix_mscg.cpp
index fba198c814c77b2cf5585fd7e73f8311a271b4ae..2e9e03c941af82e82225f4676d88d75e58bc36b6 100644
--- a/src/MSCG/fix_mscg.cpp
+++ b/src/MSCG/fix_mscg.cpp
@@ -16,8 +16,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "fix_mscg.h"
 #include "mscg.h"
 #include "atom.h"
diff --git a/src/OPT/pair_eam_opt.cpp b/src/OPT/pair_eam_opt.cpp
index 3afec5644a70bb12497163d8fd8174202f2d11b1..5345d7f8d6c40c41f56f1cc0b8df81a997a6c18e 100644
--- a/src/OPT/pair_eam_opt.cpp
+++ b/src/OPT/pair_eam_opt.cpp
@@ -19,8 +19,8 @@
      Vincent Natoli, Stone Ridge Technology
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "pair_eam_opt.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/OPT/pair_lj_charmm_coul_long_opt.cpp b/src/OPT/pair_lj_charmm_coul_long_opt.cpp
index b98dd36dd138fe7f93a60c2445decb3bd3f3736b..43f4ba7f5a9ae9fa29ae1d7c9c20220160cf96d1 100644
--- a/src/OPT/pair_lj_charmm_coul_long_opt.cpp
+++ b/src/OPT/pair_lj_charmm_coul_long_opt.cpp
@@ -18,8 +18,8 @@
      Vincent Natoli, Stone Ridge Technology
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "pair_lj_charmm_coul_long_opt.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/OPT/pair_lj_cut_coul_long_opt.cpp b/src/OPT/pair_lj_cut_coul_long_opt.cpp
index 140d4d023a688e52a2b65386442525a63d26570f..98683a67a4ccbfc537393c2aa55dcb758f1b0ee6 100644
--- a/src/OPT/pair_lj_cut_coul_long_opt.cpp
+++ b/src/OPT/pair_lj_cut_coul_long_opt.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cut_coul_long_opt.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/OPT/pair_lj_cut_opt.cpp b/src/OPT/pair_lj_cut_opt.cpp
index 0812a56f015cd1f888c1eee840f00484a645ce61..ed35178c1f9e60d6fd40cada3e5452f2b318a224 100644
--- a/src/OPT/pair_lj_cut_opt.cpp
+++ b/src/OPT/pair_lj_cut_opt.cpp
@@ -18,7 +18,7 @@
      Vincent Natoli, Stone Ridge Technology
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "pair_lj_cut_opt.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/OPT/pair_lj_cut_tip4p_long_opt.cpp b/src/OPT/pair_lj_cut_tip4p_long_opt.cpp
index db9402b521c902119e57fbe4dbdca27bb11e0a87..4842cc4fc00ea6725c5f683e010b1e58f55c5b21 100644
--- a/src/OPT/pair_lj_cut_tip4p_long_opt.cpp
+++ b/src/OPT/pair_lj_cut_tip4p_long_opt.cpp
@@ -15,7 +15,7 @@
    OPT version: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cut_tip4p_long_opt.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/OPT/pair_lj_long_coul_long_opt.cpp b/src/OPT/pair_lj_long_coul_long_opt.cpp
index c5756cbecc6de1613222e7163e43db7bf0885232..91ffc2c01ed20e96f317cf82cd48d778cb1233a0 100644
--- a/src/OPT/pair_lj_long_coul_long_opt.cpp
+++ b/src/OPT/pair_lj_long_coul_long_opt.cpp
@@ -15,7 +15,7 @@
    OPT version: Wayne Mitchell (Loyola University New Orleans)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_long_coul_long_opt.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/OPT/pair_morse_opt.cpp b/src/OPT/pair_morse_opt.cpp
index e63fbd0938c5cb235b22d10d92d86d84797513e9..6299136f46af21f358079429b8ed3981d4562589 100644
--- a/src/OPT/pair_morse_opt.cpp
+++ b/src/OPT/pair_morse_opt.cpp
@@ -18,8 +18,8 @@
      Vincent Natoli, Stone Ridge Technology
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "pair_morse_opt.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/OPT/pair_ufm_opt.cpp b/src/OPT/pair_ufm_opt.cpp
index f6f4c4ce3e7bc2a7a04a97db049c2a239e863288..85c76d624d7eaad82a27d319134642a0aee6724e 100644
--- a/src/OPT/pair_ufm_opt.cpp
+++ b/src/OPT/pair_ufm_opt.cpp
@@ -17,8 +17,8 @@
             Maurice de Koning (Unicamp/Brazil) - dekoning@ifi.unicamp.br
  ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <math.h>
+#include <cstdlib>
+#include <cmath>
 #include "pair_ufm_opt.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/PERI/atom_vec_peri.cpp b/src/PERI/atom_vec_peri.cpp
index 3e6a72289a6d3afa7e6c4ccb7105f0f64d342221..d78fe27c94b62fa8d313b968cbc2fe55f54fb315 100644
--- a/src/PERI/atom_vec_peri.cpp
+++ b/src/PERI/atom_vec_peri.cpp
@@ -15,9 +15,9 @@
    Contributing author: Mike Parks (SNL)
 ------------------------------------------------------------------------- */
 
-#include <float.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cfloat>
+#include <cstdlib>
+#include <cstring>
 #include "atom_vec_peri.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/PERI/compute_damage_atom.cpp b/src/PERI/compute_damage_atom.cpp
index a3bc580f7ab72d0ddf7562eea2d858345578b803..4bf8fa17a57fd7ff034a46a15f64c713d741fc01 100644
--- a/src/PERI/compute_damage_atom.cpp
+++ b/src/PERI/compute_damage_atom.cpp
@@ -15,7 +15,7 @@
    Contributing author: Mike Parks (SNL)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_damage_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/PERI/compute_dilatation_atom.cpp b/src/PERI/compute_dilatation_atom.cpp
index d79b80f4d459ad3d60ee43d9795f898860024633..990731a227d30865c2dbba4a2566217cd94913d7 100644
--- a/src/PERI/compute_dilatation_atom.cpp
+++ b/src/PERI/compute_dilatation_atom.cpp
@@ -15,7 +15,7 @@
    Contributing author: Rezwanur Rahman, John Foster (UTSA)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_dilatation_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/PERI/compute_plasticity_atom.cpp b/src/PERI/compute_plasticity_atom.cpp
index 34fd23fe6a663bccb36257724ff09a4f46b146ab..d08fb98e07b84d1c893c5d05588cb1db4e4622a6 100644
--- a/src/PERI/compute_plasticity_atom.cpp
+++ b/src/PERI/compute_plasticity_atom.cpp
@@ -15,7 +15,7 @@
    Contributing author: Rezwanur Rahman, John Foster (UTSA)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_plasticity_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/PERI/fix_peri_neigh.cpp b/src/PERI/fix_peri_neigh.cpp
index d92f355c53866bf8e2f13d4e020b054a598e80a0..42d86e14b2b4eec17c78d95457c48647af0f7b86 100644
--- a/src/PERI/fix_peri_neigh.cpp
+++ b/src/PERI/fix_peri_neigh.cpp
@@ -15,7 +15,7 @@
    Contributing authors: Mike Parks (SNL), Ezwanur Rahman, J.T. Foster (UTSA)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "fix_peri_neigh.h"
 #include "pair_peri_pmb.h"
 #include "pair_peri_lps.h"
diff --git a/src/PERI/pair_peri_eps.cpp b/src/PERI/pair_peri_eps.cpp
index 670e1d6937aaafce5962ca6f7a24bc2fb945f6fc..9950c36f41446ca28adbeb0162dd188adf0eb6e6 100644
--- a/src/PERI/pair_peri_eps.cpp
+++ b/src/PERI/pair_peri_eps.cpp
@@ -15,9 +15,9 @@
    Contributing author: Rezwanur Rahman, John Foster (UTSA)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "pair_peri_eps.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/PERI/pair_peri_lps.cpp b/src/PERI/pair_peri_lps.cpp
index 0fe8f29f387fee4513cb9dd1ad60305561b7f012..4c48223b0749e9ebc7b4cbe4e4d1345854da21b9 100644
--- a/src/PERI/pair_peri_lps.cpp
+++ b/src/PERI/pair_peri_lps.cpp
@@ -15,9 +15,9 @@
    Contributing author: Mike Parks (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "pair_peri_lps.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/PERI/pair_peri_pmb.cpp b/src/PERI/pair_peri_pmb.cpp
index 9e598289bd01842bb255a5501f5163fad9488d0e..81461f0b83f0c7c12df432046036a6003199397f 100644
--- a/src/PERI/pair_peri_pmb.cpp
+++ b/src/PERI/pair_peri_pmb.cpp
@@ -15,10 +15,10 @@
    Contributing author: Mike Parks (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <float.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cfloat>
+#include <cstdlib>
+#include <cstring>
 #include "pair_peri_pmb.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/PERI/pair_peri_ves.cpp b/src/PERI/pair_peri_ves.cpp
index 87213b5b59c10de830ae0e131335f5f99779b0f9..a9f620ef4b7bcbc4b92b7881a6ebaf8e8ea0e8fc 100644
--- a/src/PERI/pair_peri_ves.cpp
+++ b/src/PERI/pair_peri_ves.cpp
@@ -15,9 +15,9 @@
    Contributing authors: Rezwanur Rahman, J.T. Foster (UTSA)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "pair_peri_ves.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/POEMS/fix_poems.cpp b/src/POEMS/fix_poems.cpp
index 7ff9e91af8127ad76b0b7e661a00cbe47f1fbce1..ebd1729b6e02521299517a54aa68650c1da65856 100644
--- a/src/POEMS/fix_poems.cpp
+++ b/src/POEMS/fix_poems.cpp
@@ -18,10 +18,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
 #include "workspace.h"
 #include "fix_poems.h"
 #include "atom.h"
diff --git a/src/PYTHON/fix_python_invoke.cpp b/src/PYTHON/fix_python_invoke.cpp
index 9a4db51d99251a2e44d7101aeaa3530254b18a72..199dd94f3d1cd87cf9cc1fbbbdf15e161c2813fa 100644
--- a/src/PYTHON/fix_python_invoke.cpp
+++ b/src/PYTHON/fix_python_invoke.cpp
@@ -16,8 +16,8 @@
 ------------------------------------------------------------------------- */
 
 #include <Python.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include "fix_python_invoke.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/PYTHON/fix_python_move.cpp b/src/PYTHON/fix_python_move.cpp
index 22d3bd065f5bc899eb89f2fc6359e399f6412306..7331a75db68448ed1b3dbd6a892981637e851daa 100644
--- a/src/PYTHON/fix_python_move.cpp
+++ b/src/PYTHON/fix_python_move.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <Python.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "fix_python_move.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/PYTHON/pair_python.cpp b/src/PYTHON/pair_python.cpp
index 0db987bb63d01c932f8e895218b1279ba01ceaf7..223129f7d662111de1f31573f3bf9f6a4945acb6 100644
--- a/src/PYTHON/pair_python.cpp
+++ b/src/PYTHON/pair_python.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <Python.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_python.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/QEQ/fix_qeq.cpp b/src/QEQ/fix_qeq.cpp
index afa2801831f0c677a979d4c49df7af2fe63bee75..8acf4498f5c6f67db6a1640d4872ff34efe2b746 100644
--- a/src/QEQ/fix_qeq.cpp
+++ b/src/QEQ/fix_qeq.cpp
@@ -16,10 +16,10 @@
      Based on fix qeq/reax by H. Metin Aktulga
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "fix_qeq.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/QEQ/fix_qeq_dynamic.cpp b/src/QEQ/fix_qeq_dynamic.cpp
index 43e9a9c874c44c0ce1a421029992f7f1297f5417..aeb8dd2c59043d1c1852e8cd678074d19e51785c 100644
--- a/src/QEQ/fix_qeq_dynamic.cpp
+++ b/src/QEQ/fix_qeq_dynamic.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "fix_qeq_dynamic.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/QEQ/fix_qeq_fire.cpp b/src/QEQ/fix_qeq_fire.cpp
index 763a39e82e9d961d253c6085750270c891779245..db63bec2063f98de16b963be899e72b920d06023 100644
--- a/src/QEQ/fix_qeq_fire.cpp
+++ b/src/QEQ/fix_qeq_fire.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "fix_qeq_fire.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/QEQ/fix_qeq_point.cpp b/src/QEQ/fix_qeq_point.cpp
index 906f73799142fd0295b6096da6b2e0f6dc845169..bf7130c1d6704b334f05c227245082e61f107fd9 100644
--- a/src/QEQ/fix_qeq_point.cpp
+++ b/src/QEQ/fix_qeq_point.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "fix_qeq_point.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/QEQ/fix_qeq_shielded.cpp b/src/QEQ/fix_qeq_shielded.cpp
index e23384b1c92cdd1f945b93723b571245d4fa7e8d..70898fd96c68908ca4c74203a72c577883710ff0 100644
--- a/src/QEQ/fix_qeq_shielded.cpp
+++ b/src/QEQ/fix_qeq_shielded.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "fix_qeq_shielded.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/QEQ/fix_qeq_slater.cpp b/src/QEQ/fix_qeq_slater.cpp
index 544b9f037aeb9268d97603021078fe07372021ba..4ddcf06357b3e5c42e010a47c16f1fd8177a0a16 100644
--- a/src/QEQ/fix_qeq_slater.cpp
+++ b/src/QEQ/fix_qeq_slater.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "fix_qeq_slater.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/REAX/fix_reax_bonds.cpp b/src/REAX/fix_reax_bonds.cpp
index 00cfb0937b93b1c03c8e23f9f258d80a54737df1..84e4a66e6cede6db5d347281df036486cc2efec9 100644
--- a/src/REAX/fix_reax_bonds.cpp
+++ b/src/REAX/fix_reax_bonds.cpp
@@ -19,8 +19,8 @@
 #error LAMMPS_BIGBIG is not supported by the REAX package
 #endif
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_reax_bonds.h"
 #include "pair_reax_fortran.h"
 #include "atom.h"
diff --git a/src/REAX/fix_reax_bonds.h b/src/REAX/fix_reax_bonds.h
index 7246b836c1a2c693db3f0e8bf0b800503baf7688..03bad1ef16b3b0f45842ee709adef4e9be12868f 100644
--- a/src/REAX/fix_reax_bonds.h
+++ b/src/REAX/fix_reax_bonds.h
@@ -20,7 +20,7 @@ FixStyle(reax/bonds,FixReaxBonds)
 #ifndef LMP_FIX_REAX_BONDS_H
 #define LMP_FIX_REAX_BONDS_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/REAX/pair_reax.cpp b/src/REAX/pair_reax.cpp
index f6217c69a4aa7169d816e317cc508d75bae6761a..24083a288ab6ec3b5b66a771ca3a48a6b86d9cc2 100644
--- a/src/REAX/pair_reax.cpp
+++ b/src/REAX/pair_reax.cpp
@@ -21,10 +21,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_reax.h"
 #include "pair_reax_fortran.h"
 #include "atom.h"
diff --git a/src/REPLICA/compute_event_displace.cpp b/src/REPLICA/compute_event_displace.cpp
index 330e2ebca33a522267581e434a81b86cb627ba28..df142215863e73e13ab3448d95ef29f95c427bc6 100644
--- a/src/REPLICA/compute_event_displace.cpp
+++ b/src/REPLICA/compute_event_displace.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "compute_event_displace.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/REPLICA/fix_event.cpp b/src/REPLICA/fix_event.cpp
index f688550a6554c679432191817da5dd098254f26a..3b9b49ac57a24977766a144388a99b52cf3d8103 100644
--- a/src/REPLICA/fix_event.cpp
+++ b/src/REPLICA/fix_event.cpp
@@ -15,8 +15,8 @@
    Contributing author: Mike Brown (SNL), Aidan Thompson (SNL)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_event.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/REPLICA/fix_event_prd.cpp b/src/REPLICA/fix_event_prd.cpp
index 863caa64f240f999b920bf11ebe9bf7cf0e17ccd..a311a6444aad250d5b25454afabcf215a8be7fcc 100644
--- a/src/REPLICA/fix_event_prd.cpp
+++ b/src/REPLICA/fix_event_prd.cpp
@@ -15,8 +15,8 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_event_prd.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/REPLICA/fix_event_tad.cpp b/src/REPLICA/fix_event_tad.cpp
index b2d74855faf08cb6001256be13e9a1caf894ce84..0916fdf493748a842a6ad84783d5dfa0f9960075 100644
--- a/src/REPLICA/fix_event_tad.cpp
+++ b/src/REPLICA/fix_event_tad.cpp
@@ -15,8 +15,8 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_event_tad.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/REPLICA/fix_neb.cpp b/src/REPLICA/fix_neb.cpp
index 33f834a14069b42d4fa56379c35db41a2e102379..e5d24da392649fe1f8cecbd9bc20fea0e17194b9 100644
--- a/src/REPLICA/fix_neb.cpp
+++ b/src/REPLICA/fix_neb.cpp
@@ -17,9 +17,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_neb.h"
 #include "universe.h"
 #include "update.h"
diff --git a/src/REPLICA/neb.cpp b/src/REPLICA/neb.cpp
index 692f9361258a847e51775cb1f451e1f04895ce11..35225b3c1e2bd6f192896a96294bc42b4477c76c 100644
--- a/src/REPLICA/neb.cpp
+++ b/src/REPLICA/neb.cpp
@@ -17,9 +17,9 @@
 
 #include "lmptype.h"
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "neb.h"
 #include "universe.h"
 #include "atom.h"
diff --git a/src/REPLICA/neb.h b/src/REPLICA/neb.h
index 556ea22bbeb6ea0e25dd20ee16ee5927ffc432b7..9453c3c43bfb3786276094cf5dafc839daf8c0a1 100644
--- a/src/REPLICA/neb.h
+++ b/src/REPLICA/neb.h
@@ -20,7 +20,7 @@ CommandStyle(neb,NEB)
 #ifndef LMP_NEB_H
 #define LMP_NEB_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 
 namespace LAMMPS_NS {
diff --git a/src/REPLICA/prd.cpp b/src/REPLICA/prd.cpp
index 684277a698b265f778864f5290325dffb232c21a..6d450f48e3ed6bac08bcef47f5666e4e06a3f283 100644
--- a/src/REPLICA/prd.cpp
+++ b/src/REPLICA/prd.cpp
@@ -21,9 +21,9 @@
 
 #include "lmptype.h"
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "prd.h"
 #include "universe.h"
 #include "update.h"
diff --git a/src/REPLICA/tad.cpp b/src/REPLICA/tad.cpp
index 958a57e4e8936e895621fd4ec6fb5cf89baf153e..46073952fc6fe341f797364507b6d83fa392b59e 100644
--- a/src/REPLICA/tad.cpp
+++ b/src/REPLICA/tad.cpp
@@ -21,9 +21,9 @@
 
 #include "lmptype.h"
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "tad.h"
 #include "universe.h"
 #include "update.h"
diff --git a/src/REPLICA/temper.cpp b/src/REPLICA/temper.cpp
index d7e8c981bb51a729595aeee17ae8c2c4b43fd71d..fe3e3fb993d43e0d88c8eb2dcc777ea621a482ef 100644
--- a/src/REPLICA/temper.cpp
+++ b/src/REPLICA/temper.cpp
@@ -15,9 +15,9 @@
    Contributing author: Mark Sears (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "temper.h"
 #include "universe.h"
 #include "domain.h"
diff --git a/src/REPLICA/verlet_split.cpp b/src/REPLICA/verlet_split.cpp
index e47965d1c3c02a28f00351c5a8139caf4514915c..05ea0877ab1e84bd618ec125e1e287063344e5f3 100644
--- a/src/REPLICA/verlet_split.cpp
+++ b/src/REPLICA/verlet_split.cpp
@@ -15,7 +15,7 @@
    Contributing authors: Yuxing Peng and Chris Knight (U Chicago)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "verlet_split.h"
 #include "universe.h"
 #include "neighbor.h"
diff --git a/src/RIGID/compute_erotate_rigid.cpp b/src/RIGID/compute_erotate_rigid.cpp
index e31565cb6070844d8be629e49d4cd0b6ba99c3f1..a3ddffd9abed86427c1d06da997e7d5344676795 100644
--- a/src/RIGID/compute_erotate_rigid.cpp
+++ b/src/RIGID/compute_erotate_rigid.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
 #include "compute_erotate_rigid.h"
 #include "update.h"
 #include "force.h"
diff --git a/src/RIGID/compute_ke_rigid.cpp b/src/RIGID/compute_ke_rigid.cpp
index 2db756140fb7b35a2934ad9fb7d63aacfc4a21a2..4de13532b29856d7381f358d194d6554515983c6 100644
--- a/src/RIGID/compute_ke_rigid.cpp
+++ b/src/RIGID/compute_ke_rigid.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
 #include "compute_ke_rigid.h"
 #include "update.h"
 #include "force.h"
diff --git a/src/RIGID/compute_rigid_local.cpp b/src/RIGID/compute_rigid_local.cpp
index deca01f2aea749fa9cc82c075659fba711f13807..bcb778ab86b993c5391549b4040330bd424b651c 100644
--- a/src/RIGID/compute_rigid_local.cpp
+++ b/src/RIGID/compute_rigid_local.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "compute_rigid_local.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/RIGID/fix_ehex.cpp b/src/RIGID/fix_ehex.cpp
index 61b76b513f57f654268936711bfe535b2250b751..1476c71d3fa080912fbaa98ed44b09f410e43385 100644
--- a/src/RIGID/fix_ehex.cpp
+++ b/src/RIGID/fix_ehex.cpp
@@ -22,9 +22,9 @@
    which implements the heat exchange (HEX) algorithm.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_ehex.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/RIGID/fix_rattle.cpp b/src/RIGID/fix_rattle.cpp
index 666561b462bb7011378e02e2d3bba776f723ff97..7ade8d6848f176e64456dd875c53768a69fe2fab 100644
--- a/src/RIGID/fix_rattle.cpp
+++ b/src/RIGID/fix_rattle.cpp
@@ -16,10 +16,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 #include "fix_rattle.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/RIGID/fix_rigid.cpp b/src/RIGID/fix_rigid.cpp
index e9f668dafdd4873d5c81f3ecd4275e0d470dd8a6..554412330c955fd187dbb61ee9857c849c1c65ca 100644
--- a/src/RIGID/fix_rigid.cpp
+++ b/src/RIGID/fix_rigid.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "fix_rigid.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/RIGID/fix_rigid_nh.cpp b/src/RIGID/fix_rigid_nh.cpp
index 0e05685dba4ac546c5e3d6b1f63844921309eddb..7007ba1930252740ceb7491f859ee65da9b9036b 100644
--- a/src/RIGID/fix_rigid_nh.cpp
+++ b/src/RIGID/fix_rigid_nh.cpp
@@ -17,9 +17,9 @@
                Miller et al., J Chem Phys. 116, 8649-8659 (2002)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include "fix_rigid_nh.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/RIGID/fix_rigid_nh_small.cpp b/src/RIGID/fix_rigid_nh_small.cpp
index 50777766fe33b2e6a38a13ea2fbb42b037785e58..874812cc69d5ed964e58271f040662493c1e84b5 100644
--- a/src/RIGID/fix_rigid_nh_small.cpp
+++ b/src/RIGID/fix_rigid_nh_small.cpp
@@ -17,9 +17,9 @@
                Miller et al., J Chem Phys. 116, 8649-8659 (2002)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include "fix_rigid_nh_small.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/RIGID/fix_rigid_nph.cpp b/src/RIGID/fix_rigid_nph.cpp
index c0aa3b7040e0224a495af26dd7e934d2ab4b018f..45a4a8d09cd00dfa14abf23db64652a0ca5d4a12 100644
--- a/src/RIGID/fix_rigid_nph.cpp
+++ b/src/RIGID/fix_rigid_nph.cpp
@@ -17,7 +17,7 @@
                Miller et al., J Chem Phys. 116, 8649-8659 (2002)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_rigid_nph.h"
 #include "domain.h"
 #include "modify.h"
diff --git a/src/RIGID/fix_rigid_nph_small.cpp b/src/RIGID/fix_rigid_nph_small.cpp
index 4e3e54766f7cbc8e7b179d63e0c5da394d51f956..d32e3043f45451b7ef9a07856f918b5b3deb2bf8 100644
--- a/src/RIGID/fix_rigid_nph_small.cpp
+++ b/src/RIGID/fix_rigid_nph_small.cpp
@@ -17,7 +17,7 @@
                Miller et al., J Chem Phys. 116, 8649-8659 (2002)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_rigid_nph_small.h"
 #include "domain.h"
 #include "modify.h"
diff --git a/src/RIGID/fix_rigid_npt.cpp b/src/RIGID/fix_rigid_npt.cpp
index 24e12e41c235e37b26b9fa77b1f353d9c440223a..da5d5ffaa54837c0d54aa4830790ce98903a36cc 100644
--- a/src/RIGID/fix_rigid_npt.cpp
+++ b/src/RIGID/fix_rigid_npt.cpp
@@ -17,7 +17,7 @@
                Miller et al., J Chem Phys. 116, 8649-8659 (2002)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_rigid_npt.h"
 #include "domain.h"
 #include "modify.h"
diff --git a/src/RIGID/fix_rigid_npt_small.cpp b/src/RIGID/fix_rigid_npt_small.cpp
index 551ef50ca91ce84b8d00dc1ed3e41c754bb18ad3..f1fd5470da68dfd80bdc15644952dcfd649dc160 100644
--- a/src/RIGID/fix_rigid_npt_small.cpp
+++ b/src/RIGID/fix_rigid_npt_small.cpp
@@ -17,7 +17,7 @@
                Miller et al., J Chem Phys. 116, 8649-8659 (2002)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_rigid_npt_small.h"
 #include "domain.h"
 #include "modify.h"
diff --git a/src/RIGID/fix_rigid_small.cpp b/src/RIGID/fix_rigid_small.cpp
index 0cdec74fe86d3af2a675fd759badf913d2f95f3f..e5ccd5ec1591cca90b1a08274dd67480e980740c 100644
--- a/src/RIGID/fix_rigid_small.cpp
+++ b/src/RIGID/fix_rigid_small.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "fix_rigid_small.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/RIGID/fix_shake.cpp b/src/RIGID/fix_shake.cpp
index 35c8d7a91741432f04dd22ea46f3fa6939bd31c4..0beef3bfa24cec383ba2a5d29304aff1bb596366 100644
--- a/src/RIGID/fix_shake.cpp
+++ b/src/RIGID/fix_shake.cpp
@@ -12,10 +12,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 #include "fix_shake.h"
 #include "fix_rattle.h"
 #include "atom.h"
diff --git a/src/SHOCK/fix_append_atoms.cpp b/src/SHOCK/fix_append_atoms.cpp
index 80be74bee1634a0665c0a08fffde6b1197cd885e..27a7f5514abcfe821ddc88a416dbc6d2037f2c90 100644
--- a/src/SHOCK/fix_append_atoms.cpp
+++ b/src/SHOCK/fix_append_atoms.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_append_atoms.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/SHOCK/fix_msst.cpp b/src/SHOCK/fix_msst.cpp
index d7e5723980c647714836c561812f008d5daa561e..a7890c3afa4ab8825c585c06faae9cd4ef5135de 100644
--- a/src/SHOCK/fix_msst.cpp
+++ b/src/SHOCK/fix_msst.cpp
@@ -17,9 +17,9 @@
    see Reed, Fried, Joannopoulos, Phys Rev Lett, 90, 235503 (2003)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "fix_msst.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/SHOCK/fix_nphug.cpp b/src/SHOCK/fix_nphug.cpp
index d28e9daf775e7bf85e8f20b52413f0e4ab7feeba..c6df6646cf44a436bc7f2622034add37c76d728e 100644
--- a/src/SHOCK/fix_nphug.cpp
+++ b/src/SHOCK/fix_nphug.cpp
@@ -11,8 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "fix_nphug.h"
 #include "modify.h"
 #include "error.h"
@@ -21,10 +22,8 @@
 #include "force.h"
 #include "domain.h"
 #include "group.h"
-#include <math.h>
 #include "memory.h"
 #include "comm.h"
-#include <math.h>
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/SHOCK/fix_wall_piston.cpp b/src/SHOCK/fix_wall_piston.cpp
index 7dff3d986ff136083566df2ab6988e904bf8fe9a..7146b46c1e12f4a021a71b9d4c1f0dd963975cd3 100644
--- a/src/SHOCK/fix_wall_piston.cpp
+++ b/src/SHOCK/fix_wall_piston.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_wall_piston.h"
 #include "atom.h"
 #include "modify.h"
diff --git a/src/SNAP/compute_sna_atom.cpp b/src/SNAP/compute_sna_atom.cpp
index 9f56cee3f1500bce3f63680e3b6fb5e398468236..0d8b0bae14c3f82ccac058b88c9e37757c8f1e12 100644
--- a/src/SNAP/compute_sna_atom.cpp
+++ b/src/SNAP/compute_sna_atom.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 #include "sna.h"
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "compute_sna_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/SNAP/compute_snad_atom.cpp b/src/SNAP/compute_snad_atom.cpp
index 3db0c84854f97c3d9646afacc87e7fb599fbc9f2..b0fef8e1e3fe5203f8c8d978b0f356671acbd97b 100644
--- a/src/SNAP/compute_snad_atom.cpp
+++ b/src/SNAP/compute_snad_atom.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 #include "sna.h"
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "compute_snad_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/SNAP/compute_snav_atom.cpp b/src/SNAP/compute_snav_atom.cpp
index 578f86ae5b50224d880d9ac6cebc63987f8b1ac9..cf66b1c136ae8cbe32f1014005c49ce32f8d9d77 100644
--- a/src/SNAP/compute_snav_atom.cpp
+++ b/src/SNAP/compute_snav_atom.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 #include "sna.h"
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "compute_snav_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/SNAP/pair_snap.cpp b/src/SNAP/pair_snap.cpp
index 8714d55c5cb3dc532056330d2a674e2aa2629089..2b1816950c28c11c3b23c288aacb4fd33be5348f 100644
--- a/src/SNAP/pair_snap.cpp
+++ b/src/SNAP/pair_snap.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "pair_snap.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/SNAP/sna.cpp b/src/SNAP/sna.cpp
index 16c382cc4ce34949e463d4b1bb8fae52512290ee..31505730433a4b00b2956c10afb5a272e94a0f55 100644
--- a/src/SNAP/sna.cpp
+++ b/src/SNAP/sna.cpp
@@ -16,11 +16,11 @@
 ------------------------------------------------------------------------- */
 
 #include "sna.h"
-#include <math.h>
+#include <cmath>
 #include "math_const.h"
 #include "math_extra.h"
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "openmp_snap.h"
 
 #include "memory.h"
diff --git a/src/SRD/fix_srd.cpp b/src/SRD/fix_srd.cpp
index 81ef2024203c0b858500466ecaab0500e828c955..6bc72dca4bd72974cd39a054263364b51bab9dc8 100644
--- a/src/SRD/fix_srd.cpp
+++ b/src/SRD/fix_srd.cpp
@@ -15,9 +15,9 @@
    Contributing authors: Jeremy Lechman (SNL), Pieter in 't Veld (BASF)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_srd.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/SRD/fix_wall_srd.cpp b/src/SRD/fix_wall_srd.cpp
index dbca9c5fc88adf49e47a024415bf3b1d9eb07ccb..24b0c3cec5c2d5210ed21a39450649ac16464485 100644
--- a/src/SRD/fix_wall_srd.cpp
+++ b/src/SRD/fix_wall_srd.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_wall_srd.h"
 #include "atom.h"
 #include "modify.h"
diff --git a/src/USER-ATC/fix_atc.cpp b/src/USER-ATC/fix_atc.cpp
index 96ad93481d1aa4675eeb362cb6809ab35ad48b80..f53343ced1380ce59fe9a6b273e14fda3035335f 100644
--- a/src/USER-ATC/fix_atc.cpp
+++ b/src/USER-ATC/fix_atc.cpp
@@ -35,8 +35,8 @@
 #include "ATC_CouplingMomentumEnergy.h"
 #include "LammpsInterface.h"
 // other
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <sstream>
 
 using namespace LAMMPS_NS;
diff --git a/src/USER-AWPMD/atom_vec_wavepacket.cpp b/src/USER-AWPMD/atom_vec_wavepacket.cpp
index 33048efba6d8c24f112dc36bc288179679165ff3..7556dd2c8e3ed968aa750620b58ce885debff2a5 100644
--- a/src/USER-AWPMD/atom_vec_wavepacket.cpp
+++ b/src/USER-AWPMD/atom_vec_wavepacket.cpp
@@ -15,9 +15,9 @@
    Contributing author: Ilya Valuev (JIHT, Moscow, Russia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "atom_vec_wavepacket.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-AWPMD/fix_nve_awpmd.cpp b/src/USER-AWPMD/fix_nve_awpmd.cpp
index 3ad425030d3d2ebfc81531f73e63e43b92dc68f6..7722c931218f3cc56c1a8acbf6fd0d4bcec97e78 100644
--- a/src/USER-AWPMD/fix_nve_awpmd.cpp
+++ b/src/USER-AWPMD/fix_nve_awpmd.cpp
@@ -15,16 +15,15 @@
    Contributing author: Ilya Valuev (JIHT, Moscow, Russia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include "fix_nve_awpmd.h"
 #include "atom.h"
 #include "force.h"
 #include "update.h"
 #include "respa.h"
 #include "error.h"
-#include <math.h>
 
 #include "TCP/wpmd_split.h"
 
diff --git a/src/USER-AWPMD/pair_awpmd_cut.cpp b/src/USER-AWPMD/pair_awpmd_cut.cpp
index 2ce1a926845721c8fc10fe001585f99de5dae2b7..2dcb3e62962f43f6a1e9fc35aa75ffaa969557dc 100644
--- a/src/USER-AWPMD/pair_awpmd_cut.cpp
+++ b/src/USER-AWPMD/pair_awpmd_cut.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ilya Valuev (JIHT, Moscow, Russia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_awpmd_cut.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-CGDNA/bond_oxdna2_fene.cpp b/src/USER-CGDNA/bond_oxdna2_fene.cpp
index b2e1afb073d5af6a71a61428a2b64249d4af3166..39cbb04f88e1aad84a1b181757bf1b1b83d92f19 100644
--- a/src/USER-CGDNA/bond_oxdna2_fene.cpp
+++ b/src/USER-CGDNA/bond_oxdna2_fene.cpp
@@ -14,8 +14,8 @@
    Contributing author: Oliver Henrich (University of Strathclyde, Glasgow)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "bond_oxdna2_fene.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/USER-CGDNA/bond_oxdna_fene.cpp b/src/USER-CGDNA/bond_oxdna_fene.cpp
index e5d3a3e45242d29b21ba2c5683082d82f0e98f08..da1eb38e762a3e03b01195566b3b4e91bcc08d39 100644
--- a/src/USER-CGDNA/bond_oxdna_fene.cpp
+++ b/src/USER-CGDNA/bond_oxdna_fene.cpp
@@ -14,8 +14,8 @@
    Contributing author: Oliver Henrich (University of Strathclyde, Glasgow)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "bond_oxdna_fene.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-CGDNA/fix_nve_dot.cpp b/src/USER-CGDNA/fix_nve_dot.cpp
index 5cdda597037e238de9da6d234d799728f04baf64..63f38a4e12af727939cb5848153315f44f43b662 100644
--- a/src/USER-CGDNA/fix_nve_dot.cpp
+++ b/src/USER-CGDNA/fix_nve_dot.cpp
@@ -14,9 +14,9 @@
    Contributing author: Oliver Henrich (University of Strathclyde, Glasgow)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include "fix_nve_dot.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/USER-CGDNA/fix_nve_dotc_langevin.cpp b/src/USER-CGDNA/fix_nve_dotc_langevin.cpp
index fae515897c0ad4c07d019cf8c80284eec1d46f44..90f7b1caebbc56e5849e47b72895128b22afcbbb 100644
--- a/src/USER-CGDNA/fix_nve_dotc_langevin.cpp
+++ b/src/USER-CGDNA/fix_nve_dotc_langevin.cpp
@@ -15,9 +15,9 @@
    Contributing author: Oliver Henrich (University of Strathclyde, Glasgow)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include "fix_nve_dotc_langevin.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/USER-CGDNA/mf_oxdna.h b/src/USER-CGDNA/mf_oxdna.h
index 56055d5facab082760d899473fec3cbe667b5f8f..c63a37cde2ab4b8a9fa07e6b556181e947e4c997 100644
--- a/src/USER-CGDNA/mf_oxdna.h
+++ b/src/USER-CGDNA/mf_oxdna.h
@@ -14,7 +14,7 @@
 #ifndef MF_OXDNA_H
 #define MF_OXDNA_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "math_extra.h"
 
 namespace MFOxdna {
diff --git a/src/USER-CGDNA/pair_oxdna2_coaxstk.cpp b/src/USER-CGDNA/pair_oxdna2_coaxstk.cpp
index 8312d92bc06f788c8c87d76bb063fd6ad4ef1e67..3a80de436ac8759e2ccaf5cf81c9ba02261d0e88 100644
--- a/src/USER-CGDNA/pair_oxdna2_coaxstk.cpp
+++ b/src/USER-CGDNA/pair_oxdna2_coaxstk.cpp
@@ -14,10 +14,10 @@
    Contributing author: Oliver Henrich (University of Strathclyde, Glasgow)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_oxdna2_coaxstk.h"
 #include "mf_oxdna.h"
 #include "atom.h"
diff --git a/src/USER-CGDNA/pair_oxdna2_dh.cpp b/src/USER-CGDNA/pair_oxdna2_dh.cpp
index 48914239251e282239e8510a4355b31148e05dae..f4f78685b74132fb3ecf9b84be5ab14887982cc7 100644
--- a/src/USER-CGDNA/pair_oxdna2_dh.cpp
+++ b/src/USER-CGDNA/pair_oxdna2_dh.cpp
@@ -14,10 +14,10 @@
    Contributing author: Oliver Henrich (University of Strathclyde, Glasgow)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_oxdna2_dh.h"
 #include "mf_oxdna.h"
 #include "atom.h"
diff --git a/src/USER-CGDNA/pair_oxdna2_excv.cpp b/src/USER-CGDNA/pair_oxdna2_excv.cpp
index e1b18e1487a0d41e079e4dc50fbaf1d1a2bf13aa..4329fbe0715a2e10d22302aa0b2b2e462047a299 100644
--- a/src/USER-CGDNA/pair_oxdna2_excv.cpp
+++ b/src/USER-CGDNA/pair_oxdna2_excv.cpp
@@ -14,10 +14,10 @@
    Contributing author: Oliver Henrich (University of Strathclyde, Glasgow)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_oxdna2_excv.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/USER-CGDNA/pair_oxdna2_stk.cpp b/src/USER-CGDNA/pair_oxdna2_stk.cpp
index 3b98db32012d2cf4a99eafa3ef2a8545b8f7cbf7..f479572aa6ed5a070150cf2516a9012fbb96c471 100644
--- a/src/USER-CGDNA/pair_oxdna2_stk.cpp
+++ b/src/USER-CGDNA/pair_oxdna2_stk.cpp
@@ -14,10 +14,10 @@
    Contributing author: Oliver Henrich (University of Strathclyde, Glasgow)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_oxdna2_stk.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/USER-CGDNA/pair_oxdna_coaxstk.cpp b/src/USER-CGDNA/pair_oxdna_coaxstk.cpp
index 4a1af83884d3a19fa10a82d905ae395b26a23639..11689df73888fe2cfe8dddbb28953c7916a7b801 100644
--- a/src/USER-CGDNA/pair_oxdna_coaxstk.cpp
+++ b/src/USER-CGDNA/pair_oxdna_coaxstk.cpp
@@ -14,10 +14,10 @@
    Contributing author: Oliver Henrich (University of Strathclyde, Glasgow)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_oxdna_coaxstk.h"
 #include "mf_oxdna.h"
 #include "atom.h"
diff --git a/src/USER-CGDNA/pair_oxdna_excv.cpp b/src/USER-CGDNA/pair_oxdna_excv.cpp
index 09ae13f1b2618fadf28b2f48bf6f7775ec56eea5..31762018a3665ef01bb49d79cdccf4b164d449e0 100644
--- a/src/USER-CGDNA/pair_oxdna_excv.cpp
+++ b/src/USER-CGDNA/pair_oxdna_excv.cpp
@@ -14,10 +14,10 @@
    Contributing author: Oliver Henrich (University of Strathclyde, Glasgow)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_oxdna_excv.h"
 #include "mf_oxdna.h"
 #include "atom.h"
diff --git a/src/USER-CGDNA/pair_oxdna_hbond.cpp b/src/USER-CGDNA/pair_oxdna_hbond.cpp
index 1caf320ef1b0105cc336cfa8c2125203bb4c3337..3d3ba9b4563d384db09f88529932ae7099ac318a 100644
--- a/src/USER-CGDNA/pair_oxdna_hbond.cpp
+++ b/src/USER-CGDNA/pair_oxdna_hbond.cpp
@@ -14,10 +14,10 @@
    Contributing author: Oliver Henrich (University of Strathclyde, Glasgow)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_oxdna_hbond.h"
 #include "mf_oxdna.h"
 #include "atom.h"
diff --git a/src/USER-CGDNA/pair_oxdna_stk.cpp b/src/USER-CGDNA/pair_oxdna_stk.cpp
index 9c3a11b9b712eef4dbaecf71c709fd0e9766d255..8c4498e627cfecb185289cf1834e74fab1f484a8 100644
--- a/src/USER-CGDNA/pair_oxdna_stk.cpp
+++ b/src/USER-CGDNA/pair_oxdna_stk.cpp
@@ -14,10 +14,10 @@
    Contributing author: Oliver Henrich (University of Strathclyde, Glasgow)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_oxdna_stk.h"
 #include "mf_oxdna.h"
 #include "atom.h"
diff --git a/src/USER-CGDNA/pair_oxdna_xstk.cpp b/src/USER-CGDNA/pair_oxdna_xstk.cpp
index c14993dc36a4e8186e93d6f841b1697489edf386..d456c0117c3d7b1a15e2331795217adcc7027648 100644
--- a/src/USER-CGDNA/pair_oxdna_xstk.cpp
+++ b/src/USER-CGDNA/pair_oxdna_xstk.cpp
@@ -14,10 +14,10 @@
    Contributing author: Oliver Henrich (University of Strathclyde, Glasgow)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_oxdna_xstk.h"
 #include "mf_oxdna.h"
 #include "atom.h"
diff --git a/src/USER-CGSDK/angle_sdk.cpp b/src/USER-CGSDK/angle_sdk.cpp
index a4f979961f2e3cdc6b91a9b42103427a088a4ec9..6b8245b4914447cab0426d9a3a95633105c119b2 100644
--- a/src/USER-CGSDK/angle_sdk.cpp
+++ b/src/USER-CGSDK/angle_sdk.cpp
@@ -18,8 +18,8 @@
    lj/sdk potential for coarse grained MD simulations.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_sdk.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-CGSDK/angle_sdk.h b/src/USER-CGSDK/angle_sdk.h
index a5d917e57cfcc0e281d05b86335db9eb017709c8..293004ad4d51b4e159dce696cd8d7aea89caf063 100644
--- a/src/USER-CGSDK/angle_sdk.h
+++ b/src/USER-CGSDK/angle_sdk.h
@@ -20,7 +20,7 @@ AngleStyle(sdk,AngleSDK)
 #ifndef LMP_ANGLE_SDK_H
 #define LMP_ANGLE_SDK_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-CGSDK/lj_sdk_common.h b/src/USER-CGSDK/lj_sdk_common.h
index f8f7a66ce9bd9570af5528b29aab1d4e627dbfef..c1f2cf215a68966884b90778bcd09319fe5e935b 100644
--- a/src/USER-CGSDK/lj_sdk_common.h
+++ b/src/USER-CGSDK/lj_sdk_common.h
@@ -19,7 +19,7 @@
 #ifndef LMP_LJ_SDK_COMMON_H
 #define LMP_LJ_SDK_COMMON_H
 
-#include <string.h>
+#include <cstring>
 
 namespace LAMMPS_NS {
 namespace LJSDKParms {
diff --git a/src/USER-CGSDK/pair_lj_sdk.cpp b/src/USER-CGSDK/pair_lj_sdk.cpp
index 56e56c9605cc82b3e20352dfc2303b948b486771..cbcba7f6b260dc777bd40433aaa5610d33be0800 100644
--- a/src/USER-CGSDK/pair_lj_sdk.cpp
+++ b/src/USER-CGSDK/pair_lj_sdk.cpp
@@ -16,10 +16,10 @@
    This style is a simplified re-implementation of the CG/CMM pair style
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_sdk.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-CGSDK/pair_lj_sdk_coul_long.cpp b/src/USER-CGSDK/pair_lj_sdk_coul_long.cpp
index 4c9e42f778431810a2c78af21ed4a7b702484c2d..1d93363e207f185d7460b3f038fb1042a82eb2b4 100644
--- a/src/USER-CGSDK/pair_lj_sdk_coul_long.cpp
+++ b/src/USER-CGSDK/pair_lj_sdk_coul_long.cpp
@@ -16,10 +16,10 @@
    This style is a simplified re-implementation of the CG/CMM pair style
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_sdk_coul_long.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-CGSDK/pair_lj_sdk_coul_msm.cpp b/src/USER-CGSDK/pair_lj_sdk_coul_msm.cpp
index ddca927a681bf94752825621698f0949bbd8112a..c4882fdbdb9e13b2ae953b5f666a8c95c92d4d63 100644
--- a/src/USER-CGSDK/pair_lj_sdk_coul_msm.cpp
+++ b/src/USER-CGSDK/pair_lj_sdk_coul_msm.cpp
@@ -16,10 +16,10 @@
    This style is a simplified re-implementation of the CG/CMM pair style
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_sdk_coul_msm.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-COLVARS/fix_colvars.cpp b/src/USER-COLVARS/fix_colvars.cpp
index 84b3ee07d62533c07c6cbc7cb68bb675a5b07d3a..0e4e151c3dcca2bc43e4033df9127480f46a1318 100644
--- a/src/USER-COLVARS/fix_colvars.cpp
+++ b/src/USER-COLVARS/fix_colvars.cpp
@@ -24,10 +24,10 @@
    Contributing author:  Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <errno.h>
 
 #include "fix_colvars.h"
diff --git a/src/USER-COLVARS/group_ndx.cpp b/src/USER-COLVARS/group_ndx.cpp
index 50769180390cec50f8f693444393506ca990522c..450c250ffa4fcbe23aef74fd10cda0887ecfb3dd 100644
--- a/src/USER-COLVARS/group_ndx.cpp
+++ b/src/USER-COLVARS/group_ndx.cpp
@@ -23,8 +23,8 @@
 #include "memory.h"
 #include "error.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-COLVARS/ndx_group.cpp b/src/USER-COLVARS/ndx_group.cpp
index c7972e372ec940989ec58d2c727cf2ce4aba5a78..7b46364f189cc1e9ebef74bb965c8670affadbd2 100644
--- a/src/USER-COLVARS/ndx_group.cpp
+++ b/src/USER-COLVARS/ndx_group.cpp
@@ -24,9 +24,9 @@
 #include "force.h"
 #include "error.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 using namespace LAMMPS_NS;
 #define BUFLEN 4096
diff --git a/src/USER-DIFFRACTION/compute_saed.cpp b/src/USER-DIFFRACTION/compute_saed.cpp
index cc1dec96fa14872b1d792a5fab15847c796e825f..3d09955275c1b2de3aa7219b0a162151ce49de29 100644
--- a/src/USER-DIFFRACTION/compute_saed.cpp
+++ b/src/USER-DIFFRACTION/compute_saed.cpp
@@ -16,8 +16,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 #include "math_const.h"
 #include "compute_saed.h"
 #include "compute_saed_consts.h"
@@ -29,8 +31,6 @@
 #include "citeme.h"
 #include "memory.h"
 #include "error.h"
-#include <stdio.h>
-#include <string.h>
 
 using namespace LAMMPS_NS;
 using namespace MathConst;
diff --git a/src/USER-DIFFRACTION/compute_xrd.cpp b/src/USER-DIFFRACTION/compute_xrd.cpp
index 380629ffb9ea6c48f9c8113af305ea30b182a8ab..4d5cccdc504433afa39802bbd9d1a1ef1f5fd48b 100644
--- a/src/USER-DIFFRACTION/compute_xrd.cpp
+++ b/src/USER-DIFFRACTION/compute_xrd.cpp
@@ -17,8 +17,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 #include "math_const.h"
 #include "compute_xrd.h"
 #include "compute_xrd_consts.h"
@@ -30,8 +32,6 @@
 #include "citeme.h"
 #include "memory.h"
 #include "error.h"
-#include <stdio.h>
-#include <string.h>
 
 using namespace LAMMPS_NS;
 using namespace MathConst;
diff --git a/src/USER-DIFFRACTION/fix_saed_vtk.cpp b/src/USER-DIFFRACTION/fix_saed_vtk.cpp
index dfa63f630ad5537b7700a25b330d9e17af1d1185..45bfeca48bd2269d0579672994fca283d8495ae1 100644
--- a/src/USER-DIFFRACTION/fix_saed_vtk.cpp
+++ b/src/USER-DIFFRACTION/fix_saed_vtk.cpp
@@ -16,8 +16,9 @@
    Incorporating SAED: Shawn Coleman (Arkansas)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
 #include "fix_saed_vtk.h"
 #include "update.h"
 #include "modify.h"
@@ -29,7 +30,6 @@
 #include "memory.h"
 #include "error.h"
 #include "force.h"
-#include <math.h>
 #include "domain.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/USER-DIFFRACTION/fix_saed_vtk.h b/src/USER-DIFFRACTION/fix_saed_vtk.h
index fa379e7216ca9dfdb366969e3aca3c481559d3b4..2fc09c781c8da9644959fd5ddba30588556cf162 100644
--- a/src/USER-DIFFRACTION/fix_saed_vtk.h
+++ b/src/USER-DIFFRACTION/fix_saed_vtk.h
@@ -20,7 +20,7 @@ FixStyle(saed/vtk,FixSAEDVTK)
 #ifndef LMP_FIX_SAED_VTK_H
 #define LMP_FIX_SAED_VTK_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-DPD/atom_vec_dpd.cpp b/src/USER-DPD/atom_vec_dpd.cpp
index 477ed05e3f04c85cd0ba864bb56b0bd76200df5b..6c8e6f91a9b4ea16b778228731be2eb3d2639f94 100644
--- a/src/USER-DPD/atom_vec_dpd.cpp
+++ b/src/USER-DPD/atom_vec_dpd.cpp
@@ -15,7 +15,7 @@
    Contributing author: James Larentzos (U.S. Army Research Laboratory)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "atom_vec_dpd.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-DPD/compute_dpd_atom.cpp b/src/USER-DPD/compute_dpd_atom.cpp
index c8231ddabc231cb806c7af2289168a8486826a1a..78f842a68f2f2b351c672ba68bf4dbd6f4628057 100644
--- a/src/USER-DPD/compute_dpd_atom.cpp
+++ b/src/USER-DPD/compute_dpd_atom.cpp
@@ -15,9 +15,9 @@
    Contributing author: James Larentzos (U.S. Army Research Laboratory)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "compute_dpd_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-DPD/fix_dpd_energy.cpp b/src/USER-DPD/fix_dpd_energy.cpp
index 475e12f02fb10a30acf23e5ed27ed4605b5995fc..d89ea7759a8fbae547aeb4d724b3b8c82ca73472 100644
--- a/src/USER-DPD/fix_dpd_energy.cpp
+++ b/src/USER-DPD/fix_dpd_energy.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include "fix_dpd_energy.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-DPD/fix_eos_cv.cpp b/src/USER-DPD/fix_eos_cv.cpp
index 7a2d278fe4766d73e20163704d3ffbcd23632fad..919e6829f30fd91d5a8d2580ac64c0b276f44ea0 100644
--- a/src/USER-DPD/fix_eos_cv.cpp
+++ b/src/USER-DPD/fix_eos_cv.cpp
@@ -15,8 +15,8 @@
    Contributing author: James Larentzos (U.S. Army Research Laboratory)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_eos_cv.h"
 #include "atom.h"
 #include "error.h"
diff --git a/src/USER-DPD/fix_eos_table.cpp b/src/USER-DPD/fix_eos_table.cpp
index c17a9721084d11968b5ae7ae9771fb1789c9fc97..e57a3788bf733f8f57ec12a54ea5b501eb0c0e4f 100644
--- a/src/USER-DPD/fix_eos_table.cpp
+++ b/src/USER-DPD/fix_eos_table.cpp
@@ -15,8 +15,8 @@
    Contributing author: James Larentzos (U.S. Army Research Laboratory)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_eos_table.h"
 #include "atom.h"
 #include "error.h"
diff --git a/src/USER-DPD/fix_eos_table_rx.cpp b/src/USER-DPD/fix_eos_table_rx.cpp
index c9a705446a0f6b54d2870590366a350b1a70ed04..73144c0a0f9423196b106ba67ebd917f56bf8c77 100644
--- a/src/USER-DPD/fix_eos_table_rx.cpp
+++ b/src/USER-DPD/fix_eos_table_rx.cpp
@@ -15,15 +15,15 @@
    Contributing author: James Larentzos (U.S. Army Research Laboratory)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
 #include "fix_eos_table_rx.h"
 #include "atom.h"
 #include "error.h"
 #include "force.h"
 #include "memory.h"
 #include "comm.h"
-#include <math.h>
 #include "modify.h"
 
 #define MAXLINE 1024
@@ -774,7 +774,7 @@ void FixEOStableRX::temperature_lookup(int id, double ui, double &thetai)
   // Apply the Secant Method
   for(it=0; it<maxit; it++){
     if(fabs(f2-f1) < MY_EPSILON){
-      if(isnan(f1) || isnan(f2)) error->one(FLERR,"NaN detected in secant solver.");
+      if(std::isnan(f1) || std::isnan(f2)) error->one(FLERR,"NaN detected in secant solver.");
       temp = t1;
       temp = MAX(temp,tb->lo);
       temp = MIN(temp,tb->hi);
@@ -794,7 +794,7 @@ void FixEOStableRX::temperature_lookup(int id, double ui, double &thetai)
   if(it==maxit){
     char str[256];
     sprintf(str,"Maxit exceeded in secant solver:  id=%d ui=%lf thetai=%lf t1=%lf t2=%lf f1=%lf f2=%lf\n",id,ui,thetai,t1,t2,f1,f2);
-    if(isnan(f1) || isnan(f2) || isnan(ui) || isnan(thetai) || isnan(t1) || isnan(t2))
+    if(std::isnan(f1) || std::isnan(f2) || std::isnan(ui) || std::isnan(thetai) || std::isnan(t1) || std::isnan(t2))
       error->one(FLERR,"NaN detected in secant solver.");
     error->one(FLERR,str);
   }
diff --git a/src/USER-DPD/fix_rx.cpp b/src/USER-DPD/fix_rx.cpp
index 0d0ec2a75b0ebba55b74162ac39fbcc71a517356..b8b002a7fa11df5e5a2f5fe93ba3ad82be8f1c70 100644
--- a/src/USER-DPD/fix_rx.cpp
+++ b/src/USER-DPD/fix_rx.cpp
@@ -11,10 +11,11 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
+#include <cfloat> // DBL_EPSILON
 #include "fix_rx.h"
 #include "atom.h"
 #include "error.h"
@@ -31,10 +32,8 @@
 #include "math_special.h"
 #include "pair_dpd_fdt_energy.h"
 
-#include <float.h> // DBL_EPSILON
 #include <vector> // std::vector<>
 #include <algorithm> // std::max
-#include <cmath> // std::fmod
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/USER-DPD/fix_shardlow.cpp b/src/USER-DPD/fix_shardlow.cpp
index cee67cfcf96ee84ec5752de69d09b3651157879d..06185dee7ec702d2dfb3a4686fa88c2c7e3b16f8 100644
--- a/src/USER-DPD/fix_shardlow.cpp
+++ b/src/USER-DPD/fix_shardlow.cpp
@@ -33,16 +33,16 @@
    135, 204105.
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
 #include "fix_shardlow.h"
 #include "atom.h"
 #include "force.h"
 #include "update.h"
 #include "respa.h"
 #include "error.h"
-#include <math.h>
 #include "atom_vec.h"
 #include "comm.h"
 #include "neighbor.h"
diff --git a/src/USER-DPD/fix_shardlow.h b/src/USER-DPD/fix_shardlow.h
index 21f7569a233de12032311d80b0144ef7fa8acf1e..67e4b8f32e8383ada4448c87434edaf5ea3a0b7a 100644
--- a/src/USER-DPD/fix_shardlow.h
+++ b/src/USER-DPD/fix_shardlow.h
@@ -22,7 +22,6 @@ FixStyle(shardlow,FixShardlow)
 
 #include "fix.h"
 #include "random_external_state.h"
-#include <math.h>
 
 namespace LAMMPS_NS {
 
diff --git a/src/USER-DPD/nbin_ssa.h b/src/USER-DPD/nbin_ssa.h
index 12a572b94caab73125eb01887b89849189c11826..c738391d67f3cc0980b80dd8e275e1cb24c2ace4 100644
--- a/src/USER-DPD/nbin_ssa.h
+++ b/src/USER-DPD/nbin_ssa.h
@@ -22,8 +22,8 @@ NBinStyle(ssa,
 #ifndef LMP_NBIN_SSA_H
 #define LMP_NBIN_SSA_H
 
+#include <cmath>
 #include "nbin_standard.h"
-#include "math.h"
 #include "error.h"
 
 namespace LAMMPS_NS {
@@ -54,7 +54,7 @@ class NBinSSA : public NBinStandard {
   {
     int ix,iy,iz;
 
-    if (!ISFINITE(x) || !ISFINITE(y) || !ISFINITE(z))
+    if (!std::isfinite(x) || !std::isfinite(y) || !std::isfinite(z))
       error->one(FLERR,"Non-numeric positions - simulation unstable");
 
     if (x >= bboxhi_[0])
diff --git a/src/USER-DPD/pair_dpd_fdt.cpp b/src/USER-DPD/pair_dpd_fdt.cpp
index 95908c556d12156e3e8e0d14e8f672be66655890..aeade16e7cb0525a5e1ce75dba723832646b7ad4 100644
--- a/src/USER-DPD/pair_dpd_fdt.cpp
+++ b/src/USER-DPD/pair_dpd_fdt.cpp
@@ -15,10 +15,10 @@
    Contributing author: James Larentzos (U.S. Army Research Laboratory)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "atom.h"
 #include "atom_vec.h"
 #include "comm.h"
diff --git a/src/USER-DPD/pair_dpd_fdt_energy.cpp b/src/USER-DPD/pair_dpd_fdt_energy.cpp
index 32ac456b0fffede0ea5b4551877f6d1e001bb511..d1f3cceed4ca14db73014d7e252770b007d8db95 100644
--- a/src/USER-DPD/pair_dpd_fdt_energy.cpp
+++ b/src/USER-DPD/pair_dpd_fdt_energy.cpp
@@ -15,10 +15,10 @@
    Contributing author: James Larentzos (U.S. Army Research Laboratory)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "atom.h"
 #include "atom_vec.h"
 #include "comm.h"
diff --git a/src/USER-DPD/pair_exp6_rx.cpp b/src/USER-DPD/pair_exp6_rx.cpp
index 8b6fc9beed8e65836bb26350d1ecf8c48c02ed1d..057c8fa1190e00e61b718edc0f4d66f865cb43f0 100644
--- a/src/USER-DPD/pair_exp6_rx.cpp
+++ b/src/USER-DPD/pair_exp6_rx.cpp
@@ -11,10 +11,11 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cfloat>
 #include "pair_exp6_rx.h"
 #include "atom.h"
 #include "comm.h"
@@ -26,7 +27,6 @@
 #include "error.h"
 #include "modify.h"
 #include "fix.h"
-#include <float.h>
 
 using namespace LAMMPS_NS;
 using namespace MathConst;
diff --git a/src/USER-DPD/pair_multi_lucy.cpp b/src/USER-DPD/pair_multi_lucy.cpp
index 6f4104e93d0d45705891ccbc09667e7fbc8c40c7..3d204a849e3bfe1d70497f0c2c2340f48b3dab47 100644
--- a/src/USER-DPD/pair_multi_lucy.cpp
+++ b/src/USER-DPD/pair_multi_lucy.cpp
@@ -22,10 +22,10 @@
 ------------------------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
+#include <cmath>
 #include "math_const.h"
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "pair_multi_lucy.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-DPD/pair_multi_lucy_rx.cpp b/src/USER-DPD/pair_multi_lucy_rx.cpp
index 4628edbc127c41187ea750a5545b55f192c9592f..0070ca82d9c5eed5f07fa16defbf4b0da7944829 100644
--- a/src/USER-DPD/pair_multi_lucy_rx.cpp
+++ b/src/USER-DPD/pair_multi_lucy_rx.cpp
@@ -22,10 +22,10 @@
 ------------------------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
+#include <cmath>
 #include "math_const.h"
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "pair_multi_lucy_rx.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-DPD/pair_table_rx.cpp b/src/USER-DPD/pair_table_rx.cpp
index 89d09e73227bd3ed0c6d9f3e86714237fc98ae3d..221944edc5170612b0ae7a246f3dd7bc61e6a26d 100644
--- a/src/USER-DPD/pair_table_rx.cpp
+++ b/src/USER-DPD/pair_table_rx.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "pair_table_rx.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-DPD/random_external_state.h b/src/USER-DPD/random_external_state.h
index 47288d77fd86ed4a13f8f3ff717903b6adecde29..de017ee8bdbe0e3ddb7e8ec714920ace97f2c49f 100644
--- a/src/USER-DPD/random_external_state.h
+++ b/src/USER-DPD/random_external_state.h
@@ -63,7 +63,7 @@
 #ifndef LMP_RANDOM_EXTERNALSTATE_H
 #define LMP_RANDOM_EXTERNALSTATE_H
 
-#include <math.h>
+#include <cmath>
 #include "accelerator_kokkos.h"
 
 
diff --git a/src/USER-DRUDE/compute_temp_drude.cpp b/src/USER-DRUDE/compute_temp_drude.cpp
index 44b727f6b7b95660abc4cba3a0812edffe5ccecc..27b525c07d4393fc9cb4709b3a1c67f8d6351c97 100644
--- a/src/USER-DRUDE/compute_temp_drude.cpp
+++ b/src/USER-DRUDE/compute_temp_drude.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "compute_temp_drude.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-DRUDE/fix_drude.cpp b/src/USER-DRUDE/fix_drude.cpp
index a38f9f1e669716981174f6035089ff93eef571a5..19fd775715822d040edf8b3bf4621902fbafb71d 100644
--- a/src/USER-DRUDE/fix_drude.cpp
+++ b/src/USER-DRUDE/fix_drude.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "fix_drude.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-DRUDE/fix_drude_transform.cpp b/src/USER-DRUDE/fix_drude_transform.cpp
index adbfd324df302a244189c7ea38495824d38ba4fc..29c1ff88211085fb9769e3d292b6bc3352d9d02d 100644
--- a/src/USER-DRUDE/fix_drude_transform.cpp
+++ b/src/USER-DRUDE/fix_drude_transform.cpp
@@ -12,7 +12,8 @@
 ------------------------------------------------------------------------- */
 
 /** Fix Drude Transform ******************************************************/
-#include <math.h>
+#include <cmath>
+#include <cstring>
 #include "fix_drude_transform.h"
 #include "atom.h"
 #include "domain.h"
@@ -21,8 +22,6 @@
 #include "modify.h"
 #include "force.h"
 
-#include <string.h>
-
 using namespace LAMMPS_NS;
 using namespace FixConst;
 
diff --git a/src/USER-DRUDE/fix_langevin_drude.cpp b/src/USER-DRUDE/fix_langevin_drude.cpp
index d04adb022327de0e3822f47b246e37c73d870513..235c5d224ba8e1914e201b95055cf072d3c9b64b 100644
--- a/src/USER-DRUDE/fix_langevin_drude.cpp
+++ b/src/USER-DRUDE/fix_langevin_drude.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "fix_langevin_drude.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-DRUDE/pair_lj_cut_thole_long.cpp b/src/USER-DRUDE/pair_lj_cut_thole_long.cpp
index f78ced3d8bd96caaa35798db21f1bce5f19a05e2..ce5d3a92a9002af04c1e3cbae013bc0c605424a9 100644
--- a/src/USER-DRUDE/pair_lj_cut_thole_long.cpp
+++ b/src/USER-DRUDE/pair_lj_cut_thole_long.cpp
@@ -15,10 +15,10 @@
    Contributing author: Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_thole_long.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-DRUDE/pair_thole.cpp b/src/USER-DRUDE/pair_thole.cpp
index ace119ce523892b0ad7a8d52c0288f0bc0f725b4..8c20ee8c4208e7cd59377d184b99662444bf35bd 100644
--- a/src/USER-DRUDE/pair_thole.cpp
+++ b/src/USER-DRUDE/pair_thole.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_thole.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-EFF/atom_vec_electron.cpp b/src/USER-EFF/atom_vec_electron.cpp
index 56d61fd74f99ffb6c237ecfc2c0487bcd0d37569..1bc5387c9e20800a6c35809ed29a2587da6b2ed8 100644
--- a/src/USER-EFF/atom_vec_electron.cpp
+++ b/src/USER-EFF/atom_vec_electron.cpp
@@ -15,9 +15,9 @@
    Contributing author: Andres Jaramillo-Botero (Caltech)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "atom_vec_electron.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-EFF/compute_ke_atom_eff.cpp b/src/USER-EFF/compute_ke_atom_eff.cpp
index 8d03e97b0af4d653d3d1d4809009d60b868c664a..b1b87cd3df18d10d9dd1e366d1ed8fc849fd7909 100644
--- a/src/USER-EFF/compute_ke_atom_eff.cpp
+++ b/src/USER-EFF/compute_ke_atom_eff.cpp
@@ -15,9 +15,9 @@
    Contributing author: Andres Jaramillo-Botero
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "compute_ke_atom_eff.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-EFF/compute_ke_eff.cpp b/src/USER-EFF/compute_ke_eff.cpp
index 80c7192708fab9c6aebb39181cf4b27829ddd1e4..b4f571cb63718e8e425820961fb1ae62c4bea93c 100644
--- a/src/USER-EFF/compute_ke_eff.cpp
+++ b/src/USER-EFF/compute_ke_eff.cpp
@@ -16,8 +16,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "compute_ke_eff.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-EFF/compute_temp_deform_eff.cpp b/src/USER-EFF/compute_temp_deform_eff.cpp
index 40e8e529c0ea2baf1a0ada81edd5b0cbe06356bb..53fb7683a76bcde71ecf5dcfd32270c48c877844 100644
--- a/src/USER-EFF/compute_temp_deform_eff.cpp
+++ b/src/USER-EFF/compute_temp_deform_eff.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "compute_temp_deform_eff.h"
 #include "domain.h"
 #include "atom.h"
diff --git a/src/USER-EFF/compute_temp_eff.cpp b/src/USER-EFF/compute_temp_eff.cpp
index 251cdccaca7a83dc4cf2b866d075823d92b6892d..956461adf19489df4ad25c3c56812726c5a0a111 100644
--- a/src/USER-EFF/compute_temp_eff.cpp
+++ b/src/USER-EFF/compute_temp_eff.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "compute_temp_eff.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-EFF/compute_temp_region_eff.cpp b/src/USER-EFF/compute_temp_region_eff.cpp
index c0cd56f3a8d65c5b55d30108446cb3c58566e702..4548914ce13f5a349c0a6b00db726e5160c6cef3 100644
--- a/src/USER-EFF/compute_temp_region_eff.cpp
+++ b/src/USER-EFF/compute_temp_region_eff.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "compute_temp_region_eff.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-EFF/fix_langevin_eff.cpp b/src/USER-EFF/fix_langevin_eff.cpp
index 9584623fc3970e055ae9113d76b12e62cfccb1b9..2d0eef8e8573293af0ae480abb86898273d92a4a 100644
--- a/src/USER-EFF/fix_langevin_eff.cpp
+++ b/src/USER-EFF/fix_langevin_eff.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_langevin_eff.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/USER-EFF/fix_nh_eff.cpp b/src/USER-EFF/fix_nh_eff.cpp
index 464498969ebf6ff0a23ba335e9f0842e1dc4f364..3e0a59612c2d0ccf4af8e64dd98f76e4dbfaa82c 100644
--- a/src/USER-EFF/fix_nh_eff.cpp
+++ b/src/USER-EFF/fix_nh_eff.cpp
@@ -15,8 +15,8 @@
    Contributing author: Andres Jaramillo-Botero (Caltech)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "fix_nh_eff.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/USER-EFF/fix_nph_eff.cpp b/src/USER-EFF/fix_nph_eff.cpp
index 0fe8c8e6dbd12116cbf5972e53c325de23aa00f9..28ebc620f9fe7aaf2c7425172385ae3c621fb97a 100644
--- a/src/USER-EFF/fix_nph_eff.cpp
+++ b/src/USER-EFF/fix_nph_eff.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_nph_eff.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/USER-EFF/fix_npt_eff.cpp b/src/USER-EFF/fix_npt_eff.cpp
index 02f09839b182a7b7891d3f53f8e20619883c1b88..6aac7f373462daa1d290ed22b2b70a6dc6f944ee 100644
--- a/src/USER-EFF/fix_npt_eff.cpp
+++ b/src/USER-EFF/fix_npt_eff.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_npt_eff.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/USER-EFF/fix_nve_eff.cpp b/src/USER-EFF/fix_nve_eff.cpp
index 09cd81a722165dfb9e9c7bacf39576f8707563bb..584714a44e7413e0eed09fedb95994a853b37811 100644
--- a/src/USER-EFF/fix_nve_eff.cpp
+++ b/src/USER-EFF/fix_nve_eff.cpp
@@ -15,17 +15,16 @@
    Contributing author: Andres Jaramillo-Botero (Caltech)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
 #include "fix_nve_eff.h"
 #include "atom.h"
 #include "force.h"
 #include "update.h"
 #include "respa.h"
 #include "error.h"
-#include <math.h>
 #include "domain.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/USER-EFF/fix_nvt_eff.cpp b/src/USER-EFF/fix_nvt_eff.cpp
index ab82f9e0f8296f4008c44087f6ce0e5ad1a0b97b..9e23ee023be8702180190bae0bdf3d9e9f0e5ac2 100644
--- a/src/USER-EFF/fix_nvt_eff.cpp
+++ b/src/USER-EFF/fix_nvt_eff.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <math.h>
+#include <cstring>
+#include <cmath>
 #include "fix_nvt_eff.h"
 #include "group.h"
 #include "modify.h"
diff --git a/src/USER-EFF/fix_nvt_sllod_eff.cpp b/src/USER-EFF/fix_nvt_sllod_eff.cpp
index 1b4ec1f3fbb25ecf565d19e4eed2ddbee72a1ab4..f7b1a4ab2b162925999df9797050993902491772 100644
--- a/src/USER-EFF/fix_nvt_sllod_eff.cpp
+++ b/src/USER-EFF/fix_nvt_sllod_eff.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "fix_nvt_sllod_eff.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/USER-EFF/fix_temp_rescale_eff.cpp b/src/USER-EFF/fix_temp_rescale_eff.cpp
index 774cd1f2e303782236613686a10d5eca3146a2bc..37f45b3c28ad45142262121a957787b5e8e43a8c 100644
--- a/src/USER-EFF/fix_temp_rescale_eff.cpp
+++ b/src/USER-EFF/fix_temp_rescale_eff.cpp
@@ -15,9 +15,9 @@
    Contributing author: Andres Jaramillo-Botero
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "fix_temp_rescale_eff.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-EFF/pair_eff_cut.cpp b/src/USER-EFF/pair_eff_cut.cpp
index 850c52362967721bf00248aa0474d4a7d67efd18..0379c0264b5570f18ab1f8d401078c1abe700de9 100644
--- a/src/USER-EFF/pair_eff_cut.cpp
+++ b/src/USER-EFF/pair_eff_cut.cpp
@@ -15,10 +15,10 @@
    Contributing author: Andres Jaramillo-Botero
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_eff_cut.h"
 #include "pair_eff_inline.h"
 #include "atom.h"
diff --git a/src/USER-FEP/compute_fep.cpp b/src/USER-FEP/compute_fep.cpp
index bfa3bf7e2c91648cb08b74cca10e394da9a4a9e9..0e5f164f88d861b9614cd9e0bad8b93a3c4890e6 100644
--- a/src/USER-FEP/compute_fep.cpp
+++ b/src/USER-FEP/compute_fep.cpp
@@ -15,9 +15,9 @@
    Contributing author: Agilio Padua (Univ Blaise Pascal & CNRS)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
 #include <mpi.h>
 #include "comm.h"
 #include "update.h"
diff --git a/src/USER-FEP/fix_adapt_fep.cpp b/src/USER-FEP/fix_adapt_fep.cpp
index 1b7fc559420f2ee6bd932d872c50524cebe208d9..3b8c9d4201f592343dff8d9e43c6a6b7ae9f1407 100644
--- a/src/USER-FEP/fix_adapt_fep.cpp
+++ b/src/USER-FEP/fix_adapt_fep.cpp
@@ -15,9 +15,9 @@
    Charges by type and after option: Agilio Padua (Univ Blaise Pascal & CNRS)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_adapt_fep.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-FEP/pair_coul_cut_soft.cpp b/src/USER-FEP/pair_coul_cut_soft.cpp
index a7ac8004fe631c576d9e5cc3b58106dd6d997356..5bcb5a752256a07ac83d4d74c2d044681b891b40 100644
--- a/src/USER-FEP/pair_coul_cut_soft.cpp
+++ b/src/USER-FEP/pair_coul_cut_soft.cpp
@@ -15,10 +15,10 @@
    Soft-core version: Agilio Padua (Univ Blaise Pascal & CNRS)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_cut_soft.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-FEP/pair_coul_long_soft.cpp b/src/USER-FEP/pair_coul_long_soft.cpp
index 3d24a997ddf0162af51b1a89a93dc0e525d4cf30..94bb3659fa3beea5a4025ace13b876ad6405375b 100644
--- a/src/USER-FEP/pair_coul_long_soft.cpp
+++ b/src/USER-FEP/pair_coul_long_soft.cpp
@@ -16,10 +16,10 @@
    Soft-core version: Agilio Padua (Univ Blaise Pascal & CNRS)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_long_soft.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-FEP/pair_lj_charmm_coul_long_soft.cpp b/src/USER-FEP/pair_lj_charmm_coul_long_soft.cpp
index 06285a58d3c3009e8ddb94fa7eb8402dc1ff8c3c..34758b159b34bcbf546b76add6e8329f28caaff1 100644
--- a/src/USER-FEP/pair_lj_charmm_coul_long_soft.cpp
+++ b/src/USER-FEP/pair_lj_charmm_coul_long_soft.cpp
@@ -16,10 +16,10 @@
    Soft-core version: Agilio Padua (Univ Blaise Pascal & CNRS)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_charmm_coul_long_soft.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-FEP/pair_lj_cut_coul_cut_soft.cpp b/src/USER-FEP/pair_lj_cut_coul_cut_soft.cpp
index 9e52a16a025d103a1c2ca95c60aac239e7b8c471..fc887fbec5cf2b8729bd6dc5f1cb433ed632209f 100644
--- a/src/USER-FEP/pair_lj_cut_coul_cut_soft.cpp
+++ b/src/USER-FEP/pair_lj_cut_coul_cut_soft.cpp
@@ -15,10 +15,10 @@
    Soft-core version: Agilio Padua (Univ Blaise Pascal & CNRS)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_coul_cut_soft.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-FEP/pair_lj_cut_coul_long_soft.cpp b/src/USER-FEP/pair_lj_cut_coul_long_soft.cpp
index 7be2ebabea1fc434f5db0e920adc9f26fa70a875..a9032ab4d723d7e595b585f5ae910367107f7078 100644
--- a/src/USER-FEP/pair_lj_cut_coul_long_soft.cpp
+++ b/src/USER-FEP/pair_lj_cut_coul_long_soft.cpp
@@ -16,10 +16,10 @@
    Soft-core version: Agilio Padua (Univ Blaise Pascal & CNRS)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_coul_long_soft.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-FEP/pair_lj_cut_soft.cpp b/src/USER-FEP/pair_lj_cut_soft.cpp
index 9ae108fa338849a37704e58b66e039fff49d09ee..4aaa5c292531f7cc0aee51712576de220fe56909 100644
--- a/src/USER-FEP/pair_lj_cut_soft.cpp
+++ b/src/USER-FEP/pair_lj_cut_soft.cpp
@@ -16,10 +16,10 @@
    Soft-core version: Agilio Padua (Univ Blaise Pascal & CNRS)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_soft.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-FEP/pair_lj_cut_tip4p_long_soft.cpp b/src/USER-FEP/pair_lj_cut_tip4p_long_soft.cpp
index 8d9162e564097a44c68960ee2d28eb7746b856fc..8653800ee67f5f210e7a44db4789c571089cca08 100644
--- a/src/USER-FEP/pair_lj_cut_tip4p_long_soft.cpp
+++ b/src/USER-FEP/pair_lj_cut_tip4p_long_soft.cpp
@@ -17,10 +17,10 @@
    Soft-core version: Agilio Padua (Univ Blaise Pascal & CNRS)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_tip4p_long_soft.h"
 #include "angle.h"
 #include "atom.h"
diff --git a/src/USER-FEP/pair_morse_soft.cpp b/src/USER-FEP/pair_morse_soft.cpp
index 1333bc28ca947075eeb439458db0870f53c5809a..7a897e1870ed96a0aad08671b5d031e7764557d7 100644
--- a/src/USER-FEP/pair_morse_soft.cpp
+++ b/src/USER-FEP/pair_morse_soft.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_morse_soft.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-FEP/pair_tip4p_long_soft.cpp b/src/USER-FEP/pair_tip4p_long_soft.cpp
index 7ad654d95c3988e562d44829f5231f730b7e8303..5e8c5000f88e894bfc5ffd60224f26605a038dc6 100644
--- a/src/USER-FEP/pair_tip4p_long_soft.cpp
+++ b/src/USER-FEP/pair_tip4p_long_soft.cpp
@@ -17,10 +17,10 @@
    Soft-core version: Agilio Padua (Univ Blaise Pascal & CNRS)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_tip4p_long_soft.h"
 #include "angle.h"
 #include "atom.h"
diff --git a/src/USER-H5MD/dump_h5md.cpp b/src/USER-H5MD/dump_h5md.cpp
index 4e85b5c8b69175e98b374f53fc228ced6ab88998..393871ae0b9a7325d435f9a4f7f03f1fb2489090 100644
--- a/src/USER-H5MD/dump_h5md.cpp
+++ b/src/USER-H5MD/dump_h5md.cpp
@@ -15,11 +15,11 @@
    Contributing author: Pierre de Buyl (KU Leuven)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <climits>
 #include "ch5md.h"
 #include "dump_h5md.h"
 #include "domain.h"
diff --git a/src/USER-INTEL/angle_charmm_intel.cpp b/src/USER-INTEL/angle_charmm_intel.cpp
index bcaecb4696fa1d93e277d473e931b268298c5153..672b70b6f68785256c67b694b58b8d8e741dce87 100644
--- a/src/USER-INTEL/angle_charmm_intel.cpp
+++ b/src/USER-INTEL/angle_charmm_intel.cpp
@@ -15,8 +15,8 @@
    Contributing author: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_charmm_intel.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-INTEL/angle_charmm_intel.h b/src/USER-INTEL/angle_charmm_intel.h
index 342af31b8c122a937ab156e71c5ef12a7290bd11..5d173ee6a982e834587d5d7bc908854ec3a538d8 100644
--- a/src/USER-INTEL/angle_charmm_intel.h
+++ b/src/USER-INTEL/angle_charmm_intel.h
@@ -24,7 +24,7 @@ AngleStyle(charmm/intel,AngleCharmmIntel)
 #ifndef LMP_ANGLE_CHARMM_INTEL_H
 #define LMP_ANGLE_CHARMM_INTEL_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle_charmm.h"
 #include "fix_intel.h"
 
diff --git a/src/USER-INTEL/angle_harmonic_intel.cpp b/src/USER-INTEL/angle_harmonic_intel.cpp
index ffc81c496d77c654f35d6f0e1ad71a39a06844ee..74639f3aebddd8c705f622c2165edcf033617ea0 100644
--- a/src/USER-INTEL/angle_harmonic_intel.cpp
+++ b/src/USER-INTEL/angle_harmonic_intel.cpp
@@ -15,8 +15,8 @@
    Contributing author: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_harmonic_intel.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-INTEL/angle_harmonic_intel.h b/src/USER-INTEL/angle_harmonic_intel.h
index 301fc7cc066aabbb484f0c55b5065acbb93fd9b8..e7768542a1f1fbcb90692cf7f8afbad7f31d4ded 100644
--- a/src/USER-INTEL/angle_harmonic_intel.h
+++ b/src/USER-INTEL/angle_harmonic_intel.h
@@ -24,7 +24,7 @@ AngleStyle(harmonic/intel,AngleHarmonicIntel)
 #ifndef LMP_ANGLE_HARMONIC_INTEL_H
 #define LMP_ANGLE_HARMONIC_INTEL_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle_harmonic.h"
 #include "fix_intel.h"
 
diff --git a/src/USER-INTEL/bond_fene_intel.cpp b/src/USER-INTEL/bond_fene_intel.cpp
index 004a2e5413d6d566cb536b9d4290e80540315e81..2d70049a89b705918589f6402e987f6eb3edff34 100644
--- a/src/USER-INTEL/bond_fene_intel.cpp
+++ b/src/USER-INTEL/bond_fene_intel.cpp
@@ -15,8 +15,8 @@
    Contributing author: Stan Moore (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "bond_fene_intel.h"
 #include "atom.h"
 #include "modify.h"
diff --git a/src/USER-INTEL/bond_fene_intel.h b/src/USER-INTEL/bond_fene_intel.h
index 89c3033096e43eba27065220e2b77769cc831591..afe3b85470d6d81b0639a57a3ce7ade9a1ff0467 100644
--- a/src/USER-INTEL/bond_fene_intel.h
+++ b/src/USER-INTEL/bond_fene_intel.h
@@ -24,7 +24,7 @@ BondStyle(fene/intel,BondFENEIntel)
 #ifndef LMP_BOND_FENE_INTEL_H
 #define LMP_BOND_FENE_INTEL_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "bond_fene.h"
 #include "fix_intel.h"
 
diff --git a/src/USER-INTEL/bond_harmonic_intel.cpp b/src/USER-INTEL/bond_harmonic_intel.cpp
index 0c714edc0959519621b624d19dd6e79b5b081977..ed9cab082ed5553c9afd38ddf12f2aabf98861fe 100644
--- a/src/USER-INTEL/bond_harmonic_intel.cpp
+++ b/src/USER-INTEL/bond_harmonic_intel.cpp
@@ -15,8 +15,8 @@
    Contributing author: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "bond_harmonic_intel.h"
 #include "atom.h"
 #include "modify.h"
diff --git a/src/USER-INTEL/bond_harmonic_intel.h b/src/USER-INTEL/bond_harmonic_intel.h
index 8fc04f432a2a5994b08e9807f42161d36b933e62..b86a560d6e167e592aaee3cdfdc97b13fe906879 100644
--- a/src/USER-INTEL/bond_harmonic_intel.h
+++ b/src/USER-INTEL/bond_harmonic_intel.h
@@ -24,7 +24,7 @@ BondStyle(harmonic/intel,BondHarmonicIntel)
 #ifndef LMP_BOND_HARMONIC_INTEL_H
 #define LMP_BOND_HARMONIC_INTEL_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "bond_harmonic.h"
 #include "fix_intel.h"
 
diff --git a/src/USER-INTEL/dihedral_charmm_intel.cpp b/src/USER-INTEL/dihedral_charmm_intel.cpp
index c8429dc8ff7079930f00459c33ad85674ebaf222..c9237e7309ea7b5f51a34fe86bcc13559119b7c7 100644
--- a/src/USER-INTEL/dihedral_charmm_intel.cpp
+++ b/src/USER-INTEL/dihedral_charmm_intel.cpp
@@ -16,7 +16,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
+#include <cmath>
 #include "dihedral_charmm_intel.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-INTEL/dihedral_fourier_intel.cpp b/src/USER-INTEL/dihedral_fourier_intel.cpp
index c46617bbc253ac9ac2bf3290d5a047ff456c0b95..6ad25f1ce49228f5f719cc21277b01a9bcfd26d8 100644
--- a/src/USER-INTEL/dihedral_fourier_intel.cpp
+++ b/src/USER-INTEL/dihedral_fourier_intel.cpp
@@ -16,7 +16,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
+#include <cmath>
 #include "dihedral_fourier_intel.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-INTEL/dihedral_harmonic_intel.cpp b/src/USER-INTEL/dihedral_harmonic_intel.cpp
index b35ea4e03a9b67a3b619028c0c559b304cbbaf07..b2bf54102c4b8cfb05d8cfbe949d4cca4261ead9 100644
--- a/src/USER-INTEL/dihedral_harmonic_intel.cpp
+++ b/src/USER-INTEL/dihedral_harmonic_intel.cpp
@@ -16,7 +16,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
+#include <cmath>
 #include "dihedral_harmonic_intel.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-INTEL/dihedral_opls_intel.cpp b/src/USER-INTEL/dihedral_opls_intel.cpp
index 6b7b2c81ebd75bace530cbde5dd9bee1f0981c57..f85eb50b02dfdf9760a88f2ddf071467eedbb35b 100644
--- a/src/USER-INTEL/dihedral_opls_intel.cpp
+++ b/src/USER-INTEL/dihedral_opls_intel.cpp
@@ -16,7 +16,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
+#include <cmath>
 #include "dihedral_opls_intel.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-INTEL/fix_intel.cpp b/src/USER-INTEL/fix_intel.cpp
index d05e05957844d37e1b100d04415632ffbbd0e05e..124c7a9c76f403ea29dcee43a368e1ad97e3774f 100644
--- a/src/USER-INTEL/fix_intel.cpp
+++ b/src/USER-INTEL/fix_intel.cpp
@@ -29,10 +29,10 @@
 #include "update.h"
 #include "fix_intel.h"
 
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
+#include <cmath>
 
 #ifdef LAMMPS_BIGBIG
 #error "The USER-INTEL package is not compatible with -DLAMMPS_BIGBIG"
diff --git a/src/USER-INTEL/fix_nh_intel.cpp b/src/USER-INTEL/fix_nh_intel.cpp
index 6e44b38ef17439d6c7080ad30c497e8efca6cd56..44253e8bb0b9c3b5750c6e0a46e2f3c3cf25a7ab 100644
--- a/src/USER-INTEL/fix_nh_intel.cpp
+++ b/src/USER-INTEL/fix_nh_intel.cpp
@@ -28,8 +28,8 @@
 #include "update.h"
 
 #include <cstring>
-#include <math.h>
-#include <stdio.h>
+#include <cmath>
+#include <cstdio>
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/USER-INTEL/fix_npt_intel.cpp b/src/USER-INTEL/fix_npt_intel.cpp
index 56df3bba4bb3e999e12d49696c4f8e5dd162c2ce..bc0d297078a57adc0bfdf64a6431d2e6d20a1ade 100644
--- a/src/USER-INTEL/fix_npt_intel.cpp
+++ b/src/USER-INTEL/fix_npt_intel.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_npt_intel.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/USER-INTEL/fix_nve_asphere_intel.cpp b/src/USER-INTEL/fix_nve_asphere_intel.cpp
index 8ad63f7326dfac6df7fa5f4e1e2cb36bb2368ee6..17bbcff77140de04b60b4cfdf8f79867d11f87d8 100644
--- a/src/USER-INTEL/fix_nve_asphere_intel.cpp
+++ b/src/USER-INTEL/fix_nve_asphere_intel.cpp
@@ -15,9 +15,9 @@
    Contributing author: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include "fix_nve_asphere_intel.h"
 #include "math_extra_intel.h"
 #include "atom.h"
diff --git a/src/USER-INTEL/fix_nvt_intel.cpp b/src/USER-INTEL/fix_nvt_intel.cpp
index 3fe712c9ab812cf55bfbfab57d07e78c545a0559..547039ff23a10342a35c381e8ae6ef285d0e8d04 100644
--- a/src/USER-INTEL/fix_nvt_intel.cpp
+++ b/src/USER-INTEL/fix_nvt_intel.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_nvt_intel.h"
 #include "group.h"
 #include "modify.h"
diff --git a/src/USER-INTEL/fix_nvt_sllod_intel.cpp b/src/USER-INTEL/fix_nvt_sllod_intel.cpp
index bab748ad748c72fdabbe11bf922731e595d5c95e..5684f469038d023d71cbc4dd95f79cd1b9907601 100644
--- a/src/USER-INTEL/fix_nvt_sllod_intel.cpp
+++ b/src/USER-INTEL/fix_nvt_sllod_intel.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "fix_nvt_sllod_intel.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/USER-INTEL/improper_cvff_intel.cpp b/src/USER-INTEL/improper_cvff_intel.cpp
index 39090e5a7420b3fd32598cbab2aca8a802e497b1..e0ef2162d1e72ce865cf080e5de9192c51247d6c 100644
--- a/src/USER-INTEL/improper_cvff_intel.cpp
+++ b/src/USER-INTEL/improper_cvff_intel.cpp
@@ -16,8 +16,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "improper_cvff_intel.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-INTEL/improper_cvff_intel.h b/src/USER-INTEL/improper_cvff_intel.h
index cb5da25f992d26f95f365918f1a5691c0e3f0fe0..e815fa75c904e678f375af053c82ed2ea5a2a2b4 100644
--- a/src/USER-INTEL/improper_cvff_intel.h
+++ b/src/USER-INTEL/improper_cvff_intel.h
@@ -24,7 +24,7 @@ ImproperStyle(cvff/intel,ImproperCvffIntel)
 #ifndef LMP_IMPROPER_CVFF_INTEL_H
 #define LMP_IMPROPER_CVFF_INTEL_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "improper_cvff.h"
 #include "fix_intel.h"
 
diff --git a/src/USER-INTEL/improper_harmonic_intel.cpp b/src/USER-INTEL/improper_harmonic_intel.cpp
index 3547061672cff079b53761f928761e746d637d8a..60cbe163586da454d9dd7d70710ad6551f0c89ff 100644
--- a/src/USER-INTEL/improper_harmonic_intel.cpp
+++ b/src/USER-INTEL/improper_harmonic_intel.cpp
@@ -16,8 +16,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "improper_harmonic_intel.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-INTEL/improper_harmonic_intel.h b/src/USER-INTEL/improper_harmonic_intel.h
index 0b759b4e43e894d30d5a9ec5390b4259302a69a4..ce38e8fc317ed5dc996de47387baec910c40f71c 100644
--- a/src/USER-INTEL/improper_harmonic_intel.h
+++ b/src/USER-INTEL/improper_harmonic_intel.h
@@ -24,7 +24,7 @@ ImproperStyle(harmonic/intel,ImproperHarmonicIntel)
 #ifndef LMP_IMPROPER_HARMONIC_INTEL_H
 #define LMP_IMPROPER_HARMONIC_INTEL_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "improper_harmonic.h"
 #include "fix_intel.h"
 
diff --git a/src/USER-INTEL/intel_buffers.cpp b/src/USER-INTEL/intel_buffers.cpp
index 8948abe1725ebe2547301591748523f021d81c5f..1b31ec7fc2f6216497104a6edb64e64c238975b8 100644
--- a/src/USER-INTEL/intel_buffers.cpp
+++ b/src/USER-INTEL/intel_buffers.cpp
@@ -12,7 +12,7 @@
    Contributing author: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "intel_buffers.h"
 #include "force.h"
 #include "memory.h"
diff --git a/src/USER-INTEL/intel_intrinsics_airebo.h b/src/USER-INTEL/intel_intrinsics_airebo.h
index f17fd6985608307183aa7b69a36714a59be74dc5..4a86d8db290d096dff9ae1e16809176a6ce18930 100644
--- a/src/USER-INTEL/intel_intrinsics_airebo.h
+++ b/src/USER-INTEL/intel_intrinsics_airebo.h
@@ -744,7 +744,7 @@ struct intr_types<float,double> {
 
 #include <cassert>
 #include <immintrin.h>
-#include <stdint.h>
+#include <stdint.h> // <cstdint> requires C++-11
 
 #define VEC_INLINE __attribute__((always_inline))
 
diff --git a/src/USER-INTEL/intel_simd.h b/src/USER-INTEL/intel_simd.h
index 4616f628e73a969b3aee3ba2e036d91ffa5f97f6..e9d5d929953682276884274fe6d90285a88bf5eb 100644
--- a/src/USER-INTEL/intel_simd.h
+++ b/src/USER-INTEL/intel_simd.h
@@ -29,7 +29,7 @@ authors for more details.
 #ifndef INTEL_SIMD_H
 #define INTEL_SIMD_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "intel_preprocess.h"
 #include "immintrin.h"
 
diff --git a/src/USER-INTEL/pair_airebo_intel.cpp b/src/USER-INTEL/pair_airebo_intel.cpp
index 43e0bb7eedc9e64888d3e3ebbd5d4ecfab5ccc68..07f33f7ebe10bdfb1fac0511b768a9eba1fa3148 100644
--- a/src/USER-INTEL/pair_airebo_intel.cpp
+++ b/src/USER-INTEL/pair_airebo_intel.cpp
@@ -19,12 +19,13 @@
 #pragma offload_attribute(push, target(mic))
 #endif
 #include <unistd.h>
-#include <stdlib.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <assert.h>
-#include <stddef.h>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
+#include <cstdio>
+#include <stdint.h> // <cstdint> requires C++-11
+#include <cassert>
+#include <cstddef>
 #include "lmptype.h"
 #include "intel_preprocess.h"
 #include "intel_intrinsics_airebo.h"
@@ -35,7 +36,6 @@
 #if defined(_OPENMP)
 #include <omp.h>
 #endif
-#include <string.h>
 #include "pair_airebo_intel.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-INTEL/pair_buck_coul_cut_intel.cpp b/src/USER-INTEL/pair_buck_coul_cut_intel.cpp
index e32fd066607fff224be9bcf2d606c4472864220e..71aad95bc51016543352997c0ccba9e4b595ced3 100644
--- a/src/USER-INTEL/pair_buck_coul_cut_intel.cpp
+++ b/src/USER-INTEL/pair_buck_coul_cut_intel.cpp
@@ -15,10 +15,10 @@
    Contributing author: Rodrigo Canales (RWTH Aachen University)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_buck_coul_cut_intel.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-INTEL/pair_buck_coul_long_intel.cpp b/src/USER-INTEL/pair_buck_coul_long_intel.cpp
index 2b9fea7a50f80c0298069d976c3211d47bffc12e..bba8a7b5e7e6a7f30133a0064bc5f102e7e5ea29 100644
--- a/src/USER-INTEL/pair_buck_coul_long_intel.cpp
+++ b/src/USER-INTEL/pair_buck_coul_long_intel.cpp
@@ -15,10 +15,10 @@
    Contributing author: Rodrigo Canales (RWTH Aachen University)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_buck_coul_long_intel.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-INTEL/pair_buck_intel.cpp b/src/USER-INTEL/pair_buck_intel.cpp
index 05a28eb7f05b71e3df46b4403ae6971b70351295..f5dde26393d5878207df9b8775e2329cb19f272a 100644
--- a/src/USER-INTEL/pair_buck_intel.cpp
+++ b/src/USER-INTEL/pair_buck_intel.cpp
@@ -15,7 +15,7 @@
    Contributing author: Rodrigo Canales (RWTH Aachen University)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_buck_intel.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-INTEL/pair_dpd_intel.cpp b/src/USER-INTEL/pair_dpd_intel.cpp
index 60361cac7953c17db45cde6683948499fb23dba2..cb8c06cacc258778ba944b02ccc4096600033ea1 100644
--- a/src/USER-INTEL/pair_dpd_intel.cpp
+++ b/src/USER-INTEL/pair_dpd_intel.cpp
@@ -13,7 +13,7 @@
                         Shun Xu (Computer Network Information Center, CAS)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_dpd_intel.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-INTEL/pair_eam_alloy_intel.cpp b/src/USER-INTEL/pair_eam_alloy_intel.cpp
index 4f47c7ee23967fd11c5042316b583b8157b3b19f..192b39b2e8c27ffd8a8cd3cffeee1de9969552e3 100644
--- a/src/USER-INTEL/pair_eam_alloy_intel.cpp
+++ b/src/USER-INTEL/pair_eam_alloy_intel.cpp
@@ -15,9 +15,9 @@
    Contributing authors: Stephen Foiles (SNL), Murray Daw (SNL)
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_eam_alloy_intel.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-INTEL/pair_eam_fs_intel.cpp b/src/USER-INTEL/pair_eam_fs_intel.cpp
index cfcc8200cc751a8f3aafde06e79d4a6827a59900..61bb6e0b4d17674a2602f7eddea08cc4b82fa0ce 100644
--- a/src/USER-INTEL/pair_eam_fs_intel.cpp
+++ b/src/USER-INTEL/pair_eam_fs_intel.cpp
@@ -15,9 +15,9 @@
    Contributing authors: Tim Lau (MIT)
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_eam_fs_intel.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-INTEL/pair_eam_intel.cpp b/src/USER-INTEL/pair_eam_intel.cpp
index ea4ee30d52602440b06b81603a3d93897b72cba3..94799cdba26b5b609aa2eb28e9966e03a23509f3 100644
--- a/src/USER-INTEL/pair_eam_intel.cpp
+++ b/src/USER-INTEL/pair_eam_intel.cpp
@@ -15,10 +15,10 @@
    Contributing authors: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_eam_intel.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-INTEL/pair_eam_intel.h b/src/USER-INTEL/pair_eam_intel.h
index f34e740bdaaf83c9229239339d755dd0588dab55..83b1fbf6a13e76cffcd55e574cac81d4c4ac1d8a 100644
--- a/src/USER-INTEL/pair_eam_intel.h
+++ b/src/USER-INTEL/pair_eam_intel.h
@@ -20,7 +20,7 @@ PairStyle(eam/intel,PairEAMIntel)
 #ifndef LMP_PAIR_EAM_INTEL_H
 #define LMP_PAIR_EAM_INTEL_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pair_eam.h"
 #include "fix_intel.h"
 
diff --git a/src/USER-INTEL/pair_lj_charmm_coul_charmm_intel.cpp b/src/USER-INTEL/pair_lj_charmm_coul_charmm_intel.cpp
index b36e594f54e8ddb81a28ff0ea96671c99ba12ad1..7485395bef089c57338097d03145a5e3f435d2e3 100644
--- a/src/USER-INTEL/pair_lj_charmm_coul_charmm_intel.cpp
+++ b/src/USER-INTEL/pair_lj_charmm_coul_charmm_intel.cpp
@@ -12,7 +12,7 @@
    Contributing author: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_charmm_coul_charmm_intel.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-INTEL/pair_lj_charmm_coul_long_intel.cpp b/src/USER-INTEL/pair_lj_charmm_coul_long_intel.cpp
index a2680cdff41bb964cf39e42f85c140837e08fca8..25cca59714c9f5bdadfbf19bd5cd8b64279afb25 100644
--- a/src/USER-INTEL/pair_lj_charmm_coul_long_intel.cpp
+++ b/src/USER-INTEL/pair_lj_charmm_coul_long_intel.cpp
@@ -12,7 +12,7 @@
    Contributing author: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_charmm_coul_long_intel.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-INTEL/pair_lj_cut_coul_long_intel.cpp b/src/USER-INTEL/pair_lj_cut_coul_long_intel.cpp
index c0bf6f35c6e6b220f33d6d6bbb00232d8fcce3bd..cb7381270dd72d9dad1476645e901e13bc1998cb 100644
--- a/src/USER-INTEL/pair_lj_cut_coul_long_intel.cpp
+++ b/src/USER-INTEL/pair_lj_cut_coul_long_intel.cpp
@@ -12,7 +12,7 @@
    Contributing author: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cut_coul_long_intel.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-INTEL/pair_lj_cut_intel.cpp b/src/USER-INTEL/pair_lj_cut_intel.cpp
index f5a7999ee2e9cf13280167af8eecb008dbca59fe..b16f6230ccd5d30a6fc55eb239d8a5cc9f8c2cd2 100644
--- a/src/USER-INTEL/pair_lj_cut_intel.cpp
+++ b/src/USER-INTEL/pair_lj_cut_intel.cpp
@@ -12,7 +12,7 @@
    Contributing author: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cut_intel.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-INTEL/pair_lj_long_coul_long_intel.cpp b/src/USER-INTEL/pair_lj_long_coul_long_intel.cpp
index 86929d41ea3332db08e1a1295762b63884ac561d..8b9670f41917df66487a1b53dad343f96f59e9dc 100644
--- a/src/USER-INTEL/pair_lj_long_coul_long_intel.cpp
+++ b/src/USER-INTEL/pair_lj_long_coul_long_intel.cpp
@@ -15,7 +15,7 @@
    Contributing authors: William McDoniel (RWTH Aachen University)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_long_coul_long_intel.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-INTEL/pair_sw_intel.cpp b/src/USER-INTEL/pair_sw_intel.cpp
index 2c28fcfd94d2793b4338abb80024ec19722e261b..421de91ee938b1137ae546b0df36422c1b9ac5cb 100644
--- a/src/USER-INTEL/pair_sw_intel.cpp
+++ b/src/USER-INTEL/pair_sw_intel.cpp
@@ -25,9 +25,9 @@
 #pragma offload_attribute(pop)
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "atom.h"
 #include "neighbor.h"
 #include "neigh_request.h"
diff --git a/src/USER-INTEL/pair_tersoff_intel.cpp b/src/USER-INTEL/pair_tersoff_intel.cpp
index a59fe12f5ba0ffcd9ee96145f37337cd4231e21a..c772546928dff386b5272d12a428553abe50f5eb 100644
--- a/src/USER-INTEL/pair_tersoff_intel.cpp
+++ b/src/USER-INTEL/pair_tersoff_intel.cpp
@@ -15,10 +15,10 @@
    Contributing author: Markus Höhnerbach (RWTH)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_tersoff_intel.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-INTEL/pppm_disp_intel.cpp b/src/USER-INTEL/pppm_disp_intel.cpp
index 52e418c7138e1131919e90c0b434883982637233..0a41e5d8a5341c635853a2125ea2603ba6a9e64e 100644
--- a/src/USER-INTEL/pppm_disp_intel.cpp
+++ b/src/USER-INTEL/pppm_disp_intel.cpp
@@ -16,8 +16,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdlib>
+#include <cmath>
 #include "pppm_disp_intel.h"
 #include "atom.h"
 #include "comm.h"
@@ -728,7 +728,7 @@ void PPPMDispIntel::particle_map(double delx, double dely, double delz,
   int nlocal = atom->nlocal;
   int nthr = comm->nthreads;
 
-  if (!ISFINITE(boxlo[0]) || !ISFINITE(boxlo[1]) || !ISFINITE(boxlo[2]))
+  if (!std::isfinite(boxlo[0]) || !std::isfinite(boxlo[1]) || !std::isfinite(boxlo[2]))
     error->one(FLERR,"Non-numeric box dimensions - simulation unstable");
 
   int flag = 0;
diff --git a/src/USER-INTEL/pppm_intel.cpp b/src/USER-INTEL/pppm_intel.cpp
index 1fd267be51900d9c61d1112fb648f52491101ee6..46a55e558afbad5e408be10b24077430b53b65cc 100644
--- a/src/USER-INTEL/pppm_intel.cpp
+++ b/src/USER-INTEL/pppm_intel.cpp
@@ -19,8 +19,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdlib>
+#include <cmath>
 #include "pppm_intel.h"
 #include "atom.h"
 #include "comm.h"
@@ -358,7 +358,7 @@ void PPPMIntel::particle_map(IntelBuffers<flt_t,acc_t> *buffers)
 
   int flag = 0;
 
-  if (!ISFINITE(boxlo[0]) || !ISFINITE(boxlo[1]) || !ISFINITE(boxlo[2]))
+  if (!std::isfinite(boxlo[0]) || !std::isfinite(boxlo[1]) || !std::isfinite(boxlo[2]))
     error->one(FLERR,"Non-numeric box dimensions - simulation unstable");
 
   #if defined(_OPENMP)
diff --git a/src/USER-INTEL/verlet_lrt_intel.cpp b/src/USER-INTEL/verlet_lrt_intel.cpp
index 1b9c305e9c69377906b0346de8b6803c37b307b9..962202e228f74bce7e9b8486c33d50b0a04d4da3 100644
--- a/src/USER-INTEL/verlet_lrt_intel.cpp
+++ b/src/USER-INTEL/verlet_lrt_intel.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "verlet_lrt_intel.h"
 #include "neighbor.h"
 #include "domain.h"
diff --git a/src/USER-LB/fix_lb_fluid.cpp b/src/USER-LB/fix_lb_fluid.cpp
index 638901d6b3d06199b56edc97ddf73624c84b01eb..7a0bd0572ed63f1df5cd51eb8bead57d5ec05349 100644
--- a/src/USER-LB/fix_lb_fluid.cpp
+++ b/src/USER-LB/fix_lb_fluid.cpp
@@ -17,11 +17,11 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_lb_fluid.h"
-#include <math.h>
+#include <cmath>
 #include <mpi.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 #include "comm.h"
 #include "memory.h"
 #include "error.h"
diff --git a/src/USER-LB/fix_lb_momentum.cpp b/src/USER-LB/fix_lb_momentum.cpp
index d604d8fed414240cedd96972d8b9ee08f882778d..6cf2d3bfd09a5b8f857a44cc73ced2f3ad78c182 100644
--- a/src/USER-LB/fix_lb_momentum.cpp
+++ b/src/USER-LB/fix_lb_momentum.cpp
@@ -18,8 +18,8 @@
    Contributing author: Naveen Michaud-Agrawal (Johns Hopkins U)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_lb_momentum.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/USER-LB/fix_lb_pc.cpp b/src/USER-LB/fix_lb_pc.cpp
index c4d7cf70d3ae504f34a17418466533fdf7815396..9fd0dab51de39ec708cad06ac94202321d3bb59c 100644
--- a/src/USER-LB/fix_lb_pc.cpp
+++ b/src/USER-LB/fix_lb_pc.cpp
@@ -15,9 +15,9 @@
    Contributing authors: Frances Mackay, Santtu Ollila, Colin Denniston (UWO)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include "fix_lb_pc.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-LB/fix_lb_rigid_pc_sphere.cpp b/src/USER-LB/fix_lb_rigid_pc_sphere.cpp
index 42e8eae3d225c36972d36a97c09b5d4c291a9b3c..dddd060fa4cd416bb3e97a77bfffedcb0a05da03 100644
--- a/src/USER-LB/fix_lb_rigid_pc_sphere.cpp
+++ b/src/USER-LB/fix_lb_rigid_pc_sphere.cpp
@@ -16,10 +16,10 @@
    Based on fix_rigid (version from 2008).
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "fix_lb_rigid_pc_sphere.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/USER-LB/fix_lb_viscous.cpp b/src/USER-LB/fix_lb_viscous.cpp
index 0e156bc46ce957153bcbca2d2e68b5cbab4ebfd7..8ee4d8419e73e5a377fa65b2c8e40b13baef6b5a 100644
--- a/src/USER-LB/fix_lb_viscous.cpp
+++ b/src/USER-LB/fix_lb_viscous.cpp
@@ -15,9 +15,9 @@
    Contributing authors: Frances Mackay, Santtu Ollila, Colin Denniston (UWO)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_lb_viscous.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-MANIFOLD/fix_manifoldforce.cpp b/src/USER-MANIFOLD/fix_manifoldforce.cpp
index e66b7c9fc2ac34bf80e197461b8ea9314c7320c4..ab33b5bc972627e1611bbc80bbbaa3f1e3c660b3 100644
--- a/src/USER-MANIFOLD/fix_manifoldforce.cpp
+++ b/src/USER-MANIFOLD/fix_manifoldforce.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "atom.h"
 #include "update.h"
 #include "respa.h"
diff --git a/src/USER-MANIFOLD/fix_nve_manifold_rattle.cpp b/src/USER-MANIFOLD/fix_nve_manifold_rattle.cpp
index a8ce87ef111256b4eeb4c5bfa3c50c56c5ade443..4dcc3f9704aa3543aeaa62ed7a9202135218c801 100644
--- a/src/USER-MANIFOLD/fix_nve_manifold_rattle.cpp
+++ b/src/USER-MANIFOLD/fix_nve_manifold_rattle.cpp
@@ -32,16 +32,16 @@
 ------------------------------------------------------------------------- */
 
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "atom.h"
 #include "force.h"
 #include "update.h"
 #include "respa.h"
 #include "error.h"
 #include "group.h"
-#include <math.h>
+#include <cmath>
 #include "input.h"
 #include "variable.h"
 #include "citeme.h"
diff --git a/src/USER-MANIFOLD/fix_nvt_manifold_rattle.cpp b/src/USER-MANIFOLD/fix_nvt_manifold_rattle.cpp
index 38e8c6a26506b33c075a757e64ea29574fb09c64..973a5bcf43875d12af45655be1ff97f54c17e139 100644
--- a/src/USER-MANIFOLD/fix_nvt_manifold_rattle.cpp
+++ b/src/USER-MANIFOLD/fix_nvt_manifold_rattle.cpp
@@ -32,16 +32,16 @@
 ------------------------------------------------------------------------- */
 
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
 #include "atom.h"
 #include "force.h"
 #include "update.h"
 #include "respa.h"
 #include "error.h"
 #include "group.h"
-#include <math.h>
 #include "input.h"
 #include "variable.h"
 #include "citeme.h"
diff --git a/src/USER-MANIFOLD/manifold.h b/src/USER-MANIFOLD/manifold.h
index f0d56ffd82efd240526bbe204181206cbf2d2400..6eb09010efbb3022bed71c282744db7792140ba8 100644
--- a/src/USER-MANIFOLD/manifold.h
+++ b/src/USER-MANIFOLD/manifold.h
@@ -38,7 +38,7 @@
 #define LMP_MANIFOLD_H
 
 #include "pointers.h"
-#include <math.h>
+#include <cmath>
 
 namespace LAMMPS_NS {
 namespace user_manifold {
diff --git a/src/USER-MANIFOLD/manifold_cylinder_dent.cpp b/src/USER-MANIFOLD/manifold_cylinder_dent.cpp
index 687e311c9cd61d87fddf846e2af04f9418ed1cb1..21d4087d7c240722162b0eb556aa0b873c1a8896 100644
--- a/src/USER-MANIFOLD/manifold_cylinder_dent.cpp
+++ b/src/USER-MANIFOLD/manifold_cylinder_dent.cpp
@@ -1,7 +1,7 @@
 #include "manifold_cylinder_dent.h"
 #include "math_const.h"
 
-#include <math.h>
+#include <cmath>
 
 
 using namespace LAMMPS_NS;
diff --git a/src/USER-MANIFOLD/manifold_dumbbell.cpp b/src/USER-MANIFOLD/manifold_dumbbell.cpp
index ed1583ac9af5cc0c74f73f7f558194a657d5909d..fa7edc6e4afa4fa345c283187d073365a05dedb7 100644
--- a/src/USER-MANIFOLD/manifold_dumbbell.cpp
+++ b/src/USER-MANIFOLD/manifold_dumbbell.cpp
@@ -1,6 +1,6 @@
 #include "manifold_dumbbell.h"
 
-#include <math.h>
+#include <cmath>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-MANIFOLD/manifold_factory.h b/src/USER-MANIFOLD/manifold_factory.h
index 7fdd0a6de555f23c146849d67909a9367d74c5ea..cc3e1245bfd11f0a4c46cdb55948f40c3810bffd 100644
--- a/src/USER-MANIFOLD/manifold_factory.h
+++ b/src/USER-MANIFOLD/manifold_factory.h
@@ -37,7 +37,7 @@
 
 
 #include "manifold.h"
-#include <string.h>
+#include <cstring>
 
 /*
  * Defining USE_PHONY_LAMMPS makes sure that none of the LAMMPS classes are
diff --git a/src/USER-MANIFOLD/manifold_plane_wiggle.cpp b/src/USER-MANIFOLD/manifold_plane_wiggle.cpp
index 136c52ab361a2023ee2442fc038039a8d2c1a7d0..ccf0a794dadc28900dcee2a01cee1a6343d39b68 100644
--- a/src/USER-MANIFOLD/manifold_plane_wiggle.cpp
+++ b/src/USER-MANIFOLD/manifold_plane_wiggle.cpp
@@ -1,6 +1,6 @@
 #include "manifold_plane_wiggle.h"
 
-#include <math.h>
+#include <cmath>
 
 using namespace LAMMPS_NS;
 using namespace user_manifold;
diff --git a/src/USER-MANIFOLD/manifold_spine.cpp b/src/USER-MANIFOLD/manifold_spine.cpp
index 1081ab673e2e493e8da40c8c1a1c41d2de58949c..308190c5288ea41ad9ceb689b9df1f849ffb8c08 100644
--- a/src/USER-MANIFOLD/manifold_spine.cpp
+++ b/src/USER-MANIFOLD/manifold_spine.cpp
@@ -1,6 +1,6 @@
 #include "manifold_spine.h"
 
-#include <math.h>
+#include <cmath>
 #include "math_special.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/USER-MANIFOLD/manifold_thylakoid.cpp b/src/USER-MANIFOLD/manifold_thylakoid.cpp
index 4bb2b71331ead05bc3a70c58d58a0f3378d36bf7..b7eb155ba27b5b40c4f4d1dafc87942839b887d4 100644
--- a/src/USER-MANIFOLD/manifold_thylakoid.cpp
+++ b/src/USER-MANIFOLD/manifold_thylakoid.cpp
@@ -1,5 +1,5 @@
 #include "manifold_thylakoid.h"
-#include <math.h>
+#include <cmath>
 
 #include "comm.h"
 #include "domain.h" // For some checks regarding the simulation box.
@@ -85,7 +85,7 @@ double manifold_thylakoid::g( const double *x )
     error->one(FLERR,msg);
   }
   double con_val = p->g(x);
-  if( ISFINITE(con_val) ){
+  if( std::isfinite(con_val) ){
     return con_val;
   }else{
     char msg[2048];
@@ -107,7 +107,7 @@ void   manifold_thylakoid::n( const double *x, double *n )
     error->one(FLERR,msg);
   }
   p->n(x,n);
-  if( ISFINITE(n[0]) && ISFINITE(n[1]) && ISFINITE(n[2]) ){
+  if( std::isfinite(n[0]) && std::isfinite(n[1]) && std::isfinite(n[2]) ){
     return;
   }else{
     char msg[2048];
diff --git a/src/USER-MANIFOLD/manifold_thylakoid.h b/src/USER-MANIFOLD/manifold_thylakoid.h
index 231525950d3324086f17b40508a77c35ebb8c7b4..5e5d3b9c4192a9c622c06da6daeee0722bf3cdff 100644
--- a/src/USER-MANIFOLD/manifold_thylakoid.h
+++ b/src/USER-MANIFOLD/manifold_thylakoid.h
@@ -3,7 +3,7 @@
 
 #include "manifold.h"
 #include <vector>
-#include <stdio.h>
+#include <cstdio>
 
 #include "manifold_thylakoid_shared.h"
 
diff --git a/src/USER-MANIFOLD/manifold_thylakoid_shared.cpp b/src/USER-MANIFOLD/manifold_thylakoid_shared.cpp
index 5b87ba7c2b9eec67bff54e044450bcbfa2b3523f..4c4297f822ef2cfa7eb4113f4e61bb234dac6bf8 100644
--- a/src/USER-MANIFOLD/manifold_thylakoid_shared.cpp
+++ b/src/USER-MANIFOLD/manifold_thylakoid_shared.cpp
@@ -1,5 +1,5 @@
 #include "manifold_thylakoid_shared.h"
-#include <math.h>
+#include <cmath>
 
 using namespace LAMMPS_NS;
 using namespace user_manifold;
diff --git a/src/USER-MANIFOLD/manifold_torus.cpp b/src/USER-MANIFOLD/manifold_torus.cpp
index b46998b28d7f04b61a8fee406d266a0d4d03ad43..44a17725b5e2230e4cbc2e2fb5809ef693d99c0a 100644
--- a/src/USER-MANIFOLD/manifold_torus.cpp
+++ b/src/USER-MANIFOLD/manifold_torus.cpp
@@ -1,4 +1,4 @@
-#include <math.h>
+#include <cmath>
 #include "manifold_torus.h"
 #include "error.h"
 
diff --git a/src/USER-MEAMC/meam.h b/src/USER-MEAMC/meam.h
index 4e86df62d5bad0b762db67a0e2cbf13a9a2ebebe..8a439a2118394c01bc6bb6787152e6e4ec587d68 100644
--- a/src/USER-MEAMC/meam.h
+++ b/src/USER-MEAMC/meam.h
@@ -2,8 +2,8 @@
 #define LMP_MEAM_H
 
 #include "memory.h"
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
 #define maxelt 5
 
diff --git a/src/USER-MEAMC/meam_funcs.cpp b/src/USER-MEAMC/meam_funcs.cpp
index 3b7c114d5cc7e1e60baef248a9d220fc0a8200a7..599e9019d930aedac8a7c84ba45bfb8496f7a639 100644
--- a/src/USER-MEAMC/meam_funcs.cpp
+++ b/src/USER-MEAMC/meam_funcs.cpp
@@ -17,7 +17,7 @@
 
 #include "meam.h"
 #include "math_special.h"
-#include <math.h>
+#include <cmath>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-MEAMC/meam_setup_global.cpp b/src/USER-MEAMC/meam_setup_global.cpp
index 7062d5ebca972c1a095222420926a189c335834e..7f8ad3d81f5f09fbff2224c28ee866ddf234686f 100644
--- a/src/USER-MEAMC/meam_setup_global.cpp
+++ b/src/USER-MEAMC/meam_setup_global.cpp
@@ -1,5 +1,5 @@
 #include "meam.h"
-#include <math.h>
+#include <cmath>
 using namespace LAMMPS_NS;
 
 void
diff --git a/src/USER-MEAMC/pair_meamc.cpp b/src/USER-MEAMC/pair_meamc.cpp
index 2404005fdf695e9387b1a6d7a9ed5bc65262a23a..027e4c27a79ca000dd10a3b6383a97152f0a1bd1 100644
--- a/src/USER-MEAMC/pair_meamc.cpp
+++ b/src/USER-MEAMC/pair_meamc.cpp
@@ -15,10 +15,10 @@
    Contributing author: Greg Wagner (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "meam.h"
 #include "pair_meamc.h"
 #include "atom.h"
diff --git a/src/USER-MESO/atom_vec_edpd.cpp b/src/USER-MESO/atom_vec_edpd.cpp
index c8f1421512f5e74211e5e768f0cc89e9a6f58f61..d956e914b5d851108a01f07019ffb606e82e9d0c 100644
--- a/src/USER-MESO/atom_vec_edpd.cpp
+++ b/src/USER-MESO/atom_vec_edpd.cpp
@@ -10,8 +10,8 @@
 
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "atom_vec_edpd.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MESO/atom_vec_mdpd.cpp b/src/USER-MESO/atom_vec_mdpd.cpp
index 1d81bd2c39a0693d0becbf634800d1db32ec899f..5bc5e212ff62e5630da12864462ab901fbfca889 100644
--- a/src/USER-MESO/atom_vec_mdpd.cpp
+++ b/src/USER-MESO/atom_vec_mdpd.cpp
@@ -11,8 +11,8 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "atom_vec_mdpd.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MESO/atom_vec_tdpd.cpp b/src/USER-MESO/atom_vec_tdpd.cpp
index 6733e3e4df51b3d1dddf7ee0691ba771929754f8..aa0dc93809f8d9b51065dfccc91306fac160a56b 100644
--- a/src/USER-MESO/atom_vec_tdpd.cpp
+++ b/src/USER-MESO/atom_vec_tdpd.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "atom_vec_tdpd.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MESO/compute_edpd_temp_atom.cpp b/src/USER-MESO/compute_edpd_temp_atom.cpp
index 15fdab2a69720102075f0c0b13c7ae1e11bc0345..119e0079d133dc50ba146952967cd99eb3dd3876 100644
--- a/src/USER-MESO/compute_edpd_temp_atom.cpp
+++ b/src/USER-MESO/compute_edpd_temp_atom.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_edpd_temp_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-MESO/compute_tdpd_cc_atom.cpp b/src/USER-MESO/compute_tdpd_cc_atom.cpp
index b33550f5c164075a373fb1c4dce29de126d4da7d..6378ed5ef674eada4fea33594ffde53559fdc4a6 100644
--- a/src/USER-MESO/compute_tdpd_cc_atom.cpp
+++ b/src/USER-MESO/compute_tdpd_cc_atom.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_tdpd_cc_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-MESO/fix_edpd_source.cpp b/src/USER-MESO/fix_edpd_source.cpp
index fb8fecdcdf470c3beb7edde514b2e2c187088b8e..56e855ad0c80fa7a0fec7d381976a39d685d85e3 100644
--- a/src/USER-MESO/fix_edpd_source.cpp
+++ b/src/USER-MESO/fix_edpd_source.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_edpd_source.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MESO/fix_mvv_dpd.cpp b/src/USER-MESO/fix_mvv_dpd.cpp
index c1c4f203f1cc0547fd87b4c46d7b822b0308e435..c97a2d779c0de1595e13a5e09f2a3809d4057fa1 100644
--- a/src/USER-MESO/fix_mvv_dpd.cpp
+++ b/src/USER-MESO/fix_mvv_dpd.cpp
@@ -20,8 +20,8 @@
    Email: zhen_li@brown.edu
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include "fix_mvv_dpd.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-MESO/fix_mvv_edpd.cpp b/src/USER-MESO/fix_mvv_edpd.cpp
index 12c8bbcafbbe0cb9e465ffc5cc9b5c50474023ea..89a831e121b9a37fbdb8271f9db554b2fa6d2d07 100644
--- a/src/USER-MESO/fix_mvv_edpd.cpp
+++ b/src/USER-MESO/fix_mvv_edpd.cpp
@@ -29,8 +29,8 @@
    Communications, 2015, 51: 11038-11040.
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include "fix_mvv_edpd.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-MESO/fix_mvv_tdpd.cpp b/src/USER-MESO/fix_mvv_tdpd.cpp
index 58832e084654f8b938350f0819389c0876bf067d..e16171800b1b61bc44899fc0895adff7a52637a3 100644
--- a/src/USER-MESO/fix_mvv_tdpd.cpp
+++ b/src/USER-MESO/fix_mvv_tdpd.cpp
@@ -25,8 +25,8 @@
    -reaction problems". The Journal of Chemical Physics, 2015, 143: 014101.
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include "fix_mvv_tdpd.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-MESO/fix_tdpd_source.cpp b/src/USER-MESO/fix_tdpd_source.cpp
index c58dff76be3915b8a5c313cf6e144cf351715bd5..21fecdf49d8c03848cbd45a89e77140c1c843468 100644
--- a/src/USER-MESO/fix_tdpd_source.cpp
+++ b/src/USER-MESO/fix_tdpd_source.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_tdpd_source.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MESO/pair_edpd.cpp b/src/USER-MESO/pair_edpd.cpp
index 64d29cb65df27be31a658d5a4aeb5241090b9acf..f1d9c215b4207670e657c7fb2249b590235b23b9 100644
--- a/src/USER-MESO/pair_edpd.cpp
+++ b/src/USER-MESO/pair_edpd.cpp
@@ -16,9 +16,11 @@
    Email: zhen_li@brown.edu
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
+#include <cstring>
 #include "pair_edpd.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -31,8 +33,6 @@
 #include "citeme.h"
 #include "memory.h"
 #include "error.h"
-#include <time.h>
-#include <string.h>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-MESO/pair_mdpd.cpp b/src/USER-MESO/pair_mdpd.cpp
index 1b8cd45be98d06900975243bf4aad62eaf2791f7..f9acd3dbe1eb3c74fa2d0f1af87e8ce4ae42e80f 100644
--- a/src/USER-MESO/pair_mdpd.cpp
+++ b/src/USER-MESO/pair_mdpd.cpp
@@ -16,9 +16,10 @@
    Email: zhen_li@brown.edu
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
 #include "pair_mdpd.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -31,7 +32,6 @@
 #include "citeme.h"
 #include "memory.h"
 #include "error.h"
-#include <time.h>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-MESO/pair_mdpd_rhosum.cpp b/src/USER-MESO/pair_mdpd_rhosum.cpp
index ecfc9d5c00eb3d4f7ba4c86848d631b0805262f4..1264d03ed3b5dd9404fef9ba6a5eac0acb28b16d 100644
--- a/src/USER-MESO/pair_mdpd_rhosum.cpp
+++ b/src/USER-MESO/pair_mdpd_rhosum.cpp
@@ -19,8 +19,8 @@
    Contributing author: Zhen Li (Brown University)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "pair_mdpd_rhosum.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-MESO/pair_tdpd.cpp b/src/USER-MESO/pair_tdpd.cpp
index 71dbaaba83e23bbe91f1404fb0422599adbb6851..0d0d2a3a0ad5ab7f7fd6545aaa07f91e2c5f2abe 100644
--- a/src/USER-MESO/pair_tdpd.cpp
+++ b/src/USER-MESO/pair_tdpd.cpp
@@ -16,9 +16,10 @@
    Email: zhen_li@brown.edu
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
 #include "pair_tdpd.h"
 #include "atom.h"
 #include "atom_vec.h"
@@ -31,7 +32,6 @@
 #include "citeme.h"
 #include "memory.h"
 #include "error.h"
-#include <time.h>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-MISC/angle_cosine_shift.cpp b/src/USER-MISC/angle_cosine_shift.cpp
index 66f5c82c8445185b07e618d77fcace93f03cba32..d782497d0f6876774930f598bea24824e1eafeb7 100644
--- a/src/USER-MISC/angle_cosine_shift.cpp
+++ b/src/USER-MISC/angle_cosine_shift.cpp
@@ -15,8 +15,8 @@
    Contributing author: Carsten Svaneborg, science@zqex.dk
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_cosine_shift.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-MISC/angle_cosine_shift.h b/src/USER-MISC/angle_cosine_shift.h
index b8ab74ee43d886a452ce542ba77c07244b4e529e..030709a0e20ba90a8a168fe11fcd1b53a33f72da 100644
--- a/src/USER-MISC/angle_cosine_shift.h
+++ b/src/USER-MISC/angle_cosine_shift.h
@@ -20,7 +20,7 @@ AngleStyle(cosine/shift,AngleCosineShift)
 #ifndef LMP_ANGLE_COSINE_SHIFT_H
 #define LMP_ANGLE_COSINE_SHIFT_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/angle_cosine_shift_exp.cpp b/src/USER-MISC/angle_cosine_shift_exp.cpp
index 6d11c6894e0b7d1734b6393b582b8373c82f2c2d..0312d3b36d5003c90ccf60052ebaac60dbe4974b 100644
--- a/src/USER-MISC/angle_cosine_shift_exp.cpp
+++ b/src/USER-MISC/angle_cosine_shift_exp.cpp
@@ -15,8 +15,8 @@
    Contributing author: Carsten Svaneborg, science@zqex.dk
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_cosine_shift_exp.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-MISC/angle_cosine_shift_exp.h b/src/USER-MISC/angle_cosine_shift_exp.h
index 4db9e1f6960067df88249bc1ea5539594cf30f73..8b8e389380b7af7be8f1a2ce4816827c19000d29 100644
--- a/src/USER-MISC/angle_cosine_shift_exp.h
+++ b/src/USER-MISC/angle_cosine_shift_exp.h
@@ -18,7 +18,7 @@ AngleStyle(cosine/shift/exp,AngleCosineShiftExp)
 #ifndef LMP_ANGLE_COSINE_SHIFT_EXP_H
 #define LMP_ANGLE_COSINE_SHIFT_EXP_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/angle_dipole.cpp b/src/USER-MISC/angle_dipole.cpp
index 1e8c0e18fb1ba99594e9ac19231364540dad6a6c..0fa8d3674dadcfb6e376f8bc1410ca140a2f19c1 100644
--- a/src/USER-MISC/angle_dipole.cpp
+++ b/src/USER-MISC/angle_dipole.cpp
@@ -15,8 +15,8 @@
    Contributing authors: Mario Orsi & Wei Ding (QMUL), m.orsi@qmul.ac.uk
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_dipole.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-MISC/angle_dipole.h b/src/USER-MISC/angle_dipole.h
index 347eecfca4a098477bf9a419a8fd6285fe51cdda..6c5dccb803677b274c7cd903549389b80befb986 100644
--- a/src/USER-MISC/angle_dipole.h
+++ b/src/USER-MISC/angle_dipole.h
@@ -20,7 +20,7 @@ AngleStyle(dipole,AngleDipole)
 #ifndef LMP_ANGLE_DIPOLE_H
 #define LMP_ANGLE_DIPOLE_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/angle_fourier.cpp b/src/USER-MISC/angle_fourier.cpp
index 689caeaa5f457b6b3d6dcf4a6c1fe760aec2c47d..85e3e8f0367811162427a8b6e52fb331fbe5b46c 100644
--- a/src/USER-MISC/angle_fourier.cpp
+++ b/src/USER-MISC/angle_fourier.cpp
@@ -16,8 +16,8 @@
    [ based on angle_cosine_squared.cpp Naveen Michaud-Agrawal (Johns Hopkins U)]
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_fourier.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-MISC/angle_fourier.h b/src/USER-MISC/angle_fourier.h
index da5c96479f2febf30a9ca0f9f945980c216f69e6..14b4eedf57be4bee470b70243a9b30a5ec7e6554 100644
--- a/src/USER-MISC/angle_fourier.h
+++ b/src/USER-MISC/angle_fourier.h
@@ -20,7 +20,7 @@ AngleStyle(fourier,AngleFourier)
 #ifndef ANGLE_FOURIER_H
 #define ANGLE_FOURIER_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/angle_fourier_simple.cpp b/src/USER-MISC/angle_fourier_simple.cpp
index bd4322fe78ca77e385d4c3668b1594408f9a55b9..83fc00c1166f1bf73faefc86ea4f2dcdfe03f5bc 100644
--- a/src/USER-MISC/angle_fourier_simple.cpp
+++ b/src/USER-MISC/angle_fourier_simple.cpp
@@ -16,8 +16,8 @@
    [ based on angle_cosine_squared.cpp Naveen Michaud-Agrawal (Johns Hopkins U)]
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_fourier_simple.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-MISC/angle_fourier_simple.h b/src/USER-MISC/angle_fourier_simple.h
index ca160f185da7f393f9926a6f84a2e1aca232d6a5..3a7bd37750a93b029f0917a95dd5a7374c2a2e12 100644
--- a/src/USER-MISC/angle_fourier_simple.h
+++ b/src/USER-MISC/angle_fourier_simple.h
@@ -20,7 +20,7 @@ AngleStyle(fourier/simple,AngleFourierSimple)
 #ifndef ANGLE_FOURIER_SIMPLE_H
 #define ANGLE_FOURIER_SIMPLE_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/angle_quartic.cpp b/src/USER-MISC/angle_quartic.cpp
index 5d990003a88ac063d1a6c108402a55fd5c3ecd9e..356f2df5d478683e4c0be128ff589f0de0a54047 100644
--- a/src/USER-MISC/angle_quartic.cpp
+++ b/src/USER-MISC/angle_quartic.cpp
@@ -16,8 +16,8 @@
    [ based on angle_harmonic.cpp]
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_quartic.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-MISC/angle_quartic.h b/src/USER-MISC/angle_quartic.h
index 8844ad111de54d44d8f1c59828fc9cc9b056bfaa..7043cab06413dda4da43caa8baac0aa3a762cf6c 100644
--- a/src/USER-MISC/angle_quartic.h
+++ b/src/USER-MISC/angle_quartic.h
@@ -20,7 +20,7 @@ AngleStyle(quartic,AngleQuartic)
 #ifndef LMP_ANGLE_QUARTIC_H
 #define LMP_ANGLE_QUARTIC_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/bond_harmonic_shift.cpp b/src/USER-MISC/bond_harmonic_shift.cpp
index 70db2cc2bd690f73ec687b9aeb9e616867853a33..7148c5438d1d4ff200915edbb5c1fda345bd3d01 100644
--- a/src/USER-MISC/bond_harmonic_shift.cpp
+++ b/src/USER-MISC/bond_harmonic_shift.cpp
@@ -15,8 +15,8 @@
    Contributing author: Carsten Svaneborg, science@zqex.dk
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "bond_harmonic_shift.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-MISC/bond_harmonic_shift.h b/src/USER-MISC/bond_harmonic_shift.h
index 95dc091a62926894c99417895050c7743a2c2b6f..ff0d358243a832c36e43333ce5707a4321fa9fcc 100644
--- a/src/USER-MISC/bond_harmonic_shift.h
+++ b/src/USER-MISC/bond_harmonic_shift.h
@@ -20,7 +20,7 @@ BondStyle(harmonic/shift,BondHarmonicShift)
 #ifndef LMP_BOND_HARMONIC_SHIFT_H
 #define LMP_BOND_HARMONIC_SHIFT_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "bond.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/bond_harmonic_shift_cut.cpp b/src/USER-MISC/bond_harmonic_shift_cut.cpp
index aa0091019dbc2509e83c86732c02c901ff66df85..20c8a1a30019fb5cb3bdb99b597e91c6fd116778 100644
--- a/src/USER-MISC/bond_harmonic_shift_cut.cpp
+++ b/src/USER-MISC/bond_harmonic_shift_cut.cpp
@@ -15,8 +15,8 @@
    Contributing author: Carsten Svaneborg, science@zqex.dk
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "bond_harmonic_shift_cut.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-MISC/bond_harmonic_shift_cut.h b/src/USER-MISC/bond_harmonic_shift_cut.h
index 9b2587936ec7012dfef6af00b715cc1a459bb4a2..5db76d51aa5fbde88bc2061a4b34c506bcd239c3 100644
--- a/src/USER-MISC/bond_harmonic_shift_cut.h
+++ b/src/USER-MISC/bond_harmonic_shift_cut.h
@@ -20,7 +20,7 @@ BondStyle(harmonic/shift/cut,BondHarmonicShiftCut)
 #ifndef LMP_BOND_HARMONIC_SHIFT_CUT_H
 #define LMP_BOND_HARMONIC_SHIFT_CUT_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "bond.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/compute_ackland_atom.cpp b/src/USER-MISC/compute_ackland_atom.cpp
index 285f64a5e94bec9678fcd9d57493fdf4d90902e0..dcf17ca489d49e7ffb487b0b61e803b5d6c442a7 100644
--- a/src/USER-MISC/compute_ackland_atom.cpp
+++ b/src/USER-MISC/compute_ackland_atom.cpp
@@ -16,7 +16,8 @@
                         Copyright (C) 2007
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "compute_ackland_atom.h"
 #include "atom.h"
 #include "update.h"
@@ -29,7 +30,6 @@
 #include "comm.h"
 #include "memory.h"
 #include "error.h"
-#include <math.h>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-MISC/compute_basal_atom.cpp b/src/USER-MISC/compute_basal_atom.cpp
index cd393eb2acf81c6d2f14cc3516e87c24d6a3a906..1da43a6bafb18693cfbb70450d2a68a53f14820c 100644
--- a/src/USER-MISC/compute_basal_atom.cpp
+++ b/src/USER-MISC/compute_basal_atom.cpp
@@ -16,7 +16,8 @@
                         Copyright (C) 2013
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "compute_basal_atom.h"
 #include "atom.h"
 #include "update.h"
@@ -29,7 +30,6 @@
 #include "comm.h"
 #include "memory.h"
 #include "error.h"
-#include <math.h>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-MISC/compute_cnp_atom.cpp b/src/USER-MISC/compute_cnp_atom.cpp
index f479486b79cc18f48fe7032f0c15ba3e9509f2df..51cf3ab07a43628ba454f708400d386bdffdb54f 100644
--- a/src/USER-MISC/compute_cnp_atom.cpp
+++ b/src/USER-MISC/compute_cnp_atom.cpp
@@ -21,9 +21,9 @@
    branicio@usc.edu
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 
 #include "compute_cnp_atom.h"
 #include "atom.h"
diff --git a/src/USER-MISC/compute_pressure_grem.cpp b/src/USER-MISC/compute_pressure_grem.cpp
index ae9179cc4313745ea248d606f1c4768e4fa86e82..087c01bd8e2ad8da526bf213609c8f7241377b0d 100644
--- a/src/USER-MISC/compute_pressure_grem.cpp
+++ b/src/USER-MISC/compute_pressure_grem.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "compute_pressure_grem.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-MISC/compute_temp_rotate.cpp b/src/USER-MISC/compute_temp_rotate.cpp
index b948738e0054dca0de40bde7481d678eb2bac198..66f1b8f5f75939d02092f5c1b9a7bf50a404c059 100644
--- a/src/USER-MISC/compute_temp_rotate.cpp
+++ b/src/USER-MISC/compute_temp_rotate.cpp
@@ -16,8 +16,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "compute_temp_rotate.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-MISC/dihedral_cosine_shift_exp.cpp b/src/USER-MISC/dihedral_cosine_shift_exp.cpp
index 85ff4b27191e3b6d19bce335781f7bd715fbfff1..253909530865fbf074459329d322b22f9065fb58 100644
--- a/src/USER-MISC/dihedral_cosine_shift_exp.cpp
+++ b/src/USER-MISC/dihedral_cosine_shift_exp.cpp
@@ -16,8 +16,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "dihedral_cosine_shift_exp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MISC/dihedral_cosine_shift_exp.h b/src/USER-MISC/dihedral_cosine_shift_exp.h
index 819fd769cb13cb3fad446b9e4fd9faa9f79b93af..ca4d08f1915a8a54e666fb765a4092ead605284c 100644
--- a/src/USER-MISC/dihedral_cosine_shift_exp.h
+++ b/src/USER-MISC/dihedral_cosine_shift_exp.h
@@ -20,7 +20,7 @@ DihedralStyle(cosine/shift/exp,DihedralCosineShiftExp)
 #ifndef LMP_DIHEDRAL_COSINE_SHIFT_EXP_H
 #define LMP_DIHEDRAL_COSINE_SHIFT_EXP_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "dihedral.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/dihedral_fourier.cpp b/src/USER-MISC/dihedral_fourier.cpp
index fff10fde11b3c10b4c69294e9b0579869ff807a3..7c405ee28c3378c12a4ba6d28b44b366a1b2abb5 100644
--- a/src/USER-MISC/dihedral_fourier.cpp
+++ b/src/USER-MISC/dihedral_fourier.cpp
@@ -17,8 +17,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "dihedral_fourier.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MISC/dihedral_fourier.h b/src/USER-MISC/dihedral_fourier.h
index 4cdb7f222621666624816bcc89ab65d0562a3d58..c1ed843c3486348cd90d364f2d46453838f6d1fc 100644
--- a/src/USER-MISC/dihedral_fourier.h
+++ b/src/USER-MISC/dihedral_fourier.h
@@ -20,7 +20,7 @@ DihedralStyle(fourier,DihedralFourier)
 #ifndef LMP_DIHEDRAL_FOURIER_H
 #define LMP_DIHEDRAL_FOURIER_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "dihedral.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/dihedral_nharmonic.cpp b/src/USER-MISC/dihedral_nharmonic.cpp
index abb5904b6af55773b43a505263a457c2e92c0a6b..f8e885068070e3d7bbbf1601a7654e7331b5aa70 100644
--- a/src/USER-MISC/dihedral_nharmonic.cpp
+++ b/src/USER-MISC/dihedral_nharmonic.cpp
@@ -16,8 +16,8 @@
    [ based on dihedral_multi_harmonic.cpp Mathias Puetz (SNL) and friends ]
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "dihedral_nharmonic.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-MISC/dihedral_nharmonic.h b/src/USER-MISC/dihedral_nharmonic.h
index 2e8050feb9348307b0c21edaf5aa3a10aeaf44f1..7c6a35b200a3a6a8bb91cb21b9a5d9babc3cdfd8 100644
--- a/src/USER-MISC/dihedral_nharmonic.h
+++ b/src/USER-MISC/dihedral_nharmonic.h
@@ -20,7 +20,7 @@ DihedralStyle(nharmonic,DihedralNHarmonic)
 #ifndef DIHEDRAL_NHARMONIC_H
 #define DIHEDRAL_NHARMONIC_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "dihedral.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/dihedral_quadratic.cpp b/src/USER-MISC/dihedral_quadratic.cpp
index 6841492b2f077f5b2e875810b96c1a21a3761dd1..9674f818f1d472b4dc93772362a53447d0c02a68 100644
--- a/src/USER-MISC/dihedral_quadratic.cpp
+++ b/src/USER-MISC/dihedral_quadratic.cpp
@@ -16,8 +16,8 @@
    [ based on dihedral_helix.cpp Paul Crozier (SNL) ]
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "dihedral_quadratic.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-MISC/dihedral_quadratic.h b/src/USER-MISC/dihedral_quadratic.h
index 638efac6687dc7f83754384d41c4cff0208a14b7..45c3393e76ddd4ff57b5fd3215ead54d361db090 100644
--- a/src/USER-MISC/dihedral_quadratic.h
+++ b/src/USER-MISC/dihedral_quadratic.h
@@ -20,7 +20,7 @@ DihedralStyle(quadratic,DihedralQuadratic)
 #ifndef LMP_DIHEDRAL_QUADRATIC_H
 #define LMP_DIHEDRAL_QUADRATIC_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "dihedral.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/dihedral_spherical.h b/src/USER-MISC/dihedral_spherical.h
index 0067e5eca85058dc86d20b98cab2f5f716cd872b..ae0ece189a69118853c35b54ba74a00d7800a634 100644
--- a/src/USER-MISC/dihedral_spherical.h
+++ b/src/USER-MISC/dihedral_spherical.h
@@ -20,7 +20,7 @@ DihedralStyle(spherical,DihedralSpherical)
 #ifndef LMP_DIHEDRAL_SPHERICAL_H
 #define LMP_DIHEDRAL_SPHERICAL_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "dihedral.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/fix_addtorque.cpp b/src/USER-MISC/fix_addtorque.cpp
index 6c3bb5738d8daec03fa1e1dc9a1801d2b8a65297..654911769c271bce9c23c7488d5fa35ca88370e0 100644
--- a/src/USER-MISC/fix_addtorque.cpp
+++ b/src/USER-MISC/fix_addtorque.cpp
@@ -15,8 +15,8 @@
    Contributing author: Laurent Joly (U Lyon, France), ljoly.ulyon@gmail.com
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "fix_addtorque.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-MISC/fix_ave_correlate_long.cpp b/src/USER-MISC/fix_ave_correlate_long.cpp
index e40447d859caf5cc890ccba60dec02dee30be9ba..da6d041287df6904548cd4fa0070ca2a58b7a86e 100644
--- a/src/USER-MISC/fix_ave_correlate_long.cpp
+++ b/src/USER-MISC/fix_ave_correlate_long.cpp
@@ -21,9 +21,9 @@
    see J. Chem. Phys. 133, 154103 (2010)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 #include "fix_ave_correlate_long.h"
 #include "update.h"
diff --git a/src/USER-MISC/fix_ave_correlate_long.h b/src/USER-MISC/fix_ave_correlate_long.h
index 2823a5beb398de0f2b680db01b5093a87b70e602..5b38f454eaebcab5a81bb7a23278ee8f63c099f1 100644
--- a/src/USER-MISC/fix_ave_correlate_long.h
+++ b/src/USER-MISC/fix_ave_correlate_long.h
@@ -20,7 +20,7 @@ FixStyle(ave/correlate/long,FixAveCorrelateLong)
 #ifndef LMP_FIX_AVE_CORRELATE_LONG_H
 #define LMP_FIX_AVE_CORRELATE_LONG_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/fix_filter_corotate.cpp b/src/USER-MISC/fix_filter_corotate.cpp
index 7ada3aeb99e0d582bda2048e4dddb576ba53fc4e..a5f0e5704116c78b88793c35722b5f208ef74269 100644
--- a/src/USER-MISC/fix_filter_corotate.cpp
+++ b/src/USER-MISC/fix_filter_corotate.cpp
@@ -17,8 +17,8 @@
    ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "fix_filter_corotate.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/USER-MISC/fix_flow_gauss.cpp b/src/USER-MISC/fix_flow_gauss.cpp
index 435e3972c8da83e03e3b6e80c989f85a3789b904..6a1e508030c16857aa282e0089c920bfdbbe8796 100644
--- a/src/USER-MISC/fix_flow_gauss.cpp
+++ b/src/USER-MISC/fix_flow_gauss.cpp
@@ -16,8 +16,8 @@
    Joel.Eaves@Colorado.edu
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_flow_gauss.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-MISC/fix_gle.cpp b/src/USER-MISC/fix_gle.cpp
index ecb3390e5ee6ecce55f64f2d3ee22516ba2a219b..5857bafc2ef9fb07062812b3992d1460d969fd3c 100644
--- a/src/USER-MISC/fix_gle.cpp
+++ b/src/USER-MISC/fix_gle.cpp
@@ -17,9 +17,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_gle.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/USER-MISC/fix_grem.cpp b/src/USER-MISC/fix_grem.cpp
index 5a4e149316e38b16186ed5bd7f8cd06c94c20aa1..a5f8c344488864f80eb160d44c26c21b9ae7890a 100644
--- a/src/USER-MISC/fix_grem.cpp
+++ b/src/USER-MISC/fix_grem.cpp
@@ -22,9 +22,9 @@
                          Tom Keyes (Boston University)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "comm.h"
 #include "fix_grem.h"
 #include "atom.h"
diff --git a/src/USER-MISC/fix_imd.cpp b/src/USER-MISC/fix_imd.cpp
index b5bd8caf0b2bc5b2668c8f2590fbcd48891922cc..abf9e7cb0ba59629d5d1f65524dbea82b2f0db74 100644
--- a/src/USER-MISC/fix_imd.cpp
+++ b/src/USER-MISC/fix_imd.cpp
@@ -58,10 +58,10 @@ negotiate an appropriate license for such distribution."
 #include "group.h"
 #include "memory.h"
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #if defined(_MSC_VER) || defined(__MINGW32__)
 #include <winsock2.h>
@@ -350,7 +350,7 @@ static void id_sort(tagint *idmap, tagint left, tagint right)
 
 /* part 1: Interactive MD (IMD) API */
 
-#include <limits.h>
+#include <climits>
 
 #if ( INT_MAX == 2147483647 )
 typedef int     int32;
diff --git a/src/USER-MISC/fix_ipi.cpp b/src/USER-MISC/fix_ipi.cpp
index bacce679019beca073158a3f6a215134b2d0dfaa..090a330af66ff0fed4e87bd58e1ac7363067ec97 100644
--- a/src/USER-MISC/fix_ipi.cpp
+++ b/src/USER-MISC/fix_ipi.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
 #include "fix_ipi.h"
 #include "atom.h"
 #include "force.h"
@@ -50,7 +50,7 @@ using namespace FixConst;
 
 // socket interface
 #ifndef _WIN32
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/src/USER-MISC/fix_nvk.cpp b/src/USER-MISC/fix_nvk.cpp
index 5dcfe53e788c5f23539cd7f4fbfb764933112e2a..dbf7b56fe22048745d10b71dad15e8def74fa30e 100644
--- a/src/USER-MISC/fix_nvk.cpp
+++ b/src/USER-MISC/fix_nvk.cpp
@@ -15,9 +15,9 @@
      Contributing author: Efrem Braun (UC Berkeley)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include "fix_nvk.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-MISC/fix_pimd.cpp b/src/USER-MISC/fix_pimd.cpp
index 2c89ddda57e9a0a5d9a0f77e05e53f6f09f5049b..e65ae6ae28168acf3a766798f4028f5c7fca700a 100644
--- a/src/USER-MISC/fix_pimd.cpp
+++ b/src/USER-MISC/fix_pimd.cpp
@@ -21,9 +21,9 @@
    Version      1.0
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_pimd.h"
 #include "universe.h"
 #include "comm.h"
diff --git a/src/USER-MISC/fix_rhok.cpp b/src/USER-MISC/fix_rhok.cpp
index 58b0e95a97e0abe10ac7d48e1e93807a0c5a16ab..bbc4ce417a460d194bf3014b61cadc802c763a8d 100644
--- a/src/USER-MISC/fix_rhok.cpp
+++ b/src/USER-MISC/fix_rhok.cpp
@@ -13,10 +13,10 @@
    Contributing author: Ulf R. Pedersen, ulf@urp.dk
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
 
 #include "fix_rhok.h"
 #include "atom.h"
diff --git a/src/USER-MISC/fix_smd.cpp b/src/USER-MISC/fix_smd.cpp
index b2d3ee0779ded92b42e020d9ba9794b6890981c5..fb22483a073d327e188c62ac9bc782c74000ae26 100644
--- a/src/USER-MISC/fix_smd.cpp
+++ b/src/USER-MISC/fix_smd.cpp
@@ -16,9 +16,9 @@
    based on fix spring by: Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_smd.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MISC/fix_srp.cpp b/src/USER-MISC/fix_srp.cpp
index 90935e482af3715e585b2e4f1249aea7a0969b43..e4d85e867418b3d3173b1883d79aa567d7129278 100644
--- a/src/USER-MISC/fix_srp.cpp
+++ b/src/USER-MISC/fix_srp.cpp
@@ -15,8 +15,8 @@
    Contributing authors: Timothy Sirk (ARL), Pieter in't Veld (BASF)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "fix_srp.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-MISC/fix_srp.h b/src/USER-MISC/fix_srp.h
index aaeea2f03a1ff9c7b1bc5ba10b5a6090a28b2c5b..7dbf044bdadcd14562d99ecd0b56d1f046cc9aed 100644
--- a/src/USER-MISC/fix_srp.h
+++ b/src/USER-MISC/fix_srp.h
@@ -20,7 +20,7 @@ FixStyle(SRP,FixSRP)
 #ifndef LMP_FIX_SRP_H
 #define LMP_FIX_SRP_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/fix_ti_spring.cpp b/src/USER-MISC/fix_ti_spring.cpp
index fbbc747c38c91a88efaa148b5e723707a5a6a994..5812142763f82c44e9b9cab16595d579e5483701 100644
--- a/src/USER-MISC/fix_ti_spring.cpp
+++ b/src/USER-MISC/fix_ti_spring.cpp
@@ -18,8 +18,8 @@
              Maurice de Koning (Unicamp/Brazil) - dekoning@ifi.unicamp.br
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_ti_spring.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-MISC/fix_ttm_mod.cpp b/src/USER-MISC/fix_ttm_mod.cpp
index b7261b85d4103a63cbdf186f7d1d16d32b59c4ed..1e1e62b638595c9e2aabcb3e690c2d64517dab80 100644
--- a/src/USER-MISC/fix_ttm_mod.cpp
+++ b/src/USER-MISC/fix_ttm_mod.cpp
@@ -19,9 +19,9 @@
 
 #include "lmptype.h"
 #include <mpi.h>
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_ttm_mod.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-MISC/fix_wall_ees.cpp b/src/USER-MISC/fix_wall_ees.cpp
index 9b65d1e30f37b74dd226d19956ee1d7e57864a0d..5ca16ebdadd26706a3cdbcdb26d6ed3f4def9b0f 100644
--- a/src/USER-MISC/fix_wall_ees.cpp
+++ b/src/USER-MISC/fix_wall_ees.cpp
@@ -15,7 +15,7 @@
    Contributing author:  Abdoreza Ershadinia, a.ershadinia at gmail.com
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "math_extra.h"
 #include "fix_wall_ees.h"
 #include "atom.h"
diff --git a/src/USER-MISC/fix_wall_region_ees.cpp b/src/USER-MISC/fix_wall_region_ees.cpp
index e070e2a2216e81c63e897fc99bafc771ecadf1fb..82a78d3e73bc2d757ca2399c6a3ebc8726ad99af 100644
--- a/src/USER-MISC/fix_wall_region_ees.cpp
+++ b/src/USER-MISC/fix_wall_region_ees.cpp
@@ -15,9 +15,9 @@
    Contributing author:  Abdoreza Ershadinia, a.ershadinia at gmail.com
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_wall_region_ees.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/USER-MISC/improper_cossq.cpp b/src/USER-MISC/improper_cossq.cpp
index 223df4a76d064abcfead348518d17f1034bbd1a9..72cf0e79df352b55ef12361828ad32abc33e4be8 100644
--- a/src/USER-MISC/improper_cossq.cpp
+++ b/src/USER-MISC/improper_cossq.cpp
@@ -17,8 +17,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "improper_cossq.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MISC/improper_cossq.h b/src/USER-MISC/improper_cossq.h
index 266e31797781ab10cc4cd4ba0f28f3dc7f25fab2..46715433cd8432e0306c08df0dde7d677eff8f1e 100644
--- a/src/USER-MISC/improper_cossq.h
+++ b/src/USER-MISC/improper_cossq.h
@@ -20,7 +20,7 @@ ImproperStyle(cossq,ImproperCossq)
 #ifndef LMP_IMPROPER_COSSQ_H
 #define LMP_IMPROPER_COSSQ_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "improper.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/improper_distance.cpp b/src/USER-MISC/improper_distance.cpp
index ce6441d6746e3d4946bb8e21eaff27c39844cbe5..1c073cc791a4b792b4a1d46ddddeca7ffa354cf2 100644
--- a/src/USER-MISC/improper_distance.cpp
+++ b/src/USER-MISC/improper_distance.cpp
@@ -16,8 +16,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "improper_distance.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MISC/improper_distance.h b/src/USER-MISC/improper_distance.h
index cff96c6d9d7b096f3481730d23e354ad31cd6190..0f281803473ecd9624c02e2fbd8aad4a634ef857 100644
--- a/src/USER-MISC/improper_distance.h
+++ b/src/USER-MISC/improper_distance.h
@@ -20,7 +20,7 @@ ImproperStyle(distance,ImproperDistance)
 #ifndef LMP_IMPROPER_DISTANCE_H
 #define LMP_IMPROPER_DISTANCE_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "improper.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/improper_fourier.cpp b/src/USER-MISC/improper_fourier.cpp
index b139fdad569dc14d67560301c1550fb867204d16..90596a1967feca597b9feb3041e99ef8b29692a9 100644
--- a/src/USER-MISC/improper_fourier.cpp
+++ b/src/USER-MISC/improper_fourier.cpp
@@ -17,9 +17,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "improper_fourier.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MISC/improper_fourier.h b/src/USER-MISC/improper_fourier.h
index 903b9a12b652f50d0a3163c02934bb3982ae044e..51421d6379667268fc486d632959db3a8ac26cfa 100644
--- a/src/USER-MISC/improper_fourier.h
+++ b/src/USER-MISC/improper_fourier.h
@@ -20,7 +20,7 @@ ImproperStyle(fourier,ImproperFourier)
 #ifndef LMP_IMPROPER_FOURIER_H
 #define LMP_IMPROPER_FOURIER_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "improper.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/improper_ring.cpp b/src/USER-MISC/improper_ring.cpp
index adf17ed1d566e26dcd759914c9f46c8409c91552..878c6dfc5e0d6fadb081187c93a606b5dea72df4 100644
--- a/src/USER-MISC/improper_ring.cpp
+++ b/src/USER-MISC/improper_ring.cpp
@@ -37,8 +37,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "improper_ring.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MISC/improper_ring.h b/src/USER-MISC/improper_ring.h
index cdb2907c6578de27620e41a4d7107c8a709b0fb2..f721e8ff9eb71842f113ea7ee4f6120ed7569bd0 100644
--- a/src/USER-MISC/improper_ring.h
+++ b/src/USER-MISC/improper_ring.h
@@ -20,7 +20,7 @@ ImproperStyle(ring,ImproperRing)
 #ifndef LMP_IMPROPER_RING_H
 #define LMP_IMPROPER_RING_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "improper.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MISC/pair_agni.cpp b/src/USER-MISC/pair_agni.cpp
index 9cd2cf57b883175f5f8b50a1439f8fbed7bd9b8e..11bf2ae01ed2790cc65b62afe79c7bb2f392ee44 100644
--- a/src/USER-MISC/pair_agni.cpp
+++ b/src/USER-MISC/pair_agni.cpp
@@ -15,10 +15,10 @@
    Contributing authors: Axel Kohlmeyer (Temple U), Venkatesh Botu
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_agni.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-MISC/pair_buck_mdf.cpp b/src/USER-MISC/pair_buck_mdf.cpp
index 372fbaf8c0f4d9eebec30238f9052009c6c560ab..457d75bc7712907bd06caab711216947e2bcc270 100644
--- a/src/USER-MISC/pair_buck_mdf.cpp
+++ b/src/USER-MISC/pair_buck_mdf.cpp
@@ -15,10 +15,10 @@
    Contributing author: Paolo Raiteri (Curtin University)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_buck_mdf.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MISC/pair_cdeam.cpp b/src/USER-MISC/pair_cdeam.cpp
index b5607012ce16789056b4afed345ffcfe54d1ca7e..53d9036a61d44da205f921c3272ccf41b9075cde 100644
--- a/src/USER-MISC/pair_cdeam.cpp
+++ b/src/USER-MISC/pair_cdeam.cpp
@@ -17,10 +17,10 @@
                         Germany Department of Materials Science
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_cdeam.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-MISC/pair_coul_diel.cpp b/src/USER-MISC/pair_coul_diel.cpp
index c653e9abb23c6bfbe410d78f1691cf63a173ad7e..3f07df3d9861dbc0cb5af1bf6a3766d5ccebb38d 100644
--- a/src/USER-MISC/pair_coul_diel.cpp
+++ b/src/USER-MISC/pair_coul_diel.cpp
@@ -14,10 +14,10 @@
    Contributiong authors: Arben Jusufi, Axel Kohlmeyer (Temple U.)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_diel.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MISC/pair_coul_shield.cpp b/src/USER-MISC/pair_coul_shield.cpp
index 0f7852163c1cd696867699e4e6bd8fec38133928..5b321fe8ecd27447085d9f9c0f53874f30b4b0f7 100644
--- a/src/USER-MISC/pair_coul_shield.cpp
+++ b/src/USER-MISC/pair_coul_shield.cpp
@@ -18,10 +18,10 @@
    [Maaravi et al, J. Phys. Chem. C 121, 22826-22835 (2017)]
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_shield.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MISC/pair_edip.cpp b/src/USER-MISC/pair_edip.cpp
index 5f83af7f497809fd18c686dbcd6fc38fde7a098f..f556a099c97370ddd350196a613e31f524d9087f 100644
--- a/src/USER-MISC/pair_edip.cpp
+++ b/src/USER-MISC/pair_edip.cpp
@@ -21,11 +21,11 @@
        Phys. Rev. B 58, 2539 (1998)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <float.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cfloat>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_edip.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-MISC/pair_edip_multi.cpp b/src/USER-MISC/pair_edip_multi.cpp
index bcef1b013b67aae593ed44e7143c34335b0c2291..7a4193f55cbebb25944b8266a71444d3b265af0c 100644
--- a/src/USER-MISC/pair_edip_multi.cpp
+++ b/src/USER-MISC/pair_edip_multi.cpp
@@ -17,11 +17,11 @@
    Contributing author: Chao Jiang
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <float.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cfloat>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_edip_multi.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-MISC/pair_extep.cpp b/src/USER-MISC/pair_extep.cpp
index cf859a28f8380fbfb65dd2b72092486f7d5941f3..5a8cdf28841cf2f7fa61b4f184867a2f8465ff7f 100644
--- a/src/USER-MISC/pair_extep.cpp
+++ b/src/USER-MISC/pair_extep.cpp
@@ -15,10 +15,10 @@
    Contributing author: Jan Los
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_extep.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-MISC/pair_gauss_cut.cpp b/src/USER-MISC/pair_gauss_cut.cpp
index c1daf9c923f7b356f7a94ab330f1f353988ff7b1..85f7c02887a1d0c1a9a6841d69df6c17a754b5e6 100644
--- a/src/USER-MISC/pair_gauss_cut.cpp
+++ b/src/USER-MISC/pair_gauss_cut.cpp
@@ -15,10 +15,10 @@
    Contributing authors: Arben Jusufi, Axel Kohlmeyer (Temple U.)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_gauss_cut.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MISC/pair_ilp_graphene_hbn.cpp b/src/USER-MISC/pair_ilp_graphene_hbn.cpp
index 02c33c7e86926d8581a513a267d81bce278475c1..59dbc6142eca8424a1ef921e2111af13c253adcb 100644
--- a/src/USER-MISC/pair_ilp_graphene_hbn.cpp
+++ b/src/USER-MISC/pair_ilp_graphene_hbn.cpp
@@ -21,10 +21,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_ilp_graphene_hbn.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MISC/pair_ilp_graphene_hbn.h b/src/USER-MISC/pair_ilp_graphene_hbn.h
index 3ced305429ad647387721672010ef7df5b0d356a..07c3b2e97b12c39224656eca4fa69cad6cc9a3dc 100644
--- a/src/USER-MISC/pair_ilp_graphene_hbn.h
+++ b/src/USER-MISC/pair_ilp_graphene_hbn.h
@@ -22,7 +22,7 @@ PairStyle(ilp/graphene/hbn,PairILPGrapheneHBN)
 
 #include "pair.h"
 #include "my_page.h"
-#include <math.h>
+#include <cmath>
 
 namespace LAMMPS_NS {
 
diff --git a/src/USER-MISC/pair_kolmogorov_crespi_full.cpp b/src/USER-MISC/pair_kolmogorov_crespi_full.cpp
index a7eebe0b3f3162a210b63ba4a11a6a9179749d55..b691150c46b7d5e30ac51ea243891d4d82bbf64c 100644
--- a/src/USER-MISC/pair_kolmogorov_crespi_full.cpp
+++ b/src/USER-MISC/pair_kolmogorov_crespi_full.cpp
@@ -20,10 +20,10 @@
    [Kolmogorov & Crespi, Phys. Rev. B 71, 235415 (2005)]
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <mpi.h>
 #include "pair_kolmogorov_crespi_full.h"
 #include "atom.h"
diff --git a/src/USER-MISC/pair_kolmogorov_crespi_full.h b/src/USER-MISC/pair_kolmogorov_crespi_full.h
index 3078a7601a4053f2428c16400dd88701e6589e24..9923b409a7de490ce2717bf80aebfe010d34110d 100644
--- a/src/USER-MISC/pair_kolmogorov_crespi_full.h
+++ b/src/USER-MISC/pair_kolmogorov_crespi_full.h
@@ -22,7 +22,7 @@ PairStyle(kolmogorov/crespi/full,PairKolmogorovCrespiFull)
 
 #include "pair.h"
 #include "my_page.h"
-#include <math.h>
+#include <cmath>
 
 namespace LAMMPS_NS {
 
diff --git a/src/USER-MISC/pair_kolmogorov_crespi_z.cpp b/src/USER-MISC/pair_kolmogorov_crespi_z.cpp
index dc1f56a318602b4792118d16673e2369e97849f0..fb7d5ae40eda1bc857c5c29f6f9955973e358f43 100644
--- a/src/USER-MISC/pair_kolmogorov_crespi_z.cpp
+++ b/src/USER-MISC/pair_kolmogorov_crespi_z.cpp
@@ -21,10 +21,10 @@
    The simplification is that all normals are taken along the z-direction
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_kolmogorov_crespi_z.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MISC/pair_lennard_mdf.cpp b/src/USER-MISC/pair_lennard_mdf.cpp
index b959f513c0cec33e496b4c324eacb85ad50c9501..f6e7f7f56b0084b8fe5115e0424fce3909bde8c4 100644
--- a/src/USER-MISC/pair_lennard_mdf.cpp
+++ b/src/USER-MISC/pair_lennard_mdf.cpp
@@ -16,10 +16,10 @@
    Contributing author: Paolo Raiteri (Curtin University)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lennard_mdf.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MISC/pair_list.cpp b/src/USER-MISC/pair_list.cpp
index 6bb71d05c8cfb1239ce4e6d4ad66431c887d6e6b..aaeb586c1d544dca1916e9d1d0aceae7581c586c 100644
--- a/src/USER-MISC/pair_list.cpp
+++ b/src/USER-MISC/pair_list.cpp
@@ -24,10 +24,10 @@
 
 #include "error.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-MISC/pair_lj_mdf.cpp b/src/USER-MISC/pair_lj_mdf.cpp
index ebec1f80e1f75dd827fc6a9fb2f5cf10238db084..d43a6c30862165ea7cd6d0a801e7e285902feb0c 100644
--- a/src/USER-MISC/pair_lj_mdf.cpp
+++ b/src/USER-MISC/pair_lj_mdf.cpp
@@ -16,10 +16,10 @@
    Contributing author: Paolo Raiteri (Curtin University)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_mdf.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MISC/pair_lj_sf_dipole_sf.cpp b/src/USER-MISC/pair_lj_sf_dipole_sf.cpp
index ab342fd055c5a6f2291d2dad357483a7c0723079..cc92bfc30f9f906b7202c266df8d015163122366 100644
--- a/src/USER-MISC/pair_lj_sf_dipole_sf.cpp
+++ b/src/USER-MISC/pair_lj_sf_dipole_sf.cpp
@@ -16,8 +16,9 @@
                          Samuel Genheden (University of Southampton)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_sf_dipole_sf.h"
 #include "atom.h"
 #include "neighbor.h"
@@ -27,7 +28,6 @@
 #include "memory.h"
 #include "error.h"
 #include "update.h"
-#include <string.h>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-MISC/pair_meam_spline.cpp b/src/USER-MISC/pair_meam_spline.cpp
index 10659e86547e1de37b9a8eea241c0d546e43ca68..750f6ac5bbaee20ffcdffbaf8dccecf28576701b 100644
--- a/src/USER-MISC/pair_meam_spline.cpp
+++ b/src/USER-MISC/pair_meam_spline.cpp
@@ -31,10 +31,10 @@
                        conform with pairing, updated to LAMMPS style
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_meam_spline.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-MISC/pair_meam_sw_spline.cpp b/src/USER-MISC/pair_meam_sw_spline.cpp
index 3eda3ea45d65dba61a454541f3e41d34e5c30a45..f6b7212f9cfd9ee124eed653d2cf588b77d502a0 100644
--- a/src/USER-MISC/pair_meam_sw_spline.cpp
+++ b/src/USER-MISC/pair_meam_sw_spline.cpp
@@ -23,10 +23,10 @@
  * 01-Aug-12 - RER: First code version.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_meam_sw_spline.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-MISC/pair_momb.cpp b/src/USER-MISC/pair_momb.cpp
index b69b8b86ccd066359667a8a161319ddd7bcb7919..12a40bb08beb6ce981920f5dbba5dc041564deb8 100644
--- a/src/USER-MISC/pair_momb.cpp
+++ b/src/USER-MISC/pair_momb.cpp
@@ -16,9 +16,9 @@
                          Ya Zhou (Penn State University)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
 #include "pair_momb.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MISC/pair_morse_smooth_linear.cpp b/src/USER-MISC/pair_morse_smooth_linear.cpp
index 37a880762079eb71885fa4c1286812c923abf997..8a9c89cf6945afbba59a7509d936f0ecf526c4a8 100644
--- a/src/USER-MISC/pair_morse_smooth_linear.cpp
+++ b/src/USER-MISC/pair_morse_smooth_linear.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_morse_smooth_linear.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MISC/pair_srp.cpp b/src/USER-MISC/pair_srp.cpp
index 69c7e6b0be377270492521515561c7985b669541..7297b545f967ca3901d5918327b3d69e3331e942 100644
--- a/src/USER-MISC/pair_srp.cpp
+++ b/src/USER-MISC/pair_srp.cpp
@@ -25,7 +25,8 @@ There is an example script for this package in examples/USER/srp.
 Please contact Timothy Sirk for questions (tim.sirk@us.army.mil).
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
+#include <cstring>
 #include "pair_srp.h"
 #include "atom.h"
 #include "comm.h"
@@ -40,7 +41,6 @@ Please contact Timothy Sirk for questions (tim.sirk@us.army.mil).
 #include "fix_srp.h"
 #include "thermo.h"
 #include "output.h"
-#include <string.h>
 #include "citeme.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/USER-MISC/pair_tersoff_table.cpp b/src/USER-MISC/pair_tersoff_table.cpp
index 1c96b3d002b2d3b57a84db51612825174a57b8b5..c2362b8de9ce0c186636d91d324f406b5bdadfd4 100644
--- a/src/USER-MISC/pair_tersoff_table.cpp
+++ b/src/USER-MISC/pair_tersoff_table.cpp
@@ -20,10 +20,10 @@
     1) Tersoff, Phys. Rev. B 39, 5566 (1988)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_tersoff_table.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-MISC/temper_grem.cpp b/src/USER-MISC/temper_grem.cpp
index 9e5a4c5c3b95aed6cec87ea62e88d000874d9cc8..031a449689150ffe24d6413213d2183dd5ac5521 100644
--- a/src/USER-MISC/temper_grem.cpp
+++ b/src/USER-MISC/temper_grem.cpp
@@ -15,9 +15,9 @@
    Contributing author: David Stelter (BU)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "temper_grem.h"
 #include "fix_grem.h"
 #include "universe.h"
diff --git a/src/USER-MISC/temper_npt.cpp b/src/USER-MISC/temper_npt.cpp
index 66ab92a43b6758497883accc4439d1b45d7339d2..7cf8fbab9b76d86e46c54ebfd9c17b77fc873d0e 100644
--- a/src/USER-MISC/temper_npt.cpp
+++ b/src/USER-MISC/temper_npt.cpp
@@ -17,9 +17,9 @@
    Contact Email: amulyapervaje@gmail.com
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "temper_npt.h"
 #include "universe.h"
 #include "domain.h"
diff --git a/src/USER-MOFFF/angle_class2_p6.cpp b/src/USER-MOFFF/angle_class2_p6.cpp
index d173669771f4fbbdadd1b87732ccf2c5acc9cb61..c821c9d883ed611661dffb1ddeefea86c6d0ba77 100644
--- a/src/USER-MOFFF/angle_class2_p6.cpp
+++ b/src/USER-MOFFF/angle_class2_p6.cpp
@@ -16,9 +16,9 @@
                         and Rochus Schmid (Ruhr-Universitaet Bochum)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "angle_class2_p6.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-MOFFF/angle_class2_p6.h b/src/USER-MOFFF/angle_class2_p6.h
index aa0bdea6d6d3f7643690dbfdcffb4966040b1168..b583a45b191d17b79f3f7537967331635c757c09 100644
--- a/src/USER-MOFFF/angle_class2_p6.h
+++ b/src/USER-MOFFF/angle_class2_p6.h
@@ -20,7 +20,7 @@ AngleStyle(class2/p6,AngleClass2P6)
 #ifndef LMP_ANGLE_CLASS2_P6_H
 #define LMP_ANGLE_CLASS2_P6_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MOFFF/angle_cosine_buck6d.cpp b/src/USER-MOFFF/angle_cosine_buck6d.cpp
index 493807dbdca9f34a3eca831403b4e81e2ae5f521..b5800db2beb9a398eaa2fd8d314a8ae5566df1a9 100644
--- a/src/USER-MOFFF/angle_cosine_buck6d.cpp
+++ b/src/USER-MOFFF/angle_cosine_buck6d.cpp
@@ -16,8 +16,8 @@
                         and Rochus Schmid (Ruhr-Universitaet Bochum)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "angle_cosine_buck6d.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/USER-MOFFF/angle_cosine_buck6d.h b/src/USER-MOFFF/angle_cosine_buck6d.h
index e021992b94565e04e7dda5e0146df006b6677ad5..689b1634e02c935c126380682fcbcbea0f573633 100644
--- a/src/USER-MOFFF/angle_cosine_buck6d.h
+++ b/src/USER-MOFFF/angle_cosine_buck6d.h
@@ -20,7 +20,7 @@ AngleStyle(cosine/buck6d, AngleCosineBuck6d)
 #ifndef LMP_ANGLE_COSINE_BUCK6D_H
 #define LMP_ANGLE_COSINE_BUCK6D_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MOFFF/improper_inversion_harmonic.cpp b/src/USER-MOFFF/improper_inversion_harmonic.cpp
index 3a7c0272aa31f21706f315646f29208ce3f6a148..53a7b4729a990c6adacf7b69c8a57558e586e465 100644
--- a/src/USER-MOFFF/improper_inversion_harmonic.cpp
+++ b/src/USER-MOFFF/improper_inversion_harmonic.cpp
@@ -20,9 +20,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include "string.h"
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "improper_inversion_harmonic.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MOFFF/improper_inversion_harmonic.h b/src/USER-MOFFF/improper_inversion_harmonic.h
index 1b46c7489a9dafba9a569ad2bd2c5f3dca86a8a0..201c9e358d3d2d392dd856c9468595d2c9d53090 100644
--- a/src/USER-MOFFF/improper_inversion_harmonic.h
+++ b/src/USER-MOFFF/improper_inversion_harmonic.h
@@ -20,7 +20,7 @@ ImproperStyle(inversion/harmonic,ImproperInversionHarmonic)
 #ifndef LMP_IMPROPER_INVERSION_HARMONIC_H
 #define LMP_IMPROPER_INVERSION_HARMONIC_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "improper.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-MOFFF/pair_buck6d_coul_gauss_dsf.cpp b/src/USER-MOFFF/pair_buck6d_coul_gauss_dsf.cpp
index baa42a4bc0d7abf0b0e4efb85f50cdbc0de0673d..f434d03858b3d370c63e03a2b911e9554d9763e9 100644
--- a/src/USER-MOFFF/pair_buck6d_coul_gauss_dsf.cpp
+++ b/src/USER-MOFFF/pair_buck6d_coul_gauss_dsf.cpp
@@ -18,10 +18,10 @@
                Fennell and Gezelter, JCP 124, 234104 (2006)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_buck6d_coul_gauss_dsf.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MOFFF/pair_buck6d_coul_gauss_long.cpp b/src/USER-MOFFF/pair_buck6d_coul_gauss_long.cpp
index 36018613a2614d753564d403a5fc41ccf5c92493..9902896d18ece26a6e49f461e613182b4440b0b5 100644
--- a/src/USER-MOFFF/pair_buck6d_coul_gauss_long.cpp
+++ b/src/USER-MOFFF/pair_buck6d_coul_gauss_long.cpp
@@ -17,10 +17,10 @@
    References: Bureekaew and Schmid, Phys. Status Solidi B 250, 1128 (2013)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_buck6d_coul_gauss_long.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-MOLFILE/dump_molfile.cpp b/src/USER-MOLFILE/dump_molfile.cpp
index 54e86f3bc577fdfcc3c942fb40351b9cc4a685ba..732fea74bde61ae3a3fd4ba5bd6779cbeb1711db 100644
--- a/src/USER-MOLFILE/dump_molfile.cpp
+++ b/src/USER-MOLFILE/dump_molfile.cpp
@@ -15,9 +15,9 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
+#include <cstdio>
+#include <cstring>
+#include <cmath>
 #include "dump_molfile.h"
 #include "domain.h"
 #include "atom.h"
diff --git a/src/USER-MOLFILE/molfile_interface.cpp b/src/USER-MOLFILE/molfile_interface.cpp
index 9c0c15f1ee3d6524cfe1c01b3aaa3cf155c12c5d..798beaee096a68a0b4200219e81e7373532c3ba0 100644
--- a/src/USER-MOLFILE/molfile_interface.cpp
+++ b/src/USER-MOLFILE/molfile_interface.cpp
@@ -18,11 +18,11 @@
 #include "molfile_interface.h"
 
 #include <sys/types.h>
-#include <stdio.h>
+#include <cstdio>
 #include <dirent.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
+#include <cstring>
+#include <cstdlib>
+#include <cctype>
 
 #if defined(_WIN32)
 #include <windows.h>
diff --git a/src/USER-MOLFILE/reader_molfile.cpp b/src/USER-MOLFILE/reader_molfile.cpp
index 15735ab92a25bc47937a3b1de64089364b525fb0..6348009d8fd9ca866909f0994920a42a1a997258 100644
--- a/src/USER-MOLFILE/reader_molfile.cpp
+++ b/src/USER-MOLFILE/reader_molfile.cpp
@@ -15,9 +15,9 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "reader_molfile.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-NETCDF/dump_netcdf.cpp b/src/USER-NETCDF/dump_netcdf.cpp
index 4147b3897d26df8a13086f43197ee8988de01248..c08bc89d04fd86215be6ecce3f6355a504fbad4a 100644
--- a/src/USER-NETCDF/dump_netcdf.cpp
+++ b/src/USER-NETCDF/dump_netcdf.cpp
@@ -18,8 +18,8 @@
 #if defined(LMP_HAS_NETCDF)
 
 #include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <netcdf.h>
 #include "dump_netcdf.h"
 #include "atom.h"
diff --git a/src/USER-NETCDF/dump_netcdf_mpiio.cpp b/src/USER-NETCDF/dump_netcdf_mpiio.cpp
index 129f9cccbb9978dc77968b9c673bc4e7b639b6a0..0a292d4721b5e5c909375b3e56b7ac991ee01795 100644
--- a/src/USER-NETCDF/dump_netcdf_mpiio.cpp
+++ b/src/USER-NETCDF/dump_netcdf_mpiio.cpp
@@ -18,8 +18,8 @@
 #if defined(LMP_HAS_PNETCDF)
 
 #include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <pnetcdf.h>
 #include "dump_netcdf_mpiio.h"
 #include "atom.h"
diff --git a/src/USER-OMP/angle_charmm_omp.cpp b/src/USER-OMP/angle_charmm_omp.cpp
index 228ca94dee718796389e785f5388acfdb54eae0a..1f24438df3e44fb274f4e458fc4a873c96c5bdd6 100644
--- a/src/USER-OMP/angle_charmm_omp.cpp
+++ b/src/USER-OMP/angle_charmm_omp.cpp
@@ -24,7 +24,7 @@
 
 #include "math_const.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/angle_class2_omp.cpp b/src/USER-OMP/angle_class2_omp.cpp
index 8f958b477cb8443a9378b2ebe94668c947cd5c17..bd13e20bcc5827ef547370999b1654de4304942b 100644
--- a/src/USER-OMP/angle_class2_omp.cpp
+++ b/src/USER-OMP/angle_class2_omp.cpp
@@ -24,7 +24,7 @@
 
 #include "math_const.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/angle_cosine_delta_omp.cpp b/src/USER-OMP/angle_cosine_delta_omp.cpp
index f9891dbb3d7bbe0721509a67cb7d0b5ef3ffa5a4..b3bb3e1f8a7e0f42c792929f962d8be05fc8ef0d 100644
--- a/src/USER-OMP/angle_cosine_delta_omp.cpp
+++ b/src/USER-OMP/angle_cosine_delta_omp.cpp
@@ -24,7 +24,7 @@
 
 #include "math_const.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/angle_cosine_omp.cpp b/src/USER-OMP/angle_cosine_omp.cpp
index 39ae3ce698f9ab14705c775826d59d07cf04b0dd..04b3870bc4e0220f631511a0d48d0e483f9878a9 100644
--- a/src/USER-OMP/angle_cosine_omp.cpp
+++ b/src/USER-OMP/angle_cosine_omp.cpp
@@ -24,7 +24,7 @@
 
 #include "math_const.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/angle_cosine_periodic_omp.cpp b/src/USER-OMP/angle_cosine_periodic_omp.cpp
index 3bd4ef1212cc0edbf06ee7528490007ab7cb8033..8060ebec7b0ef1fbad1c3a896009ec8fdd9dc56c 100644
--- a/src/USER-OMP/angle_cosine_periodic_omp.cpp
+++ b/src/USER-OMP/angle_cosine_periodic_omp.cpp
@@ -25,7 +25,7 @@
 #include "math_const.h"
 #include "math_special.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/angle_cosine_shift_exp_omp.cpp b/src/USER-OMP/angle_cosine_shift_exp_omp.cpp
index 3a3c31d62582db4f81b170a858bc3c7bf67f2d22..3e00681ec930aef234a266d803bc3fb22ee95147 100644
--- a/src/USER-OMP/angle_cosine_shift_exp_omp.cpp
+++ b/src/USER-OMP/angle_cosine_shift_exp_omp.cpp
@@ -24,7 +24,7 @@
 
 #include "math_const.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/angle_cosine_shift_omp.cpp b/src/USER-OMP/angle_cosine_shift_omp.cpp
index f9f538e55388b03fe4388d3c859cf7cef1a8caf8..0ab3df43594cc5caceeb0b760651bdc2e064f415 100644
--- a/src/USER-OMP/angle_cosine_shift_omp.cpp
+++ b/src/USER-OMP/angle_cosine_shift_omp.cpp
@@ -24,7 +24,7 @@
 
 #include "math_const.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/angle_cosine_squared_omp.cpp b/src/USER-OMP/angle_cosine_squared_omp.cpp
index c7d14468f5addd2614b7caf7e39a084987dd0f34..a1b1ffdf1a9ee121f1aa3b0dce09a78bd5ded27c 100644
--- a/src/USER-OMP/angle_cosine_squared_omp.cpp
+++ b/src/USER-OMP/angle_cosine_squared_omp.cpp
@@ -24,7 +24,7 @@
 
 #include "math_const.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/angle_dipole_omp.cpp b/src/USER-OMP/angle_dipole_omp.cpp
index ee2af539183d514a7c38b8273e8bf12dbbde64f9..92a5ba092edf1d5ad3c0ce0e19b1ef033a12c246 100644
--- a/src/USER-OMP/angle_dipole_omp.cpp
+++ b/src/USER-OMP/angle_dipole_omp.cpp
@@ -25,7 +25,7 @@
 
 #include "math_const.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/angle_fourier_omp.cpp b/src/USER-OMP/angle_fourier_omp.cpp
index 275eab29f1d7778d9c4d3cef6fa9432a57c29b20..dfc713c3728be3795ca98576666c89e69cf0f29d 100644
--- a/src/USER-OMP/angle_fourier_omp.cpp
+++ b/src/USER-OMP/angle_fourier_omp.cpp
@@ -24,7 +24,7 @@
 
 #include "math_const.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/angle_fourier_simple_omp.cpp b/src/USER-OMP/angle_fourier_simple_omp.cpp
index 5bdbfce05d38a28d53cad0c8e8eaf0aaf1a35449..dea7a8872340a655c14929543ae39af665197b70 100644
--- a/src/USER-OMP/angle_fourier_simple_omp.cpp
+++ b/src/USER-OMP/angle_fourier_simple_omp.cpp
@@ -24,7 +24,7 @@
 
 #include "math_const.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/angle_harmonic_omp.cpp b/src/USER-OMP/angle_harmonic_omp.cpp
index 917bc2d5b0b61412cca6c39c923d841f3aad06e4..0a71e5c9dd2ca645c59bf8166bdd48055350440a 100644
--- a/src/USER-OMP/angle_harmonic_omp.cpp
+++ b/src/USER-OMP/angle_harmonic_omp.cpp
@@ -24,7 +24,7 @@
 
 #include "math_const.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/angle_quartic_omp.cpp b/src/USER-OMP/angle_quartic_omp.cpp
index 70383fd50a56cd62b057cf1f1bac8cdf19d7f0fa..97a9b14f1dac16c87ab681fac72fc0c4e8ef1037 100644
--- a/src/USER-OMP/angle_quartic_omp.cpp
+++ b/src/USER-OMP/angle_quartic_omp.cpp
@@ -24,7 +24,7 @@
 
 #include "math_const.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/angle_sdk_omp.cpp b/src/USER-OMP/angle_sdk_omp.cpp
index 9b4a967bf32644979d7f9fe5fbb49ffdfab4e635..9383a9af83cda57631cf88fe77434461c5802000 100644
--- a/src/USER-OMP/angle_sdk_omp.cpp
+++ b/src/USER-OMP/angle_sdk_omp.cpp
@@ -23,7 +23,7 @@
 #include "force.h"
 #include "math_const.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "lj_sdk_common.h"
 
diff --git a/src/USER-OMP/angle_table_omp.cpp b/src/USER-OMP/angle_table_omp.cpp
index 465f4370fcce2b40946f3ae8bba77e7b2254c398..c3d2307489087fd412e67c94a238122aeea0194c 100644
--- a/src/USER-OMP/angle_table_omp.cpp
+++ b/src/USER-OMP/angle_table_omp.cpp
@@ -24,7 +24,7 @@
 
 #include "math_const.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/bond_class2_omp.cpp b/src/USER-OMP/bond_class2_omp.cpp
index 69decfb32acfd8d60bfc8693363403996fc5db75..1f9bcaa3204b054595664a027ef477c920374adc 100644
--- a/src/USER-OMP/bond_class2_omp.cpp
+++ b/src/USER-OMP/bond_class2_omp.cpp
@@ -22,7 +22,7 @@
 #include "neighbor.h"
 #include "domain.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/bond_fene_expand_omp.cpp b/src/USER-OMP/bond_fene_expand_omp.cpp
index 37cb8b403e479e6b6402d1b869217731b5a666a0..d002d454dd912612cf777f680adede7547d95654 100644
--- a/src/USER-OMP/bond_fene_expand_omp.cpp
+++ b/src/USER-OMP/bond_fene_expand_omp.cpp
@@ -24,7 +24,7 @@
 #include "error.h"
 #include "update.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/bond_fene_omp.cpp b/src/USER-OMP/bond_fene_omp.cpp
index e92dae999c41ac5e90fc30ad89b7b3a168bab4e7..ba958e1d6f3fc52f97bf3ea2adb60fde9b19121b 100644
--- a/src/USER-OMP/bond_fene_omp.cpp
+++ b/src/USER-OMP/bond_fene_omp.cpp
@@ -24,7 +24,7 @@
 #include "error.h"
 #include "update.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/bond_gromos_omp.cpp b/src/USER-OMP/bond_gromos_omp.cpp
index 7904c4683b4c5526a99b2e4fa56049cc43be2dbf..bcfde436d5338e4d7e93fd20e2fc02b167f2989a 100644
--- a/src/USER-OMP/bond_gromos_omp.cpp
+++ b/src/USER-OMP/bond_gromos_omp.cpp
@@ -22,7 +22,7 @@
 #include "neighbor.h"
 #include "domain.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/bond_harmonic_omp.cpp b/src/USER-OMP/bond_harmonic_omp.cpp
index b62fd531939bc572b820e3c668ad69aae9c2286e..46a93cbbdd60f089b2952acab2e395bf7a39c672 100644
--- a/src/USER-OMP/bond_harmonic_omp.cpp
+++ b/src/USER-OMP/bond_harmonic_omp.cpp
@@ -22,7 +22,7 @@
 #include "neighbor.h"
 #include "domain.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/bond_harmonic_shift_cut_omp.cpp b/src/USER-OMP/bond_harmonic_shift_cut_omp.cpp
index db2518e9a9ba23d768f56d6b9cbf89e36c699b9d..5f39bb1b64beeeb977689da7ab31884ae05f7793 100644
--- a/src/USER-OMP/bond_harmonic_shift_cut_omp.cpp
+++ b/src/USER-OMP/bond_harmonic_shift_cut_omp.cpp
@@ -22,7 +22,7 @@
 #include "neighbor.h"
 #include "domain.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/bond_harmonic_shift_omp.cpp b/src/USER-OMP/bond_harmonic_shift_omp.cpp
index 632db873012e45e5f8cd20b0fbbe6ac08fe01f70..8c260bfc9b12558670f1528f482ca8199da3ce7e 100644
--- a/src/USER-OMP/bond_harmonic_shift_omp.cpp
+++ b/src/USER-OMP/bond_harmonic_shift_omp.cpp
@@ -22,7 +22,7 @@
 #include "neighbor.h"
 #include "domain.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/bond_morse_omp.cpp b/src/USER-OMP/bond_morse_omp.cpp
index d03783920b230529a41023ac8079be9050c45487..0c3cded71aa2ec6fab7ea44e8e3c5aa33c92b8d7 100644
--- a/src/USER-OMP/bond_morse_omp.cpp
+++ b/src/USER-OMP/bond_morse_omp.cpp
@@ -22,7 +22,7 @@
 #include "neighbor.h"
 #include "domain.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/bond_nonlinear_omp.cpp b/src/USER-OMP/bond_nonlinear_omp.cpp
index 2bc77de85c0ea9a8062d8224b12c1c9bec55d6d6..cdc70eac8d18947f585902ee74dce696e0c3da57 100644
--- a/src/USER-OMP/bond_nonlinear_omp.cpp
+++ b/src/USER-OMP/bond_nonlinear_omp.cpp
@@ -22,7 +22,7 @@
 #include "neighbor.h"
 #include "domain.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/bond_quartic_omp.cpp b/src/USER-OMP/bond_quartic_omp.cpp
index c0ddfd0b9267d888fd8bd3c4e623cfd80c08d51d..b2b1696bb41853b1205e143effa55972aa5d6328 100644
--- a/src/USER-OMP/bond_quartic_omp.cpp
+++ b/src/USER-OMP/bond_quartic_omp.cpp
@@ -23,7 +23,7 @@
 #include "domain.h"
 #include "pair.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/bond_table_omp.cpp b/src/USER-OMP/bond_table_omp.cpp
index 53226df4f70368842a36310dc161f22b4e3ef4fc..71dc23749655e558a82ce2a0990518ecb994debb 100644
--- a/src/USER-OMP/bond_table_omp.cpp
+++ b/src/USER-OMP/bond_table_omp.cpp
@@ -22,7 +22,7 @@
 #include "neighbor.h"
 #include "domain.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "suffix.h"
 using namespace LAMMPS_NS;
diff --git a/src/USER-OMP/dihedral_charmm_omp.cpp b/src/USER-OMP/dihedral_charmm_omp.cpp
index 95cab754c3b7465671f1c9e77d71ad6b0d99e2e6..1bed4497740c111386ec027469c04204662528f0 100644
--- a/src/USER-OMP/dihedral_charmm_omp.cpp
+++ b/src/USER-OMP/dihedral_charmm_omp.cpp
@@ -16,7 +16,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
+#include <cmath>
 #include "dihedral_charmm_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/dihedral_class2_omp.cpp b/src/USER-OMP/dihedral_class2_omp.cpp
index edf3e972d296c546bb808a2beb9b93911eae8d14..c7ae1572c766c2aaf0ad2c0ac036628049f9fd4e 100644
--- a/src/USER-OMP/dihedral_class2_omp.cpp
+++ b/src/USER-OMP/dihedral_class2_omp.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "dihedral_class2_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/dihedral_cosine_shift_exp_omp.cpp b/src/USER-OMP/dihedral_cosine_shift_exp_omp.cpp
index fe99d52cb7e7d274873b85584443d2658231d03f..c43b9900281e54009ddf790a7b0c5bf6a895d540 100644
--- a/src/USER-OMP/dihedral_cosine_shift_exp_omp.cpp
+++ b/src/USER-OMP/dihedral_cosine_shift_exp_omp.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "dihedral_cosine_shift_exp_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/dihedral_fourier_omp.cpp b/src/USER-OMP/dihedral_fourier_omp.cpp
index 9c93f2ad30651b4d498df9bf53e8a52b11eb0a6f..319acb0beb038eddb13384dc0cad10c5108fc00d 100644
--- a/src/USER-OMP/dihedral_fourier_omp.cpp
+++ b/src/USER-OMP/dihedral_fourier_omp.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "dihedral_fourier_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/dihedral_harmonic_omp.cpp b/src/USER-OMP/dihedral_harmonic_omp.cpp
index 2e0a1cf5545694f24de16699e82fc5ee6f68d5cd..bb659cf2621a2929692fb0bed6cd076dda68cf25 100644
--- a/src/USER-OMP/dihedral_harmonic_omp.cpp
+++ b/src/USER-OMP/dihedral_harmonic_omp.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "dihedral_harmonic_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/dihedral_helix_omp.cpp b/src/USER-OMP/dihedral_helix_omp.cpp
index 7dd1e8f8a4c59d5266a50fef0ac7757723254ca5..e40f084e547be390b30136135da554ada43b9deb 100644
--- a/src/USER-OMP/dihedral_helix_omp.cpp
+++ b/src/USER-OMP/dihedral_helix_omp.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "dihedral_helix_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/dihedral_multi_harmonic_omp.cpp b/src/USER-OMP/dihedral_multi_harmonic_omp.cpp
index 06565e7b502a09217381e0b4e690ea685d30e765..e10fc7b94a0bcac42abd3350f4dbe320aeed1b10 100644
--- a/src/USER-OMP/dihedral_multi_harmonic_omp.cpp
+++ b/src/USER-OMP/dihedral_multi_harmonic_omp.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "dihedral_multi_harmonic_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/dihedral_nharmonic_omp.cpp b/src/USER-OMP/dihedral_nharmonic_omp.cpp
index c698f7c109d1d9e88b1aa6c15f9e27bdf19a661a..ad758fc89231cd71cb8797cfb069081acde252ff 100644
--- a/src/USER-OMP/dihedral_nharmonic_omp.cpp
+++ b/src/USER-OMP/dihedral_nharmonic_omp.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "dihedral_nharmonic_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/dihedral_opls_omp.cpp b/src/USER-OMP/dihedral_opls_omp.cpp
index 069d6d2dd203482adb62e7f6002d68c6fabeb128..53fddf51cbd6fe01fc236812b7b4d0db80d4d3cb 100644
--- a/src/USER-OMP/dihedral_opls_omp.cpp
+++ b/src/USER-OMP/dihedral_opls_omp.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "dihedral_opls_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/dihedral_quadratic_omp.cpp b/src/USER-OMP/dihedral_quadratic_omp.cpp
index 3fa580defc20cd1027833d63f0655738f790b7d3..f6110cd5050ec580749530da13d699d74307d5b8 100644
--- a/src/USER-OMP/dihedral_quadratic_omp.cpp
+++ b/src/USER-OMP/dihedral_quadratic_omp.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "dihedral_quadratic_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/ewald_omp.cpp b/src/USER-OMP/ewald_omp.cpp
index ad6b0bf80573f990616b53f0195ae092fa4f7e70..a26d5cf27d9be4f2e08103f7f9e0d36ed3156009 100644
--- a/src/USER-OMP/ewald_omp.cpp
+++ b/src/USER-OMP/ewald_omp.cpp
@@ -22,7 +22,7 @@
 #include "force.h"
 #include "memory.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "math_const.h"
 
diff --git a/src/USER-OMP/fix_gravity_omp.cpp b/src/USER-OMP/fix_gravity_omp.cpp
index 1e65d1f7641abd558040f8cc27f74788ea2f435f..ef1a07aa5ad909f0017bf58d3d304d610d9557e9 100644
--- a/src/USER-OMP/fix_gravity_omp.cpp
+++ b/src/USER-OMP/fix_gravity_omp.cpp
@@ -15,10 +15,10 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "fix_gravity_omp.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-OMP/fix_neigh_history_omp.cpp b/src/USER-OMP/fix_neigh_history_omp.cpp
index a7ee18257f30ba43e90a137fa67808ba8940304d..efa7f5a3f1697499824d93a1b62a74b251b46bdc 100644
--- a/src/USER-OMP/fix_neigh_history_omp.cpp
+++ b/src/USER-OMP/fix_neigh_history_omp.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 #include "fix_neigh_history_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/fix_nh_asphere_omp.cpp b/src/USER-OMP/fix_nh_asphere_omp.cpp
index e710e6f12e4d86c427c4df84a7a75fb6272c9ccb..b0967bf7f78c7a2ca8f883c92c7b3558ddc2936d 100644
--- a/src/USER-OMP/fix_nh_asphere_omp.cpp
+++ b/src/USER-OMP/fix_nh_asphere_omp.cpp
@@ -15,9 +15,9 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "math_extra.h"
 #include "fix_nh_asphere_omp.h"
 #include "atom.h"
diff --git a/src/USER-OMP/fix_nh_omp.cpp b/src/USER-OMP/fix_nh_omp.cpp
index ccb6090378faf3da1990499b2ff87217c5338f52..76a47b71fdf7c86b0ead410c639e82050523ef44 100644
--- a/src/USER-OMP/fix_nh_omp.cpp
+++ b/src/USER-OMP/fix_nh_omp.cpp
@@ -22,8 +22,8 @@
 #include "error.h"
 #include "modify.h"
 
-#include <math.h>
-#include <stdio.h>
+#include <cmath>
+#include <cstdio>
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/USER-OMP/fix_nh_sphere_omp.cpp b/src/USER-OMP/fix_nh_sphere_omp.cpp
index dd0530dcfa3c2da91e3ef566ecb6eaa97a38acf9..a32f0f8b51e3d4a91e3d866cd04afbe5e1520223 100644
--- a/src/USER-OMP/fix_nh_sphere_omp.cpp
+++ b/src/USER-OMP/fix_nh_sphere_omp.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "fix_nh_sphere_omp.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/USER-OMP/fix_nph_asphere_omp.cpp b/src/USER-OMP/fix_nph_asphere_omp.cpp
index dfcbc87e6f9df5b0afa524b8484f2ca5142cfac3..c012583fda2a8a922aa2b3bac145cbb1de6c9b51 100644
--- a/src/USER-OMP/fix_nph_asphere_omp.cpp
+++ b/src/USER-OMP/fix_nph_asphere_omp.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_nph_asphere_omp.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/USER-OMP/fix_nph_omp.cpp b/src/USER-OMP/fix_nph_omp.cpp
index f2a4e66f55a481ee4f371a3d621c989b46206ee9..c11a64cd47949009969c6bdb1e612888071b7947 100644
--- a/src/USER-OMP/fix_nph_omp.cpp
+++ b/src/USER-OMP/fix_nph_omp.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_nph_omp.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/USER-OMP/fix_nph_sphere_omp.cpp b/src/USER-OMP/fix_nph_sphere_omp.cpp
index 670009de2fd29e44d3ca893b9a270712976c1696..21db6a3aaa8fc673498ff375eba913a903422f20 100644
--- a/src/USER-OMP/fix_nph_sphere_omp.cpp
+++ b/src/USER-OMP/fix_nph_sphere_omp.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_nph_sphere_omp.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/USER-OMP/fix_nphug_omp.cpp b/src/USER-OMP/fix_nphug_omp.cpp
index 75ff393e288efb55863ed7354945bb4370bfc9f0..a2ed8eb7aae023ff0e74ca1e986932843076c696 100644
--- a/src/USER-OMP/fix_nphug_omp.cpp
+++ b/src/USER-OMP/fix_nphug_omp.cpp
@@ -11,8 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_nphug_omp.h"
 #include "modify.h"
 #include "error.h"
@@ -21,10 +22,8 @@
 #include "force.h"
 #include "domain.h"
 #include "group.h"
-#include <math.h>
 #include "memory.h"
 #include "comm.h"
-#include <math.h>
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/USER-OMP/fix_npt_asphere_omp.cpp b/src/USER-OMP/fix_npt_asphere_omp.cpp
index 1db62d40c091da4e1a2889e2f540a89bf74d51b4..f1fbe27d8397b4daa83cfa4c5bd924bc39bc2243 100644
--- a/src/USER-OMP/fix_npt_asphere_omp.cpp
+++ b/src/USER-OMP/fix_npt_asphere_omp.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_npt_asphere_omp.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/USER-OMP/fix_npt_omp.cpp b/src/USER-OMP/fix_npt_omp.cpp
index 5610f62f368978788b2b4dc913514f1b0575d2e9..9244aa16068e0d5bd40014968e89588c8e529a5d 100644
--- a/src/USER-OMP/fix_npt_omp.cpp
+++ b/src/USER-OMP/fix_npt_omp.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_npt_omp.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/USER-OMP/fix_npt_sphere_omp.cpp b/src/USER-OMP/fix_npt_sphere_omp.cpp
index d71d1380b9c73c370e1504215a91b7fd1d48779f..b12bafecdd50eac66bb1b19b38f217165812ba1a 100644
--- a/src/USER-OMP/fix_npt_sphere_omp.cpp
+++ b/src/USER-OMP/fix_npt_sphere_omp.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_npt_sphere_omp.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/USER-OMP/fix_nve_sphere_omp.cpp b/src/USER-OMP/fix_nve_sphere_omp.cpp
index 43ecc998681992e0c061b2d336db88c81d888e4c..dd13e58d7cc2d0b37fc58368a59f57b51a7d3c73 100644
--- a/src/USER-OMP/fix_nve_sphere_omp.cpp
+++ b/src/USER-OMP/fix_nve_sphere_omp.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include "fix_nve_sphere_omp.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/USER-OMP/fix_nvt_asphere_omp.cpp b/src/USER-OMP/fix_nvt_asphere_omp.cpp
index bb1e784a3799ce64813d14b5d69b50d8fe67a782..d0ef28f4deba8cf34272230c7be826a00df12139 100644
--- a/src/USER-OMP/fix_nvt_asphere_omp.cpp
+++ b/src/USER-OMP/fix_nvt_asphere_omp.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_nvt_asphere_omp.h"
 #include "group.h"
 #include "modify.h"
diff --git a/src/USER-OMP/fix_nvt_omp.cpp b/src/USER-OMP/fix_nvt_omp.cpp
index f8f3c15b761384cb45e6f429ed353cecc8a56521..d4dbd4c8f0521be2ab4bf137c641886da1fb1d25 100644
--- a/src/USER-OMP/fix_nvt_omp.cpp
+++ b/src/USER-OMP/fix_nvt_omp.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_nvt_omp.h"
 #include "group.h"
 #include "modify.h"
diff --git a/src/USER-OMP/fix_nvt_sllod_omp.cpp b/src/USER-OMP/fix_nvt_sllod_omp.cpp
index a829d49c0f9e126459d3d33755c4e4d9a67f774f..33445c68af1e8000b669ba2df38db8b26a6a7ee2 100644
--- a/src/USER-OMP/fix_nvt_sllod_omp.cpp
+++ b/src/USER-OMP/fix_nvt_sllod_omp.cpp
@@ -15,8 +15,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "fix_nvt_sllod_omp.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/USER-OMP/fix_nvt_sphere_omp.cpp b/src/USER-OMP/fix_nvt_sphere_omp.cpp
index 22eda99883a28a9d309f32bf54ceed9ccb7ecc96..33ea949fcb34e7135ef06e26397fb09fae55210a 100644
--- a/src/USER-OMP/fix_nvt_sphere_omp.cpp
+++ b/src/USER-OMP/fix_nvt_sphere_omp.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_nvt_sphere_omp.h"
 #include "group.h"
 #include "modify.h"
diff --git a/src/USER-OMP/fix_omp.cpp b/src/USER-OMP/fix_omp.cpp
index 2a3717da0dcfa49036e8669da30aaa2017d63ecc..8d54d5b4516f109c2202868d985ca47e62893ce2 100644
--- a/src/USER-OMP/fix_omp.cpp
+++ b/src/USER-OMP/fix_omp.cpp
@@ -39,9 +39,9 @@
 #include "improper_hybrid.h"
 #include "kspace.h"
 
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
 
 #include "suffix.h"
 
diff --git a/src/USER-OMP/fix_qeq_comb_omp.cpp b/src/USER-OMP/fix_qeq_comb_omp.cpp
index 351003b6685098390cab8525b20eeaa31629d63d..b898fe3fe4e90d17eb0b9847d5a49beef22b4b92 100644
--- a/src/USER-OMP/fix_qeq_comb_omp.cpp
+++ b/src/USER-OMP/fix_qeq_comb_omp.cpp
@@ -16,7 +16,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
+#include <cmath>
+#include <cstring>
 #include "fix_qeq_comb_omp.h"
 #include "fix_omp.h"
 #include "atom.h"
@@ -33,8 +34,6 @@
 #include "update.h"
 #include "pair_comb_omp.h"
 
-#include <string.h>
-
 using namespace LAMMPS_NS;
 using namespace FixConst;
 
diff --git a/src/USER-OMP/fix_qeq_reax_omp.cpp b/src/USER-OMP/fix_qeq_reax_omp.cpp
index d89c9627fe30a79d2b6d3ee2e3052fe322becf35..a9ffb32d9094277e2e7770c75ef0a129aa9f8042 100644
--- a/src/USER-OMP/fix_qeq_reax_omp.cpp
+++ b/src/USER-OMP/fix_qeq_reax_omp.cpp
@@ -31,10 +31,10 @@
    High Performance Computing Applications, to appear.
  ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "fix_qeq_reax_omp.h"
 #include "pair_reaxc_omp.h"
 #include "atom.h"
diff --git a/src/USER-OMP/fix_rigid_nh_omp.cpp b/src/USER-OMP/fix_rigid_nh_omp.cpp
index 9341f83079f8ad9fb3efb8492fa8908f74e51d7b..9f25a1d0001868f58b4152b08ce3a1fd80960a5b 100644
--- a/src/USER-OMP/fix_rigid_nh_omp.cpp
+++ b/src/USER-OMP/fix_rigid_nh_omp.cpp
@@ -29,7 +29,7 @@
 #include "modify.h"
 #include "update.h"
 
-#include <string.h>
+#include <cstring>
 
 #if defined(_OPENMP)
 #include <omp.h>
diff --git a/src/USER-OMP/fix_rigid_nph_omp.cpp b/src/USER-OMP/fix_rigid_nph_omp.cpp
index 6aca84c30973566ef1b58e7954d667144277d7ef..7db45ed9bf414a4b0c417a47b08945c8f9ba1a91 100644
--- a/src/USER-OMP/fix_rigid_nph_omp.cpp
+++ b/src/USER-OMP/fix_rigid_nph_omp.cpp
@@ -17,7 +17,7 @@
                Miller et al., J Chem Phys. 116, 8649-8659 (2002)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_rigid_nph_omp.h"
 #include "domain.h"
 #include "modify.h"
diff --git a/src/USER-OMP/fix_rigid_npt_omp.cpp b/src/USER-OMP/fix_rigid_npt_omp.cpp
index 23f16c61556034bd208dda6d20f941ba87045d23..a041706f388890decd8c834021553e9eb18ddec2 100644
--- a/src/USER-OMP/fix_rigid_npt_omp.cpp
+++ b/src/USER-OMP/fix_rigid_npt_omp.cpp
@@ -17,7 +17,7 @@
                Miller et al., J Chem Phys. 116, 8649-8659 (2002)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_rigid_npt_omp.h"
 #include "domain.h"
 #include "modify.h"
diff --git a/src/USER-OMP/fix_rigid_omp.cpp b/src/USER-OMP/fix_rigid_omp.cpp
index 6f084c628cb7e6b3538b74d4d462e909b93b6440..15e5f91c320513173bd482d0810f046b2ee6bad8 100644
--- a/src/USER-OMP/fix_rigid_omp.cpp
+++ b/src/USER-OMP/fix_rigid_omp.cpp
@@ -24,7 +24,7 @@
 #include "comm.h"
 #include "domain.h"
 
-#include <string.h>
+#include <cstring>
 
 #if defined(_OPENMP)
 #include <omp.h>
diff --git a/src/USER-OMP/fix_rigid_small_omp.cpp b/src/USER-OMP/fix_rigid_small_omp.cpp
index 156ef8a2d7a04876fd186ae4ec70c2a00fad2a3a..7d82bd04e8d056141978c046c907a8557a339c54 100644
--- a/src/USER-OMP/fix_rigid_small_omp.cpp
+++ b/src/USER-OMP/fix_rigid_small_omp.cpp
@@ -24,7 +24,7 @@
 #include "comm.h"
 #include "domain.h"
 
-#include <string.h>
+#include <cstring>
 
 #if defined(_OPENMP)
 #include <omp.h>
diff --git a/src/USER-OMP/fix_wall_gran_omp.cpp b/src/USER-OMP/fix_wall_gran_omp.cpp
index 55ae8593a761d62d3cbfc1c136bb4ed611d8d2d5..d45e748b6a1100691fc7e46f246c08330913a870 100644
--- a/src/USER-OMP/fix_wall_gran_omp.cpp
+++ b/src/USER-OMP/fix_wall_gran_omp.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "fix_wall_gran_omp.h"
 #include "atom.h"
 #include "memory.h"
diff --git a/src/USER-OMP/improper_class2_omp.cpp b/src/USER-OMP/improper_class2_omp.cpp
index 3beeb41a2626d5f9b52d52a348d69cda07111c90..7184cbeb69b7800cc7477803b29df83e2af5fc10 100644
--- a/src/USER-OMP/improper_class2_omp.cpp
+++ b/src/USER-OMP/improper_class2_omp.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "improper_class2_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/improper_cossq_omp.cpp b/src/USER-OMP/improper_cossq_omp.cpp
index f34941d6245b28f94d34d151225115c6b37976ad..022cfa6adf8216c80ce8ffd78068241ae35061be 100644
--- a/src/USER-OMP/improper_cossq_omp.cpp
+++ b/src/USER-OMP/improper_cossq_omp.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "improper_cossq_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/improper_cvff_omp.cpp b/src/USER-OMP/improper_cvff_omp.cpp
index cba14226ac870029c3e6971155b5a6250eef3ba7..78c5a55e054da887354dc8707a026c9ddc9cb0da 100644
--- a/src/USER-OMP/improper_cvff_omp.cpp
+++ b/src/USER-OMP/improper_cvff_omp.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "improper_cvff_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/improper_fourier_omp.cpp b/src/USER-OMP/improper_fourier_omp.cpp
index c1699baf02a5429c83ba561ea996fe632429975e..aed04003a5eff70550f4d98830145a7557cc22b5 100644
--- a/src/USER-OMP/improper_fourier_omp.cpp
+++ b/src/USER-OMP/improper_fourier_omp.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "improper_fourier_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/improper_harmonic_omp.cpp b/src/USER-OMP/improper_harmonic_omp.cpp
index 8c1f91ecabb6213fe884cccfb7ecde71bedd9ada..3f1895142df47ebc6a6cfd532ff53e12a2517cff 100644
--- a/src/USER-OMP/improper_harmonic_omp.cpp
+++ b/src/USER-OMP/improper_harmonic_omp.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "improper_harmonic_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/improper_ring_omp.cpp b/src/USER-OMP/improper_ring_omp.cpp
index 4eadc831833b9f2b3f9e26fd24a545ecafa962c4..7970de3839a8c98b92a68f65b8655110c3eda320 100644
--- a/src/USER-OMP/improper_ring_omp.cpp
+++ b/src/USER-OMP/improper_ring_omp.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "improper_ring_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/improper_umbrella_omp.cpp b/src/USER-OMP/improper_umbrella_omp.cpp
index 9ea94c57050e3ba15555df231aaf94095228f8e9..dc11f24a4de084b07b666c08b76271d135218115 100644
--- a/src/USER-OMP/improper_umbrella_omp.cpp
+++ b/src/USER-OMP/improper_umbrella_omp.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "improper_umbrella_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/msm_cg_omp.cpp b/src/USER-OMP/msm_cg_omp.cpp
index fb64bc5644683f1490bd8e90b9d5f64cc91cb871..226083deb48489ecb5cd6bedc56265185c506630 100644
--- a/src/USER-OMP/msm_cg_omp.cpp
+++ b/src/USER-OMP/msm_cg_omp.cpp
@@ -17,10 +17,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "atom.h"
 #include "gridcomm.h"
@@ -331,7 +331,7 @@ void MSMCGOMP::particle_map()
   int flag = 0;
   int i;
 
-  if (!ISFINITE(boxlo[0]) || !ISFINITE(boxlo[1]) || !ISFINITE(boxlo[2]))
+  if (!std::isfinite(boxlo[0]) || !std::isfinite(boxlo[1]) || !std::isfinite(boxlo[2]))
     error->one(FLERR,"Non-numeric box dimensions - simulation unstable");
 
   // XXX: O(N). is it worth to add OpenMP here?
diff --git a/src/USER-OMP/msm_omp.cpp b/src/USER-OMP/msm_omp.cpp
index 7a79dc865b7d28f6110d62823f9f259465e7f5fa..3bc7ddb1cdc28fc9851d12432422db994b3cbff7 100644
--- a/src/USER-OMP/msm_omp.cpp
+++ b/src/USER-OMP/msm_omp.cpp
@@ -24,7 +24,7 @@
 #include "memory.h"
 #include "math_const.h"
 
-#include <string.h>
+#include <cstring>
 
 #if defined(_OPENMP)
 #include <omp.h>
diff --git a/src/USER-OMP/npair_half_size_bin_newtoff_omp.cpp b/src/USER-OMP/npair_half_size_bin_newtoff_omp.cpp
index fc101a33d21ce88b683df8835b5d083af287cbd5..dff2a762d51dd71b96fc84d98aa26d618acd2750 100644
--- a/src/USER-OMP/npair_half_size_bin_newtoff_omp.cpp
+++ b/src/USER-OMP/npair_half_size_bin_newtoff_omp.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "npair_half_size_bin_newtoff_omp.h"
 #include "npair_omp.h"
 #include "neighbor.h"
diff --git a/src/USER-OMP/npair_half_size_bin_newton_omp.cpp b/src/USER-OMP/npair_half_size_bin_newton_omp.cpp
index 1f0dca79ac1b072b05176254577b3954bcb390e3..3053b815946f59ffa07b2943da022374083f1c14 100644
--- a/src/USER-OMP/npair_half_size_bin_newton_omp.cpp
+++ b/src/USER-OMP/npair_half_size_bin_newton_omp.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "npair_half_size_bin_newton_omp.h"
 #include "npair_omp.h"
 #include "neighbor.h"
diff --git a/src/USER-OMP/npair_half_size_nsq_newtoff_omp.cpp b/src/USER-OMP/npair_half_size_nsq_newtoff_omp.cpp
index 1615effad3864afbec6ee9633580bd754c44a834..717012b226e3dfb08292b40e029bdb65592450ce 100644
--- a/src/USER-OMP/npair_half_size_nsq_newtoff_omp.cpp
+++ b/src/USER-OMP/npair_half_size_nsq_newtoff_omp.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "npair_half_size_nsq_newtoff_omp.h"
 #include "npair_omp.h"
 #include "neighbor.h"
diff --git a/src/USER-OMP/npair_half_size_nsq_newton_omp.cpp b/src/USER-OMP/npair_half_size_nsq_newton_omp.cpp
index e5de57aa5112698f7bc069914eef8d5d9256401d..5a55029d30fd77e50349f2aa6214a38009588a86 100644
--- a/src/USER-OMP/npair_half_size_nsq_newton_omp.cpp
+++ b/src/USER-OMP/npair_half_size_nsq_newton_omp.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "npair_half_size_nsq_newton_omp.h"
 #include "npair_omp.h"
 #include "neighbor.h"
diff --git a/src/USER-OMP/pair_adp_omp.cpp b/src/USER-OMP/pair_adp_omp.cpp
index 658ef365a37c7948d36f8aea27feaa3b1f1b680a..264169773b9af8cb988377ebef73b187583013d2 100644
--- a/src/USER-OMP/pair_adp_omp.cpp
+++ b/src/USER-OMP/pair_adp_omp.cpp
@@ -12,8 +12,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 
 #include "pair_adp_omp.h"
 #include "atom.h"
diff --git a/src/USER-OMP/pair_agni_omp.cpp b/src/USER-OMP/pair_agni_omp.cpp
index 72e8331718c3461c1d33a147a41b63b2a1636af0..e8f003ea881674165d42e15053c2766b9be8a27e 100644
--- a/src/USER-OMP/pair_agni_omp.cpp
+++ b/src/USER-OMP/pair_agni_omp.cpp
@@ -12,9 +12,9 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdint.h>
+#include <cmath>
+#include <cstring>
+#include <stdint.h> // <cstdint> requires C++-11
 #include "pair_agni_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_airebo_omp.cpp b/src/USER-OMP/pair_airebo_omp.cpp
index 3e8f6d6df3ba242bc5d47249d8563bdc5136e03b..8decda7cabc86ef3096d806d03b101b3891afefa 100644
--- a/src/USER-OMP/pair_airebo_omp.cpp
+++ b/src/USER-OMP/pair_airebo_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_airebo_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_beck_omp.cpp b/src/USER-OMP/pair_beck_omp.cpp
index e56a0dc7faf1ac4b3ae8fa5442142b56d998b336..1494ec2987e09864b7b69f01cec12b59197d5bd5 100644
--- a/src/USER-OMP/pair_beck_omp.cpp
+++ b/src/USER-OMP/pair_beck_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_beck_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_born_coul_long_omp.cpp b/src/USER-OMP/pair_born_coul_long_omp.cpp
index cbb71dfeb54e65c728d6f22b2f493c3186c03247..f1981844066c3eab95133ef67957a8b9786414a7 100644
--- a/src/USER-OMP/pair_born_coul_long_omp.cpp
+++ b/src/USER-OMP/pair_born_coul_long_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_born_coul_long_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_born_coul_msm_omp.cpp b/src/USER-OMP/pair_born_coul_msm_omp.cpp
index 8ce564ccfabd10c2f8c3be2748822f430728327f..1b4757359f6a84b027a7e18078b8d7576993c64d 100644
--- a/src/USER-OMP/pair_born_coul_msm_omp.cpp
+++ b/src/USER-OMP/pair_born_coul_msm_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_born_coul_msm_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_born_coul_wolf_omp.cpp b/src/USER-OMP/pair_born_coul_wolf_omp.cpp
index bd3e539dd65dd030858b590754eed655fd3c6165..7904181ba594994be359c77c72dcf0be97d77082 100644
--- a/src/USER-OMP/pair_born_coul_wolf_omp.cpp
+++ b/src/USER-OMP/pair_born_coul_wolf_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_born_coul_wolf_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_born_omp.cpp b/src/USER-OMP/pair_born_omp.cpp
index 35669cb53955f3f9aca601efbafcda37b501998a..f75d4b9f35a6ba81467c382f6ce43f9052e0d4c6 100644
--- a/src/USER-OMP/pair_born_omp.cpp
+++ b/src/USER-OMP/pair_born_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_born_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_brownian_omp.cpp b/src/USER-OMP/pair_brownian_omp.cpp
index 9ea6a9187b75c0422043e7161a5c8d909618d32a..b1af821bba876a95dd27919c5d4abef736aa4af0 100644
--- a/src/USER-OMP/pair_brownian_omp.cpp
+++ b/src/USER-OMP/pair_brownian_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_brownian_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_brownian_poly_omp.cpp b/src/USER-OMP/pair_brownian_poly_omp.cpp
index d8cb3bf06e158454212026bd6d980cbae1dadcdf..2e677ed535220e11bf13ccbe4068a5bffebb91f8 100644
--- a/src/USER-OMP/pair_brownian_poly_omp.cpp
+++ b/src/USER-OMP/pair_brownian_poly_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_brownian_poly_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_buck_coul_cut_omp.cpp b/src/USER-OMP/pair_buck_coul_cut_omp.cpp
index ead60d70acc76e2fb650aa840a4550a716d93ded..8fa6be06b2ef595fd6d029e101d07e98e298632e 100644
--- a/src/USER-OMP/pair_buck_coul_cut_omp.cpp
+++ b/src/USER-OMP/pair_buck_coul_cut_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_buck_coul_cut_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_buck_coul_long_omp.cpp b/src/USER-OMP/pair_buck_coul_long_omp.cpp
index 48750f83181049664dd52618bf4ebb8aff3a0393..4d30eb3e82d991be28bf00ba4fc7ec67b4216bc8 100644
--- a/src/USER-OMP/pair_buck_coul_long_omp.cpp
+++ b/src/USER-OMP/pair_buck_coul_long_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_buck_coul_long_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_buck_coul_msm_omp.cpp b/src/USER-OMP/pair_buck_coul_msm_omp.cpp
index df94efc81232cc9547d01f9fabadfb30d6fda81e..a8bca36394bd5b4415ce840a238cdaaa195ab8df 100644
--- a/src/USER-OMP/pair_buck_coul_msm_omp.cpp
+++ b/src/USER-OMP/pair_buck_coul_msm_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_buck_coul_msm_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_buck_long_coul_long_omp.cpp b/src/USER-OMP/pair_buck_long_coul_long_omp.cpp
index dbcef106d2571f3a439a635be5f8417e3d105937..4a67cf9544fda593f82862e976498f1537d3a3c5 100644
--- a/src/USER-OMP/pair_buck_long_coul_long_omp.cpp
+++ b/src/USER-OMP/pair_buck_long_coul_long_omp.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 
-#include <math.h>
+#include <cmath>
 #include "math_vector.h"
 #include "pair_buck_long_coul_long_omp.h"
 #include "atom.h"
diff --git a/src/USER-OMP/pair_buck_omp.cpp b/src/USER-OMP/pair_buck_omp.cpp
index 826fd78deb3368a0745b3f6ee2717c10e1376c58..f3fa32a5ea231fc772c3edd6596c43e85a644ded 100644
--- a/src/USER-OMP/pair_buck_omp.cpp
+++ b/src/USER-OMP/pair_buck_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_buck_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_cdeam_omp.cpp b/src/USER-OMP/pair_cdeam_omp.cpp
index 3bfe74e129d391af143d3301a06f1b1e6f91326c..c3a9454567cccc0cb0c075f635e61c247ef9c476 100644
--- a/src/USER-OMP/pair_cdeam_omp.cpp
+++ b/src/USER-OMP/pair_cdeam_omp.cpp
@@ -12,8 +12,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 
 #include "pair_cdeam_omp.h"
 #include "atom.h"
diff --git a/src/USER-OMP/pair_colloid_omp.cpp b/src/USER-OMP/pair_colloid_omp.cpp
index 4c6411f1509f86973731a699d241836571a14ea7..536b7644bd4f12efcd0818ae18f57cdf656b0b6d 100644
--- a/src/USER-OMP/pair_colloid_omp.cpp
+++ b/src/USER-OMP/pair_colloid_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_colloid_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_comb_omp.cpp b/src/USER-OMP/pair_comb_omp.cpp
index 2a0e6ceb2354ea0361a540b824c18f1cecbdbc9f..8a77ab955fdeba423203938e0bd50012b4228621 100644
--- a/src/USER-OMP/pair_comb_omp.cpp
+++ b/src/USER-OMP/pair_comb_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_comb_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_coul_cut_omp.cpp b/src/USER-OMP/pair_coul_cut_omp.cpp
index 381e7f83c208c97980f11c0fec8be31d2b7b5782..b9ac72421ef874728a22ad24279840210fdefb7a 100644
--- a/src/USER-OMP/pair_coul_cut_omp.cpp
+++ b/src/USER-OMP/pair_coul_cut_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_coul_cut_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_coul_cut_soft_omp.cpp b/src/USER-OMP/pair_coul_cut_soft_omp.cpp
index af9c9472fa788b827ac0eaf18f09d2db782e3d90..c7e8c5e5603a0765e4911f5d34357cd1181089e3 100644
--- a/src/USER-OMP/pair_coul_cut_soft_omp.cpp
+++ b/src/USER-OMP/pair_coul_cut_soft_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_coul_cut_soft_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_coul_debye_omp.cpp b/src/USER-OMP/pair_coul_debye_omp.cpp
index 0d9b1179674495710e42c4a8a578d71f8c0b44ea..cb7a9025ce718bf297bc83b1e718c20a32fd4a34 100644
--- a/src/USER-OMP/pair_coul_debye_omp.cpp
+++ b/src/USER-OMP/pair_coul_debye_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_coul_debye_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_coul_diel_omp.cpp b/src/USER-OMP/pair_coul_diel_omp.cpp
index 577ba6bf65a9b49e0a22e1dcd04257cc0bde947b..c75e36b55ee842c05c8f9ca8de58875fa8c08ae8 100644
--- a/src/USER-OMP/pair_coul_diel_omp.cpp
+++ b/src/USER-OMP/pair_coul_diel_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_coul_diel_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_coul_dsf_omp.cpp b/src/USER-OMP/pair_coul_dsf_omp.cpp
index 4707fad733520cca8fca7e02f87753e543f085c0..740e3242ad2bcf3c0db313f3f2989dac2e32867a 100644
--- a/src/USER-OMP/pair_coul_dsf_omp.cpp
+++ b/src/USER-OMP/pair_coul_dsf_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_coul_dsf_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_coul_long_omp.cpp b/src/USER-OMP/pair_coul_long_omp.cpp
index dc619913d6ef82c9c2e141ac5128617b7c25744c..eb74bb9615cf2a5ac2f9d1118f3b1fb6a7263d92 100644
--- a/src/USER-OMP/pair_coul_long_omp.cpp
+++ b/src/USER-OMP/pair_coul_long_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_coul_long_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_coul_long_soft_omp.cpp b/src/USER-OMP/pair_coul_long_soft_omp.cpp
index f44f95717d10e5fcef2f12dd32a94f6e492d17f2..4e65483a17c7f4a6b7d9759781df748dcdc89561 100644
--- a/src/USER-OMP/pair_coul_long_soft_omp.cpp
+++ b/src/USER-OMP/pair_coul_long_soft_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_coul_long_soft_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_coul_msm_omp.cpp b/src/USER-OMP/pair_coul_msm_omp.cpp
index baf9ceefb5b4957e83d7408243c791d0ff67b3cd..f4bc279532fe96386de8344d0797bd925e6104c9 100644
--- a/src/USER-OMP/pair_coul_msm_omp.cpp
+++ b/src/USER-OMP/pair_coul_msm_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_coul_msm_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_coul_wolf_omp.cpp b/src/USER-OMP/pair_coul_wolf_omp.cpp
index c5080bc7de2185f860530235e48f496da1a8dd34..bc86cdbf5dae8e5d3378458ec11df65117c94a20 100644
--- a/src/USER-OMP/pair_coul_wolf_omp.cpp
+++ b/src/USER-OMP/pair_coul_wolf_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_coul_wolf_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_dpd_omp.cpp b/src/USER-OMP/pair_dpd_omp.cpp
index 98e5af0d814cdeb429057ae23dc8837a6efec27b..29b5568defa983e9393358331dfb75fffc459b94 100644
--- a/src/USER-OMP/pair_dpd_omp.cpp
+++ b/src/USER-OMP/pair_dpd_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_dpd_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_dpd_tstat_omp.cpp b/src/USER-OMP/pair_dpd_tstat_omp.cpp
index ee697a2e96f687b404091b5055a3de4bc4e4d791..0a9e96fa0cca4478b5364528f3d0a16f1fefecc6 100644
--- a/src/USER-OMP/pair_dpd_tstat_omp.cpp
+++ b/src/USER-OMP/pair_dpd_tstat_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_dpd_tstat_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_eam_alloy_omp.cpp b/src/USER-OMP/pair_eam_alloy_omp.cpp
index eea7383eac3ee19edf12f32314c9866464bd0fee..bbb3b03b020cffdf39327c6b556b26e165983699 100644
--- a/src/USER-OMP/pair_eam_alloy_omp.cpp
+++ b/src/USER-OMP/pair_eam_alloy_omp.cpp
@@ -15,9 +15,9 @@
    Contributing authors: Stephen Foiles (SNL), Murray Daw (SNL)
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_eam_alloy_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_eam_fs_omp.cpp b/src/USER-OMP/pair_eam_fs_omp.cpp
index c646632224a213762eb50ae81868b65c5ebf217e..a678c887a0726ce23d3c5e9468cf8e77581ae5af 100644
--- a/src/USER-OMP/pair_eam_fs_omp.cpp
+++ b/src/USER-OMP/pair_eam_fs_omp.cpp
@@ -15,9 +15,9 @@
    Contributing authors: Tim Lau (MIT)
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_eam_fs_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_eam_omp.cpp b/src/USER-OMP/pair_eam_omp.cpp
index 9c28477af03053b28a4ecde21daab5f370bbae49..492ff797692d19fba1de48296b98f4450037fc00 100644
--- a/src/USER-OMP/pair_eam_omp.cpp
+++ b/src/USER-OMP/pair_eam_omp.cpp
@@ -12,8 +12,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 
 #include "pair_eam_omp.h"
 #include "atom.h"
diff --git a/src/USER-OMP/pair_edip_omp.cpp b/src/USER-OMP/pair_edip_omp.cpp
index 7c503ea8aa13057c9149a3116c92336c0b7aa0a0..5ad8c808ba5e39a0ce728f1375065f296b247048 100644
--- a/src/USER-OMP/pair_edip_omp.cpp
+++ b/src/USER-OMP/pair_edip_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_edip_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_eim_omp.cpp b/src/USER-OMP/pair_eim_omp.cpp
index e98c035860c74289548fbc2ee17333875093c5ad..6a3e0bc529d99f2201a6d0df25535acddffa08f5 100644
--- a/src/USER-OMP/pair_eim_omp.cpp
+++ b/src/USER-OMP/pair_eim_omp.cpp
@@ -12,8 +12,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 
 #include "pair_eim_omp.h"
 #include "atom.h"
diff --git a/src/USER-OMP/pair_gauss_cut_omp.cpp b/src/USER-OMP/pair_gauss_cut_omp.cpp
index ad0eb77963448d92a2a7e3c9c9b491c99b7c638c..9a41dcc87ef3a4024b1a4a1a19f6f87f8a6b41ca 100644
--- a/src/USER-OMP/pair_gauss_cut_omp.cpp
+++ b/src/USER-OMP/pair_gauss_cut_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_gauss_cut_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_gauss_omp.cpp b/src/USER-OMP/pair_gauss_omp.cpp
index 062da924e32b2f3b4f63560b093db792dac99caf..059c77c677aded43c3bfe1dcf4ca0cdedd15c851 100644
--- a/src/USER-OMP/pair_gauss_omp.cpp
+++ b/src/USER-OMP/pair_gauss_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_gauss_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_gayberne_omp.cpp b/src/USER-OMP/pair_gayberne_omp.cpp
index 54e4496f22efcb5954fdee9c83c91024e1d48a01..5b0ff67afed9a8d5e3dfbb858a68c4f4e08ec477 100644
--- a/src/USER-OMP/pair_gayberne_omp.cpp
+++ b/src/USER-OMP/pair_gayberne_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_gayberne_omp.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/USER-OMP/pair_gran_hertz_history_omp.cpp b/src/USER-OMP/pair_gran_hertz_history_omp.cpp
index 046b71a73aee49f91222b0b787f1c1ea4551f434..9854b8f9ff5261cc5d2a2609a1e146971298a03d 100644
--- a/src/USER-OMP/pair_gran_hertz_history_omp.cpp
+++ b/src/USER-OMP/pair_gran_hertz_history_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_gran_hertz_history_omp.h"
 #include "fix_neigh_history.h"
 #include "atom.h"
diff --git a/src/USER-OMP/pair_gran_hooke_history_omp.cpp b/src/USER-OMP/pair_gran_hooke_history_omp.cpp
index 2e7d55aff059c1e7867cb35edd03bd3d19cf7eb6..2327fc815ac218709b28ad358c4d124f4393a3e5 100644
--- a/src/USER-OMP/pair_gran_hooke_history_omp.cpp
+++ b/src/USER-OMP/pair_gran_hooke_history_omp.cpp
@@ -12,7 +12,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
+#include <cstring>
 #include "pair_gran_hooke_history_omp.h"
 #include "fix_neigh_history.h"
 #include "atom.h"
@@ -24,8 +25,6 @@
 #include "neigh_list.h"
 #include "update.h"
 
-#include <string.h>
-
 #include "suffix.h"
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-OMP/pair_gran_hooke_omp.cpp b/src/USER-OMP/pair_gran_hooke_omp.cpp
index 3197b7076e8c09740ea75d1bd84950b4d8a67777..876fe9c4de5eb997a4c58b892a99f16728f87c6b 100644
--- a/src/USER-OMP/pair_gran_hooke_omp.cpp
+++ b/src/USER-OMP/pair_gran_hooke_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_gran_hooke_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_hbond_dreiding_lj_omp.cpp b/src/USER-OMP/pair_hbond_dreiding_lj_omp.cpp
index c22efffb5a8edca99cdfb486de5cfaab76dbcd26..ec9da78b16dc06d14135ade0263f635ecc39f25e 100644
--- a/src/USER-OMP/pair_hbond_dreiding_lj_omp.cpp
+++ b/src/USER-OMP/pair_hbond_dreiding_lj_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_hbond_dreiding_lj_omp.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/USER-OMP/pair_hbond_dreiding_morse_omp.cpp b/src/USER-OMP/pair_hbond_dreiding_morse_omp.cpp
index 7debe5a68a6f41ecbce2680e9c6671178af43288..4965be43b84a6f1dd3809c2cd90a5816adf14124 100644
--- a/src/USER-OMP/pair_hbond_dreiding_morse_omp.cpp
+++ b/src/USER-OMP/pair_hbond_dreiding_morse_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_hbond_dreiding_morse_omp.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/USER-OMP/pair_lj96_cut_omp.cpp b/src/USER-OMP/pair_lj96_cut_omp.cpp
index e502a93acfb1d711426b0660c401cdd16413eeb3..1cca6743690756f4e5f7300f425b4718999356ec 100644
--- a/src/USER-OMP/pair_lj96_cut_omp.cpp
+++ b/src/USER-OMP/pair_lj96_cut_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj96_cut_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_charmm_coul_charmm_implicit_omp.cpp b/src/USER-OMP/pair_lj_charmm_coul_charmm_implicit_omp.cpp
index 1333ae27613e15beead53eac127fed836b52e28e..2f72f3851e244552b8b465ef05e7aca23a731872 100644
--- a/src/USER-OMP/pair_lj_charmm_coul_charmm_implicit_omp.cpp
+++ b/src/USER-OMP/pair_lj_charmm_coul_charmm_implicit_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_charmm_coul_charmm_implicit_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_charmm_coul_charmm_omp.cpp b/src/USER-OMP/pair_lj_charmm_coul_charmm_omp.cpp
index 9fd41e61dd48f4c92e925b5aeebbd4f0dbd6c7a0..b61a80a178b77c0b56ee696b30141b45f5b3e6eb 100644
--- a/src/USER-OMP/pair_lj_charmm_coul_charmm_omp.cpp
+++ b/src/USER-OMP/pair_lj_charmm_coul_charmm_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_charmm_coul_charmm_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_charmm_coul_long_omp.cpp b/src/USER-OMP/pair_lj_charmm_coul_long_omp.cpp
index acbf61d9fd717dfc403c219e180ca01fe88983b2..5351ab9aeaa95571a0fbb59f057c7b5d27ad6a06 100644
--- a/src/USER-OMP/pair_lj_charmm_coul_long_omp.cpp
+++ b/src/USER-OMP/pair_lj_charmm_coul_long_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_charmm_coul_long_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_charmm_coul_long_soft_omp.cpp b/src/USER-OMP/pair_lj_charmm_coul_long_soft_omp.cpp
index 4953c89a4d55142adade87e72685e5380f2085a4..ea5d739e49d2614f003571bc6128bca2c75d785c 100644
--- a/src/USER-OMP/pair_lj_charmm_coul_long_soft_omp.cpp
+++ b/src/USER-OMP/pair_lj_charmm_coul_long_soft_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_charmm_coul_long_soft_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_charmm_coul_msm_omp.cpp b/src/USER-OMP/pair_lj_charmm_coul_msm_omp.cpp
index c603f0dd3a01aa78d2c8b9d5cb29e0d8f1393f6c..3baa9597a8e28c3619fe1184c6fe937f0fd2012a 100644
--- a/src/USER-OMP/pair_lj_charmm_coul_msm_omp.cpp
+++ b/src/USER-OMP/pair_lj_charmm_coul_msm_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_charmm_coul_msm_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_class2_coul_cut_omp.cpp b/src/USER-OMP/pair_lj_class2_coul_cut_omp.cpp
index 98c2b0d578eaf153ee44d271b4db4cd1c82e03a0..38390918c7da9644f10193d362300d7c34324a54 100644
--- a/src/USER-OMP/pair_lj_class2_coul_cut_omp.cpp
+++ b/src/USER-OMP/pair_lj_class2_coul_cut_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_class2_coul_cut_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_class2_coul_long_omp.cpp b/src/USER-OMP/pair_lj_class2_coul_long_omp.cpp
index 3038332c905e7e69b4730816b1457519e632d19d..f47672c9bc39d3f01f8af5733f923d38578359f4 100644
--- a/src/USER-OMP/pair_lj_class2_coul_long_omp.cpp
+++ b/src/USER-OMP/pair_lj_class2_coul_long_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_class2_coul_long_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_class2_omp.cpp b/src/USER-OMP/pair_lj_class2_omp.cpp
index ffb0ceaa0a0f762ee63d8384b015bd2c4a1400fc..7ab4626c3e420ddf0e6dd633b8b8ca704568ae0e 100644
--- a/src/USER-OMP/pair_lj_class2_omp.cpp
+++ b/src/USER-OMP/pair_lj_class2_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_class2_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_cubic_omp.cpp b/src/USER-OMP/pair_lj_cubic_omp.cpp
index 1cea0f454a7199fbe54e6193b4ed75285b7cc1b5..3e8adb33b85df9fda3fcee37f875971713166661 100644
--- a/src/USER-OMP/pair_lj_cubic_omp.cpp
+++ b/src/USER-OMP/pair_lj_cubic_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cubic_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_cut_coul_cut_omp.cpp b/src/USER-OMP/pair_lj_cut_coul_cut_omp.cpp
index 1f48b4245ec7f53b73807fe5f9ad5481e15674fa..ea560a09bf30382158a22fa5fadb575677ceb407 100644
--- a/src/USER-OMP/pair_lj_cut_coul_cut_omp.cpp
+++ b/src/USER-OMP/pair_lj_cut_coul_cut_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cut_coul_cut_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_cut_coul_cut_soft_omp.cpp b/src/USER-OMP/pair_lj_cut_coul_cut_soft_omp.cpp
index f6ba7236a03f1700836098f2fd7dd5c19155f903..4ef12bb1bbe198439a2033ff8c5b9b5fdbcd8300 100644
--- a/src/USER-OMP/pair_lj_cut_coul_cut_soft_omp.cpp
+++ b/src/USER-OMP/pair_lj_cut_coul_cut_soft_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cut_coul_cut_soft_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_cut_coul_debye_omp.cpp b/src/USER-OMP/pair_lj_cut_coul_debye_omp.cpp
index 9fc64cf38cdd6ea40564e09779f2958118d92f68..9163e98eddeae433ca7d360518d4197d51cf5c80 100644
--- a/src/USER-OMP/pair_lj_cut_coul_debye_omp.cpp
+++ b/src/USER-OMP/pair_lj_cut_coul_debye_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cut_coul_debye_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_cut_coul_dsf_omp.cpp b/src/USER-OMP/pair_lj_cut_coul_dsf_omp.cpp
index d0b6c1b2dc3d108d24de94d2a0ebc9680baed248..9d9c098f8744afa5817f91b2fce97aed0fb213f3 100644
--- a/src/USER-OMP/pair_lj_cut_coul_dsf_omp.cpp
+++ b/src/USER-OMP/pair_lj_cut_coul_dsf_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cut_coul_dsf_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_cut_coul_long_omp.cpp b/src/USER-OMP/pair_lj_cut_coul_long_omp.cpp
index 6746cf97015500e894a6c0bbf7f5a362a0856452..d2eaae4ca4f640282ad2c6d6ef885db228fdf1f5 100644
--- a/src/USER-OMP/pair_lj_cut_coul_long_omp.cpp
+++ b/src/USER-OMP/pair_lj_cut_coul_long_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cut_coul_long_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_cut_coul_long_soft_omp.cpp b/src/USER-OMP/pair_lj_cut_coul_long_soft_omp.cpp
index 5f0a3d57c4cd940d3bd3db8a408942e633a8d4c0..725bfe4724020e70298a9d7fe955f04ae624cd71 100644
--- a/src/USER-OMP/pair_lj_cut_coul_long_soft_omp.cpp
+++ b/src/USER-OMP/pair_lj_cut_coul_long_soft_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cut_coul_long_soft_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_cut_coul_msm_omp.cpp b/src/USER-OMP/pair_lj_cut_coul_msm_omp.cpp
index fba8f552db565aa9df09c1e9eb176f31111ea5c1..234204af93f362a5d81ecbf888b9cffa587d0aab 100644
--- a/src/USER-OMP/pair_lj_cut_coul_msm_omp.cpp
+++ b/src/USER-OMP/pair_lj_cut_coul_msm_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cut_coul_msm_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_cut_coul_wolf_omp.cpp b/src/USER-OMP/pair_lj_cut_coul_wolf_omp.cpp
index 51574b2ee7d884f768ddd8635116bd0df842829a..36ef9d54f970741f0ab6638ca6d5d57c5b19528f 100644
--- a/src/USER-OMP/pair_lj_cut_coul_wolf_omp.cpp
+++ b/src/USER-OMP/pair_lj_cut_coul_wolf_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cut_coul_wolf_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_cut_dipole_cut_omp.cpp b/src/USER-OMP/pair_lj_cut_dipole_cut_omp.cpp
index d9fd7ac72e1473389642ae650a77a480d794e1a9..d4145d98350c1890ca15ff869a880062471eb3ca 100644
--- a/src/USER-OMP/pair_lj_cut_dipole_cut_omp.cpp
+++ b/src/USER-OMP/pair_lj_cut_dipole_cut_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cut_dipole_cut_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_cut_omp.cpp b/src/USER-OMP/pair_lj_cut_omp.cpp
index 34754975fb53f14de1997ebabfe165c05f86425c..319257b56b7f1800fd32c3624468b8cbaa08cb45 100644
--- a/src/USER-OMP/pair_lj_cut_omp.cpp
+++ b/src/USER-OMP/pair_lj_cut_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cut_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_cut_soft_omp.cpp b/src/USER-OMP/pair_lj_cut_soft_omp.cpp
index 9147b9aa1c9e811d7fae59dc6bcdd3af1d1950be..7698f19b9512400e06c726be454c62c7df58805f 100644
--- a/src/USER-OMP/pair_lj_cut_soft_omp.cpp
+++ b/src/USER-OMP/pair_lj_cut_soft_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cut_soft_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_cut_thole_long_omp.cpp b/src/USER-OMP/pair_lj_cut_thole_long_omp.cpp
index 110b8917cf07366b02aa0eeda1b99daeaffbe99a..536d5bcb863d7a0bfe2413caa750c59b9f7129fd 100644
--- a/src/USER-OMP/pair_lj_cut_thole_long_omp.cpp
+++ b/src/USER-OMP/pair_lj_cut_thole_long_omp.cpp
@@ -15,10 +15,10 @@
    Contributing author: Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_thole_long_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_cut_tip4p_cut_omp.cpp b/src/USER-OMP/pair_lj_cut_tip4p_cut_omp.cpp
index 45797b289742084081cc6c874450859c48f3c441..619e970bb0035231a8e7a02dab09dd74ad22d09d 100644
--- a/src/USER-OMP/pair_lj_cut_tip4p_cut_omp.cpp
+++ b/src/USER-OMP/pair_lj_cut_tip4p_cut_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cut_tip4p_cut_omp.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/USER-OMP/pair_lj_cut_tip4p_long_omp.cpp b/src/USER-OMP/pair_lj_cut_tip4p_long_omp.cpp
index d05b13cd10765b977adfbeff070f42a8e0e8ba63..ca8f450dc6b4f8371ad6e24bf0504890869ae6bf 100644
--- a/src/USER-OMP/pair_lj_cut_tip4p_long_omp.cpp
+++ b/src/USER-OMP/pair_lj_cut_tip4p_long_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cut_tip4p_long_omp.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/USER-OMP/pair_lj_cut_tip4p_long_soft_omp.cpp b/src/USER-OMP/pair_lj_cut_tip4p_long_soft_omp.cpp
index b31c1c109b632d45e4a572000cc41d97bd0d6007..80b17fba96e6e81e0ba9ba34cb1450c37b478efc 100644
--- a/src/USER-OMP/pair_lj_cut_tip4p_long_soft_omp.cpp
+++ b/src/USER-OMP/pair_lj_cut_tip4p_long_soft_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_cut_tip4p_long_soft_omp.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/USER-OMP/pair_lj_expand_omp.cpp b/src/USER-OMP/pair_lj_expand_omp.cpp
index e0f64e471e46285511b3ac403a64ec02c12a0b36..064ea97809a791ccf77089ee9dba75b63c18d226 100644
--- a/src/USER-OMP/pair_lj_expand_omp.cpp
+++ b/src/USER-OMP/pair_lj_expand_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_expand_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_gromacs_coul_gromacs_omp.cpp b/src/USER-OMP/pair_lj_gromacs_coul_gromacs_omp.cpp
index 954fbe7cce751ce4036b022ae18c9b2c35994077..c87f369d115b499565ba3efd32f05a79627510a9 100644
--- a/src/USER-OMP/pair_lj_gromacs_coul_gromacs_omp.cpp
+++ b/src/USER-OMP/pair_lj_gromacs_coul_gromacs_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_gromacs_coul_gromacs_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_gromacs_omp.cpp b/src/USER-OMP/pair_lj_gromacs_omp.cpp
index 84c46886e10ec43c4dba2e3ed10508dca5c1cdfc..1d7cec5eef768425ed4d44ffb8d45d4e52b84af6 100644
--- a/src/USER-OMP/pair_lj_gromacs_omp.cpp
+++ b/src/USER-OMP/pair_lj_gromacs_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_gromacs_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_long_coul_long_omp.cpp b/src/USER-OMP/pair_lj_long_coul_long_omp.cpp
index 8cc4c95fc24f2cbd8584b816e5f6cc061a8810b8..0afc230e92c54c40f1a7578353ee367a80ef82b2 100644
--- a/src/USER-OMP/pair_lj_long_coul_long_omp.cpp
+++ b/src/USER-OMP/pair_lj_long_coul_long_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_long_coul_long_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_long_tip4p_long_omp.cpp b/src/USER-OMP/pair_lj_long_tip4p_long_omp.cpp
index f4b5071afbfe8eaadad74691d2bc113023223e02..8c0d72c74180a5dc61a32f6da8576196c5ee825e 100644
--- a/src/USER-OMP/pair_lj_long_tip4p_long_omp.cpp
+++ b/src/USER-OMP/pair_lj_long_tip4p_long_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_long_tip4p_long_omp.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/USER-OMP/pair_lj_sdk_coul_long_omp.cpp b/src/USER-OMP/pair_lj_sdk_coul_long_omp.cpp
index f388009bd808d12d6c6243bd6862fa38f1ec2328..c87f26204e8610114d5c6221278ec437b0ced1cd 100644
--- a/src/USER-OMP/pair_lj_sdk_coul_long_omp.cpp
+++ b/src/USER-OMP/pair_lj_sdk_coul_long_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_sdk_coul_long_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_sdk_coul_msm_omp.cpp b/src/USER-OMP/pair_lj_sdk_coul_msm_omp.cpp
index 9d991d5812ea7a1f88d929be5d2ac3b03c9dbf64..8ff0cfe9211f0221c106715ed4d6e264b64c7f50 100644
--- a/src/USER-OMP/pair_lj_sdk_coul_msm_omp.cpp
+++ b/src/USER-OMP/pair_lj_sdk_coul_msm_omp.cpp
@@ -13,7 +13,7 @@
    This style is a simplified re-implementation of the CG/CMM pair style
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_sdk_coul_msm_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_sdk_omp.cpp b/src/USER-OMP/pair_lj_sdk_omp.cpp
index 36e170046dbe45512fc843b4ec0ae69b802391a2..e107399316bdc80b0288f96cdcc943c41f00395e 100644
--- a/src/USER-OMP/pair_lj_sdk_omp.cpp
+++ b/src/USER-OMP/pair_lj_sdk_omp.cpp
@@ -13,7 +13,7 @@
    This style is a simplified re-implementation of the CG/CMM pair style
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_sdk_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_sf_dipole_sf_omp.cpp b/src/USER-OMP/pair_lj_sf_dipole_sf_omp.cpp
index 29250b09f4682b04ebe07720f9e9d7a19406b61f..250f6ff27214b4412935af0579c532165a504484 100644
--- a/src/USER-OMP/pair_lj_sf_dipole_sf_omp.cpp
+++ b/src/USER-OMP/pair_lj_sf_dipole_sf_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_sf_dipole_sf_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_smooth_linear_omp.cpp b/src/USER-OMP/pair_lj_smooth_linear_omp.cpp
index 9017ac740fb8d6ac6070b6295089898643bf31ca..b06de641f5b58337ec5d3e41f05ff4d61cd241e4 100644
--- a/src/USER-OMP/pair_lj_smooth_linear_omp.cpp
+++ b/src/USER-OMP/pair_lj_smooth_linear_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_smooth_linear_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lj_smooth_omp.cpp b/src/USER-OMP/pair_lj_smooth_omp.cpp
index 9bf15035bdce3604c09739d3cd0a4c43de434cf9..36935616bfdc5952cc77ef36fbc0958d80705f82 100644
--- a/src/USER-OMP/pair_lj_smooth_omp.cpp
+++ b/src/USER-OMP/pair_lj_smooth_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lj_smooth_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lubricate_omp.cpp b/src/USER-OMP/pair_lubricate_omp.cpp
index 1c622f5641035b743b3be6c08f6b7cebf13ea160..fbfc24769b73dfddd3853ec77a42530d328a5384 100644
--- a/src/USER-OMP/pair_lubricate_omp.cpp
+++ b/src/USER-OMP/pair_lubricate_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lubricate_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_lubricate_poly_omp.cpp b/src/USER-OMP/pair_lubricate_poly_omp.cpp
index 2e7140e32bc96eee7d92c579865eab434bb1c094..825b3e8d705286ed254078ceca8dcd4fddbea070 100644
--- a/src/USER-OMP/pair_lubricate_poly_omp.cpp
+++ b/src/USER-OMP/pair_lubricate_poly_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_lubricate_poly_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_meam_spline_omp.cpp b/src/USER-OMP/pair_meam_spline_omp.cpp
index 4333d3b2a94ef8bc30d2aa2abef069041c07f584..dfc3b978a29f0a06665cfe4bbbbd35ef64dc03be 100644
--- a/src/USER-OMP/pair_meam_spline_omp.cpp
+++ b/src/USER-OMP/pair_meam_spline_omp.cpp
@@ -12,8 +12,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 
 #include "pair_meam_spline_omp.h"
 #include "atom.h"
diff --git a/src/USER-OMP/pair_morse_omp.cpp b/src/USER-OMP/pair_morse_omp.cpp
index 8aca4ef98f6c1ba0f939e54e198ad66134523fa3..922b67b46344335df4daad06d332ab973da72fb2 100644
--- a/src/USER-OMP/pair_morse_omp.cpp
+++ b/src/USER-OMP/pair_morse_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_morse_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_morse_smooth_linear_omp.cpp b/src/USER-OMP/pair_morse_smooth_linear_omp.cpp
index 113f6f2a02d57d081a31c43dbd800c7c330394a4..61cef69c377f3b706d59537c61d123a2640a2c43 100644
--- a/src/USER-OMP/pair_morse_smooth_linear_omp.cpp
+++ b/src/USER-OMP/pair_morse_smooth_linear_omp.cpp
@@ -13,7 +13,7 @@
    Most code borrowed from pair_morse_omp.cpp
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_morse_smooth_linear_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_nb3b_harmonic_omp.cpp b/src/USER-OMP/pair_nb3b_harmonic_omp.cpp
index 199cbc93371b464c80626eef1b3b9d1438ff9ffa..2ab96c43a0c8d2e6c056365ea771f5a6392d7e30 100644
--- a/src/USER-OMP/pair_nb3b_harmonic_omp.cpp
+++ b/src/USER-OMP/pair_nb3b_harmonic_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_nb3b_harmonic_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_nm_cut_coul_cut_omp.cpp b/src/USER-OMP/pair_nm_cut_coul_cut_omp.cpp
index 38af84d1f73775b6de427ee960f7d7097c653632..fcbf5dbabbab67f3a8c8117f31e36928d9c911ca 100644
--- a/src/USER-OMP/pair_nm_cut_coul_cut_omp.cpp
+++ b/src/USER-OMP/pair_nm_cut_coul_cut_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_nm_cut_coul_cut_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_nm_cut_coul_long_omp.cpp b/src/USER-OMP/pair_nm_cut_coul_long_omp.cpp
index bbcdfb26c3c20c377002ae553a1eae47ec8d43c3..b31387dbfe0104fca9e582c6f169be4dab3c0b71 100644
--- a/src/USER-OMP/pair_nm_cut_coul_long_omp.cpp
+++ b/src/USER-OMP/pair_nm_cut_coul_long_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_nm_cut_coul_long_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_nm_cut_omp.cpp b/src/USER-OMP/pair_nm_cut_omp.cpp
index ea2d0fa7f5c7a368f3c117d1dfe91037e77b0ade..79cd0463114d5291bdcaa4c961f704c7ffe24428 100644
--- a/src/USER-OMP/pair_nm_cut_omp.cpp
+++ b/src/USER-OMP/pair_nm_cut_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_nm_cut_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_peri_lps_omp.cpp b/src/USER-OMP/pair_peri_lps_omp.cpp
index a471b47750ee7416ee494bee23fefba69554db20..7b174face743fedae1e6e6ef0949e39e4d1d60ee 100644
--- a/src/USER-OMP/pair_peri_lps_omp.cpp
+++ b/src/USER-OMP/pair_peri_lps_omp.cpp
@@ -12,8 +12,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <float.h>
+#include <cmath>
+#include <cfloat>
 #include "pair_peri_lps_omp.h"
 #include "fix.h"
 #include "fix_peri_neigh.h"
diff --git a/src/USER-OMP/pair_peri_pmb_omp.cpp b/src/USER-OMP/pair_peri_pmb_omp.cpp
index 1c14ff753cf8e57820f04642bb0659b9798a960b..8199d8aa47a0d474aa558402b7e462f3c994ec9a 100644
--- a/src/USER-OMP/pair_peri_pmb_omp.cpp
+++ b/src/USER-OMP/pair_peri_pmb_omp.cpp
@@ -12,8 +12,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <float.h>
+#include <cmath>
+#include <cfloat>
 #include "pair_peri_pmb_omp.h"
 #include "fix.h"
 #include "fix_peri_neigh.h"
diff --git a/src/USER-OMP/pair_resquared_omp.cpp b/src/USER-OMP/pair_resquared_omp.cpp
index a1364133d005b1ac51368a0ee4726c12e6c39e58..1736e794f55b7621f29d852e867307581238a38b 100644
--- a/src/USER-OMP/pair_resquared_omp.cpp
+++ b/src/USER-OMP/pair_resquared_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_resquared_omp.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/USER-OMP/pair_soft_omp.cpp b/src/USER-OMP/pair_soft_omp.cpp
index 9a926652a853d12a0e2fef51ddfb03c19b889359..a860ad97d96af326aa602bf8dd7c06ee4eea9132 100644
--- a/src/USER-OMP/pair_soft_omp.cpp
+++ b/src/USER-OMP/pair_soft_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_soft_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_sw_omp.cpp b/src/USER-OMP/pair_sw_omp.cpp
index 9a63b4f4394846b09988a22ab2f55e00cb05d049..e323fc4c373a4882f586297d19b56b9e92e63f11 100644
--- a/src/USER-OMP/pair_sw_omp.cpp
+++ b/src/USER-OMP/pair_sw_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_sw_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_table_omp.cpp b/src/USER-OMP/pair_table_omp.cpp
index d584061648a2188530003bac065c27a06886c8b9..d27456e1b58f834193924cb70adb64dc5db66d4d 100644
--- a/src/USER-OMP/pair_table_omp.cpp
+++ b/src/USER-OMP/pair_table_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_table_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_tersoff_mod_c_omp.cpp b/src/USER-OMP/pair_tersoff_mod_c_omp.cpp
index 340eb3ebc5aa1f098cf87c84a87e72ac2f99ce79..fad077ca125a69617372f1b53eac0e2c013adf7e 100644
--- a/src/USER-OMP/pair_tersoff_mod_c_omp.cpp
+++ b/src/USER-OMP/pair_tersoff_mod_c_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_tersoff_mod_c_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_tersoff_mod_omp.cpp b/src/USER-OMP/pair_tersoff_mod_omp.cpp
index 403a61147beab5136ca5ff773061cb5948aeefcf..04e54c6e698707431c1ed80ae4d8d795a0158fd2 100644
--- a/src/USER-OMP/pair_tersoff_mod_omp.cpp
+++ b/src/USER-OMP/pair_tersoff_mod_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_tersoff_mod_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_tersoff_omp.cpp b/src/USER-OMP/pair_tersoff_omp.cpp
index db249b4ba907cd3afb78333141b2137a084504ff..a5afdc7509ab4944ad4b3a7e7a46ef70716f2cc0 100644
--- a/src/USER-OMP/pair_tersoff_omp.cpp
+++ b/src/USER-OMP/pair_tersoff_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_tersoff_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_tersoff_table_omp.cpp b/src/USER-OMP/pair_tersoff_table_omp.cpp
index 9de9ee57086c03d411c83c5be8ec684b6c6f1375..de045f9c622c63de9db428170a476f6543816529 100644
--- a/src/USER-OMP/pair_tersoff_table_omp.cpp
+++ b/src/USER-OMP/pair_tersoff_table_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_tersoff_table_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_tersoff_zbl_omp.cpp b/src/USER-OMP/pair_tersoff_zbl_omp.cpp
index f53778d1a13fe7d46b1fcfd7659cdc0e52fc1e83..ce3e6fea75320dcae3e5884df13a1b23efd8661f 100644
--- a/src/USER-OMP/pair_tersoff_zbl_omp.cpp
+++ b/src/USER-OMP/pair_tersoff_zbl_omp.cpp
@@ -16,10 +16,10 @@
                         David Farrell (NWU) - ZBL addition
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_tersoff_zbl_omp.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-OMP/pair_tip4p_cut_omp.cpp b/src/USER-OMP/pair_tip4p_cut_omp.cpp
index c3662ad642a1f1883012e5189d32b09931eef662..85589cf043c231c24f0b4a69092f69d994fc8128 100644
--- a/src/USER-OMP/pair_tip4p_cut_omp.cpp
+++ b/src/USER-OMP/pair_tip4p_cut_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_tip4p_cut_omp.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/USER-OMP/pair_tip4p_long_omp.cpp b/src/USER-OMP/pair_tip4p_long_omp.cpp
index bcd8659a54ce50e2b65a6406954e665fbe5c4801..c6c4bfe5fc953294db71ed8ea5d476e1d3855e0a 100644
--- a/src/USER-OMP/pair_tip4p_long_omp.cpp
+++ b/src/USER-OMP/pair_tip4p_long_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_tip4p_long_omp.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/USER-OMP/pair_tip4p_long_soft_omp.cpp b/src/USER-OMP/pair_tip4p_long_soft_omp.cpp
index 2f16a28b8c00ad5cedd94f84fe859da7c1cd27e8..7e9d3b6dff84c37f556f4ee6980a009bc6f3dc1b 100644
--- a/src/USER-OMP/pair_tip4p_long_soft_omp.cpp
+++ b/src/USER-OMP/pair_tip4p_long_soft_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_tip4p_long_soft_omp.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/USER-OMP/pair_ufm_omp.cpp b/src/USER-OMP/pair_ufm_omp.cpp
index b2e2cd29ee9026a9647bc825ef9dd63a1825dc79..ff258b5b3b8af8404f693c02ce452e2d5917d653 100644
--- a/src/USER-OMP/pair_ufm_omp.cpp
+++ b/src/USER-OMP/pair_ufm_omp.cpp
@@ -14,7 +14,7 @@
             Maurice de Koning (Unicamp/Brazil) - dekoning@ifi.unicamp.br
  ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_ufm_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_vashishta_omp.cpp b/src/USER-OMP/pair_vashishta_omp.cpp
index c432738f6239e5079e2298b3055efdf5be0be217..194a3e2d86acb67b99ed0cdab2e644d3b936637b 100644
--- a/src/USER-OMP/pair_vashishta_omp.cpp
+++ b/src/USER-OMP/pair_vashishta_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_vashishta_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_vashishta_table_omp.cpp b/src/USER-OMP/pair_vashishta_table_omp.cpp
index d2298dca09d1a6bcec326c7eb4638ecd8a2038c2..e0d96d8bb6573a1bf00652996ed62e8fd07c0d3b 100644
--- a/src/USER-OMP/pair_vashishta_table_omp.cpp
+++ b/src/USER-OMP/pair_vashishta_table_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_vashishta_table_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_yukawa_colloid_omp.cpp b/src/USER-OMP/pair_yukawa_colloid_omp.cpp
index cc05fc91559893e02418f4e902317ebba82117c5..c1d2133a1ca585fc42650f17ae1005ec8a47570b 100644
--- a/src/USER-OMP/pair_yukawa_colloid_omp.cpp
+++ b/src/USER-OMP/pair_yukawa_colloid_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_yukawa_colloid_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_yukawa_omp.cpp b/src/USER-OMP/pair_yukawa_omp.cpp
index c705446f052710f3468139c9c7dba5fac709e10a..cbfd627f9789bdbfaba49b7c2226ec189b292735 100644
--- a/src/USER-OMP/pair_yukawa_omp.cpp
+++ b/src/USER-OMP/pair_yukawa_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_yukawa_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pair_zbl_omp.cpp b/src/USER-OMP/pair_zbl_omp.cpp
index 1d69487eb2d65639993ea0005764e6cc0e3393cd..788679434bd60b28e0dea8e1f5368e2b1936e31d 100644
--- a/src/USER-OMP/pair_zbl_omp.cpp
+++ b/src/USER-OMP/pair_zbl_omp.cpp
@@ -12,7 +12,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_zbl_omp.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-OMP/pppm_cg_omp.cpp b/src/USER-OMP/pppm_cg_omp.cpp
index eb230a3bb479c8314b80b11fab6284ff415f6809..990c50932ea9a5ae86824a35142d0870de233f65 100644
--- a/src/USER-OMP/pppm_cg_omp.cpp
+++ b/src/USER-OMP/pppm_cg_omp.cpp
@@ -15,6 +15,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
+#include <cstring>
+#include <cmath>
 #include "pppm_cg_omp.h"
 #include "atom.h"
 #include "comm.h"
@@ -27,9 +29,6 @@
 #include "math_const.h"
 #include "math_special.h"
 
-#include <string.h>
-#include <math.h>
-
 #include "suffix.h"
 using namespace LAMMPS_NS;
 using namespace MathConst;
diff --git a/src/USER-OMP/pppm_disp_omp.cpp b/src/USER-OMP/pppm_disp_omp.cpp
index 74881c9a8ad75ff7f084e07f291125a31c797ade..97bb909a2c546263d248ba9e62cd4637921b7f7e 100644
--- a/src/USER-OMP/pppm_disp_omp.cpp
+++ b/src/USER-OMP/pppm_disp_omp.cpp
@@ -16,6 +16,8 @@
                          Rolf Isele-Holder (RWTH Aachen University)
 ------------------------------------------------------------------------- */
 
+#include <cstring>
+#include <cmath>
 #include "pppm_disp_omp.h"
 #include "atom.h"
 #include "comm.h"
@@ -24,9 +26,6 @@
 #include "memory.h"
 #include "math_const.h"
 
-#include <string.h>
-#include <math.h>
-
 #include "suffix.h"
 using namespace LAMMPS_NS;
 using namespace MathConst;
@@ -358,7 +357,7 @@ void PPPMDispOMP::particle_map(double dxinv, double dyinv,
   const int nyhi_out = nyhi_o;
   const int nzhi_out = nzhi_o;
 
-  if (!ISFINITE(boxlo[0]) || !ISFINITE(boxlo[1]) || !ISFINITE(boxlo[2]))
+  if (!std::isfinite(boxlo[0]) || !std::isfinite(boxlo[1]) || !std::isfinite(boxlo[2]))
     error->one(FLERR,"Non-numeric box dimensions. Simulation unstable.");
 
   int i, flag = 0;
diff --git a/src/USER-OMP/pppm_disp_tip4p_omp.cpp b/src/USER-OMP/pppm_disp_tip4p_omp.cpp
index 49e3681f6ee63357ca1bab5cebf1a86cd988e3e7..2f7fbbea550f3dcf373a8878d2d2b0ab8eb74820 100644
--- a/src/USER-OMP/pppm_disp_tip4p_omp.cpp
+++ b/src/USER-OMP/pppm_disp_tip4p_omp.cpp
@@ -15,6 +15,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
+#include <cstring>
+#include <cmath>
 #include "pppm_disp_tip4p_omp.h"
 #include "atom.h"
 #include "comm.h"
@@ -26,9 +28,6 @@
 #include "math_const.h"
 #include "math_special.h"
 
-#include <string.h>
-#include <math.h>
-
 #include "suffix.h"
 using namespace LAMMPS_NS;
 using namespace MathConst;
@@ -355,7 +354,7 @@ void PPPMDispTIP4POMP::particle_map_c(double dxinv, double dyinv,
   const int nyhi_out = nyhi_o;
   const int nzhi_out = nzhi_o;
 
-  if (!ISFINITE(boxlo[0]) || !ISFINITE(boxlo[1]) || !ISFINITE(boxlo[2]))
+  if (!std::isfinite(boxlo[0]) || !std::isfinite(boxlo[1]) || !std::isfinite(boxlo[2]))
     error->one(FLERR,"Non-numeric box dimensions - simulation unstable");
 
   int i, flag = 0;
diff --git a/src/USER-OMP/pppm_omp.cpp b/src/USER-OMP/pppm_omp.cpp
index ef03ef1bba65473739af3404a922a22425655dda..e9c24a000c7727247807ca36a995de47146afb3d 100644
--- a/src/USER-OMP/pppm_omp.cpp
+++ b/src/USER-OMP/pppm_omp.cpp
@@ -15,6 +15,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
+#include <cstring>
+#include <cmath>
 #include "pppm_omp.h"
 #include "atom.h"
 #include "comm.h"
@@ -26,9 +28,6 @@
 #include "math_const.h"
 #include "math_special.h"
 
-#include <string.h>
-#include <math.h>
-
 #include "suffix.h"
 using namespace LAMMPS_NS;
 using namespace MathConst;
diff --git a/src/USER-OMP/pppm_tip4p_omp.cpp b/src/USER-OMP/pppm_tip4p_omp.cpp
index f9733ed95b9827430b459e9fc6742bf54a26477a..29966216da633de31c2d92537f778553647bf785 100644
--- a/src/USER-OMP/pppm_tip4p_omp.cpp
+++ b/src/USER-OMP/pppm_tip4p_omp.cpp
@@ -15,6 +15,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
+#include <cstring>
+#include <cmath>
 #include "pppm_tip4p_omp.h"
 #include "atom.h"
 #include "comm.h"
@@ -26,9 +28,6 @@
 #include "math_const.h"
 #include "math_special.h"
 
-#include <string.h>
-#include <math.h>
-
 #include "suffix.h"
 using namespace LAMMPS_NS;
 using namespace MathConst;
@@ -348,7 +347,7 @@ void PPPMTIP4POMP::particle_map()
   const double boxloz = boxlo[2];
   const int nlocal = atom->nlocal;
 
-  if (!ISFINITE(boxlo[0]) || !ISFINITE(boxlo[1]) || !ISFINITE(boxlo[2]))
+  if (!std::isfinite(boxlo[0]) || !std::isfinite(boxlo[1]) || !std::isfinite(boxlo[2]))
     error->one(FLERR,"Non-numeric box dimensions - simulation unstable");
 
   int i, flag = 0;
diff --git a/src/USER-OMP/respa_omp.cpp b/src/USER-OMP/respa_omp.cpp
index d4fa529b1c22efbc1d64a69577c86e66a1dbd143..9c8555c66d6d12dfe2c0ca448d3b90a19bc5b332 100644
--- a/src/USER-OMP/respa_omp.cpp
+++ b/src/USER-OMP/respa_omp.cpp
@@ -15,8 +15,8 @@
    Contributing authors: Mark Stevens (SNL), Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "respa_omp.h"
 #include "neighbor.h"
 #include "domain.h"
diff --git a/src/USER-OMP/thr_data.cpp b/src/USER-OMP/thr_data.cpp
index 9d0b657b302452a290fba1d3437b705823c651c9..612c36053cd9a12b66155fe1d9951106dd6b1f2a 100644
--- a/src/USER-OMP/thr_data.cpp
+++ b/src/USER-OMP/thr_data.cpp
@@ -16,10 +16,10 @@
    per-thread data management for LAMMPS
 ------------------------------------------------------------------------- */
 
-#include "thr_data.h"
+#include <cstring>
+#include <cstdio>
 
-#include <string.h>
-#include <stdio.h>
+#include "thr_data.h"
 
 #include "memory.h"
 #include "timer.h"
diff --git a/src/USER-OMP/thr_omp.cpp b/src/USER-OMP/thr_omp.cpp
index 4eaf09fb9a9568209778131e1ea22ca96502b0cb..22f751e6c0f99fb839632e25e8b72f08d60aacfb 100644
--- a/src/USER-OMP/thr_omp.cpp
+++ b/src/USER-OMP/thr_omp.cpp
@@ -16,6 +16,8 @@
    OpenMP based threading support for LAMMPS
 ------------------------------------------------------------------------- */
 
+#include <cstring>
+
 #include "atom.h"
 #include "comm.h"
 #include "error.h"
@@ -37,8 +39,6 @@
 
 #include "math_const.h"
 
-#include <string.h>
-
 using namespace LAMMPS_NS;
 using namespace MathConst;
 
diff --git a/src/USER-PHONON/fix_phonon.cpp b/src/USER-PHONON/fix_phonon.cpp
index a0fa614eca8eba0dec0d404c2c5dbb75ec65d965..cf561178926cb00be0740eb5fd7348d7243286e7 100644
--- a/src/USER-PHONON/fix_phonon.cpp
+++ b/src/USER-PHONON/fix_phonon.cpp
@@ -23,9 +23,9 @@
      konglt@sjtu.edu.cn; konglt@gmail.com
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "fix_phonon.h"
 #include "fft3d_wrap.h"
 #include "atom.h"
diff --git a/src/USER-QMMM/fix_qmmm.cpp b/src/USER-QMMM/fix_qmmm.cpp
index 7fae85f7df4aecfc2b1ed2197388ff14a0f8c82d..f1a34d95380b751e437d052ca13dc25e099856f9 100644
--- a/src/USER-QMMM/fix_qmmm.cpp
+++ b/src/USER-QMMM/fix_qmmm.cpp
@@ -15,6 +15,8 @@
    Contributing author:  Axel Kohlmeyer (ICTP)
 ------------------------------------------------------------------------- */
 
+#include <cstdlib>
+#include <cstring>
 #include "fix_qmmm.h"
 #include "atom.h"
 #include "domain.h"
@@ -25,9 +27,6 @@
 #include "group.h"
 #include "memory.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 #include "libqmmm.h"
 
 // message tags for QM/MM inter communicator communication
diff --git a/src/USER-QTB/fix_qbmsst.cpp b/src/USER-QTB/fix_qbmsst.cpp
index 21ae464e10ede952c5eaf7d0f32ef0adb08b415a..fa5ee75bcb8852fb6ea3e24f229d0ffdd1bb8812 100644
--- a/src/USER-QTB/fix_qbmsst.cpp
+++ b/src/USER-QTB/fix_qbmsst.cpp
@@ -17,9 +17,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_qbmsst.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/USER-QTB/fix_qtb.cpp b/src/USER-QTB/fix_qtb.cpp
index 98dd498088ef93d49d7d5a6142ecda88013ed018..7f9a6510bed1d6223d5afa71863f14fb24c91664 100644
--- a/src/USER-QTB/fix_qtb.cpp
+++ b/src/USER-QTB/fix_qtb.cpp
@@ -17,9 +17,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_qtb.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/USER-QUIP/pair_quip.cpp b/src/USER-QUIP/pair_quip.cpp
index 6bbbcdb8e62375dac19f5d4b6489ac21e11bccd9..f8968bfda2ca289c7375f3a39645d5cdc161f096 100644
--- a/src/USER-QUIP/pair_quip.cpp
+++ b/src/USER-QUIP/pair_quip.cpp
@@ -17,10 +17,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_quip.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-REAXC/compute_spec_atom.cpp b/src/USER-REAXC/compute_spec_atom.cpp
index e913225492a08bcf545f4ed43ba9861a33478022..77b82b3e5514cf75a7e15f3a26f9a01ba2b63a85 100644
--- a/src/USER-REAXC/compute_spec_atom.cpp
+++ b/src/USER-REAXC/compute_spec_atom.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "compute_spec_atom.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/USER-REAXC/fix_qeq_reax.cpp b/src/USER-REAXC/fix_qeq_reax.cpp
index 326af7505abaf10ccde5f82be949ff7a93e5aff6..a2f4d3d0e936c70674d1340e2c883cbb3a0c79be 100644
--- a/src/USER-REAXC/fix_qeq_reax.cpp
+++ b/src/USER-REAXC/fix_qeq_reax.cpp
@@ -18,10 +18,10 @@
      Hybrid and sub-group capabilities: Ray Shan (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "fix_qeq_reax.h"
 #include "pair_reaxc.h"
 #include "atom.h"
diff --git a/src/USER-REAXC/fix_reaxc_bonds.cpp b/src/USER-REAXC/fix_reaxc_bonds.cpp
index 09ca132635e83fde5bd95608a37db3fa71838d86..b38d137412b16d18130ed32dcaf82cd0ead7ab94 100644
--- a/src/USER-REAXC/fix_reaxc_bonds.cpp
+++ b/src/USER-REAXC/fix_reaxc_bonds.cpp
@@ -15,8 +15,8 @@
    Contributing author: Ray Shan (Sandia, tnshan@sandia.gov)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_ave_atom.h"
 #include "fix_reaxc_bonds.h"
 #include "atom.h"
diff --git a/src/USER-REAXC/fix_reaxc_bonds.h b/src/USER-REAXC/fix_reaxc_bonds.h
index e1dcd82c0e43ed96323668a918dfd9259e05939e..d72f5446b5141a7c701f527cc0f67c1e32524a8e 100644
--- a/src/USER-REAXC/fix_reaxc_bonds.h
+++ b/src/USER-REAXC/fix_reaxc_bonds.h
@@ -20,7 +20,7 @@ FixStyle(reax/c/bonds,FixReaxCBonds)
 #ifndef LMP_FIX_REAXC_BONDS_H
 #define LMP_FIX_REAXC_BONDS_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 #include "pointers.h"
 
diff --git a/src/USER-REAXC/fix_reaxc_species.cpp b/src/USER-REAXC/fix_reaxc_species.cpp
index 181c9bcd31763b1366c311d71d962c0c6367ed22..61b4cebf966592ff2a8a73ce708647d639ac8951 100644
--- a/src/USER-REAXC/fix_reaxc_species.cpp
+++ b/src/USER-REAXC/fix_reaxc_species.cpp
@@ -16,12 +16,12 @@
                          Oleg Sergeev (VNIIA, sergeev@vniia.ru)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <math.h>
-#include "atom.h"
-#include <string.h>
+#include <cstdlib>
+#include <cmath>
+#include <cstring>
 #include "fix_ave_atom.h"
 #include "fix_reaxc_species.h"
+#include "atom.h"
 #include "domain.h"
 #include "update.h"
 #include "pair_reaxc.h"
diff --git a/src/USER-REAXC/reaxc_types.h b/src/USER-REAXC/reaxc_types.h
index fb1a9a853a7cc908347813a9d34336a82984a775..2666fcf85c80290f72fdca63921479448f488549 100644
--- a/src/USER-REAXC/reaxc_types.h
+++ b/src/USER-REAXC/reaxc_types.h
@@ -27,20 +27,20 @@
 #ifndef __REAX_TYPES_H_
 #define __REAX_TYPES_H_
 
+#include <mpi.h>
 #include "lmptype.h"
 
-#include <ctype.h>
-#include <math.h>
-#include <mpi.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "sys/time.h"
-#include <time.h>
+#include <cctype>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
+#include <sys/time.h>
 #include "accelerator_kokkos.h"
 
 #if defined LMP_USER_OMP
-#define OMP_TIMING 1
+#define OMP_TIMING 0
 
 #ifdef OMP_TIMING
 // pkcoff timing fields
diff --git a/src/USER-SMD/atom_vec_smd.cpp b/src/USER-SMD/atom_vec_smd.cpp
index ca38ca7ab5d1b2c6bde35c9468a7cdbcbabac6cb..e99f3c51694eb609944461f44a495bca88187e1e 100644
--- a/src/USER-SMD/atom_vec_smd.cpp
+++ b/src/USER-SMD/atom_vec_smd.cpp
@@ -22,9 +22,9 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "atom_vec_smd.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-SMD/compute_smd_contact_radius.cpp b/src/USER-SMD/compute_smd_contact_radius.cpp
index 991b1a2e674316d4b832aafaa60d620e40e8012d..8193ad6ccf4cf1e92c3875ed8276e1ad0cfb010b 100644
--- a/src/USER-SMD/compute_smd_contact_radius.cpp
+++ b/src/USER-SMD/compute_smd_contact_radius.cpp
@@ -23,7 +23,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_smd_contact_radius.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-SMD/compute_smd_damage.cpp b/src/USER-SMD/compute_smd_damage.cpp
index 7cb4d2b4b8dac1608091c72789d4456b404641d7..9603fd5c64c299ef1c89a48e66da913913328d2e 100644
--- a/src/USER-SMD/compute_smd_damage.cpp
+++ b/src/USER-SMD/compute_smd_damage.cpp
@@ -23,7 +23,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_smd_damage.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-SMD/compute_smd_hourglass_error.cpp b/src/USER-SMD/compute_smd_hourglass_error.cpp
index 1502f7ccb5ab8aa6d73840788d1c0f20c86cde7e..3b6b9000048b84ec3637e3325d27c9f58b34ce11 100644
--- a/src/USER-SMD/compute_smd_hourglass_error.cpp
+++ b/src/USER-SMD/compute_smd_hourglass_error.cpp
@@ -23,7 +23,7 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_smd_hourglass_error.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-SMD/compute_smd_internal_energy.cpp b/src/USER-SMD/compute_smd_internal_energy.cpp
index aabaa8906cb1bf8c7ca5a2be75f9963d98230af2..d937aa98a42a1d3e1079fd54b9bfe36ec5a98ec4 100644
--- a/src/USER-SMD/compute_smd_internal_energy.cpp
+++ b/src/USER-SMD/compute_smd_internal_energy.cpp
@@ -23,7 +23,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_smd_internal_energy.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-SMD/compute_smd_plastic_strain.cpp b/src/USER-SMD/compute_smd_plastic_strain.cpp
index 86a5c6329f3a351e51f880473b7443dfb6446416..67466ebb72cd97ea1769d81849fdc56de5457c88 100644
--- a/src/USER-SMD/compute_smd_plastic_strain.cpp
+++ b/src/USER-SMD/compute_smd_plastic_strain.cpp
@@ -23,7 +23,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_smd_plastic_strain.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-SMD/compute_smd_plastic_strain_rate.cpp b/src/USER-SMD/compute_smd_plastic_strain_rate.cpp
index 899e456c8883623f2812de8a207dadb60e69d2e9..20dfa64edd2c3762c067c54799a70746d5727354 100644
--- a/src/USER-SMD/compute_smd_plastic_strain_rate.cpp
+++ b/src/USER-SMD/compute_smd_plastic_strain_rate.cpp
@@ -23,7 +23,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_smd_plastic_strain_rate.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-SMD/compute_smd_rho.cpp b/src/USER-SMD/compute_smd_rho.cpp
index cb97755aca6c8547c73027696adddca12414ffba..5c78e604b6639428ca6d088a19e661ac28c6d5a1 100644
--- a/src/USER-SMD/compute_smd_rho.cpp
+++ b/src/USER-SMD/compute_smd_rho.cpp
@@ -22,7 +22,7 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_smd_rho.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-SMD/compute_smd_tlsph_defgrad.cpp b/src/USER-SMD/compute_smd_tlsph_defgrad.cpp
index 3ba66a656c6f3224960d0d1d6cfe366c5f1e3343..37ad78dcea2a532af82fc097307328a585e3366d 100644
--- a/src/USER-SMD/compute_smd_tlsph_defgrad.cpp
+++ b/src/USER-SMD/compute_smd_tlsph_defgrad.cpp
@@ -22,7 +22,11 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+#include <Eigen/Eigen>
 #include "compute_smd_tlsph_defgrad.h"
 #include "atom.h"
 #include "update.h"
@@ -32,11 +36,6 @@
 #include "memory.h"
 #include "error.h"
 #include "pair.h"
-#include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <Eigen/Eigen>
 using namespace Eigen;
 using namespace std;
 using namespace LAMMPS_NS;
diff --git a/src/USER-SMD/compute_smd_tlsph_dt.cpp b/src/USER-SMD/compute_smd_tlsph_dt.cpp
index 6d573775fa2cf6d773bea02e44038603d200bcc2..7752436b8a40f67734d5e4596aec3fc0800e5545 100644
--- a/src/USER-SMD/compute_smd_tlsph_dt.cpp
+++ b/src/USER-SMD/compute_smd_tlsph_dt.cpp
@@ -22,7 +22,7 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_smd_tlsph_dt.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-SMD/compute_smd_tlsph_num_neighs.cpp b/src/USER-SMD/compute_smd_tlsph_num_neighs.cpp
index d0df4ff3d7051d74874ef6c2b50901126321ef39..347b1384123b180570ec2e48692f633c3692db19 100644
--- a/src/USER-SMD/compute_smd_tlsph_num_neighs.cpp
+++ b/src/USER-SMD/compute_smd_tlsph_num_neighs.cpp
@@ -23,7 +23,7 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_smd_tlsph_num_neighs.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-SMD/compute_smd_tlsph_shape.cpp b/src/USER-SMD/compute_smd_tlsph_shape.cpp
index d9dc070f6b67c4f061a9cf2c7920ff337ad563a6..bbab274b5cca0dd4d785ea0be2044df1e6c2cef9 100644
--- a/src/USER-SMD/compute_smd_tlsph_shape.cpp
+++ b/src/USER-SMD/compute_smd_tlsph_shape.cpp
@@ -22,7 +22,12 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+#include <Eigen/Eigen>
+#include <Eigen/Geometry>
 #include "compute_smd_tlsph_shape.h"
 #include "atom.h"
 #include "update.h"
@@ -32,12 +37,7 @@
 #include "memory.h"
 #include "error.h"
 #include "pair.h"
-#include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <Eigen/Eigen>
-#include <Eigen/Geometry>
+
 using namespace Eigen;
 using namespace std;
 using namespace LAMMPS_NS;
diff --git a/src/USER-SMD/compute_smd_tlsph_strain.cpp b/src/USER-SMD/compute_smd_tlsph_strain.cpp
index ea137d5b2a718253b8f528891fe8d42fa186b574..a94a3cd51158defab103323d007c7662efafbeac 100644
--- a/src/USER-SMD/compute_smd_tlsph_strain.cpp
+++ b/src/USER-SMD/compute_smd_tlsph_strain.cpp
@@ -23,7 +23,11 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+#include <Eigen/Eigen>
 #include "compute_smd_tlsph_strain.h"
 #include "atom.h"
 #include "update.h"
@@ -33,11 +37,7 @@
 #include "memory.h"
 #include "error.h"
 #include "pair.h"
-#include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <Eigen/Eigen>
+
 using namespace Eigen;
 using namespace std;
 using namespace LAMMPS_NS;
diff --git a/src/USER-SMD/compute_smd_tlsph_strain_rate.cpp b/src/USER-SMD/compute_smd_tlsph_strain_rate.cpp
index ed3525f4ad2c934d9b9191b8de903f525147ea80..895a973f6a1863c4faacbe59aa33d8fd18044211 100644
--- a/src/USER-SMD/compute_smd_tlsph_strain_rate.cpp
+++ b/src/USER-SMD/compute_smd_tlsph_strain_rate.cpp
@@ -23,7 +23,8 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
+#include <Eigen/Eigen>
 #include "compute_smd_tlsph_strain_rate.h"
 #include "atom.h"
 #include "update.h"
@@ -33,7 +34,7 @@
 #include "memory.h"
 #include "error.h"
 #include "pair.h"
-#include <Eigen/Eigen>
+
 using namespace Eigen;
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-SMD/compute_smd_tlsph_stress.cpp b/src/USER-SMD/compute_smd_tlsph_stress.cpp
index cbcb4c45af60454e3d0afecccf7c85246d7ced3f..a54b07dd1ef5b007c9f7d9ede03bd6b8b6583c67 100644
--- a/src/USER-SMD/compute_smd_tlsph_stress.cpp
+++ b/src/USER-SMD/compute_smd_tlsph_stress.cpp
@@ -22,7 +22,8 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
+#include <Eigen/Eigen>
 #include "compute_smd_tlsph_stress.h"
 #include "atom.h"
 #include "update.h"
@@ -32,7 +33,7 @@
 #include "memory.h"
 #include "error.h"
 #include "pair.h"
-#include <Eigen/Eigen>
+
 using namespace Eigen;
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-SMD/compute_smd_triangle_mesh_vertices.cpp b/src/USER-SMD/compute_smd_triangle_mesh_vertices.cpp
index e43dadb47ad99ba7652589710e5c32e9727835fb..67ec27778a692008a870b3af3728b0cfdcebfced 100644
--- a/src/USER-SMD/compute_smd_triangle_mesh_vertices.cpp
+++ b/src/USER-SMD/compute_smd_triangle_mesh_vertices.cpp
@@ -23,7 +23,11 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+#include <Eigen/Eigen>
 #include "compute_smd_triangle_mesh_vertices.h"
 #include "atom.h"
 #include "update.h"
@@ -33,11 +37,7 @@
 #include "memory.h"
 #include "error.h"
 #include "pair.h"
-#include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <Eigen/Eigen>
+
 using namespace Eigen;
 using namespace std;
 using namespace LAMMPS_NS;
diff --git a/src/USER-SMD/compute_smd_ulsph_effm.cpp b/src/USER-SMD/compute_smd_ulsph_effm.cpp
index 9453d8cfa6a5cd474f85843adeef44d53cb19207..fc8637bbf01506114b0602d525fd52a79260458d 100644
--- a/src/USER-SMD/compute_smd_ulsph_effm.cpp
+++ b/src/USER-SMD/compute_smd_ulsph_effm.cpp
@@ -22,7 +22,7 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_smd_ulsph_effm.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-SMD/compute_smd_ulsph_num_neighs.cpp b/src/USER-SMD/compute_smd_ulsph_num_neighs.cpp
index efe6bba47ea16232af896ddd45092e75f682f69e..4ef339db9812d91ac32eb85187612c263eba1300 100644
--- a/src/USER-SMD/compute_smd_ulsph_num_neighs.cpp
+++ b/src/USER-SMD/compute_smd_ulsph_num_neighs.cpp
@@ -23,7 +23,7 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_smd_ulsph_num_neighs.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-SMD/compute_smd_ulsph_strain.cpp b/src/USER-SMD/compute_smd_ulsph_strain.cpp
index c7fcc909f37b71da4a97cc67e7e52d8e20481d11..89b85f7bc1cafc299fc45b55a5c88f5757b3d616 100644
--- a/src/USER-SMD/compute_smd_ulsph_strain.cpp
+++ b/src/USER-SMD/compute_smd_ulsph_strain.cpp
@@ -23,7 +23,11 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+#include <Eigen/Eigen>
 #include "compute_smd_ulsph_strain.h"
 #include "atom.h"
 #include "update.h"
@@ -33,11 +37,7 @@
 #include "memory.h"
 #include "error.h"
 #include "pair.h"
-#include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <Eigen/Eigen>
+
 using namespace Eigen;
 using namespace std;
 using namespace LAMMPS_NS;
diff --git a/src/USER-SMD/compute_smd_ulsph_strain_rate.cpp b/src/USER-SMD/compute_smd_ulsph_strain_rate.cpp
index 0d472a368a0830bedf7861ebe4dfce384ea9719c..f5ff4fef98fc6ec308855be74c635b4d03465c87 100644
--- a/src/USER-SMD/compute_smd_ulsph_strain_rate.cpp
+++ b/src/USER-SMD/compute_smd_ulsph_strain_rate.cpp
@@ -22,7 +22,8 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
+#include <Eigen/Eigen>
 #include "compute_smd_ulsph_strain_rate.h"
 #include "atom.h"
 #include "update.h"
@@ -32,7 +33,7 @@
 #include "memory.h"
 #include "error.h"
 #include "pair.h"
-#include <Eigen/Eigen>
+
 using namespace Eigen;
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-SMD/compute_smd_ulsph_stress.cpp b/src/USER-SMD/compute_smd_ulsph_stress.cpp
index 7069feced3f7e7801ec459b70d0909654c4c6987..7f1bbc4c29fadf300623ae243ae0ed97047ec220 100644
--- a/src/USER-SMD/compute_smd_ulsph_stress.cpp
+++ b/src/USER-SMD/compute_smd_ulsph_stress.cpp
@@ -22,7 +22,8 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
+#include <Eigen/Eigen>
 #include "compute_smd_ulsph_stress.h"
 #include "atom.h"
 #include "update.h"
@@ -32,7 +33,7 @@
 #include "memory.h"
 #include "error.h"
 #include "pair.h"
-#include <Eigen/Eigen>
+
 using namespace Eigen;
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-SMD/compute_smd_vol.cpp b/src/USER-SMD/compute_smd_vol.cpp
index 3573ee6a6cc8d4b09c8dd53a21a0c8b3ecb9dd9d..17a6b556e8ac352eab0703e4d19744d51933905d 100644
--- a/src/USER-SMD/compute_smd_vol.cpp
+++ b/src/USER-SMD/compute_smd_vol.cpp
@@ -22,7 +22,7 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_smd_vol.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-SMD/fix_smd_adjust_dt.cpp b/src/USER-SMD/fix_smd_adjust_dt.cpp
index d2570b6bdc3f1b64a482732b45b1f26945e06f0e..3685248d5e556fa7aa08f09b1f5fa42d252e08e7 100644
--- a/src/USER-SMD/fix_smd_adjust_dt.cpp
+++ b/src/USER-SMD/fix_smd_adjust_dt.cpp
@@ -22,9 +22,9 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_smd_adjust_dt.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-SMD/fix_smd_integrate_tlsph.cpp b/src/USER-SMD/fix_smd_integrate_tlsph.cpp
index 2744211d87d8f3045741fe73dda514cff6d84c1e..4668e673fca68d72dd4c1ece19fecacc8ed94228 100644
--- a/src/USER-SMD/fix_smd_integrate_tlsph.cpp
+++ b/src/USER-SMD/fix_smd_integrate_tlsph.cpp
@@ -22,9 +22,11 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+#include <Eigen/Eigen>
 #include "fix_smd_integrate_tlsph.h"
 #include "atom.h"
 #include "force.h"
@@ -32,13 +34,10 @@
 #include "error.h"
 #include "pair.h"
 #include "neigh_list.h"
-#include <Eigen/Eigen>
 #include "domain.h"
 #include "neighbor.h"
 #include "comm.h"
 #include "modify.h"
-#include <stdio.h>
-#include <iostream>
 
 using namespace Eigen;
 using namespace LAMMPS_NS;
diff --git a/src/USER-SMD/fix_smd_integrate_ulsph.cpp b/src/USER-SMD/fix_smd_integrate_ulsph.cpp
index 9b892bf25976f5507663c9171a3616ddfdcf7a64..a145deeb61ce90733aafd5d54c32d1aadaca5dd5 100644
--- a/src/USER-SMD/fix_smd_integrate_ulsph.cpp
+++ b/src/USER-SMD/fix_smd_integrate_ulsph.cpp
@@ -22,12 +22,12 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+#include <Eigen/Eigen>
 #include "fix_smd_integrate_ulsph.h"
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
@@ -41,7 +41,6 @@
 #include "error.h"
 #include "pair.h"
 #include "domain.h"
-#include <Eigen/Eigen>
 
 using namespace Eigen;
 using namespace LAMMPS_NS;
diff --git a/src/USER-SMD/fix_smd_move_triangulated_surface.cpp b/src/USER-SMD/fix_smd_move_triangulated_surface.cpp
index d8a0bda4d07629f49980c61d6aab84c17cf80cd3..d4afbe0535e4445709914d7ea71a9d1867a1eee5 100644
--- a/src/USER-SMD/fix_smd_move_triangulated_surface.cpp
+++ b/src/USER-SMD/fix_smd_move_triangulated_surface.cpp
@@ -22,12 +22,12 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
+#include <cmath>
+#include <cstdlib>
+#include <Eigen/Eigen>
 #include "fix_smd_move_triangulated_surface.h"
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
@@ -41,7 +41,6 @@
 #include "error.h"
 #include "pair.h"
 #include "domain.h"
-#include <Eigen/Eigen>
 #include "math_const.h"
 
 using namespace Eigen;
diff --git a/src/USER-SMD/fix_smd_setvel.cpp b/src/USER-SMD/fix_smd_setvel.cpp
index 0c2dc31f45269af6abdcde5981003724c81c8719..5e7cdbad3807dc15e1a535bb81b6db24d331ced8 100644
--- a/src/USER-SMD/fix_smd_setvel.cpp
+++ b/src/USER-SMD/fix_smd_setvel.cpp
@@ -23,8 +23,8 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "fix_smd_setvel.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-SMD/fix_smd_tlsph_reference_configuration.cpp b/src/USER-SMD/fix_smd_tlsph_reference_configuration.cpp
index da0533c88bcbb15e0adc56a6345558823ad91bed..3e2812aa12e29a1f3e6d57ff3867d987676b361c 100644
--- a/src/USER-SMD/fix_smd_tlsph_reference_configuration.cpp
+++ b/src/USER-SMD/fix_smd_tlsph_reference_configuration.cpp
@@ -24,15 +24,16 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include "lattice.h"
 #include <mpi.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
+#include <Eigen/Eigen>
 #include "fix_smd_tlsph_reference_configuration.h"
 #include "atom.h"
 #include "comm.h"
 #include "neighbor.h"
 #include "neigh_list.h"
+#include "lattice.h"
 #include "force.h"
 #include "pair.h"
 #include "update.h"
@@ -40,7 +41,6 @@
 #include "memory.h"
 #include "error.h"
 #include "domain.h"
-#include <Eigen/Eigen>
 #include "smd_kernels.h"
 #include "smd_math.h"
 
diff --git a/src/USER-SMD/fix_smd_wall_surface.cpp b/src/USER-SMD/fix_smd_wall_surface.cpp
index 53232af0012af87ad8e813c8fbddaea59dcdb333..4bd5078cb86558a8699d953a2c8cf79afd24af87 100644
--- a/src/USER-SMD/fix_smd_wall_surface.cpp
+++ b/src/USER-SMD/fix_smd_wall_surface.cpp
@@ -15,7 +15,10 @@
    Contributing authors: Mike Parks (SNL), Ezwanur Rahman, J.T. Foster (UTSA)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
+#include <cstring>
+#include <cstdio>
+#include <Eigen/Eigen>
 #include "fix_smd_wall_surface.h"
 #include "atom.h"
 #include "domain.h"
@@ -29,10 +32,7 @@
 #include "lattice.h"
 #include "memory.h"
 #include "error.h"
-#include <Eigen/Eigen>
-#include <stdio.h>
 #include "atom_vec.h"
-#include <string.h>
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/USER-SMD/pair_smd_hertz.cpp b/src/USER-SMD/pair_smd_hertz.cpp
index 9b2638296587fd714cc562f898b25668fcae8379..815db4a4508a297d779a8a4499f21aa073fa17d4 100644
--- a/src/USER-SMD/pair_smd_hertz.cpp
+++ b/src/USER-SMD/pair_smd_hertz.cpp
@@ -26,10 +26,10 @@
    Contributing author: Mike Parks (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <float.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cfloat>
+#include <cstdlib>
+#include <cstring>
 #include "pair_smd_hertz.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/USER-SMD/pair_smd_tlsph.cpp b/src/USER-SMD/pair_smd_tlsph.cpp
index 1a600b393e933e6abd431bb8740aa3dc31917ca1..4dd16c4d83a4ee212491da430dc37f34fe49b751 100644
--- a/src/USER-SMD/pair_smd_tlsph.cpp
+++ b/src/USER-SMD/pair_smd_tlsph.cpp
@@ -22,15 +22,19 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include "group.h"
-#include <math.h>
-#include <float.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cfloat>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+#include <iostream>
+#include <map>
+#include <Eigen/Eigen>
 #include "pair_smd_tlsph.h"
 #include "fix_smd_tlsph_reference_configuration.h"
 #include "atom.h"
 #include "domain.h"
+#include "group.h"
 #include "force.h"
 #include "update.h"
 #include "modify.h"
@@ -41,15 +45,12 @@
 #include "neigh_request.h"
 #include "memory.h"
 #include "error.h"
-#include <stdio.h>
-#include <iostream>
 #include "math_special.h"
-#include <map>
 #include "update.h"
-#include <Eigen/Eigen>
 #include "smd_material_models.h"
 #include "smd_kernels.h"
 #include "smd_math.h"
+
 using namespace SMD_Kernels;
 using namespace Eigen;
 using namespace std;
diff --git a/src/USER-SMD/pair_smd_triangulated_surface.cpp b/src/USER-SMD/pair_smd_triangulated_surface.cpp
index a62e262b7ac0036fdb33d1095b3ce34957ce228c..b8bff7e799948c73a47ecc71c44da5c15e068dd3 100644
--- a/src/USER-SMD/pair_smd_triangulated_surface.cpp
+++ b/src/USER-SMD/pair_smd_triangulated_surface.cpp
@@ -26,10 +26,13 @@
    Contributing author: Mike Parks (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <float.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cfloat>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+#include <iostream>
+#include <Eigen/Eigen>
 #include "pair_smd_triangulated_surface.h"
 #include "atom.h"
 #include "domain.h"
@@ -43,9 +46,6 @@
 #include "neigh_request.h"
 #include "memory.h"
 #include "error.h"
-#include <Eigen/Eigen>
-#include <stdio.h>
-#include <iostream>
 
 using namespace std;
 using namespace LAMMPS_NS;
diff --git a/src/USER-SMD/pair_smd_ulsph.cpp b/src/USER-SMD/pair_smd_ulsph.cpp
index fcb5e7eeb0689ae785ca17f7ef2c19523f8699a7..96eb912faec26a2e7b18a888eebd359f68771fa2 100644
--- a/src/USER-SMD/pair_smd_ulsph.cpp
+++ b/src/USER-SMD/pair_smd_ulsph.cpp
@@ -22,10 +22,12 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <float.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cfloat>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+#include <iostream>
 #include "pair_smd_ulsph.h"
 #include "atom.h"
 #include "domain.h"
@@ -39,8 +41,6 @@
 #include "neigh_request.h"
 #include "memory.h"
 #include "error.h"
-#include <stdio.h>
-#include <iostream>
 #include "smd_material_models.h"
 #include "smd_math.h"
 #include "smd_kernels.h"
diff --git a/src/USER-SMD/smd_material_models.cpp b/src/USER-SMD/smd_material_models.cpp
index 93228f3724d816c0ff1ff041bbabc5bef074fe5e..e3deb199b650be86b37fc7998152a57cfa6c22e1 100644
--- a/src/USER-SMD/smd_material_models.cpp
+++ b/src/USER-SMD/smd_material_models.cpp
@@ -22,8 +22,8 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 #include <iostream>
+#include <cstdio>
 #include "math_special.h"
-#include <stdio.h>
 
 #include <Eigen/Eigen>
 
diff --git a/src/USER-SMTBQ/pair_smtbq.cpp b/src/USER-SMTBQ/pair_smtbq.cpp
index 937b9e511736e6e4bbadc7f8d66f251383daa2d0..1028d8a8972117568e8670f101296a1db25703db 100644
--- a/src/USER-SMTBQ/pair_smtbq.cpp
+++ b/src/USER-SMTBQ/pair_smtbq.cpp
@@ -38,10 +38,10 @@
    <http://www.gnu.org/licenses/>.
    ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_smtbq.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-SPH/atom_vec_meso.cpp b/src/USER-SPH/atom_vec_meso.cpp
index daa7c10740d66c608e4d331f9fb11bd421eebc51..7dc6c6f7bd9382fa85496d96a448979751743d4e 100644
--- a/src/USER-SPH/atom_vec_meso.cpp
+++ b/src/USER-SPH/atom_vec_meso.cpp
@@ -11,8 +11,8 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "atom_vec_meso.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/USER-SPH/compute_meso_e_atom.cpp b/src/USER-SPH/compute_meso_e_atom.cpp
index dc8d0b55ad32f32d27f1bb14da002cfe57b359ec..e39dee2b5fb83e883e1bb8e4e8ff02892399d29a 100644
--- a/src/USER-SPH/compute_meso_e_atom.cpp
+++ b/src/USER-SPH/compute_meso_e_atom.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_meso_e_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-SPH/compute_meso_rho_atom.cpp b/src/USER-SPH/compute_meso_rho_atom.cpp
index 9b4da8b339f55b53b07bcc0b4de11fa1b1098287..eeb3f987bc7d82aad15a09a11b7cb3532e0ce8c3 100644
--- a/src/USER-SPH/compute_meso_rho_atom.cpp
+++ b/src/USER-SPH/compute_meso_rho_atom.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_meso_rho_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-SPH/compute_meso_t_atom.cpp b/src/USER-SPH/compute_meso_t_atom.cpp
index d901f73eff5feaba1490d349e6c3757e26113b69..dc4f3407f143ff7c75acdcee7ea7290aacf41503 100644
--- a/src/USER-SPH/compute_meso_t_atom.cpp
+++ b/src/USER-SPH/compute_meso_t_atom.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_meso_t_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/USER-SPH/fix_meso.cpp b/src/USER-SPH/fix_meso.cpp
index 665c9e0f3f866413924e617ee6b45f988daf5b9f..d7a5d81517600583101303174793d37f29ec27ae 100644
--- a/src/USER-SPH/fix_meso.cpp
+++ b/src/USER-SPH/fix_meso.cpp
@@ -11,12 +11,11 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
+#include <cmath>
+#include <cstdlib>
 #include "fix_meso.h"
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/USER-SPH/fix_meso_stationary.cpp b/src/USER-SPH/fix_meso_stationary.cpp
index 0607f2f3d0f51d9ff58548ca36dae65be937bd38..f5fc306320d1951078cd122500705898a30f6262 100644
--- a/src/USER-SPH/fix_meso_stationary.cpp
+++ b/src/USER-SPH/fix_meso_stationary.cpp
@@ -11,12 +11,11 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
+#include <cmath>
+#include <cstdlib>
 #include "fix_meso_stationary.h"
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/USER-SPH/pair_sph_heatconduction.cpp b/src/USER-SPH/pair_sph_heatconduction.cpp
index 02e667e437a2d2ff96c1f85600273954dff5af62..6f0cf7eca2f734b4e19bb3c69246aeae71996874 100644
--- a/src/USER-SPH/pair_sph_heatconduction.cpp
+++ b/src/USER-SPH/pair_sph_heatconduction.cpp
@@ -11,8 +11,8 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "pair_sph_heatconduction.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-SPH/pair_sph_idealgas.cpp b/src/USER-SPH/pair_sph_idealgas.cpp
index 2ba0d9bfbe6a970bcffd36e17aa412e7d9df0e4f..99fba05917ae35dbf71836cf10c5c568c10a5278 100644
--- a/src/USER-SPH/pair_sph_idealgas.cpp
+++ b/src/USER-SPH/pair_sph_idealgas.cpp
@@ -11,8 +11,8 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "pair_sph_idealgas.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-SPH/pair_sph_lj.cpp b/src/USER-SPH/pair_sph_lj.cpp
index 98752ac126aa6385c3bb1bc4f2df5b91d34d73bd..5cefdf87c43645e32be21de131ce1d8ec2046ee7 100644
--- a/src/USER-SPH/pair_sph_lj.cpp
+++ b/src/USER-SPH/pair_sph_lj.cpp
@@ -11,8 +11,8 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "pair_sph_lj.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-SPH/pair_sph_rhosum.cpp b/src/USER-SPH/pair_sph_rhosum.cpp
index 4bff0ec27c6e75e33e904627d06c6336581a3627..605187d3a733115254fe3a74967442c63de0afa2 100644
--- a/src/USER-SPH/pair_sph_rhosum.cpp
+++ b/src/USER-SPH/pair_sph_rhosum.cpp
@@ -11,8 +11,8 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "pair_sph_rhosum.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-SPH/pair_sph_taitwater.cpp b/src/USER-SPH/pair_sph_taitwater.cpp
index b1887c6164ac1e0d9528c8fec71d864a447d5e2c..00500b940de1803c47982e2b4936ddbd005cc915 100644
--- a/src/USER-SPH/pair_sph_taitwater.cpp
+++ b/src/USER-SPH/pair_sph_taitwater.cpp
@@ -11,8 +11,8 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "pair_sph_taitwater.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-SPH/pair_sph_taitwater_morris.cpp b/src/USER-SPH/pair_sph_taitwater_morris.cpp
index 76b538e46bd38fb0037a412ae2203adaa15f0d98..80607cb333b2cd882c1b276c703e4c5d173c9b94 100644
--- a/src/USER-SPH/pair_sph_taitwater_morris.cpp
+++ b/src/USER-SPH/pair_sph_taitwater_morris.cpp
@@ -11,8 +11,8 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "pair_sph_taitwater_morris.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-TALLY/compute_force_tally.cpp b/src/USER-TALLY/compute_force_tally.cpp
index 3ec6c188fc385026ce3fd93383fa87e38559b15f..0ec1d332a4ea91daf86330f7c51e33e980bc1553 100644
--- a/src/USER-TALLY/compute_force_tally.cpp
+++ b/src/USER-TALLY/compute_force_tally.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <math.h>
+#include <cstring>
+#include <cmath>
 #include "compute_force_tally.h"
 #include "atom.h"
 #include "group.h"
diff --git a/src/USER-TALLY/compute_heat_flux_tally.cpp b/src/USER-TALLY/compute_heat_flux_tally.cpp
index 43b663b27a580495943b5d4835650ae01811b0cd..f8db92a730e320905d488e45d74c26ab1636d836 100644
--- a/src/USER-TALLY/compute_heat_flux_tally.cpp
+++ b/src/USER-TALLY/compute_heat_flux_tally.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_heat_flux_tally.h"
 #include "atom.h"
 #include "group.h"
diff --git a/src/USER-TALLY/compute_pe_mol_tally.cpp b/src/USER-TALLY/compute_pe_mol_tally.cpp
index 0328740e0395bc6ca7914ee8d7b7b88e212e0000..264ddca270af4f7956b50ceb2da75ec380c57295 100644
--- a/src/USER-TALLY/compute_pe_mol_tally.cpp
+++ b/src/USER-TALLY/compute_pe_mol_tally.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_pe_mol_tally.h"
 #include "atom.h"
 #include "group.h"
diff --git a/src/USER-TALLY/compute_pe_tally.cpp b/src/USER-TALLY/compute_pe_tally.cpp
index caa4cf134a89dd10d73169eae5ba02510a8bf2dd..3031915ebe54f76c51d409b36455cdccee9bdff0 100644
--- a/src/USER-TALLY/compute_pe_tally.cpp
+++ b/src/USER-TALLY/compute_pe_tally.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_pe_tally.h"
 #include "atom.h"
 #include "group.h"
diff --git a/src/USER-TALLY/compute_stress_tally.cpp b/src/USER-TALLY/compute_stress_tally.cpp
index e44313d695c46959b87ddb89bbf50ec99078bd7c..8ed40ae8e24dad64c313563f5c157f8f7d0794cf 100644
--- a/src/USER-TALLY/compute_stress_tally.cpp
+++ b/src/USER-TALLY/compute_stress_tally.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_stress_tally.h"
 #include "atom.h"
 #include "group.h"
diff --git a/src/USER-UEF/compute_pressure_uef.cpp b/src/USER-UEF/compute_pressure_uef.cpp
index 43054d7d3f9652f1770361596fa8c62d954ff898..8b6285304228970aaceb014bee9446990703ecad 100644
--- a/src/USER-UEF/compute_pressure_uef.cpp
+++ b/src/USER-UEF/compute_pressure_uef.cpp
@@ -14,8 +14,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "compute_pressure_uef.h"
 #include "fix_nh_uef.h"
 #include "update.h"
diff --git a/src/USER-UEF/compute_temp_uef.cpp b/src/USER-UEF/compute_temp_uef.cpp
index 605552405611711327b9fd0a7409b7edbec70eca..999296ec7e73f54bcb664cd6bc1492826ed4ce0c 100644
--- a/src/USER-UEF/compute_temp_uef.cpp
+++ b/src/USER-UEF/compute_temp_uef.cpp
@@ -13,8 +13,8 @@
    Contributing author: David Nicholson (MIT)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "compute_temp_uef.h"
 #include "fix_nh_uef.h"
 #include "update.h"
diff --git a/src/USER-UEF/dump_cfg_uef.cpp b/src/USER-UEF/dump_cfg_uef.cpp
index 4b0c08275a62a7bb78132fd2ab6a138a0670d11d..f5f78297c2910877fcc5564f8db778426183a553 100644
--- a/src/USER-UEF/dump_cfg_uef.cpp
+++ b/src/USER-UEF/dump_cfg_uef.cpp
@@ -14,9 +14,9 @@
 ------------------------------------------------------------------------- */
 
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "dump_cfg.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/USER-UEF/fix_nh_uef.cpp b/src/USER-UEF/fix_nh_uef.cpp
index 36494b0d493809c4ae10e9314bc58765a19ee674..cd0b2ba2683742ab1140ce3a41e0e7c506a40a33 100644
--- a/src/USER-UEF/fix_nh_uef.cpp
+++ b/src/USER-UEF/fix_nh_uef.cpp
@@ -13,9 +13,9 @@
    Contributing author: David Nicholson (MIT)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "fix_nh_uef.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/USER-UEF/uef_utils.cpp b/src/USER-UEF/uef_utils.cpp
index f270fe1d8b41760aa1236c1e4b478f79a24203ca..a5498d605f3d28291d91dcc320a4cd41dd999ce2 100644
--- a/src/USER-UEF/uef_utils.cpp
+++ b/src/USER-UEF/uef_utils.cpp
@@ -22,7 +22,7 @@
    http://link.springer.com/chapter/10.1007%2F3-540-44670-2_13
 */
 
-#include <math.h>
+#include <cmath>
 #include "uef_utils.h"
 
 namespace LAMMPS_NS {
diff --git a/src/USER-VTK/dump_vtk.cpp b/src/USER-VTK/dump_vtk.cpp
index 78be5668cfebb8954b58c3be6df6bd7149c43521..adad070f51596c9d4b28ce0a904fdc476a94ab02 100644
--- a/src/USER-VTK/dump_vtk.cpp
+++ b/src/USER-VTK/dump_vtk.cpp
@@ -22,9 +22,9 @@
    Richard Berger (JKU)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "dump_vtk.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/VORONOI/compute_voronoi_atom.cpp b/src/VORONOI/compute_voronoi_atom.cpp
index d55db85ef8624501183cecc238fa9c9ae598e8e8..ea6158bfa225dcf9ccf75b21ce93ed0eb55c33c5 100644
--- a/src/VORONOI/compute_voronoi_atom.cpp
+++ b/src/VORONOI/compute_voronoi_atom.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "compute_voronoi_atom.h"
 #include "atom.h"
 #include "group.h"
diff --git a/src/angle.cpp b/src/angle.cpp
index 1366c48865b5daa516b58bba254aa0171eaf3da0..2a297990ac83046595212b2819d621bfa6ab2b1a 100644
--- a/src/angle.cpp
+++ b/src/angle.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "angle.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/angle.h b/src/angle.h
index 000c3fe916d84c1766eeb4dd09dbd082fba61387..0247fa0ff83eb24204d01908577e60dab67883d4 100644
--- a/src/angle.h
+++ b/src/angle.h
@@ -14,7 +14,7 @@
 #ifndef LMP_ANGLE_H
 #define LMP_ANGLE_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 
 namespace LAMMPS_NS {
diff --git a/src/angle_hybrid.cpp b/src/angle_hybrid.cpp
index 9b3af1856e67a33ae14eafd674b38d57782fb052..c29eaac2ae9e694c6eb3198099c04bcd9fb9122e 100644
--- a/src/angle_hybrid.cpp
+++ b/src/angle_hybrid.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <ctype.h>
+#include <cmath>
+#include <cstring>
+#include <cctype>
 #include "angle_hybrid.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/angle_hybrid.h b/src/angle_hybrid.h
index 4ae34c176f9574ca013b4f8075157c8e155e9fa5..4fde71e43f1251822355823dab06e941d8f33f31 100644
--- a/src/angle_hybrid.h
+++ b/src/angle_hybrid.h
@@ -20,7 +20,7 @@ AngleStyle(hybrid,AngleHybrid)
 #ifndef LMP_ANGLE_HYBRID_H
 #define LMP_ANGLE_HYBRID_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle.h"
 
 namespace LAMMPS_NS {
diff --git a/src/angle_zero.cpp b/src/angle_zero.cpp
index ba84295ca76a997a956991c35e6b0b194f925cdc..e5191c4fb22d6ceaaa0f4a562abe5b103364cefe 100644
--- a/src/angle_zero.cpp
+++ b/src/angle_zero.cpp
@@ -15,9 +15,9 @@
    Contributing author: Carsten Svaneborg (SDU)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "angle_zero.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/angle_zero.h b/src/angle_zero.h
index e40fc8355ce2be6aad4723f147455dc028c5cd82..b91be5c8d72a5330cabd8b3dca8d0cb8c450ab69 100644
--- a/src/angle_zero.h
+++ b/src/angle_zero.h
@@ -20,7 +20,7 @@ AngleStyle(zero,AngleZero)
 #ifndef LMP_ANGLE_ZERO_H
 #define LMP_ANGLE_ZERO_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "angle.h"
 
 namespace LAMMPS_NS {
diff --git a/src/atom.cpp b/src/atom.cpp
index ae36a8884b84e5093c98dbd4aabfde2079277ef5..d5773a2fe1f945ccf96877b9d56d2de857c4dfe1 100644
--- a/src/atom.cpp
+++ b/src/atom.cpp
@@ -12,11 +12,11 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <climits>
 #include "atom.h"
 #include "style_atom.h"
 #include "atom_vec.h"
diff --git a/src/atom_map.cpp b/src/atom_map.cpp
index 4b1be77a061464728e8769f8fef48ef37d667c00..46593432cfe07cd6806a0fcfca4f1ab282f7cc03 100644
--- a/src/atom_map.cpp
+++ b/src/atom_map.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "atom.h"
 #include "comm.h"
 #include "memory.h"
diff --git a/src/atom_vec.cpp b/src/atom_vec.cpp
index 14091cbb77ff41bbb8864f717c96ef97c6958455..b04bfba34c91295b0858c6f0833d75172fed20c9 100644
--- a/src/atom_vec.cpp
+++ b/src/atom_vec.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "atom_vec.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/atom_vec.h b/src/atom_vec.h
index 5be955a06c39b0c4c501f862ecf9b0e1d841bb39..87fb35d9c72042e478d8cb8dde75549fddd70b17 100644
--- a/src/atom_vec.h
+++ b/src/atom_vec.h
@@ -14,7 +14,7 @@
 #ifndef LMP_ATOM_VEC_H
 #define LMP_ATOM_VEC_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 
 namespace LAMMPS_NS {
diff --git a/src/atom_vec_atomic.cpp b/src/atom_vec_atomic.cpp
index eda1a33152a0f5d513d115fb04e8f07d3642a0b3..e1c9a1e524c2ae99e3cdc2aff74217404f4240bb 100644
--- a/src/atom_vec_atomic.cpp
+++ b/src/atom_vec_atomic.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "atom_vec_atomic.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/atom_vec_body.cpp b/src/atom_vec_body.cpp
index b7422cf229785feaf714d3c914acd15c3a01767f..4d3b5643aea121a788d41345f2a1be43e2e0a667 100644
--- a/src/atom_vec_body.cpp
+++ b/src/atom_vec_body.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "atom_vec_body.h"
 #include "style_body.h"
 #include "body.h"
diff --git a/src/atom_vec_charge.cpp b/src/atom_vec_charge.cpp
index a93a29662b0d5fe2885c8af9b64e6380ef8c4e1e..440393385dad38b24735ce7120b67be1ec83df6c 100644
--- a/src/atom_vec_charge.cpp
+++ b/src/atom_vec_charge.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "atom_vec_charge.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/atom_vec_ellipsoid.cpp b/src/atom_vec_ellipsoid.cpp
index 858b89d62b47036a3025607c00f1844fc53172f3..c569f89a0933ef4b594f0fc581647140140a93d3 100644
--- a/src/atom_vec_ellipsoid.cpp
+++ b/src/atom_vec_ellipsoid.cpp
@@ -15,7 +15,7 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "atom_vec_ellipsoid.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/atom_vec_hybrid.cpp b/src/atom_vec_hybrid.cpp
index 40c744afc5461bb83822053291f01e0701f341e3..7e1fb01e5ddc6318a578a1740f2a8acad7ded7bb 100644
--- a/src/atom_vec_hybrid.cpp
+++ b/src/atom_vec_hybrid.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "atom_vec_hybrid.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/atom_vec_hybrid.h b/src/atom_vec_hybrid.h
index fd8a3e433cc9bf594171149c5aa7f9b2ab35bc8f..a027923a1717a0385943e2885122f25c677e1430 100644
--- a/src/atom_vec_hybrid.h
+++ b/src/atom_vec_hybrid.h
@@ -20,7 +20,7 @@ AtomStyle(hybrid,AtomVecHybrid)
 #ifndef LMP_ATOM_VEC_HYBRID_H
 #define LMP_ATOM_VEC_HYBRID_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "atom_vec.h"
 
 namespace LAMMPS_NS {
diff --git a/src/atom_vec_line.cpp b/src/atom_vec_line.cpp
index ec278562f9ea702abeeeb0b595cfef36487f2ac4..9babfe3735ca1eb03ce0c67f3b4033517dc16998 100644
--- a/src/atom_vec_line.cpp
+++ b/src/atom_vec_line.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "atom_vec_line.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/atom_vec_sphere.cpp b/src/atom_vec_sphere.cpp
index a72704b4c62941af07ff48c99b05d0d1a2efd600..dec98e5200d2ec45fe9b3a3b32789802d88eee45 100644
--- a/src/atom_vec_sphere.cpp
+++ b/src/atom_vec_sphere.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "atom_vec_sphere.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/atom_vec_tri.cpp b/src/atom_vec_tri.cpp
index eb87e75b18dfa34e602dde516679d5e53d650134..2c31b95cfe3adf07520fdb39426c34597c1e16d1 100644
--- a/src/atom_vec_tri.cpp
+++ b/src/atom_vec_tri.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "atom_vec_tri.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/balance.cpp b/src/balance.cpp
index 45f185a6fc0ba06d4b5cddb7409d73eccff26b82..9be7b2a7b3267295b49d35c46af1ce007da6dd66 100644
--- a/src/balance.cpp
+++ b/src/balance.cpp
@@ -19,9 +19,9 @@
 //#define BALANCE_DEBUG 1
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "balance.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/balance.h b/src/balance.h
index 3e5e0e0d70a07e145b5864bd44dd822652577589..420031502a8f826a636c8d63e1a3a421beb37de6 100644
--- a/src/balance.h
+++ b/src/balance.h
@@ -20,7 +20,7 @@ CommandStyle(balance,Balance)
 #ifndef LMP_BALANCE_H
 #define LMP_BALANCE_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 
 namespace LAMMPS_NS {
diff --git a/src/body.cpp b/src/body.cpp
index 144ee13c92bd9d7a516bd708053e1955080090ee..42f4ccbdd3fcaf9491d7656a7e138c1f7efe4ebe 100644
--- a/src/body.cpp
+++ b/src/body.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "body.h"
 #include "error.h"
 
diff --git a/src/bond.cpp b/src/bond.cpp
index 825ff1b199a48b854f5b7d716eac80c77228345e..edcd869425bd0d7444915d6e1f16dd1f71cb1a17 100644
--- a/src/bond.cpp
+++ b/src/bond.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "bond.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/bond.h b/src/bond.h
index b34628d7575fc726ba5ab7cb69ddae7da2c2d298..9c353a1a6dae5fed06e2f9992d116e24d1d284a4 100644
--- a/src/bond.h
+++ b/src/bond.h
@@ -14,7 +14,7 @@
 #ifndef LMP_BOND_H
 #define LMP_BOND_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 
 namespace LAMMPS_NS {
diff --git a/src/bond_hybrid.cpp b/src/bond_hybrid.cpp
index 9a16d0e1fd2e54a02a3b9d5eb8cedd451b59768c..c3a71ee71c2c85a6a0cbeb914f823423541f4637 100644
--- a/src/bond_hybrid.cpp
+++ b/src/bond_hybrid.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <ctype.h>
+#include <cmath>
+#include <cstring>
+#include <cctype>
 #include "bond_hybrid.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/bond_hybrid.h b/src/bond_hybrid.h
index e1d567c886813755bc4fe42017ce8fbdd6ed8607..a385a2e3f856788f90dd8b2a2f8df5e83a5ca2c9 100644
--- a/src/bond_hybrid.h
+++ b/src/bond_hybrid.h
@@ -20,7 +20,7 @@ BondStyle(hybrid,BondHybrid)
 #ifndef LMP_BOND_HYBRID_H
 #define LMP_BOND_HYBRID_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "bond.h"
 
 namespace LAMMPS_NS {
diff --git a/src/bond_zero.cpp b/src/bond_zero.cpp
index f38b7754f826e297e1f820e8dcb22f6f6315bc16..9fd9d4a580c5d83cf4c69a431330975a116ee330 100644
--- a/src/bond_zero.cpp
+++ b/src/bond_zero.cpp
@@ -15,9 +15,9 @@
    Contributing author: Carsten Svaneborg (SDU)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "bond_zero.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/bond_zero.h b/src/bond_zero.h
index b7b7e999600e4f52b90ceaca4d1ace2956feed79..9443ff0784c64bba76ca5079ae79d90f31b8b1f8 100644
--- a/src/bond_zero.h
+++ b/src/bond_zero.h
@@ -20,7 +20,7 @@ BondStyle(zero,BondZero)
 #ifndef LMP_BOND_ZERO_H
 #define LMP_BOND_ZERO_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "bond.h"
 
 namespace LAMMPS_NS {
diff --git a/src/change_box.cpp b/src/change_box.cpp
index c6ec078a01f647d4059b692b03250bc5bd52012d..93dff387c47ddceb622f20168deaca3c93ca5f83 100644
--- a/src/change_box.cpp
+++ b/src/change_box.cpp
@@ -12,9 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "change_box.h"
 #include "atom.h"
 #include "modify.h"
diff --git a/src/citeme.h b/src/citeme.h
index 18e9a712db81a1ce5fed2f5f2ca4d26867a15688..262b284337a12dfca5f5c81bffcec5cc0c248eeb 100644
--- a/src/citeme.h
+++ b/src/citeme.h
@@ -15,7 +15,7 @@
 #define LMP_CITEME_H
 
 #include "pointers.h"
-#include <stdio.h>
+#include <cstdio>
 #include <set>
 
 namespace LAMMPS_NS {
diff --git a/src/comm.cpp b/src/comm.cpp
index 14d2d70c5a2ed125cf467e98b4dbb149ac306f52..b53ce251f27bce20a5c964015f52286e9a266a74 100644
--- a/src/comm.cpp
+++ b/src/comm.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "comm.h"
 #include "universe.h"
 #include "atom.h"
diff --git a/src/comm_brick.cpp b/src/comm_brick.cpp
index 992d988f902d553f1093341bcf17f61a963a030d..070c93bd3cb765dffe29ecab6dd6cfa42742579e 100644
--- a/src/comm_brick.cpp
+++ b/src/comm_brick.cpp
@@ -16,10 +16,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
 #include "comm_brick.h"
 #include "comm_tiled.h"
 #include "universe.h"
diff --git a/src/comm_tiled.cpp b/src/comm_tiled.cpp
index 23b098a705a26bb477ab7199688d2375e2034699..12b10be2f7652f113c5e736a80d032a8d7a9942d 100644
--- a/src/comm_tiled.cpp
+++ b/src/comm_tiled.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "comm_tiled.h"
 #include "comm_brick.h"
 #include "atom.h"
diff --git a/src/compute.cpp b/src/compute.cpp
index 467faf9fe1e0e258fd4fb22b3a0c1e7fe9b902d2..207f825ec850b2118ce7dff45668045a295c40fd 100644
--- a/src/compute.cpp
+++ b/src/compute.cpp
@@ -12,9 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
 #include "compute.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/compute_aggregate_atom.cpp b/src/compute_aggregate_atom.cpp
index d61fd06397c04f982880a1dd2c814e1093bcdcd4..56855fcc29720bf8db93b8a2a6a52f8c1818fd45 100644
--- a/src/compute_aggregate_atom.cpp
+++ b/src/compute_aggregate_atom.cpp
@@ -15,8 +15,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <math.h>
+#include <cstring>
+#include <cmath>
 #include "compute_aggregate_atom.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/compute_angle.cpp b/src/compute_angle.cpp
index 8546350ecd9afc69398cf9d91b73c03172060843..59945f5832c3f78a7b32d8f6526f40c16da573c3 100644
--- a/src/compute_angle.cpp
+++ b/src/compute_angle.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
 #include "compute_angle.h"
 #include "update.h"
 #include "force.h"
diff --git a/src/compute_angle_local.cpp b/src/compute_angle_local.cpp
index 1e249554dcd136cf64676d03031bfbec637018a6..7137077158eb33e1dfc2abbea7378426639e0f65 100644
--- a/src/compute_angle_local.cpp
+++ b/src/compute_angle_local.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "compute_angle_local.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/compute_angmom_chunk.cpp b/src/compute_angmom_chunk.cpp
index 98c6ea044110e211e28c00765bc45a0c3a4384a2..a70eaaf49f3d334b87067a20f9f27b6560ee7829 100644
--- a/src/compute_angmom_chunk.cpp
+++ b/src/compute_angmom_chunk.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_angmom_chunk.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_bond.cpp b/src/compute_bond.cpp
index 29d7ce0ecec42556db00830cd80573ceb171adbf..896aaec9bdfa97c1c84d4fc22244f40396e4ebc3 100644
--- a/src/compute_bond.cpp
+++ b/src/compute_bond.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
 #include "compute_bond.h"
 #include "update.h"
 #include "force.h"
diff --git a/src/compute_bond_local.cpp b/src/compute_bond_local.cpp
index b7e84d0a29f64e0844931f0a095f406eb2efb07c..985e3ef0756260c9b6e9f258a5d3ab1b080f4605 100644
--- a/src/compute_bond_local.cpp
+++ b/src/compute_bond_local.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "compute_bond_local.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/compute_centro_atom.cpp b/src/compute_centro_atom.cpp
index 089c57798008527c99b5046565fce975492c0e41..48af45363598ab0ed8fd8e1b3b9aff5d9c996be3 100644
--- a/src/compute_centro_atom.cpp
+++ b/src/compute_centro_atom.cpp
@@ -15,8 +15,8 @@
    Contributing author: Michel Perez (U Lyon) for non-fcc lattices
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "compute_centro_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_chunk_atom.cpp b/src/compute_chunk_atom.cpp
index 6a81b181cf50a6f13602ccc35fc89cf8475b3ecb..ddad7eb62fd6e323756795b376a5fa9daa080915 100644
--- a/src/compute_chunk_atom.cpp
+++ b/src/compute_chunk_atom.cpp
@@ -14,8 +14,8 @@
 // NOTE: allow for bin center to be variables for sphere/cylinder
 
 #include <mpi.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "compute_chunk_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_cluster_atom.cpp b/src/compute_cluster_atom.cpp
index 9a7df03e49ba5bcf919b7714b82a7a70f37c0510..146f8fd1b3c7d64491e1213038b94c4ba9d0a32a 100644
--- a/src/compute_cluster_atom.cpp
+++ b/src/compute_cluster_atom.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "compute_cluster_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_cna_atom.cpp b/src/compute_cna_atom.cpp
index bd24e06cae4e289893e48f19affed911f74cdb1e..a1b97d94043dc537102f98cb3a05cbb7555a26a1 100644
--- a/src/compute_cna_atom.cpp
+++ b/src/compute_cna_atom.cpp
@@ -15,8 +15,9 @@
    Contributing author: Wan Liang (Chinese Academy of Sciences)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "compute_cna_atom.h"
 #include "atom.h"
 #include "update.h"
@@ -29,7 +30,6 @@
 #include "comm.h"
 #include "memory.h"
 #include "error.h"
-#include <math.h>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/compute_com_chunk.cpp b/src/compute_com_chunk.cpp
index 3eb686783b2511e4db32e7e048aa8b52f1e527a6..ec667672454d66436276b94c64dd9d5f47355279 100644
--- a/src/compute_com_chunk.cpp
+++ b/src/compute_com_chunk.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_com_chunk.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_contact_atom.cpp b/src/compute_contact_atom.cpp
index b2186bd17502f735dfc732554739a44f959973f3..f3c4513b0152a2edd090c31d07a46f832d925021 100644
--- a/src/compute_contact_atom.cpp
+++ b/src/compute_contact_atom.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "compute_contact_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_coord_atom.cpp b/src/compute_coord_atom.cpp
index 8c69aa787437131f1f376a29a3db7a99d6290def..b86d818d0608d99468658adb982df1afaccf7472 100644
--- a/src/compute_coord_atom.cpp
+++ b/src/compute_coord_atom.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "compute_coord_atom.h"
 #include "compute_orientorder_atom.h"
 #include "atom.h"
diff --git a/src/compute_dihedral.cpp b/src/compute_dihedral.cpp
index 2afcb5e321ae655cee5c3af02a46a6543ca715e0..3595b2eda32f24e02287753dc04a8f8d9f1714e8 100644
--- a/src/compute_dihedral.cpp
+++ b/src/compute_dihedral.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
 #include "compute_dihedral.h"
 #include "update.h"
 #include "force.h"
diff --git a/src/compute_dihedral_local.cpp b/src/compute_dihedral_local.cpp
index 7a21d0f9d708a02a73e7deef3230fec065a62143..42d1476ad25fb368b08b36bf99195f3a0750235b 100644
--- a/src/compute_dihedral_local.cpp
+++ b/src/compute_dihedral_local.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "compute_dihedral_local.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/compute_dipole_chunk.cpp b/src/compute_dipole_chunk.cpp
index b4beacb9849a792e97e1acd6d44fce5992ef7609..b0474b6359c7a654a8ec97ced8121ac0d3da2b1f 100644
--- a/src/compute_dipole_chunk.cpp
+++ b/src/compute_dipole_chunk.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_dipole_chunk.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_displace_atom.cpp b/src/compute_displace_atom.cpp
index a5c32c53cc9496ced1a2ecd6000d55469639ce7e..0b6b40b62a35688d2ed7dde70d9526305c68f075 100644
--- a/src/compute_displace_atom.cpp
+++ b/src/compute_displace_atom.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "compute_displace_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_erotate_sphere_atom.cpp b/src/compute_erotate_sphere_atom.cpp
index b29c18c1e3438085a630197146af2457e083c6d0..999bc062c57406292cf7b0d469c9f5f1133e0f66 100644
--- a/src/compute_erotate_sphere_atom.cpp
+++ b/src/compute_erotate_sphere_atom.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_erotate_sphere_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_fragment_atom.cpp b/src/compute_fragment_atom.cpp
index 8606f54933bda9738267d844747605d49228e6b9..b9fb2331ecf35bca18a9f5803baad10c0273eaa2 100644
--- a/src/compute_fragment_atom.cpp
+++ b/src/compute_fragment_atom.cpp
@@ -15,7 +15,7 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_fragment_atom.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/compute_global_atom.cpp b/src/compute_global_atom.cpp
index 6cd79f919c9ac27cef83b1edb69b20594ab29c37..dc9ab52f4978268a7fe51dcbd03b5afbeff51a54 100644
--- a/src/compute_global_atom.cpp
+++ b/src/compute_global_atom.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "compute_global_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_group_group.cpp b/src/compute_group_group.cpp
index 51c978cb530017af17c9cffaf4ca6217551608c8..dc94db50f645ee35f9c1e5b928881aa5a584f155 100644
--- a/src/compute_group_group.cpp
+++ b/src/compute_group_group.cpp
@@ -17,7 +17,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
+#include <cmath>
 #include "compute_group_group.h"
 #include "atom.h"
 #include "update.h"
@@ -29,7 +30,6 @@
 #include "group.h"
 #include "kspace.h"
 #include "error.h"
-#include <math.h>
 #include "comm.h"
 #include "domain.h"
 #include "math_const.h"
diff --git a/src/compute_gyration.cpp b/src/compute_gyration.cpp
index 0877efa4d9214201442da4463d0c7f0bde1375ac..f8d19853e0e9805ff8d2e1891dd56c486487156a 100644
--- a/src/compute_gyration.cpp
+++ b/src/compute_gyration.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "compute_gyration.h"
 #include "update.h"
 #include "atom.h"
diff --git a/src/compute_gyration_chunk.cpp b/src/compute_gyration_chunk.cpp
index efb26c9ad2721f006da6ee4896baa313b7755453..6a23398aca3151533a39c317aafc73f1a5dc650e 100644
--- a/src/compute_gyration_chunk.cpp
+++ b/src/compute_gyration_chunk.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "compute_gyration_chunk.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_heat_flux.cpp b/src/compute_heat_flux.cpp
index 108691aec240b46907fa4189199d99af5dc428a5..e402da7842a70ccf35ed3980e0bd8e93af6abded 100644
--- a/src/compute_heat_flux.cpp
+++ b/src/compute_heat_flux.cpp
@@ -16,8 +16,8 @@
                          Mario Pinto (Computational Research Lab, Pune, India)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "compute_heat_flux.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_hexorder_atom.cpp b/src/compute_hexorder_atom.cpp
index 44525e67a2e9f2d5e7f0443d4574db2b1386f40f..cb2946beba8e7833feb9115566f38505108360cb 100644
--- a/src/compute_hexorder_atom.cpp
+++ b/src/compute_hexorder_atom.cpp
@@ -16,8 +16,8 @@
 ------------------------------------------------------------------------- */
 
 #include <complex>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "compute_hexorder_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_improper.cpp b/src/compute_improper.cpp
index 60d22d0d70d938d8718f62eb6e5a21d875afb37b..ac2a23e727cc87bb65e23063b4e105c87fa61afe 100644
--- a/src/compute_improper.cpp
+++ b/src/compute_improper.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
 #include "compute_improper.h"
 #include "update.h"
 #include "force.h"
diff --git a/src/compute_improper_local.cpp b/src/compute_improper_local.cpp
index e183405956721349fdc43c15a779e7f3661700bf..f54cb67535e2e1eed7ce88253b1a0284bdffe0cf 100644
--- a/src/compute_improper_local.cpp
+++ b/src/compute_improper_local.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "compute_improper_local.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/compute_inertia_chunk.cpp b/src/compute_inertia_chunk.cpp
index 1e3c595ed1db93406d9a8e1c1528ac09413f9e1b..a33073c35a8194f61302f2e7831d424f40aae1e7 100644
--- a/src/compute_inertia_chunk.cpp
+++ b/src/compute_inertia_chunk.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_inertia_chunk.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_ke_atom.cpp b/src/compute_ke_atom.cpp
index da159669dea4f88f615639f4379fbc9b36776ac6..c5506996dab5843e97260d51f7342088f77ae727 100644
--- a/src/compute_ke_atom.cpp
+++ b/src/compute_ke_atom.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_ke_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_msd.cpp b/src/compute_msd.cpp
index ac510bca8eb59e7bd6c2ff315738aab8bc673cad..fc47b2609a264c3ef8d3e4a925d627818fcb51f7 100644
--- a/src/compute_msd.cpp
+++ b/src/compute_msd.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_msd.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_msd_chunk.cpp b/src/compute_msd_chunk.cpp
index 69cd87f96b6b62d800eb0a7e54587525bc779cfd..1f974cc06cd0163c7dfc511370bb55e5afe96df2 100644
--- a/src/compute_msd_chunk.cpp
+++ b/src/compute_msd_chunk.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_msd_chunk.h"
 #include "atom.h"
 #include "group.h"
diff --git a/src/compute_omega_chunk.cpp b/src/compute_omega_chunk.cpp
index d89c57889e2ce515fca42ec070ef898eda1786c6..23447da602d492a6ad97924891f6cb56a6e8ce15 100644
--- a/src/compute_omega_chunk.cpp
+++ b/src/compute_omega_chunk.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_omega_chunk.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_orientorder_atom.cpp b/src/compute_orientorder_atom.cpp
index 4fc9ab060b39eda652f027023d1864535c6b3355..f263fdfaed0caa3cdeea54cf149b080c716bf7be 100644
--- a/src/compute_orientorder_atom.cpp
+++ b/src/compute_orientorder_atom.cpp
@@ -16,9 +16,9 @@
                          Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "compute_orientorder_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_pair.cpp b/src/compute_pair.cpp
index b00944e1bcc6b42a9eae7d9170fd402421a38d37..444395bae5dc999fbf9181be76822762a2eeec58 100644
--- a/src/compute_pair.cpp
+++ b/src/compute_pair.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
 #include "compute_pair.h"
 #include "update.h"
 #include "force.h"
diff --git a/src/compute_pair_local.cpp b/src/compute_pair_local.cpp
index 1d28ae8b769ebcbc7ea427fa9b5008e986a03fc2..3f1147ed2778c3640c749ee76c7db66b28f9ca24 100644
--- a/src/compute_pair_local.cpp
+++ b/src/compute_pair_local.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "compute_pair_local.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_pe.cpp b/src/compute_pe.cpp
index 342c1c5cc550f6d57165c71d35e214da433b3fe0..5839ec209599834366af029d48f37d03c2d2a6eb 100644
--- a/src/compute_pe.cpp
+++ b/src/compute_pe.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
 #include "compute_pe.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_pe_atom.cpp b/src/compute_pe_atom.cpp
index c324a8eff7d4740b723c96559f0a69bf9dc92ed4..2f1dc5650eb5b7f507efece1cd7ac065547812d0 100644
--- a/src/compute_pe_atom.cpp
+++ b/src/compute_pe_atom.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_pe_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_pressure.cpp b/src/compute_pressure.cpp
index 99046e864cc0f418c765fab9c80f65253b9edfa1..dde02a5aed62dabd961a4812b110db115505c70f 100644
--- a/src/compute_pressure.cpp
+++ b/src/compute_pressure.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "compute_pressure.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_property_atom.cpp b/src/compute_property_atom.cpp
index d158d0081615df68d648149c8a60d3affe1bba62..76df5a053dfc0e10b88c9369735ed597c639110f 100644
--- a/src/compute_property_atom.cpp
+++ b/src/compute_property_atom.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "compute_property_atom.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/compute_property_chunk.cpp b/src/compute_property_chunk.cpp
index c169e20d739a6ff6b1d59351abc1a9d126e570fc..489890e1cc4608f4fd7c54a33bef3ec33db0e843 100644
--- a/src/compute_property_chunk.cpp
+++ b/src/compute_property_chunk.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_property_chunk.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_property_local.cpp b/src/compute_property_local.cpp
index e38817b4ea8085a22f3dda409d9be22d272a4a7a..ad68459650a500a513f9d9e7718377f7a2870247 100644
--- a/src/compute_property_local.cpp
+++ b/src/compute_property_local.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_property_local.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/compute_rdf.cpp b/src/compute_rdf.cpp
index bcb620f3b36c59dd842669dd626baebcda760f31..263e7f799ba02eb254dcc422fdddd86f2bfa798f 100644
--- a/src/compute_rdf.cpp
+++ b/src/compute_rdf.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "compute_rdf.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_rdf.h b/src/compute_rdf.h
index af4f56e838500eda3f4674537e42230c32bcc75f..52a93a38dd78deac22423ef8930b4f3371dc5fa9 100644
--- a/src/compute_rdf.h
+++ b/src/compute_rdf.h
@@ -20,7 +20,7 @@ ComputeStyle(rdf,ComputeRDF)
 #ifndef LMP_COMPUTE_RDF_H
 #define LMP_COMPUTE_RDF_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "compute.h"
 
 namespace LAMMPS_NS {
diff --git a/src/compute_reduce.cpp b/src/compute_reduce.cpp
index 91379e9ba6dca5169c052530c71b53b032a869c7..7c61d666b2d9db9c9625b69bb08dfdafff49fa29 100644
--- a/src/compute_reduce.cpp
+++ b/src/compute_reduce.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "compute_reduce.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_reduce_region.cpp b/src/compute_reduce_region.cpp
index c867a0190ccde7331cb0060304124570891fd7f7..77cd6371c691170776926da985522f7923f69316 100644
--- a/src/compute_reduce_region.cpp
+++ b/src/compute_reduce_region.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "compute_reduce_region.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_slice.cpp b/src/compute_slice.cpp
index 23bed054ace3815a9a9cb19770ec17369e55b954..ac70e7dd15803751674ffaf9ee3fc25e5f674c06 100644
--- a/src/compute_slice.cpp
+++ b/src/compute_slice.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "compute_slice.h"
 #include "update.h"
 #include "modify.h"
diff --git a/src/compute_stress_atom.cpp b/src/compute_stress_atom.cpp
index fd38f13dbab0dd9c840b8db14e6ec3d9d4167706..5211f015abd19054f39552fa49f20f2fec68ebcb 100644
--- a/src/compute_stress_atom.cpp
+++ b/src/compute_stress_atom.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "compute_stress_atom.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_temp.cpp b/src/compute_temp.cpp
index 1fbab924b83ddc63930f70f4da031fd27b7151cd..f7d3a890ec6d9a044ab6b2cfbac9af8ca28b5611 100644
--- a/src/compute_temp.cpp
+++ b/src/compute_temp.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
 #include "compute_temp.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_temp_chunk.cpp b/src/compute_temp_chunk.cpp
index 1cc98c4ee83c9d63d3027b96271f74233573117f..920515e05c54ca3e4e9cb5437e3392b83a4a351b 100644
--- a/src/compute_temp_chunk.cpp
+++ b/src/compute_temp_chunk.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_temp_chunk.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_temp_com.cpp b/src/compute_temp_com.cpp
index 6d64ff5aee5af36ba8fb34b72d9fd6a25f32598b..35f4512ab2b76e8c7b16d1de171588b6c2a547f6 100644
--- a/src/compute_temp_com.cpp
+++ b/src/compute_temp_com.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "compute_temp_com.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_temp_deform.cpp b/src/compute_temp_deform.cpp
index c8b8200770e237d7b3d33c6698526f797fc5e758..907f7090987a5cb4c0b3261835aaec74384479c7 100644
--- a/src/compute_temp_deform.cpp
+++ b/src/compute_temp_deform.cpp
@@ -16,7 +16,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
 #include "compute_temp_deform.h"
 #include "domain.h"
 #include "atom.h"
diff --git a/src/compute_temp_partial.cpp b/src/compute_temp_partial.cpp
index 9df8e8b580f137f1fe73cc0b26ccf00bd82827cb..4b87a2249ed1f96593a901d264b1b9bd61f20621 100644
--- a/src/compute_temp_partial.cpp
+++ b/src/compute_temp_partial.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include "compute_temp_partial.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_temp_profile.cpp b/src/compute_temp_profile.cpp
index 236f5bc0960ff90b88c149c7d0dc9700172564cd..c7f0b28a6cb096184ad2f3b2cdd269df7af2664f 100644
--- a/src/compute_temp_profile.cpp
+++ b/src/compute_temp_profile.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "compute_temp_profile.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_temp_ramp.cpp b/src/compute_temp_ramp.cpp
index af6a730c9d2869c311afd572f1262023d0681839..42d258d8b2fe626d68524fc21af9b427dd477baf 100644
--- a/src/compute_temp_ramp.cpp
+++ b/src/compute_temp_ramp.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "compute_temp_ramp.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_temp_region.cpp b/src/compute_temp_region.cpp
index ed710bc73096a2093cf963eed78c4d717ed2b345..bde70a20f0c44058961dab409ca605bfe4e7a81e 100644
--- a/src/compute_temp_region.cpp
+++ b/src/compute_temp_region.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
 #include "compute_temp_region.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_temp_sphere.cpp b/src/compute_temp_sphere.cpp
index ad5cf565e9a8ecc4b3e1339ed6696693edcfd280..651da6dee521309e8e8951445359f0e20f1f34f0 100644
--- a/src/compute_temp_sphere.cpp
+++ b/src/compute_temp_sphere.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
 #include "compute_temp_sphere.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/compute_torque_chunk.cpp b/src/compute_torque_chunk.cpp
index 25386ad40d7873e836dd40738f2a022072de8107..d9de99bcb2589e4c8bfcb6fc63bf43163efe0761 100644
--- a/src/compute_torque_chunk.cpp
+++ b/src/compute_torque_chunk.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_torque_chunk.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_vacf.cpp b/src/compute_vacf.cpp
index b3f487a4d758cfdf2c9af81f77887f2833ee2a04..3ef3acf0bf662100946755fe3034a2c52f97b1d6 100644
--- a/src/compute_vacf.cpp
+++ b/src/compute_vacf.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_vacf.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/compute_vcm_chunk.cpp b/src/compute_vcm_chunk.cpp
index 0661bf44574d1f0a2ace74caa8fba70bc5172adf..a6dd796c63c7e71db984e60550ef4918d777cb83 100644
--- a/src/compute_vcm_chunk.cpp
+++ b/src/compute_vcm_chunk.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "compute_vcm_chunk.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/create_atoms.cpp b/src/create_atoms.cpp
index 6caa4157ce89e5b7b241415e0a357d111358eaf0..cdd2c5e37f4528da2f7844ba0462c608fad18b62 100644
--- a/src/create_atoms.cpp
+++ b/src/create_atoms.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "create_atoms.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/create_bonds.cpp b/src/create_bonds.cpp
index f19458772086dd9831f517e9d22011780d2b3088..8b5ab60f050777cd73fa8e93c8ba3307a0e1459a 100644
--- a/src/create_bonds.cpp
+++ b/src/create_bonds.cpp
@@ -15,8 +15,8 @@
    Contributing authors: Mike Salerno (NRL) added single methods
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "create_bonds.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/create_box.cpp b/src/create_box.cpp
index 3a131099813e086d1dd961a28748824959cfe50e..b5e37b759ca0bd4b6ec0cd7c49aeacf859450bde 100644
--- a/src/create_box.cpp
+++ b/src/create_box.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "create_box.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/delete_atoms.cpp b/src/delete_atoms.cpp
index f5324f95585417c787e149ddc0d3566cc79c49f1..e26ecad5f37a7e9fc44dce761dbf1f22b5895b40 100644
--- a/src/delete_atoms.cpp
+++ b/src/delete_atoms.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "delete_atoms.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/delete_bonds.cpp b/src/delete_bonds.cpp
index 97eb1c09a857246f3236be089f73c1cb46008325..fe32bca87977d92ac7c8b3a8f64509117cb1e619 100644
--- a/src/delete_bonds.cpp
+++ b/src/delete_bonds.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "delete_bonds.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/dihedral.cpp b/src/dihedral.cpp
index f5c1c6c44c143604cec5ec3aa9b1bbd8ea03688d..adccf2a490b32d90828b69110bbb97e512934b09 100644
--- a/src/dihedral.cpp
+++ b/src/dihedral.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "dihedral.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/dihedral.h b/src/dihedral.h
index d27810c4d6e79ede7d5875daced83861f2461346..627104871b9b51f8b13966af119e64a3b12c6f1a 100644
--- a/src/dihedral.h
+++ b/src/dihedral.h
@@ -14,7 +14,7 @@
 #ifndef LMP_DIHEDRAL_H
 #define LMP_DIHEDRAL_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 
 namespace LAMMPS_NS {
diff --git a/src/dihedral_hybrid.cpp b/src/dihedral_hybrid.cpp
index 372a858d023e19730129c4bf8d85083b383e6514..b9107ac874cc674f01cda6c7fce741f21c58432a 100644
--- a/src/dihedral_hybrid.cpp
+++ b/src/dihedral_hybrid.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <ctype.h>
+#include <cmath>
+#include <cstring>
+#include <cctype>
 #include "dihedral_hybrid.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/dihedral_hybrid.h b/src/dihedral_hybrid.h
index 6e30d3d693373ca6859a52ac2a9f9acdab07c93b..0839fdfc61a8f6cdb9c45589d5cfbe6495d79167 100644
--- a/src/dihedral_hybrid.h
+++ b/src/dihedral_hybrid.h
@@ -20,7 +20,7 @@ DihedralStyle(hybrid,DihedralHybrid)
 #ifndef LMP_DIHEDRAL_HYBRID_H
 #define LMP_DIHEDRAL_HYBRID_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "dihedral.h"
 
 namespace LAMMPS_NS {
diff --git a/src/dihedral_zero.cpp b/src/dihedral_zero.cpp
index 9b0c569fcac8743bf3124bcfe1359aeb35f07e40..bdd2eaadd3d484e5f709531be0ac43635b826ed1 100644
--- a/src/dihedral_zero.cpp
+++ b/src/dihedral_zero.cpp
@@ -15,9 +15,9 @@
    Contributing author: Carsten Svaneborg (SDU)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "dihedral_zero.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/dihedral_zero.h b/src/dihedral_zero.h
index d27ff6abbad9f5acc0e00558a0a1482f4f89c7d9..e7dbb0d3a53a9dae1f675db394b6755f68efa42d 100644
--- a/src/dihedral_zero.h
+++ b/src/dihedral_zero.h
@@ -24,7 +24,7 @@ DihedralStyle(zero,DihedralZero)
 #ifndef LMP_DIHEDRAL_ZERO_H
 #define LMP_DIHEDRAL_ZERO_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "dihedral.h"
 
 namespace LAMMPS_NS {
diff --git a/src/displace_atoms.cpp b/src/displace_atoms.cpp
index 66988d467339c4d56a3b6d93ed136ab700473d23..04088bec8ce76233552a9f39da188d853eb0e7e1 100644
--- a/src/displace_atoms.cpp
+++ b/src/displace_atoms.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "displace_atoms.h"
 #include "atom.h"
 #include "modify.h"
diff --git a/src/domain.cpp b/src/domain.cpp
index c4dcf20b6423dc48d98c28243dbec9f97738b3ec..eae4f3926df72c1c587785e78db2f79efdb12bcf 100644
--- a/src/domain.cpp
+++ b/src/domain.cpp
@@ -16,10 +16,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <math.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+#include <cmath>
 #include "domain.h"
 #include "style_region.h"
 #include "atom.h"
@@ -518,7 +518,7 @@ void Domain::pbc()
   coord = &x[0][0];  // note: x is always initialized to at least one element.
   int flag = 0;
   for (i = 0; i < n3; i++)
-    if (!ISFINITE(*coord++)) flag = 1;
+    if (!std::isfinite(*coord++)) flag = 1;
   if (flag) error->one(FLERR,"Non-numeric atom coords - simulation unstable");
 
   // setup for PBC checks
diff --git a/src/domain.h b/src/domain.h
index 649e722c50723ee4283a5cdba205d4c48c5311f9..fe2502c691476c32ebed7448ed035b4533f9d608 100644
--- a/src/domain.h
+++ b/src/domain.h
@@ -14,7 +14,7 @@
 #ifndef LMP_DOMAIN_H
 #define LMP_DOMAIN_H
 
-#include <math.h>
+#include <cmath>
 #include "pointers.h"
 #include <map>
 #include <string>
diff --git a/src/dump.cpp b/src/dump.cpp
index be42693b8dacb7e2886b7fb1018f4a1271e01754..46e556600a8473ffa80feca8bc90a28e08a788f1 100644
--- a/src/dump.cpp
+++ b/src/dump.cpp
@@ -12,9 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 #include "dump.h"
 #include "atom.h"
 #include "irregular.h"
diff --git a/src/dump.h b/src/dump.h
index 472f69bfb9e95212c5d6e90579b0b46446fcb8b0..b726b9c3e73d764cbe1bfbaebbc2791f3fc52347 100644
--- a/src/dump.h
+++ b/src/dump.h
@@ -15,7 +15,7 @@
 #define LMP_DUMP_H
 
 #include <mpi.h>
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 
 namespace LAMMPS_NS {
diff --git a/src/dump_atom.cpp b/src/dump_atom.cpp
index 6221463920f18e1efdf7e87347ac274dc4d83e4e..74583f40131cead43003e76838ddeeac204555fd 100644
--- a/src/dump_atom.cpp
+++ b/src/dump_atom.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "dump_atom.h"
 #include "domain.h"
 #include "atom.h"
diff --git a/src/dump_cfg.cpp b/src/dump_cfg.cpp
index 6ebdd0f99af74d2f0cee0db72caeda8df0c856ee..15f64688464ad35e20952de8adc746f787a42302 100644
--- a/src/dump_cfg.cpp
+++ b/src/dump_cfg.cpp
@@ -16,9 +16,9 @@
         Memory efficiency improved by Ray Shan (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "dump_cfg.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/dump_custom.cpp b/src/dump_custom.cpp
index 34ab2182049679750bb0c8f59b407d721f9c481d..174fcd73c875ac04f308d612d81ce25835712f4e 100644
--- a/src/dump_custom.cpp
+++ b/src/dump_custom.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "dump_custom.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/dump_dcd.cpp b/src/dump_dcd.cpp
index ca7246ab241f4875eeb0886215efa2baaa64d58a..384e9089c0a1781bfaaaf2eb87137a823382367b 100644
--- a/src/dump_dcd.cpp
+++ b/src/dump_dcd.cpp
@@ -16,11 +16,11 @@
                         Axel Kohlmeyer (Temple U), support for groups
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <time.h>
-#include <string.h>
+#include <cmath>
+#include <inttypes.h> // <cinttypes> requires C++-11
+#include <cstdio>
+#include <ctime>
+#include <cstring>
 #include "dump_dcd.h"
 #include "domain.h"
 #include "atom.h"
diff --git a/src/dump_image.cpp b/src/dump_image.cpp
index 9ca6ad34e90fa88c99d317bd36c755325fd72949..60a1f545c9715d951d07590891e4f31888b3746c 100644
--- a/src/dump_image.cpp
+++ b/src/dump_image.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cctype>
+#include <cstdlib>
+#include <cstring>
 #include "dump_image.h"
 #include "image.h"
 #include "atom.h"
diff --git a/src/dump_local.cpp b/src/dump_local.cpp
index ca8b1822a2611dfffae2fc6c6579f8995c434617..0d5172b5c1bdaf0de61828a464bc0e7b09a61006 100644
--- a/src/dump_local.cpp
+++ b/src/dump_local.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "dump_local.h"
 #include "atom.h"
 #include "modify.h"
diff --git a/src/dump_movie.cpp b/src/dump_movie.cpp
index cb8982cabe38c400198d5427eda89b9677bccda3..59dfdc3d6e9e579ee49d851577182bbde622700a 100644
--- a/src/dump_movie.cpp
+++ b/src/dump_movie.cpp
@@ -15,9 +15,9 @@
    Contributing author:  Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "dump_movie.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/dump_xyz.cpp b/src/dump_xyz.cpp
index 7059e855908a1b15551febca652b028e8a85c68a..fd52671d8140056f8fce6995d5f8e7e4680e6410 100644
--- a/src/dump_xyz.cpp
+++ b/src/dump_xyz.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "dump_xyz.h"
 #include "atom.h"
 #include "group.h"
diff --git a/src/error.cpp b/src/error.cpp
index 9193314fc8c8674c445341d9e993c4690499da55..3c8d8bb34cda52a888342a6165f7a19424f91991 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "error.h"
 #include "universe.h"
 #include "output.h"
diff --git a/src/finish.cpp b/src/finish.cpp
index c22b26782e7c63e9ae4ee1b7a9fcbdcbe2978770..f35fb7e3a502a785747b2c98476ee0aa4e2c3dd1 100644
--- a/src/finish.cpp
+++ b/src/finish.cpp
@@ -12,10 +12,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 #include "finish.h"
 #include "timer.h"
 #include "universe.h"
diff --git a/src/fix.cpp b/src/fix.cpp
index 297d184967617100ae2ea25804ec5beb9d7e1217..a54e2957985207ee6c5a27f59ae70483763d251b 100644
--- a/src/fix.cpp
+++ b/src/fix.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <ctype.h>
+#include <cstring>
+#include <cctype>
 #include "fix.h"
 #include "atom.h"
 #include "group.h"
diff --git a/src/fix_adapt.cpp b/src/fix_adapt.cpp
index 10b09f4a7f56d5d14c49489eba9a0eb343ceebc9..754c9ea4da41230b46836b28ca69a6e990c77b05 100644
--- a/src/fix_adapt.cpp
+++ b/src/fix_adapt.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_adapt.h"
 #include "atom.h"
 #include "bond.h"
diff --git a/src/fix_addforce.cpp b/src/fix_addforce.cpp
index 6b1e89227985acb0dc12336520962ff7599ffee3..c2eedccd6151e6306bcf11d6f7a380413434850a 100644
--- a/src/fix_addforce.cpp
+++ b/src/fix_addforce.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "fix_addforce.h"
 #include "atom.h"
 #include "atom_masks.h"
diff --git a/src/fix_ave_atom.cpp b/src/fix_ave_atom.cpp
index c4222f6fcd056dde4816de1629394ec2e03f0b21..a8c3be07af55fe5eab76b1c35fbd3afe0b2340f4 100644
--- a/src/fix_ave_atom.cpp
+++ b/src/fix_ave_atom.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_ave_atom.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/fix_ave_atom.h b/src/fix_ave_atom.h
index c2f5067309559903ede2270a424531224a23329e..e4baf6bda14bfc8672e1ae1818117826a1028ddd 100644
--- a/src/fix_ave_atom.h
+++ b/src/fix_ave_atom.h
@@ -20,7 +20,7 @@ FixStyle(ave/atom,FixAveAtom)
 #ifndef LMP_FIX_AVE_ATOM_H
 #define LMP_FIX_AVE_ATOM_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/fix_ave_chunk.cpp b/src/fix_ave_chunk.cpp
index 8558e8695c10d3e04a5ef218aee8bc32e499b657..5f727fd3f747f6c9ec21cf7fcdf873cf57ecf5cb 100644
--- a/src/fix_ave_chunk.cpp
+++ b/src/fix_ave_chunk.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 #include "fix_ave_chunk.h"
 #include "atom.h"
diff --git a/src/fix_ave_chunk.h b/src/fix_ave_chunk.h
index a69b07f5d07986b060548e72fc4f96b59563fbd8..4dc1c1c24602e8947a027866222f7b6e843cab69 100644
--- a/src/fix_ave_chunk.h
+++ b/src/fix_ave_chunk.h
@@ -20,7 +20,7 @@ FixStyle(ave/chunk,FixAveChunk)
 #ifndef LMP_FIX_AVE_CHUNK_H
 #define LMP_FIX_AVE_CHUNK_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/fix_ave_correlate.cpp b/src/fix_ave_correlate.cpp
index fffcc09d7ae7d3787397f229a918753b48d5abec..418464a2484b4884e58a2966a410eb9e092b1d38 100644
--- a/src/fix_ave_correlate.cpp
+++ b/src/fix_ave_correlate.cpp
@@ -17,8 +17,8 @@
      Reese Jones (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 #include "fix_ave_correlate.h"
 #include "update.h"
diff --git a/src/fix_ave_correlate.h b/src/fix_ave_correlate.h
index 6d2567e73073040d7332e3e41a1d2c84efac1e53..ff20e8ba94c2e54ec8c98cb735b734d0fb8a943f 100644
--- a/src/fix_ave_correlate.h
+++ b/src/fix_ave_correlate.h
@@ -20,7 +20,7 @@ FixStyle(ave/correlate,FixAveCorrelate)
 #ifndef LMP_FIX_AVE_CORRELATE_H
 #define LMP_FIX_AVE_CORRELATE_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/fix_ave_histo.cpp b/src/fix_ave_histo.cpp
index e104512479f07ed93af3dcadc866de7cf557cb70..7aa599389979bac8cdfe48614a5302c7834a2bac 100644
--- a/src/fix_ave_histo.cpp
+++ b/src/fix_ave_histo.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 #include "fix_ave_histo.h"
 #include "atom.h"
diff --git a/src/fix_ave_histo.h b/src/fix_ave_histo.h
index 123122b05182f9ba72d1b5fc2d52c83011a46510..3616959c612a0e66760eaa21b588ddc4728a4bb7 100644
--- a/src/fix_ave_histo.h
+++ b/src/fix_ave_histo.h
@@ -20,7 +20,7 @@ FixStyle(ave/histo,FixAveHisto)
 #ifndef LMP_FIX_AVE_HISTO_H
 #define LMP_FIX_AVE_HISTO_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/fix_ave_histo_weight.cpp b/src/fix_ave_histo_weight.cpp
index 37dd8c9898c74f16f5bea3d52aff364a12ab8d15..c78f4fa1e38765c2e150c59f840d00bc535deee4 100644
--- a/src/fix_ave_histo_weight.cpp
+++ b/src/fix_ave_histo_weight.cpp
@@ -15,8 +15,8 @@
    Contributing author: Shawn Coleman (ARL)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 #include "fix_ave_histo_weight.h"
 #include "atom.h"
diff --git a/src/fix_ave_histo_weight.h b/src/fix_ave_histo_weight.h
index 22812384de036920a44fa25a3d96c1dd065447a6..e5638e121569cd5e328ad7760a3ea6b957af8938 100644
--- a/src/fix_ave_histo_weight.h
+++ b/src/fix_ave_histo_weight.h
@@ -20,7 +20,7 @@ FixStyle(ave/histo/weight,FixAveHistoWeight)
 #ifndef LMP_FIX_AVE_HISTO_WEIGHT_H
 #define LMP_FIX_AVE_HISTO_WEIGHT_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix_ave_histo.h"
 
 namespace LAMMPS_NS {
diff --git a/src/fix_ave_time.cpp b/src/fix_ave_time.cpp
index 5de32c7faea287cb391f2520dacd7b5aedbc0eec..c3ace296842b0cb3738c62b635ed7fb48854e48a 100644
--- a/src/fix_ave_time.cpp
+++ b/src/fix_ave_time.cpp
@@ -15,8 +15,8 @@
    Contributing author: Pieter in 't Veld (SNL)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 #include "fix_ave_time.h"
 #include "update.h"
diff --git a/src/fix_ave_time.h b/src/fix_ave_time.h
index aa1d2333cfa74d05ac886b59ce96701c20d78eaa..62dfbad2963e90b29679929dbfaf3b488df6d06c 100644
--- a/src/fix_ave_time.h
+++ b/src/fix_ave_time.h
@@ -20,7 +20,7 @@ FixStyle(ave/time,FixAveTime)
 #ifndef LMP_FIX_AVE_TIME_H
 #define LMP_FIX_AVE_TIME_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/fix_aveforce.cpp b/src/fix_aveforce.cpp
index 793c2d5c2b230756c34de697474180279839eca2..4432a5dd36d8aeb369a34c0523bc1592a83050a7 100644
--- a/src/fix_aveforce.cpp
+++ b/src/fix_aveforce.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "fix_aveforce.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix_balance.cpp b/src/fix_balance.cpp
index 9f29400d9a5291590c5f7ed83e9a6d90b26b33b1..29ea5360661a8779db624233f79594526f1d5a45 100644
--- a/src/fix_balance.cpp
+++ b/src/fix_balance.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "fix_balance.h"
 #include "balance.h"
 #include "update.h"
diff --git a/src/fix_balance.h b/src/fix_balance.h
index 8b8759ec9783f5c3dfe201dabab823a672497657..64383b59508bce2ded60e67a7311a28cd164a9bc 100644
--- a/src/fix_balance.h
+++ b/src/fix_balance.h
@@ -20,7 +20,7 @@ FixStyle(balance,FixBalance)
 #ifndef LMP_FIX_BALANCE_H
 #define LMP_FIX_BALANCE_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/fix_box_relax.cpp b/src/fix_box_relax.cpp
index 21bc09b259420113ec9b3c8307c1ebc6dc918479..a315330d149eb40f0f5fb7f4446f6495d8738149 100644
--- a/src/fix_box_relax.cpp
+++ b/src/fix_box_relax.cpp
@@ -15,9 +15,9 @@
    Contributing author: Aidan Thompson (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_box_relax.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/fix_controller.cpp b/src/fix_controller.cpp
index e283b1c19257b36758c4c685369fb03ae4fc8b26..eb7a79496253bd787e7baa1a33b59301cfa83773 100644
--- a/src/fix_controller.cpp
+++ b/src/fix_controller.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_controller.h"
 #include "force.h"
 #include "update.h"
diff --git a/src/fix_deform.cpp b/src/fix_deform.cpp
index 705f1970afa1d15658ed014dd3168f24d5b96b7a..65e1bee63b47310bff3931ff0b7b7679e91a9c1f 100644
--- a/src/fix_deform.cpp
+++ b/src/fix_deform.cpp
@@ -15,9 +15,9 @@
    Contributing author: Pieter in 't Veld (SNL)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "fix_deform.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix_deprecated.cpp b/src/fix_deprecated.cpp
index 9c0b6686d10e6c48b264c30f11b34537ae884e26..d0a63b00964471cd76666ae655f6e7205b0a7b8b 100644
--- a/src/fix_deprecated.cpp
+++ b/src/fix_deprecated.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_deprecated.h"
 #include "comm.h"
 #include "error.h"
diff --git a/src/fix_drag.cpp b/src/fix_drag.cpp
index 3fda219126cbccc3bc8463bb07eea26ae96d3259..6a69dddbf5d744a8028c3aac143def239e3991cf 100644
--- a/src/fix_drag.cpp
+++ b/src/fix_drag.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_drag.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix_dt_reset.cpp b/src/fix_dt_reset.cpp
index 48d09150a5337a3ba67e451b83d55fdeae01dc73..006bf27e77729c1f45078642f80bec2014631f65 100644
--- a/src/fix_dt_reset.cpp
+++ b/src/fix_dt_reset.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_dt_reset.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix_enforce2d.cpp b/src/fix_enforce2d.cpp
index 336fd125563579490a66d9107138c12f0fa5ca47..4ffd2ca7ac233342910b495e839ac293f5583dd4 100644
--- a/src/fix_enforce2d.cpp
+++ b/src/fix_enforce2d.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_enforce2d.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix_external.cpp b/src/fix_external.cpp
index a3b697bb2b6a006d78101a156c423fe5e2dda54d..4fcc842f899401eebc0f21e2fdf0abe86a7f3e41 100644
--- a/src/fix_external.cpp
+++ b/src/fix_external.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
 #include "fix_external.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix_gravity.cpp b/src/fix_gravity.cpp
index 5582357c075eba7df09984ffb0c1a86b9b67fd23..9ace9d45ffcad6a3a6b86f3111e503ec3237b764 100644
--- a/src/fix_gravity.cpp
+++ b/src/fix_gravity.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "fix_gravity.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix_group.cpp b/src/fix_group.cpp
index 8479565891a77dd0ba1471d9560362755d097968..d316f52425bcc914a043afee82762351ae6c8954 100644
--- a/src/fix_group.cpp
+++ b/src/fix_group.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_group.h"
 #include "group.h"
 #include "update.h"
diff --git a/src/fix_halt.cpp b/src/fix_halt.cpp
index 48d0f5da25ae55b9de9683980e41126cfb930ae4..7de09a0fa4b9add400543a97a62f2f8a73ad2f74 100644
--- a/src/fix_halt.cpp
+++ b/src/fix_halt.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_halt.h"
 #include "update.h"
 #include "force.h"
diff --git a/src/fix_halt.h b/src/fix_halt.h
index 73c8d0115a100979da441c3629e9166901133126..d3b39cc1e2af13ee04d1813e738df6f5ad11c6e3 100644
--- a/src/fix_halt.h
+++ b/src/fix_halt.h
@@ -20,7 +20,7 @@ FixStyle(halt,FixHalt)
 #ifndef LMP_FIX_HALT_H
 #define LMP_FIX_HALT_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/fix_heat.cpp b/src/fix_heat.cpp
index 846531dbb987eaa3c1870c4c5c20e1ba1448f82c..f34845785c03b583e508ddd671d97023c4dd3e9a 100644
--- a/src/fix_heat.cpp
+++ b/src/fix_heat.cpp
@@ -15,9 +15,9 @@
    Contributing author: Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_heat.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/fix_indent.cpp b/src/fix_indent.cpp
index 331d84ff9aa61edded4b18edfb69382c41f52c3c..ade8cee5328d711ddbfd6ccb4088fe49120f7b88 100644
--- a/src/fix_indent.cpp
+++ b/src/fix_indent.cpp
@@ -15,9 +15,9 @@
    Contributing author: Ravi Agrawal (Northwestern U)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_indent.h"
 #include "atom.h"
 #include "input.h"
diff --git a/src/fix_langevin.cpp b/src/fix_langevin.cpp
index 22993530010c9b0a016bb04e67006d6232e111e1..e4c36cc73917fe0f7d6b8b7ad094741d94cb1f8d 100644
--- a/src/fix_langevin.cpp
+++ b/src/fix_langevin.cpp
@@ -17,9 +17,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_langevin.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/fix_lineforce.cpp b/src/fix_lineforce.cpp
index 1e78bf3ec390130d229509bdec35d17d4a52e9c1..e90152c4e1092ef95b94df1371f6131f94e8d979 100644
--- a/src/fix_lineforce.cpp
+++ b/src/fix_lineforce.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_lineforce.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix_minimize.cpp b/src/fix_minimize.cpp
index cc00cc286ac98e625984b438ba228a45d99364f0..06a3ac900d7cd28209682056d923b6889ecc37d2 100644
--- a/src/fix_minimize.cpp
+++ b/src/fix_minimize.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "fix_minimize.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/fix_momentum.cpp b/src/fix_momentum.cpp
index 63ec71f10d592f4d8f782f87f7fb8a37a0b302f1..680251e670a44330782eaab69619a55119a2c7de 100644
--- a/src/fix_momentum.cpp
+++ b/src/fix_momentum.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_momentum.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/fix_move.cpp b/src/fix_move.cpp
index a32c80c1e9e7d29fa5d098c086171a1cbb40ab3b..9eadfa5ab4c7c9b2a41102e9997f90178633d9bc 100644
--- a/src/fix_move.cpp
+++ b/src/fix_move.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "fix_move.h"
 #include "atom.h"
 #include "group.h"
diff --git a/src/fix_move.h b/src/fix_move.h
index 13c9bc66b83cc4627eb6b5ee20f7becf7954bd88..5993d7d6e808f0e57b3427660c8d58e6bea6daeb 100644
--- a/src/fix_move.h
+++ b/src/fix_move.h
@@ -20,7 +20,7 @@ FixStyle(move,FixMove)
 #ifndef LMP_FIX_MOVE_H
 #define LMP_FIX_MOVE_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/fix_neigh_history.cpp b/src/fix_neigh_history.cpp
index e8bfe840d8059b6b9ac0d20ad1e7132e995b357f..3329b604efa4a0e2f6310e34cce95d7ca6902a14 100644
--- a/src/fix_neigh_history.cpp
+++ b/src/fix_neigh_history.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 #include "fix_neigh_history.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/fix_nh.cpp b/src/fix_nh.cpp
index e4500b19ca09c189f867b1e11819cd7af7e407bd..186376d95230bc8d2bbbf977c95fba8c5c16243f 100644
--- a/src/fix_nh.cpp
+++ b/src/fix_nh.cpp
@@ -15,9 +15,9 @@
    Contributing authors: Mark Stevens (SNL), Aidan Thompson (SNL)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "fix_nh.h"
 #include "math_extra.h"
 #include "atom.h"
@@ -1034,7 +1034,7 @@ void FixNH::couple()
     p_current[2] = tensor[2];
   }
 
-  if (!ISFINITE(p_current[0]) || !ISFINITE(p_current[1]) || !ISFINITE(p_current[2]))
+  if (!std::isfinite(p_current[0]) || !std::isfinite(p_current[1]) || !std::isfinite(p_current[2]))
     error->all(FLERR,"Non-numeric pressure - simulation unstable");
 
   // switch order from xy-xz-yz to Voigt
@@ -1044,7 +1044,7 @@ void FixNH::couple()
     p_current[4] = tensor[4];
     p_current[5] = tensor[3];
 
-    if (!ISFINITE(p_current[3]) || !ISFINITE(p_current[4]) || !ISFINITE(p_current[5]))
+    if (!std::isfinite(p_current[3]) || !std::isfinite(p_current[4]) || !std::isfinite(p_current[5]))
       error->all(FLERR,"Non-numeric pressure - simulation unstable");
   }
 }
diff --git a/src/fix_nh_sphere.cpp b/src/fix_nh_sphere.cpp
index cc59e4a1016eef159e0b4e04f21dc9f21bfa111c..f1764932429c84c80f9660a777153eff82470060 100644
--- a/src/fix_nh_sphere.cpp
+++ b/src/fix_nh_sphere.cpp
@@ -15,7 +15,7 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "fix_nh_sphere.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/fix_nph.cpp b/src/fix_nph.cpp
index a331a07d2404c30b0b61bfd27580dd2a76782f95..40265ef57c6e278a5260a5a007d3a1597d758c44 100644
--- a/src/fix_nph.cpp
+++ b/src/fix_nph.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_nph.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/fix_nph_sphere.cpp b/src/fix_nph_sphere.cpp
index 852234074f0c212bf53691508e1275289fbbe878..3fcbe5e9c686e7801156570b42021c03ab60e9fa 100644
--- a/src/fix_nph_sphere.cpp
+++ b/src/fix_nph_sphere.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_nph_sphere.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/fix_npt.cpp b/src/fix_npt.cpp
index e14200f6a2617af055f13ca0ddffe015bb897fbe..d17577d68d7c1e751f3d19a43eb4f5d1da9ac497 100644
--- a/src/fix_npt.cpp
+++ b/src/fix_npt.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_npt.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/fix_npt_sphere.cpp b/src/fix_npt_sphere.cpp
index d3773e0d177296eeab5edc912bae43e1ce41fc93..50ac990dafc0ad3295ff6821472611e9b3011e76 100644
--- a/src/fix_npt_sphere.cpp
+++ b/src/fix_npt_sphere.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_npt_sphere.h"
 #include "modify.h"
 #include "error.h"
diff --git a/src/fix_nve.cpp b/src/fix_nve.cpp
index 64ec3373f12c81137a7884c25f358bcc2e609174..58e33b9744b7c84eac6ca72b6d05ae7b502b571d 100644
--- a/src/fix_nve.cpp
+++ b/src/fix_nve.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include "fix_nve.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/fix_nve_limit.cpp b/src/fix_nve_limit.cpp
index 6f85d107f113c178332c03450d55a77d0ee44747..f659597af7aeeb0d35081ed02aa43736d58fe8a1 100644
--- a/src/fix_nve_limit.cpp
+++ b/src/fix_nve_limit.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "fix_nve_limit.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/fix_nve_noforce.cpp b/src/fix_nve_noforce.cpp
index aa24c26e03ff9bc7462da80aafb913dcc2258938..3403f4f5ec6b7f2eb7b71229159c18f3136b252e 100644
--- a/src/fix_nve_noforce.cpp
+++ b/src/fix_nve_noforce.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include "fix_nve_noforce.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix_nve_sphere.cpp b/src/fix_nve_sphere.cpp
index daf89871ab60a459f339959d2bf5abb4dce22d99..fe37324cfbac2164ea0bd04940df8145f12f7e7f 100644
--- a/src/fix_nve_sphere.cpp
+++ b/src/fix_nve_sphere.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include "fix_nve_sphere.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/fix_nvt.cpp b/src/fix_nvt.cpp
index 35ee085da1bb86a49038ae8da123357e80fd7009..7247612dd470bc71ce513e2ae2c1aef042508572 100644
--- a/src/fix_nvt.cpp
+++ b/src/fix_nvt.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_nvt.h"
 #include "group.h"
 #include "modify.h"
diff --git a/src/fix_nvt_sllod.cpp b/src/fix_nvt_sllod.cpp
index 87e86f235179e6e726719a4bed540990ed0f0365..270d721a008552e1de3ac0096df02cbfd7b17529 100644
--- a/src/fix_nvt_sllod.cpp
+++ b/src/fix_nvt_sllod.cpp
@@ -15,8 +15,8 @@
    Contributing author: Pieter in 't Veld (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "fix_nvt_sllod.h"
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/fix_nvt_sphere.cpp b/src/fix_nvt_sphere.cpp
index b65b3adfae38b1509e347ee53201b00b7fffc4bb..44046699ba96e16da7a787695a35bd49a00e7c67 100644
--- a/src/fix_nvt_sphere.cpp
+++ b/src/fix_nvt_sphere.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_nvt_sphere.h"
 #include "group.h"
 #include "modify.h"
diff --git a/src/fix_planeforce.cpp b/src/fix_planeforce.cpp
index 5e999c888cfdc9e2ab2b30a4e89bb8e9146f6da3..f90be6a233a330a9687ce56b7864d2bdda6128e6 100644
--- a/src/fix_planeforce.cpp
+++ b/src/fix_planeforce.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_planeforce.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix_press_berendsen.cpp b/src/fix_press_berendsen.cpp
index 04e2b3d39c535724b92f29fbc080d8b14c801b22..792154e93fe6dc222d1e9902019297731f48a486 100644
--- a/src/fix_press_berendsen.cpp
+++ b/src/fix_press_berendsen.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "fix_press_berendsen.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/fix_print.cpp b/src/fix_print.cpp
index b553a94e3a19eebfe1777eba3b54c2c92f5b9f64..16218e0088e7ab0d04c560bbb975bdace7d41ebd 100644
--- a/src/fix_print.cpp
+++ b/src/fix_print.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_print.h"
 #include "update.h"
 #include "input.h"
diff --git a/src/fix_print.h b/src/fix_print.h
index c3897b815f5fd8a7783a7aabc8f3cbda7f0d8181..1f6efdf10851f9c9780b09caf145555a9ac471da 100644
--- a/src/fix_print.h
+++ b/src/fix_print.h
@@ -20,7 +20,7 @@ FixStyle(print,FixPrint)
 #ifndef LMP_FIX_PRINT_H
 #define LMP_FIX_PRINT_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/fix_property_atom.cpp b/src/fix_property_atom.cpp
index 9ef939c58dc2a836ab0c143446b7736680bd4c0e..5ad4dfa4ba1bf2a3d4cee54695d80d28aa98bc71 100644
--- a/src/fix_property_atom.cpp
+++ b/src/fix_property_atom.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_property_atom.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/fix_read_restart.cpp b/src/fix_read_restart.cpp
index f174e8160d709d394985d3d3ace43bc5f9b19e95..b384234b99973c51aa8c8a8ce765e99257bc5b0d 100644
--- a/src/fix_read_restart.cpp
+++ b/src/fix_read_restart.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "fix_read_restart.h"
 #include "atom.h"
 #include "memory.h"
diff --git a/src/fix_recenter.cpp b/src/fix_recenter.cpp
index 499e1a4158cd57540b52d72f4af25153df0d1074..49e370ac806ead4df1a1845dacdd1341503d9630 100644
--- a/src/fix_recenter.cpp
+++ b/src/fix_recenter.cpp
@@ -15,8 +15,8 @@
    Contributing author: Naveen Michaud-Agrawal (Johns Hopkins U)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_recenter.h"
 #include "atom.h"
 #include "group.h"
diff --git a/src/fix_respa.cpp b/src/fix_respa.cpp
index 0b6febd7b8329c0db139a35173b3d2dfaeee4bdb..3b9aad1286c4e62dbab97e505cdd3afcd7ab6cee 100644
--- a/src/fix_respa.cpp
+++ b/src/fix_respa.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_respa.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/fix_restrain.cpp b/src/fix_restrain.cpp
index af11136d78d666851d4f446dac505ed526409632..2f75902d2cb1455aa0aa17975ca9f4eba50f9dd9 100644
--- a/src/fix_restrain.cpp
+++ b/src/fix_restrain.cpp
@@ -16,9 +16,9 @@
      support for bond and angle restraints by Andres Jaramillo-Botero (Caltech)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "fix_restrain.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/fix_setforce.cpp b/src/fix_setforce.cpp
index 99176bb3799c76444f3555c7f028434868507391..89b340b0ae422558e666f81190bb3c4055abf69c 100644
--- a/src/fix_setforce.cpp
+++ b/src/fix_setforce.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "fix_setforce.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix_spring.cpp b/src/fix_spring.cpp
index 9c6bd4084ffe53c568bd5edefe9ba0ecd4517bde..ecb84eeb0f0ead6b4aec161ae43b8a38d6e8fc89 100644
--- a/src/fix_spring.cpp
+++ b/src/fix_spring.cpp
@@ -15,9 +15,9 @@
    Contributing author: Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_spring.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix_spring_chunk.cpp b/src/fix_spring_chunk.cpp
index 773e032388b225fc1590c37b7f715116ebb4106a..53e9285a9c7ddd4869bb760c8b5cc60be790b073 100644
--- a/src/fix_spring_chunk.cpp
+++ b/src/fix_spring_chunk.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_spring_chunk.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix_spring_rg.cpp b/src/fix_spring_rg.cpp
index b7fd33ce7749c2dfb1b0c445edf41273a1a18a1c..c2e226a343dc657b5661f24b6991d390cac4f1ff 100644
--- a/src/fix_spring_rg.cpp
+++ b/src/fix_spring_rg.cpp
@@ -16,9 +16,9 @@
                         Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_spring_rg.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix_spring_self.cpp b/src/fix_spring_self.cpp
index b6d5e3c834d48a585658acf09999ae814c844199..1a5c89c6a15b43832f190d7f73dcfeaef3cf6383 100644
--- a/src/fix_spring_self.cpp
+++ b/src/fix_spring_self.cpp
@@ -15,8 +15,8 @@
    Contributing author: Naveen Michaud-Agrawal (Johns Hopkins University)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_spring_self.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix_store.cpp b/src/fix_store.cpp
index 3738629820e45e146b6ba569b7c2f459e815351c..3b1f3dca77dde1d15d645938e000a012c202ee9c 100644
--- a/src/fix_store.cpp
+++ b/src/fix_store.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_store.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/fix_store.h b/src/fix_store.h
index 1aad56323244c937850134658b899a8b7def75ad..5524770a9700be426df90671e5be2336c499b6f9 100644
--- a/src/fix_store.h
+++ b/src/fix_store.h
@@ -20,7 +20,7 @@ FixStyle(STORE,FixStore)
 #ifndef LMP_FIX_STORE_H
 #define LMP_FIX_STORE_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/fix_store_force.cpp b/src/fix_store_force.cpp
index cfeace532627c68a28ddf00a5c8e9a09cffa8f6d..5e2150f68d004cdd6a82d0f416ddbd00311520d7 100644
--- a/src/fix_store_force.cpp
+++ b/src/fix_store_force.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_store_force.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix_store_state.cpp b/src/fix_store_state.cpp
index 2f2ba3feff7ffbcf7deea48f91568e8cdc846874..3195e983e35019adb4c627f20a62bffa18dae2e3 100644
--- a/src/fix_store_state.cpp
+++ b/src/fix_store_state.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_store_state.h"
 #include "atom.h"
 #include "domain.h"
diff --git a/src/fix_temp_berendsen.cpp b/src/fix_temp_berendsen.cpp
index 7b312cfb5f35dbc1777aeb9e63c3a530ed1e9d9c..55518015c4a1a5bfd743e369d7b92a500ee1e2ed 100644
--- a/src/fix_temp_berendsen.cpp
+++ b/src/fix_temp_berendsen.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "fix_temp_berendsen.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/fix_temp_csld.cpp b/src/fix_temp_csld.cpp
index 63f27cdecb17968ecbc6f265ef78a45018a70535..7bdf7763555c56841348040e0f4f78bd246cd9b1 100644
--- a/src/fix_temp_csld.cpp
+++ b/src/fix_temp_csld.cpp
@@ -15,9 +15,9 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "fix_temp_csld.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/fix_temp_csvr.cpp b/src/fix_temp_csvr.cpp
index ae5868ff0ff7902859ac61b6b3cc40f072ac882c..495a1551135f48c37fb5c29d1a132434e5ed1f71 100644
--- a/src/fix_temp_csvr.cpp
+++ b/src/fix_temp_csvr.cpp
@@ -16,9 +16,9 @@
    Based on code by Paolo Raiteri (Curtin U) and Giovanni Bussi (SISSA)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "fix_temp_csvr.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/fix_temp_rescale.cpp b/src/fix_temp_rescale.cpp
index 52e2da7b3de2b35e7afb35fae4746f404041c214..11dfa6a5fcdf05c4e75a459f3bc5d74503616e83 100644
--- a/src/fix_temp_rescale.cpp
+++ b/src/fix_temp_rescale.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #include "fix_temp_rescale.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/fix_tmd.cpp b/src/fix_tmd.cpp
index f5ed970da7eb480a5b440ca94b5c6ef8e4253483..39d4173a63a058a40030512287d7441123266d63 100644
--- a/src/fix_tmd.cpp
+++ b/src/fix_tmd.cpp
@@ -17,9 +17,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_tmd.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix_tmd.h b/src/fix_tmd.h
index 337b037c2dad317ec79c4b4986864b9a4f2094bf..b6db41dd5a158361be5d000fd416c0afc9b216c3 100644
--- a/src/fix_tmd.h
+++ b/src/fix_tmd.h
@@ -20,7 +20,7 @@ FixStyle(tmd,FixTMD)
 #ifndef LMP_FIX_TMD_H
 #define LMP_FIX_TMD_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "fix.h"
 
 namespace LAMMPS_NS {
diff --git a/src/fix_vector.cpp b/src/fix_vector.cpp
index 4847926aaf60e6cb20060712a76a3e0e075b513c..9b7f01697084ce3e705dc1920de8b11f0b024a62 100644
--- a/src/fix_vector.cpp
+++ b/src/fix_vector.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "fix_vector.h"
 #include "update.h"
 #include "force.h"
diff --git a/src/fix_viscous.cpp b/src/fix_viscous.cpp
index 423bccc38323aecae8b07fc9cbbf34d7c7308e1c..1d2609c8b68ff782ba1e41c7798f4e944a6ed646 100644
--- a/src/fix_viscous.cpp
+++ b/src/fix_viscous.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_viscous.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix_wall.cpp b/src/fix_wall.cpp
index 2c3aa4afa0bd01856af22e5dee54bfedc5f19414..096bbe618a5a9b3fa234292807912f32642d210c 100644
--- a/src/fix_wall.cpp
+++ b/src/fix_wall.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_wall.h"
 #include "atom.h"
 #include "input.h"
diff --git a/src/fix_wall_harmonic.cpp b/src/fix_wall_harmonic.cpp
index 20d5dbebd4fef90efff97feb14114cde107efea4..4dc067178ad5d42da7f4f6c0eb580adff908df1e 100644
--- a/src/fix_wall_harmonic.cpp
+++ b/src/fix_wall_harmonic.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "fix_wall_harmonic.h"
 #include "atom.h"
 #include "error.h"
diff --git a/src/fix_wall_lj1043.cpp b/src/fix_wall_lj1043.cpp
index 35bfff1749e97c3392c6abf7ac5f79ad6af6ce5b..a93f4dd699c6424cfdc2d918aba8ab862df13cd9 100644
--- a/src/fix_wall_lj1043.cpp
+++ b/src/fix_wall_lj1043.cpp
@@ -15,7 +15,7 @@
    Contributing author: Jonathan Lee (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "fix_wall_lj1043.h"
 #include "atom.h"
 #include "math_const.h"
diff --git a/src/fix_wall_lj126.cpp b/src/fix_wall_lj126.cpp
index f556952ab3de5ec9bd7dff1118b3848f09c0016a..369ef78c97875ee693c2e0151e8527270068cfeb 100644
--- a/src/fix_wall_lj126.cpp
+++ b/src/fix_wall_lj126.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "fix_wall_lj126.h"
 #include "atom.h"
 #include "error.h"
diff --git a/src/fix_wall_lj93.cpp b/src/fix_wall_lj93.cpp
index f5d6a7e147d19ae5c062fc6157fe57c43738cf0e..ce5a06c81b956fbafe3570c73903a7a52afdc802 100644
--- a/src/fix_wall_lj93.cpp
+++ b/src/fix_wall_lj93.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "fix_wall_lj93.h"
 #include "atom.h"
 #include "error.h"
diff --git a/src/fix_wall_reflect.cpp b/src/fix_wall_reflect.cpp
index 86607dbe8e611078ba7f59de9c5c8b0984b4dded..8acba720352dc38030263f29486b55c77be4e539 100644
--- a/src/fix_wall_reflect.cpp
+++ b/src/fix_wall_reflect.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "fix_wall_reflect.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/fix_wall_region.cpp b/src/fix_wall_region.cpp
index 67b0bcd713750403bcc007d741e90aeae26387ef..ea1b62bfa5e160688cd7913e9cad106e5db60535 100644
--- a/src/fix_wall_region.cpp
+++ b/src/fix_wall_region.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "fix_wall_region.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/force.cpp b/src/force.cpp
index df32930e0ab0aa750215dd7299d3611a13958e5e..8ee301982d168c6f5c8389bee86d3d2404bcf903 100644
--- a/src/force.cpp
+++ b/src/force.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
 #include "force.h"
 #include "style_bond.h"
 #include "style_angle.h"
diff --git a/src/force.h b/src/force.h
index 76cd69ed76e62146f6007a97b5bc7fede686daa2..ce593fa518a0b772f528be8a3cb5269c440f2c26 100644
--- a/src/force.h
+++ b/src/force.h
@@ -15,7 +15,7 @@
 #define LMP_FORCE_H
 
 #include "pointers.h"
-#include <stdio.h>
+#include <cstdio>
 #include <map>
 #include <string>
 
diff --git a/src/group.cpp b/src/group.cpp
index 72224dcf25b58c186b544f9135e93ca4082aa847..9d33da9acb4e623ea80a0e1f5e9e5fe1928ada07 100644
--- a/src/group.cpp
+++ b/src/group.cpp
@@ -12,10 +12,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
 #include "group.h"
 #include "domain.h"
 #include "atom.h"
diff --git a/src/group.h b/src/group.h
index 8f07fa19d00d23097e8267a9fce7ba448939a101..6b6cbb1def7e4d2e5340fa6ce3f0b14664f642f3 100644
--- a/src/group.h
+++ b/src/group.h
@@ -14,7 +14,7 @@
 #ifndef LMP_GROUP_H
 #define LMP_GROUP_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 #include <map>
 
diff --git a/src/image.cpp b/src/image.cpp
index 033bcfb669d633dbb566b0ce5bc5cb42ad18157b..599ac4a09132c1917f087cf2c89d6270dd696519 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -16,10 +16,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cctype>
+#include <cstdlib>
+#include <cstring>
 #include "image.h"
 #include "math_extra.h"
 #include "random_mars.h"
@@ -35,7 +35,7 @@
 #ifdef LAMMPS_PNG
 #include <png.h>
 #include <zlib.h>
-#include <setjmp.h>
+#include <csetjmp>
 #include "version.h"
 #endif
 
diff --git a/src/image.h b/src/image.h
index 58050ada3278f8b8f4d140b2a43883c450ef049c..5672bf85c571d801876d37ebe889fefb12c1707c 100644
--- a/src/image.h
+++ b/src/image.h
@@ -14,8 +14,8 @@
 #ifndef LMP_IMAGE_H
 #define LMP_IMAGE_H
 
-#include <math.h>
-#include <stdio.h>
+#include <cmath>
+#include <cstdio>
 #include "pointers.h"
 
 namespace LAMMPS_NS {
diff --git a/src/imbalance.h b/src/imbalance.h
index ce7b700b9d66ddfb46db8d8132b3b8515d477e67..d3c3b9a64262c4dbd0aca56f83798a85db6b14b5 100644
--- a/src/imbalance.h
+++ b/src/imbalance.h
@@ -14,7 +14,7 @@
 #ifndef LMP_IMBALANCE_H
 #define LMP_IMBALANCE_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 
 namespace LAMMPS_NS {
diff --git a/src/imbalance_store.cpp b/src/imbalance_store.cpp
index 2903f8497ea29ed6940db945c0195f58ddf4f097..6b69caf785c964e831236c65a2b545ca4ec85ec6 100644
--- a/src/imbalance_store.cpp
+++ b/src/imbalance_store.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "imbalance_store.h"
 #include "atom.h"
 #include "input.h"
diff --git a/src/imbalance_var.cpp b/src/imbalance_var.cpp
index 394a9af3657f2788950041c338448594ad8254e7..acb3da8d1370ed6215549effa3a340abd492f82c 100644
--- a/src/imbalance_var.cpp
+++ b/src/imbalance_var.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "imbalance_var.h"
 #include "atom.h"
 #include "group.h"
diff --git a/src/improper.cpp b/src/improper.cpp
index 089fc43aad09205a0e72aecaa886ef3b78a87d50..17e2df4e590e65fe61000c948d129163173f0b97 100644
--- a/src/improper.cpp
+++ b/src/improper.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "improper.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/improper.h b/src/improper.h
index df3c966cdc4704b5d91c03332274fabd0e3ab9b5..adcf6d29c867251342105212f90c0a8cff947956 100644
--- a/src/improper.h
+++ b/src/improper.h
@@ -14,7 +14,7 @@
 #ifndef LMP_IMPROPER_H
 #define LMP_IMPROPER_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 
 namespace LAMMPS_NS {
diff --git a/src/improper_hybrid.cpp b/src/improper_hybrid.cpp
index abaaae02dabeee2e79519f363dcdce22f045ea29..3c17e42eafe77e26b1af427561f010ea130cb667 100644
--- a/src/improper_hybrid.cpp
+++ b/src/improper_hybrid.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <ctype.h>
+#include <cmath>
+#include <cstring>
+#include <cctype>
 #include "improper_hybrid.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/improper_hybrid.h b/src/improper_hybrid.h
index dbba347cf947e96238e3b587ef933f1380627ce8..89595ccfc44ff6f07ecfac4641b9440769a1f7fd 100644
--- a/src/improper_hybrid.h
+++ b/src/improper_hybrid.h
@@ -20,7 +20,7 @@ ImproperStyle(hybrid,ImproperHybrid)
 #ifndef LMP_IMPROPER_HYBRID_H
 #define LMP_IMPROPER_HYBRID_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "improper.h"
 
 namespace LAMMPS_NS {
diff --git a/src/improper_zero.cpp b/src/improper_zero.cpp
index 556e427ff8b9203112c8cb53f475ceab4bb6379a..25ab3e7bbafa554104b440245c07dda93a18f924 100644
--- a/src/improper_zero.cpp
+++ b/src/improper_zero.cpp
@@ -15,9 +15,9 @@
    Contributing author: Carsten Svaneborg (SDU)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "improper_zero.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/improper_zero.h b/src/improper_zero.h
index 0e16411fefac513a33415f66142cbd34e4f76729..0a2290b6f747a45013639005239284fe59c548fe 100644
--- a/src/improper_zero.h
+++ b/src/improper_zero.h
@@ -20,7 +20,7 @@ ImproperStyle(zero,ImproperZero)
 #ifndef LMP_IMPROPER_ZERO_H
 #define LMP_IMPROPER_ZERO_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "improper.h"
 
 namespace LAMMPS_NS {
diff --git a/src/info.cpp b/src/info.cpp
index e1103c0530b8638d3505ec9a13b50023d280bad9..65c0cd9b53dcb4f480b54d4095752b9179546a6b 100644
--- a/src/info.cpp
+++ b/src/info.cpp
@@ -16,7 +16,7 @@
                           Richard Berger (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "info.h"
 #include "accelerator_kokkos.h"
 #include "atom.h"
@@ -43,7 +43,7 @@
 #include "update.h"
 #include "error.h"
 
-#include <time.h>
+#include <ctime>
 #include <vector>
 #include <string>
 #include <algorithm>
@@ -51,7 +51,7 @@
 #ifdef _WIN32
 #define PSAPI_VERSION 1
 #include <windows.h>
-#include <stdint.h>
+#include <stdint.h> // <cstdint> requires C++-11
 #include <psapi.h>
 #else
 #include <sys/time.h>
diff --git a/src/input.cpp b/src/input.cpp
index a0691f78a49c119ad65ce1b16f777e472f8b9d7e..b83a3683e4a3eae3984e842f55f33e672471fd85 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -12,11 +12,11 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <errno.h>
-#include <ctype.h>
+#include <cctype>
 #include <unistd.h>
 #include <sys/stat.h>
 #include "input.h"
diff --git a/src/input.h b/src/input.h
index 55d93e630373be8934d928cf1868d685f5b9e4d0..80b3e8c7da3d1f7a1e2f0378c37eb7785d5da7a2 100644
--- a/src/input.h
+++ b/src/input.h
@@ -14,7 +14,7 @@
 #ifndef LMP_INPUT_H
 #define LMP_INPUT_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 #include <map>
 #include <string>
diff --git a/src/integrate.cpp b/src/integrate.cpp
index 4aeb6e18c93e721e489c046348938f70c3287d69..97d28d6d7c2b6bccbc70d6f973017f31d86cc6d4 100644
--- a/src/integrate.cpp
+++ b/src/integrate.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "integrate.h"
 #include "update.h"
 #include "force.h"
diff --git a/src/irregular.cpp b/src/irregular.cpp
index 6cd1b22c2fefc099d4ce1b976756a5fc53bc8941..451ce7af668b9550bcfcdf3dce670b90d9cf997b 100644
--- a/src/irregular.cpp
+++ b/src/irregular.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "irregular.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/kspace.cpp b/src/kspace.cpp
index b2db585f121f7a537dc2d75d9b222e9545b106e7..fc8b12288ba0679f17d0cbca31287c24208f142b 100644
--- a/src/kspace.cpp
+++ b/src/kspace.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "kspace.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/lammps.cpp b/src/lammps.cpp
index dd91ea7c19780f3d34d99864efc892203df9131f..56af95767bc9901ae60df9e2d2df3d7765de3567 100644
--- a/src/lammps.cpp
+++ b/src/lammps.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
-#include <ctype.h>
+#include <cstring>
+#include <cctype>
 #include "lammps.h"
 #include "style_angle.h"
 #include "style_atom.h"
diff --git a/src/lammps.h b/src/lammps.h
index 26714ab072bd76f3748bf845d87bd8d6a2f588b8..1323dcccc810a29634d7d6348844925daf34004a 100644
--- a/src/lammps.h
+++ b/src/lammps.h
@@ -14,7 +14,7 @@
 #ifndef LMP_LAMMPS_H
 #define LMP_LAMMPS_H
 
-#include <stdio.h>
+#include <cstdio>
 
 namespace LAMMPS_NS {
 
diff --git a/src/lattice.cpp b/src/lattice.cpp
index 5f6d05db8932a9e7f8acf86571961413c9bec21e..ee2fea2a758dca955bb4a8841ff481d99974dac9 100644
--- a/src/lattice.cpp
+++ b/src/lattice.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
 #include "lattice.h"
 #include "update.h"
 #include "domain.h"
diff --git a/src/library.cpp b/src/library.cpp
index 07c4cae9c16327b5efd618391d3096f1551ac4e3..032b28d178c8a1911964bce545f06d1dad783b07 100644
--- a/src/library.cpp
+++ b/src/library.cpp
@@ -15,8 +15,8 @@
 // customize by adding new LAMMPS-specific functions
 
 #include <mpi.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "library.h"
 #include "lmptype.h"
 #include "lammps.h"
diff --git a/src/lmptype.h b/src/lmptype.h
index 253f9a7470a400ef4330e7619c9d89a6e60e7a7f..2be1d2ac385ccdb0e1dad96a4c23f2143a4bf10a 100644
--- a/src/lmptype.h
+++ b/src/lmptype.h
@@ -36,9 +36,9 @@
 #define __STDC_FORMAT_MACROS
 #endif
 
-#include <limits.h>
-#include <stdint.h>
-#include <inttypes.h>
+#include <climits>
+#include <stdint.h>   // <cstdint> requires C++-11
+#include <inttypes.h> // <cinttypes> requires C++-11
 
 // grrr - IBM Power6 does not provide this def in their system header files
 
@@ -200,8 +200,6 @@ typedef int bigint;
 #define _noalias
 #endif
 
-#define ISFINITE(x) isfinite(x)
-
 // settings to enable LAMMPS to build under Windows
 
 #ifdef _WIN32
diff --git a/src/lmpwindows.h b/src/lmpwindows.h
index d20d0f87baa274d29a5be8610f4f34f15826d018..ae2a5457179ad9eec7c10e0645959dd05dc9c71e 100644
--- a/src/lmpwindows.h
+++ b/src/lmpwindows.h
@@ -1,9 +1,9 @@
-#include <iso646.h>
+#include <ciso646>
 #if !defined(__MINGW32__)
 #include "erf.h"
 #endif
 #include <direct.h>
-#include <math.h>
+#include <cmath>
 // LAMMPS uses usleep with 100 ms arguments, no microsecond precision needed
 #if !defined(__MINGW32__)
 #include "sleep.h"
diff --git a/src/main.cpp b/src/main.cpp
index 95368385bd0b31b5e5ef878f1827c63f225e8a44..8eb5e4e5433da594017958784de1de0790b37b82 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,8 +15,8 @@
 #include "lammps.h"
 #include "input.h"
 #include "error.h"
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #if defined(LAMMPS_TRAP_FPE) && defined(_GNU_SOURCE)
 #include <fenv.h>
diff --git a/src/math_extra.cpp b/src/math_extra.cpp
index d1700a3070cb6cc546e7e39ed0c1c10a5ad2a9f7..b70986ce914904edc8b3a2cbf41fb3b3e9ade210 100644
--- a/src/math_extra.cpp
+++ b/src/math_extra.cpp
@@ -15,8 +15,8 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include "math_extra.h"
 
 #define MAXJACOBI 50
diff --git a/src/math_extra.h b/src/math_extra.h
index eec9855b8066deb3f75ae3dc92e2b1f5881f679a..85f57224cfb97a3f6a7bde21dddbae18409dae93 100644
--- a/src/math_extra.h
+++ b/src/math_extra.h
@@ -18,9 +18,9 @@
 #ifndef LMP_MATH_EXTRA_H
 #define LMP_MATH_EXTRA_H
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
 #include "error.h"
 
 namespace MathExtra {
diff --git a/src/math_special.cpp b/src/math_special.cpp
index 4b9197f0fc150e7452351b3eee441872641a5457..31567bdc77fa90bab58d307356d3a9b67aa109ba 100644
--- a/src/math_special.cpp
+++ b/src/math_special.cpp
@@ -1,5 +1,5 @@
-#include <math.h>
-#include <stdint.h>
+#include <cmath>
+#include <stdint.h> // <cstdint> requires C++-11
 #include "math_special.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/math_special.h b/src/math_special.h
index 8cd328f5fcdb25232932a68a3cfbd7cc148cad79..1e7b10d9fdc46201e8833127098777fe58bda88c 100644
--- a/src/math_special.h
+++ b/src/math_special.h
@@ -14,7 +14,7 @@
 #ifndef LMP_MATH_SPECIAL_H
 #define LMP_MATH_SPECIAL_H
 
-#include <math.h>
+#include <cmath>
 
 namespace LAMMPS_NS {
 
diff --git a/src/math_vector.h b/src/math_vector.h
index 9304cf0804d1133fcf33f7d61ce1941ba2cb802b..c2227572729a96367f3ca35d1d11fd12c1391592 100644
--- a/src/math_vector.h
+++ b/src/math_vector.h
@@ -18,8 +18,8 @@
 #ifndef LMP_MATH_VECTOR_H
 #define LMP_MATH_VECTOR_H
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 
 #define VECTOR_NULL        {0, 0, 0}
 #define SHAPE_NULL        {0, 0, 0, 0, 0, 0}
diff --git a/src/memory.cpp b/src/memory.cpp
index eb5309b8b7930292a812141ded0747e2c56e33b1..429cf75c00ab9975a7859201301c9e963b1bf1e8 100644
--- a/src/memory.cpp
+++ b/src/memory.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "memory.h"
 #include "error.h"
 
diff --git a/src/mergesort.h b/src/mergesort.h
index 1df6cb4b819375e68fbdd2c745a4c7cee4a49009..50addd0a729a23766b21a764465ac254ce6f5909 100644
--- a/src/mergesort.h
+++ b/src/mergesort.h
@@ -14,7 +14,7 @@
 #ifndef LMP_MERGESORT
 #define LMP_MERGESORT
 
-#include <string.h>
+#include <cstring>
 
 // custom hybrid upward merge sort implementation with support to pass
 // an opaque pointer to the comparison function, e.g. for access to
diff --git a/src/min.cpp b/src/min.cpp
index 0caa9a9acf0584eac39ad0a55c8ddf634f56906e..cd9253f8d30f31fdab356efca3ff50a7bd2e710b 100644
--- a/src/min.cpp
+++ b/src/min.cpp
@@ -19,9 +19,9 @@
             JR Shewchuk, http://www-2.cs.cmu.edu/~jrs/jrspapers.html#cg
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "min.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/min_cg.cpp b/src/min_cg.cpp
index eda59bd3d4fd19fe586ccb459b327d337ff4ebc8..20e8cc30dd35f05355eb44869f48a2dc914a7c90 100644
--- a/src/min_cg.cpp
+++ b/src/min_cg.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "min_cg.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/min_fire.cpp b/src/min_fire.cpp
index 698b00b7a6781a021ce133e41e88ebe5ef3d8eff..a50071d56204e197a9a4d321640ec50c7d897b99 100644
--- a/src/min_fire.cpp
+++ b/src/min_fire.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "min_fire.h"
 #include "universe.h"
 #include "atom.h"
diff --git a/src/min_hftn.cpp b/src/min_hftn.cpp
index 84793e33a4f9741767d1f75691028a8f3419f161..0c834fbeb442e71e5227989de328dbe252339ae8 100644
--- a/src/min_hftn.cpp
+++ b/src/min_hftn.cpp
@@ -17,8 +17,8 @@
             "Parallel Unconstrained Min", Plantenga, SAND98-8201
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
 #include "atom.h"
 #include "fix_minimize.h"
 #include "min_hftn.h"
diff --git a/src/min_linesearch.cpp b/src/min_linesearch.cpp
index ddc0c64321ccd84372e8bb2a2420bd732667b955..f93a56b09d93895dddd0770a377629b50e0b8412 100644
--- a/src/min_linesearch.cpp
+++ b/src/min_linesearch.cpp
@@ -21,7 +21,7 @@
             JR Shewchuk, http://www-2.cs.cmu.edu/~jrs/jrspapers.html#cg
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "min_linesearch.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/min_quickmin.cpp b/src/min_quickmin.cpp
index 491387406d10a6f1407cf0b970bacfdf5dc25865..8b48816355b0a5b64db0a77fd3c11a9fccff1886 100644
--- a/src/min_quickmin.cpp
+++ b/src/min_quickmin.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
+#include <cmath>
 #include "min_quickmin.h"
 #include "universe.h"
 #include "atom.h"
diff --git a/src/min_sd.cpp b/src/min_sd.cpp
index 73a3867d8a29cce5667ace0a367a2689b9b6f3ec..5d44437ca07e6ca372068e5ae2516cc32d05a045 100644
--- a/src/min_sd.cpp
+++ b/src/min_sd.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include <mpi.h>
 #include "min_sd.h"
 #include "atom.h"
diff --git a/src/minimize.cpp b/src/minimize.cpp
index e4e89804bf6e07ef9d63533d910b40b654423def..e27fffd74bb15c1e005052a3669e09a8b20d13d7 100644
--- a/src/minimize.cpp
+++ b/src/minimize.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "minimize.h"
 #include "domain.h"
 #include "update.h"
diff --git a/src/modify.cpp b/src/modify.cpp
index 64970f2cf98b10cbf9ad9f7042392d5e2bf827b6..c5a680a3bd6b0e928db0c1f055fb63af3d58e468 100644
--- a/src/modify.cpp
+++ b/src/modify.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include "modify.h"
 #include "style_compute.h"
 #include "style_fix.h"
diff --git a/src/modify.h b/src/modify.h
index 1163d44b16f54e4b39f296d166c685118ed714ba..eca4e078599573cf280fde726399069b9091837c 100644
--- a/src/modify.h
+++ b/src/modify.h
@@ -14,7 +14,7 @@
 #ifndef LMP_MODIFY_H
 #define LMP_MODIFY_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 #include <map>
 #include <string>
diff --git a/src/molecule.cpp b/src/molecule.cpp
index 78dc4b82b3ed2374dbae7cafa4f3e5d296408c1e..b03142e98498eeffeeb106965098fc925ef89634 100644
--- a/src/molecule.cpp
+++ b/src/molecule.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "molecule.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/my_page.h b/src/my_page.h
index 5d95217968e75e34e0f781533662bd50564be442..5cd7098d8c9132654b0cf4c7ec4d01a179910fc5 100644
--- a/src/my_page.h
+++ b/src/my_page.h
@@ -52,7 +52,7 @@ methods:
 #define LAMMPS_MEMALIGN 64
 #endif
 
-#include <stdlib.h>
+#include <cstdlib>
 namespace LAMMPS_NS {
 
 template<class T>
diff --git a/src/my_pool_chunk.h b/src/my_pool_chunk.h
index c2f4f190f84bb87a3a3980336c179e19b50fa296..8bf88d35bbe425c67193daeba0d309aff73eb78c 100644
--- a/src/my_pool_chunk.h
+++ b/src/my_pool_chunk.h
@@ -43,7 +43,7 @@ public variables:
 #ifndef LAMMPS_MY_POOL_CHUNK_H
 #define LAMMPS_MY_POOL_CHUNK_H
 
-#include <stdlib.h>
+#include <cstdlib>
 
 namespace LAMMPS_NS {
 
diff --git a/src/nbin.cpp b/src/nbin.cpp
index 6bd1ce322f6f93d93a80c50058d598f8abccfcc9..a30b76cca03770562ef0d7f9da2a0c0fd576a0cc 100644
--- a/src/nbin.cpp
+++ b/src/nbin.cpp
@@ -117,7 +117,7 @@ int NBin::coord2bin(double *x)
 {
   int ix,iy,iz;
 
-  if (!ISFINITE(x[0]) || !ISFINITE(x[1]) || !ISFINITE(x[2]))
+  if (!std::isfinite(x[0]) || !std::isfinite(x[1]) || !std::isfinite(x[2]))
     error->one(FLERR,"Non-numeric positions - simulation unstable");
 
   if (x[0] >= bboxhi[0])
diff --git a/src/neighbor.cpp b/src/neighbor.cpp
index 31dddd9f15eb39964967a9308feee577fe1162a5..d5cb83b37d5fc8176b4aceb7527aa4f11e23ca34 100644
--- a/src/neighbor.cpp
+++ b/src/neighbor.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "neighbor.h"
 #include "neigh_list.h"
 #include "neigh_request.h"
diff --git a/src/npair.cpp b/src/npair.cpp
index 4d06850e659197846c426199673ca44747aa1312..24cdc7750af504f1f510fdd0e29a5ba0b0b9355a 100644
--- a/src/npair.cpp
+++ b/src/npair.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "npair.h"
 #include "neighbor.h"
 #include "neigh_request.h"
@@ -208,7 +208,7 @@ int NPair::exclusion(int i, int j, int itype, int jtype,
 
 int NPair::coord2bin(double *x, int &ix, int &iy, int &iz)
 {
-  if (!ISFINITE(x[0]) || !ISFINITE(x[1]) || !ISFINITE(x[2]))
+  if (!std::isfinite(x[0]) || !std::isfinite(x[1]) || !std::isfinite(x[2]))
     error->one(FLERR,"Non-numeric positions - simulation unstable");
 
   if (x[0] >= bboxhi[0])
diff --git a/src/npair_half_size_bin_newtoff.cpp b/src/npair_half_size_bin_newtoff.cpp
index 6cd97c71d13383cb34a1c7a7ba21d1cef2461293..021452028b3802f68c759707dbd9f00d4bb6c320 100644
--- a/src/npair_half_size_bin_newtoff.cpp
+++ b/src/npair_half_size_bin_newtoff.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "npair_half_size_bin_newtoff.h"
 #include "neighbor.h"
 #include "neigh_list.h"
diff --git a/src/npair_half_size_bin_newton.cpp b/src/npair_half_size_bin_newton.cpp
index c0ed03816625f3bc91de2b43c4fe472e8895b36a..760c09570a0dcad90ae2e66ec1d3e3a2480f93df 100644
--- a/src/npair_half_size_bin_newton.cpp
+++ b/src/npair_half_size_bin_newton.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "npair_half_size_bin_newton.h"
 #include "neighbor.h"
 #include "neigh_list.h"
diff --git a/src/npair_half_size_bin_newton_tri.cpp b/src/npair_half_size_bin_newton_tri.cpp
index 044847ba8ce9d38d534e5aecfc13e841e5d81a9b..d831982ed6033842b85cbdf677ca5e59b1a40a66 100644
--- a/src/npair_half_size_bin_newton_tri.cpp
+++ b/src/npair_half_size_bin_newton_tri.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "npair_half_size_bin_newton_tri.h"
 #include "neighbor.h"
 #include "neigh_list.h"
diff --git a/src/npair_half_size_nsq_newtoff.cpp b/src/npair_half_size_nsq_newtoff.cpp
index 50a32c87ba5d3ed2ab5883eb7e47167f626adbca..1c2fe5f3d57b4666a0807c7765bb380bce935204 100644
--- a/src/npair_half_size_nsq_newtoff.cpp
+++ b/src/npair_half_size_nsq_newtoff.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "npair_half_size_nsq_newtoff.h"
 #include "neighbor.h"
 #include "neigh_list.h"
diff --git a/src/npair_half_size_nsq_newton.cpp b/src/npair_half_size_nsq_newton.cpp
index 343172fb986c0a316d705c186a892aeee10a002d..ce9f8ec18631876d99d0b5bb1d2641aabee72da4 100644
--- a/src/npair_half_size_nsq_newton.cpp
+++ b/src/npair_half_size_nsq_newton.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "npair_half_size_nsq_newton.h"
 #include "neighbor.h"
 #include "neigh_list.h"
diff --git a/src/npair_skip_size.cpp b/src/npair_skip_size.cpp
index b75856dde409a3e060cf1831f6ecc8684c965977..67717ae57660ca11e71685c7c445bab8eff6602b 100644
--- a/src/npair_skip_size.cpp
+++ b/src/npair_skip_size.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "npair_skip_size.h"
 #include "neighbor.h"
 #include "neigh_list.h"
diff --git a/src/npair_skip_size_off2on.cpp b/src/npair_skip_size_off2on.cpp
index 8d728a3c0ad73074bb06b4786462f854fd0cc4a2..74a80e6d3d3e2da207aaa1c424069bac4148020a 100644
--- a/src/npair_skip_size_off2on.cpp
+++ b/src/npair_skip_size_off2on.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "npair_skip_size_off2on.h"
 #include "neighbor.h"
 #include "neigh_list.h"
diff --git a/src/npair_skip_size_off2on_oneside.cpp b/src/npair_skip_size_off2on_oneside.cpp
index a04fc7782c2bcfdecd88d6f8e2df6b438bfc08a8..a042acd1c6bb034d4a84e568487c48170c1dfbca 100644
--- a/src/npair_skip_size_off2on_oneside.cpp
+++ b/src/npair_skip_size_off2on_oneside.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "npair_skip_size_off2on_oneside.h"
 #include "neighbor.h"
 #include "neigh_list.h"
diff --git a/src/ntopo.cpp b/src/ntopo.cpp
index 124fa6687c498ceae9c688dfe437f25e70c736d2..8a87a5d6e5fa9003e78a7e5be6ce9d744ee1ca89 100644
--- a/src/ntopo.cpp
+++ b/src/ntopo.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "ntopo.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/output.cpp b/src/output.cpp
index 11c6fa073e8c05c38056efbdc1765e5f6f8da999..884647f478bbb89d1d963048828eabbd51a36458 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "output.h"
 #include "style_dump.h"
 #include "atom.h"
diff --git a/src/pair.cpp b/src/pair.cpp
index 8b3178415c28156203b0ff57ca937794c8d85a9d..3b839dff497808a033a97f9c551381b80658e267 100644
--- a/src/pair.cpp
+++ b/src/pair.cpp
@@ -16,13 +16,13 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <ctype.h>
-#include <float.h>
-#include <limits.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cfloat>
+#include <climits>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/pair_beck.cpp b/src/pair_beck.cpp
index 36e44e5c2ebc5203f97a8fc20041fe3b07fbfd25..cc8e14bf2c6c93164a1795b79352a7568f24f515 100644
--- a/src/pair_beck.cpp
+++ b/src/pair_beck.cpp
@@ -15,9 +15,9 @@
    Contributing author: Jonathan Zimmerman (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
 #include "pair_beck.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_born.cpp b/src/pair_born.cpp
index 979499488e0e3dbf34f4d6a3a77a897429b3946e..ce7a255fd4935a41e1a20d00fe4ea8757894600f 100644
--- a/src/pair_born.cpp
+++ b/src/pair_born.cpp
@@ -15,10 +15,10 @@
    Contributing Author: Sai Jayaraman (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_born.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_born_coul_dsf.cpp b/src/pair_born_coul_dsf.cpp
index 3700aa46d7f5b83df7bf20fd4c0c21714a4f85c4..be7f41ca2b69ddb9a86eae3a72e3a77b81e2e891 100644
--- a/src/pair_born_coul_dsf.cpp
+++ b/src/pair_born_coul_dsf.cpp
@@ -16,10 +16,10 @@
    References: Fennell and Gezelter, JCP 124, 234104 (2006)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_born_coul_dsf.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_born_coul_wolf.cpp b/src/pair_born_coul_wolf.cpp
index fbec4f3da74362d51c6d99e541574be8758f6658..22dcfa9f2dd6e623e0a738168970fa4205c7beb3 100644
--- a/src/pair_born_coul_wolf.cpp
+++ b/src/pair_born_coul_wolf.cpp
@@ -15,10 +15,10 @@
    Contributing author: Yongfeng Zhang (INL), yongfeng.zhang@inl.gov
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_born_coul_wolf.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_buck.cpp b/src/pair_buck.cpp
index 8cbf97a6badc13f8bd22c20d85e6175626f897e7..450ce291cb9814629e0ade5d1398cd595744d95c 100644
--- a/src/pair_buck.cpp
+++ b/src/pair_buck.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_buck.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_buck_coul_cut.cpp b/src/pair_buck_coul_cut.cpp
index 2764a8e4e4c05abb2e19394a4d73e2f98d3f453e..7eecb621214e89fc78428a896874cf36e0f126f4 100644
--- a/src/pair_buck_coul_cut.cpp
+++ b/src/pair_buck_coul_cut.cpp
@@ -15,9 +15,9 @@
    Contributing author: Eduardo Bringa (LLNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
 #include "pair_buck_coul_cut.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_coul_cut.cpp b/src/pair_coul_cut.cpp
index b505dcb02ce5836c8edc0a2e568a622634e67474..edcf26bffe990d91219eaeaa60d53e20bf57181a 100644
--- a/src/pair_coul_cut.cpp
+++ b/src/pair_coul_cut.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_cut.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_coul_debye.cpp b/src/pair_coul_debye.cpp
index df4555753f2c5782060892cf2ec13e794acefb9e..ee08ab3294909b1865bc16100b3a390468fa31d3 100644
--- a/src/pair_coul_debye.cpp
+++ b/src/pair_coul_debye.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_debye.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_coul_dsf.cpp b/src/pair_coul_dsf.cpp
index 3595f9cbee8d8b64369b5eff1c3a77ee28df8c4f..f20eae43bdbdde3fe252d25f3f6194404e8e81bb 100644
--- a/src/pair_coul_dsf.cpp
+++ b/src/pair_coul_dsf.cpp
@@ -16,10 +16,10 @@
    References: Fennell and Gezelter, JCP 124, 234104 (2006)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_dsf.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_coul_streitz.cpp b/src/pair_coul_streitz.cpp
index 82ecd1d8104723b2aced06c7e886150b8c187abd..1d725f4ca87c637ffb1e9855a126fe1e95f0cf41 100644
--- a/src/pair_coul_streitz.cpp
+++ b/src/pair_coul_streitz.cpp
@@ -15,10 +15,10 @@
    Contributing author: Ray Shan (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_streitz.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_coul_wolf.cpp b/src/pair_coul_wolf.cpp
index 1a7f4772608c98aeb8da19bb7f273e8fe64a18de..cd582f0693abaafffb3d04af52996cf7ea033c8a 100644
--- a/src/pair_coul_wolf.cpp
+++ b/src/pair_coul_wolf.cpp
@@ -15,10 +15,10 @@
    Contributing author: Yongfeng Zhang (INL), yongfeng.zhang@inl.gov
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_coul_wolf.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_dpd.cpp b/src/pair_dpd.cpp
index 61f700a33ecda8c04197d5055d9ef4df1bdfbc75..c209de87ed15e7aad81c1e1c01322509d4045720 100644
--- a/src/pair_dpd.cpp
+++ b/src/pair_dpd.cpp
@@ -15,9 +15,9 @@
    Contributing author: Kurt Smith (U Pittsburgh)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
 #include "pair_dpd.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/pair_dpd_tstat.cpp b/src/pair_dpd_tstat.cpp
index 0a5ebd33f85728d573097d354662dab87fa60ed7..f2c0b157eae27a8bc150bfdbe8e9a427c5099d6e 100644
--- a/src/pair_dpd_tstat.cpp
+++ b/src/pair_dpd_tstat.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
+#include <cmath>
 #include "pair_dpd_tstat.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/pair_gauss.cpp b/src/pair_gauss.cpp
index c66cfc2c8058dd424ea204d415641b74870496fa..fe53bcc9e1b2af7b61b3074170521887b8166252 100644
--- a/src/pair_gauss.cpp
+++ b/src/pair_gauss.cpp
@@ -15,10 +15,10 @@
    Contributing author: Sai Jayaraman (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_gauss.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_hybrid.cpp b/src/pair_hybrid.cpp
index 751560deffd56355b97cf7d4f5e63c7b044c880e..dc74dd040dde23f9b72fe87ab39417a54de263a6 100644
--- a/src/pair_hybrid.cpp
+++ b/src/pair_hybrid.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
 #include "pair_hybrid.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/pair_hybrid.h b/src/pair_hybrid.h
index 202847b028b8583cc88b0afcdc5db97a197c2096..08f5a574df832cfa3f0e43ff8012e30fd1140683 100644
--- a/src/pair_hybrid.h
+++ b/src/pair_hybrid.h
@@ -20,7 +20,7 @@ PairStyle(hybrid,PairHybrid)
 #ifndef LMP_PAIR_HYBRID_H
 #define LMP_PAIR_HYBRID_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pair.h"
 
 namespace LAMMPS_NS {
diff --git a/src/pair_hybrid_overlay.cpp b/src/pair_hybrid_overlay.cpp
index 6776e90ff423c412b4a2652d0a92c468d4c842c7..717c0de1d1a19d7c9aa264e14d3134ccfceb42a9 100644
--- a/src/pair_hybrid_overlay.cpp
+++ b/src/pair_hybrid_overlay.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
 #include "pair_hybrid_overlay.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/pair_lj96_cut.cpp b/src/pair_lj96_cut.cpp
index 842b918fe154ad8db4865e2b14cd44d8141c7ff3..28677a393ef3745a969ae3ca03dcb47f09ed5e53 100644
--- a/src/pair_lj96_cut.cpp
+++ b/src/pair_lj96_cut.cpp
@@ -15,10 +15,10 @@
    Contributing author: Chuanfu Luo (luochuanfu@gmail.com)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj96_cut.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_lj_cubic.cpp b/src/pair_lj_cubic.cpp
index c96d4490cbddf7cbaabb5314f46d32627a1842e5..4b140e5f05d416fce943890c9412d8f1962a5a3e 100644
--- a/src/pair_lj_cubic.cpp
+++ b/src/pair_lj_cubic.cpp
@@ -16,10 +16,10 @@
    Contributing author: Aidan Thompson (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cubic.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_lj_cut.cpp b/src/pair_lj_cut.cpp
index 215fabecbbca976d2a01c46c163bf2f0aadff734..bb2db6aa2fc025cbec62d10111ee2d838caf1715 100644
--- a/src/pair_lj_cut.cpp
+++ b/src/pair_lj_cut.cpp
@@ -15,10 +15,10 @@
    Contributing author: Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_lj_cut_coul_cut.cpp b/src/pair_lj_cut_coul_cut.cpp
index 85cf9dc97dea6a84d862d9f27265ffb68a024d24..15c06ab36a02f53453e644cd5974c36b72cbf47f 100644
--- a/src/pair_lj_cut_coul_cut.cpp
+++ b/src/pair_lj_cut_coul_cut.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_coul_cut.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_lj_cut_coul_debye.cpp b/src/pair_lj_cut_coul_debye.cpp
index 8f5e8e7a1721d74a39df8d98539230f52f08ae7b..dfd866ca7a01537d96737760ee8443155a6e5ab4 100644
--- a/src/pair_lj_cut_coul_debye.cpp
+++ b/src/pair_lj_cut_coul_debye.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "pair_lj_cut_coul_debye.h"
 #include "atom.h"
 #include "neigh_list.h"
diff --git a/src/pair_lj_cut_coul_dsf.cpp b/src/pair_lj_cut_coul_dsf.cpp
index 429058650191af04433757140d58843b5306c244..a49af13fb2737fa8d8a6a09ba19ee92db98b23e7 100644
--- a/src/pair_lj_cut_coul_dsf.cpp
+++ b/src/pair_lj_cut_coul_dsf.cpp
@@ -16,10 +16,10 @@
    References: Fennell and Gezelter, JCP 124, 234104 (2006)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_coul_dsf.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_lj_cut_coul_wolf.cpp b/src/pair_lj_cut_coul_wolf.cpp
index 2043de4c7d46514845288d6f437f0b56502a85bd..fc8a858ce1aee20d2e72c50cf2b70fb3e71c7fd5 100644
--- a/src/pair_lj_cut_coul_wolf.cpp
+++ b/src/pair_lj_cut_coul_wolf.cpp
@@ -15,10 +15,10 @@
    Contributing author: Vishal Boddu (FAU)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_cut_coul_wolf.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_lj_expand.cpp b/src/pair_lj_expand.cpp
index f2f49c872dcb5f0436ceb4062094eb934fed3441..ba72d7d45f39884c80c061d3b6a3b9bc6b5157dd 100644
--- a/src/pair_lj_expand.cpp
+++ b/src/pair_lj_expand.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_expand.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_lj_gromacs.cpp b/src/pair_lj_gromacs.cpp
index 3375c6c4e203ea41a14c4587e1f2fe99da952e87..6b2219d2c5cef92f4da305e343e4111eb4fc751b 100644
--- a/src/pair_lj_gromacs.cpp
+++ b/src/pair_lj_gromacs.cpp
@@ -15,10 +15,10 @@
    Contributing author: Mark Stevens (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_gromacs.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_lj_gromacs_coul_gromacs.cpp b/src/pair_lj_gromacs_coul_gromacs.cpp
index 26e433b38113a6ef282c7034f1ddcdb9f1b5539e..414bfea92a0f2bab8db52a1ba2f0a1f9ffcb7cd0 100644
--- a/src/pair_lj_gromacs_coul_gromacs.cpp
+++ b/src/pair_lj_gromacs_coul_gromacs.cpp
@@ -15,10 +15,10 @@
    Contributing author: Mark Stevens (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_lj_gromacs_coul_gromacs.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_lj_smooth.cpp b/src/pair_lj_smooth.cpp
index 1afaef9235a6c0ddbf837bbcb58db5bbeb798817..23256d486ed09fcf2a48e31ebefd65aead569372 100644
--- a/src/pair_lj_smooth.cpp
+++ b/src/pair_lj_smooth.cpp
@@ -15,9 +15,9 @@
    Contributing author: Craig Maloney (UCSB)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
 #include "pair_lj_smooth.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_lj_smooth_linear.cpp b/src/pair_lj_smooth_linear.cpp
index 415ca7b6d3650a1b2f71f8060da75f47221eb3c1..592a7f6f41a1ad75eae1a537e3e02e5c88b29bfb 100644
--- a/src/pair_lj_smooth_linear.cpp
+++ b/src/pair_lj_smooth_linear.cpp
@@ -15,9 +15,9 @@
    Contributing author: Jonathan Zimmerman (Sandia)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
 #include "pair_lj_smooth_linear.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_mie_cut.cpp b/src/pair_mie_cut.cpp
index 04f8de8d7d335b32aa4c00fe66cc764ea1e3abde..1f9267ca30898ed75de80279c23bb3b74d670e88 100644
--- a/src/pair_mie_cut.cpp
+++ b/src/pair_mie_cut.cpp
@@ -15,10 +15,10 @@
    Contributing author: Cassiano Aimoli (aimoli@gmail.com)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_mie_cut.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_morse.cpp b/src/pair_morse.cpp
index 0e40fc75512277a36b3ef83c3bc5c299134090d7..32ddd723b2c0dcf062a2f3f1261651786b092bbc 100644
--- a/src/pair_morse.cpp
+++ b/src/pair_morse.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_morse.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_soft.cpp b/src/pair_soft.cpp
index b05058b4dcdc20699f0d4892b31f7c8bdfd28554..f428893fd107a0726dcf9532a49d55ddb288b8b3 100644
--- a/src/pair_soft.cpp
+++ b/src/pair_soft.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_soft.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_table.cpp b/src/pair_table.cpp
index 0ee4effb0190b989d966689293d6fbd07d875e62..9e9e41a54c6eac3671c7260937d9ca401254b35b 100644
--- a/src/pair_table.cpp
+++ b/src/pair_table.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "pair_table.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/pair_ufm.cpp b/src/pair_ufm.cpp
index e036e2cdd96cfbf0472c6b61a0c736bda90ede6f..965fe0204e739a526f5f7ebe13e981f2b5c22984 100644
--- a/src/pair_ufm.cpp
+++ b/src/pair_ufm.cpp
@@ -17,10 +17,10 @@
             Maurice de Koning (Unicamp/Brazil) - dekoning@ifi.unicamp.br
  ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_ufm.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_yukawa.cpp b/src/pair_yukawa.cpp
index 9be9237734343588dda84aceb4d650c067c8f525..040664abec071e8b776a9315f2e33521d6221f2a 100644
--- a/src/pair_yukawa.cpp
+++ b/src/pair_yukawa.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "pair_yukawa.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/pair_zbl.cpp b/src/pair_zbl.cpp
index d2dbaeae702adeb0b5505d4a0c0d411a182591e7..98048f61d0751393e4a23b672b84c6698e669db2 100644
--- a/src/pair_zbl.cpp
+++ b/src/pair_zbl.cpp
@@ -15,10 +15,10 @@
    Contributing authors: Stephen Foiles, Aidan Thompson (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_zbl.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/pair_zero.cpp b/src/pair_zero.cpp
index ab6d713cc4aa433524eff1484a38b7dd4eba5d31..d423e196af0f47a8789cefb6430d3b5d7a0f36eb 100644
--- a/src/pair_zero.cpp
+++ b/src/pair_zero.cpp
@@ -15,10 +15,10 @@
    Contributing author: Carsten Svaneborg (SDU)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "pair_zero.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/random_mars.cpp b/src/random_mars.cpp
index 1300cbbb8d8bbefb755b1769c0636ea60a875c41..464e640eab5b73489d4216467de4e848da23e293 100644
--- a/src/random_mars.cpp
+++ b/src/random_mars.cpp
@@ -14,7 +14,7 @@
 // Marsaglia random number generator
 // see RANMAR in F James, Comp Phys Comm, 60, 329 (1990)
 
-#include <math.h>
+#include <cmath>
 #include "random_mars.h"
 #include "error.h"
 
diff --git a/src/random_park.cpp b/src/random_park.cpp
index 80460a39fd26168a8e24b034795e87f2e97d325f..fc00939bd471f4f07f863141a4f22da586f564cc 100644
--- a/src/random_park.cpp
+++ b/src/random_park.cpp
@@ -13,7 +13,7 @@
 
 // Park/Miller RNG
 
-#include <math.h>
+#include <cmath>
 #include "random_park.h"
 #include "error.h"
 
diff --git a/src/rcb.cpp b/src/rcb.cpp
index 2ef3e0c136b2dac029ee0e769b0303f3014f484e..3027920310055351370fd6bff70f61038f01b726 100644
--- a/src/rcb.cpp
+++ b/src/rcb.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
 #include "rcb.h"
 #include "irregular.h"
 #include "memory.h"
diff --git a/src/read_data.cpp b/src/read_data.cpp
index 4b84016744c9d462fbe564f8c71d0f57e561fa8b..5faa8f9646517ff8952a5d035372099c256d2070 100644
--- a/src/read_data.cpp
+++ b/src/read_data.cpp
@@ -17,10 +17,10 @@
 
 #include "lmptype.h"
 #include <mpi.h>
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
+#include <cctype>
 #include "read_data.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/read_data.h b/src/read_data.h
index 9b7ca66259d266bc0cdd39b39068f73ef9b55ce1..9dce8cfcf581c20a145b3684b1b42f14dde214ef 100644
--- a/src/read_data.h
+++ b/src/read_data.h
@@ -20,7 +20,7 @@ CommandStyle(read_data,ReadData)
 #ifndef LMP_READ_DATA_H
 #define LMP_READ_DATA_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 
 namespace LAMMPS_NS {
diff --git a/src/read_dump.cpp b/src/read_dump.cpp
index 7f2488fbb2ecd451468a0e09c934fdaa79b1c7c8..30934f123b853ee5d2c035b564a6f8a2db73f42b 100644
--- a/src/read_dump.cpp
+++ b/src/read_dump.cpp
@@ -21,8 +21,8 @@
 
 #include "lmptype.h"
 #include <mpi.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "read_dump.h"
 #include "reader.h"
 #include "style_reader.h"
diff --git a/src/read_dump.h b/src/read_dump.h
index 3fc554b5116475f407a686a6cd0af0cf8aa3a596..eb70b9980898b1665ca93fc2f755ba06f824fa86 100644
--- a/src/read_dump.h
+++ b/src/read_dump.h
@@ -22,7 +22,7 @@ CommandStyle(read_dump,ReadDump)
 #ifndef LMP_READ_DUMP_H
 #define LMP_READ_DUMP_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 
 namespace LAMMPS_NS {
diff --git a/src/read_restart.cpp b/src/read_restart.cpp
index 60d4a7199eea14804c559f720eb03636de28d6ca..1164de6faa91acea7ebc08b985d317618c723e9f 100644
--- a/src/read_restart.cpp
+++ b/src/read_restart.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include <dirent.h>
 #include "read_restart.h"
 #include "atom.h"
diff --git a/src/read_restart.h b/src/read_restart.h
index 0c4661cb55abce8719427f87ac75d77f4d11cf41..8d2547fb1055673945e77b650b7004e6f0f01720 100644
--- a/src/read_restart.h
+++ b/src/read_restart.h
@@ -20,7 +20,7 @@ CommandStyle(read_restart,ReadRestart)
 #ifndef LMP_READ_RESTART_H
 #define LMP_READ_RESTART_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 
 namespace LAMMPS_NS {
diff --git a/src/reader.cpp b/src/reader.cpp
index b8914d1b1003136dcc14a16d894c9a056d667967..f6e8bd39ebec8522ea68c9e0ca099f9ea07edd9f 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include "reader.h"
 #include "error.h"
 
diff --git a/src/reader_native.cpp b/src/reader_native.cpp
index 529325ed18927f6c0eeed92b06d7cbf5dbf3be08..2c60ffdfd48f6a0d81c942a091d83e71bf8c6183 100644
--- a/src/reader_native.cpp
+++ b/src/reader_native.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "reader_native.h"
 #include "atom.h"
 #include "memory.h"
diff --git a/src/reader_xyz.cpp b/src/reader_xyz.cpp
index a56b503f5e329d2fcd5aecfef8122f5ba8aa30b6..5cb3476510f093abbe51f745043e0d063356fe29 100644
--- a/src/reader_xyz.cpp
+++ b/src/reader_xyz.cpp
@@ -15,8 +15,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "reader_xyz.h"
 #include "atom.h"
 #include "memory.h"
diff --git a/src/region.cpp b/src/region.cpp
index 047c43ce4b0aa1b6a3e5eb0abc8701e769bd6c52..88a414b13438fb2acc8008c7e635645fb1026c30 100644
--- a/src/region.cpp
+++ b/src/region.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "region.h"
 #include "update.h"
 #include "domain.h"
diff --git a/src/region_block.cpp b/src/region_block.cpp
index 8e1659aa13489b2890abb8c92a26565a5250ace4..eeca1323786390c43e434cb0cf89817c5b5ecb52 100644
--- a/src/region_block.cpp
+++ b/src/region_block.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "region_block.h"
 #include "force.h"
 #include "domain.h"
diff --git a/src/region_cone.cpp b/src/region_cone.cpp
index 2af39f93a933f210acd712bda94e93fccebb328f..72f56a268fe4ece8ce5771c6bda9ad5bd56a7523 100644
--- a/src/region_cone.cpp
+++ b/src/region_cone.cpp
@@ -15,9 +15,9 @@
    Contributing author: Pim Schravendijk
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "region_cone.h"
 #include "domain.h"
 #include "error.h"
diff --git a/src/region_cylinder.cpp b/src/region_cylinder.cpp
index 959992f77b89f7cb1e7fa4f1c9538016c0db750f..0b15a3644df2b454f9794a11dab2f495898b1222 100644
--- a/src/region_cylinder.cpp
+++ b/src/region_cylinder.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "region_cylinder.h"
 #include "update.h"
 #include "domain.h"
diff --git a/src/region_intersect.cpp b/src/region_intersect.cpp
index 4fb84dda5999f047a115d1fcb26c1acbe6bc6619..96d3bed16c319657aa20c10e6d6eff2f21f44179 100644
--- a/src/region_intersect.cpp
+++ b/src/region_intersect.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "region_intersect.h"
 #include "domain.h"
 #include "error.h"
diff --git a/src/region_plane.cpp b/src/region_plane.cpp
index 3c945eb553401844159156b549577d4f975d5816..e67a2c85bd8d7e7bf6aa842171c20d05df893279 100644
--- a/src/region_plane.cpp
+++ b/src/region_plane.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "region_plane.h"
 #include "error.h"
 #include "force.h"
diff --git a/src/region_prism.cpp b/src/region_prism.cpp
index b8b7b30368ad2dfe565065c69e4b6c6b95376b6c..22fc504c37537b14e2370ef822ba4c17a4547d09 100644
--- a/src/region_prism.cpp
+++ b/src/region_prism.cpp
@@ -15,9 +15,9 @@
    Contributing author: Pieter in 't Veld (SNL)
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "region_prism.h"
 #include "domain.h"
 #include "force.h"
diff --git a/src/region_sphere.cpp b/src/region_sphere.cpp
index 8aef087d38eab60b8d46b910951797d1405c36bc..5645b3369d7f64ea0fd2cccbb52027f39c6d153d 100644
--- a/src/region_sphere.cpp
+++ b/src/region_sphere.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "region_sphere.h"
 #include "update.h"
 #include "input.h"
diff --git a/src/region_union.cpp b/src/region_union.cpp
index abb6f854e3675f821c7c9ee51f7c599e5447d5a3..33ac6fedd709acf0f6b06d99fb095e6facd799c6 100644
--- a/src/region_union.cpp
+++ b/src/region_union.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "region_union.h"
 #include "domain.h"
 #include "error.h"
diff --git a/src/replicate.cpp b/src/replicate.cpp
index 1251688211950d97bbc62dd497b40cb14e6f8162..7954e4291416b6ea666a18dc639d442093efe610 100644
--- a/src/replicate.cpp
+++ b/src/replicate.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "replicate.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/rerun.cpp b/src/rerun.cpp
index 6081a6fc4721026ba3c89db20a3098cb7718735c..f8a37b59462a89a3f4c1e5c0e3e2fd6fe3105fff 100644
--- a/src/rerun.cpp
+++ b/src/rerun.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "rerun.h"
 #include "read_dump.h"
 #include "domain.h"
diff --git a/src/respa.cpp b/src/respa.cpp
index 7080a739484de0c772463b72963c501b8312dc52..73e280b03d806fa038d388e2943d067465cce3d2 100644
--- a/src/respa.cpp
+++ b/src/respa.cpp
@@ -15,8 +15,8 @@
    Contributing authors: Mark Stevens (SNL), Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "respa.h"
 #include "neighbor.h"
 #include "atom.h"
diff --git a/src/run.cpp b/src/run.cpp
index 37af977e3450f2b2b07ff38c3c35199447ddcc44..beb71be52c1faafeecfb8b3e4fd6c6cb2315e2fc 100644
--- a/src/run.cpp
+++ b/src/run.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "run.h"
 #include "domain.h"
 #include "update.h"
diff --git a/src/set.cpp b/src/set.cpp
index 77cae4cb0972c25604610199903406d99f3bdf14..f741760ed56c56ab85bb42c29015a4db87a07228 100644
--- a/src/set.cpp
+++ b/src/set.cpp
@@ -12,9 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "set.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/special.cpp b/src/special.cpp
index 56529e748b8d52e070696543627bfba255b87e0a..fccc930353ce3a71458f5997355b49110f9006dd 100644
--- a/src/special.cpp
+++ b/src/special.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <stdio.h>
+#include <cstdio>
 #include "special.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/thermo.cpp b/src/thermo.cpp
index 211ace5232b3b89f3a64ad4a0a102628e4990383..fb3d1abc485df6cd975a68835dd99d771247b287 100644
--- a/src/thermo.cpp
+++ b/src/thermo.cpp
@@ -17,9 +17,9 @@
 
 #include "lmptype.h"
 #include <mpi.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include "thermo.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/timer.cpp b/src/timer.cpp
index 9c1aa8794398c03345fe3882f40399725e6bfcf5..65cb6ab5d8fef698784258a1c80220848f96d9bb 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "timer.h"
 #include "comm.h"
 #include "error.h"
@@ -22,13 +22,13 @@
 
 #ifdef _WIN32
 #include <windows.h>
-#include <stdint.h>
+#include <stdint.h> // <cstdint> requires C++-11
 #else
 #include <sys/time.h>
 #include <sys/resource.h>
 #endif
 
-#include <time.h>
+#include <ctime>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/universe.cpp b/src/universe.cpp
index c2a6754fac7799ec7882572fac0365407dd41654..45b4318ec900862d85d8a7c3999ae181bd1b1f6d 100644
--- a/src/universe.cpp
+++ b/src/universe.cpp
@@ -12,10 +12,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cctype>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 #include "universe.h"
 #include "version.h"
 #include "error.h"
diff --git a/src/universe.h b/src/universe.h
index 4ff4d7dd14971c691b9f29417c789a3627255a97..3073409b8677a41a1c0326e4c965591170aa3403 100644
--- a/src/universe.h
+++ b/src/universe.h
@@ -14,7 +14,7 @@
 #ifndef LMP_UNIVERSE_H
 #define LMP_UNIVERSE_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 
 namespace LAMMPS_NS {
diff --git a/src/update.cpp b/src/update.cpp
index 6282c0a875aec481d0ed3df46e1fa3f7988ff637..aa152a850857e729f78da1db98e678e41140f1d7 100644
--- a/src/update.cpp
+++ b/src/update.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include "update.h"
 #include "integrate.h"
 #include "min.h"
diff --git a/src/variable.cpp b/src/variable.cpp
index 34dc33da39a084d46fef21a6727b04ec5d341095..b5c19a48439cd2342273e7af4b7d21936ffe9bd2 100644
--- a/src/variable.cpp
+++ b/src/variable.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
 #include <unistd.h>
 #include "variable.h"
 #include "universe.h"
diff --git a/src/variable.h b/src/variable.h
index 9dcbaebd4fa82e6860fd836b20929fbe3efc1fa7..a74cdba980f4cee3c75486a08706e3c3ba4f96ca 100644
--- a/src/variable.h
+++ b/src/variable.h
@@ -14,7 +14,7 @@
 #ifndef LMP_VARIABLE_H
 #define LMP_VARIABLE_H
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "pointers.h"
 
 namespace LAMMPS_NS {
diff --git a/src/velocity.cpp b/src/velocity.cpp
index 260a11bb4ee90dc2116907688e9b5bda4503e4cb..f83f778f8b15dfecfbd7b755da0fc7dfb19f93d7 100644
--- a/src/velocity.cpp
+++ b/src/velocity.cpp
@@ -12,10 +12,10 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "velocity.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/verlet.cpp b/src/verlet.cpp
index 019f3f2f05b3f539cd9619b441dd77f290c804dd..fcba248d5f8ddcc1e46cd0d8ec8a4ae2e04351a4 100644
--- a/src/verlet.cpp
+++ b/src/verlet.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "verlet.h"
 #include "neighbor.h"
 #include "domain.h"
diff --git a/src/write_coeff.cpp b/src/write_coeff.cpp
index 0556d647cf36d1046f4864002f2e6fa5e5d656f5..5f82a480fd9242a745998709bc6748ed80212fb0 100644
--- a/src/write_coeff.cpp
+++ b/src/write_coeff.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 #include "write_coeff.h"
 #include "pair.h"
diff --git a/src/write_coeff.h b/src/write_coeff.h
index 9228e879bc365486a44e50711144b5dd217ec6c7..569a615e6e577f06386fd0accb394971a7ab1edc 100644
--- a/src/write_coeff.h
+++ b/src/write_coeff.h
@@ -20,7 +20,7 @@ CommandStyle(write_coeff,WriteCoeff)
 #ifndef LMP_WRITE_COEFF_H
 #define LMP_WRITE_COEFF_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 
 namespace LAMMPS_NS {
diff --git a/src/write_data.cpp b/src/write_data.cpp
index d9694f7cd355e593dbee401b252dfc1d6efd042e..85fbe6e5c7cd3f4fa309f8ee470feb1ae87214cc 100644
--- a/src/write_data.cpp
+++ b/src/write_data.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
 #include "write_data.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/write_data.h b/src/write_data.h
index ced6a3be8b4ceee0e07c06463d561d996c357320..6f1bb2ec47f9a609c7a6bf1823a7869561480942 100644
--- a/src/write_data.h
+++ b/src/write_data.h
@@ -20,7 +20,7 @@ CommandStyle(write_data,WriteData)
 #ifndef LMP_WRITE_DATA_H
 #define LMP_WRITE_DATA_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 
 namespace LAMMPS_NS {
diff --git a/src/write_dump.cpp b/src/write_dump.cpp
index dcf6c05a14db5629dd01a157756d40cce194f550..bb79c654b418569101a1f601f31fe93ce420bd97 100644
--- a/src/write_dump.cpp
+++ b/src/write_dump.cpp
@@ -15,7 +15,7 @@
    Contributing author:  Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <string.h>
+#include <cstring>
 #include "write_dump.h"
 #include "style_dump.h"
 #include "dump.h"
diff --git a/src/write_restart.cpp b/src/write_restart.cpp
index c92fd15334778cf8267033b8a638e17b4844b743..c82791e2c1c7c1d0f8a50e6faa695c39873e8c8a 100644
--- a/src/write_restart.cpp
+++ b/src/write_restart.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <string.h>
+#include <cstring>
 #include "write_restart.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/write_restart.h b/src/write_restart.h
index 2253977bdad8868fce56246dc4de315fa088e8b2..c6202acbfd1bf08f47baacb33ebb3832f35b2f89 100644
--- a/src/write_restart.h
+++ b/src/write_restart.h
@@ -20,7 +20,7 @@ CommandStyle(write_restart,WriteRestart)
 #ifndef LMP_WRITE_RESTART_H
 #define LMP_WRITE_RESTART_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "pointers.h"
 
 namespace LAMMPS_NS {