diff -r 28839de615b4 -r 26645d81f48d persistentstorage/sql/GROUP/t_sqlstartup.mmp
--- a/persistentstorage/sql/GROUP/t_sqlstartup.mmp	Thu Aug 19 11:36:21 2010 +0300
+++ b/persistentstorage/sql/GROUP/t_sqlstartup.mmp	Tue Aug 31 16:57:14 2010 +0300
@@ -12,9 +12,9 @@
 //
 // Description:
 //
-
-TARGET			t_sqlstartup.exe
-TARGETTYPE		EXE
+#include <e32utrace.mmh>
+TARGET          t_sqlstartup.exe
+TARGETTYPE      EXE
 CAPABILITY      ProtServ AllFiles
 
 EPOCFIXEDPROCESS
@@ -25,58 +25,59 @@
 EPOCHEAPSIZE 0x00020000 0x02000000
 #endif
 
-EPOCSTACKSIZE	0x3000
+EPOCSTACKSIZE   0x3000
 
-UID		    0 0x10281E17
+UID             0 0x10281E17
 
 MACRO SQLSRV_STARTUP_TEST
 
-USERINCLUDE 	.
-USERINCLUDE 	../INC
-USERINCLUDE 	../SRC/Common
-USERINCLUDE 	../SRC/Common/IPC
-USERINCLUDE 	../SRC/Common/Trace
-USERINCLUDE 	../SRC/Server
-USERINCLUDE 	../SRC/Server/Compact
-USERINCLUDE 	../SRC/Server/IPC
-USERINCLUDE 	../SRC/Security
-USERINCLUDE 	../SQLite
-USERINCLUDE 	../OsLayer
+USERINCLUDE     .
+USERINCLUDE     ../INC
+USERINCLUDE     ../traces_SqlDb
+USERINCLUDE     ../traces_SqlSrv
+USERINCLUDE     ../SRC/Common
+USERINCLUDE     ../SRC/Common/IPC
+USERINCLUDE     ../SRC/Server
+USERINCLUDE     ../SRC/Server/Compact
+USERINCLUDE     ../SRC/Server/IPC
+USERINCLUDE     ../SRC/Security
+USERINCLUDE     ../SQLite
+USERINCLUDE     ../OsLayer
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 OS_LAYER_ESTLIB_SYSTEMINCLUDE
 
-SOURCEPATH		../TEST
-SOURCE			t_sqlstartup.cpp
+SOURCEPATH      ../TEST
+SOURCE          t_sqlstartup.cpp
 
-SOURCEPATH		../SRC/Common
-SOURCE			SqlBufFlat.cpp
-SOURCE			SqlUtil.cpp
+SOURCEPATH      ../SRC/Common
+SOURCE          SqlBufFlat.cpp
+SOURCE          SqlUtil.cpp
 
-SOURCEPATH		../SRC/Server
-SOURCE			SqlBur.cpp
-SOURCE			SqlSrvConfig.cpp
-SOURCE			SqlSrvMain.cpp
-SOURCE			SqlSrvDriveSpace.cpp
-SOURCE			SqlSrvStrings.cpp
-SOURCE			SqlSrvStatementUtil.cpp
-SOURCE			SqlSrvSecurityMap.cpp
-SOURCE			SqlSrvUtil.cpp
-SOURCE			SqlSrvResourceProfiler.cpp
+SOURCEPATH      ../SRC/Server
+SOURCE          SqlBur.cpp
+SOURCE          SqlSrvConfig.cpp
+SOURCE          SqlSrvMain.cpp
+SOURCE          SqlSrvDriveSpace.cpp
+SOURCE          SqlSrvStrings.cpp
+SOURCE          SqlSrvStatementUtil.cpp
+SOURCE          SqlSrvSecurityMap.cpp
+SOURCE          SqlSrvUtil.cpp
+SOURCE          SqlSrvResourceProfiler.cpp
 
-SOURCEPATH		../SRC/Server/Compact
-SOURCE			SqlCompact.cpp
-SOURCE			SqlCompactConn.cpp
-SOURCE			SqlCompactEntry.cpp
-SOURCE			SqlCompactTimer.cpp
+SOURCEPATH      ../SRC/Server/Compact
+SOURCE          SqlCompact.cpp
+SOURCE          SqlCompactConn.cpp
+SOURCE          SqlCompactEntry.cpp
+SOURCE          SqlCompactTimer.cpp
 
-LIBRARY			estlib.lib 
-LIBRARY			hal.lib 
-LIBRARY			euser.lib 
-LIBRARY			efsrv.lib
-LIBRARY			estor.lib 
-LIBRARY			abclient.lib
-STATICLIBRARY	sqlite.lib
+LIBRARY         estlib.lib 
+LIBRARY         hal.lib 
+LIBRARY         euser.lib 
+LIBRARY         efsrv.lib
+LIBRARY         estor.lib 
+LIBRARY         abclient.lib
+STATICLIBRARY   sqlite.lib
 
-VENDORID		0x70000001
+VENDORID        0x70000001
 
 SMPSAFE