diff --git a/src/KOKKOS/angle_charmm_kokkos.cpp b/src/KOKKOS/angle_charmm_kokkos.cpp
index 14850525ef..59ccac92ce 100644
--- a/src/KOKKOS/angle_charmm_kokkos.cpp
+++ b/src/KOKKOS/angle_charmm_kokkos.cpp
@@ -16,17 +16,16 @@
 ------------------------------------------------------------------------- */
 
 #include "angle_charmm_kokkos.h"
-#include <cmath>
 
 #include "atom_kokkos.h"
-#include "neighbor_kokkos.h"
-#include "domain.h"
+#include "atom_masks.h"
 #include "comm.h"
 #include "force.h"
 #include "math_const.h"
 #include "memory_kokkos.h"
-#include "error.h"
-#include "atom_masks.h"
+#include "neighbor_kokkos.h"
+
+#include <cmath>
 
 using namespace LAMMPS_NS;
 using namespace MathConst;
diff --git a/src/KOKKOS/angle_class2_kokkos.cpp b/src/KOKKOS/angle_class2_kokkos.cpp
index 4406f51f83..bfa0f81a1d 100644
--- a/src/KOKKOS/angle_class2_kokkos.cpp
+++ b/src/KOKKOS/angle_class2_kokkos.cpp
@@ -16,17 +16,16 @@
 ------------------------------------------------------------------------- */
 
 #include "angle_class2_kokkos.h"
-#include <cmath>
 
 #include "atom_kokkos.h"
-#include "neighbor_kokkos.h"
-#include "domain.h"
+#include "atom_masks.h"
 #include "comm.h"
 #include "force.h"
 #include "math_const.h"
 #include "memory_kokkos.h"
-#include "error.h"
-#include "atom_masks.h"
+#include "neighbor_kokkos.h"
+
+#include <cmath>
 
 using namespace LAMMPS_NS;
 using namespace MathConst;
diff --git a/src/KOKKOS/angle_cosine_kokkos.cpp b/src/KOKKOS/angle_cosine_kokkos.cpp
index 7ba634cd13..cf93bfbde5 100644
--- a/src/KOKKOS/angle_cosine_kokkos.cpp
+++ b/src/KOKKOS/angle_cosine_kokkos.cpp
@@ -16,17 +16,16 @@
 ------------------------------------------------------------------------- */
 
 #include "angle_cosine_kokkos.h"
-#include <cmath>
 
 #include "atom_kokkos.h"
-#include "neighbor_kokkos.h"
-#include "domain.h"
+#include "atom_masks.h"
 #include "comm.h"
 #include "force.h"
 #include "math_const.h"
 #include "memory_kokkos.h"
-#include "error.h"
-#include "atom_masks.h"
+#include "neighbor_kokkos.h"
+
+#include <cmath>
 
 using namespace LAMMPS_NS;
 using namespace MathConst;
diff --git a/src/KOKKOS/angle_harmonic_kokkos.cpp b/src/KOKKOS/angle_harmonic_kokkos.cpp
index 2e5831ef07..3a8878d222 100644
--- a/src/KOKKOS/angle_harmonic_kokkos.cpp
+++ b/src/KOKKOS/angle_harmonic_kokkos.cpp
@@ -16,17 +16,16 @@
 ------------------------------------------------------------------------- */
 
 #include "angle_harmonic_kokkos.h"
-#include <cmath>
 
 #include "atom_kokkos.h"
-#include "neighbor_kokkos.h"
-#include "domain.h"
+#include "atom_masks.h"
 #include "comm.h"
 #include "force.h"
 #include "math_const.h"
 #include "memory_kokkos.h"
-#include "error.h"
-#include "atom_masks.h"
+#include "neighbor_kokkos.h"
+
+#include <cmath>
 
 using namespace LAMMPS_NS;
 using namespace MathConst;
diff --git a/src/KOKKOS/atom_kokkos.h b/src/KOKKOS/atom_kokkos.h
index ce480f6f9d..6eebbad661 100644
--- a/src/KOKKOS/atom_kokkos.h
+++ b/src/KOKKOS/atom_kokkos.h
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include "atom.h"
+#include "atom.h"               // IWYU pragma: export
 #include "kokkos_type.h"
 
 #ifndef LMP_ATOM_KOKKOS_H
diff --git a/src/KOKKOS/atom_vec_angle_kokkos.cpp b/src/KOKKOS/atom_vec_angle_kokkos.cpp
index e9c101eb79..662f09fe5a 100644
--- a/src/KOKKOS/atom_vec_angle_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_angle_kokkos.cpp
@@ -12,15 +12,15 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_angle_kokkos.h"
+
 #include "atom_kokkos.h"
+#include "atom_masks.h"
 #include "comm_kokkos.h"
 #include "domain.h"
-#include "modify.h"
-#include "fix.h"
-#include "atom_masks.h"
-#include "memory_kokkos.h"
 #include "error.h"
-
+#include "fix.h"
+#include "memory_kokkos.h"
+#include "modify.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/atom_vec_atomic_kokkos.cpp b/src/KOKKOS/atom_vec_atomic_kokkos.cpp
index c76af73420..995985b29d 100644
--- a/src/KOKKOS/atom_vec_atomic_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_atomic_kokkos.cpp
@@ -12,15 +12,15 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_atomic_kokkos.h"
+
 #include "atom_kokkos.h"
+#include "atom_masks.h"
 #include "comm_kokkos.h"
 #include "domain.h"
-#include "modify.h"
-#include "fix.h"
-#include "atom_masks.h"
-#include "memory_kokkos.h"
 #include "error.h"
-
+#include "fix.h"
+#include "memory_kokkos.h"
+#include "modify.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/atom_vec_bond_kokkos.cpp b/src/KOKKOS/atom_vec_bond_kokkos.cpp
index 47e77c33b3..db56d58dff 100644
--- a/src/KOKKOS/atom_vec_bond_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_bond_kokkos.cpp
@@ -12,15 +12,15 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_bond_kokkos.h"
+
 #include "atom_kokkos.h"
+#include "atom_masks.h"
 #include "comm_kokkos.h"
 #include "domain.h"
-#include "modify.h"
-#include "fix.h"
-#include "atom_masks.h"
-#include "memory_kokkos.h"
 #include "error.h"
-
+#include "fix.h"
+#include "memory_kokkos.h"
+#include "modify.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/atom_vec_charge_kokkos.cpp b/src/KOKKOS/atom_vec_charge_kokkos.cpp
index 183bdb94e4..9846d2f4f8 100644
--- a/src/KOKKOS/atom_vec_charge_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_charge_kokkos.cpp
@@ -12,15 +12,15 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_charge_kokkos.h"
+
 #include "atom_kokkos.h"
+#include "atom_masks.h"
 #include "comm_kokkos.h"
 #include "domain.h"
-#include "modify.h"
-#include "fix.h"
-#include "atom_masks.h"
-#include "memory_kokkos.h"
 #include "error.h"
-
+#include "fix.h"
+#include "memory_kokkos.h"
+#include "modify.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/atom_vec_hybrid_kokkos.cpp b/src/KOKKOS/atom_vec_hybrid_kokkos.cpp
index 34a246008d..7c7f3c9826 100644
--- a/src/KOKKOS/atom_vec_hybrid_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_hybrid_kokkos.cpp
@@ -12,15 +12,16 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_hybrid_kokkos.h"
-#include <cstring>
+
 #include "atom_kokkos.h"
+#include "atom_masks.h"
 #include "domain.h"
-#include "modify.h"
+#include "error.h"
 #include "fix.h"
 #include "memory_kokkos.h"
-#include "error.h"
-#include "atom_masks.h"
+#include "modify.h"
 
+#include <cstring>
 
 using namespace LAMMPS_NS;
 
@@ -1177,7 +1178,7 @@ void AtomVecHybridKokkos::build_styles()
   allstyles[nallstyles] = new char[n];      \
   strcpy(allstyles[nallstyles],#key);       \
   nallstyles++;
-#include "style_atom.h"
+#include "style_atom.h"         // IWYU pragma: keep
 #undef AtomStyle
 #undef ATOM_CLASS
 }
diff --git a/src/KOKKOS/atom_vec_kokkos.cpp b/src/KOKKOS/atom_vec_kokkos.cpp
index dceedc8e60..9e39f53733 100644
--- a/src/KOKKOS/atom_vec_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_kokkos.cpp
@@ -12,11 +12,11 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_kokkos.h"
+
 #include "atom_kokkos.h"
+#include "atom_masks.h"
 #include "comm_kokkos.h"
 #include "domain.h"
