diff --git a/src/imbalance_neigh.cpp b/src/imbalance_neigh.cpp
index 2a55754da8..19f3915a11 100644
--- a/src/imbalance_neigh.cpp
+++ b/src/imbalance_neigh.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <mpi.h>
 #include "imbalance_neigh.h"
+#include <mpi.h>
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/imbalance_store.cpp b/src/imbalance_store.cpp
index c117b60860..343d47b189 100644
--- a/src/imbalance_store.cpp
+++ b/src/imbalance_store.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <cstring>
 #include "imbalance_store.h"
+#include <cstring>
 #include "atom.h"
 #include "error.h"
 
diff --git a/src/imbalance_time.cpp b/src/imbalance_time.cpp
index ceb3c08220..0831713204 100644
--- a/src/imbalance_time.cpp
+++ b/src/imbalance_time.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <mpi.h>
 #include "imbalance_time.h"
+#include <mpi.h>
 #include "atom.h"
 #include "force.h"
 #include "timer.h"
diff --git a/src/imbalance_var.cpp b/src/imbalance_var.cpp
index ba17c06866..ba84ef01ef 100644
--- a/src/imbalance_var.cpp
+++ b/src/imbalance_var.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "imbalance_var.h"
 #include <mpi.h>
 #include <cstring>
-#include "imbalance_var.h"
 #include "atom.h"
 #include "group.h"
 #include "input.h"
diff --git a/src/improper_deprecated.cpp b/src/improper_deprecated.cpp
index 6f4d08764f..62a688527a 100644
--- a/src/improper_deprecated.cpp
+++ b/src/improper_deprecated.cpp
@@ -15,8 +15,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <cstring>
 #include "improper_deprecated.h"
+#include <cstring>
 #include "improper_hybrid.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/improper_hybrid.cpp b/src/improper_hybrid.cpp
index af1382d3eb..f078a73ec0 100644
--- a/src/improper_hybrid.cpp
+++ b/src/improper_hybrid.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "improper_hybrid.h"
 #include <mpi.h>
 #include <cstring>
 #include <cctype>
-#include "improper_hybrid.h"
 #include "atom.h"
 #include "neighbor.h"
 #include "comm.h"
diff --git a/src/improper_zero.cpp b/src/improper_zero.cpp
index 3f36954a0a..efa70c8ff5 100644
--- a/src/improper_zero.cpp
+++ b/src/improper_zero.cpp
@@ -15,8 +15,8 @@
    Contributing author: Carsten Svaneborg (SDU)
 ------------------------------------------------------------------------- */
 
-#include <cstring>
 #include "improper_zero.h"
+#include <cstring>
 #include "atom.h"
 #include "force.h"
 #include "memory.h"
diff --git a/src/info.cpp b/src/info.cpp
index bb2d3c4b45..8f55fab367 100644
--- a/src/info.cpp
+++ b/src/info.cpp
@@ -16,6 +16,7 @@
                           Richard Berger (Temple U)
 ------------------------------------------------------------------------- */
 
+#include "info.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstring>
@@ -23,7 +24,6 @@
 #include <ctime>
 #include <map>
 #include <string>
-#include "info.h"
 #include "accelerator_kokkos.h"
 #include "atom.h"
 #include "comm.h"
diff --git a/src/input.cpp b/src/input.cpp
index cbad1d78bf..f887bc0245 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -11,6 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "input.h"
 #include <mpi.h>
 #include <cstdlib>
 #include <cstring>
@@ -18,7 +19,6 @@
 #include <cctype>
 #include <unistd.h>
 #include <sys/stat.h>
-#include "input.h"
 #include "style_command.h"
 #include "universe.h"
 #include "atom.h"
diff --git a/src/irregular.cpp b/src/irregular.cpp
index 2040d12d0b..b67214df25 100644
--- a/src/irregular.cpp
+++ b/src/irregular.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "irregular.h"
 #include <mpi.h>
 #include <cstring>
-#include "irregular.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "domain.h"
diff --git a/src/kspace.cpp b/src/kspace.cpp
index b51191857d..f9020416bf 100644
--- a/src/kspace.cpp
+++ b/src/kspace.cpp
@@ -11,11 +11,11 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "kspace.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
-#include "kspace.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/kspace_deprecated.cpp b/src/kspace_deprecated.cpp
index 1d62de2692..0b6490b4cf 100644
--- a/src/kspace_deprecated.cpp
+++ b/src/kspace_deprecated.cpp
@@ -15,8 +15,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <cstring>
 #include "kspace_deprecated.h"
+#include <cstring>
 #include "comm.h"
 #include "force.h"
 #include "error.h"
diff --git a/src/lammps.cpp b/src/lammps.cpp
index f8e7dceb89..5ddc1600a4 100644
--- a/src/lammps.cpp
+++ b/src/lammps.cpp
@@ -11,6 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lammps.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstring>
@@ -18,7 +19,6 @@
 #include <cctype>
 #include <map>
 #include <string>
-#include "lammps.h"
 #include "style_angle.h"     // IWYU pragma: keep
 #include "style_atom.h"      // IWYU pragma: keep
 #include "style_bond.h"      // IWYU pragma: keep
diff --git a/src/lattice.cpp b/src/lattice.cpp
index ee2fea2a75..98faf680e8 100644
--- a/src/lattice.cpp
+++ b/src/lattice.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lattice.h"
 #include <cmath>
 #include <cstring>
 #include <cstdlib>
-#include "lattice.h"
 #include "update.h"
 #include "domain.h"
 #include "comm.h"
diff --git a/src/library.cpp b/src/library.cpp
index 033b814865..eabe5fd179 100644
--- a/src/library.cpp
+++ b/src/library.cpp
@@ -14,11 +14,11 @@
 // C or Fortran style library interface to LAMMPS
 // customize by adding new LAMMPS-specific functions
 
