--- a/charconvfw/JPLangUtil/group/jplangutil.mmp	Fri Mar 12 15:51:09 2010 +0200
+++ b/charconvfw/JPLangUtil/group/jplangutil.mmp	Fri Mar 12 15:51:09 2010 +0200
@@ -45,4 +45,4 @@
 SOURCE          jplangutil.cpp
 
 LIBRARY         euser.lib
-DEFFILE         jplangutil.def
+DEFFILE         JPLANGUTIL.DEF

--- a/charconvfw/JPLangUtil/src/jplangutil.cpp	Fri Mar 12 15:51:09 2010 +0200
+++ b/charconvfw/JPLangUtil/src/jplangutil.cpp	Fri Mar 12 15:51:09 2010 +0200
@@ -19,8 +19,8 @@
 
 
 // INCLUDES FILES
-#include "JPLANGUTIL.H"
-#include "JPLANGUTIL.TABLES.H"
+#include "jplangutil.h"
+#include "jplangutil.tables.h"
 
 // LOCAL DEFINES
 

--- a/charconvfw/JPLangUtil/src/jplangutil.tables.h	Fri Mar 12 15:51:09 2010 +0200
+++ b/charconvfw/JPLangUtil/src/jplangutil.tables.h	Fri Mar 12 15:51:09 2010 +0200
@@ -22,7 +22,7 @@
 #define __JPLANGUTIL_TABLES_H__
 
 // INCLUDES
-#include <E32STD.H>
+#include <e32std.h>
 
 // CONSTANTS
 const TText KMiddleDotMap[] =      { 0xff65 , 0x30fb };

--- a/charconvfw/SortUtil/src/SortUtil.cpp	Fri Mar 12 15:51:09 2010 +0200
+++ b/charconvfw/SortUtil/src/SortUtil.cpp	Fri Mar 12 15:51:09 2010 +0200
@@ -25,7 +25,7 @@
 #include "SortUtil.h"
 
 #ifdef __WINS__     
-#include <FeatMgr.h>    
+#include <featmgr.h>    
 #endif
 
 // LOCAL CONSTANTS AND MACROS

--- a/charconvfw/SortUtil/src/SortUtilJapan.cpp	Fri Mar 12 15:51:09 2010 +0200
+++ b/charconvfw/SortUtil/src/SortUtilJapan.cpp	Fri Mar 12 15:51:09 2010 +0200
@@ -24,7 +24,7 @@
 #include "SortUtilJapan.h"
 #include "SortUtilImpl.h"
 #include "SortUtilImplExport.h"
-#include <JpLangUtil.h>
+#include <jplangutil.h>
 
 // Unnamed namespace for local definitions
 namespace

--- a/charconvfw/inlinetext/inc/InlineTextNoMatchesIndicatorSource.h	Fri Mar 12 15:51:09 2010 +0200
+++ b/charconvfw/inlinetext/inc/InlineTextNoMatchesIndicatorSource.h	Fri Mar 12 15:51:09 2010 +0200
@@ -22,12 +22,12 @@
 
 // INCLUDES
 
-#include "inlinetextbase.h"
+#include "InlineTextBase.h"
 #ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <tagma.h>
 #else
 #include <tagma.h>
-#include <tagmaLayoutAndSource.h>
+#include <tagmalayoutandsource.h>
 #endif
 
 // CONSTANTS

--- a/charconvfw/numbergrouping/Src/NumberGrouping.cpp	Fri Mar 12 15:51:09 2010 +0200
+++ b/charconvfw/numbergrouping/Src/NumberGrouping.cpp	Fri Mar 12 15:51:09 2010 +0200
@@ -20,7 +20,7 @@
 
 #include <barsread.h>
 #include <eikenv.h>
-#include <CentralRepository.h>
+#include <centralrepository.h>
 #include <NumberGroupingCRKeys.h>
 
 const TText KNumberGroupingWildcard('n');

--- a/fontservices/fontstore/group/tfontsessioncacheproc.mmp	Fri Mar 12 15:51:09 2010 +0200
+++ b/fontservices/fontstore/group/tfontsessioncacheproc.mmp	Fri Mar 12 15:51:09 2010 +0200
@@ -1,17 +1,20 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 
 
 TARGETTYPE EXE

--- a/fontservices/fontstore/tfs/T_fontsessioncache.cpp	Fri Mar 12 15:51:09 2010 +0200
+++ b/fontservices/fontstore/tfs/T_fontsessioncache.cpp	Fri Mar 12 15:51:09 2010 +0200
@@ -1,17 +1,19 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
+/*
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 
 /**
  @file

--- a/fontservices/fontstore/tfs/T_fontsessioncache.h	Fri Mar 12 15:51:09 2010 +0200
+++ b/fontservices/fontstore/tfs/T_fontsessioncache.h	Fri Mar 12 15:51:09 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description:
+* Description: 
 *
 */
 

--- a/fontservices/fontstore/tfs/T_fontsessioncacheproc.cpp	Fri Mar 12 15:51:09 2010 +0200
+++ b/fontservices/fontstore/tfs/T_fontsessioncacheproc.cpp	Fri Mar 12 15:51:09 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description:
+* Description: 
 *
 */
 

--- a/fontservices/fontstore/tfs/scripts/fntstoretest_T_FontSessionCache.script	Fri Mar 12 15:51:09 2010 +0200
+++ b/fontservices/fontstore/tfs/scripts/fntstoretest_T_FontSessionCache.script	Fri Mar 12 15:51:09 2010 +0200
@@ -1,7 +1,8 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+//
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -10,7 +11,7 @@
 //
 // Contributors:
 //
-// Description:
+// Description: 
 //