diff --git a/src/angle_hybrid.cpp b/src/angle_hybrid.cpp
index 47baf770a5..48bb241100 100644
--- a/src/angle_hybrid.cpp
+++ b/src/angle_hybrid.cpp
@@ -12,6 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
+#include <cstdio>
 #include <cstring>
 #include <cctype>
 #include "angle_hybrid.h"
diff --git a/src/atom.cpp b/src/atom.cpp
index 8176039165..b79febfc20 100644
--- a/src/atom.cpp
+++ b/src/atom.cpp
@@ -12,6 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
+#include <climits>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
@@ -25,7 +26,6 @@
 #include "modify.h"
 #include "fix.h"
 #include "compute.h"
-#include "output.h"
 #include "update.h"
 #include "domain.h"
 #include "group.h"
diff --git a/src/atom_map.cpp b/src/atom_map.cpp
index e9cd590624..35d7435ae2 100644
--- a/src/atom_map.cpp
+++ b/src/atom_map.cpp
@@ -11,6 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
+#include <mpi.h>
 #include <cmath>
 #include "atom.h"
 #include "comm.h"
diff --git a/src/atom_vec.cpp b/src/atom_vec.cpp
index a7ca6fcb19..91e1980dd0 100644
--- a/src/atom_vec.cpp
+++ b/src/atom_vec.cpp
@@ -11,6 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include <cstdio>
 #include <cstring>
 #include <cstdlib>
 #include "atom_vec.h"
diff --git a/src/atom_vec.h b/src/atom_vec.h
index 87fb35d9c7..26c181be1e 100644
--- a/src/atom_vec.h
+++ b/src/atom_vec.h
@@ -14,8 +14,7 @@
 #ifndef LMP_ATOM_VEC_H
 #define LMP_ATOM_VEC_H
 
-#include <cstdio>
-#include "pointers.h"
+#include "pointers.h"  // IWYU pragma: export
 
 namespace LAMMPS_NS {
 
diff --git a/src/atom_vec_body.h b/src/atom_vec_body.h
index 4d02c4b3e0..09f03caca1 100644
--- a/src/atom_vec_body.h
+++ b/src/atom_vec_body.h
@@ -112,7 +112,6 @@ class AtomVecBody : public AtomVec {
 
   void grow_bonus();
   void copy_bonus(int, int);
-  //void check(int);
 };
 
 }