diff --git a/src/BOCS/fix_bocs.cpp b/src/BOCS/fix_bocs.cpp
index d6beb889ff..25471d04a4 100644
--- a/src/BOCS/fix_bocs.cpp
+++ b/src/BOCS/fix_bocs.cpp
@@ -25,7 +25,6 @@
 #include "error.h"
 #include "fix_deform.h"
 #include "force.h"
-#include "group.h"
 #include "irregular.h"
 #include "kspace.h"
 #include "memory.h"
diff --git a/src/DIELECTRIC/fix_polarize_bem_gmres.cpp b/src/DIELECTRIC/fix_polarize_bem_gmres.cpp
index 40f7d0c853..67d79d57f0 100644
--- a/src/DIELECTRIC/fix_polarize_bem_gmres.cpp
+++ b/src/DIELECTRIC/fix_polarize_bem_gmres.cpp
@@ -41,7 +41,6 @@
 #include "comm.h"
 #include "error.h"
 #include "force.h"
-#include "group.h"
 #include "kspace.h"
 #include "math_const.h"
 #include "memory.h"
diff --git a/src/GRANULAR/pair_granular.cpp b/src/GRANULAR/pair_granular.cpp
index 119feb1c38..d5179a19b7 100644
--- a/src/GRANULAR/pair_granular.cpp
+++ b/src/GRANULAR/pair_granular.cpp
@@ -37,7 +37,6 @@
 #include "update.h"
 
 #include <cstring>
-#include <vector>
 
 using namespace LAMMPS_NS;
 using namespace Granular_NS;
diff --git a/src/KOKKOS/neighbor_kokkos.cpp b/src/KOKKOS/neighbor_kokkos.cpp
index 67af5b2b28..214b2e86d9 100644
--- a/src/KOKKOS/neighbor_kokkos.cpp
+++ b/src/KOKKOS/neighbor_kokkos.cpp
@@ -18,6 +18,7 @@
 #include "atom_kokkos.h"
 #include "atom_masks.h"
 #include "bond.h"
+#include "domain.h"
 #include "dihedral.h"
 #include "error.h"
 #include "force.h"
diff --git a/src/MDI/mdi_command.h b/src/MDI/mdi_command.h
index 88e1901ab1..0bdfe81279 100644
--- a/src/MDI/mdi_command.h
+++ b/src/MDI/mdi_command.h
@@ -21,7 +21,7 @@ CommandStyle(mdi,MDICommand);
 #define LMP_MDI_COMMAND_H
 
 #include "command.h"
-#include "mdi.h"
+#include <mdi.h>
 
 namespace LAMMPS_NS {
 
diff --git a/src/MESONT/pair_mesocnt_viscous.cpp b/src/MESONT/pair_mesocnt_viscous.cpp
index 9beabe0d2f..f7ad7b0aa6 100644
--- a/src/MESONT/pair_mesocnt_viscous.cpp
+++ b/src/MESONT/pair_mesocnt_viscous.cpp
@@ -25,7 +25,6 @@
 #include "math_const.h"
 #include "math_extra.h"
 #include "memory.h"
-#include "neigh_list.h"
 #include "neighbor.h"
 #include "update.h"
 
diff --git a/src/compute_heat_flux.cpp b/src/compute_heat_flux.cpp
index 62b2c8b63b..64cc8e69f3 100644
--- a/src/compute_heat_flux.cpp
+++ b/src/compute_heat_flux.cpp
@@ -19,12 +19,11 @@
 
 #include "compute_heat_flux.h"
 
-#include <cstring>
 #include "atom.h"
-#include "update.h"
-#include "modify.h"
-#include "force.h"
 #include "error.h"
+#include "force.h"
+#include "modify.h"
+#include "update.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/fix_pair.cpp b/src/fix_pair.cpp
index 93a88a60c9..da56b01f9e 100644
--- a/src/fix_pair.cpp
+++ b/src/fix_pair.cpp
@@ -21,7 +21,6 @@
 #include "memory.h"
 #include "pair.h"
 #include "update.h"
-#include "fmt/format.h"
 
 #include <cstring>
 
diff --git a/src/imbalance_neigh.cpp b/src/imbalance_neigh.cpp
index 8d4a17976b..f6b2be2cad 100644
--- a/src/imbalance_neigh.cpp
+++ b/src/imbalance_neigh.cpp
@@ -14,10 +14,8 @@
 #include "imbalance_neigh.h"
 
 #include "accelerator_kokkos.h"
-#include "atom.h"
 #include "comm.h"
 #include "error.h"
-#include "neighbor.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/replicate.cpp b/src/replicate.cpp
index 710361e55c..b27304a2a0 100644
--- a/src/replicate.cpp
+++ b/src/replicate.cpp
@@ -21,7 +21,6 @@
 #include "domain.h"
 #include "error.h"
 #include "memory.h"
-#include "molecule.h"
 #include "special.h"
 #include "label_map.h"