--- a/codhandler/codeng/group/CodEng.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/group/CodEng.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -19,7 +19,7 @@
 
 #include <platform_paths.hrh>
 #include <platform/mw/browser_platform_variant.hrh>
-#include    "../inc/CodDefs.h"
+#include "../inc/CodDefs.h"
 
 TARGET      CodEng.dll
 TARGETTYPE  dll
@@ -27,11 +27,9 @@
 CAPABILITY  CAP_GENERAL_DLL
 VENDORID    VID_DEFAULT
 
-
 //MACRO _DEBUG
 //#define _DEBUG
   
-  
 SOURCEPATH  ../src
 
 SOURCE      CodEngBase.cpp
@@ -72,18 +70,11 @@
 
 USERINCLUDE     ../inc
 
+MW_LAYER_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
+#if defined(__PLATFORM_VERSION_50_TUBE__) || defined(__PLATFORM_VERSION_50__)
 APP_LAYER_SYSTEMINCLUDE
-/* SF TODO: resolve APP LAYER DEPENDENCY: 
-	s60/app/devicecontrol/devctrl_dom/fota_engine_api/inc/FotaEngine.h
-	s60/app/devicecontrol/devctrl_dom/fota_engine_api/inc/fotaconst.h
-	s60/app/devicecontrol/devctrl_dom/fota_engine_api/inc/FotaEngStream.h
-
-	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
-MW_LAYER_LIBC_SYSTEMINCLUDE
-MW_LAYER_ECOM_SYSTEMINCLUDE
+#endif
 
 LIBRARY     euser.lib
 LIBRARY     efsrv.lib