--- a/kerneltest/f32test/bench/t_fsrdirload.cpp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/bench/t_fsrdirload.cpp	Sun Jul 18 10:20:49 2010 +0100
@@ -18,7 +18,7 @@
 #include <f32file.h>
 #include <e32test.h>
 #include "t_select.h"
-#include "..\server\t_server.h"
+#include "../server/t_server.h"
 #include "t_benchmain.h"
 
 

--- a/kerneltest/f32test/bench/t_fsrdirscan.cpp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/bench/t_fsrdirscan.cpp	Sun Jul 18 10:20:49 2010 +0100
@@ -18,7 +18,7 @@
 #include <f32file.h>
 #include <e32test.h>
 #include "t_select.h"
-#include "..\server\t_server.h"
+#include "../server/t_server.h"
 #include "t_benchmain.h"
 
 GLDEF_D RTest test(_L("File Server Benchmarks, DirScan"));

--- a/kerneltest/f32test/bench/t_fsropen.cpp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/bench/t_fsropen.cpp	Sun Jul 18 10:20:49 2010 +0100
@@ -18,7 +18,7 @@
 #include <f32file.h>
 #include <e32test.h>
 #include "t_select.h"
-#include "..\server\t_server.h"
+#include "../server/t_server.h"
 #include "t_benchmain.h"
 
 GLDEF_D RTest test(_L("File Server Benchmarks, Open File"));

--- a/kerneltest/f32test/group/t_bigfile.mmp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/group/t_bigfile.mmp	Sun Jul 18 10:20:49 2010 +0100
@@ -22,7 +22,7 @@
 SOURCE         T_MAIN.CPP
 SOURCEPATH     ../fileutils/src
 SOURCE         t_chlffs.cpp 
-LIBRARY        EUSER.LIB EFSRV.LIB HAL.LIB
+LIBRARY        euser.lib efsrv.lib hal.lib
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 USERINCLUDE    ../server
 USERINCLUDE    ../fileutils/inc

--- a/kerneltest/f32test/group/t_cfileman.mmp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/group/t_cfileman.mmp	Sun Jul 18 10:20:49 2010 +0100
@@ -29,7 +29,7 @@
 USERINCLUDE    ../server
 USERINCLUDE    ../fileutils/inc
 
-LIBRARY        EUSER.LIB EFSRV.LIB HAL.LIB
+LIBRARY        euser.lib efsrv.lib hal.lib
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 USERINCLUDE    ../server

--- a/kerneltest/f32test/group/t_cp_plugin.mmp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/group/t_cp_plugin.mmp	Sun Jul 18 10:20:49 2010 +0100
@@ -29,7 +29,7 @@
 SOURCE          fat_utils.cpp f32_test_utils.cpp
 SOURCE          t_chlffs.cpp
 
-LIBRARY         EUSER.LIB EFSRV.LIB EKTRAN.LIB HAL.LIB
+LIBRARY         euser.lib efsrv.lib ektran.lib hal.lib
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 USERINCLUDE     ../server
 USERINCLUDE     ../fileutils/inc

--- a/kerneltest/f32test/group/t_fatcharsetconv.mmp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/group/t_fatcharsetconv.mmp	Sun Jul 18 10:20:49 2010 +0100
@@ -26,7 +26,7 @@
 SOURCE         fat_utils.cpp f32_test_utils.cpp
 SOURCE	       T_CHLFFS.CPP
 
-LIBRARY        EUSER.LIB EFSRV.LIB EKTRAN.LIB HAL.LIB
+LIBRARY        euser.lib efsrv.lib ektran.lib hal.lib
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 USERINCLUDE    ../server
 USERINCLUDE    ../fileutils/inc

--- a/kerneltest/f32test/group/t_file64bit.mmp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/group/t_file64bit.mmp	Sun Jul 18 10:20:49 2010 +0100
@@ -23,10 +23,10 @@
 SOURCEPATH     ../FILEUTILS/SRC
 SOURCE         f32_test_utils.cpp
 SOURCE         t_chlffs.cpp
-LIBRARY        EUSER.LIB EFSRV.LIB HAL.LIB
+LIBRARY        euser.lib efsrv.lib hal.lib
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-USERINCLUDE    ../SERVER
-USERINCLUDE    ../FILEUTILS/INC
+USERINCLUDE    ../server
+USERINCLUDE    ../fileutils/inc
 
 CAPABILITY	   All -TCB NetworkControl
 

--- a/kerneltest/f32test/group/t_filecache.mmp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/group/t_filecache.mmp	Sun Jul 18 10:20:49 2010 +0100
@@ -23,7 +23,7 @@
 //SOURCE		T_MAIN.CPP
 //SOURCE		T_CHLFFS.CPP
 
-LIBRARY			EUSER.LIB EFSRV.LIB HAL.LIB
+LIBRARY			euser.lib efsrv.lib hal.lib
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 CAPABILITY		TCB DISKADMIN ALLFILES

