diff -r 9e9792ae22e3 -r 86979fe66c4c fotaapplication/fotaserver/FotaServer/inc/DevEncController.h
--- a/fotaapplication/fotaserver/FotaServer/inc/DevEncController.h	Mon Mar 15 12:43:15 2010 +0200
+++ b/fotaapplication/fotaserver/FotaServer/inc/DevEncController.h	Wed Mar 31 23:00:03 2010 +0300
@@ -20,15 +20,14 @@
 
 // INCLUDES
 #include <e32base.h>
-#include <DevEncSession.h>
+
 #include <DevEncConstants.h>
 #include "DevEncProgressDlg.h"
 #define KDevEncUIUid 0x2000259A
 
 //Forward declaration
 class CFotaServer;
-
-
+class CDevEncSessionBase;
 class CDevEncStarterStarter;
 class CDevEncProgressObserver;
 
@@ -62,6 +61,10 @@
         
         TBool IsDeviceEncryptionSupportedL();
         
+        void LoadDevEncSessionL();
+        
+        void UnloadDevEncSession();
+        
         void StartDecryptionL();
         
         void StartEncryptionL();
@@ -71,7 +74,9 @@
     // Data
         CFotaServer* iCallback; // parent
         
-        CDevEncSession*     iEncMemorySession; // Device Encryption engine session
+		RLibrary iLibrary;
+                
+        CDevEncSessionBase*     iEncMemorySession; // Device Encryption engine session
 
         CDevEncProgressObserver* iDevEncObserver; //Observer for the encryption/decryption operation