--- a/uiaccelerator_plat/alf_client_server_api/inc/alf/alfappui.h	Sun Mar 14 13:12:23 2010 +0000
+++ b/uiaccelerator_plat/alf_client_server_api/inc/alf/alfappui.h	Sun Mar 28 16:38:10 2010 +0100
@@ -102,7 +102,7 @@
 
     void RemoveTvDisplayOnSharedWindow( CHuiDisplay& aDisplay );
     
-    CHuiDisplay* CAlfAppUi::FindTvDisplayOnSharedWindow();
+    CHuiDisplay* FindTvDisplayOnSharedWindow();
     
     CAlfSrvSettingsHandler& SettingsHandler();
     

--- a/uiaccelerator_plat/alf_core_toolkit_api/inc/uiacceltk/HuiEnv.h	Sun Mar 14 13:12:23 2010 +0000
+++ b/uiaccelerator_plat/alf_core_toolkit_api/inc/uiacceltk/HuiEnv.h	Sun Mar 28 16:38:10 2010 +0100
@@ -560,7 +560,7 @@
      *
      * @param aIndex  Index of the display array.     
      */
-    IMPORT_C CHuiDisplay& CHuiEnv::Display(TInt aIndex) const;
+    IMPORT_C CHuiDisplay& Display(TInt aIndex) const;
 
     /**
      * Notifies everyone of a change in the environment's skin. Called by the

--- a/uiaccelerator_plat/alf_core_toolkit_api/inc/uiacceltk/HuiFont.h	Sun Mar 14 13:12:23 2010 +0000
+++ b/uiaccelerator_plat/alf_core_toolkit_api/inc/uiacceltk/HuiFont.h	Sun Mar 28 16:38:10 2010 +0100
@@ -201,7 +201,7 @@
     * @param aOrder Whether the text provided is in visual or logical order
     * @return       width of the text in pixels.
     */
-    TInt THuiFont::MeasureBidiTextBoundsWidth(const CFont& aFont,
+    TInt MeasureBidiTextBoundsWidth(const CFont& aFont,
                                           const TDesC& aText,
                                           CFont::TMeasureTextInput::TFlags aOrder) const;
 

--- a/uiaccelerator_plat/alf_core_toolkit_api/inc/uiacceltk/HuiGridLayout.h	Sun Mar 14 13:12:23 2010 +0000
+++ b/uiaccelerator_plat/alf_core_toolkit_api/inc/uiacceltk/HuiGridLayout.h	Sun Mar 28 16:38:10 2010 +0100
@@ -471,7 +471,7 @@
      * @param aInnerPadPos the calculated position if inner padding is applied
      * @param aOuterPadPos the calculated position if outer padding is applied
      */
-    TReal32 CHuiGridLayout::ProportionalInnerOuterPadding(  
+    TReal32 ProportionalInnerOuterPadding(  
         THuiGridDimension aDim,
         TReal32 aInnerPadPos,
         TReal32 aOuterPadPos) const;

--- a/uiaccelerator_plat/alf_visual_api/inc/alf/alfevent.h	Sun Mar 14 13:12:23 2010 +0000
+++ b/uiaccelerator_plat/alf_visual_api/inc/alf/alfevent.h	Sun Mar 28 16:38:10 2010 +0100
@@ -177,7 +177,7 @@
      *
      * @return EFalse iff the event is not a scroller event
      */     
-    IMPORT_C TBool TAlfEvent::IsScrollerEvent() const;
+    IMPORT_C TBool IsScrollerEvent() const;
 
     /**
      * Access an ALF scroller event object. 

--- a/uiaccelerator_plat/alf_visual_api/inc/alf/alfvisual.h	Sun Mar 14 13:12:23 2010 +0000
+++ b/uiaccelerator_plat/alf_visual_api/inc/alf/alfvisual.h	Sun Mar 28 16:38:10 2010 +0100
@@ -921,8 +921,8 @@
      * @return Drop shadow handler. NULL if drop shadow is disabled.
      */
     IMPORT_C CAlfDropShadow* DropShadowHandler() const;
-    IMPORT_C void CAlfVisual::SetEffectL( const TDesC& aEffectFile );
-    IMPORT_C void CAlfVisual::SetGroupEffectL( const TDesC& aEffectFile, TInt aGroupHandle );
+    IMPORT_C void SetEffectL( const TDesC& aEffectFile );
+    IMPORT_C void SetGroupEffectL( const TDesC& aEffectFile, TInt aGroupHandle );
 
 protected:
 

--- a/uiacceltk/hitchcock/ServerCore/Inc/alfsrvtranseffect.h	Sun Mar 14 13:12:23 2010 +0000
+++ b/uiacceltk/hitchcock/ServerCore/Inc/alfsrvtranseffect.h	Sun Mar 28 16:38:10 2010 +0100
@@ -53,7 +53,7 @@
      *
      * @return Effect system boolean state.
      */
-    TBool CAlfSrvTransEffect::IsEnabled();
+    TBool IsEnabled();
     
     /**
      * Starts a new phase in the effect.