+#include "library.h"
 #include <mpi.h>
 #include <cctype>
 #include <cstring>
 #include <cstdlib>
-#include "library.h"
 #include "universe.h"
 #include "atom_vec.h"
 #include "atom.h"
diff --git a/src/main.cpp b/src/main.cpp
index 1be9c253eb..b7f6adbdda 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <mpi.h>
 #include "lammps.h"
+#include <mpi.h>
 #include "input.h"
 
 #if defined(LAMMPS_TRAP_FPE) && defined(_GNU_SOURCE)
diff --git a/src/math_extra.cpp b/src/math_extra.cpp
index f7e5bb646b..797d210d0e 100644
--- a/src/math_extra.cpp
+++ b/src/math_extra.cpp
@@ -15,9 +15,9 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
+#include "math_extra.h"
 #include <cstdio>
 #include <cstring>
-#include "math_extra.h"
 
 #define MAXJACOBI 50
 
diff --git a/src/math_special.cpp b/src/math_special.cpp
index b2f545ddc6..bf11a1ad45 100644
--- a/src/math_special.cpp
+++ b/src/math_special.cpp
@@ -1,6 +1,6 @@
+#include "math_special.h"
 #include <cmath>
 #include <stdint.h> // IWYU pragma: keep
-#include "math_special.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/memory.cpp b/src/memory.cpp
index ca7fd3ea7f..a513dde6c2 100644
--- a/src/memory.cpp
+++ b/src/memory.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <cstdlib>
 #include "memory.h"
+#include <cstdlib>
 #include "error.h"
 
 #if defined(LMP_USER_INTEL) && defined(__INTEL_COMPILER)
diff --git a/src/min.cpp b/src/min.cpp
index f2e1c982be..408954edb8 100644
--- a/src/min.cpp
+++ b/src/min.cpp
@@ -19,10 +19,10 @@
             JR Shewchuk, http://www-2.cs.cmu.edu/~jrs/jrspapers.html#cg
 ------------------------------------------------------------------------- */
 
+#include "min.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstring>
-#include "min.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "domain.h"
diff --git a/src/min_cg.cpp b/src/min_cg.cpp
index eb8831c8f5..ff318d23da 100644
--- a/src/min_cg.cpp
+++ b/src/min_cg.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "min_cg.h"
 #include <mpi.h>
 #include <cmath>
-#include "min_cg.h"
 #include "update.h"
 #include "output.h"
 #include "timer.h"
diff --git a/src/min_fire.cpp b/src/min_fire.cpp
index 79346341bb..b7f853afd2 100644
--- a/src/min_fire.cpp
+++ b/src/min_fire.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "min_fire.h"
 #include <mpi.h>
 #include <cmath>
-#include "min_fire.h"
 #include "universe.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/min_hftn.cpp b/src/min_hftn.cpp
index c2c251c386..dcfed10fef 100644
--- a/src/min_hftn.cpp
+++ b/src/min_hftn.cpp
@@ -17,12 +17,12 @@
             "Parallel Unconstrained Min", Plantenga, SAND98-8201
 ------------------------------------------------------------------------- */
 
+#include "min_hftn.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstring>
 #include "atom.h"
 #include "fix_minimize.h"
-#include "min_hftn.h"
 #include "modify.h"
 #include "output.h"
 #include "pair.h"
diff --git a/src/min_linesearch.cpp b/src/min_linesearch.cpp
index 3c0621c602..a7a10dcd51 100644
--- a/src/min_linesearch.cpp
+++ b/src/min_linesearch.cpp
@@ -21,9 +21,9 @@
             JR Shewchuk, http://www-2.cs.cmu.edu/~jrs/jrspapers.html#cg
 ------------------------------------------------------------------------- */
 
+#include "min_linesearch.h"
 #include <mpi.h>
 #include <cmath>
-#include "min_linesearch.h"
 #include "atom.h"
 #include "modify.h"
 #include "fix_minimize.h"
diff --git a/src/min_quickmin.cpp b/src/min_quickmin.cpp
index 784da82686..04e72b046d 100644
--- a/src/min_quickmin.cpp
+++ b/src/min_quickmin.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "min_quickmin.h"
 #include <mpi.h>
 #include <cmath>
-#include "min_quickmin.h"
 #include "universe.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/min_sd.cpp b/src/min_sd.cpp
index d66601119b..e4e159003f 100644
--- a/src/min_sd.cpp
+++ b/src/min_sd.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <cmath>
 #include "min_sd.h"
+#include <cmath>
 #include "update.h"
 #include "output.h"
 #include "timer.h"
diff --git a/src/modify.cpp b/src/modify.cpp
index 61497d86db..a9b8817aed 100644
--- a/src/modify.cpp
+++ b/src/modify.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <cstring>
 #include "modify.h"
+#include <cstring>
 #include "style_compute.h"
 #include "style_fix.h"
 #include "atom.h"
diff --git a/src/molecule.cpp b/src/molecule.cpp
index 4a3790296f..38887ebb0c 100644
--- a/src/molecule.cpp
+++ b/src/molecule.cpp
@@ -11,11 +11,11 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "molecule.h"
 #include <mpi.h>
 #include <cctype>
 #include <cmath>
 #include <cstring>
-#include "molecule.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "atom_vec_body.h"
diff --git a/src/nbin.cpp b/src/nbin.cpp
index 0480c9730d..99d41db140 100644
--- a/src/nbin.cpp
+++ b/src/nbin.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <cmath>
 #include "nbin.h"
+#include <cmath>
 #include "neighbor.h"
 #include "neigh_request.h"
 #include "domain.h"
diff --git a/src/neighbor.cpp b/src/neighbor.cpp
index a2efc5919b..d38aed08c0 100644
--- a/src/neighbor.cpp
+++ b/src/neighbor.cpp
@@ -15,10 +15,10 @@
    Contributing author (triclinic and multi-neigh) : Pieter in 't Veld (SNL)
 ------------------------------------------------------------------------- */
 