-#include "atom_masks.h"
-
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/atom_vec_kokkos.h b/src/KOKKOS/atom_vec_kokkos.h
index 7d8796b1ae..d414101966 100644
--- a/src/KOKKOS/atom_vec_kokkos.h
+++ b/src/KOKKOS/atom_vec_kokkos.h
@@ -14,7 +14,8 @@
 #ifndef LMP_ATOM_VEC_KOKKOS_H
 #define LMP_ATOM_VEC_KOKKOS_H
 
-#include "atom_vec.h"
+#include "atom_vec.h"           //  IWYU pragma: export
+
 #include "kokkos_type.h"
 #include <type_traits>
 
diff --git a/src/KOKKOS/atom_vec_molecular_kokkos.cpp b/src/KOKKOS/atom_vec_molecular_kokkos.cpp
index 6a4d94dc14..7e3cdbf5e3 100644
--- a/src/KOKKOS/atom_vec_molecular_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_molecular_kokkos.cpp
@@ -12,15 +12,15 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_molecular_kokkos.h"
+
 #include "atom_kokkos.h"
+#include "atom_masks.h"
 #include "comm_kokkos.h"
 #include "domain.h"
-#include "modify.h"
-#include "fix.h"
-#include "atom_masks.h"
-#include "memory_kokkos.h"
 #include "error.h"
-
+#include "fix.h"
+#include "memory_kokkos.h"
+#include "modify.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/atom_vec_sphere_kokkos.cpp b/src/KOKKOS/atom_vec_sphere_kokkos.cpp
index 569498f664..6b62014e4a 100644
--- a/src/KOKKOS/atom_vec_sphere_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_sphere_kokkos.cpp
@@ -12,27 +12,26 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_sphere_kokkos.h"
-#include <cmath>
-#include <cstring>
+
 #include "atom_kokkos.h"
 #include "atom_masks.h"
 #include "comm_kokkos.h"
 #include "domain.h"
-#include "modify.h"
+#include "error.h"
 #include "fix.h"
 #include "fix_adapt.h"
 #include "math_const.h"
 #include "memory.h"
-#include "error.h"
 #include "memory_kokkos.h"
+#include "modify.h"
 
+#include <cstring>
 
 using namespace LAMMPS_NS;
+using namespace MathConst;
 
 #define DELTA 10
 
-static const double MY_PI  = 3.14159265358979323846; // pi
-
 /* ---------------------------------------------------------------------- */
 
 AtomVecSphereKokkos::AtomVecSphereKokkos(LAMMPS *lmp) : AtomVecKokkos(lmp)
diff --git a/src/KOKKOS/bond_class2_kokkos.cpp b/src/KOKKOS/bond_class2_kokkos.cpp
index 5481a41806..07712df203 100644
--- a/src/KOKKOS/bond_class2_kokkos.cpp
+++ b/src/KOKKOS/bond_class2_kokkos.cpp
@@ -16,16 +16,15 @@
 ------------------------------------------------------------------------- */
 
 #include "bond_class2_kokkos.h"
-#include <cmath>
 
 #include "atom_kokkos.h"
-#include "neighbor_kokkos.h"
-#include "domain.h"
+#include "atom_masks.h"
 #include "comm.h"
 #include "force.h"
 #include "memory_kokkos.h"
-#include "error.h"
-#include "atom_masks.h"
+#include "neighbor_kokkos.h"
+
+#include <cmath>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/bond_fene_kokkos.cpp b/src/KOKKOS/bond_fene_kokkos.cpp
index 9d2200dd90..1ee82476b2 100644
--- a/src/KOKKOS/bond_fene_kokkos.cpp
+++ b/src/KOKKOS/bond_fene_kokkos.cpp
@@ -16,16 +16,16 @@
 ------------------------------------------------------------------------- */
 
 #include "bond_fene_kokkos.h"
-#include <cmath>
 
 #include "atom_kokkos.h"
-#include "neighbor_kokkos.h"
-#include "domain.h"
+#include "atom_masks.h"
 #include "comm.h"
+#include "error.h"
 #include "force.h"
 #include "memory_kokkos.h"
-#include "error.h"
-#include "atom_masks.h"
+#include "neighbor_kokkos.h"
+
+#include <cmath>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/bond_harmonic_kokkos.cpp b/src/KOKKOS/bond_harmonic_kokkos.cpp
index 9239a4191b..20b8778463 100644
--- a/src/KOKKOS/bond_harmonic_kokkos.cpp
+++ b/src/KOKKOS/bond_harmonic_kokkos.cpp
@@ -16,20 +16,18 @@
 ------------------------------------------------------------------------- */
 
 #include "bond_harmonic_kokkos.h"
-#include <cmath>
 
 #include "atom_kokkos.h"
-#include "neighbor_kokkos.h"
-#include "domain.h"
+#include "atom_masks.h"
 #include "comm.h"
 #include "force.h"
 #include "memory_kokkos.h"
-#include "error.h"
-#include "atom_masks.h"
+#include "neighbor_kokkos.h"
+
+#include <cmath>
 
 using namespace LAMMPS_NS;
 
-
 /* ---------------------------------------------------------------------- */
 
 template<class DeviceType>
diff --git a/src/KOKKOS/comm_kokkos.cpp b/src/KOKKOS/comm_kokkos.cpp
index 8f865f6459..51ba6bbdb2 100644
--- a/src/KOKKOS/comm_kokkos.cpp
+++ b/src/KOKKOS/comm_kokkos.cpp
@@ -12,23 +12,24 @@
 ------------------------------------------------------------------------- */
 
 #include "comm_kokkos.h"
-#include "kokkos.h"
+
 #include "atom.h"
 #include "atom_kokkos.h"
+#include "atom_masks.h"
 #include "atom_vec.h"
 #include "atom_vec_kokkos.h"
-#include "domain.h"
-#include "atom_masks.h"
-#include "error.h"
-#include "memory_kokkos.h"
-#include "force.h"
-#include "pair.h"
-#include "fix.h"
 #include "compute.h"
+#include "domain.h"
 #include "dump.h"
-#include "output.h"
-#include "modify.h"
+#include "error.h"
+#include "fix.h"
+#include "force.h"
+#include "kokkos.h"
 #include "kokkos_base.h"
+#include "memory_kokkos.h"
+#include "modify.h"
+#include "output.h"
+#include "pair.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/comm_tiled_kokkos.cpp b/src/KOKKOS/comm_tiled_kokkos.cpp
index a29d9f63b3..88d3d1ac8c 100644
--- a/src/KOKKOS/comm_tiled_kokkos.cpp
+++ b/src/KOKKOS/comm_tiled_kokkos.cpp
@@ -12,22 +12,10 @@
 ------------------------------------------------------------------------- */
 
 #include "comm_tiled_kokkos.h"
-#include <cstring>
-#include "comm_brick.h"
+
 #include "atom_kokkos.h"
-#include "atom_vec.h"
-#include "domain.h"
-#include "force.h"
-#include "pair.h"
-#include "neighbor.h"
-#include "modify.h"
-#include "fix.h"
-#include "compute.h"
-#include "output.h"
-#include "dump.h"
-#include "memory_kokkos.h"
-#include "error.h"
 #include "atom_masks.h"
+#include "atom_vec.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/compute_coord_atom_kokkos.cpp b/src/KOKKOS/compute_coord_atom_kokkos.cpp
index 90bd151b2d..c1f9324942 100644
--- a/src/KOKKOS/compute_coord_atom_kokkos.cpp
+++ b/src/KOKKOS/compute_coord_atom_kokkos.cpp
@@ -12,22 +12,18 @@
 ------------------------------------------------------------------------- */
 
 #include "compute_coord_atom_kokkos.h"
-#include <cmath>
-#include <cstring>
-#include "compute_orientorder_atom_kokkos.h"
+
 #include "atom_kokkos.h"
-#include "update.h"
+#include "atom_masks.h"
+#include "comm.h"
+#include "compute_orientorder_atom_kokkos.h"
+#include "error.h"
+#include "memory_kokkos.h"
 #include "modify.h"
-#include "neighbor_kokkos.h"
 #include "neigh_list.h"
 #include "neigh_request.h"
-#include "force.h"
-#include "pair.h"
-#include "comm.h"
-#include "group.h"
-#include "memory_kokkos.h"
-#include "error.h"
-#include "atom_masks.h"
+#include "neighbor_kokkos.h"
+#include "update.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/compute_orientorder_atom_kokkos.cpp b/src/KOKKOS/compute_orientorder_atom_kokkos.cpp
index 7d635dbeb7..6e35dfd94f 100644
--- a/src/KOKKOS/compute_orientorder_atom_kokkos.cpp
+++ b/src/KOKKOS/compute_orientorder_atom_kokkos.cpp
@@ -16,23 +16,19 @@
 ------------------------------------------------------------------------- */
 
 #include "compute_orientorder_atom_kokkos.h"
-#include <cstring>
 
-#include <cmath>
 #include "atom_kokkos.h"
