diff -r 63aabac4416d -r f54ebcfc1b80 radioapp/radioenginewrapper/src/cradioenginehandler.cpp
--- a/radioapp/radioenginewrapper/src/cradioenginehandler.cpp	Fri Apr 16 14:58:55 2010 +0300
+++ b/radioapp/radioenginewrapper/src/cradioenginehandler.cpp	Mon May 03 12:31:41 2010 +0300
@@ -15,21 +15,15 @@
 *
 */
 
-
-#ifdef USE_STUBBED_RADIOENGINE
-#   include "t_cradioengine.h"
-#   include "t_mrdshandler.h"
-#else
-#   include "cradioengine.h"
-#   include "cradioaudiorouter.h"
-#   include "cradiosystemeventcollector.h"
-#   include "cradiosettings.h"
-#   include "mradioenginesettings.h"
-#   include "cradiopubsub.h"
-#   include "cradiorepositorymanager.h"
-#   include "mradiordsreceiver.h"
-#endif
-
+// User includes
+#include "cradioengine.h"
+#include "cradioaudiorouter.h"
+#include "cradiosystemeventcollector.h"
+#include "cradiosettings.h"
+#include "mradioenginesettings.h"
+#include "cradiopubsub.h"
+#include "cradiorepositorymanager.h"
+#include "mradiordsreceiver.h"
 #include "cradioenginehandler.h"
 #include "mradioenginehandlerobserver.h"
 #include "radio_global.h"