diff --git a/src/storage/StateBlock.cpp b/src/storage/StateBlock.cpp
index 9f87d324d..fb4f21133 100644
--- a/src/storage/StateBlock.cpp
+++ b/src/storage/StateBlock.cpp
@@ -2,19 +2,19 @@
 
 namespace storm {
     namespace storage {
-        typename StateBlock::iterator StateBlock::begin() {
+        StateBlock::iterator StateBlock::begin() {
             return states.begin();
         }
         
-        typename StateBlock::const_iterator StateBlock::begin() const {
+        StateBlock::const_iterator StateBlock::begin() const {
             return states.begin();
         }
         
-        typename StateBlock::iterator StateBlock::end() {
+        StateBlock::iterator StateBlock::end() {
             return states.end();
         }
         
-        typename StateBlock::const_iterator StateBlock::end() const {
+        StateBlock::const_iterator StateBlock::end() const {
             return states.end();
         }
         
diff --git a/src/storage/StateBlock.h b/src/storage/StateBlock.h
index ad80fd62e..dcd516277 100644
--- a/src/storage/StateBlock.h
+++ b/src/storage/StateBlock.h
@@ -17,16 +17,16 @@ namespace storm {
         class StateBlock {
         public:
             typedef FlatSetStateContainer container_type;
-            typedef typename container_type::value_type value_type;
+            typedef container_type::value_type value_type;
             static_assert(std::is_same<value_type, sparse::state_type>::value, "Illegal value type of container.");
-            typedef typename container_type::iterator iterator;
-            typedef typename container_type::const_iterator const_iterator;
+            typedef container_type::iterator iterator;
+            typedef container_type::const_iterator const_iterator;
             
             // Default constructors.
             StateBlock() = default;
-            StateBlock(StateBlock const& other) = default;
-            StateBlock(StateBlock&& other) = default;
+			StateBlock(StateBlock const& other) = default;
 #ifndef WINDOWS
+            StateBlock(StateBlock&& other) = default;
             StateBlock& operator=(StateBlock const& other) = default;
             StateBlock& operator=(StateBlock&& other) = default;
 #endif
diff --git a/src/storage/StronglyConnectedComponent.h b/src/storage/StronglyConnectedComponent.h
index 10915d940..1a81742c9 100644
--- a/src/storage/StronglyConnectedComponent.h
+++ b/src/storage/StronglyConnectedComponent.h
@@ -15,9 +15,9 @@ namespace storm {
         class StronglyConnectedComponent : public StateBlock {
         public:
             StronglyConnectedComponent() = default;
-            StronglyConnectedComponent(StronglyConnectedComponent const& other) = default;
-            StronglyConnectedComponent(StronglyConnectedComponent&& other) = default;
+			StronglyConnectedComponent(StronglyConnectedComponent const& other) = default;
 #ifndef WINDOWS
+            StronglyConnectedComponent(StronglyConnectedComponent&& other) = default;
             StronglyConnectedComponent& operator=(StronglyConnectedComponent const& other) = default;
             StronglyConnectedComponent& operator=(StronglyConnectedComponent&& other) = default;
 #endif