diff --git a/src/ASPHERE/atom_vec_ellipsoid.cpp b/src/ASPHERE/atom_vec_ellipsoid.cpp
index e48e7ae303..5d85e01ef1 100755
--- a/src/ASPHERE/atom_vec_ellipsoid.cpp
+++ b/src/ASPHERE/atom_vec_ellipsoid.cpp
@@ -15,9 +15,9 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "atom_vec_ellipsoid.h"
-#include "lmptype.h"
 #include "math_extra.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/CLASS2/dihedral_class2.cpp b/src/CLASS2/dihedral_class2.cpp
index 9b43673da5..df80d249a3 100644
--- a/src/CLASS2/dihedral_class2.cpp
+++ b/src/CLASS2/dihedral_class2.cpp
@@ -15,11 +15,11 @@
    Contributing author: Eric Simon (Cray)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "string.h"
 #include "stdlib.h"
 #include "dihedral_class2.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "neighbor.h"
 #include "update.h"
diff --git a/src/CLASS2/improper_class2.cpp b/src/CLASS2/improper_class2.cpp
index 7f0f31bc1f..57ada4cfc3 100644
--- a/src/CLASS2/improper_class2.cpp
+++ b/src/CLASS2/improper_class2.cpp
@@ -15,11 +15,11 @@
    Contributing author: Eric Simon (Cray)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "string.h"
 #include "stdlib.h"
 #include "improper_class2.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "neighbor.h"
 #include "update.h"
diff --git a/src/COLLOID/atom_vec_colloid.cpp b/src/COLLOID/atom_vec_colloid.cpp
index 0ba21a7356..d35bfe7de8 100644
--- a/src/COLLOID/atom_vec_colloid.cpp
+++ b/src/COLLOID/atom_vec_colloid.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "atom_vec_colloid.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "force.h"
 #include "domain.h"
diff --git a/src/DIPOLE/atom_vec_dipole.cpp b/src/DIPOLE/atom_vec_dipole.cpp
index cc81711b4d..bc254cbb61 100644
--- a/src/DIPOLE/atom_vec_dipole.cpp
+++ b/src/DIPOLE/atom_vec_dipole.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "atom_vec_dipole.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "domain.h"
 #include "modify.h"
diff --git a/src/GPU/pair_cg_cmm_coul_long_gpu.cpp b/src/GPU/pair_cg_cmm_coul_long_gpu.cpp
index 3a5a58c5b2..6d11692d5c 100644
--- a/src/GPU/pair_cg_cmm_coul_long_gpu.cpp
+++ b/src/GPU/pair_cg_cmm_coul_long_gpu.cpp
@@ -15,11 +15,11 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "stdio.h"
 #include "stdlib.h"
 #include "pair_cg_cmm_coul_long_gpu.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "comm.h"
diff --git a/src/GPU/pair_cg_cmm_gpu.cpp b/src/GPU/pair_cg_cmm_gpu.cpp
index a49464fd58..638815f367 100644
--- a/src/GPU/pair_cg_cmm_gpu.cpp
+++ b/src/GPU/pair_cg_cmm_gpu.cpp
@@ -15,11 +15,11 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "stdio.h"
 #include "stdlib.h"
 #include "pair_cg_cmm_gpu.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "comm.h"
diff --git a/src/GPU/pair_gayberne_gpu.cpp b/src/GPU/pair_gayberne_gpu.cpp
index b0e8af1df6..eea45ad978 100644
--- a/src/GPU/pair_gayberne_gpu.cpp
+++ b/src/GPU/pair_gayberne_gpu.cpp
@@ -15,11 +15,11 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "stdio.h"
 #include "stdlib.h"
 #include "pair_gayberne_gpu.h"
-#include "lmptype.h"
 #include "math_extra.h"
 #include "atom.h"
 #include "atom_vec.h"
diff --git a/src/GPU/pair_lj96_cut_gpu.cpp b/src/GPU/pair_lj96_cut_gpu.cpp
index e36ea857f2..8da2391068 100644
--- a/src/GPU/pair_lj96_cut_gpu.cpp
+++ b/src/GPU/pair_lj96_cut_gpu.cpp
@@ -15,11 +15,11 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "stdio.h"
 #include "stdlib.h"
 #include "pair_lj96_cut_gpu.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "comm.h"
diff --git a/src/GPU/pair_lj_charmm_coul_long_gpu.cpp b/src/GPU/pair_lj_charmm_coul_long_gpu.cpp
index a02d7018c9..7be632c001 100644
--- a/src/GPU/pair_lj_charmm_coul_long_gpu.cpp
+++ b/src/GPU/pair_lj_charmm_coul_long_gpu.cpp
@@ -15,11 +15,11 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "stdio.h"
 #include "stdlib.h"
 #include "pair_lj_charmm_coul_long_gpu.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "comm.h"
diff --git a/src/GPU/pair_lj_cut_coul_cut_gpu.cpp b/src/GPU/pair_lj_cut_coul_cut_gpu.cpp
index 3c8b1271f5..2cb4027bc5 100644
--- a/src/GPU/pair_lj_cut_coul_cut_gpu.cpp
+++ b/src/GPU/pair_lj_cut_coul_cut_gpu.cpp
@@ -15,11 +15,11 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "stdio.h"
 #include "stdlib.h"
 #include "pair_lj_cut_coul_cut_gpu.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "comm.h"
diff --git a/src/GPU/pair_lj_cut_coul_long_gpu.cpp b/src/GPU/pair_lj_cut_coul_long_gpu.cpp
index 9782317d73..86cba80704 100644
--- a/src/GPU/pair_lj_cut_coul_long_gpu.cpp
+++ b/src/GPU/pair_lj_cut_coul_long_gpu.cpp
@@ -15,11 +15,11 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "stdio.h"
 #include "stdlib.h"
 #include "pair_lj_cut_coul_long_gpu.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "comm.h"
