diff --git a/src/adapters/AddExpressionAdapter.h b/src/adapters/AddExpressionAdapter.h
index 9e74fd49d..ad82146f3 100644
--- a/src/adapters/AddExpressionAdapter.h
+++ b/src/adapters/AddExpressionAdapter.h
@@ -3,7 +3,7 @@
 
 #include "src/storage/expressions/Variable.h"
 #include "src/storage/expressions/Expressions.h"
-#include "storage/expressions/ExpressionVisitor.h"
+#include "src/storage/expressions/ExpressionVisitor.h"
 
 #include "src/storage/dd/Add.h"
 #include "src/storage/dd/Bdd.h"
diff --git a/src/builder/ExplicitPrismModelBuilder.h b/src/builder/ExplicitPrismModelBuilder.h
index ccb0622e7..e2ccf8dc8 100644
--- a/src/builder/ExplicitPrismModelBuilder.h
+++ b/src/builder/ExplicitPrismModelBuilder.h
@@ -9,6 +9,7 @@
 #include <boost/functional/hash.hpp>
 #include <boost/container/flat_set.hpp>
 #include <boost/container/flat_map.hpp>
+#include <boost/variant.hpp>
 #include <src/models/sparse/StandardRewardModel.h>
 
 #include "src/storage/prism/Program.h"
diff --git a/src/exceptions/BaseException.h b/src/exceptions/BaseException.h
index cfb97580d..9b7cabd5f 100644
--- a/src/exceptions/BaseException.h
+++ b/src/exceptions/BaseException.h
@@ -4,7 +4,7 @@
 #include <exception>
 #include <sstream>
 
-#include "utility/OsDetection.h"
+#include "src/utility/OsDetection.h"
 
 namespace storm {
     namespace exceptions {
diff --git a/src/storage/bisimulation/BisimulationDecomposition.h b/src/storage/bisimulation/BisimulationDecomposition.h
index 420d528c9..c8cb5da0d 100644
--- a/src/storage/bisimulation/BisimulationDecomposition.h
+++ b/src/storage/bisimulation/BisimulationDecomposition.h
@@ -9,6 +9,7 @@
 #include "src/storage/Decomposition.h"
 #include "src/storage/StateBlock.h"
 #include "src/storage/bisimulation/Partition.h"
+#include "src/solver/OptimizationDirection.h"
 
 #include "src/logic/Formulas.h"
 
diff --git a/src/utility/graph.h b/src/utility/graph.h
index 913a8aaab..9143dfbda 100644
--- a/src/utility/graph.h
+++ b/src/utility/graph.h
@@ -4,7 +4,7 @@
 #include <set>
 #include <limits>
 
-#include "utility/OsDetection.h"
+#include "src/utility/OsDetection.h"
 
 #include "src/storage/sparse/StateType.h"
 #include "src/storage/PartialScheduler.h"
diff --git a/src/utility/storm.h b/src/utility/storm.h
index d4a042bc6..09a72acb2 100644
--- a/src/utility/storm.h
+++ b/src/utility/storm.h
@@ -73,6 +73,9 @@
 #include "src/exceptions/InvalidTypeException.h"
 #include "src/exceptions/NotImplementedException.h"
 
+// Notice: The implementation for the template functions must stay in the header.
+// Otherwise the linker complains.
+
 namespace storm {
 
     template<typename ValueType>