-#include "update.h"
-#include "modify.h"
-#include "neighbor_kokkos.h"
-#include "neigh_list.h"
-#include "neigh_request.h"
-#include "force.h"
-#include "pair.h"
-#include "comm.h"
-#include "memory_kokkos.h"
-#include "error.h"
-#include "math_const.h"
 #include "atom_masks.h"
 #include "kokkos.h"
+#include "math_const.h"
+#include "memory_kokkos.h"
+#include "neigh_list.h"
+#include "neigh_request.h"
+#include "neighbor_kokkos.h"
+#include "pair.h"
+#include "update.h"
+
+#include <cmath>
 
 using namespace LAMMPS_NS;
 using namespace MathConst;
diff --git a/src/KOKKOS/compute_temp_kokkos.cpp b/src/KOKKOS/compute_temp_kokkos.cpp
index 7e4d3ad6ae..5e60d62be1 100644
--- a/src/KOKKOS/compute_temp_kokkos.cpp
+++ b/src/KOKKOS/compute_temp_kokkos.cpp
@@ -13,15 +13,14 @@
 
 #include "compute_temp_kokkos.h"
 
-#include <cstring>
 #include "atom_kokkos.h"
-#include "update.h"
-#include "force.h"
-#include "domain.h"
-#include "comm.h"
-#include "group.h"
-#include "error.h"
 #include "atom_masks.h"
+#include "comm.h"
+#include "error.h"
+#include "force.h"
+#include "update.h"
+
+#include <cstring>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/dihedral_charmm_kokkos.cpp b/src/KOKKOS/dihedral_charmm_kokkos.cpp
index c25ab18c60..88b5e1344d 100644
--- a/src/KOKKOS/dihedral_charmm_kokkos.cpp
+++ b/src/KOKKOS/dihedral_charmm_kokkos.cpp
@@ -16,19 +16,18 @@
 ------------------------------------------------------------------------- */
 
 #include "dihedral_charmm_kokkos.h"
-#include <cmath>
 
 #include "atom_kokkos.h"
-#include "comm.h"
-#include "neighbor_kokkos.h"
-#include "domain.h"
+#include "atom_masks.h"
+#include "error.h"
 #include "force.h"
-#include "pair.h"
+#include "kokkos.h"
 #include "math_const.h"
 #include "memory_kokkos.h"
-#include "error.h"
-#include "atom_masks.h"
-#include "kokkos.h"
+#include "neighbor_kokkos.h"
+#include "pair.h"
+
+#include <cmath>
 
 using namespace LAMMPS_NS;
 using namespace MathConst;
diff --git a/src/KOKKOS/dihedral_class2_kokkos.cpp b/src/KOKKOS/dihedral_class2_kokkos.cpp
index df60ebd1e4..156a13c2ec 100644
--- a/src/KOKKOS/dihedral_class2_kokkos.cpp
+++ b/src/KOKKOS/dihedral_class2_kokkos.cpp
@@ -16,17 +16,16 @@
 ------------------------------------------------------------------------- */
 
 #include "dihedral_class2_kokkos.h"
-#include <cmath>
 
 #include "atom_kokkos.h"
-#include "comm.h"
-#include "neighbor_kokkos.h"
-#include "domain.h"
-#include "force.h"
-#include "update.h"
-#include "memory_kokkos.h"
-#include "error.h"
 #include "atom_masks.h"
+#include "comm.h"
+#include "error.h"
+#include "force.h"
+#include "memory_kokkos.h"
+#include "neighbor_kokkos.h"
+
+#include <cmath>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/dihedral_harmonic_kokkos.cpp b/src/KOKKOS/dihedral_harmonic_kokkos.cpp
index 0acd61222e..d4855b10c1 100644
--- a/src/KOKKOS/dihedral_harmonic_kokkos.cpp
+++ b/src/KOKKOS/dihedral_harmonic_kokkos.cpp
@@ -16,17 +16,16 @@
 ------------------------------------------------------------------------- */
 
 #include "dihedral_harmonic_kokkos.h"
-#include <cmath>
 
 #include "atom_kokkos.h"
-#include "comm.h"
-#include "neighbor_kokkos.h"
-#include "domain.h"
-#include "force.h"
-#include "update.h"
-#include "memory_kokkos.h"
-#include "error.h"
 #include "atom_masks.h"
+#include "comm.h"
+#include "error.h"
+#include "force.h"
+#include "memory_kokkos.h"
+#include "neighbor_kokkos.h"
+
+#include <cmath>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/dihedral_opls_kokkos.cpp b/src/KOKKOS/dihedral_opls_kokkos.cpp
index 70beae918a..42874936f9 100644
--- a/src/KOKKOS/dihedral_opls_kokkos.cpp
+++ b/src/KOKKOS/dihedral_opls_kokkos.cpp
@@ -16,17 +16,16 @@
 ------------------------------------------------------------------------- */
 
 #include "dihedral_opls_kokkos.h"
-#include <cmath>
 
 #include "atom_kokkos.h"
-#include "comm.h"
-#include "neighbor_kokkos.h"
-#include "domain.h"
-#include "force.h"
-#include "update.h"
-#include "memory_kokkos.h"
-#include "error.h"
 #include "atom_masks.h"
+#include "comm.h"
+#include "error.h"
+#include "force.h"
+#include "memory_kokkos.h"
+#include "neighbor_kokkos.h"
+
+#include <cmath>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/domain_kokkos.h b/src/KOKKOS/domain_kokkos.h
index eccc36a021..3bfdeb708b 100644
--- a/src/KOKKOS/domain_kokkos.h
+++ b/src/KOKKOS/domain_kokkos.h
@@ -14,7 +14,7 @@
 #ifndef LMP_DOMAIN_KOKKOS_H
 #define LMP_DOMAIN_KOKKOS_H
 
-#include "domain.h"
+#include "domain.h"             // IWYU pragma: export
 #include "kokkos_type.h"
 #include "kokkos_few.h"
 
diff --git a/src/KOKKOS/fft3d_kokkos.cpp b/src/KOKKOS/fft3d_kokkos.cpp
index e49d780040..ff95998e4e 100644
--- a/src/KOKKOS/fft3d_kokkos.cpp
+++ b/src/KOKKOS/fft3d_kokkos.cpp
@@ -14,16 +14,13 @@
 /* ----------------------------------------------------------------------
    Contributing authors: Stan Moore (SNL), Sam Mish (U.C. Davis)
 ------------------------------------------------------------------------- */
-
-#include <mpi.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
 #include "fft3d_kokkos.h"
-#include "remap_kokkos.h"
+
 #include "error.h"
 #include "kokkos.h"
+#include "remap_kokkos.h"
 
+#include <cmath>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/fix_deform_kokkos.cpp b/src/KOKKOS/fix_deform_kokkos.cpp
index 5d8430d337..87d860b5ae 100644
--- a/src/KOKKOS/fix_deform_kokkos.cpp
+++ b/src/KOKKOS/fix_deform_kokkos.cpp
@@ -16,23 +16,22 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_deform_kokkos.h"
-#include <cstring>
+
+#include "atom_kokkos.h"
+#include "atom_masks.h"
+#include "domain_kokkos.h"
+#include "error.h"
+#include "force.h"
+#include "input.h"
+#include "irregular.h"
+#include "kspace.h"
+#include "math_const.h"
+#include "modify.h"
+#include "update.h"
+#include "variable.h"
 
 #include <cmath>
-#include "atom_kokkos.h"
-#include "update.h"
-#include "comm.h"
-#include "irregular.h"
-#include "domain_kokkos.h"
-#include "lattice.h"
-#include "force.h"
-#include "modify.h"
-#include "math_const.h"
-#include "kspace.h"
-#include "input.h"
-#include "variable.h"
-#include "error.h"
-#include "atom_masks.h"
+#include <cstring>
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/KOKKOS/fix_gravity_kokkos.cpp b/src/KOKKOS/fix_gravity_kokkos.cpp
index 4f8b57365e..7d413a1d57 100644
--- a/src/KOKKOS/fix_gravity_kokkos.cpp
+++ b/src/KOKKOS/fix_gravity_kokkos.cpp
@@ -12,13 +12,14 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_gravity_kokkos.h"
-#include "atom_masks.h"
-#include "modify.h"
-#include "input.h"
-#include "variable.h"
-#include "update.h"
+
 #include "atom_kokkos.h"
+#include "atom_masks.h"
 #include "atom_vec.h"
+#include "input.h"
+#include "modify.h"
+#include "update.h"
+#include "variable.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/fix_langevin_kokkos.cpp b/src/KOKKOS/fix_langevin_kokkos.cpp
index 44ae18f9a9..dadf9e4c8b 100644
--- a/src/KOKKOS/fix_langevin_kokkos.cpp
+++ b/src/KOKKOS/fix_langevin_kokkos.cpp
@@ -12,21 +12,22 @@
    ------------------------------------------------------------------------- */
 
 #include "fix_langevin_kokkos.h"