diff --git a/src/GPU/pair_lj_cut_gpu.cpp b/src/GPU/pair_lj_cut_gpu.cpp
index 4c12e7d9f6..612a8e918d 100644
--- a/src/GPU/pair_lj_cut_gpu.cpp
+++ b/src/GPU/pair_lj_cut_gpu.cpp
@@ -15,11 +15,11 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "stdio.h"
 #include "stdlib.h"
 #include "pair_lj_cut_gpu.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "comm.h"
diff --git a/src/GRANULAR/atom_vec_granular.cpp b/src/GRANULAR/atom_vec_granular.cpp
index 0ebb38d8f2..d70b4051da 100644
--- a/src/GRANULAR/atom_vec_granular.cpp
+++ b/src/GRANULAR/atom_vec_granular.cpp
@@ -11,11 +11,11 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "stdlib.h"
 #include "string.h"
 #include "atom_vec_granular.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "domain.h"
 #include "modify.h"
diff --git a/src/KSPACE/pppm.cpp b/src/KSPACE/pppm.cpp
index 306efb8ea2..ad43ff3120 100644
--- a/src/KSPACE/pppm.cpp
+++ b/src/KSPACE/pppm.cpp
@@ -15,13 +15,13 @@
    Contributing authors: Roy Pollock (LLNL), Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "string.h"
 #include "stdio.h"
 #include "stdlib.h"
 #include "math.h"
 #include "pppm.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "comm.h"
 #include "neighbor.h"
diff --git a/src/KSPACE/pppm.h b/src/KSPACE/pppm.h
index 9ca04a7540..cb02853983 100644
--- a/src/KSPACE/pppm.h
+++ b/src/KSPACE/pppm.h
@@ -20,8 +20,8 @@ KSpaceStyle(pppm,PPPM)
 #ifndef LMP_PPPM_H
 #define LMP_PPPM_H
 
-#include "kspace.h"
 #include "lmptype.h"
+#include "kspace.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/MANYBODY/fix_qeq_comb.cpp b/src/MANYBODY/fix_qeq_comb.cpp
index b734c5a1c2..3552519ffe 100644
--- a/src/MANYBODY/fix_qeq_comb.cpp
+++ b/src/MANYBODY/fix_qeq_comb.cpp
@@ -15,12 +15,12 @@
    Contributing author: Tzu-Ray Shan (U Florida, rayshan@ufl.edu)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "math.h"
 #include "stdlib.h"
 #include "string.h"
 #include "fix_qeq_comb.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "force.h"
 #include "group.h"
diff --git a/src/MANYBODY/fix_qeq_comb.h b/src/MANYBODY/fix_qeq_comb.h
index 235b4c9c3e..be3d6b227b 100644
--- a/src/MANYBODY/fix_qeq_comb.h
+++ b/src/MANYBODY/fix_qeq_comb.h
@@ -20,9 +20,9 @@ FixStyle(qeq/comb,FixQEQComb)
 #ifndef LMP_FIX_QEQ_COMB_H
 #define LMP_FIX_QEQ_COMB_H
 
+#include "lmptype.h"
 #include "stdio.h"
 #include "fix.h"
-#include "lmptype.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/MOLECULE/atom_vec_angle.cpp b/src/MOLECULE/atom_vec_angle.cpp
index 33390ee34d..13688b002f 100644
--- a/src/MOLECULE/atom_vec_angle.cpp
+++ b/src/MOLECULE/atom_vec_angle.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "atom_vec_angle.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "domain.h"
 #include "modify.h"
diff --git a/src/MOLECULE/atom_vec_bond.cpp b/src/MOLECULE/atom_vec_bond.cpp
index 13ea1e5e2b..bda7cb97cb 100644
--- a/src/MOLECULE/atom_vec_bond.cpp
+++ b/src/MOLECULE/atom_vec_bond.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "atom_vec_bond.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "domain.h"
 #include "modify.h"
diff --git a/src/MOLECULE/atom_vec_full.cpp b/src/MOLECULE/atom_vec_full.cpp
index 2d733ebf41..1fe0d4fda9 100644
--- a/src/MOLECULE/atom_vec_full.cpp
+++ b/src/MOLECULE/atom_vec_full.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "atom_vec_full.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "domain.h"
 #include "modify.h"
diff --git a/src/MOLECULE/atom_vec_molecular.cpp b/src/MOLECULE/atom_vec_molecular.cpp
index 07c46724aa..a2ff7c19c8 100644
--- a/src/MOLECULE/atom_vec_molecular.cpp
+++ b/src/MOLECULE/atom_vec_molecular.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "atom_vec_molecular.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "domain.h"
 #include "modify.h"
diff --git a/src/MOLECULE/bond_fene.cpp b/src/MOLECULE/bond_fene.cpp
index a2ac3edcf6..6c2f53cc84 100644
--- a/src/MOLECULE/bond_fene.cpp
+++ b/src/MOLECULE/bond_fene.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "stdlib.h"
 #include "bond_fene.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "neighbor.h"
 #include "domain.h"
diff --git a/src/MOLECULE/bond_fene_expand.cpp b/src/MOLECULE/bond_fene_expand.cpp
index e628941025..cb2fc5d723 100644
--- a/src/MOLECULE/bond_fene_expand.cpp
+++ b/src/MOLECULE/bond_fene_expand.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "stdlib.h"
 #include "bond_fene_expand.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "neighbor.h"
 #include "domain.h"
