diff --git a/src/CLASS2/angle_class2.cpp b/src/CLASS2/angle_class2.cpp
index 340152abd4..99e1b39c9d 100644
--- a/src/CLASS2/angle_class2.cpp
+++ b/src/CLASS2/angle_class2.cpp
@@ -16,9 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include "angle_class2.h"
+#include <mpi.h>
 #include <cmath>
 #include <cstring>
-#include <cstdlib>
 #include "atom.h"
 #include "neighbor.h"
 #include "domain.h"
diff --git a/src/CLASS2/bond_class2.cpp b/src/CLASS2/bond_class2.cpp
index 945555f772..cfc1a93bde 100644
--- a/src/CLASS2/bond_class2.cpp
+++ b/src/CLASS2/bond_class2.cpp
@@ -16,11 +16,10 @@
 ------------------------------------------------------------------------- */
 
 #include "bond_class2.h"
+#include <mpi.h>
 #include <cmath>
-#include <cstdlib>
 #include "atom.h"
 #include "neighbor.h"
-#include "domain.h"
 #include "comm.h"
 #include "force.h"
 #include "memory.h"
diff --git a/src/CLASS2/dihedral_class2.cpp b/src/CLASS2/dihedral_class2.cpp
index c36d976525..725228666e 100644
--- a/src/CLASS2/dihedral_class2.cpp
+++ b/src/CLASS2/dihedral_class2.cpp
@@ -16,13 +16,12 @@
 ------------------------------------------------------------------------- */
 
 #include "dihedral_class2.h"
+#include <mpi.h>
 #include <cmath>
 #include <cstring>
-#include <cstdlib>
 #include "atom.h"
 #include "neighbor.h"
 #include "update.h"
-#include "domain.h"
 #include "comm.h"
 #include "force.h"
 #include "math_const.h"
diff --git a/src/CLASS2/improper_class2.cpp b/src/CLASS2/improper_class2.cpp
index aff37df318..ca7ac95239 100644
--- a/src/CLASS2/improper_class2.cpp
+++ b/src/CLASS2/improper_class2.cpp
@@ -16,13 +16,12 @@
 ------------------------------------------------------------------------- */
 
 #include "improper_class2.h"
+#include <mpi.h>
 #include <cmath>
 #include <cstring>
-#include <cstdlib>
 #include "atom.h"
 #include "neighbor.h"
 #include "update.h"
-#include "domain.h"
 #include "comm.h"
 #include "force.h"
 #include "math_const.h"
diff --git a/src/CLASS2/pair_lj_class2.cpp b/src/CLASS2/pair_lj_class2.cpp
index 9a67fafecb..a0088e52b7 100644
--- a/src/CLASS2/pair_lj_class2.cpp
+++ b/src/CLASS2/pair_lj_class2.cpp
@@ -10,9 +10,8 @@
 ------------------------------------------------------------------------- */
 
 #include "pair_lj_class2.h"
+#include <mpi.h>
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
 #include "comm.h"
@@ -21,7 +20,6 @@
 #include "neigh_list.h"
 #include "neigh_request.h"
 #include "update.h"
-#include "integrate.h"
 #include "respa.h"
 #include "math_const.h"
 #include "memory.h"
diff --git a/src/CLASS2/pair_lj_class2_coul_cut.cpp b/src/CLASS2/pair_lj_class2_coul_cut.cpp
index 24620611c6..e999a3682e 100644
--- a/src/CLASS2/pair_lj_class2_coul_cut.cpp
+++ b/src/CLASS2/pair_lj_class2_coul_cut.cpp
@@ -12,9 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include "pair_lj_class2_coul_cut.h"
+#include <mpi.h>
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
 #include <cstring>
 #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 cd11294327..b56c076996 100644
--- a/src/CLASS2/pair_lj_class2_coul_long.cpp
+++ b/src/CLASS2/pair_lj_class2_coul_long.cpp
@@ -12,16 +12,14 @@
 ------------------------------------------------------------------------- */
 
 #include "pair_lj_class2_coul_long.h"
+#include <mpi.h>
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
 #include "kspace.h"
 #include "update.h"
-#include "integrate.h"
 #include "respa.h"
 #include "neighbor.h"
 #include "neigh_list.h"
diff --git a/src/COLLOID/fix_wall_colloid.cpp b/src/COLLOID/fix_wall_colloid.cpp
index f2e895c4f3..58593a99b1 100644
--- a/src/COLLOID/fix_wall_colloid.cpp
+++ b/src/COLLOID/fix_wall_colloid.cpp
@@ -16,12 +16,10 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_wall_colloid.h"
+#include <mpi.h>
 #include <cmath>
-#include <cstring>
 #include "atom.h"
 #include "atom_vec.h"
-#include "update.h"
-#include "respa.h"
 #include "error.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/COLLOID/pair_brownian.cpp b/src/COLLOID/pair_brownian.cpp
index f9185264e0..71a5f8c056 100644
--- a/src/COLLOID/pair_brownian.cpp
+++ b/src/COLLOID/pair_brownian.cpp
@@ -16,22 +16,18 @@
 ------------------------------------------------------------------------- */
 
 #include "pair_brownian.h"
+#include <mpi.h>
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
-#include "atom_vec.h"
 #include "comm.h"
 #include "force.h"
 #include "neighbor.h"
 #include "neigh_list.h"
-#include "neigh_request.h"
 #include "domain.h"
 #include "update.h"
 #include "modify.h"
 #include "fix.h"
-#include "fix_deform.h"
 #include "fix_wall.h"
 #include "input.h"
 #include "variable.h"
diff --git a/src/COLLOID/pair_brownian_poly.cpp b/src/COLLOID/pair_brownian_poly.cpp
index 250dcef1fd..c3eb4f28a5 100644
--- a/src/COLLOID/pair_brownian_poly.cpp
+++ b/src/COLLOID/pair_brownian_poly.cpp
@@ -17,13 +17,10 @@
 ------------------------------------------------------------------------- */
 
 #include "pair_brownian_poly.h"
+#include <mpi.h>
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
-#include "atom_vec.h"
-#include "comm.h"
 #include "force.h"
 #include "neighbor.h"
 #include "neigh_list.h"
@@ -32,14 +29,12 @@
 #include "update.h"
 #include "modify.h"
 #include "fix.h"
-#include "fix_deform.h"
 #include "fix_wall.h"
 #include "input.h"
 #include "variable.h"
 #include "random_mars.h"
 #include "math_const.h"
 #include "math_special.h"
-#include "memory.h"
 #include "error.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/COLLOID/pair_colloid.cpp b/src/COLLOID/pair_colloid.cpp
index 306cdfebdf..ad25184181 100644
--- a/src/COLLOID/pair_colloid.cpp
+++ b/src/COLLOID/pair_colloid.cpp
@@ -16,14 +16,11 @@
 ------------------------------------------------------------------------- */
 
 #include "pair_colloid.h"
+#include <mpi.h>
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
-#include "neighbor.h"
 #include "neigh_list.h"
 #include "math_special.h"
 #include "memory.h"
diff --git a/src/COLLOID/pair_lubricate.cpp b/src/COLLOID/pair_lubricate.cpp
index ee55c6cbf5..4492de3cbb 100644
--- a/src/COLLOID/pair_lubricate.cpp
+++ b/src/COLLOID/pair_lubricate.cpp
@@ -17,17 +17,14 @@
 ------------------------------------------------------------------------- */
 
 #include "pair_lubricate.h"
+#include <mpi.h>
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
-#include "atom_vec.h"
 #include "comm.h"
 #include "force.h"
 #include "neighbor.h"
 #include "neigh_list.h"
-#include "neigh_request.h"
 #include "domain.h"
 #include "modify.h"
 #include "fix.h"
@@ -35,7 +32,6 @@
 #include "fix_wall.h"
 #include "input.h"
 #include "variable.h"
-#include "random_mars.h"
 #include "math_const.h"
 #include "memory.h"
 #include "error.h"
diff --git a/src/COLLOID/pair_lubricateU.cpp b/src/COLLOID/pair_lubricateU.cpp
index be589167c9..4f7e3917e8 100644
--- a/src/COLLOID/pair_lubricateU.cpp
+++ b/src/COLLOID/pair_lubricateU.cpp
@@ -18,22 +18,17 @@
 #include "pair_lubricateU.h"
 #include <mpi.h>
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
-#include "atom_vec.h"
 #include "comm.h"
 #include "force.h"
 #include "neighbor.h"
 #include "neigh_list.h"
-#include "neigh_request.h"
 #include "domain.h"
 #include "update.h"
 #include "math_const.h"
 #include "modify.h"
 #include "fix.h"
-#include "fix_deform.h"
 #include "fix_wall.h"
 #include "input.h"
 #include "variable.h"