-#include <cmath>
-#include "atom_masks.h"
+
 #include "atom_kokkos.h"
+#include "atom_masks.h"
+#include "comm.h"
+#include "compute.h"
+#include "error.h"
 #include "force.h"
 #include "group.h"
-#include "update.h"
-#include "error.h"
-#include "memory_kokkos.h"
-#include "compute.h"
-#include "comm.h"
-#include "modify.h"
 #include "input.h"
-#include "region.h"
+#include "memory_kokkos.h"
+#include "modify.h"
+#include "update.h"
 #include "variable.h"
 
+#include <cmath>
+
 using namespace LAMMPS_NS;
 using namespace FixConst;
 
diff --git a/src/KOKKOS/fix_minimize_kokkos.cpp b/src/KOKKOS/fix_minimize_kokkos.cpp
index e7b10dbb8e..13b9cb02a7 100644
--- a/src/KOKKOS/fix_minimize_kokkos.cpp
+++ b/src/KOKKOS/fix_minimize_kokkos.cpp
@@ -12,10 +12,11 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_minimize_kokkos.h"
+
 #include "atom_kokkos.h"
+#include "atom_masks.h"
 #include "domain.h"
 #include "memory_kokkos.h"
-#include "atom_masks.h"
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/KOKKOS/fix_momentum_kokkos.cpp b/src/KOKKOS/fix_momentum_kokkos.cpp
index 1821b6dadd..be486bf752 100644
--- a/src/KOKKOS/fix_momentum_kokkos.cpp
+++ b/src/KOKKOS/fix_momentum_kokkos.cpp
@@ -13,16 +13,15 @@
 
 #include "fix_momentum_kokkos.h"
 
-#include <cstring>
 #include "atom_kokkos.h"
 #include "atom_masks.h"
-#include "domain.h"
 #include "domain_kokkos.h"
 #include "group.h"
 #include "error.h"
-#include "force.h"
 #include "kokkos_few.h"
 
+#include <cstring>
+
 using namespace LAMMPS_NS;
 using namespace FixConst;
 
diff --git a/src/KOKKOS/fix_neigh_history_kokkos.cpp b/src/KOKKOS/fix_neigh_history_kokkos.cpp
index a43c5ef458..d1f3f66327 100644
--- a/src/KOKKOS/fix_neigh_history_kokkos.cpp
+++ b/src/KOKKOS/fix_neigh_history_kokkos.cpp
@@ -12,13 +12,13 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_neigh_history_kokkos.h"
+
 #include "atom_kokkos.h"
 #include "error.h"
 #include "memory_kokkos.h"
+#include "modify.h"
 #include "neigh_list_kokkos.h"
 #include "pair_kokkos.h"
-#include "comm.h"
-#include "modify.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/fix_nh_kokkos.cpp b/src/KOKKOS/fix_nh_kokkos.cpp
index 8cd58b0927..a2985502bb 100644
--- a/src/KOKKOS/fix_nh_kokkos.cpp
+++ b/src/KOKKOS/fix_nh_kokkos.cpp
@@ -16,27 +16,24 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_nh_kokkos.h"
-#include <cstring>
+
+#include "atom.h"
+#include "atom_kokkos.h"
+#include "atom_masks.h"
+#include "comm.h"
+#include "compute.h"
+#include "domain_kokkos.h"
+#include "error.h"
+#include "fix_deform.h"
+#include "force.h"
+#include "irregular.h"
+#include "kspace.h"
+#include "memory_kokkos.h"
+#include "neighbor.h"
+#include "update.h"
 
 #include <cmath>
-#include "math_extra.h"
-#include "atom.h"
-#include "force.h"
-#include "group.h"
-#include "comm.h"
-#include "neighbor.h"
-#include "irregular.h"
-#include "modify.h"
-#include "fix_deform.h"
-#include "compute.h"
-#include "kspace.h"
-#include "update.h"
-#include "respa.h"
-#include "domain_kokkos.h"
-#include "memory_kokkos.h"
-#include "error.h"
-#include "atom_masks.h"
-#include "atom_kokkos.h"
+#include <cstring>
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/KOKKOS/fix_nph_kokkos.cpp b/src/KOKKOS/fix_nph_kokkos.cpp
index d667e29221..7efcb150bd 100644
--- a/src/KOKKOS/fix_nph_kokkos.cpp
+++ b/src/KOKKOS/fix_nph_kokkos.cpp
@@ -12,10 +12,12 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_nph_kokkos.h"
-#include <cstring>
+
 #include "modify.h"
 #include "error.h"
 
+#include <cstring>
+
 using namespace LAMMPS_NS;
 using namespace FixConst;
 
diff --git a/src/KOKKOS/fix_npt_kokkos.cpp b/src/KOKKOS/fix_npt_kokkos.cpp
index 47b3da4efe..5b73eee4d7 100644
--- a/src/KOKKOS/fix_npt_kokkos.cpp
+++ b/src/KOKKOS/fix_npt_kokkos.cpp
@@ -12,10 +12,12 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_npt_kokkos.h"
-#include <cstring>
+
 #include "modify.h"
 #include "error.h"
 
+#include <cstring>
+
 using namespace LAMMPS_NS;
 using namespace FixConst;
 
diff --git a/src/KOKKOS/fix_nve_kokkos.cpp b/src/KOKKOS/fix_nve_kokkos.cpp
index da0a326d5d..beabc55727 100644
--- a/src/KOKKOS/fix_nve_kokkos.cpp
+++ b/src/KOKKOS/fix_nve_kokkos.cpp
@@ -12,14 +12,11 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_nve_kokkos.h"
-#include <cstdio>
-#include <cstring>
-#include "atom_masks.h"
+
 #include "atom_kokkos.h"
-#include "force.h"
-#include "update.h"
-#include "respa.h"
-#include "error.h"
+#include "atom_masks.h"
+
+#include <cstring>
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/KOKKOS/fix_nvt_kokkos.cpp b/src/KOKKOS/fix_nvt_kokkos.cpp
index 013095abc0..6e69582617 100644
--- a/src/KOKKOS/fix_nvt_kokkos.cpp
+++ b/src/KOKKOS/fix_nvt_kokkos.cpp
@@ -12,10 +12,12 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_nvt_kokkos.h"
-#include <cstring>
+
+#include "error.h"
 #include "group.h"
 #include "modify.h"
-#include "error.h"
+
+#include <cstring>
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/KOKKOS/fix_property_atom_kokkos.cpp b/src/KOKKOS/fix_property_atom_kokkos.cpp
index d6afae3ec2..185e7445b2 100644
--- a/src/KOKKOS/fix_property_atom_kokkos.cpp
+++ b/src/KOKKOS/fix_property_atom_kokkos.cpp
@@ -13,13 +13,12 @@
 
 #include "fix_property_atom_kokkos.h"
 
-#include <cstring>
 #include "atom_kokkos.h"
-#include "comm.h"
-#include "memory_kokkos.h"
-#include "error.h"
-#include "update.h"
 #include "atom_masks.h"
+#include "error.h"
+#include "memory_kokkos.h"
+
+#include <cstring>
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/KOKKOS/fix_qeq_reax_kokkos.cpp b/src/KOKKOS/fix_qeq_reax_kokkos.cpp
index 8c007586a9..eac044da28 100644
--- a/src/KOKKOS/fix_qeq_reax_kokkos.cpp
+++ b/src/KOKKOS/fix_qeq_reax_kokkos.cpp
@@ -17,21 +17,21 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_qeq_reax_kokkos.h"
-#include <cmath>
-#include "kokkos.h"
+
 #include "atom.h"
-#include "atom_masks.h"
 #include "atom_kokkos.h"
+#include "atom_masks.h"
 #include "comm.h"
+#include "error.h"
 #include "force.h"
-#include "neighbor.h"
+#include "kokkos.h"
+#include "memory_kokkos.h"
 #include "neigh_list_kokkos.h"
 #include "neigh_request.h"
+#include "neighbor.h"
 #include "update.h"
-#include "integrate.h"
-#include "memory_kokkos.h"
-#include "error.h"
-#include "pair_reaxc_kokkos.h"
+
+#include <cmath>
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/KOKKOS/fix_reaxc_bonds_kokkos.cpp b/src/KOKKOS/fix_reaxc_bonds_kokkos.cpp
index 3a706ece83..f98ab0314c 100644
--- a/src/KOKKOS/fix_reaxc_bonds_kokkos.cpp
+++ b/src/KOKKOS/fix_reaxc_bonds_kokkos.cpp
@@ -16,14 +16,13 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_reaxc_bonds_kokkos.h"
+
 #include "atom.h"