+#include "neighbor.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstring>
-#include "neighbor.h"
 #include "neigh_list.h"
 #include "neigh_request.h"
 #include "nbin.h"
diff --git a/src/npair.cpp b/src/npair.cpp
index 24cdc7750a..b63135fad6 100644
--- a/src/npair.cpp
+++ b/src/npair.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <cmath>
 #include "npair.h"
+#include <cmath>
 #include "neighbor.h"
 #include "neigh_request.h"
 #include "nbin.h"
diff --git a/src/ntopo.cpp b/src/ntopo.cpp
index 05e287e192..ca63b85328 100644
--- a/src/ntopo.cpp
+++ b/src/ntopo.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <mpi.h>
 #include "ntopo.h"
+#include <mpi.h>
 #include "atom.h"
 #include "neighbor.h"
 #include "comm.h"
diff --git a/src/ntopo_angle_all.cpp b/src/ntopo_angle_all.cpp
index 2a358c8ce5..e0c20609a1 100644
--- a/src/ntopo_angle_all.cpp
+++ b/src/ntopo_angle_all.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <mpi.h>
 #include "ntopo_angle_all.h"
+#include <mpi.h>
 #include "atom.h"
 #include "force.h"
 #include "domain.h"
diff --git a/src/ntopo_angle_partial.cpp b/src/ntopo_angle_partial.cpp
index c82110cda5..a6fd900825 100644
--- a/src/ntopo_angle_partial.cpp
+++ b/src/ntopo_angle_partial.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <mpi.h>
 #include "ntopo_angle_partial.h"
+#include <mpi.h>
 #include "atom.h"
 #include "force.h"
 #include "domain.h"
diff --git a/src/ntopo_angle_template.cpp b/src/ntopo_angle_template.cpp
index 15a8b658f3..8cbcf8bcbd 100644
--- a/src/ntopo_angle_template.cpp
+++ b/src/ntopo_angle_template.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <mpi.h>
 #include "ntopo_angle_template.h"
+#include <mpi.h>
 #include "atom.h"
 #include "atom_vec.h"
 #include "force.h"
diff --git a/src/ntopo_bond_all.cpp b/src/ntopo_bond_all.cpp
index 42e9e2303d..5309754554 100644
--- a/src/ntopo_bond_all.cpp
+++ b/src/ntopo_bond_all.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <mpi.h>
 #include "ntopo_bond_all.h"
+#include <mpi.h>
 #include "atom.h"
 #include "force.h"
 #include "domain.h"
diff --git a/src/ntopo_bond_partial.cpp b/src/ntopo_bond_partial.cpp
index 5a1acd9191..1cbf5eed11 100644
--- a/src/ntopo_bond_partial.cpp
+++ b/src/ntopo_bond_partial.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <mpi.h>
 #include "ntopo_bond_partial.h"
+#include <mpi.h>
 #include "atom.h"
 #include "force.h"
 #include "domain.h"
diff --git a/src/ntopo_bond_template.cpp b/src/ntopo_bond_template.cpp
index fa98658ad0..cd7b85aa19 100644
--- a/src/ntopo_bond_template.cpp
+++ b/src/ntopo_bond_template.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <mpi.h>
 #include "ntopo_bond_template.h"
+#include <mpi.h>
 #include "atom.h"
 #include "atom_vec.h"
 #include "force.h"
diff --git a/src/ntopo_dihedral_all.cpp b/src/ntopo_dihedral_all.cpp
index 9c94fb10f9..5af2d526e0 100644
--- a/src/ntopo_dihedral_all.cpp
+++ b/src/ntopo_dihedral_all.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <mpi.h>
 #include "ntopo_dihedral_all.h"
+#include <mpi.h>
 #include "atom.h"
 #include "force.h"
 #include "domain.h"
diff --git a/src/ntopo_dihedral_partial.cpp b/src/ntopo_dihedral_partial.cpp
index 14749e6511..faac57aa51 100644
--- a/src/ntopo_dihedral_partial.cpp
+++ b/src/ntopo_dihedral_partial.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <mpi.h>
 #include "ntopo_dihedral_partial.h"
+#include <mpi.h>
 #include "atom.h"
 #include "force.h"
 #include "domain.h"
diff --git a/src/ntopo_dihedral_template.cpp b/src/ntopo_dihedral_template.cpp
index 8ea860c2e2..bce8ecf4bc 100644
--- a/src/ntopo_dihedral_template.cpp
+++ b/src/ntopo_dihedral_template.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <mpi.h>
 #include "ntopo_dihedral_template.h"
+#include <mpi.h>
 #include "atom.h"
 #include "atom_vec.h"
 #include "force.h"
diff --git a/src/ntopo_improper_all.cpp b/src/ntopo_improper_all.cpp
index 6c478dec52..0cbecbf962 100644
--- a/src/ntopo_improper_all.cpp
+++ b/src/ntopo_improper_all.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <mpi.h>
 #include "ntopo_improper_all.h"
+#include <mpi.h>
 #include "atom.h"
 #include "force.h"
 #include "domain.h"
diff --git a/src/ntopo_improper_partial.cpp b/src/ntopo_improper_partial.cpp
index 2c37668ca8..17e5d4cf62 100644
--- a/src/ntopo_improper_partial.cpp
+++ b/src/ntopo_improper_partial.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <mpi.h>
 #include "ntopo_improper_partial.h"
+#include <mpi.h>
 #include "atom.h"
 #include "force.h"
 #include "domain.h"
diff --git a/src/ntopo_improper_template.cpp b/src/ntopo_improper_template.cpp
index 953e010d89..a80fe60e1d 100644
--- a/src/ntopo_improper_template.cpp
+++ b/src/ntopo_improper_template.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <mpi.h>
 #include "ntopo_improper_template.h"
+#include <mpi.h>
 #include "atom.h"
 #include "atom_vec.h"
 #include "force.h"
