Some more forward declarations

plumed · Feb 20, 2018 · bf94a41 · bf94a41
1 parent e250529
commit bf94a41
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 9 deletions.
diff --git a/src/colvar/PathMSDBase.h b/src/colvar/PathMSDBase.h
@@ -27,7 +27,6 @@
 
 #include "tools/PDB.h"
 #include "tools/RMSD.h"
-#include "tools/Tools.h"
 
 namespace PLMD {
 namespace colvar {

diff --git a/src/core/Action.h b/src/core/Action.h
@@ -25,7 +25,6 @@
 #include <string>
 #include <set>
 #include "tools/Keywords.h"
-#include "Value.h"
 #include "tools/Tools.h"
 #include "tools/Log.h"
 
@@ -34,6 +33,7 @@ namespace PLMD {
 class PDB;
 class PlumedMain;
 class Communicator;
+class ActionWithValue;
 
 /// This class is used to bring the relevant information to the Action constructor.
 /// Only Action and ActionRegister class can access to its content, which is

diff --git a/src/core/MDAtoms.cpp b/src/core/MDAtoms.cpp
@@ -23,6 +23,7 @@
 #include "tools/Tools.h"
 #include "tools/OpenMP.h"
 #include "tools/Exception.h"
+#include "tools/Units.h"
 #include <algorithm>
 #include <string>
 

diff --git a/src/core/MDAtoms.h b/src/core/MDAtoms.h
@@ -28,10 +28,11 @@
 #include <vector>
 #include <set>
 #include <memory>
-#include "tools/Units.h"
 
 namespace PLMD {
 
+class Units;
+
 /**
 Class containing interface to MDAtomsTyped
 

diff --git a/src/function/FuncSumHills.cpp b/src/function/FuncSumHills.cpp
@@ -24,9 +24,11 @@
 #include "tools/Exception.h"
 #include "tools/Communicator.h"
 #include "tools/BiasRepresentation.h"
+#include "tools/KernelFunctions.h"
 #include "tools/File.h"
 #include "tools/Tools.h"
 #include "tools/Stopwatch.h"
+#include "tools/Grid.h"
 #include <iostream>
 #include <memory>
 

diff --git a/src/function/Function.cpp b/src/function/Function.cpp
@@ -21,6 +21,7 @@
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
 #include "Function.h"
 #include "tools/OpenMP.h"
+#include "tools/Communicator.h"
 
 using namespace std;
 namespace PLMD {

diff --git a/src/function/Function.h b/src/function/Function.h
@@ -24,7 +24,6 @@
 
 #include "core/ActionWithValue.h"
 #include "core/ActionWithArguments.h"
-#include "tools/Communicator.h"
 
 namespace PLMD {
 namespace function {

diff --git a/src/tools/BiasRepresentation.cpp b/src/tools/BiasRepresentation.cpp
@@ -23,6 +23,10 @@
 #include "core/Value.h"
 #include "Communicator.h"
 #include <iostream>
+#include "KernelFunctions.h"
+#include "File.h"
+#include "Grid.h"
+
 
 namespace PLMD {
 

diff --git a/src/tools/BiasRepresentation.h b/src/tools/BiasRepresentation.h
@@ -23,14 +23,18 @@
 #define __PLUMED_tools_BiasRepresentation_h
 
 #include "Exception.h"
-#include "KernelFunctions.h"
-#include "File.h"
-#include "Grid.h"
 #include <memory>
+#include <vector>
 
 namespace PLMD {
 
-//+PLUMEDOC INTERNAL biasrepresentation
+class Value;
+class Grid;
+class IFile;
+class KernelFunctions;
+class Communicator;
+
+//+PLUMEDOC INTERNAL biasrepresentation 
 /*
 
 */

diff --git a/src/tools/KernelFunctions.h b/src/tools/KernelFunctions.h
@@ -22,7 +22,6 @@
 #ifndef __PLUMED_tools_KernelFunctions_h
 #define __PLUMED_tools_KernelFunctions_h
 
-#include "Tools.h"
 #include "Matrix.h"
 #include "core/Value.h"
 #include <vector>