diff --git a/src/COLLOID/pair_lubricateU_poly.cpp b/src/COLLOID/pair_lubricateU_poly.cpp
index ebcf939cff..0f16d94300 100644
--- a/src/COLLOID/pair_lubricateU_poly.cpp
+++ b/src/COLLOID/pair_lubricateU_poly.cpp
@@ -20,21 +20,16 @@
 #include "pair_lubricateU_poly.h"
 #include <mpi.h>
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
-#include "atom_vec.h"
 #include "comm.h"
 #include "force.h"
 #include "neighbor.h"
 #include "neigh_list.h"
 #include "neigh_request.h"
 #include "domain.h"
-#include "update.h"
 #include "modify.h"
 #include "fix.h"
-#include "fix_deform.h"
 #include "fix_wall.h"
 #include "input.h"
 #include "variable.h"
diff --git a/src/COLLOID/pair_lubricate_poly.cpp b/src/COLLOID/pair_lubricate_poly.cpp
index f1bfa0c695..e347441cf4 100644
--- a/src/COLLOID/pair_lubricate_poly.cpp
+++ b/src/COLLOID/pair_lubricate_poly.cpp
@@ -18,12 +18,10 @@
 ------------------------------------------------------------------------- */
 
 #include "pair_lubricate_poly.h"
+#include <mpi.h>
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
-#include "atom_vec.h"
 #include "comm.h"
 #include "force.h"
 #include "neighbor.h"
@@ -33,8 +31,6 @@
 #include "modify.h"
 #include "fix.h"
 #include "fix_deform.h"
-#include "memory.h"
-#include "random_mars.h"
 #include "fix_wall.h"
 #include "input.h"
 #include "variable.h"
diff --git a/src/COLLOID/pair_yukawa_colloid.cpp b/src/COLLOID/pair_yukawa_colloid.cpp
index 98d0586925..1866fa60b5 100644
--- a/src/COLLOID/pair_yukawa_colloid.cpp
+++ b/src/COLLOID/pair_yukawa_colloid.cpp
@@ -17,14 +17,11 @@
 
 #include "pair_yukawa_colloid.h"
 #include <cmath>
-#include <cstdlib>
 #include "atom.h"
 #include "atom_vec.h"
 #include "force.h"
-#include "comm.h"
 #include "neighbor.h"
 #include "neigh_list.h"
-#include "memory.h"
 #include "error.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/COMPRESS/dump_xyz_gz.cpp b/src/COMPRESS/dump_xyz_gz.cpp
index 7be1a10fe2..c76b7afa17 100644
--- a/src/COMPRESS/dump_xyz_gz.cpp
+++ b/src/COMPRESS/dump_xyz_gz.cpp
@@ -12,7 +12,6 @@
 ------------------------------------------------------------------------- */
 
 #include "dump_xyz_gz.h"
-#include "domain.h"
 #include "error.h"
 #include "update.h"
 
diff --git a/src/CORESHELL/compute_temp_cs.cpp b/src/CORESHELL/compute_temp_cs.cpp
index 4217fe3410..cccccaf254 100644
--- a/src/CORESHELL/compute_temp_cs.cpp
+++ b/src/CORESHELL/compute_temp_cs.cpp
@@ -18,9 +18,7 @@
 
 #include "compute_temp_cs.h"
 #include <mpi.h>
-#include <cstdlib>
 #include <cstring>
-#include <cmath>
 #include "atom.h"
 #include "atom_vec.h"
 #include "domain.h"
@@ -28,7 +26,6 @@
 #include "force.h"
 #include "group.h"
 #include "modify.h"
-#include "fix.h"
 #include "fix_store.h"
 #include "comm.h"
 #include "memory.h"
diff --git a/src/CORESHELL/pair_born_coul_dsf_cs.cpp b/src/CORESHELL/pair_born_coul_dsf_cs.cpp
index cd932e560b..9440bca109 100644
--- a/src/CORESHELL/pair_born_coul_dsf_cs.cpp
+++ b/src/CORESHELL/pair_born_coul_dsf_cs.cpp
@@ -18,17 +18,11 @@
 
 #include "pair_born_coul_dsf_cs.h"
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
-#include "neighbor.h"
 #include "neigh_list.h"
 #include "math_const.h"
-#include "memory.h"
-#include "error.h"
 #include "math_special.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/CORESHELL/pair_born_coul_long_cs.cpp b/src/CORESHELL/pair_born_coul_long_cs.cpp
index 2ef7fdb273..f6262fa9e7 100644
--- a/src/CORESHELL/pair_born_coul_long_cs.cpp
+++ b/src/CORESHELL/pair_born_coul_long_cs.cpp
@@ -17,21 +17,12 @@
 
 #include "pair_born_coul_long_cs.h"
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
-#include "comm.h"
 #include "force.h"
-#include "kspace.h"
-#include "neighbor.h"
 #include "neigh_list.h"
-#include "math_const.h"
-#include "memory.h"
-#include "error.h"
 
 using namespace LAMMPS_NS;
-using namespace MathConst;
 
 #define EWALD_F   1.12837917
 #define EWALD_P   9.95473818e-1
diff --git a/src/CORESHELL/pair_born_coul_wolf_cs.cpp b/src/CORESHELL/pair_born_coul_wolf_cs.cpp
index c0374e2ddb..398c2ba1ee 100644
--- a/src/CORESHELL/pair_born_coul_wolf_cs.cpp
+++ b/src/CORESHELL/pair_born_coul_wolf_cs.cpp
@@ -14,22 +14,14 @@
 
 #include "pair_born_coul_wolf_cs.h"
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
-#include "neighbor.h"
 #include "neigh_list.h"
 #include "math_const.h"
-#include "math_special.h"
-#include "memory.h"
-#include "error.h"
 
 using namespace LAMMPS_NS;
 using namespace MathConst;
-using namespace MathSpecial;
 
 #define EPSILON 1.0e-20
 
diff --git a/src/CORESHELL/pair_buck_coul_long_cs.cpp b/src/CORESHELL/pair_buck_coul_long_cs.cpp
index 6c897622fa..1392ec1880 100644
--- a/src/CORESHELL/pair_buck_coul_long_cs.cpp
+++ b/src/CORESHELL/pair_buck_coul_long_cs.cpp
@@ -17,21 +17,11 @@
 
 #include "pair_buck_coul_long_cs.h"
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 #include "atom.h"
-#include "comm.h"
 #include "force.h"
-#include "kspace.h"
-#include "neighbor.h"
 #include "neigh_list.h"
-#include "math_const.h"
-#include "memory.h"
-#include "error.h"
 
 using namespace LAMMPS_NS;
-using namespace MathConst;
 
 #define EWALD_F   1.12837917
 #define EWALD_P   9.95473818e-1
diff --git a/src/CORESHELL/pair_coul_long_cs.cpp b/src/CORESHELL/pair_coul_long_cs.cpp
index 6094ae072a..8280799389 100644
--- a/src/CORESHELL/pair_coul_long_cs.cpp
+++ b/src/CORESHELL/pair_coul_long_cs.cpp
@@ -17,20 +17,9 @@
 
 #include "pair_coul_long_cs.h"
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 #include "atom.h"
-#include "comm.h"
 #include "force.h"
-#include "kspace.h"
-#include "neighbor.h"
 #include "neigh_list.h"
-#include "update.h"
-#include "integrate.h"
-#include "respa.h"
-#include "memory.h"
-#include "error.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/CORESHELL/pair_coul_wolf_cs.cpp b/src/CORESHELL/pair_coul_wolf_cs.cpp
index 40ade7bfe4..20b7339480 100644
--- a/src/CORESHELL/pair_coul_wolf_cs.cpp
+++ b/src/CORESHELL/pair_coul_wolf_cs.cpp
@@ -13,22 +13,14 @@
 
 #include "pair_coul_wolf_cs.h"
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
-#include "neighbor.h"
 #include "neigh_list.h"
 #include "math_const.h"
-#include "math_special.h"
-#include "memory.h"
-#include "error.h"
 
 using namespace LAMMPS_NS;
 using namespace MathConst;
-using namespace MathSpecial;
 
 #define EPSILON 1.0e-20
 
diff --git a/src/CORESHELL/pair_lj_cut_coul_long_cs.cpp b/src/CORESHELL/pair_lj_cut_coul_long_cs.cpp
index 3f20377cf1..7ad544051a 100644
--- a/src/CORESHELL/pair_lj_cut_coul_long_cs.cpp
+++ b/src/CORESHELL/pair_lj_cut_coul_long_cs.cpp
@@ -17,25 +17,11 @@
 
 #include "pair_lj_cut_coul_long_cs.h"
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 #include "atom.h"
-#include "comm.h"
 #include "force.h"
-#include "kspace.h"
-#include "update.h"
-#include "integrate.h"
-#include "respa.h"
-#include "neighbor.h"
 #include "neigh_list.h"
-#include "neigh_request.h"
-#include "math_const.h"
-#include "memory.h"
-#include "error.h"
 
 using namespace LAMMPS_NS;
-using namespace MathConst;
 
 #define EWALD_F   1.12837917
 #define EWALD_P   9.95473818e-1