--- a/application/group/bld.inf	Thu Jul 22 10:23:15 2010 +0100
+++ b/application/group/bld.inf	Fri Jul 23 15:21:11 2010 +0100
@@ -25,6 +25,7 @@
 
 PRJ_EXPORTS
 ..\help\podcatcher.hlp z:\resource\help\podcatcher.hlp
+podcatcher.iby CORE_APP_LAYER_IBY_EXPORT_PATH(podcatcher.iby)
 
 PRJ_EXTENSIONS
 
@@ -52,6 +53,3 @@
 	-c16,1 Video_suspended.svg\
     -c16,1 Feed
 END
-
-PRJ_EXPORTS
-podcatcher.iby CORE_APP_LAYER_IBY_EXPORT_PATH(podcatcher.iby)

--- a/engine/group/bld.inf	Thu Jul 22 10:23:15 2010 +0100
+++ b/engine/group/bld.inf	Fri Jul 23 15:21:11 2010 +0100
@@ -20,8 +20,6 @@
 DEFAULT
 
 PRJ_MMPFILES
-
-PRJ_MMPFILES
 engine.mmp
 
 PRJ_EXPORTS

--- a/engine/group/engine.mmp	Thu Jul 22 10:23:15 2010 +0100
+++ b/engine/group/engine.mmp	Fri Jul 23 15:21:11 2010 +0100
@@ -79,4 +79,8 @@
 LIBRARY avkon.lib
 LIBRARY centralrepository.lib
 
-CAPABILITY All -TCB
+#ifdef ENABLE_MPX_INTEGRATION
+CAPABILITY NetworkServices UserEnvironment WriteUserData ReadDeviceData WriteDeviceData MultimediaDD
+#else
+CAPABILITY NetworkServices UserEnvironment
+#endif
\ No newline at end of file

--- a/engine/inc/ShowEngine.h	Thu Jul 22 10:23:15 2010 +0100
+++ b/engine/inc/ShowEngine.h	Fri Jul 23 15:21:11 2010 +0100
@@ -29,8 +29,8 @@
 #include "MetaDataReader.h"
 #include <sqlite3.h>
 #ifdef ENABLE_MPX_INTEGRATION    
-#include "mpxcollectionhelper.h"
-#include "mpxcollectionhelperobserver.h"
+#include <mpxcollectionhelper.h>
+#include <mpxcollectionhelperobserver.h>
 #endif
 
 struct TDownload
@@ -38,6 +38,7 @@
 	TUint iIndex;
 	TUint iUid;
 	};
+
 #ifdef ENABLE_MPX_INTEGRATION    
 class CShowEngine : public CBase, public MHttpClientObserver, public MMetaDataReaderObserver,
 					public MMPXCollectionHelperObserver

--- a/engine/src/ShowEngine.cpp	Thu Jul 22 10:23:15 2010 +0100
+++ b/engine/src/ShowEngine.cpp	Fri Jul 23 15:21:11 2010 +0100
@@ -26,7 +26,10 @@
 #include <httperr.h>
 #include "debug.h"
 #include "PodcastUtils.h"
+
+#ifdef ENABLE_MPX_INTEGRATION 
 #include <mpxcollectionhelperfactory.h>
+#endif
 
 const TUint KMaxDownloadErrors = 3;
 const TInt KMimeBufLength = 100;