--- a/kerneltest/f32test/group/t_localeutils_cp932.mmp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/group/t_localeutils_cp932.mmp	Sun Jul 18 10:20:49 2010 +0100
@@ -26,7 +26,7 @@
 SOURCE          fat_utils.cpp f32_test_utils.cpp
 SOURCE          t_chlffs.cpp
 
-LIBRARY         EUSER.LIB EFSRV.LIB EKTRAN.LIB HAL.LIB
+LIBRARY         euser.lib efsrv.lib ektran.lib hal.lib
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 USERINCLUDE     ../server
 USERINCLUDE     ../fileutils/inc

--- a/kerneltest/f32test/group/t_romg.mmp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/group/t_romg.mmp	Sun Jul 18 10:20:49 2010 +0100
@@ -24,7 +24,7 @@
 SOURCEPATH     ../fileutils/src
 SOURCE         T_CHLFFS.CPP
 
-LIBRARY        EUSER.LIB EFSRV.LIB HAL.LIB
+LIBRARY        euser.lib efsrv.lib hal.lib
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 USERINCLUDE    ../server
 USERINCLUDE    ../fileutils/inc

--- a/kerneltest/f32test/group/t_surrogatepair.mmp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/group/t_surrogatepair.mmp	Sun Jul 18 10:20:49 2010 +0100
@@ -27,7 +27,7 @@
 SOURCE          fat_utils.cpp f32_test_utils.cpp
 SOURCE          t_chlffs.cpp
 
-LIBRARY         EUSER.LIB EFSRV.LIB EKTRAN.LIB HAL.LIB
+LIBRARY         euser.lib efsrv.lib ektran.lib hal.lib
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 USERINCLUDE     ../server
 USERINCLUDE     ../fileutils/inc

--- a/kerneltest/f32test/locl/localeutils/elocl32_japan/inc/t_tlocl32_charconv.h	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/locl/localeutils/elocl32_japan/inc/t_tlocl32_charconv.h	Sun Jul 18 10:20:49 2010 +0100
@@ -21,11 +21,11 @@
 #define __CHARCONV_H__
 
 #if !defined(__E32STD_H__)
-#include <E32STD.H>
+#include <e32std.h>
 #endif
 
 #if !defined(__E32BASE_H__)
-#include <E32BASE.H>
+#include <e32base.h>
 #endif
 
 /** 

--- a/kerneltest/f32test/locl/localeutils/elocl32_japan/inc/t_tlocl32_shiftjis.h	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/locl/localeutils/elocl32_japan/inc/t_tlocl32_shiftjis.h	Sun Jul 18 10:20:49 2010 +0100
@@ -21,15 +21,15 @@
 #define __SHIFTJIS_H__
 
 #if !defined(__E32STD_H__)
-#include <E32STD.H>
+#include <e32std.h>
 #endif
 
 #if !defined(__CHARCONV_H__)
-#include "T_TLOCL32_CHARCONV.H"
+#include "t_tlocl32_charconv.h"
 #endif
 
 #if !defined(__CONVUTILS_H__)
-#include "T_TLOCL32_CONVUTILS.H"
+#include "t_tlocl32_convutils.h"
 #endif
 
 class CnvShiftJis 

--- a/kerneltest/f32test/manager/t_romg.cpp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/manager/t_romg.cpp	Sun Jul 18 10:20:49 2010 +0100
@@ -19,7 +19,7 @@
 #include <f32file.h>
 #include <e32test.h>
 #include <e32rom.h>
-#include "..\server\t_server.h"
+#include "../server/t_server.h"
 
 const TInt KBufSize=0x10000;
 const TInt KFillerSize=0x100;

--- a/kerneltest/f32test/outsideBMP/src/t_surrogatepair.cpp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/outsideBMP/src/t_surrogatepair.cpp	Sun Jul 18 10:20:49 2010 +0100
@@ -18,10 +18,10 @@
 #define __E32TEST_EXTENSION__
 
 #include <e32test.h>
-#include <HAL.H>
+#include <hal.h>
 #include <f32fsys.h>
 #include <f32dbg.h>
-#include "..\server\t_server.h"
+#include "../server/t_server.h"
 
 RTest test(_L("T_SURROGATEPAIR"));
 

--- a/kerneltest/f32test/plugins/version_2/src/AllSupportedDrives_plugin.cpp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/plugins/version_2/src/AllSupportedDrives_plugin.cpp	Sun Jul 18 10:20:49 2010 +0100
@@ -13,7 +13,7 @@
 // Description:
 //
 
-#include "AllSupportedDrives_plugin.h"
+#include "allsupporteddrives_plugin.h"
 #include <f32pluginutils.h>
 
 /**

--- a/kerneltest/f32test/plugins/version_2/src/combinational2_plugin.cpp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/plugins/version_2/src/combinational2_plugin.cpp	Sun Jul 18 10:20:49 2010 +0100
@@ -13,7 +13,7 @@
 // Description:
 //
 
-#include "Combinational2_plugin.h"
+#include "combinational2_plugin.h"
 #include "plugincommon.h"
 #include <f32pluginutils.h>
 

--- a/kerneltest/f32test/plugins/version_2/src/drivec_plugin.cpp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/plugins/version_2/src/drivec_plugin.cpp	Sun Jul 18 10:20:49 2010 +0100
@@ -13,7 +13,7 @@
 // Description:
 //
 
-#include "DriveC_plugin.h"
+#include "drivec_plugin.h"
 #include <f32pluginutils.h>
 #include "plugincommon.h"
 

--- a/kerneltest/f32test/plugins/version_2/src/drivez_plugin.cpp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/plugins/version_2/src/drivez_plugin.cpp	Sun Jul 18 10:20:49 2010 +0100
@@ -13,7 +13,7 @@
 // Description:
 //
 
-#include "DriveZ_plugin.h"
+#include "drivez_plugin.h"
 #include <f32pluginutils.h>
 #include "plugincommon.h"
 

--- a/kerneltest/f32test/server/t_cp_plugintest.cpp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/server/t_cp_plugintest.cpp	Sun Jul 18 10:20:49 2010 +0100
@@ -19,10 +19,10 @@
 #define __E32TEST_EXTENSION__
 
 #include <e32test.h>
-#include <HAL.H>
+#include <hal.h>
 #include <f32fsys.h>
 #include <f32dbg.h>
-#include "..\server\t_server.h"
+#include "../server/t_server.h"
 #include "fat_utils.h"
 
 	

--- a/kerneltest/f32test/server/t_fatcharsetconv_Cases.h	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/server/t_fatcharsetconv_Cases.h	Sun Jul 18 10:20:49 2010 +0100
@@ -19,7 +19,7 @@
 #ifndef T_FATCHARSETCONV_CASES_H
 #define T_FATCHARSETCONV_CASES_H
 
-#include "T_Fatcharsetconv_Aux.h"
+#include "t_fatcharsetconv_aux.h"
 
 #if defined(_DEBUG) || defined(_DEBUG_RELEASE)
 extern CFileMan* gFileman;

--- a/kerneltest/f32test/server/t_fatcharsetconv_SpecificCases.cpp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/server/t_fatcharsetconv_SpecificCases.cpp	Sun Jul 18 10:20:49 2010 +0100
@@ -16,14 +16,14 @@
 */
 #define __E32TEST_EXTENSION__
 
