..

Author: dweindl

include/amici/abstract_model.h

@@ -2,14 +2,18 @@
 #define AMICI_ABSTRACT_MODEL_H
 
 #include "amici/defines.h"
-#include "amici/splinefunctions.h"
-#include "amici/sundials_matrix_wrapper.h"
-#include "amici/vector.h"
+
+#include <gsl/gsl-lite.hpp>
+#include <sundials/sundials_matrix.h>
 
 #include <memory>
+#include <vector>
 
 namespace amici {
 class Solver;
+class HermiteSpline;
+class SUNMatrixWrapper;
+class AmiVector;
 
 /**
  * @brief Abstract base class of amici::Model defining functions that need to

include/amici/model.h

@@ -4,13 +4,11 @@
 #include "amici/abstract_model.h"
 #include "amici/defines.h"
 #include "amici/event.h"
-#include "amici/logging.h"
 #include "amici/model_dimensions.h"
 #include "amici/model_state.h"
 #include "amici/simulation_parameters.h"
 #include "amici/splinefunctions.h"
 #include "amici/sundials_matrix_wrapper.h"
-#include "amici/vector.h"
 
 #include <map>
 #include <vector>
@@ -20,6 +18,9 @@ namespace amici {
 class ExpData;
 class Model;
 class Solver;
+class Logger;
+class AmiVector;
+class AmiVectorArray;
 
 } // namespace amici
 

src/abstract_model.cpp

@@ -1,4 +1,6 @@
 #include "amici/abstract_model.h"
+#include "amici/exception.h"
+#include "amici/splinefunctions.h"
 
 namespace amici {