diff --git a/src/abstraction/AbstractionDdInformation.cpp b/src/abstraction/AbstractionDdInformation.cpp
index 598443df6..1014117a0 100644
--- a/src/abstraction/AbstractionDdInformation.cpp
+++ b/src/abstraction/AbstractionDdInformation.cpp
@@ -3,7 +3,6 @@
 #include <sstream>
 
 #include "src/storage/expressions/ExpressionManager.h"
-#include "src/storage/expressions/Expression.h"
 
 #include "src/storage/dd/DdManager.h"
 #include "src/storage/dd/Bdd.h"
diff --git a/src/abstraction/AbstractionDdInformation.h b/src/abstraction/AbstractionDdInformation.h
index 0c6301936..0f9961bbd 100644
--- a/src/abstraction/AbstractionDdInformation.h
+++ b/src/abstraction/AbstractionDdInformation.h
@@ -5,8 +5,10 @@
 #include <set>
 #include <map>
 #include <unordered_map>
+#include <cstdint>
 
 #include "src/storage/dd/DdType.h"
+#include "src/storage/expressions/Expression.h"
 #include "src/storage/expressions/Variable.h"
 
 namespace storm {
@@ -17,11 +19,7 @@ namespace storm {
         template <storm::dd::DdType DdType>
         class Bdd;
     }
-    
-    namespace expressions {
-        class Expression;
-    }
-    
+
     namespace abstraction {
         
         template <storm::dd::DdType DdType, typename ValueType>
diff --git a/src/abstraction/AbstractionExpressionInformation.cpp b/src/abstraction/AbstractionExpressionInformation.cpp
index f3ef47074..8a0ddd6f9 100644
--- a/src/abstraction/AbstractionExpressionInformation.cpp
+++ b/src/abstraction/AbstractionExpressionInformation.cpp
@@ -61,4 +61,4 @@ namespace storm {
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/abstraction/AbstractionExpressionInformation.h b/src/abstraction/AbstractionExpressionInformation.h
index 97c3ec54e..f26958b2f 100644
--- a/src/abstraction/AbstractionExpressionInformation.h
+++ b/src/abstraction/AbstractionExpressionInformation.h
@@ -2,6 +2,7 @@
 
 #include <vector>
 #include <set>
+#include <cstdint>
 
 namespace storm {
     namespace expressions {
diff --git a/src/abstraction/AbstractionInformation.cpp b/src/abstraction/AbstractionInformation.cpp
index 071f9150e..2a3aafe3a 100644
--- a/src/abstraction/AbstractionInformation.cpp
+++ b/src/abstraction/AbstractionInformation.cpp
@@ -1,5 +1,8 @@
 #include "src/abstraction/AbstractionInformation.h"
 
+#include "src/storage/expressions/Expression.h"
+#include "src/storage/expressions/ExpressionManager.h"
+
 namespace storm {
     namespace abstraction {
 
@@ -74,4 +77,4 @@ namespace storm {
         template class AbstractionInformation<storm::dd::DdType::CUDD, double>;
         template class AbstractionInformation<storm::dd::DdType::Sylvan, double>;
     }
-}
\ No newline at end of file
+}
diff --git a/src/abstraction/AbstractionInformation.h b/src/abstraction/AbstractionInformation.h
index 6af6e7e17..3035853f1 100644
--- a/src/abstraction/AbstractionInformation.h
+++ b/src/abstraction/AbstractionInformation.h
@@ -2,6 +2,7 @@
 
 #include <vector>
 #include <set>
+#include <cstdint>
 
 #include "src/storage/dd/DdType.h"