-#include "pair_reaxc_kokkos.h"
-#include "force.h"
-#include "compute.h"
-#include "memory_kokkos.h"
-#include "error.h"
-#include "reaxc_defs.h"
 #include "atom_masks.h"
+#include "error.h"
+#include "force.h"
+#include "memory_kokkos.h"
+#include "pair_reaxc_kokkos.h"
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/KOKKOS/fix_setforce_kokkos.cpp b/src/KOKKOS/fix_setforce_kokkos.cpp
index da516f5ba2..a11e8b4bd4 100644
--- a/src/KOKKOS/fix_setforce_kokkos.cpp
+++ b/src/KOKKOS/fix_setforce_kokkos.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_setforce_kokkos.h"
-#include <cstring>
+
 #include "atom_kokkos.h"
 #include "update.h"
 #include "modify.h"
@@ -24,7 +24,8 @@
 #include "error.h"
 #include "atom_masks.h"
 #include "kokkos_base.h"
-#include "region.h"
+
+#include <cstring>
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/KOKKOS/fix_wall_reflect_kokkos.cpp b/src/KOKKOS/fix_wall_reflect_kokkos.cpp
index c581edb123..046c97c12b 100644
--- a/src/KOKKOS/fix_wall_reflect_kokkos.cpp
+++ b/src/KOKKOS/fix_wall_reflect_kokkos.cpp
@@ -13,19 +13,14 @@
 
 #include "fix_wall_reflect_kokkos.h"
 
-#include <cstring>
 #include "atom_kokkos.h"
-#include "comm.h"
-#include "update.h"
-#include "modify.h"
-#include "domain.h"
-#include "lattice.h"
-#include "input.h"
-#include "variable.h"
-#include "error.h"
-#include "force.h"
 #include "atom_masks.h"
+#include "input.h"
+#include "modify.h"
+#include "update.h"
+#include "variable.h"
 
+#include <cstring>
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/KOKKOS/gridcomm_kokkos.cpp b/src/KOKKOS/gridcomm_kokkos.cpp
index 5f32c5b4ae..909e3c8544 100644
--- a/src/KOKKOS/gridcomm_kokkos.cpp
+++ b/src/KOKKOS/gridcomm_kokkos.cpp
@@ -12,14 +12,13 @@
 ------------------------------------------------------------------------- */
 
 #include "gridcomm_kokkos.h"
-#include <mpi.h>
+
 #include "comm.h"
-#include "kspace.h"
 #include "irregular.h"
-#include "memory_kokkos.h"
-#include "error.h"
-#include "kokkos_base_fft.h"
 #include "kokkos.h"
+#include "kokkos_base_fft.h"
+#include "kspace.h"
+#include "memory_kokkos.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/kokkos.cpp b/src/KOKKOS/kokkos.cpp
index b5e6174528..79fd0685b0 100644
--- a/src/KOKKOS/kokkos.cpp
+++ b/src/KOKKOS/kokkos.cpp
@@ -12,19 +12,17 @@
 ------------------------------------------------------------------------- */
 
 #include "kokkos.h"
-#include <mpi.h>
-#include <cstdio>
+
+#include "error.h"
+#include "force.h"
+#include "memory_kokkos.h"
+#include "neigh_list_kokkos.h"
+#include "neighbor_kokkos.h"
+
 #include <cstring>
-#include <cstdlib>
 #include <cctype>
 #include <csignal>
 #include <unistd.h>
-#include "lammps.h"
-#include "force.h"
-#include "neighbor_kokkos.h"
-#include "neigh_list_kokkos.h"
-#include "error.h"
-#include "memory_kokkos.h"
 
 #ifdef KOKKOS_ENABLE_CUDA
 
diff --git a/src/KOKKOS/memory_kokkos.h b/src/KOKKOS/memory_kokkos.h
index 39d30ac785..83e8b9ec7c 100644
--- a/src/KOKKOS/memory_kokkos.h
+++ b/src/KOKKOS/memory_kokkos.h
@@ -14,7 +14,7 @@
 #ifndef LMP_MEMORY_KOKKOS_H
 #define LMP_MEMORY_KOKKOS_H
 
