3 files changed, 4 insertions, 4 deletions

diff --git a/core/pim/today/plugins/datebook/config.in b/core/pim/today/plugins/datebook/config.in
index 7a14438..413e0b8 100644
--- a/core/pim/today/plugins/datebook/config.in
+++ b/core/pim/today/plugins/datebook/config.in
@@ -1,4 +1,4 @@
   config TODAY_DATEBOOK
     boolean "datebook"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 && LIBOPIECORE2
diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp
index 9a820f2..f5b0d0a 100644
--- a/core/pim/today/plugins/datebook/datebookevent.cpp
+++ b/core/pim/today/plugins/datebook/datebookevent.cpp
@@ -19,13 +19,14 @@
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/calendar.h>
 
 #include <opie2/odevice.h>
 
-using namespace Opie;
+using namespace Opie::Ui;
+using namespace Opie::Core;
 
 DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
                              QWidget* parent,
                              bool show_location,
                              bool show_notes,
                              bool timeExtraLine,
diff --git a/core/pim/today/plugins/datebook/datebookevent.h b/core/pim/today/plugins/datebook/datebookevent.h
index e2ee077..973efe4 100644
--- a/core/pim/today/plugins/datebook/datebookevent.h
+++ b/core/pim/today/plugins/datebook/datebookevent.h
@@ -18,15 +18,14 @@
 #define DATEBOOKEVENT_PLUGIN_H
 
 #include <opie2/oclickablelabel.h>
 
 #include <qpe/datebookdb.h>
 
-using namespace Opie; 
 
-class DateBookEvent: public OClickableLabel {
+class DateBookEvent: public Opie::Ui::OClickableLabel {
 
      Q_OBJECT
 
 public:
      DateBookEvent( const EffectiveEvent &ev,
                     QWidget* parent = 0,