diff --git a/src/output.cpp b/src/output.cpp
index be6f66b7aa..193db9ae2a 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "output.h"
 #include <mpi.h>
 #include <cstring>
-#include "output.h"
 #include "style_dump.h"
 #include "atom.h"
 #include "neighbor.h"
diff --git a/src/pair.cpp b/src/pair.cpp
index 3d7bdaa62c..36194aec9b 100644
--- a/src/pair.cpp
+++ b/src/pair.cpp
@@ -15,12 +15,12 @@
    Contributing author: Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
+#include "pair.h"
 #include <mpi.h>
 #include <cfloat>    // IWYU pragma: keep
 #include <climits>   // IWYU pragma: keep
 #include <cmath>
 #include <cstring>
-#include "pair.h"
 #include "atom.h"
 #include "neighbor.h"
 #include "domain.h"
diff --git a/src/pair_beck.cpp b/src/pair_beck.cpp
index 8ba3ef80f2..b94436b696 100644
--- a/src/pair_beck.cpp
+++ b/src/pair_beck.cpp
@@ -15,9 +15,9 @@
    Contributing author: Jonathan Zimmerman (Sandia)
 ------------------------------------------------------------------------- */
 
+#include "pair_beck.h"
 #include <mpi.h>
 #include <cmath>
-#include "pair_beck.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_born.cpp b/src/pair_born.cpp
index ae7456ddbb..bd993acb56 100644
--- a/src/pair_born.cpp
+++ b/src/pair_born.cpp
@@ -15,10 +15,10 @@
    Contributing Author: Sai Jayaraman (Sandia)
 ------------------------------------------------------------------------- */
 
+#include "pair_born.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstring>
-#include "pair_born.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_born_coul_dsf.cpp b/src/pair_born_coul_dsf.cpp
index 51b9a2677d..f7e139c750 100644
--- a/src/pair_born_coul_dsf.cpp
+++ b/src/pair_born_coul_dsf.cpp
@@ -16,9 +16,9 @@
    References: Fennell and Gezelter, JCP 124, 234104 (2006)
 ------------------------------------------------------------------------- */
 
+#include "pair_born_coul_dsf.h"
 #include <mpi.h>
 #include <cmath>
-#include "pair_born_coul_dsf.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_born_coul_wolf.cpp b/src/pair_born_coul_wolf.cpp
index f4ccac80a1..f4d533bdb0 100644
--- a/src/pair_born_coul_wolf.cpp
+++ b/src/pair_born_coul_wolf.cpp
@@ -15,9 +15,9 @@
    Contributing author: Yongfeng Zhang (INL), yongfeng.zhang@inl.gov
 ------------------------------------------------------------------------- */
 
+#include "pair_born_coul_wolf.h"
 #include <mpi.h>
 #include <cmath>
-#include "pair_born_coul_wolf.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_buck.cpp b/src/pair_buck.cpp
index b9795fb0ed..a94ce87891 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 "pair_buck.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstring>
-#include "pair_buck.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_buck_coul_cut.cpp b/src/pair_buck_coul_cut.cpp
index 64475166e3..d05c139f71 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 "pair_buck_coul_cut.h"
 #include <mpi.h>
 #include <cmath>
-#include "pair_buck_coul_cut.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_coul_cut.cpp b/src/pair_coul_cut.cpp
index 28973026cd..9e6f238eba 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 "pair_coul_cut.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstring>
-#include "pair_coul_cut.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_coul_debye.cpp b/src/pair_coul_debye.cpp
index cd23ef1919..1b87a93701 100644
--- a/src/pair_coul_debye.cpp
+++ b/src/pair_coul_debye.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "pair_coul_debye.h"
 #include <mpi.h>
 #include <cmath>
-#include "pair_coul_debye.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_coul_dsf.cpp b/src/pair_coul_dsf.cpp
index 4c15b5d330..22230182b0 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 "pair_coul_dsf.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstring>
-#include "pair_coul_dsf.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_coul_streitz.cpp b/src/pair_coul_streitz.cpp
index f577564ac1..628f6a6b36 100644
--- a/src/pair_coul_streitz.cpp
+++ b/src/pair_coul_streitz.cpp
@@ -15,11 +15,11 @@
    Contributing author: Ray Shan (Sandia)
 ------------------------------------------------------------------------- */
 
+#include "pair_coul_streitz.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
-#include "pair_coul_streitz.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_coul_wolf.cpp b/src/pair_coul_wolf.cpp
index 8c15378de8..15c7839fc6 100644
--- a/src/pair_coul_wolf.cpp
+++ b/src/pair_coul_wolf.cpp
@@ -15,9 +15,9 @@
    Contributing author: Yongfeng Zhang (INL), yongfeng.zhang@inl.gov
 ------------------------------------------------------------------------- */
 
+#include "pair_coul_wolf.h"
 #include <mpi.h>
 #include <cmath>
-#include "pair_coul_wolf.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_deprecated.cpp b/src/pair_deprecated.cpp
index 0b1342fb2d..058809eb80 100644
--- a/src/pair_deprecated.cpp
+++ b/src/pair_deprecated.cpp
@@ -15,8 +15,8 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <cstring>
 #include "pair_deprecated.h"
+#include <cstring>
 #include "pair_hybrid.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_dpd.cpp b/src/pair_dpd.cpp
index e5e6cf7dae..ec65eaafd6 100644
--- a/src/pair_dpd.cpp
+++ b/src/pair_dpd.cpp
@@ -15,9 +15,9 @@
    Contributing author: Kurt Smith (U Pittsburgh)
 ------------------------------------------------------------------------- */
 
+#include "pair_dpd.h"
 #include <mpi.h>
 #include <cmath>
-#include "pair_dpd.h"
 #include "atom.h"
 #include "comm.h"
 #include "update.h"
