diff --git a/nowplaying.cpp b/nowplaying.cpp
index e90c701e2874af0db418ec4db22b7f5268cc76d4..e584a79bb0839caa801f3b26e76349eb0fd17ff7 100644
--- a/nowplaying.cpp
+++ b/nowplaying.cpp
@@ -12,7 +12,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kdebug.h>
 #include <kiconloader.h>
 #include <kactionclasses.h>
 #include <kconfig.h>
@@ -22,10 +21,11 @@
 #include <qsize.h>
 #include <qsizepolicy.h>
 #include <qpixmap.h>
-#include <qbutton.h>
 #include <qimage.h>
 #include <qvaluelist.h>
 #include <qsplitter.h>
+#include <qpushbutton.h>
+#include <qlayout.h>
 
 #include "nowplaying.h"
 #include "playermanager.h"
@@ -39,7 +39,7 @@ using namespace ActionCollection;
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-NowPlaying::NowPlaying(QWidget *parent, const char *name) :
+NowPlaying::NowPlaying(QSplitter *parent, const char *name) :
     QWidget(parent, name),
     m_button(0)
 {
@@ -186,4 +186,3 @@ void NowPlaying::setupLayout()
 }
 
 #include "nowplaying.moc"
-
diff --git a/nowplaying.h b/nowplaying.h
index ec0405863a45e9075f2bed115e7f223d90c57156..01dba16cd872f76f49237caddce821197124065d 100644
--- a/nowplaying.h
+++ b/nowplaying.h
@@ -16,17 +16,16 @@
 #define NOWPLAYING_H
 
 #include <qwidget.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qtimer.h>
+
+class QPushButton;
+class QSplitter;
 
 class NowPlaying : public QWidget
 {
     Q_OBJECT
 
 public:
-    NowPlaying(QWidget *parent = 0, const char *name = 0);
+    NowPlaying(QSplitter *parent, const char *name = 0);
     virtual ~NowPlaying();
 
 private:
@@ -44,7 +43,7 @@ private slots:
 
 protected:
     virtual void resizeEvent(QResizeEvent *ev);
-    virtual void mousePressEvent ( QMouseEvent * e );
+    virtual void mousePressEvent(QMouseEvent *e);
 
 private:
     QPushButton *m_button;
diff --git a/playlistsplitter.cpp b/playlistsplitter.cpp
index 46ec4ff1b4c3ffe6056b4ef50a50345fba2d6ea5..a5b8c2086f96dfdad13b36afdc9834b6d97c39b9 100644
--- a/playlistsplitter.cpp
+++ b/playlistsplitter.cpp
@@ -25,6 +25,7 @@
 #include "tageditor.h"
 #include "collectionlist.h"
 #include "playermanager.h"
+#include "nowplaying.h"
 
 using namespace ActionCollection;
 
@@ -117,14 +118,14 @@ void PlaylistSplitter::setupLayout()
     connect(CollectionList::instance(), SIGNAL(signalCollectionChanged()),
             m_editor, SLOT(slotUpdateCollection()));
 
-    m_nowPlaying = new NowPlaying(boxSplitter);
+    NowPlaying *nowPlaying = new NowPlaying(boxSplitter);
 
     boxSplitter->moveToFirst(m_playlistBox);
-    connect(PlayerManager::instance(), SIGNAL(signalPlay()), m_nowPlaying, SLOT(slotRefresh()));
-    connect(PlayerManager::instance(), SIGNAL(signalStop()), m_nowPlaying, SLOT(slotClear()));
-    connect(PlayerManager::instance(), SIGNAL(signalCoverChanged()), m_nowPlaying, SLOT(slotRefresh()));
+    connect(PlayerManager::instance(), SIGNAL(signalPlay()), nowPlaying, SLOT(slotRefresh()));
+    connect(PlayerManager::instance(), SIGNAL(signalStop()), nowPlaying, SLOT(slotClear()));
+    connect(PlayerManager::instance(), SIGNAL(signalCoverChanged()), nowPlaying, SLOT(slotRefresh()));
 
-    boxSplitter->setResizeMode(m_nowPlaying, QSplitter::KeepSize);
+    boxSplitter->setResizeMode(nowPlaying, QSplitter::KeepSize);
 
     // Create the search widget -- this must be done after the CollectionList is created.
 
@@ -186,7 +187,7 @@ void PlaylistSplitter::slotPlaylistChanged(QWidget *w)
     Playlist *p = dynamic_cast<Playlist *>(w);
 
     if(p)
-	m_searchWidget->setSearch(p->search());
+        m_searchWidget->setSearch(p->search());
 }
 
 #include "playlistsplitter.moc"
diff --git a/playlistsplitter.h b/playlistsplitter.h
index 2abf3ff35a86fbf78d6b7be6bae3e5160f31df3d..af595e4fb38f37d988766c61156cd0b309c0034d 100644
--- a/playlistsplitter.h
+++ b/playlistsplitter.h
@@ -21,7 +21,6 @@
 #include <qwidgetstack.h>
 
 #include "playlistbox.h"
-#include "nowplaying.h"
 
 class KActionMenu;
 class KDirWatch;
@@ -81,7 +80,6 @@ private:
     SearchWidget *m_searchWidget;
     QWidgetStack *m_playlistStack;
     TagEditor *m_editor;
-    NowPlaying *m_nowPlaying;
 };
 
 #endif