--- a/graphicscomposition/openwfsupport/inc/symbianstream.h	Thu May 27 14:13:51 2010 +0300
+++ b/graphicscomposition/openwfsupport/inc/symbianstream.h	Fri Jun 11 14:58:47 2010 +0300
@@ -26,7 +26,6 @@
 typedef struct struct_TSurfaceId TSurfaceId;
 #endif
 #include <KHR/khrplatform.h>
-#include <pixelformats.h>
 typedef khronos_int32_t khronos_bool;
 typedef khronos_int32_t TErrCode;
 
@@ -89,7 +88,7 @@
 typedef khronos_int32_t	MultipleSymbianStreamEventBits;
 typedef khronos_int32_t	SymNativeStreamEvent;
 typedef khronos_int32_t SymbianStreamBuffer;
-typedef TUidPixelFormat	SymOwfPixelFormat;
+typedef khronos_int32_t	SymOwfPixelFormat;
 typedef	khronos_int32_t SymOwfBool;
 
 typedef enum
@@ -388,7 +387,7 @@
 @panic NativeStream 1000002 Null return value pointer
 @panic NativeStream 1000003 Null Native Stream
 **/
-  IMPORT_C void SymbianStreamGetHeader( SymbianStreamType aStream, khronos_int32_t* aWidth, khronos_int32_t* aHeight, khronos_int32_t* aStride, TUidPixelFormat* aFormat, khronos_int32_t* aPixelSize);
+  IMPORT_C void SymbianStreamGetHeader( SymbianStreamType aStream, khronos_int32_t* aWidth, khronos_int32_t* aHeight, khronos_int32_t* aStride, khronos_int32_t* aFormat, khronos_int32_t* aPixelSize);
 
 /** Returns extra details of the format of the image data stored in the Native Stream.
  This method is intended to allow compositors to access the SurfaceManager hints associated with the