diff --git a/src/MOLECULE/dihedral_charmm.cpp b/src/MOLECULE/dihedral_charmm.cpp
index 5bfbd69aac..57248ff148 100644
--- a/src/MOLECULE/dihedral_charmm.cpp
+++ b/src/MOLECULE/dihedral_charmm.cpp
@@ -15,11 +15,11 @@
    Contributing author: Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "math.h"
 #include "stdlib.h"
 #include "dihedral_charmm.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "comm.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/dihedral_harmonic.cpp b/src/MOLECULE/dihedral_harmonic.cpp
index f4dad74653..e4effc6f24 100644
--- a/src/MOLECULE/dihedral_harmonic.cpp
+++ b/src/MOLECULE/dihedral_harmonic.cpp
@@ -15,11 +15,11 @@
    Contributing author: Paul Crozier (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "math.h"
 #include "stdlib.h"
 #include "dihedral_harmonic.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "comm.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/dihedral_helix.cpp b/src/MOLECULE/dihedral_helix.cpp
index d9c4b78f72..42c4d5eb4a 100644
--- a/src/MOLECULE/dihedral_helix.cpp
+++ b/src/MOLECULE/dihedral_helix.cpp
@@ -16,11 +16,11 @@
                          Mark Stevens (Sandia)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "stdlib.h"
 #include "mpi.h"
 #include "dihedral_helix.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "neighbor.h"
 #include "domain.h"
diff --git a/src/MOLECULE/dihedral_multi_harmonic.cpp b/src/MOLECULE/dihedral_multi_harmonic.cpp
index 4636089e4e..4d4dd429db 100644
--- a/src/MOLECULE/dihedral_multi_harmonic.cpp
+++ b/src/MOLECULE/dihedral_multi_harmonic.cpp
@@ -15,10 +15,10 @@
    Contributing author: Mathias Puetz (SNL) and friends
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "stdlib.h"
 #include "dihedral_multi_harmonic.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "neighbor.h"
 #include "domain.h"
diff --git a/src/MOLECULE/dihedral_opls.cpp b/src/MOLECULE/dihedral_opls.cpp
index 5ef2d0b7ce..6750d3b157 100644
--- a/src/MOLECULE/dihedral_opls.cpp
+++ b/src/MOLECULE/dihedral_opls.cpp
@@ -15,10 +15,10 @@
    Contributing author: Mark Stevens (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "stdlib.h"
 #include "dihedral_opls.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "comm.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/improper_cvff.cpp b/src/MOLECULE/improper_cvff.cpp
index b688a59989..4fdb710948 100644
--- a/src/MOLECULE/improper_cvff.cpp
+++ b/src/MOLECULE/improper_cvff.cpp
@@ -11,11 +11,11 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "math.h"
 #include "stdlib.h"
 #include "improper_cvff.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "comm.h"
 #include "neighbor.h"
diff --git a/src/MOLECULE/improper_harmonic.cpp b/src/MOLECULE/improper_harmonic.cpp
index 527fbf19b8..feae8a3869 100644
--- a/src/MOLECULE/improper_harmonic.cpp
+++ b/src/MOLECULE/improper_harmonic.cpp
@@ -11,11 +11,11 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "math.h"
 #include "stdlib.h"
 #include "improper_harmonic.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "comm.h"
 #include "neighbor.h"
diff --git a/src/PERI/atom_vec_peri.cpp b/src/PERI/atom_vec_peri.cpp
index d20809e6bd..a674ab3bcd 100644
--- a/src/PERI/atom_vec_peri.cpp
+++ b/src/PERI/atom_vec_peri.cpp
@@ -15,10 +15,10 @@
    Contributing author: Mike Parks (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "float.h"
 #include "stdlib.h"
 #include "atom_vec_peri.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "domain.h"
 #include "modify.h"
diff --git a/src/REAX/fix_reax_bonds.cpp b/src/REAX/fix_reax_bonds.cpp
index 0607acc5b6..3d3698b77b 100644
--- a/src/REAX/fix_reax_bonds.cpp
+++ b/src/REAX/fix_reax_bonds.cpp
@@ -15,10 +15,10 @@
    Contributing author: Aidan Thompson (Sandia)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "string.h"
 #include "fix_reax_bonds.h"
-#include "lmptype.h"
 #include "pair_reax_fortran.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/REAX/fix_reax_bonds.h b/src/REAX/fix_reax_bonds.h
index 42bc6ea060..678984f022 100644
--- a/src/REAX/fix_reax_bonds.h
+++ b/src/REAX/fix_reax_bonds.h
@@ -20,9 +20,9 @@ FixStyle(reax/bonds,FixReaxBonds)
 #ifndef LMP_FIX_REAX_BONDS_H
 #define LMP_FIX_REAX_BONDS_H
 
+#include "lmptype.h"
 #include "stdio.h"
 #include "fix.h"
-#include "lmptype.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/REPLICA/fix_event_prd.cpp b/src/REPLICA/fix_event_prd.cpp
index 3fba4da909..ac428f3713 100644
--- a/src/REPLICA/fix_event_prd.cpp
+++ b/src/REPLICA/fix_event_prd.cpp
@@ -15,10 +15,10 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "string.h"
 #include "fix_event_prd.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "update.h"
 #include "domain.h"
diff --git a/src/REPLICA/fix_event_prd.h b/src/REPLICA/fix_event_prd.h
index 18f77b324a..e5aaa8ccdc 100644
--- a/src/REPLICA/fix_event_prd.h
+++ b/src/REPLICA/fix_event_prd.h
@@ -20,8 +20,8 @@ FixStyle(EVENT/PRD,FixEventPRD)
 #ifndef LMP_FIX_EVENT_PRD_H
 #define LMP_FIX_EVENT_PRD_H
 
-#include "fix_event.h"
 #include "lmptype.h"
+#include "fix_event.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/REPLICA/fix_event_tad.cpp b/src/REPLICA/fix_event_tad.cpp
index 8968ec8b7a..950fcd6b80 100644
--- a/src/REPLICA/fix_event_tad.cpp
+++ b/src/REPLICA/fix_event_tad.cpp
@@ -15,10 +15,10 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "string.h"
 #include "fix_event_tad.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "update.h"
 #include "domain.h"
diff --git a/src/REPLICA/fix_event_tad.h b/src/REPLICA/fix_event_tad.h
index 2b6067e9e2..ccd3c1cd4b 100644
--- a/src/REPLICA/fix_event_tad.h
+++ b/src/REPLICA/fix_event_tad.h
@@ -20,8 +20,8 @@ FixStyle(EVENT/TAD,FixEventTAD)
 #ifndef LMP_FIX_EVENT_TAD_H
 #define LMP_FIX_EVENT_TAD_H
 
-#include "fix_event.h"
 #include "lmptype.h"
+#include "fix_event.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/REPLICA/neb.cpp b/src/REPLICA/neb.cpp
index fe5e74a1d4..ebe45eeeeb 100644
--- a/src/REPLICA/neb.cpp
+++ b/src/REPLICA/neb.cpp
@@ -11,12 +11,12 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "math.h"
 #include "stdlib.h"
 #include "string.h"
 #include "neb.h"
-#include "lmptype.h"
 #include "universe.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/REPLICA/prd.cpp b/src/REPLICA/prd.cpp
index 28ec841d4d..84d7112705 100644
--- a/src/REPLICA/prd.cpp
+++ b/src/REPLICA/prd.cpp
@@ -15,12 +15,12 @@
    Contributing author: Mike Brown (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "math.h"
 #include "stdlib.h"
 #include "string.h"
 #include "prd.h"
-#include "lmptype.h"
 #include "universe.h"
 #include "update.h"
 #include "atom.h"
diff --git a/src/REPLICA/temper.cpp b/src/REPLICA/temper.cpp
index 4befb443b3..ea8fcfaab6 100644
--- a/src/REPLICA/temper.cpp
+++ b/src/REPLICA/temper.cpp
@@ -15,11 +15,11 @@
    Contributing author: Mark Sears (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "stdlib.h"
 #include "string.h"
 #include "temper.h"
-#include "lmptype.h"
 #include "universe.h"
 #include "domain.h"
 #include "atom.h"
diff --git a/src/SRD/fix_wall_srd.h b/src/SRD/fix_wall_srd.h
index ed5afcde3b..2ad5fdcdfc 100644
--- a/src/SRD/fix_wall_srd.h
+++ b/src/SRD/fix_wall_srd.h
@@ -20,8 +20,8 @@ FixStyle(wall/srd,FixWallSRD)
 #ifndef LMP_FIX_WALL_SRD_H
 #define LMP_FIX_WALL_SRD_H
 
-#include "fix.h"
 #include "lmptype.h"
+#include "fix.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/USER-EFF/atom_vec_electron.cpp b/src/USER-EFF/atom_vec_electron.cpp
index ceba59846b..20e33a0919 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 "lmptype.h"
 #include "stdlib.h"
 #include "atom_vec_electron.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "domain.h"
 #include "modify.h"
diff --git a/src/atom.h b/src/atom.h
index 563bc9b1c0..8821e7c48c 100644
--- a/src/atom.h
+++ b/src/atom.h
@@ -14,8 +14,8 @@
 #ifndef LMP_ATOM_H
 #define LMP_ATOM_H
 
-#include "pointers.h"
 #include "lmptype.h"
+#include "pointers.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/atom_vec_atomic.cpp b/src/atom_vec_atomic.cpp
index 13dd6b4a9b..e574c387a5 100644
--- a/src/atom_vec_atomic.cpp
+++ b/src/atom_vec_atomic.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "atom_vec_atomic.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "domain.h"
 #include "modify.h"
diff --git a/src/atom_vec_charge.cpp b/src/atom_vec_charge.cpp
index 69a918562f..ed2053a52f 100644
--- a/src/atom_vec_charge.cpp
+++ b/src/atom_vec_charge.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "atom_vec_charge.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "domain.h"
 #include "modify.h"
diff --git a/src/atom_vec_hybrid.cpp b/src/atom_vec_hybrid.cpp
index 8be54a1029..12b1591589 100644
--- a/src/atom_vec_hybrid.cpp
+++ b/src/atom_vec_hybrid.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "string.h"
 #include "atom_vec_hybrid.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "domain.h"
 #include "modify.h"
diff --git a/src/compute.cpp b/src/compute.cpp
index 27e7ff564c..44c628e27a 100644
--- a/src/compute.cpp
+++ b/src/compute.cpp
@@ -11,12 +11,12 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "stdlib.h"
 #include "string.h"
 #include "ctype.h"
 #include "compute.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "domain.h"
 #include "comm.h"
diff --git a/src/compute.h b/src/compute.h
index cb7c3152fc..f7ece5d38a 100644
--- a/src/compute.h
+++ b/src/compute.h
@@ -14,8 +14,8 @@
 #ifndef LMP_COMPUTE_H
 #define LMP_COMPUTE_H
 
-#include "pointers.h"
 #include "lmptype.h"
+#include "pointers.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/compute_reduce.cpp b/src/compute_reduce.cpp
index da1ff6bcbd..149517ae35 100644
--- a/src/compute_reduce.cpp
+++ b/src/compute_reduce.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "string.h"
 #include "stdlib.h"
 #include "compute_reduce.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "update.h"
 #include "domain.h"
diff --git a/src/compute_reduce.h b/src/compute_reduce.h
index c0d6a59765..04ffd40c63 100644
--- a/src/compute_reduce.h
+++ b/src/compute_reduce.h
@@ -20,8 +20,8 @@ ComputeStyle(reduce,ComputeReduce)
 #ifndef LMP_COMPUTE_REDUCE_H
 #define LMP_COMPUTE_REDUCE_H
 
-#include "compute.h"
 #include "lmptype.h"
+#include "compute.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/compute_reduce_region.h b/src/compute_reduce_region.h
index 55249b0ef6..a1b9ee1695 100644
--- a/src/compute_reduce_region.h
+++ b/src/compute_reduce_region.h
@@ -20,8 +20,8 @@ ComputeStyle(reduce/region,ComputeReduceRegion)
 #ifndef LMP_COMPUTE_REDUCE_REGION_H
 #define LMP_COMPUTE_REDUCE_REGION_H
 
-#include "compute_reduce.h"
 #include "lmptype.h"
+#include "compute_reduce.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/create_atoms.cpp b/src/create_atoms.cpp
index 11eda7d7ed..1f7d3ef655 100644
--- a/src/create_atoms.cpp
+++ b/src/create_atoms.cpp
@@ -11,11 +11,11 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "stdlib.h"
 #include "string.h"
 #include "create_atoms.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "comm.h"
diff --git a/src/delete_atoms.cpp b/src/delete_atoms.cpp
index d92085ffe0..ecddab700e 100644
--- a/src/delete_atoms.cpp
+++ b/src/delete_atoms.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "string.h"
 #include "delete_atoms.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "comm.h"
diff --git a/src/displace_atoms.cpp b/src/displace_atoms.cpp
index 64cb195df6..f433541d9e 100644
--- a/src/displace_atoms.cpp
+++ b/src/displace_atoms.cpp
@@ -11,11 +11,11 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "stdlib.h"
 #include "string.h"
 #include "displace_atoms.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "modify.h"
 #include "domain.h"
diff --git a/src/displace_box.cpp b/src/displace_box.cpp
index e8b88fb314..f2e3363a6d 100644
--- a/src/displace_box.cpp
+++ b/src/displace_box.cpp
@@ -11,12 +11,12 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "math.h"
 #include "stdlib.h"
 #include "string.h"
 #include "displace_box.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "modify.h"
 #include "domain.h"
diff --git a/src/dump.cpp b/src/dump.cpp
index 6bd3018a0f..d082ac29d6 100644
--- a/src/dump.cpp
+++ b/src/dump.cpp
@@ -11,12 +11,12 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "stdlib.h"
 #include "string.h"
 #include "stdio.h"
 #include "dump.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "irregular.h"
 #include "update.h"
diff --git a/src/dump.h b/src/dump.h
index 4b4aeb289d..0f50c20bfa 100644
--- a/src/dump.h
+++ b/src/dump.h
@@ -14,9 +14,9 @@
 #ifndef LMP_DUMP_H
 #define LMP_DUMP_H
 
+#include "lmptype.h"
 #include "stdio.h"
 #include "pointers.h"
-#include "lmptype.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/dump_dcd.cpp b/src/dump_dcd.cpp
index 5235ccdf89..ebf9e72e91 100644
--- a/src/dump_dcd.cpp
+++ b/src/dump_dcd.cpp
@@ -16,13 +16,13 @@
                         Axel Kohlmeyer (Temple U), support for groups
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "inttypes.h"
 #include "stdio.h"
 #include "time.h"
 #include "string.h"
 #include "dump_dcd.h"
-#include "lmptype.h"
 #include "domain.h"
 #include "atom.h"
 #include "update.h"
diff --git a/src/fix.h b/src/fix.h
index c44cccfa28..4cd938e05b 100644
--- a/src/fix.h
+++ b/src/fix.h
@@ -14,8 +14,8 @@
 #ifndef LMP_FIX_H
 #define LMP_FIX_H
 
-#include "pointers.h"
 #include "lmptype.h"
+#include "pointers.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/fix_ave_atom.cpp b/src/fix_ave_atom.cpp
index ef7de11d3e..ee2cf2b2d0 100644
--- a/src/fix_ave_atom.cpp
+++ b/src/fix_ave_atom.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "string.h"
 #include "fix_ave_atom.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "domain.h"
 #include "update.h"
diff --git a/src/fix_ave_atom.h b/src/fix_ave_atom.h
index 409b78cc25..790b6252fd 100644
--- a/src/fix_ave_atom.h
+++ b/src/fix_ave_atom.h
@@ -20,9 +20,9 @@ FixStyle(ave/atom,FixAveAtom)
 #ifndef LMP_FIX_AVE_ATOM_H
 #define LMP_FIX_AVE_ATOM_H
 
+#include "lmptype.h"
 #include "stdio.h"
 #include "fix.h"
-#include "lmptype.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/fix_ave_correlate.cpp b/src/fix_ave_correlate.cpp
index 4984c587cf..4660662e04 100644
--- a/src/fix_ave_correlate.cpp
+++ b/src/fix_ave_correlate.cpp
@@ -17,10 +17,10 @@
      Reese Jones (Sandia)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "string.h"
 #include "fix_ave_correlate.h"
-#include "lmptype.h"
 #include "update.h"
 #include "modify.h"
 #include "compute.h"
diff --git a/src/fix_ave_correlate.h b/src/fix_ave_correlate.h
index e5dc5046c9..ea8a5cb4ef 100644
--- a/src/fix_ave_correlate.h
+++ b/src/fix_ave_correlate.h
@@ -20,9 +20,9 @@ FixStyle(ave/correlate,FixAveCorrelate)
 #ifndef LMP_FIX_AVE_CORRELATE_H
 #define LMP_FIX_AVE_CORRELATE_H
 
+#include "lmptype.h"
 #include "stdio.h"
 #include "fix.h"
-#include "lmptype.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/fix_ave_histo.cpp b/src/fix_ave_histo.cpp
index c90c5a0fef..b5f94b3e7b 100644
--- a/src/fix_ave_histo.cpp
+++ b/src/fix_ave_histo.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "string.h"
 #include "fix_ave_histo.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "update.h"
 #include "modify.h"
diff --git a/src/fix_ave_histo.h b/src/fix_ave_histo.h
index 7dc63220b0..c2c8702233 100644
--- a/src/fix_ave_histo.h
+++ b/src/fix_ave_histo.h
@@ -20,9 +20,9 @@ FixStyle(ave/histo,FixAveHisto)
 #ifndef LMP_FIX_AVE_HISTO_H
 #define LMP_FIX_AVE_HISTO_H
 
+#include "lmptype.h"
 #include "stdio.h"
 #include "fix.h"
-#include "lmptype.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/fix_ave_spatial.cpp b/src/fix_ave_spatial.cpp
index 511e429faa..734425b3ab 100644
--- a/src/fix_ave_spatial.cpp
+++ b/src/fix_ave_spatial.cpp
@@ -15,10 +15,10 @@
    Contributing author: Pieter in 't Veld (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "string.h"
 #include "fix_ave_spatial.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "update.h"
 #include "force.h"
diff --git a/src/fix_ave_spatial.h b/src/fix_ave_spatial.h
index eefd20347e..80dcee0049 100644
--- a/src/fix_ave_spatial.h
+++ b/src/fix_ave_spatial.h
@@ -20,9 +20,9 @@ FixStyle(ave/spatial,FixAveSpatial)
 #ifndef LMP_FIX_AVE_SPATIAL_H
 #define LMP_FIX_AVE_SPATIAL_H
 
+#include "lmptype.h"
 #include "stdio.h"
 #include "fix.h"
-#include "lmptype.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/fix_ave_time.cpp b/src/fix_ave_time.cpp
index d3c4f3207b..8a72d054a2 100644
--- a/src/fix_ave_time.cpp
+++ b/src/fix_ave_time.cpp
@@ -15,10 +15,10 @@
    Contributing author: Pieter in 't Veld (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "string.h"
 #include "fix_ave_time.h"
-#include "lmptype.h"
 #include "update.h"
 #include "modify.h"
 #include "compute.h"
diff --git a/src/fix_ave_time.h b/src/fix_ave_time.h
index a8c118d39f..fafd21e509 100644
--- a/src/fix_ave_time.h
+++ b/src/fix_ave_time.h
@@ -20,9 +20,9 @@ FixStyle(ave/time,FixAveTime)
 #ifndef LMP_FIX_AVE_TIME_H
 #define LMP_FIX_AVE_TIME_H
 
+#include "lmptype.h"
 #include "stdio.h"
 #include "fix.h"
-#include "lmptype.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/fix_dt_reset.h b/src/fix_dt_reset.h
index ddba09c73d..095f8c9cac 100644
--- a/src/fix_dt_reset.h
+++ b/src/fix_dt_reset.h
@@ -20,8 +20,8 @@ FixStyle(dt/reset,FixDtReset)
 #ifndef LMP_FIX_DT_RESET_H
 #define LMP_FIX_DT_RESET_H
 
-#include "fix.h"
 #include "lmptype.h"
+#include "fix.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/fix_shake.cpp b/src/fix_shake.cpp
index 70e1fbb4e6..83ff409112 100644
--- a/src/fix_shake.cpp
+++ b/src/fix_shake.cpp
@@ -11,13 +11,13 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "math.h"
 #include "stdlib.h"
 #include "string.h"
 #include "stdio.h"
 #include "fix_shake.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "update.h"
diff --git a/src/fix_shake.h b/src/fix_shake.h
index fc919aaa11..ef061dc9df 100644
--- a/src/fix_shake.h
+++ b/src/fix_shake.h
@@ -20,8 +20,8 @@ FixStyle(shake,FixShake)
 #ifndef LMP_FIX_SHAKE_H
 #define LMP_FIX_SHAKE_H
 
-#include "fix.h"
 #include "lmptype.h"
+#include "fix.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/fix_tmd.cpp b/src/fix_tmd.cpp
index 24cb8bc8fc..496b508619 100644
--- a/src/fix_tmd.cpp
+++ b/src/fix_tmd.cpp
@@ -16,12 +16,12 @@
                          Christian Burisch (Bochum Univeristy, Germany)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "math.h"
 #include "stdlib.h"
 #include "string.h"
 #include "fix_tmd.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "update.h"
 #include "modify.h"
diff --git a/src/fix_ttm.cpp b/src/fix_ttm.cpp
index 4edfba1bba..d486cf49e6 100644
--- a/src/fix_ttm.cpp
+++ b/src/fix_ttm.cpp
@@ -16,12 +16,12 @@
                          Carolyn Phillips (University of Michigan)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "math.h"
 #include "string.h"
 #include "stdlib.h"
 #include "fix_ttm.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "force.h"
 #include "update.h"
diff --git a/src/group.cpp b/src/group.cpp
index 79a526b5b7..b5803ccdb5 100644
--- a/src/group.cpp
+++ b/src/group.cpp
@@ -11,13 +11,13 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "mpi.h"
 #include "stdio.h"
 #include "string.h"
 #include "stdlib.h"
 #include "group.h"
-#include "lmptype.h"
 #include "domain.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/group.h b/src/group.h
index cc0938f4a0..9621aa850f 100644
--- a/src/group.h
+++ b/src/group.h
@@ -14,9 +14,9 @@
 #ifndef LMP_GROUP_H
 #define LMP_GROUP_H
 
+#include "lmptype.h"
 #include "stdio.h"
 #include "pointers.h"
-#include "lmptype.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/integrate.cpp b/src/integrate.cpp
index 5b7d8df198..80bf89f676 100644
--- a/src/integrate.cpp
+++ b/src/integrate.cpp
@@ -11,9 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "integrate.h"
-#include "lmptype.h"
 #include "update.h"
 #include "modify.h"
 #include "compute.h"
diff --git a/src/integrate.h b/src/integrate.h
index bcbc711921..d869ceac23 100644
--- a/src/integrate.h
+++ b/src/integrate.h
@@ -14,8 +14,8 @@
 #ifndef LMP_INTEGRATE_H
 #define LMP_INTEGRATE_H
 
-#include "pointers.h"
 #include "lmptype.h"
+#include "pointers.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/library.cpp b/src/library.cpp
index 2b2cc39778..fd58515d29 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 "lmptype.h"
 #include "mpi.h"
 #include "string.h"
 #include "stdlib.h"
 #include "library.h"
-#include "lmptype.h"
 #include "lammps.h"
 #include "input.h"
 #include "atom.h"
diff --git a/src/lmptype.h b/src/lmptype.h
index af2bf465d3..a1f6662fe6 100644
--- a/src/lmptype.h
+++ b/src/lmptype.h
@@ -13,7 +13,7 @@
 
 // define integer data types used by LAMMPS and associated size limits
 
-// smallint = variables for system on 1 processor (nlocal, nmax, etc)
+// smallint = variables for on-procesor system (nlocal, nmax, etc)
 // tagint = variables for atom IDs (tag)
 // bigint = variables for total system (natoms, ntimestep, etc)
 
@@ -22,24 +22,21 @@
 // NOTE: 64-bit tagint is not yet supported
 // bigint can be 32-bit or 64-bit int, must be >= tagint
 
-// MAXSMALLINT = max value of a smallint
-// MAXTAGINT = max value of a tagint
-// MAXBIGINT = max value of a bigint
-
-// MPI_LMP_TAGINT = MPI data type corresponding to tagint
-// MPI_LMP_BIGINT = MPI data type corresponding to bigint
+// MPI_LMP_TAGINT = MPI data type corresponding to a tagint
+// MPI_LMP_BIGINT = MPI data type corresponding to a bigint
 
 // NOTE: if your machine/MPI does not support "long long" ints,
-//       but only "long" ints, then you will need to set
-//       MPI_LONG_LONG to MPI_LONG and atoll to atol
+//       but only "long" ints, then you will need to change
+//       MPI_LONG_LONG to MPI_LONG, and atoll to atol
 
 #ifndef LMP_LMPTYPE_H
 #define LMP_LMPTYPE_H
 
-#include "limits.h"
 #define __STDC_LIMIT_MACROS
-#include "stdint.h"
 #define __STDC_FORMAT_MACROS
+
+#include "limits.h"
+#include "stdint.h"
 #include "inttypes.h"
 
 namespace LAMMPS_NS {
diff --git a/src/memory.cpp b/src/memory.cpp
index df8cff685d..b7e4c4dc4b 100644
--- a/src/memory.cpp
+++ b/src/memory.cpp
@@ -11,12 +11,12 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "stdio.h"
 #include "stdlib.h"
 #include "string.h"
 #include "memory.h"
-#include "lmptype.h"
 #include "error.h"
 
 using namespace LAMMPS_NS;
diff --git a/src/min.cpp b/src/min.cpp
index 255bdfb605..b7c51cb48a 100644
--- a/src/min.cpp
+++ b/src/min.cpp
@@ -19,11 +19,11 @@
             JR Shewchuk, http://www-2.cs.cmu.edu/~jrs/jrspapers.html#cg
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "stdlib.h"
 #include "string.h"
 #include "min.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "domain.h"
 #include "comm.h"
diff --git a/src/min.h b/src/min.h
index 7b09903332..de0d596c37 100644
--- a/src/min.h
+++ b/src/min.h
@@ -14,8 +14,8 @@
 #ifndef LMP_MIN_H
 #define LMP_MIN_H
 
-#include "pointers.h"
 #include "lmptype.h"
+#include "pointers.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/min_cg.cpp b/src/min_cg.cpp
index 9ad87904fb..9ef3c8c4a7 100644
--- a/src/min_cg.cpp
+++ b/src/min_cg.cpp
@@ -11,11 +11,11 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "math.h"
 #include "string.h"
 #include "min_cg.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "update.h"
 #include "output.h"
diff --git a/src/min_quickmin.cpp b/src/min_quickmin.cpp
index 6fb15b175c..ec59fd20f8 100644
--- a/src/min_quickmin.cpp
+++ b/src/min_quickmin.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "math.h"
 #include "min_quickmin.h"
-#include "lmptype.h"
 #include "universe.h"
 #include "atom.h"
 #include "force.h"
diff --git a/src/modify.h b/src/modify.h
index f211167a11..56d94d63b9 100644
--- a/src/modify.h
+++ b/src/modify.h
@@ -14,9 +14,9 @@
 #ifndef LMP_MODIFY_H
 #define LMP_MODIFY_H
 
+#include "lmptype.h"
 #include "stdio.h"
 #include "pointers.h"
-#include "lmptype.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/neigh_bond.cpp b/src/neigh_bond.cpp
index e89c31cf37..2ef6b89507 100644
--- a/src/neigh_bond.cpp
+++ b/src/neigh_bond.cpp
@@ -11,8 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include "neighbor.h"
 #include "lmptype.h"
+#include "neighbor.h"
 #include "atom.h"
 #include "force.h"
 #include "update.h"
diff --git a/src/neighbor.cpp b/src/neighbor.cpp
index e97a11d64b..7240fde424 100644
--- a/src/neighbor.cpp
+++ b/src/neighbor.cpp
@@ -15,12 +15,12 @@
    Contributing author (triclinic and multi-neigh) : Pieter in 't Veld (SNL)
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "math.h"
 #include "stdlib.h"
 #include "string.h"
 #include "neighbor.h"
-#include "lmptype.h"
 #include "neigh_list.h"
 #include "neigh_request.h"
 #include "atom.h"
diff --git a/src/output.h b/src/output.h
index 9e0c72acbc..d8ce61e529 100644
--- a/src/output.h
+++ b/src/output.h
@@ -14,8 +14,8 @@
 #ifndef LMP_OUTPUT_H
 #define LMP_OUTPUT_H
 
-#include "pointers.h"
 #include "lmptype.h"
+#include "pointers.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/read_data.cpp b/src/read_data.cpp
index c1a3f010e5..50a5f347db 100644
--- a/src/read_data.cpp
+++ b/src/read_data.cpp
@@ -11,12 +11,12 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "math.h"
 #include "mpi.h"
 #include "string.h"
 #include "stdlib.h"
 #include "read_data.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "comm.h"
diff --git a/src/read_restart.cpp b/src/read_restart.cpp
index 51b4783069..6c34cf8960 100644
--- a/src/read_restart.cpp
+++ b/src/read_restart.cpp
@@ -11,13 +11,13 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "string.h"
 #include "stdlib.h"
 #include "sys/types.h"
 #include "dirent.h"
 #include "read_restart.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "domain.h"
diff --git a/src/read_restart.h b/src/read_restart.h
index d5364a1447..16d2e675d5 100644
--- a/src/read_restart.h
+++ b/src/read_restart.h
@@ -20,9 +20,9 @@ CommandStyle(read_restart,ReadRestart)
 #ifndef LMP_READ_RESTART_H
 #define LMP_READ_RESTART_H
 
+#include "lmptype.h"
 #include "stdio.h"
 #include "pointers.h"
-#include "lmptype.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/region.h b/src/region.h
index c4a1e18a75..e32d7ff1c7 100644
--- a/src/region.h
+++ b/src/region.h
@@ -14,8 +14,8 @@
 #ifndef LMP_REGION_H
 #define LMP_REGION_H
 
-#include "pointers.h"
 #include "lmptype.h"
+#include "pointers.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/replicate.cpp b/src/replicate.cpp
index d0a15af918..503f59c267 100644
--- a/src/replicate.cpp
+++ b/src/replicate.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "string.h"
 #include "replicate.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "atom_vec_hybrid.h"
diff --git a/src/run.cpp b/src/run.cpp
index e5a1b318ea..7ed02bd2ba 100644
--- a/src/run.cpp
+++ b/src/run.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "stdlib.h"
 #include "string.h"
 #include "run.h"
-#include "lmptype.h"
 #include "domain.h"
 #include "update.h"
 #include "integrate.h"
diff --git a/src/thermo.h b/src/thermo.h
index 8b954ebb89..0d000b0e12 100644
--- a/src/thermo.h
+++ b/src/thermo.h
@@ -14,8 +14,8 @@
 #ifndef LMP_THERMO_H
 #define LMP_THERMO_H
 
-#include "pointers.h"
 #include "lmptype.h"
+#include "pointers.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/update.h b/src/update.h
index 75edc7e2fe..b713c4c113 100644
--- a/src/update.h
+++ b/src/update.h
@@ -14,8 +14,8 @@
 #ifndef LMP_UPDATE_H
 #define LMP_UPDATE_H
 
-#include "pointers.h"
 #include "lmptype.h"
+#include "pointers.h"
 
 namespace LAMMPS_NS {
 
diff --git a/src/velocity.cpp b/src/velocity.cpp
index 06032e6480..77545a86fc 100644
--- a/src/velocity.cpp
+++ b/src/velocity.cpp
@@ -11,13 +11,13 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "math.h"
 #include "stdio.h"
 #include "stdlib.h"
 #include "string.h"
 #include "velocity.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "update.h"
 #include "domain.h"
diff --git a/src/write_restart.cpp b/src/write_restart.cpp
index 2f2f73a200..0b8bfac436 100644
--- a/src/write_restart.cpp
+++ b/src/write_restart.cpp
@@ -11,10 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "mpi.h"
 #include "string.h"
 #include "write_restart.h"
-#include "lmptype.h"
 #include "atom.h"
 #include "atom_vec.h"
 #include "atom_vec_hybrid.h"
diff --git a/src/write_restart.h b/src/write_restart.h
index db729ec010..8a849e8256 100644
--- a/src/write_restart.h
+++ b/src/write_restart.h
@@ -20,9 +20,9 @@ CommandStyle(write_restart,WriteRestart)
 #ifndef LMP_WRITE_RESTART_H
 #define LMP_WRITE_RESTART_H
 
+#include "lmptype.h"
 #include "stdio.h"
 #include "pointers.h"
-#include "lmptype.h"
 
 namespace LAMMPS_NS {