Index: common/list.h
===================================================================
--- common/list.h	(revision 39046)
+++ common/list.h	(working copy)
@@ -29,6 +29,8 @@
 
 namespace Common {
 
+	template<class t_T2>
+	class Iterator;
 /**
  * Simple double linked list, modeled after the list template of the standard
  * C++ library.
@@ -54,7 +56,7 @@
 
 	template<class t_T2>
 	class Iterator {
-		template<class T> friend class Iterator;
+		template<class T> friend class Common::Iterator;
 		friend class List<t_T>;
 		NodeBase *_node;
 
Index: common/hashmap.h
===================================================================
--- common/hashmap.h	(revision 39046)
+++ common/hashmap.h	(working copy)
@@ -41,6 +41,8 @@
 
 namespace Common {
 
+template<class T> class IteratorImpl;
+
 // Enable the following #define if you want to check how many collisions the
 // code produces (many collisions indicate either a bad hash function, or a
 // hash table that is too small).
@@ -128,7 +130,7 @@
 	template<class NodeType>
 	class IteratorImpl {
 		friend class HashMap;
-		template<class T> friend class IteratorImpl;
+		template<class T> friend class Common::IteratorImpl;
 	protected:
 		typedef const HashMap hashmap_t;
 
Index: engines/groovie/graphics.cpp
===================================================================
--- engines/groovie/graphics.cpp	(revision 39046)
+++ engines/groovie/graphics.cpp	(working copy)
@@ -60,8 +60,8 @@
 			_fading = 0;
 
 			// Clear the buffer when ending the fade out
-			if (_fading == 2)
-				_foreground.fillRect(Common::Rect::Rect(640, 320), 0);
+			if (_fading == 2) 
+				_foreground.fillRect(Common::Rect(640, 320), 0);
 		}
 	}