diff --git a/src/GPU/pair_vashishta_gpu.cpp b/src/GPU/pair_vashishta_gpu.cpp
index b496359b8a..5539653756 100644
--- a/src/GPU/pair_vashishta_gpu.cpp
+++ b/src/GPU/pair_vashishta_gpu.cpp
@@ -14,7 +14,6 @@
 /* ----------------------------------------------------------------------
    Contributing author: Anders Hafreager (UiO)
 ------------------------------------------------------------------------- */
-#include <limits>
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
diff --git a/src/angle_deprecated.cpp b/src/angle_deprecated.cpp
index 73fcccc53a..b5af217b7b 100644
--- a/src/angle_deprecated.cpp
+++ b/src/angle_deprecated.cpp
@@ -16,7 +16,6 @@
 ------------------------------------------------------------------------- */
 
 #include <cstring>
-#include <cstdio>
 #include "angle_deprecated.h"
 #include "angle_hybrid.h"
 #include "comm.h"
diff --git a/src/angle_hybrid.cpp b/src/angle_hybrid.cpp
index 48bb241100..47baf770a5 100644
--- a/src/angle_hybrid.cpp
+++ b/src/angle_hybrid.cpp
@@ -12,7 +12,6 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
-#include <cstdio>
 #include <cstring>
 #include <cctype>
 #include "angle_hybrid.h"
diff --git a/src/atom.cpp b/src/atom.cpp
index b79febfc20..eab8a3063d 100644
--- a/src/atom.cpp
+++ b/src/atom.cpp
@@ -13,7 +13,6 @@
 
 #include <mpi.h>
 #include <climits>
-#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include "atom.h"
diff --git a/src/atom_map.cpp b/src/atom_map.cpp
index 35d7435ae2..b14ebdba68 100644
--- a/src/atom_map.cpp
+++ b/src/atom_map.cpp
@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include "lmptype.h"
+#include "pointers.h"
 #include <mpi.h>
 #include <cmath>
 #include "atom.h"
diff --git a/src/atom_vec.cpp b/src/atom_vec.cpp
index 91e1980dd0..a7ca6fcb19 100644
--- a/src/atom_vec.cpp
+++ b/src/atom_vec.cpp
@@ -11,7 +11,6 @@
    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_hybrid.h b/src/atom_vec_hybrid.h
index a027923a17..8129baccba 100644
--- a/src/atom_vec_hybrid.h
+++ b/src/atom_vec_hybrid.h
@@ -20,7 +20,6 @@ AtomStyle(hybrid,AtomVecHybrid)
 #ifndef LMP_ATOM_VEC_HYBRID_H
 #define LMP_ATOM_VEC_HYBRID_H
 
-#include <cstdio>
 #include "atom_vec.h"
 
 namespace LAMMPS_NS {
diff --git a/src/bond_zero.cpp b/src/bond_zero.cpp
index 0847cf9e6b..3932846cb4 100644
--- a/src/bond_zero.cpp
+++ b/src/bond_zero.cpp
@@ -15,8 +15,8 @@
    Contributing author: Carsten Svaneborg (SDU)
 ------------------------------------------------------------------------- */
 
-#include <cmath>
-#include <cstdlib>
+#include <mpi.h>
+#include <cstdio>
 #include <cstring>
 #include "bond_zero.h"
 #include "atom.h"
diff --git a/src/change_box.cpp b/src/change_box.cpp
index b7d3cb245f..1fed65b430 100644
--- a/src/change_box.cpp
+++ b/src/change_box.cpp
@@ -13,7 +13,6 @@
 
 #include <mpi.h>
 #include <cmath>
-#include <cstdlib>
 #include <cstring>
 #include "change_box.h"
 #include "atom.h"
diff --git a/src/citeme.cpp b/src/citeme.cpp
index d021722671..24896b448c 100644
--- a/src/citeme.cpp
+++ b/src/citeme.cpp
@@ -11,10 +11,9 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include <cstdio>
 #include "citeme.h"
-#include "version.h"
 #include "universe.h"
-#include "error.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/citeme.h b/src/citeme.h
index 262b284337..c383ec2227 100644
--- a/src/citeme.h
+++ b/src/citeme.h
@@ -15,7 +15,6 @@
 #define LMP_CITEME_H
 
 #include "pointers.h"
-#include <cstdio>
 #include <set>
 
 namespace LAMMPS_NS {
@@ -29,7 +28,7 @@ class CiteMe : protected Pointers {
  private:
   FILE *fp;                    // opaque pointer to log.cite file object
   typedef std::set<const char *> citeset;
-  citeset *cs;                // registered set of publications
+  citeset *cs;                 // registered set of publications
 };
 
 }
diff --git a/src/comm.cpp b/src/comm.cpp
index 052de93793..5f846cf292 100644
--- a/src/comm.cpp
+++ b/src/comm.cpp
@@ -21,6 +21,7 @@
 #include "force.h"
 #include "pair.h"
 #include "modify.h"
+#include "neighbor.h"
 #include "fix.h"
 #include "compute.h"
 #include "domain.h"
diff --git a/src/comm_brick.cpp b/src/comm_brick.cpp
index 330551aaed..47f60a3da6 100644
--- a/src/comm_brick.cpp
+++ b/src/comm_brick.cpp
@@ -19,23 +19,15 @@
 #include <cmath>
 #include <cstring>
 #include <cstdio>
-#include <cstdlib>
 #include "comm_brick.h"
-#include "comm_tiled.h"
-#include "universe.h"
 #include "atom.h"
 #include "atom_vec.h"
-#include "force.h"
 #include "pair.h"
 #include "domain.h"
 #include "neighbor.h"
-#include "group.h"
-#include "modify.h"
 #include "fix.h"
 #include "compute.h"
-#include "output.h"
 #include "dump.h"
-#include "math_extra.h"
 #include "error.h"
 #include "memory.h"
 
diff --git a/src/hashlittle.cpp b/src/hashlittle.cpp
index f612be9eeb..42109abd24 100644
--- a/src/hashlittle.cpp
+++ b/src/hashlittle.cpp
@@ -3,7 +3,7 @@
 // bob_jenkins@burtleburtle.net
 
 #include <cmath>
-#include <stddef.h>
+#include <cstddef>
 #include <stdint.h>
 
 // if the system defines the __BYTE_ORDER__ define,
diff --git a/src/lammps.cpp b/src/lammps.cpp
index 320d89ed52..83a2f057ee 100644
--- a/src/lammps.cpp
+++ b/src/lammps.cpp
@@ -12,6 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <mpi.h>
+#include <cmath>
 #include <cstring>
 #include <cstdlib>
 #include <cctype>