-#include "memory.h"
+#include "memory.h"             // IWYU pragma: export
 #include "kokkos_type.h"
 
 namespace LAMMPS_NS {
diff --git a/src/KOKKOS/min_kokkos.cpp b/src/KOKKOS/min_kokkos.cpp
index e5f22411f6..032538fe60 100644
--- a/src/KOKKOS/min_kokkos.cpp
+++ b/src/KOKKOS/min_kokkos.cpp
@@ -16,32 +16,31 @@
 ------------------------------------------------------------------------- */
 
 #include "min_kokkos.h"
-#include <mpi.h>
-#include <cmath>
-#include <cstring>
-#include "atom_kokkos.h"
-#include "atom_vec.h"
-#include "domain.h"
-#include "comm.h"
-#include "update.h"
-#include "modify.h"
-#include "fix_minimize_kokkos.h"
-#include "compute.h"
-#include "neighbor.h"
-#include "force.h"
-#include "pair.h"
-#include "bond.h"
+
 #include "angle.h"
+#include "atom_kokkos.h"
+#include "atom_masks.h"
+#include "bond.h"
+#include "comm.h"
+#include "compute.h"
 #include "dihedral.h"
+#include "domain.h"
+#include "error.h"
+#include "fix_minimize_kokkos.h"
+#include "force.h"
 #include "improper.h"
+#include "kokkos.h"
 #include "kspace.h"
+#include "modify.h"
+#include "neighbor.h"
 #include "output.h"
+#include "pair.h"
 #include "thermo.h"
 #include "timer.h"
-#include "memory.h"
-#include "error.h"
-#include "kokkos.h"
-#include "atom_masks.h"
+#include "update.h"
+
+#include <cmath>
+#include <cstring>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/min_linesearch_kokkos.cpp b/src/KOKKOS/min_linesearch_kokkos.cpp
index cb07c7db86..3c94f07233 100644
--- a/src/KOKKOS/min_linesearch_kokkos.cpp
+++ b/src/KOKKOS/min_linesearch_kokkos.cpp
@@ -16,8 +16,7 @@
 ------------------------------------------------------------------------- */
 
 #include "min_linesearch_kokkos.h"
-#include <mpi.h>
-#include <cmath>
+
 #include "atom_kokkos.h"
 #include "modify.h"
 #include "fix_minimize_kokkos.h"
@@ -27,6 +26,8 @@
 #include "error.h"
 #include "atom_masks.h"
 
+#include <cmath>
+
 using namespace LAMMPS_NS;
 
 // ALPHA_MAX = max alpha allowed to avoid long backtracks
diff --git a/src/KOKKOS/nbin_kokkos.cpp b/src/KOKKOS/nbin_kokkos.cpp
index 89a69dc633..158a87796e 100644
--- a/src/KOKKOS/nbin_kokkos.cpp
+++ b/src/KOKKOS/nbin_kokkos.cpp
@@ -12,14 +12,11 @@
 ------------------------------------------------------------------------- */
 
 #include "nbin_kokkos.h"
-#include "neighbor.h"
+
 #include "atom_kokkos.h"
-#include "group.h"
-#include "domain.h"
+#include "atom_masks.h"
 #include "comm.h"
 #include "update.h"
-#include "error.h"
-#include "atom_masks.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/neigh_bond_kokkos.cpp b/src/KOKKOS/neigh_bond_kokkos.cpp
index bf9234e17c..021dcc7a1c 100644
--- a/src/KOKKOS/neigh_bond_kokkos.cpp
+++ b/src/KOKKOS/neigh_bond_kokkos.cpp
@@ -16,22 +16,22 @@
 ------------------------------------------------------------------------- */
 
 #include "neigh_bond_kokkos.h"
+
 #include "atom_kokkos.h"
+#include "atom_masks.h"
 #include "atom_vec.h"
-#include "molecule.h"
-#include "force.h"
-#include "update.h"
 #include "domain_kokkos.h"
+#include "error.h"
+#include "fix.h"
+#include "force.h"
+#include "memory_kokkos.h"
+#include "modify.h"
 #include "output.h"
 #include "thermo.h"
-#include "memory_kokkos.h"
-#include "error.h"
-#include "modify.h"
-#include "fix.h"
-#include <cstring>
-#include "atom_masks.h"
-#include "domain.h"
+#include "update.h"
 
+#include <cmath>
+#include <cstring>
 using namespace LAMMPS_NS;
 
 #define BONDDELTA 10000
diff --git a/src/KOKKOS/neigh_list_kokkos.cpp b/src/KOKKOS/neigh_list_kokkos.cpp
index 14591f8246..7db78e38d2 100644
--- a/src/KOKKOS/neigh_list_kokkos.cpp
+++ b/src/KOKKOS/neigh_list_kokkos.cpp
@@ -12,8 +12,6 @@
 ------------------------------------------------------------------------- */
 
 #include "neigh_list_kokkos.h"
-#include "atom.h"
-#include "memory_kokkos.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/neigh_list_kokkos.h b/src/KOKKOS/neigh_list_kokkos.h
index edd775f7f9..8ae873036b 100644
--- a/src/KOKKOS/neigh_list_kokkos.h
+++ b/src/KOKKOS/neigh_list_kokkos.h
@@ -15,7 +15,8 @@
 #define LMP_NEIGH_LIST_KOKKOS_H
 
 #include "pointers.h"
-#include "neigh_list.h"
+
+#include "neigh_list.h"         // IWYU pragma: export
 #include "kokkos_type.h"
 
 namespace LAMMPS_NS {
diff --git a/src/KOKKOS/neighbor_kokkos.cpp b/src/KOKKOS/neighbor_kokkos.cpp
index 4d0cf7ea3a..b21a7cb1ee 100644
--- a/src/KOKKOS/neighbor_kokkos.cpp
+++ b/src/KOKKOS/neighbor_kokkos.cpp
@@ -12,25 +12,26 @@
 ------------------------------------------------------------------------- */
 
 #include "neighbor_kokkos.h"
-#include "atom_kokkos.h"
-#include "pair.h"
-#include "fix.h"
-#include "neigh_request.h"
-#include "memory_kokkos.h"
-#include "update.h"
-#include "atom_masks.h"
-#include "error.h"
-#include "kokkos.h"
-#include "force.h"
-#include "bond.h"
+
 #include "angle.h"
-#include "dihedral.h"
-#include "improper.h"
-#include "style_nbin.h"
-#include "style_nstencil.h"
-#include "style_npair.h"
-#include "style_ntopo.h"
+#include "atom_kokkos.h"
+#include "atom_masks.h"
+#include "bond.h"
 #include "comm.h"
+#include "dihedral.h"
+#include "error.h"
+#include "fix.h"
+#include "force.h"
+#include "improper.h"
+#include "kokkos.h"
+#include "memory_kokkos.h"
+#include "neigh_request.h"
+#include "pair.h"
+#include "style_nbin.h"
+#include "style_npair.h"
+#include "style_nstencil.h"
+#include "style_ntopo.h"
+#include "update.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/neighbor_kokkos.h b/src/KOKKOS/neighbor_kokkos.h
index 3829502c0d..304fe8f1da 100644
--- a/src/KOKKOS/neighbor_kokkos.h
+++ b/src/KOKKOS/neighbor_kokkos.h
@@ -14,11 +14,10 @@
 #ifndef LMP_NEIGHBOR_KOKKOS_H
 #define LMP_NEIGHBOR_KOKKOS_H
 
-#include "neighbor.h"
+#include "neighbor.h"           // IWYU pragma: export
 #include "neigh_list_kokkos.h"
 #include "neigh_bond_kokkos.h"
 #include "kokkos_type.h"
-#include <cmath>
 
 namespace LAMMPS_NS {
 
diff --git a/src/KOKKOS/npair_halffull_kokkos.cpp b/src/KOKKOS/npair_halffull_kokkos.cpp
index b109010935..ca9c14b29d 100644
--- a/src/KOKKOS/npair_halffull_kokkos.cpp
+++ b/src/KOKKOS/npair_halffull_kokkos.cpp
@@ -12,15 +12,14 @@
 ------------------------------------------------------------------------- */
 
 #include "npair_halffull_kokkos.h"
-#include "neighbor.h"
-#include "neigh_list_kokkos.h"
+
 #include "atom_kokkos.h"
-#include "atom_vec.h"
-#include "molecule.h"
-#include "domain.h"
-#include "my_page.h"
-#include "error.h"
 #include "atom_masks.h"
+#include "atom_vec.h"
+#include "domain.h"
+#include "neigh_list_kokkos.h"
+
+#include <cmath>
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/npair_skip_kokkos.cpp b/src/KOKKOS/npair_skip_kokkos.cpp
index 13080a9580..81f78844d3 100644
--- a/src/KOKKOS/npair_skip_kokkos.cpp
+++ b/src/KOKKOS/npair_skip_kokkos.cpp
@@ -12,11 +12,11 @@
 ------------------------------------------------------------------------- */
 
 #include "npair_skip_kokkos.h"
-#include "neigh_list_kokkos.h"
+
 #include "atom_kokkos.h"
-#include "atom_vec.h"
-#include "error.h"
 #include "atom_masks.h"
+#include "atom_vec.h"
+#include "neigh_list_kokkos.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/KOKKOS/pair_kokkos.h b/src/KOKKOS/pair_kokkos.h
index ffafdf7f17..396a5f2d48 100644
--- a/src/KOKKOS/pair_kokkos.h
+++ b/src/KOKKOS/pair_kokkos.h
@@ -19,7 +19,7 @@
 #define LMP_PAIR_KOKKOS_H
 
 #include "Kokkos_Macros.hpp"
-#include "pair.h"
+#include "pair.h"               // IWYU pragma: export
 #include "neighbor_kokkos.h"
 #include "neigh_list_kokkos.h"
 #include "Kokkos_Vectorization.hpp"
diff --git a/src/KOKKOS/pair_reaxc_kokkos.cpp b/src/KOKKOS/pair_reaxc_kokkos.cpp
index bf8518e3c3..3a7359df93 100644
--- a/src/KOKKOS/pair_reaxc_kokkos.cpp
+++ b/src/KOKKOS/pair_reaxc_kokkos.cpp
@@ -16,25 +16,23 @@
 ------------------------------------------------------------------------- */
 
 #include "pair_reaxc_kokkos.h"
-#include <cmath>
 
-#include <cstring>
-#include "kokkos.h"
 #include "atom_kokkos.h"
+#include "atom_masks.h"
 #include "comm.h"
+#include "error.h"
 #include "force.h"
-#include "neighbor.h"
-#include "neigh_request.h"
-#include "neigh_list_kokkos.h"
+#include "kokkos.h"
 #include "math_const.h"
 #include "math_special.h"
-#include "memory_kokkos.h"
-#include "error.h"
-#include "atom_masks.h"
+#include "neigh_request.h"
+#include "neighbor.h"
 #include "reaxc_defs.h"
 #include "reaxc_lookup.h"
 #include "reaxc_tool_box.h"
 
+#include <cmath>
+
 
 #define TEAMSIZE 128
 
diff --git a/src/KOKKOS/pair_vashishta_kokkos.cpp b/src/KOKKOS/pair_vashishta_kokkos.cpp
index f5489c0e0c..b5dd43f12a 100644
--- a/src/KOKKOS/pair_vashishta_kokkos.cpp
+++ b/src/KOKKOS/pair_vashishta_kokkos.cpp
@@ -16,20 +16,21 @@
 ------------------------------------------------------------------------- */
 
 #include "pair_vashishta_kokkos.h"
-#include <cmath>
-#include <cstring>
-#include "kokkos.h"
-#include "pair_kokkos.h"
+
 #include "atom_kokkos.h"
-#include "neighbor.h"
-#include "neigh_request.h"
-#include "force.h"
+#include "atom_masks.h"
 #include "comm.h"
+#include "error.h"
+#include "force.h"
+#include "kokkos.h"
+#include "math_const.h"
 #include "memory_kokkos.h"
 #include "neigh_list_kokkos.h"
-#include "error.h"
-#include "atom_masks.h"
-#include "math_const.h"
+#include "neigh_request.h"
+#include "neighbor.h"
+#include "pair_kokkos.h"
+
+#include <cmath>
 
 using namespace LAMMPS_NS;
 using namespace MathConst;
diff --git a/src/KOKKOS/pppm_kokkos.cpp b/src/KOKKOS/pppm_kokkos.cpp
index 2eea527947..4a795833fb 100644
--- a/src/KOKKOS/pppm_kokkos.cpp
+++ b/src/KOKKOS/pppm_kokkos.cpp
@@ -16,26 +16,22 @@
 ------------------------------------------------------------------------- */
 
 #include "pppm_kokkos.h"
-#include <mpi.h>
-#include <cmath>
-#include "atom_kokkos.h"
-#include "comm.h"
-#include "gridcomm_kokkos.h"
-#include "neighbor.h"
-#include "force.h"
-#include "pair.h"
-#include "domain.h"
-#include "fft3d_kokkos.h"
-#include "remap_kokkos.h"
-#include "memory_kokkos.h"
-#include "error.h"
-#include "atom_masks.h"
-#include "kokkos.h"
-#include "utils.h"
-#include "fmt/format.h"
 
+#include "atom_kokkos.h"
+#include "atom_masks.h"
+#include "domain.h"
+#include "error.h"
+#include "fft3d_kokkos.h"
+#include "force.h"
+#include "gridcomm_kokkos.h"
+#include "kokkos.h"
 #include "math_const.h"
 #include "math_special_kokkos.h"
+#include "memory_kokkos.h"
+#include "pair.h"
+#include "remap_kokkos.h"
+
+#include <cmath>
 
 using namespace LAMMPS_NS;
 using namespace MathConst;
diff --git a/src/KOKKOS/remap_kokkos.cpp b/src/KOKKOS/remap_kokkos.cpp
index d496db05e2..af87ba3644 100644
--- a/src/KOKKOS/remap_kokkos.cpp
+++ b/src/KOKKOS/remap_kokkos.cpp
@@ -11,12 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <mpi.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include "remap_kokkos.h"
-#include "pack_kokkos.h"
+
 #include "error.h"
+#include "pack_kokkos.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-INTEL/angle_charmm_intel.cpp b/src/USER-INTEL/angle_charmm_intel.cpp
index b6e0b0dac5..7aad7f754a 100644
--- a/src/USER-INTEL/angle_charmm_intel.cpp
+++ b/src/USER-INTEL/angle_charmm_intel.cpp
@@ -15,20 +15,21 @@
    Contributing author: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include "omp_compat.h"
-#include <cmath>
-
 #include "angle_charmm_intel.h"
+
 #include "atom.h"
-#include "neighbor.h"
-#include "domain.h"
 #include "comm.h"
+#include "error.h"
 #include "force.h"
-#include "modify.h"
 #include "math_const.h"
 #include "memory.h"
+#include "modify.h"
+#include "neighbor.h"
 #include "suffix.h"
-#include "error.h"
+
+#include <cmath>
+
+#include "omp_compat.h"
 
 using namespace LAMMPS_NS;
 using namespace MathConst;
diff --git a/src/USER-INTEL/angle_harmonic_intel.cpp b/src/USER-INTEL/angle_harmonic_intel.cpp
index 6d3deee9ba..290f7320b1 100644
--- a/src/USER-INTEL/angle_harmonic_intel.cpp
+++ b/src/USER-INTEL/angle_harmonic_intel.cpp
@@ -15,20 +15,21 @@
    Contributing author: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include "omp_compat.h"
-#include <cmath>
-
 #include "angle_harmonic_intel.h"
+
 #include "atom.h"
-#include "neighbor.h"
-#include "domain.h"
 #include "comm.h"
+#include "error.h"
 #include "force.h"
-#include "modify.h"
 #include "math_const.h"
 #include "memory.h"
+#include "modify.h"
+#include "neighbor.h"
 #include "suffix.h"
-#include "error.h"
+
+#include <cmath>
+
+#include "omp_compat.h"
 
 using namespace LAMMPS_NS;
 using namespace MathConst;
diff --git a/src/USER-INTEL/bond_fene_intel.cpp b/src/USER-INTEL/bond_fene_intel.cpp
index 072800db42..6b458aeefb 100644
--- a/src/USER-INTEL/bond_fene_intel.cpp
+++ b/src/USER-INTEL/bond_fene_intel.cpp
@@ -15,19 +15,21 @@
    Contributing author: Stan Moore (Sandia)
 ------------------------------------------------------------------------- */
 
-#include "omp_compat.h"
-#include <cmath>
 
 #include "bond_fene_intel.h"
+
 #include "atom.h"
-#include "modify.h"
-#include "neighbor.h"
-#include "domain.h"
 #include "comm.h"
+#include "error.h"
 #include "force.h"
 #include "memory.h"
+#include "modify.h"
+#include "neighbor.h"
 #include "suffix.h"
-#include "error.h"
+
+#include <cmath>
+
+#include "omp_compat.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-INTEL/bond_harmonic_intel.cpp b/src/USER-INTEL/bond_harmonic_intel.cpp
index 1ddb424a7b..84d94b8f3d 100644
--- a/src/USER-INTEL/bond_harmonic_intel.cpp
+++ b/src/USER-INTEL/bond_harmonic_intel.cpp
@@ -15,19 +15,20 @@
    Contributing author: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include "omp_compat.h"
-#include <cmath>
-
 #include "bond_harmonic_intel.h"
+
 #include "atom.h"
-#include "modify.h"
-#include "neighbor.h"
-#include "domain.h"
 #include "comm.h"
+#include "error.h"
 #include "force.h"
 #include "memory.h"
+#include "modify.h"
+#include "neighbor.h"
 #include "suffix.h"
-#include "error.h"
+
+#include <cmath>
+
+#include "omp_compat.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-INTEL/dihedral_fourier_intel.cpp b/src/USER-INTEL/dihedral_fourier_intel.cpp
index cd62012255..67b82b62bf 100644
--- a/src/USER-INTEL/dihedral_fourier_intel.cpp
+++ b/src/USER-INTEL/dihedral_fourier_intel.cpp
@@ -15,22 +15,22 @@
    Contributing author: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include "omp_compat.h"
-
-#include <cmath>
 #include "dihedral_fourier_intel.h"
+
 #include "atom.h"
 #include "comm.h"
+#include "error.h"
+#include "force.h"
 #include "memory.h"
 #include "modify.h"
 #include "neighbor.h"
-#include "domain.h"
-#include "force.h"
-#include "pair.h"
-#include "update.h"
-#include "error.h"
-
 #include "suffix.h"
+#include "update.h"
+
+#include <cmath>
+
+#include "omp_compat.h"
+
 using namespace LAMMPS_NS;
 
 #define PTOLERANCE (flt_t)1.05
diff --git a/src/USER-INTEL/dihedral_harmonic_intel.cpp b/src/USER-INTEL/dihedral_harmonic_intel.cpp
index dd8c3d98db..ea9bc33c57 100644
--- a/src/USER-INTEL/dihedral_harmonic_intel.cpp
+++ b/src/USER-INTEL/dihedral_harmonic_intel.cpp
@@ -15,22 +15,22 @@
    Contributing author: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include "omp_compat.h"
-
-#include <cmath>
 #include "dihedral_harmonic_intel.h"
+
 #include "atom.h"
 #include "comm.h"
+#include "error.h"
+#include "force.h"
 #include "memory.h"
 #include "modify.h"
 #include "neighbor.h"
-#include "domain.h"
-#include "force.h"
-#include "pair.h"
-#include "update.h"
-#include "error.h"
-
 #include "suffix.h"
+#include "update.h"
+
+#include <cmath>
+
+#include "omp_compat.h"
+
 using namespace LAMMPS_NS;
 
 #define PTOLERANCE (flt_t)1.05
diff --git a/src/USER-INTEL/dihedral_opls_intel.cpp b/src/USER-INTEL/dihedral_opls_intel.cpp
index ef48f7e8ee..fa8fd53def 100644
--- a/src/USER-INTEL/dihedral_opls_intel.cpp
+++ b/src/USER-INTEL/dihedral_opls_intel.cpp
@@ -15,22 +15,22 @@
    Contributing author: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include "omp_compat.h"
-
-#include <cmath>
 #include "dihedral_opls_intel.h"
+
 #include "atom.h"
 #include "comm.h"
+#include "error.h"
+#include "force.h"
 #include "memory.h"
 #include "modify.h"
 #include "neighbor.h"
-#include "domain.h"
-#include "force.h"
-#include "pair.h"
-#include "update.h"
-#include "error.h"
-
 #include "suffix.h"
+#include "update.h"
+
+#include <cmath>
+
+#include "omp_compat.h"
+
 using namespace LAMMPS_NS;
 
 #define PTOLERANCE (flt_t)1.05
diff --git a/src/USER-INTEL/fix_intel.cpp b/src/USER-INTEL/fix_intel.cpp
index b3649be7c8..eacbc7ddcc 100644
--- a/src/USER-INTEL/fix_intel.cpp
+++ b/src/USER-INTEL/fix_intel.cpp
@@ -16,8 +16,8 @@
                         Anupama Kurpad (Intel) - Host Affinitization
 ------------------------------------------------------------------------- */
 
-#include "omp_compat.h"
 #include "fix_intel.h"
+
 #include "comm.h"
 #include "error.h"
 #include "force.h"
@@ -25,17 +25,10 @@
 #include "neigh_request.h"
 #include "pair.h"
 #include "pair_hybrid.h"
-#include "pair_hybrid_overlay.h"
-#include "timer.h"
-#include "universe.h"
 #include "update.h"
 
-
 #include <cstring>
 
-#include <cstdio>
-#include <cmath>
-
 #ifdef _LMP_INTEL_OFFLOAD
 #ifndef INTEL_OFFLOAD_NOAFFINITY
 #include <unistd.h>
diff --git a/src/USER-INTEL/fix_nh_intel.cpp b/src/USER-INTEL/fix_nh_intel.cpp
index a072e823a4..2122bfd370 100644
--- a/src/USER-INTEL/fix_nh_intel.cpp
+++ b/src/USER-INTEL/fix_nh_intel.cpp
@@ -16,12 +16,11 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_nh_intel.h"
+
 #include "atom.h"
-#include "compute.h"
 #include "domain.h"
 #include "error.h"
 #include "force.h"
-#include "kspace.h"
 #include "memory.h"
 #include "modify.h"
 #include "neighbor.h"
@@ -29,7 +28,6 @@
 
 #include <cstring>
 #include <cmath>
-#include <cstdio>
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/USER-INTEL/fix_nve_asphere_intel.cpp b/src/USER-INTEL/fix_nve_asphere_intel.cpp
index 7eeb8a1635..55e51227f4 100644
--- a/src/USER-INTEL/fix_nve_asphere_intel.cpp
+++ b/src/USER-INTEL/fix_nve_asphere_intel.cpp
@@ -15,18 +15,16 @@
    Contributing author: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include <cmath>
-#include <cstdio>
-#include <cstring>
 #include "fix_nve_asphere_intel.h"
-#include "math_extra_intel.h"
+
 #include "atom.h"
 #include "atom_vec_ellipsoid.h"
+#include "error.h"
 #include "force.h"
+#include "math_extra_intel.h"
+#include "memory.h"
 #include "neighbor.h"
 #include "update.h"
-#include "memory.h"
-#include "error.h"
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/USER-INTEL/fix_nvt_sllod_intel.cpp b/src/USER-INTEL/fix_nvt_sllod_intel.cpp
index f5a5dabfb1..4382542710 100644
--- a/src/USER-INTEL/fix_nvt_sllod_intel.cpp
+++ b/src/USER-INTEL/fix_nvt_sllod_intel.cpp
@@ -11,18 +11,19 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <cmath>
-#include <cstring>
 #include "fix_nvt_sllod_intel.h"
-#include "math_extra.h"
+
 #include "atom.h"
+#include "compute.h"
 #include "domain.h"
-#include "group.h"
-#include "modify.h"
+#include "error.h"
 #include "fix.h"
 #include "fix_deform.h"
-#include "compute.h"
-#include "error.h"
+#include "group.h"
+#include "math_extra.h"
+#include "modify.h"
+
+#include <cstring>
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/USER-INTEL/intel_buffers.cpp b/src/USER-INTEL/intel_buffers.cpp
index 04791dee78..dc5b0fad5a 100644
--- a/src/USER-INTEL/intel_buffers.cpp
+++ b/src/USER-INTEL/intel_buffers.cpp
@@ -12,8 +12,8 @@
    Contributing author: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include <cmath>
 #include "intel_buffers.h"
+
 #include "force.h"
 #include "memory.h"
 
diff --git a/src/USER-INTEL/nbin_intel.cpp b/src/USER-INTEL/nbin_intel.cpp
index 78c6246389..4a046bc845 100644
--- a/src/USER-INTEL/nbin_intel.cpp
+++ b/src/USER-INTEL/nbin_intel.cpp
@@ -16,13 +16,13 @@
 ------------------------------------------------------------------------- */
 
 #include "nbin_intel.h"
+
 #include "atom.h"
-#include "group.h"
 #include "comm.h"
-#include "domain.h"
+#include "error.h"
+#include "group.h"
 #include "modify.h"
 #include "update.h"
-#include "error.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-INTEL/npair_intel.cpp b/src/USER-INTEL/npair_intel.cpp
index f7a233efc9..9aae0d27b7 100644
--- a/src/USER-INTEL/npair_intel.cpp
+++ b/src/USER-INTEL/npair_intel.cpp
@@ -15,13 +15,13 @@
    Contributing author: W. Michael Brown (Intel)
 ------------------------------------------------------------------------- */
 
-#include "omp_compat.h"
+#include "npair_intel.h"
+
 #include "comm.h"
 #include "domain.h"
-#include "timer.h"
 #include "modify.h"
-#include "npair_intel.h"
-#include "nstencil.h"
+
+#include "omp_compat.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-OMP/reaxc_forces_omp.cpp b/src/USER-OMP/reaxc_forces_omp.cpp
index ee4670fe59..ce38cb0544 100644
--- a/src/USER-OMP/reaxc_forces_omp.cpp
+++ b/src/USER-OMP/reaxc_forces_omp.cpp
@@ -26,13 +26,11 @@
   <http://www.gnu.org/licenses/>.
   ----------------------------------------------------------------------*/
 
-#include "omp_compat.h"
 #include "reaxc_forces_omp.h"
-#include <mpi.h>
-#include <cmath>
+
 #include "fix_omp.h"
-#include "reaxc_defs.h"
 #include "pair_reaxc_omp.h"
+#include "reaxc_defs.h"
 
 #include "reaxc_bond_orders_omp.h"
 #include "reaxc_bonds_omp.h"
@@ -44,6 +42,11 @@
 #include "reaxc_valence_angles_omp.h"
 #include "reaxc_vector.h"
 
+#include <mpi.h>
+#include <cmath>
+
+#include "omp_compat.h"
+
 #if defined(_OPENMP)
 #include <omp.h>
 #endif
diff --git a/src/USER-OMP/reaxc_init_md_omp.cpp b/src/USER-OMP/reaxc_init_md_omp.cpp
index b0cf4a5fb8..fd216844eb 100644
--- a/src/USER-OMP/reaxc_init_md_omp.cpp
+++ b/src/USER-OMP/reaxc_init_md_omp.cpp
@@ -27,7 +27,7 @@
   ----------------------------------------------------------------------*/
 
 #include "reaxc_init_md_omp.h"
-#include <cstdlib>
+
 #include "reaxc_defs.h"
 #include "reaxc_forces.h"
 #include "reaxc_forces_omp.h"
@@ -38,6 +38,8 @@
 #include "error.h"
 #include "fmt/format.h"
 
+#include <cstdlib>
+
 // Functions defined in reaxc_init_md.cpp
 extern int Init_MPI_Datatypes(reax_system*, storage*, mpi_datatypes*, MPI_Comm, char*);
 extern int Init_System(reax_system*, control_params*, char*);
diff --git a/src/USER-OMP/reaxc_multi_body_omp.cpp b/src/USER-OMP/reaxc_multi_body_omp.cpp
index 5f4b6d4eb0..57c056fff7 100644
--- a/src/USER-OMP/reaxc_multi_body_omp.cpp
+++ b/src/USER-OMP/reaxc_multi_body_omp.cpp
@@ -27,14 +27,16 @@
   ----------------------------------------------------------------------*/
 
 #include "reaxc_multi_body_omp.h"
-#include <mpi.h>
-#include <cmath>
+
 #include "fix_omp.h"
-#include <cstring>
 #include "pair_reaxc_omp.h"
+
 #include "reaxc_defs.h"
 #include "reaxc_list.h"
 
+#include <cmath>
+#include <cstring>
+
 #if defined(_OPENMP)
 #include  <omp.h>
 #endif
diff --git a/src/USER-OMP/reaxc_torsion_angles_omp.cpp b/src/USER-OMP/reaxc_torsion_angles_omp.cpp
index 68bacb7202..7d567b259c 100644
--- a/src/USER-OMP/reaxc_torsion_angles_omp.cpp
+++ b/src/USER-OMP/reaxc_torsion_angles_omp.cpp
@@ -27,7 +27,7 @@
   ----------------------------------------------------------------------*/
 
 #include "reaxc_torsion_angles_omp.h"
-#include <mpi.h>
+
 #include "fix_omp.h"
 #include "pair_reaxc_omp.h"
 
@@ -36,6 +36,8 @@
 #include "reaxc_list.h"
 #include "reaxc_vector.h"
 
+#include <cmath>
+
 #if defined(_OPENMP)
 #include <omp.h>
 #endif
diff --git a/src/USER-OMP/reaxc_valence_angles_omp.cpp b/src/USER-OMP/reaxc_valence_angles_omp.cpp
index 104fadbbae..f9117d3a53 100644
--- a/src/USER-OMP/reaxc_valence_angles_omp.cpp
+++ b/src/USER-OMP/reaxc_valence_angles_omp.cpp
@@ -27,11 +27,10 @@
   ----------------------------------------------------------------------*/
 
 #include "reaxc_valence_angles_omp.h"
-#include <mpi.h>
-#include <cmath>
-#include "pair_reaxc_omp.h"
-#include "fix_omp.h"
+
 #include "error.h"
+#include "fix_omp.h"
+#include "pair_reaxc_omp.h"
 
 #include "reaxc_defs.h"
 #include "reaxc_types.h"
@@ -39,6 +38,8 @@
 #include "reaxc_list.h"
 #include "reaxc_vector.h"
 
+#include <cmath>
+
 #if defined(_OPENMP)
 #include <omp.h>
 #endif