diff -r bbf46f59e123 -r 25ffed67c7ef fbs/fontandbitmapserver/group/TFbsServer.mmp
--- a/fbs/fontandbitmapserver/group/TFbsServer.mmp	Tue Aug 31 16:31:06 2010 +0300
+++ b/fbs/fontandbitmapserver/group/TFbsServer.mmp	Wed Sep 01 12:39:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -27,15 +27,14 @@
 
 CAPABILITY       All -Tcb -AllFiles
 
-userinclude		../tfbs 
-userinclude		../sfbs 
-userinclude		../inc 
+userinclude		../../../graphicstest/graphicstestharness/inc
+userinclude		../tfbs ../sfbs ../inc 
 userinclude		../trasterizer/src
-userinclude		../traces_FBSERV
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 OS_LAYER_ESTLIB_SYSTEMINCLUDE
 
+SOURCEPATH  .
 SOURCEPATH  ../tfbs
 SOURCE		TFbsServer.cpp
 SOURCE		TALLOC.CPP
@@ -56,20 +55,12 @@
 SOURCE 		textendedbitmaplegacy.cpp
 SOURCE 		textendedbitmappanic.cpp
 SOURCE 		twdp.cpp
-SOURCE		tfonttableandglyph.cpp
-SOURCE  	tfbsglyphdata.cpp
-SOURCE 		tfbsglyphdatapanic.cpp 
-SOURCE 		tfbsglyphdataoutlineshadow.cpp
-SOURCE  	tglyphatlas.cpp
-SOURCE		tfbsoogm.cpp
-SOURCE  	glyphatlastestwrapper.cpp
 
 
 SOURCEPATH		../sfbs
 SOURCE			FbsRalc.cpp
 SOURCE			FBSMBMC.CPP
 SOURCE			ShiftedFileStore.cpp
-SOURCE			glyphatlas.cpp
 
 
 LIBRARY			euser.lib
@@ -83,21 +74,19 @@
 library			bitgdi.lib
 LIBRARY	    	testexecuteutils.lib 
 LIBRARY	    	tgraphicsharness.lib
-LIBRARY			tgraphicsfontutils.lib
 LIBRARY	    	testexecutelogclient.lib
 library			lookuptable.lib
 LIBRARY			hal.lib
-LIBRARY			sgresource.lib
-LIBRARY			libEGL.lib
-LIBRARY			libOpenVG.lib
 
 #if defined(WINS)
 LIBRARY			fontinjector.lib
 #endif
 
+#if !defined(WINS)
+LIBRARY  viewsrv.lib
+#endif
+
 // We're quite heavy on the stack... 4k in WinS isn't enough...
 EPOCSTACKSIZE	0xf000
 
 SMPSAFE
-
-