diff --git a/src/storage/jani/VariableSet.cpp b/src/storage/jani/VariableSet.cpp
index 97697e2f7..e3e183558 100644
--- a/src/storage/jani/VariableSet.cpp
+++ b/src/storage/jani/VariableSet.cpp
@@ -10,7 +10,7 @@ namespace storm {
         namespace detail {
             
             template<typename VariableType>
-            VariableType& Dereferencer<VariableType>::operator()(std::shared_ptr<VariableType> const& d) {
+            VariableType& Dereferencer<VariableType>::operator()(std::shared_ptr<VariableType> const& d) const {
                 return *d;
             }
             
@@ -150,4 +150,4 @@ namespace storm {
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/storage/jani/VariableSet.h b/src/storage/jani/VariableSet.h
index 058e56457..1ab0b758b 100644
--- a/src/storage/jani/VariableSet.h
+++ b/src/storage/jani/VariableSet.h
@@ -19,7 +19,7 @@ namespace storm {
             template<typename VariableType>
             class Dereferencer {
             public:
-                VariableType& operator()(std::shared_ptr<VariableType> const& d);
+                VariableType& operator()(std::shared_ptr<VariableType> const& d) const;
             };
             
             template<typename VariableType>
@@ -192,4 +192,4 @@ namespace storm {
         };
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storage/prism/HidingComposition.h b/src/storage/prism/HidingComposition.h
index 4de9e8eba..2edba85b1 100644
--- a/src/storage/prism/HidingComposition.h
+++ b/src/storage/prism/HidingComposition.h
@@ -3,6 +3,7 @@
 
 #include <set>
 #include <string>
+#include <memory>
 
 #include "src/storage/prism/Composition.h"
 
diff --git a/src/storage/prism/RenamingComposition.cpp b/src/storage/prism/RenamingComposition.cpp
index 9fe7d72e6..4fc918fb4 100644
--- a/src/storage/prism/RenamingComposition.cpp
+++ b/src/storage/prism/RenamingComposition.cpp
@@ -34,4 +34,4 @@ namespace storm {
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/storage/prism/RenamingComposition.h b/src/storage/prism/RenamingComposition.h
index 124889d3c..6bf31a5ea 100644
--- a/src/storage/prism/RenamingComposition.h
+++ b/src/storage/prism/RenamingComposition.h
@@ -1,6 +1,7 @@
 #ifndef STORM_STORAGE_PRISM_RENAMINGCOMPOSITION_H_
 #define STORM_STORAGE_PRISM_RENAMINGCOMPOSITION_H_
 
+#include <memory>
 #include <string>
 #include <map>
 #include <boost/optional.hpp>