diff --git a/src/storm/storage/jani/Edge.cpp b/src/storm/storage/jani/Edge.cpp
index 36b51745e..27fd5e57a 100644
--- a/src/storm/storage/jani/Edge.cpp
+++ b/src/storm/storage/jani/Edge.cpp
@@ -5,6 +5,8 @@
 #include "storm/utility/macros.h"
 #include "storm/exceptions/InvalidArgumentException.h"
 
+#include "storm/storage/jani/TemplateEdge.h"
+
 namespace storm {
     namespace jani {
         
diff --git a/src/storm/storage/jani/Edge.h b/src/storm/storage/jani/Edge.h
index 928f54a78..62568afcb 100644
--- a/src/storm/storage/jani/Edge.h
+++ b/src/storm/storage/jani/Edge.h
@@ -3,14 +3,16 @@
 #include <memory>
 
 #include <boost/optional.hpp>
+#include <boost/container/flat_set.hpp>
 
-#include "storm/storage/jani/TemplateEdge.h"
 #include "storm/storage/jani/EdgeDestination.h"
 #include "storm/storage/jani/OrderedAssignments.h"
 
 namespace storm {
     namespace jani {
-        
+
+        class TemplateEdge;
+
         class Edge {
         public:
             Edge() = default;
diff --git a/src/storm/storage/jani/OrderedAssignments.cpp b/src/storm/storage/jani/OrderedAssignments.cpp
index 3e432dfc8..a77dcb035 100644
--- a/src/storm/storage/jani/OrderedAssignments.cpp
+++ b/src/storm/storage/jani/OrderedAssignments.cpp
@@ -2,6 +2,7 @@
 
 #include "storm/utility/macros.h"
 #include "storm/exceptions/InvalidArgumentException.h"
+#include "storm/storage/jani/VariableSet.h"
 
 namespace storm {
     namespace jani {