diff --git a/src/pair_dpd_tstat.cpp b/src/pair_dpd_tstat.cpp
index 66c8d91ab1..15d7c90b27 100644
--- a/src/pair_dpd_tstat.cpp
+++ b/src/pair_dpd_tstat.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "pair_dpd_tstat.h"
 #include <mpi.h>
 #include <cmath>
-#include "pair_dpd_tstat.h"
 #include "atom.h"
 #include "update.h"
 #include "force.h"
diff --git a/src/pair_gauss.cpp b/src/pair_gauss.cpp
index 7df9a417c3..7fd3233f4c 100644
--- a/src/pair_gauss.cpp
+++ b/src/pair_gauss.cpp
@@ -15,10 +15,10 @@
    Contributing author: Sai Jayaraman (Sandia)
 ------------------------------------------------------------------------- */
 
+#include "pair_gauss.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstring>
-#include "pair_gauss.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_hybrid.cpp b/src/pair_hybrid.cpp
index daeee3d2b3..762b9fe8fc 100644
--- a/src/pair_hybrid.cpp
+++ b/src/pair_hybrid.cpp
@@ -12,10 +12,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "pair_hybrid.h"
 #include <mpi.h>
 #include <cstring>
 #include <cctype>
-#include "pair_hybrid.h"
 #include "atom.h"
 #include "force.h"
 #include "pair.h"
diff --git a/src/pair_hybrid_overlay.cpp b/src/pair_hybrid_overlay.cpp
index 496e3d0406..e67cb677af 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 "pair_hybrid_overlay.h"
 #include <cstring>
 #include <cctype>
-#include "pair_hybrid_overlay.h"
 #include "atom.h"
 #include "force.h"
 #include "error.h"
diff --git a/src/pair_lj96_cut.cpp b/src/pair_lj96_cut.cpp
index 62e645ef2c..c27038900d 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 "pair_lj96_cut.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstring>
-#include "pair_lj96_cut.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_lj_cubic.cpp b/src/pair_lj_cubic.cpp
index 8b1b4b7627..7990952494 100644
--- a/src/pair_lj_cubic.cpp
+++ b/src/pair_lj_cubic.cpp
@@ -16,9 +16,9 @@
    Contributing author: Aidan Thompson (SNL)
 ------------------------------------------------------------------------- */
 
+#include "pair_lj_cubic.h"
 #include <mpi.h>
 #include <cmath>
-#include "pair_lj_cubic.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_lj_cut.cpp b/src/pair_lj_cut.cpp
index 9284923218..0302858adb 100644
--- a/src/pair_lj_cut.cpp
+++ b/src/pair_lj_cut.cpp
@@ -15,10 +15,10 @@
    Contributing author: Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
+#include "pair_lj_cut.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstring>
-#include "pair_lj_cut.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_lj_cut_coul_cut.cpp b/src/pair_lj_cut_coul_cut.cpp
index 9ffa02156e..d4640bee3a 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 "pair_lj_cut_coul_cut.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstring>
-#include "pair_lj_cut_coul_cut.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_lj_cut_coul_debye.cpp b/src/pair_lj_cut_coul_debye.cpp
index ab6220bd24..4ef533a743 100644
--- a/src/pair_lj_cut_coul_debye.cpp
+++ b/src/pair_lj_cut_coul_debye.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "pair_lj_cut_coul_debye.h"
 #include <mpi.h>
 #include <cmath>
-#include "pair_lj_cut_coul_debye.h"
 #include "atom.h"
 #include "neigh_list.h"
 #include "force.h"
diff --git a/src/pair_lj_cut_coul_wolf.cpp b/src/pair_lj_cut_coul_wolf.cpp
index 55aff0d7c5..fb641f7d24 100644
--- a/src/pair_lj_cut_coul_wolf.cpp
+++ b/src/pair_lj_cut_coul_wolf.cpp
@@ -15,11 +15,11 @@
    Contributing author: Vishal Boddu (FAU)
 ------------------------------------------------------------------------- */
 
+#include "pair_lj_cut_coul_wolf.h"
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include "pair_lj_cut_coul_wolf.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_lj_expand.cpp b/src/pair_lj_expand.cpp
index d5c0a40f2d..60593fd01d 100644
--- a/src/pair_lj_expand.cpp
+++ b/src/pair_lj_expand.cpp
@@ -11,11 +11,11 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "pair_lj_expand.h"
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include "pair_lj_expand.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_lj_gromacs.cpp b/src/pair_lj_gromacs.cpp
index 1fdaefebe9..4796c288d7 100644
--- a/src/pair_lj_gromacs.cpp
+++ b/src/pair_lj_gromacs.cpp
@@ -15,11 +15,11 @@
    Contributing author: Mark Stevens (SNL)
 ------------------------------------------------------------------------- */
 
+#include "pair_lj_gromacs.h"
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include "pair_lj_gromacs.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_lj_gromacs_coul_gromacs.cpp b/src/pair_lj_gromacs_coul_gromacs.cpp
index 28dc8ec79b..45beeb1daf 100644
--- a/src/pair_lj_gromacs_coul_gromacs.cpp
+++ b/src/pair_lj_gromacs_coul_gromacs.cpp
@@ -15,11 +15,11 @@
    Contributing author: Mark Stevens (SNL)
 ------------------------------------------------------------------------- */
 
+#include "pair_lj_gromacs_coul_gromacs.h"
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include "pair_lj_gromacs_coul_gromacs.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_lj_smooth.cpp b/src/pair_lj_smooth.cpp
index ecacadbffa..d89fee1148 100644
--- a/src/pair_lj_smooth.cpp
+++ b/src/pair_lj_smooth.cpp
@@ -15,10 +15,10 @@
    Contributing author: Craig Maloney (UCSB)
 ------------------------------------------------------------------------- */
 
