--- a/calendarui/controller/inc/calenstatetable.h	Thu Aug 19 09:53:43 2010 +0300
+++ b/calendarui/controller/inc/calenstatetable.h	Tue Aug 31 15:13:43 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
@@ -112,13 +113,10 @@
     /* ECalenMonthView */
     { EIdle , EIdle, KCalenNoNotification },
 
-    /* ECalenWeekView */
-    { EIdle , EIdle, KCalenNoNotification },
-
     /* ECalenDayView */
     { EIdle , EIdle, KCalenNoNotification },
 
-    /* ECalenTodoView */
+    /* ECalenAgendaView */
     { EIdle , EIdle, KCalenNoNotification },
 
     /* ECalenForwardsToDayView */
@@ -144,9 +142,6 @@
     /* ECalenUpdateToolbar */
     { EIdle , EIdle, KCalenNoNotification },
 
-    /* ECalenStartActiveStep */
-    { EIdle , EIdle, KCalenNoNotification },
-
     /* ECalenGotoToday */
     { EIdle , EIdle, KCalenNoNotification },