-#include "T_Fatcharsetconv_aux.h"
+#include "t_fatcharsetconv_aux.h"
 #include <f32file.h>
 #include <e32test.h>
 #include <e32svr.h>
-#include <HAL.H>
+#include <hal.h>
 #include <f32fsys.h>
 #include <f32dbg.h>
-#include "..\server\t_server.h"
+#include "../server/t_server.h"
 
 //#include "fat_utils.h"
 

--- a/kerneltest/f32test/server/t_fatcharsetconv_aux.cpp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/server/t_fatcharsetconv_aux.cpp	Sun Jul 18 10:20:49 2010 +0100
@@ -16,7 +16,7 @@
 //
 
 #include <f32dbg.h>
-#include "T_fatcharsetconv_Aux.h"
+#include "t_fatcharsetconv_aux.h"
 
 CFileMan* gFileMan = NULL;
 RPointerArray<RFile>* gFileHandles = NULL;

--- a/kerneltest/f32test/server/t_fatcharsetconv_main.cpp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/server/t_fatcharsetconv_main.cpp	Sun Jul 18 10:20:49 2010 +0100
@@ -25,7 +25,7 @@
 #include "t_server.h"
 #include "t_chlffs.h"
 #include "fat_utils.h"
-#include "T_Fatcharsetconv_Cases.h"
+#include "t_fatcharsetconv_Cases.h"
 
 
 RTest test(_L("T_FatCharSetConv"));

--- a/kerneltest/f32test/server/t_file64bit.cpp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/server/t_file64bit.cpp	Sun Jul 18 10:20:49 2010 +0100
@@ -31,7 +31,7 @@
 #include <e32svr.h>
 #include "t_server.h"
 #include "t_file64bit.h"
-#include "..\\fileshare\\handshare64bit.h"
+#include "../fileshare/handshare64bit.h"
 #include <f32pluginutils.h>
 #include <massstorage.h>
 #include <e32math.h>

--- a/kerneltest/f32test/server/t_localeutils_cp932.cpp	Sat Jul 17 15:20:54 2010 +0100
+++ b/kerneltest/f32test/server/t_localeutils_cp932.cpp	Sun Jul 18 10:20:49 2010 +0100
@@ -19,11 +19,11 @@
 
 
 #include <e32test.h>
-#include <HAL.H>
+#include <hal.h>
 #include <f32fsys.h>
 #include <f32dbg.h>
 #include <e32svr.h>
-#include "..\server\t_server.h"
+#include "../server/t_server.h"
 #include "fat_utils.h"
 
 RTest test(_L("T_LOCALEUTILS_CP932"));