+#include "pair_lj_smooth.h"
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
-#include "pair_lj_smooth.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_lj_smooth_linear.cpp b/src/pair_lj_smooth_linear.cpp
index 265828c4cf..6ed19a452f 100644
--- a/src/pair_lj_smooth_linear.cpp
+++ b/src/pair_lj_smooth_linear.cpp
@@ -15,10 +15,10 @@
    Contributing author: Jonathan Zimmerman (Sandia)
 ------------------------------------------------------------------------- */
 
+#include "pair_lj_smooth_linear.h"
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
-#include "pair_lj_smooth_linear.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_mie_cut.cpp b/src/pair_mie_cut.cpp
index 231832dc48..d2b0c20cd5 100644
--- a/src/pair_mie_cut.cpp
+++ b/src/pair_mie_cut.cpp
@@ -15,11 +15,11 @@
    Contributing author: Cassiano Aimoli (aimoli@gmail.com)
 ------------------------------------------------------------------------- */
 
+#include "pair_mie_cut.h"
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include "pair_mie_cut.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_morse.cpp b/src/pair_morse.cpp
index dca1834c14..47102932db 100644
--- a/src/pair_morse.cpp
+++ b/src/pair_morse.cpp
@@ -11,11 +11,11 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "pair_morse.h"
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include "pair_morse.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_soft.cpp b/src/pair_soft.cpp
index 7602f7b925..f3d7423b04 100644
--- a/src/pair_soft.cpp
+++ b/src/pair_soft.cpp
@@ -11,11 +11,11 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "pair_soft.h"
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include "pair_soft.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_table.cpp b/src/pair_table.cpp
index b1b6f45eda..63cda78c67 100644
--- a/src/pair_table.cpp
+++ b/src/pair_table.cpp
@@ -15,11 +15,11 @@
    Contributing author: Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
+#include "pair_table.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
-#include "pair_table.h"
 #include "atom.h"
 #include "force.h"
 #include "comm.h"
diff --git a/src/pair_ufm.cpp b/src/pair_ufm.cpp
index 226fb6e7d9..40b72136ff 100644
--- a/src/pair_ufm.cpp
+++ b/src/pair_ufm.cpp
@@ -17,11 +17,11 @@
             Maurice de Koning (Unicamp/Brazil) - dekoning@ifi.unicamp.br
  ------------------------------------------------------------------------- */
 
+#include "pair_ufm.h"
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include "pair_ufm.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_yukawa.cpp b/src/pair_yukawa.cpp
index 913afbd5a1..4a2cf23952 100644
--- a/src/pair_yukawa.cpp
+++ b/src/pair_yukawa.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "pair_yukawa.h"
 #include <cmath>
 #include <cstdlib>
-#include "pair_yukawa.h"
 #include "atom.h"
 #include "force.h"
 #include "comm.h"
diff --git a/src/pair_zbl.cpp b/src/pair_zbl.cpp
index 254a82ea64..b01c301785 100644
--- a/src/pair_zbl.cpp
+++ b/src/pair_zbl.cpp
@@ -15,11 +15,11 @@
    Contributing authors: Stephen Foiles, Aidan Thompson (SNL)
 ------------------------------------------------------------------------- */
 
+#include "pair_zbl.h"
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include "pair_zbl.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/pair_zero.cpp b/src/pair_zero.cpp
index 143808f598..2692710e20 100644
--- a/src/pair_zero.cpp
+++ b/src/pair_zero.cpp
@@ -15,11 +15,11 @@
    Contributing author: Carsten Svaneborg (SDU)
 ------------------------------------------------------------------------- */
 
+#include "pair_zero.h"
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include "pair_zero.h"
 #include "atom.h"
 #include "comm.h"
 #include "force.h"
diff --git a/src/procmap.cpp b/src/procmap.cpp
index 08b60a26af..47afb76da9 100644
--- a/src/procmap.cpp
+++ b/src/procmap.cpp
@@ -15,8 +15,8 @@
    Contributing author (NUMA option) : Mike Brown (ORNL)
 ------------------------------------------------------------------------- */
 
-#include <cstring>
 #include "procmap.h"
+#include <cstring>
 #include "universe.h"
 #include "comm.h"
 #include "domain.h"
diff --git a/src/random_mars.cpp b/src/random_mars.cpp
index 464e640eab..9de5290d29 100644
--- a/src/random_mars.cpp
+++ b/src/random_mars.cpp
@@ -14,8 +14,8 @@
 // Marsaglia random number generator
 // see RANMAR in F James, Comp Phys Comm, 60, 329 (1990)
 
-#include <cmath>
 #include "random_mars.h"
+#include <cmath>
 #include "error.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/random_park.cpp b/src/random_park.cpp
index fc00939bd4..e12e8a3a10 100644
--- a/src/random_park.cpp
+++ b/src/random_park.cpp
@@ -13,8 +13,8 @@
 
 // Park/Miller RNG
 
-#include <cmath>
 #include "random_park.h"
+#include <cmath>
 #include "error.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/rcb.cpp b/src/rcb.cpp
index 83cdccdf80..b19beae3c5 100644
--- a/src/rcb.cpp
+++ b/src/rcb.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "rcb.h"
 #include <mpi.h>
 #include <cstring>
-#include "rcb.h"
 #include "irregular.h"
 #include "memory.h"
 #include "error.h"
diff --git a/src/read_data.cpp b/src/read_data.cpp
index e70a526c38..a50d41b498 100644
--- a/src/read_data.cpp
+++ b/src/read_data.cpp
@@ -15,13 +15,13 @@
 // 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 "read_data.h"
 #include "lmptype.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstring>
 #include <cstdlib>
 #include <cctype>
-#include "read_data.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "atom_vec_ellipsoid.h"
diff --git a/src/read_dump.cpp b/src/read_dump.cpp
index 395f4c8edd..49f96db680 100644
--- a/src/read_dump.cpp
+++ b/src/read_dump.cpp
@@ -19,11 +19,11 @@
 // 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 "read_dump.h"
 #include "lmptype.h"
 #include <mpi.h>
 #include <cstring>
 #include <cstdlib>
