--- a/phoneapp/phoneuicontrol/inc/mphonestate.h	Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/mphonestate.h	Tue Aug 31 15:14:29 2010 +0300
@@ -26,10 +26,11 @@
 #include "mphonesystemevents.h"
 #include "mphonemenuandcbaevents.h"
 #include "mphoneremotecontrolevents.h"
+#include "mphonedivertif.h"
 #include "mphoneneclearedhandler.h"
 #include "mphonenumberentryevents.h"
 #include "mphonelockinfo.h"
-#include "mphonestateproperties.h"
+#include "mphoneblockedkeys.h"
 
 // FORWARD DECLARATIONS
 
@@ -45,10 +46,10 @@
     public MPhoneSystemEvents,
     public MPhoneMenuAndCbaEvents,
     public MPhoneRemoteControlEvents,
+    public MPhoneDivertIF,
+    public MPhoneBlockedKeys,
     public MPhoneNEClearedHandler,
-    public MPhoneNumberEntryEvents,
-    public MPhoneLockInfo,
-    public MPhoneStateProperties
+    public MPhoneLockInfo
     {
     public: