diff --git a/src/PERI/pair_peri_ves.cpp b/src/PERI/pair_peri_ves.cpp
index 930ecc6812..bd1eaa5fd2 100644
--- a/src/PERI/pair_peri_ves.cpp
+++ b/src/PERI/pair_peri_ves.cpp
@@ -18,7 +18,6 @@
 #include "pair_peri_ves.h"
 #include <mpi.h>
 #include <cmath>
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
 #include "domain.h"
diff --git a/src/QEQ/fix_qeq.cpp b/src/QEQ/fix_qeq.cpp
index 2e0b7edbe5..7768c01a41 100644
--- a/src/QEQ/fix_qeq.cpp
+++ b/src/QEQ/fix_qeq.cpp
@@ -17,28 +17,18 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_qeq.h"
+#include <mpi.h>
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
 #include "comm.h"
-#include "domain.h"
-#include "neighbor.h"
 #include "neigh_list.h"
-#include "neigh_request.h"
 #include "update.h"
 #include "force.h"
-#include "kspace.h"
-#include "group.h"
-#include "pair.h"
-#include "respa.h"
-#include "math_const.h"
 #include "memory.h"
 #include "error.h"
 
 using namespace LAMMPS_NS;
-using namespace MathConst;
 using namespace FixConst;
 
 #define MAXLINE 1024
diff --git a/src/QEQ/fix_qeq_dynamic.cpp b/src/QEQ/fix_qeq_dynamic.cpp
index fb5fd2ddac..a2cc683b56 100644
--- a/src/QEQ/fix_qeq_dynamic.cpp
+++ b/src/QEQ/fix_qeq_dynamic.cpp
@@ -16,23 +16,20 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_qeq_dynamic.h"
+#include <mpi.h>
 #include <cmath>
-#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include "atom.h"
 #include "comm.h"
-#include "domain.h"
 #include "neighbor.h"
 #include "neigh_list.h"
 #include "neigh_request.h"
 #include "update.h"
 #include "force.h"
 #include "group.h"
-#include "pair.h"
 #include "kspace.h"
 #include "respa.h"
-#include "memory.h"
 #include "error.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/QEQ/fix_qeq_fire.cpp b/src/QEQ/fix_qeq_fire.cpp
index 561a82b714..265528a089 100644
--- a/src/QEQ/fix_qeq_fire.cpp
+++ b/src/QEQ/fix_qeq_fire.cpp
@@ -16,25 +16,22 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_qeq_fire.h"
+#include <mpi.h>
 #include <cmath>
-#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include "atom.h"
 #include "comm.h"
-#include "domain.h"
 #include "neighbor.h"
 #include "neigh_list.h"
 #include "neigh_request.h"
 #include "update.h"
 #include "force.h"
 #include "group.h"
-#include "pair.h"
 #include "pair_comb.h"
 #include "pair_comb3.h"
 #include "kspace.h"
 #include "respa.h"
-#include "memory.h"
 #include "error.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/QEQ/fix_qeq_point.cpp b/src/QEQ/fix_qeq_point.cpp
index bb3ce835fc..8fb9fd3273 100644
--- a/src/QEQ/fix_qeq_point.cpp
+++ b/src/QEQ/fix_qeq_point.cpp
@@ -17,12 +17,9 @@
 
 #include "fix_qeq_point.h"
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
 #include "comm.h"
-#include "domain.h"
 #include "neighbor.h"
 #include "neigh_list.h"
 #include "neigh_request.h"
diff --git a/src/QEQ/fix_qeq_shielded.cpp b/src/QEQ/fix_qeq_shielded.cpp
index 60ff62ca07..13e25475ae 100644
--- a/src/QEQ/fix_qeq_shielded.cpp
+++ b/src/QEQ/fix_qeq_shielded.cpp
@@ -17,12 +17,9 @@
 
 #include "fix_qeq_shielded.h"
 #include <cmath>
-#include <cstdio>
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
 #include "comm.h"
-#include "domain.h"
 #include "neighbor.h"
 #include "neigh_list.h"
 #include "neigh_request.h"