-#include "read_dump.h"
 #include "reader.h"
 #include "style_reader.h"
 #include "atom.h"
diff --git a/src/read_restart.cpp b/src/read_restart.cpp
index 6e156da837..17b313bfa2 100644
--- a/src/read_restart.cpp
+++ b/src/read_restart.cpp
@@ -11,11 +11,11 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "read_restart.h"
 #include <mpi.h>
 #include <cstring>
 #include <cstdlib>
 #include <dirent.h>
-#include "read_restart.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "domain.h"
diff --git a/src/reader.cpp b/src/reader.cpp
index cf344b37b3..a1fe51f662 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "reader.h"
 #include <cstdio>
 #include <cstring>
-#include "reader.h"
 #include "error.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/reader_native.cpp b/src/reader_native.cpp
index 2c60ffdfd4..9e98a95759 100644
--- a/src/reader_native.cpp
+++ b/src/reader_native.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "reader_native.h"
 #include <cstring>
 #include <cstdlib>
-#include "reader_native.h"
 #include "atom.h"
 #include "memory.h"
 #include "error.h"
diff --git a/src/reader_xyz.cpp b/src/reader_xyz.cpp
index 37d30bd740..fa553dc30f 100644
--- a/src/reader_xyz.cpp
+++ b/src/reader_xyz.cpp
@@ -15,9 +15,9 @@
    Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
+#include "reader_xyz.h"
 #include <cstring>
 #include <cstdlib>
-#include "reader_xyz.h"
 #include "atom.h"
 #include "memory.h"
 #include "error.h"
diff --git a/src/region.cpp b/src/region.cpp
index 6b49a2819b..0c4bec16e0 100644
--- a/src/region.cpp
+++ b/src/region.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "region.h"
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
-#include "region.h"
 #include "update.h"
 #include "domain.h"
 #include "lattice.h"
diff --git a/src/region_block.cpp b/src/region_block.cpp
index e55c481189..bc52fcd7cf 100644
--- a/src/region_block.cpp
+++ b/src/region_block.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "region_block.h"
 #include <cstdlib>
 #include <cstring>
-#include "region_block.h"
 #include "force.h"
 #include "domain.h"
 #include "math_extra.h"
diff --git a/src/region_cone.cpp b/src/region_cone.cpp
index 72f56a268f..345c9fa8e2 100644
--- a/src/region_cone.cpp
+++ b/src/region_cone.cpp
@@ -15,10 +15,10 @@
    Contributing author: Pim Schravendijk
 ------------------------------------------------------------------------- */
 
+#include "region_cone.h"
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
-#include "region_cone.h"
 #include "domain.h"
 #include "error.h"
 #include "force.h"
diff --git a/src/region_cylinder.cpp b/src/region_cylinder.cpp
index 7709c57aab..968453cf37 100644
--- a/src/region_cylinder.cpp
+++ b/src/region_cylinder.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "region_cylinder.h"
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
-#include "region_cylinder.h"
 #include "update.h"
 #include "domain.h"
 #include "input.h"
diff --git a/src/region_deprecated.cpp b/src/region_deprecated.cpp
index 87225959fa..a2e4e88393 100644
--- a/src/region_deprecated.cpp
+++ b/src/region_deprecated.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <cstring>
 #include "region_deprecated.h"
+#include <cstring>
 #include "comm.h"
 #include "error.h"
 
diff --git a/src/region_intersect.cpp b/src/region_intersect.cpp
index 96d3bed16c..c6c11cf35c 100644
--- a/src/region_intersect.cpp
+++ b/src/region_intersect.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "region_intersect.h"
 #include <cstdlib>
 #include <cstring>
-#include "region_intersect.h"
 #include "domain.h"
 #include "error.h"
 #include "force.h"
diff --git a/src/region_plane.cpp b/src/region_plane.cpp
index e67a2c85bd..950c0a4b53 100644
--- a/src/region_plane.cpp
+++ b/src/region_plane.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "region_plane.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 22fc504c37..38fc23da21 100644
--- a/src/region_prism.cpp
+++ b/src/region_prism.cpp
@@ -15,10 +15,10 @@
    Contributing author: Pieter in 't Veld (SNL)
 ------------------------------------------------------------------------- */
 
+#include "region_prism.h"
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
-#include "region_prism.h"
 #include "domain.h"
 #include "force.h"
 #include "math_extra.h"
diff --git a/src/region_sphere.cpp b/src/region_sphere.cpp
index 8080ef5882..9c478960e3 100644
--- a/src/region_sphere.cpp
+++ b/src/region_sphere.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "region_sphere.h"
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
-#include "region_sphere.h"
 #include "update.h"
 #include "input.h"
 #include "variable.h"
diff --git a/src/region_union.cpp b/src/region_union.cpp
index 33ac6fedd7..f4e30f5b94 100644
--- a/src/region_union.cpp
+++ b/src/region_union.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "region_union.h"
 #include <cstdlib>
 #include <cstring>
-#include "region_union.h"
 #include "domain.h"
 #include "error.h"
 #include "force.h"
diff --git a/src/replicate.cpp b/src/replicate.cpp
index 3c8f4a8aee..6f8c94238a 100644
--- a/src/replicate.cpp
+++ b/src/replicate.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "replicate.h"
 #include <cstdlib>
 #include <cstring>
-#include "replicate.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "atom_vec_hybrid.h"
diff --git a/src/rerun.cpp b/src/rerun.cpp
index 063ea882c2..e75779ccc0 100644
--- a/src/rerun.cpp
+++ b/src/rerun.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "rerun.h"
 #include <cstdlib>
 #include <cstring>
-#include "rerun.h"
 #include "read_dump.h"
 #include "domain.h"
 #include "update.h"
