Index: src/Common/ScopedMap.h
===================================================================
--- src/Common/ScopedMap.h	(revision 8f5571611e55362b66ba5af61560f8d5d9ea50cb)
+++ src/Common/ScopedMap.h	(revision 7ce70e2bb9fd3ca221c6984a10a1060acdf9cb7e)
@@ -199,7 +199,6 @@
 	friend class ScopedMap;
 	friend class const_iterator;
-	typedef typename ScopedMap::MapType::iterator wrapped_iterator;
-	typedef typename ScopedMap::ScopeList scope_list;
-	typedef typename scope_list::size_type size_type;
+	typedef typename MapType::iterator wrapped_iterator;
+	typedef typename ScopeList::size_type size_type;
 
 	/// Checks if this iterator points to a valid item
@@ -220,5 +219,5 @@
 	}
 
-	iterator(scope_list & _scopes, const wrapped_iterator & _it, size_type inLevel)
+	iterator(ScopeList & _scopes, const wrapped_iterator & _it, size_type inLevel)
 		: scopes(&_scopes), it(_it), level(inLevel) {}
 public:
@@ -266,5 +265,5 @@
 
 private:
-	scope_list *scopes;
+	ScopeList *scopes;
 	wrapped_iterator it;
 	size_type level;