some more include file consistency changes

src/atom_vec_body.cpp

@@ -11,17 +11,16 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <cmath>
 #include <cstdlib>
 #include <cstring>
 #include "atom_vec_body.h"
+#include "my_pool_chunk.h"
 #include "style_body.h"
 #include "body.h"
 #include "atom.h"
 #include "comm.h"
 #include "domain.h"
 #include "modify.h"
-#include "force.h"
 #include "fix.h"
 #include "memory.h"
 #include "error.h"

src/atom_vec_body.h

@@ -21,7 +21,6 @@ AtomStyle(body,AtomVecBody)
 #define LMP_ATOM_VEC_BODY_H
 
 #include "atom_vec.h"
-#include "my_pool_chunk.h"
 
 namespace LAMMPS_NS {
 

src/atom_vec_ellipsoid.cpp

@@ -16,11 +16,11 @@
 ------------------------------------------------------------------------- */
 
 #include <cstdlib>
+#include <cstring>
 #include "atom_vec_ellipsoid.h"
 #include "math_extra.h"
 #include "atom.h"
 #include "comm.h"
-#include "force.h"
 #include "domain.h"
 #include "modify.h"
 #include "fix.h"

src/atom_vec_line.cpp

@@ -19,7 +19,6 @@
 #include "comm.h"
 #include "domain.h"
 #include "modify.h"
-#include "force.h"
 #include "fix.h"
 #include "math_const.h"
 #include "memory.h"

src/atom_vec_sphere.cpp

@@ -11,7 +11,6 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <cmath>
 #include <cstdlib>
 #include <cstring>
 #include "atom_vec_sphere.h"
@@ -19,7 +18,6 @@
 #include "comm.h"
 #include "domain.h"
 #include "modify.h"
-#include "force.h"
 #include "fix.h"
 #include "fix_adapt.h"
 #include "math_const.h"

src/atom_vec_tri.cpp

@@ -20,7 +20,6 @@
 #include "comm.h"
 #include "domain.h"
 #include "modify.h"
-#include "force.h"
 #include "fix.h"
 #include "math_const.h"
 #include "memory.h"

src/balance.cpp

@@ -20,7 +20,6 @@
 
 #include <mpi.h>
 #include <cmath>
-#include <cstdlib>
 #include <cstring>
 #include "balance.h"
 #include "atom.h"
@@ -30,7 +29,6 @@
 #include "domain.h"
 #include "force.h"
 #include "update.h"
-#include "group.h"
 #include "modify.h"
 #include "fix_store.h"
 #include "imbalance.h"
@@ -39,7 +37,6 @@
 #include "imbalance_neigh.h"
 #include "imbalance_store.h"
 #include "imbalance_var.h"
-#include "timer.h"
 #include "memory.h"
 #include "error.h"
 

src/balance.h

@@ -20,7 +20,6 @@ CommandStyle(balance,Balance)
 #ifndef LMP_BALANCE_H
 #define LMP_BALANCE_H
 
-#include <cstdio>
 #include "pointers.h"
 
 namespace LAMMPS_NS {

src/body.cpp

@@ -11,11 +11,8 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <cmath>
-#include <cstdlib>
 #include <cstring>
 #include "body.h"
-#include "error.h"
 
 using namespace LAMMPS_NS;
 

src/body.h

@@ -16,7 +16,6 @@
 
 #include "pointers.h"
 #include "atom_vec_body.h"
-#include "my_pool_chunk.h"
 
 namespace LAMMPS_NS {
 

src/bond.cpp

@@ -11,7 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <cstring>
+#include <mpi.h>
 #include "bond.h"
 #include "atom.h"
 #include "comm.h"

src/bond_hybrid.cpp

@@ -11,13 +11,13 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <cmath>
+#include <mpi.h>
+#include <cstdio>
 #include <cstring>
 #include <cctype>
 #include "bond_hybrid.h"
 #include "atom.h"
 #include "neighbor.h"
-#include "domain.h"
 #include "comm.h"
 #include "force.h"
 #include "memory.h"

src/pointers.h

@@ -39,6 +39,11 @@ namespace LAMMPS_NS {
 
 enum ExecutionSpace{Host,Device};
 
+// global forward declarations
+
+template <class T> class MyPoolChunk;
+template <class T> class MyPage;
+
 class Pointers {
  public:
   Pointers(LAMMPS *ptr) :