diff --git a/src/reset_ids.cpp b/src/reset_ids.cpp
index b2cf7a9bbc..b68b7ca797 100644
--- a/src/reset_ids.cpp
+++ b/src/reset_ids.cpp
@@ -28,7 +28,7 @@ ResetIDs::ResetIDs(LAMMPS *lmp) : Pointers(lmp) {}
 
 /* ---------------------------------------------------------------------- */
 
-void ResetIDs::command(int narg, char **/*arg*/)
+void ResetIDs::command(int narg, char ** /* arg */)
 {
   if (domain->box_exist == 0)
     error->all(FLERR,"Reset_ids command before simulation box is defined");
diff --git a/src/respa.cpp b/src/respa.cpp
index 6fa9959d78..867662b3c2 100644
--- a/src/respa.cpp
+++ b/src/respa.cpp
@@ -15,9 +15,9 @@
    Contributing authors: Mark Stevens (SNL), Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
+#include "respa.h"
 #include <cstdlib>
 #include <cstring>
-#include "respa.h"
 #include "neighbor.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/run.cpp b/src/run.cpp
index beb71be52c..60861ad3b9 100644
--- a/src/run.cpp
+++ b/src/run.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "run.h"
 #include <cstdlib>
 #include <cstring>
-#include "run.h"
 #include "domain.h"
 #include "update.h"
 #include "force.h"
diff --git a/src/set.cpp b/src/set.cpp
index 00b2d8a9b0..d34aa7753a 100644
--- a/src/set.cpp
+++ b/src/set.cpp
@@ -11,11 +11,11 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "set.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
-#include "set.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "atom_vec_ellipsoid.h"
diff --git a/src/special.cpp b/src/special.cpp
index 903794c0f6..f8661e238c 100644
--- a/src/special.cpp
+++ b/src/special.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "special.h"
 #include <mpi.h>
 #include <cstdio>
-#include "special.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "force.h"
diff --git a/src/thermo.cpp b/src/thermo.cpp
index f4ab7b0779..d267ea260c 100644
--- a/src/thermo.cpp
+++ b/src/thermo.cpp
@@ -15,12 +15,12 @@
 // 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 "thermo.h"
 #include "lmptype.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
-#include "thermo.h"
 #include "atom.h"
 #include "update.h"
 #include "comm.h"
diff --git a/src/timer.cpp b/src/timer.cpp
index 65cb6ab5d8..0dad8fb756 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "timer.h"
 #include <mpi.h>
 #include <cstring>
 #include <cstdlib>
-#include "timer.h"
 #include "comm.h"
 #include "error.h"
 #include "force.h"
diff --git a/src/universe.cpp b/src/universe.cpp
index f078590103..2a7117da51 100644
--- a/src/universe.cpp
+++ b/src/universe.cpp
@@ -11,12 +11,12 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "universe.h"
 #include <mpi.h>
 #include <cctype>
 #include <cstdlib>
 #include <cstring>
 #include <cstdio>
-#include "universe.h"
 #include "version.h"
 #include "error.h"
 #include "force.h"
diff --git a/src/update.cpp b/src/update.cpp
index f5e706e354..e83f4d9f72 100644
--- a/src/update.cpp
+++ b/src/update.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "update.h"
 #include <cstring>
 #include <cstdlib>
-#include "update.h"
 #include "integrate.h"
 #include "min.h"
 #include "style_integrate.h"
diff --git a/src/utils.cpp b/src/utils.cpp
index 8468b22d8c..ea2ab57f6f 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "utils.h"
 #include <mpi.h>
 #include <cstring>
-#include "utils.h"
 #include "lammps.h"
 #include "error.h"
 
diff --git a/src/variable.cpp b/src/variable.cpp
index 111fc75a9a..440fb07f95 100644
--- a/src/variable.cpp
+++ b/src/variable.cpp
@@ -11,13 +11,13 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "variable.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
 #include <cctype>
 #include <unistd.h>
-#include "variable.h"
 #include "universe.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/velocity.cpp b/src/velocity.cpp
index 95d820cc22..1a03f71128 100644
--- a/src/velocity.cpp
+++ b/src/velocity.cpp
@@ -11,12 +11,12 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "velocity.h"
 #include <mpi.h>
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include "velocity.h"
 #include "atom.h"
 #include "update.h"
 #include "domain.h"
diff --git a/src/verlet.cpp b/src/verlet.cpp
index fcba248d5f..5ccef36259 100644
--- a/src/verlet.cpp
+++ b/src/verlet.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <cstring>
 #include "verlet.h"
+#include <cstring>
 #include "neighbor.h"
 #include "domain.h"
 #include "comm.h"
diff --git a/src/write_coeff.cpp b/src/write_coeff.cpp
index 9bf54b3c08..08ff964e7c 100644
--- a/src/write_coeff.cpp
+++ b/src/write_coeff.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "write_coeff.h"
 #include <cstring>
 #include <cstdlib>
 #include <unistd.h>
-#include "write_coeff.h"
 #include "pair.h"
 #include "bond.h"
 #include "angle.h"
diff --git a/src/write_data.cpp b/src/write_data.cpp
index decc92ea8c..b78e701d35 100644
--- a/src/write_data.cpp
+++ b/src/write_data.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "write_data.h"
 #include <mpi.h>
 #include <cstring>
-#include "write_data.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "group.h"
diff --git a/src/write_dump.cpp b/src/write_dump.cpp
index 072680a8a5..903f0e0cdd 100644
--- a/src/write_dump.cpp
+++ b/src/write_dump.cpp
@@ -15,8 +15,8 @@
    Contributing author:  Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <cstring>
 #include "write_dump.h"
+#include <cstring>
 #include "style_dump.h"
 #include "dump.h"
 #include "dump_image.h"
diff --git a/src/write_restart.cpp b/src/write_restart.cpp
index e0e17cd292..5adb39067c 100644
--- a/src/write_restart.cpp
+++ b/src/write_restart.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "write_restart.h"
 #include <mpi.h>
 #include <cstring>
-#include "write_restart.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "atom_vec_hybrid.h"