diff --git a/src/QEQ/fix_qeq_slater.cpp b/src/QEQ/fix_qeq_slater.cpp
index 95105b5ef2..4f5369eb87 100644
--- a/src/QEQ/fix_qeq_slater.cpp
+++ b/src/QEQ/fix_qeq_slater.cpp
@@ -17,12 +17,10 @@
 
 #include "fix_qeq_slater.h"
 #include <cmath>
-#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include "atom.h"
 #include "comm.h"
-#include "domain.h"
 #include "neighbor.h"
 #include "neigh_list.h"
 #include "neigh_request.h"
@@ -33,7 +31,6 @@
 #include "kspace.h"
 #include "respa.h"
 #include "math_const.h"
-#include "memory.h"
 #include "error.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/REPLICA/compute_event_displace.cpp b/src/REPLICA/compute_event_displace.cpp
index 4c8d022d70..a6abcce85d 100644
--- a/src/REPLICA/compute_event_displace.cpp
+++ b/src/REPLICA/compute_event_displace.cpp
@@ -17,14 +17,11 @@
 
 #include "compute_event_displace.h"
 #include <mpi.h>
-#include <cmath>
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
 #include "domain.h"
 #include "modify.h"
 #include "fix_event.h"
-#include "memory.h"
 #include "error.h"
 #include "force.h"
 #include "update.h"
diff --git a/src/REPLICA/fix_event.cpp b/src/REPLICA/fix_event.cpp
index 8cf1acba94..41f91332cb 100644
--- a/src/REPLICA/fix_event.cpp
+++ b/src/REPLICA/fix_event.cpp
@@ -16,16 +16,10 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_event.h"
-#include <cstdlib>
-#include <cstring>
 #include "atom.h"
-#include "update.h"
 #include "domain.h"
-#include "neighbor.h"
-#include "comm.h"
-#include "universe.h"
-#include "memory.h"
 #include "error.h"
+#include "memory.h"
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/REPLICA/fix_event_hyper.cpp b/src/REPLICA/fix_event_hyper.cpp
index 3dd1a03eb9..0d32516dee 100644
--- a/src/REPLICA/fix_event_hyper.cpp
+++ b/src/REPLICA/fix_event_hyper.cpp
@@ -12,16 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_event_hyper.h"
-#include <cstdlib>
-#include <cstring>
-#include "atom.h"
-#include "update.h"
-#include "domain.h"
-#include "neighbor.h"
 #include "comm.h"
-#include "universe.h"
-#include "memory.h"
 #include "error.h"
+#include "update.h"
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/REPLICA/fix_event_prd.cpp b/src/REPLICA/fix_event_prd.cpp
index 63c9c2718b..19a89e988c 100644
--- a/src/REPLICA/fix_event_prd.cpp
+++ b/src/REPLICA/fix_event_prd.cpp
@@ -16,16 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_event_prd.h"
-#include <cstdlib>
-#include <cstring>
-#include "atom.h"
-#include "update.h"
-#include "domain.h"
-#include "neighbor.h"
 #include "comm.h"
-#include "universe.h"
-#include "memory.h"
 #include "error.h"
+#include "update.h"
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/REPLICA/fix_event_tad.cpp b/src/REPLICA/fix_event_tad.cpp
index b92bc1fd73..d0b94a216b 100644
--- a/src/REPLICA/fix_event_tad.cpp
+++ b/src/REPLICA/fix_event_tad.cpp
@@ -16,16 +16,9 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_event_tad.h"
-#include <cstdlib>
-#include <cstring>
-#include "atom.h"
-#include "update.h"
-#include "domain.h"
-#include "neighbor.h"
 #include "comm.h"
-#include "universe.h"
-#include "memory.h"
 #include "error.h"
+#include "update.h"
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/REPLICA/fix_hyper_global.cpp b/src/REPLICA/fix_hyper_global.cpp
index a58798a63e..5e9da02768 100644
--- a/src/REPLICA/fix_hyper_global.cpp
+++ b/src/REPLICA/fix_hyper_global.cpp
@@ -14,7 +14,6 @@
 #include "fix_hyper_global.h"
 #include <mpi.h>
 #include <cmath>
-#include <cstdio>
 #include <cstring>
 #include "atom.h"
 #include "update.h"
