--- a/brandingserver/BSClient/cbsaccess.cpp	Wed May 05 00:59:14 2010 +0530
+++ b/brandingserver/BSClient/cbsaccess.cpp	Fri May 28 18:27:27 2010 +0530
@@ -20,8 +20,8 @@
 //  INCLUDE FILES
 
 #include <e32base.h>
-#include <aknsskininstance.h>	// skins 
-#include <aknsutils.h>
+#include <AknsSkinInstance.h>	// skins 
+#include <AknsUtils.h>
 #include <coemain.h>
 
 #include "cbsaccess.h"

--- a/brandingserver/BSClient/cbsiconfileprovider.cpp	Wed May 05 00:59:14 2010 +0530
+++ b/brandingserver/BSClient/cbsiconfileprovider.cpp	Fri May 28 18:27:27 2010 +0530
@@ -20,7 +20,7 @@
 // INCLUDE FILES
 #include    "cbsiconfileprovider.h"
 #include	<aknappui.h>
-#include    <akniconutils.h>
+#include    <AknIconUtils.h>
 
 // ============================ MEMBER FUNCTIONS ===============================
 

--- a/brandingserver/BSClient/cbsiconfileprovider.h	Wed May 05 00:59:14 2010 +0530
+++ b/brandingserver/BSClient/cbsiconfileprovider.h	Fri May 28 18:27:27 2010 +0530
@@ -23,8 +23,8 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include <aknsitemid.h>
-#include <akniconutils.h>
+#include <AknsItemID.h>
+#include <AknIconUtils.h>
 
 
 // FORWARD DECLARATIONS

--- a/brandingserver/tools/bsimport/src/cbsimportxmlparser.cpp	Wed May 05 00:59:14 2010 +0530
+++ b/brandingserver/tools/bsimport/src/cbsimportxmlparser.cpp	Fri May 28 18:27:27 2010 +0530
@@ -21,7 +21,7 @@
 #include <gmxmlelement.h>
 #include <gmxmltext.h>
 #include <utf.h>
-#include <aknutils.h>
+#include <AknUtils.h>
 #include <bselementfactory.h>
 #include <cbsbitmap.h>