diff -r 2717213c588a -r 171fae344dd4 fbs/fontandbitmapserver/group/FBSCLI.MMP
--- a/fbs/fontandbitmapserver/group/FBSCLI.MMP	Tue Jun 22 15:21:29 2010 +0300
+++ b/fbs/fontandbitmapserver/group/FBSCLI.MMP	Fri Jul 16 11:45:55 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-2010 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"
@@ -28,8 +28,9 @@
 SOURCEPATH      ../sfbs
 
 userinclude     ../inc
-userinclude		../../../../textandloc/fontservices/fontstore/src
+userinclude     ../traces
 
+OS_LAYER_SYSTEMINCLUDE
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 source          BITBMP.CPP
@@ -47,6 +48,8 @@
 source          ShiftedFileStore.cpp
 source          BitmapCompr.cpp
 source          patchableconstantscli.cpp
+source          fbsglyphdataiterator.cpp
+source          fbsglyphmetricsarray.cpp
 
 library         euser.lib
 library         efsrv.lib
@@ -57,6 +60,7 @@
 library         palette.lib
 library         lookuptable.lib
 library         hal.lib
+library         sgresource.lib
 #if !defined(WINS)
 library         fbsrasterizer.lib
 #endif