From fdb2748fbb3f8ed7306bc32fb71b3ebb0243899a Mon Sep 17 00:00:00 2001
From: Daniel Queteschiner <daniel.queteschiner@jku.at>
Date: Wed, 23 Oct 2019 12:52:13 +0200
Subject: [PATCH] clean up header file includes

* include only necessary files
* whenever possible, include headers in .C file not in .H file
---
 .../dataExchangeModel/twoWayMPI/twoWayMPI.C   | 12 +++++---
 .../dataExchangeModel/twoWayMPI/twoWayMPI.H   | 20 +++----------
 .../twoWayOne2One/twoWayOne2One.C             | 14 +++++++---
 .../twoWayOne2One/twoWayOne2One.H             | 28 +++++--------------
 4 files changed, 29 insertions(+), 45 deletions(-)

diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C
index eda5f290..c2ba97c6 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C
@@ -29,13 +29,17 @@ Description
     and OpenFOAM(R). Note: this code is not part of OpenFOAM(R) (see DISCLAIMER).
 \*---------------------------------------------------------------------------*/
 
-#include "error.H"
 #include "twoWayMPI.H"
 #include "addToRunTimeSelectionTable.H"
+#include "OFstream.H"
 #include "clockModel.H"
-#include "pair.h"
-#include "force.h"
-#include "forceModel.H"
+#include "liggghtsCommandModel.H"
+
+//LAMMPS/LIGGGHTS
+#include <input.h>
+#include <library_cfd_coupling.h>
+#include <update.h>
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H
index dd0079e9..9bd66fd5 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H
@@ -41,27 +41,15 @@ SourceFiles
 #ifndef twoWayMPI_H
 #define twoWayMPI_H
 
+#include <mpi.h>
+
 #include "dataExchangeModel.H"
-#include "liggghtsCommandModel.H"
-#include "OFstream.H"
-#include <sys/stat.h>
-#include "pair.h"
-#include "force.h"
-#include "forceModel.H"
 
 //=================================//
 //LAMMPS/LIGGGHTS
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <mpi.h>
 #include <lammps.h>         // these are LAMMPS include files
-#include <input.h>
-#include <atom.h>
-#include <library.h>
-#include <error.h>
-#include <library_cfd_coupling.h>
-#include <update.h>
+#include <pair.h>
+#include <force.h>
 //=================================//
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C
index 93745838..5420e16a 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C
@@ -33,13 +33,19 @@ Contributing authors
 
 \*---------------------------------------------------------------------------*/
 
-
 #include "twoWayOne2One.H"
 #include "addToRunTimeSelectionTable.H"
+#include "OFstream.H"
 #include "clockModel.H"
-#include "pair.h"
-#include "force.h"
-#include "forceModel.H"
+#include "liggghtsCommandModel.H"
+
+//LAMMPS/LIGGGHTS
+#include <atom.h>
+#include <input.h>
+#include <library.h>
+#include <library_cfd_coupling.h>
+#include <memory.h>
+#include <update.h>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.H b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.H
index ce6ff8b0..9f436b50 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.H
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.H
@@ -45,33 +45,19 @@ Contributing authors
 #ifndef twoWayOne2One_H
 #define twoWayOne2One_H
 
+#include <mpi.h>
+
 #include "dataExchangeModel.H"
-#include "liggghtsCommandModel.H"
-#include "OFstream.H"
-#include <sys/stat.h>
-#include "pair.h"
-#include "force.h"
-#include "forceModel.H"
 #include "one2one.H"
 
-#include "meshSearch.H"
+#include <treeBoundBox.H>
 
 //=================================//
 //LAMMPS/LIGGGHTS
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <mpi.h>
-#include <lammps.h>         // these are LAMMPS include files
-#include <input.h>
-#include <atom.h>
-#include <memory.h>
-#include <library.h>
-#include <library_cfd_coupling.h>
-#include <update.h>
-#include <comm.h>
-#include <fix.h>
-#include <fix_property_atom.h>
+#include <lammps.h>          // these are LAMMPS include files
+#include <pair.h>
+#include <force.h>
+#include <fix_property_atom.h> /// needed
 //=================================//
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //