--- a/egl/eglinterface/include/khrplatform.h	Tue Jun 15 18:03:59 2010 +0100
+++ b/egl/eglinterface/include/khrplatform.h	Wed Jun 16 12:37:57 2010 +0100
@@ -95,30 +95,10 @@
 #define __KHR_EXPORTS
 #endif
 
-#if defined(_WIN32) || defined(__VC32__) || defined(__MWERKS__) || defined(__CW32__)         /* Win32 */
-#   ifdef __KHR_EXPORTS
-#       define KHRONOS_APICALL __declspec(dllexport)
-#   else
-#       define KHRONOS_APICALL __declspec(dllexport)
-#   endif
+#ifdef __KHR_EXPORTS
+#define KHRONOS_APICALL  EXPORT_C
 #else
-#   if defined (__ARMCC_VERSION)
-#       if (__ARMCC_VERSION <= 310000) || (__ARMCC_VERSION >= 400000)
-#          ifdef __KHR_EXPORTS
-#            define KHRONOS_APICALL __declspec(dllexport)
-#          else
-#            define KHRONOS_APICALL __declspec(dllimport)
-#          endif
-#       else
-#         define KHRONOS_APICALL __declspec(dllimport)
-#       endif
-#   else
-#       ifdef __KHR_EXPORTS
-#           define KHRONOS_APICALL
-#       else
-#           define KHRONOS_APICALL extern
-#       endif
-#   endif
+#define KHRONOS_APICALL  IMPORT_C
 #endif
 
 #define KHRONOS_APIENTRY

--- a/graphicscomposition/openwfsupport/inc/streammap.h	Tue Jun 15 18:03:59 2010 +0100
+++ b/graphicscomposition/openwfsupport/inc/streammap.h	Wed Jun 16 12:37:57 2010 +0100
@@ -177,7 +177,7 @@
 		*/
 		static TUint32 HashFunction(const TSurfaceId& aHashKey);
 		
-		static TInt COpenWfcStreamMap::DeleteSingleton(TAny* aData);
+		static TInt DeleteSingleton(TAny* aData);
 	private:
 		/**
 		 * Mutex used for controlling the access to the native streams map

--- a/graphicsdeviceinterface/directgdi/inc/directgdicontext.h	Tue Jun 15 18:03:59 2010 +0100
+++ b/graphicsdeviceinterface/directgdi/inc/directgdicontext.h	Wed Jun 16 12:37:57 2010 +0100
@@ -155,7 +155,7 @@
 	IMPORT_C TInt GetInterface(TUid aInterfaceId, TAny*& aInterface);
 	
 private:
-	CDirectGdiContext(CDirectGdiDriver& aDirectGdiDriver);
+	IMPORT_C CDirectGdiContext(CDirectGdiDriver& aDirectGdiDriver);
 	void ConstructL();
 	void CleanUpBrushPattern();
 	void DrawText(const TDesC& aText, const DirectGdi::TTextParameters* aParam, const TPoint& aPosition, DirectGdi::TTextAlign aAlignment, 

--- a/windowing/windowserver/inc/W32STDGRAPHIC.H	Tue Jun 15 18:03:59 2010 +0100
+++ b/windowing/windowserver/inc/W32STDGRAPHIC.H	Wed Jun 16 12:37:57 2010 +0100
@@ -80,8 +80,8 @@
 	IMPORT_C TInt UnShare(TSecureId aClientId);
 private:
 	CWsGraphicBitmap();
-	void HandleMessage(const TDesC8& aData);
-	void OnReplace();
+	IMPORT_C void HandleMessage(const TDesC8& aData);
+	IMPORT_C void OnReplace();
 };
 
 NONSHARABLE_CLASS(CWsGraphicBitmapAnimation): public CWsGraphic