diff -r 56cd22a7a1cb -r f2f7b3284356 fontservices/fontstore/src/FNTSTD.H
--- a/fontservices/fontstore/src/FNTSTD.H	Fri Apr 16 16:55:07 2010 +0300
+++ b/fontservices/fontstore/src/FNTSTD.H	Mon May 03 14:13:26 2010 +0300
@@ -41,6 +41,8 @@
 	EFntNoFontFound,
 	EFntRemovingAlreadyDeletedLinkedFont,
 	EFntOverFlow,
+	EFntMetricsNotOnHeap,
+	EFntPointerNotByteAligned,
 	};
 
 /**
@@ -53,7 +55,6 @@
 class COpenFontSessionCacheListItem;
 class COpenFont;
 
-#ifdef FNTSTORE_SUPPORT_FMM
 class COpenFontSessionCacheList
 /**
 @internalComponent
@@ -76,30 +77,6 @@
 	iStartOffset(0)
 	{
 	}
-#else
-class COpenFontSessionCacheList
-/**
-@internalComponent
-*/
-	{
-	friend class COpenFont;
-
-	public:
-	inline COpenFontSessionCacheList();
-	void Delete(RHeap* aHeap);
-	void DeleteCache(RHeap* aHeap,TInt aSessionHandle);
-
-	private:
-	void DeleteFontGlyphs(RHeap* aHeap,const COpenFont* aFont);
-
-	COpenFontSessionCacheListItem* iStart;
-	};
-
-inline COpenFontSessionCacheList::COpenFontSessionCacheList():
-	iStart(NULL)
-	{
-	}
-#endif // FNTSTORE_SUPPORT_FMM
 
 /**
 @internalComponent