--- a/photosgallery/imgvwr/group/glxivwr.mmp	Mon Jun 21 15:40:32 2010 +0300
+++ b/photosgallery/imgvwr/group/glxivwr.mmp	Thu Jul 15 18:39:01 2010 +0300
@@ -22,9 +22,7 @@
 #include <platform_paths.hrh>
 
 #include "../../inc/glxcapabilities.hrh"
-#include "../../../photos_plat/gallery_utilities_api/inc/glxgallery.hrh"
 #include "../../group/glxbuildcommon.mmh"
-#include "../../inc/glxalfhelper.mmh"
 
 TARGET                  glxivwr.exe
 TARGETTYPE              exe
@@ -34,8 +32,8 @@
 
 SOURCEPATH              ../src
 SOURCE                  glxivwrapplication.cpp 
-SOURCE			glxivwrappui.cpp 
-SOURCE			glxivwrdocument.cpp
+SOURCE                  glxivwrappui.cpp 
+SOURCE                  glxivwrdocument.cpp
 
 SOURCEPATH              ../group
 
@@ -46,19 +44,15 @@
 END // RESOURCE
 
 USERINCLUDE             ../inc
-USERINCLUDE		../../viewframework/medialists/inc
+USERINCLUDE             ../../viewframework/medialists/inc
 
 APP_LAYER_SYSTEMINCLUDE
 
 // System includes from the source tree
 SYSTEMINCLUDE           ../../inc
-SYSTEMINCLUDE           ../../common/inc
 SYSTEMINCLUDE           ../../commonui/inc
 SYSTEMINCLUDE           ../../viewframework/inc
 SYSTEMINCLUDE           ../../viewframework/uiutilities/inc
-SYSTEMINCLUDE           ../../viewframework/plugins/gridviewplugin/inc
-SYSTEMINCLUDE           ../../viewframework/plugins/fullscreenviewplugin/inc
-SYSTEMINCLUDE           ../../viewframework/commandhandlers/inc
 SYSTEMINCLUDE           ../../controllers/imageviewer/inc
 
 LIBRARY                 apparc.lib
@@ -67,26 +61,19 @@
 LIBRARY                 eikcoctl.lib
 LIBRARY                 eikcore.lib
 LIBRARY                 ws32.lib
-LIBRARY                 estor.lib 
 LIBRARY                 euser.lib
-LIBRARY                 mpxcollectionutility.lib
 LIBRARY                 mpxcommon.lib
 LIBRARY                 mpxviewutility.lib
 LIBRARY                 glxuiutilities.lib
 LIBRARY                 glxcommonui.lib // for NGlxZoomStatePublisher::PublishStateL
-LIBRARY                 alfclient.lib // for CAlfEnv
-LIBRARY			glxmedialists.lib // to get the cache manager handle
-LIBRARY    		apgrfx.lib 
+LIBRARY                 glxmedialists.lib // to get the cache manager handle
+LIBRARY                 apgrfx.lib 
 LIBRARY                 glximageviewermanager.lib
-LIBRARY                 glxcommon.lib
 LIBRARY                 efsrv.lib // for RFile
+LIBRARY                 oommonitor.lib
+LIBRARY                 hal.lib   // HAL, HALData
 
 EPOCHEAPSIZE 0x1000 0xC00000 //HEAP SIZE SET TO DEFAULT MIN OF 4KB AND MAX OF 12 MB
-START WINS
-END
-
-START MARM
-END
 
 START RESOURCE glxivwr_loc.rss
 HEADER
@@ -100,9 +87,3 @@
 TARGETPATH              /private/10003a3f/import/apps
 LANGUAGE_IDS
 END // RESOURCE
-
-
-LIBRARY oommonitor.lib
-LIBRARY aknnotify.lib
-LIBRARY hal.lib              // HAL, HALData
-LIBRARY commonengine.lib		// for StringLoader