@@ -24,7 +23,6 @@
 #include "neighbor.h"
 #include "neigh_request.h"
 #include "neigh_list.h"
-#include "modify.h"
 #include "math_extra.h"
 #include "memory.h"
 #include "error.h"
diff --git a/src/REPLICA/fix_hyper_local.cpp b/src/REPLICA/fix_hyper_local.cpp
index 555c5234f6..e8773095d1 100644
--- a/src/REPLICA/fix_hyper_local.cpp
+++ b/src/REPLICA/fix_hyper_local.cpp
@@ -14,7 +14,6 @@
 #include "fix_hyper_local.h"
 #include <mpi.h>
 #include <cmath>
-#include <cstdio>
 #include <cstring>
 #include "atom.h"
 #include "update.h"
@@ -22,10 +21,10 @@
 #include "pair.h"
 #include "domain.h"
 #include "comm.h"
+#include "my_page.h"
 #include "neighbor.h"
 #include "neigh_request.h"
 #include "neigh_list.h"
-#include "modify.h"
 #include "math_extra.h"
 #include "memory.h"
 #include "error.h"
diff --git a/src/REPLICA/fix_hyper_local.h b/src/REPLICA/fix_hyper_local.h
index 6f13acb606..8fb3a445c2 100644
--- a/src/REPLICA/fix_hyper_local.h
+++ b/src/REPLICA/fix_hyper_local.h
@@ -21,7 +21,6 @@ FixStyle(hyper/local,FixHyperLocal)
 #define LMP_FIX_HYPER_LOCAL_H
 
 #include "fix_hyper.h"
-#include "my_page.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/REPLICA/fix_neb.cpp b/src/REPLICA/fix_neb.cpp
index 2803c37b23..7b377ae9ec 100644
--- a/src/REPLICA/fix_neb.cpp
+++ b/src/REPLICA/fix_neb.cpp
@@ -19,7 +19,6 @@
 #include "fix_neb.h"
 #include <mpi.h>
 #include <cmath>
-#include <cstdlib>
 #include <cstring>
 #include "universe.h"
 #include "update.h"
diff --git a/src/REPLICA/hyper.cpp b/src/REPLICA/hyper.cpp
index c400ae097d..af2a963616 100644
--- a/src/REPLICA/hyper.cpp
+++ b/src/REPLICA/hyper.cpp
@@ -12,11 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include "hyper.h"
-#include <cmath>
-#include <cstdlib>
+#include <mpi.h>
 #include <cstring>
 #include "update.h"
-#include "atom.h"
 #include "domain.h"
 #include "region.h"
 #include "integrate.h"
diff --git a/src/REPLICA/neb.cpp b/src/REPLICA/neb.cpp
index b670f3d8f1..84337ce8ae 100644
--- a/src/REPLICA/neb.cpp
+++ b/src/REPLICA/neb.cpp
@@ -11,12 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-// lmptype.h must be first b/c this file uses MAXBIGINT and includes mpi.h
-// due to OpenMPI bug which sets INT64_MAX via its mpi.h
-//   before lmptype.h can set flags to insure it is done correctly
-
 #include "neb.h"
-#include "lmptype.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstdlib>
diff --git a/src/REPLICA/prd.cpp b/src/REPLICA/prd.cpp
index 19a12ddbbb..f631cc6a0a 100644
--- a/src/REPLICA/prd.cpp
+++ b/src/REPLICA/prd.cpp
@@ -15,15 +15,8 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
-// lmptype.h must be first b/c this file uses MAXBIGINT and includes mpi.h
-// due to OpenMPI bug which sets INT64_MAX via its mpi.h
-//   before lmptype.h can set flags to insure it is done correctly
-
 #include "prd.h"
-#include "lmptype.h"
 #include <mpi.h>
-#include <cmath>
-#include <cstdlib>
 #include <cstring>
 #include "universe.h"
 #include "update.h"
@@ -40,11 +33,9 @@
 #include "fix.h"
 #include "fix_event_prd.h"
 #include "force.h"
-#include "pair.h"
 #include "random_park.h"
 #include "random_mars.h"
 #include "output.h"
-#include "dump.h"
 #include "finish.h"
 #include "timer.h"
 #include "memory.h"
