--- a/radioapp/radiowidgets/inc/radiostationcontrolwidget.h	Fri Mar 19 09:29:04 2010 +0200
+++ b/radioapp/radiowidgets/inc/radiostationcontrolwidget.h	Fri Apr 16 14:58:55 2010 +0300
@@ -19,14 +19,13 @@
 #define RADIOSTATIONCONTROLWIDGET_H
 
 // System includes
-#include <hbwidget.h>
-#include <hbicon.h>
-#include <hbeffect.h>
+#include <HbWidget>
+#include <HbIcon>
+#include <HbEffect>
 
 // Forward declarations
 class RadioUiEngine;
 class HbPushButton;
-class RadioXmlUiLoader;
 class RadioMainWindow;
 
 // Class declaration
@@ -79,8 +78,8 @@
 
     HbIcon              mBackground;
     HbPushButton*       mTagSongButton;
+    HbPushButton*       mStationsViewButton;
     HbPushButton*       mRecognizeButton;
-    HbPushButton*       mStationsViewButton;
 
     RadioMainWindow*    mMainWindow;