--- a/calendarui/controller/inc/calenstatetable.h	Tue Feb 02 10:12:19 2010 +0200
+++ b/calendarui/controller/inc/calenstatetable.h	Fri Apr 16 14:57:40 2010 +0300
@@ -21,10 +21,11 @@
 
 // INCLUDES
 #include <e32base.h>
-#include <calencommands.hrh>
-#include <calennotificationhandler.h>      // TCalenNotification
+#include "hb_calencommands.hrh"      // command ids
+#include "calennotificationhandler.h"      // TCalenNotification
 
 // ENUMERATIONS
+
 // Enumeration of the various possible states that the controller can be
 // be in.
 enum TControllerState
@@ -118,9 +119,6 @@
     /* ECalenDayView */
     { EIdle , EIdle, KCalenNoNotification },
 
-    /* ECalenTodoView */
-    { EIdle , EIdle, KCalenNoNotification },
-
     /* ECalenForwardsToDayView */
     { EIdle , EIdle, KCalenNoNotification },
     
@@ -144,9 +142,6 @@
     /* ECalenUpdateToolbar */
     { EIdle , EIdle, KCalenNoNotification },
 
-    /* ECalenStartActiveStep */
-    { EIdle , EIdle, KCalenNoNotification },
-
     /* ECalenGotoToday */
     { EIdle , EIdle, KCalenNoNotification },