--- a/graphicscomposition/openwfsupport/inc/streammap.h	Wed Jun 16 12:37:57 2010 +0100
+++ b/graphicscomposition/openwfsupport/inc/streammap.h	Thu Jul 22 16:46:06 2010 +0100
@@ -21,14 +21,12 @@
 #include <e32base.h>
 #include <e32std.h>			//for RFastLock
 #include <e32hashtab.h>		//for RHashMap
-#include <graphics/surfacemanager.h>
-
-#include <graphics/updateserverprovider.h>
 
 class CSurfaceStream;
 class TSurfaceId;
 class MSurfaceUpdateServerProvider;
 class CExtensionContainer;
+class RSurfaceManager;
 
 NONSHARABLE_CLASS(COpenWfcStreamMap): public CBase
 	{
@@ -198,7 +196,7 @@
 		/**
 		 * Surface manager
 		 */
-		RSurfaceManager iSurfaceManager;
+		RSurfaceManager* iSurfaceManager;
 
 		RHeap *iMainHeap; //< --This points to main thread's heap--