diff --git a/src/REPLICA/tad.cpp b/src/REPLICA/tad.cpp
index 90667b8865..8a51f6d00e 100644
--- a/src/REPLICA/tad.cpp
+++ b/src/REPLICA/tad.cpp
@@ -15,36 +15,24 @@
    Contributing author: Aidan Thompson (SNL)
 ------------------------------------------------------------------------- */
 
-// lmptype.h must be first b/c this file uses MAXBIGINT and includes mpi.h
-// due to OpenMPI bug which sets INT64_MAX via its mpi.h
-//   before lmptype.h can set flags to insure it is done correctly
-
 #include "tad.h"
-#include "lmptype.h"
 #include <mpi.h>
 #include <cmath>
-#include <cstdlib>
 #include <cstring>
 #include "universe.h"
 #include "update.h"
 #include "atom.h"
 #include "domain.h"
-#include "region.h"
-#include "comm.h"
-#include "velocity.h"
 #include "integrate.h"
 #include "min.h"
 #include "neighbor.h"
 #include "modify.h"
 #include "neb.h"
 #include "compute.h"
-#include "fix.h"
 #include "fix_event_tad.h"
 #include "fix_store.h"
 #include "force.h"
-#include "pair.h"
 #include "output.h"
-#include "dump.h"
 #include "finish.h"
 #include "timer.h"
 #include "memory.h"
diff --git a/src/REPLICA/temper.cpp b/src/REPLICA/temper.cpp
index 6eb50c8d9f..46fc3af649 100644
--- a/src/REPLICA/temper.cpp
+++ b/src/REPLICA/temper.cpp
@@ -17,7 +17,6 @@
 
 #include "temper.h"
 #include <cmath>
-#include <cstdlib>
 #include <cstring>
 #include "universe.h"
 #include "domain.h"
@@ -27,13 +26,10 @@
 #include "modify.h"
 #include "compute.h"
 #include "force.h"
-#include "output.h"
-#include "thermo.h"
 #include "fix.h"
 #include "random_park.h"
 #include "finish.h"
 #include "timer.h"
-#include "memory.h"
 #include "error.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/REPLICA/verlet_split.cpp b/src/REPLICA/verlet_split.cpp
index f268afe7f8..a5ed1a671d 100644
--- a/src/REPLICA/verlet_split.cpp
+++ b/src/REPLICA/verlet_split.cpp
@@ -16,7 +16,6 @@
 ------------------------------------------------------------------------- */
 
 #include "verlet_split.h"
-#include <cstring>
 #include "universe.h"
 #include "neighbor.h"
 #include "domain.h"
diff --git a/src/RIGID/compute_erotate_rigid.cpp b/src/RIGID/compute_erotate_rigid.cpp
index 1a7236e263..e15c0deb82 100644
--- a/src/RIGID/compute_erotate_rigid.cpp
+++ b/src/RIGID/compute_erotate_rigid.cpp
@@ -12,7 +12,6 @@
 ------------------------------------------------------------------------- */
 
 #include "compute_erotate_rigid.h"
-#include <mpi.h>
 #include <cstring>
 #include "update.h"
 #include "force.h"
diff --git a/src/RIGID/compute_ke_rigid.cpp b/src/RIGID/compute_ke_rigid.cpp
index 66b7a92566..031919b7a9 100644
--- a/src/RIGID/compute_ke_rigid.cpp
+++ b/src/RIGID/compute_ke_rigid.cpp
@@ -12,7 +12,6 @@
 ------------------------------------------------------------------------- */
 
 #include "compute_ke_rigid.h"
-#include <mpi.h>
 #include <cstring>
 #include "update.h"
 #include "force.h"
diff --git a/src/RIGID/compute_rigid_local.cpp b/src/RIGID/compute_rigid_local.cpp
index 75334bb759..57f69a64e2 100644
--- a/src/RIGID/compute_rigid_local.cpp
+++ b/src/RIGID/compute_rigid_local.cpp
@@ -12,7 +12,6 @@
 ------------------------------------------------------------------------- */
 
 #include "compute_rigid_local.h"
-#include <cmath>
 #include <cstring>
 #include "atom.h"
 #include "update.h"