--- a/codhandler/codeng/group/CodEng.mmp	Tue Feb 02 00:56:45 2010 +0200
+++ b/codhandler/codeng/group/CodEng.mmp	Fri Mar 19 09:52:28 2010 +0200
@@ -18,8 +18,8 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
-#include "../inc/CodDefs.h"
+#include <platform/mw/Browser_platform_variant.hrh>
+#include    "../inc/CodDefs.h"
 
 TARGET      CodEng.dll
 TARGETTYPE  dll
@@ -27,9 +27,11 @@
 CAPABILITY  CAP_GENERAL_DLL
 VENDORID    VID_DEFAULT
 
+
 //MACRO _DEBUG
 //#define _DEBUG
   
+  
 SOURCEPATH  ../src
 
 SOURCE      CodEngBase.cpp
@@ -70,11 +72,15 @@
 
 USERINCLUDE     ../inc
 
+//APP_LAYER_SYSTEMINCLUDE
+/* SF TODO: resolve APP LAYER DEPENDENCY: 
+	s60/app/gallery/gallery_dom/media_file_api/inc/CMGXFileManager.h
+	s60/app/gallery/gallery_dom/media_file_api/inc/MGXFileManagerFactory.h
+*/
 MW_LAYER_SYSTEMINCLUDE
-OS_LAYER_ESTLIB_SYSTEMINCLUDE
-#if defined(__PLATFORM_VERSION_50_TUBE__) || defined(__PLATFORM_VERSION_50__)
-APP_LAYER_SYSTEMINCLUDE
-#endif
+
+MW_LAYER_LIBC_SYSTEMINCLUDE
+MW_LAYER_ECOM_SYSTEMINCLUDE
 
 LIBRARY     euser.lib
 LIBRARY     efsrv.lib
@@ -118,7 +124,3 @@
 
 DEBUGLIBRARY    flogger.lib
 //LIBRARY    flogger.lib
-#ifdef BRDO_OCC_ENABLED_FF
-LIBRARY    extendedconnpref.lib
-LIBRARY    netmeta.lib
-#endif
\ No newline at end of file