diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index 32d3903317..f5535a6532 100644
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -24,7 +24,7 @@
 #include "kfileitemmodel.h"
 #include "private/kpixmapmodifier.h"
 
-#include <KDebug>
+#include <QDebug>
 #include <QIcon>
 #include <KIconLoader>
 
diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index a304ea69c9..8b2c761551 100644
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -22,7 +22,7 @@
 #include "kitemlistview.h"
 
 #include <kmimetype.h>
-#include <KDebug>
+#include <QDebug>
 #include <KLocale>
 #include <KIO/MetaData>
 #include <QDateTime>
diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index 2353f106f1..df521e2fc5 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -23,7 +23,7 @@
 
 #include <KConfig>
 #include <KConfigGroup>
-#include <KDebug>
+#include <QDebug>
 #include <KFileItem>
 #include <KIconLoader>
 #include <KJobWidgets>
diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp
index 46ac4745e7..6e995c25db 100644
--- a/src/kitemviews/kitemlistcontainer.cpp
+++ b/src/kitemviews/kitemlistcontainer.cpp
@@ -35,7 +35,7 @@
 #include <QStyle>
 #include <QStyleOption>
 
-#include <KDebug>
+#include <QDebug>
 
 /**
  * Replaces the default viewport of KItemListContainer by a
diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index 1cd06c7e16..812d1c9499 100644
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -24,7 +24,7 @@
 #include "kitemlistcontroller.h"
 
 #include <KGlobalSettings>
-#include <KDebug>
+#include <QDebug>
 
 #include "kitemlistview.h"
 #include "kitemlistselectionmanager.h"
diff --git a/src/kitemviews/kitemlistgroupheader.cpp b/src/kitemviews/kitemlistgroupheader.cpp
index accaf9ecff..687d6ea3af 100644
--- a/src/kitemviews/kitemlistgroupheader.cpp
+++ b/src/kitemviews/kitemlistgroupheader.cpp
@@ -27,7 +27,7 @@
 #include <QGraphicsSceneResizeEvent>
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
-#include <KDebug>
+#include <QDebug>
 
 KItemListGroupHeader::KItemListGroupHeader(QGraphicsWidget* parent) :
     QGraphicsWidget(parent, 0),
diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp
index ba524a6bf4..2057f56219 100644
--- a/src/kitemviews/kitemlistselectionmanager.cpp
+++ b/src/kitemviews/kitemlistselectionmanager.cpp
@@ -24,7 +24,7 @@
 #include "kitemlistselectionmanager.h"
 
 #include "kitemmodelbase.h"
-#include <KDebug>
+#include <QDebug>
 
 KItemListSelectionManager::KItemListSelectionManager(QObject* parent) :
     QObject(parent),
diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index ea1ec3f3a5..0d0304afcb 100644
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -22,7 +22,7 @@
 
 #include "kitemlistview.h"
 
-#include <KDebug>
+#include <QDebug>
 #include "kitemlistcontainer.h"
 #include "kitemlistcontroller.h"
 #include "kitemlistheader.h"
@@ -41,6 +41,7 @@
 #include <QStyle>
 #include <QStyleOptionRubberBand>
 #include <QTimer>
+#include <QElapsedTimer>
 
 #include <algorithm>
 
@@ -542,7 +543,7 @@ void KItemListView::endTransaction()
     --m_activeTransactions;
     if (m_activeTransactions < 0) {
         m_activeTransactions = 0;
-        kWarning() << "Mismatch between beginTransaction()/endTransaction()";
+        qWarning() << "Mismatch between beginTransaction()/endTransaction()";
     }
 
     if (m_activeTransactions == 0) {
@@ -1005,7 +1006,7 @@ void KItemListView::slotItemsInserted(const KItemRangeList& itemRanges)
         const int index = range.index + previouslyInsertedCount;
         const int count = range.count;
         if (index < 0 || count <= 0) {
-            kWarning() << "Invalid item range (index:" << index << ", count:" << count << ")";
+            qWarning() << "Invalid item range (index:" << index << ", count:" << count << ")";
             continue;
         }
         previouslyInsertedCount += count;
@@ -1113,7 +1114,7 @@ void KItemListView::slotItemsRemoved(const KItemRangeList& itemRanges)
         const int index = range.index;
         const int count = range.count;
         if (index < 0 || count <= 0) {
-            kWarning() << "Invalid item range (index:" << index << ", count:" << count << ")";
+            qWarning() << "Invalid item range (index:" << index << ", count:" << count << ")";
             continue;
         }
 
diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
index 8efa60fff6..6345aaf50e 100644
--- a/src/kitemviews/kitemlistviewaccessible.cpp
+++ b/src/kitemviews/kitemlistviewaccessible.cpp
@@ -31,7 +31,7 @@
 #include <qgraphicsscene.h>
 #include <qgraphicsview.h>
 
-#include <KDebug>
+#include <QDebug>
 #include <QHash>
 
 KItemListView* KItemListViewAccessible::view() const
diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp
index df19d49b12..db60cecdb3 100644
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@ -27,7 +27,7 @@
 
 #include "private/kitemlistselectiontoggle.h"
 
-#include <KDebug>
+#include <QDebug>
 
 #include <KGlobalSettings>
 #include <QApplication>
diff --git a/src/kitemviews/kstandarditem.cpp b/src/kitemviews/kstandarditem.cpp
index 6cb5b049b4..d189715284 100644
--- a/src/kitemviews/kstandarditem.cpp
+++ b/src/kitemviews/kstandarditem.cpp
@@ -19,7 +19,7 @@
 
 #include "kstandarditem.h"
 
-#include <KDebug>
+#include <QDebug>
 #include "kstandarditemmodel.h"
 
 KStandardItem::KStandardItem(KStandardItem* parent) :
diff --git a/src/kitemviews/kstandarditemlistview.cpp b/src/kitemviews/kstandarditemlistview.cpp
index 1c07d53278..4ef5bed093 100644
--- a/src/kitemviews/kstandarditemlistview.cpp
+++ b/src/kitemviews/kstandarditemlistview.cpp
@@ -19,7 +19,7 @@
 
 #include "kstandarditemlistview.h"
 
-#include <KDebug>
+#include <QDebug>
 #include <KIconLoader>
 #include "kstandarditemlistwidget.h"
 #include "kstandarditemlistgroupheader.h"
diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index ec48f19db2..8d8691bb0d 100644
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -27,7 +27,7 @@
 #include <KIconLoader>
 #include <kratingpainter.h>
 #include <KStringHandler>
-#include <KDebug>
+#include <QDebug>
 
 #include "private/kfileitemclipboard.h"
 #include "private/kitemlistroleeditor.h"
diff --git a/src/kitemviews/kstandarditemmodel.cpp b/src/kitemviews/kstandarditemmodel.cpp
index 060440aecb..efbb40adcd 100644
--- a/src/kitemviews/kstandarditemmodel.cpp
+++ b/src/kitemviews/kstandarditemmodel.cpp
@@ -19,7 +19,7 @@
 
 #include "kstandarditemmodel.h"
 
-#include <KDebug>
+#include <QDebug>
 #include "kstandarditem.h"
 
 KStandardItemModel::KStandardItemModel(QObject* parent) :
diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp
index 5ca56c58b3..98e867582b 100644
--- a/src/kitemviews/private/kbaloorolesprovider.cpp
+++ b/src/kitemviews/private/kbaloorolesprovider.cpp
@@ -20,7 +20,7 @@
 
 #include "kbaloorolesprovider.h"
 
-#include <KDebug>
+#include <QDebug>
 #include <KGlobal>
 #include <KLocalizedString>
 
diff --git a/src/kitemviews/private/kitemlistheaderwidget.cpp b/src/kitemviews/private/kitemlistheaderwidget.cpp
index e820bd7892..403d503b7f 100644
--- a/src/kitemviews/private/kitemlistheaderwidget.cpp
+++ b/src/kitemviews/private/kitemlistheaderwidget.cpp
@@ -26,7 +26,7 @@
 #include <QPainter>
 #include <QStyleOptionHeader>
 
-#include <KDebug>
+#include <QDebug>
 
 KItemListHeaderWidget::KItemListHeaderWidget(QGraphicsWidget* parent) :
     QGraphicsWidget(parent),
diff --git a/src/kitemviews/private/kitemlistroleeditor.cpp b/src/kitemviews/private/kitemlistroleeditor.cpp
index 6e7e89c171..dfa211cc0d 100644
--- a/src/kitemviews/private/kitemlistroleeditor.cpp
+++ b/src/kitemviews/private/kitemlistroleeditor.cpp
@@ -19,7 +19,7 @@
 
 #include "kitemlistroleeditor.h"
 
-#include <KDebug>
+#include <QDebug>
 #include <kio/global.h>
 #include <QKeyEvent>
 
diff --git a/src/kitemviews/private/kitemlistselectiontoggle.cpp b/src/kitemviews/private/kitemlistselectiontoggle.cpp
index 4daa55f9a9..8b5033b883 100644
--- a/src/kitemviews/private/kitemlistselectiontoggle.cpp
+++ b/src/kitemviews/private/kitemlistselectiontoggle.cpp
@@ -22,7 +22,7 @@
 #include <KIconLoader>
 #include <QPainter>
 
-#include <KDebug>
+#include <QDebug>
 
 KItemListSelectionToggle::KItemListSelectionToggle(QGraphicsItem* parent) :
     QGraphicsWidget(parent, 0),
diff --git a/src/kitemviews/private/kitemlistsmoothscroller.cpp b/src/kitemviews/private/kitemlistsmoothscroller.cpp
index 24eea0cefb..697d3f5262 100644
--- a/src/kitemviews/private/kitemlistsmoothscroller.cpp
+++ b/src/kitemviews/private/kitemlistsmoothscroller.cpp
@@ -25,7 +25,7 @@
 #include <QScrollBar>
 #include <QWheelEvent>
 
-#include <KDebug>
+#include <QDebug>
 
 KItemListSmoothScroller::KItemListSmoothScroller(QScrollBar* scrollBar,
                                                  QObject* parent) :
diff --git a/src/kitemviews/private/kitemlistviewanimation.cpp b/src/kitemviews/private/kitemlistviewanimation.cpp
index 336ba38adb..955eac6034 100644
--- a/src/kitemviews/private/kitemlistviewanimation.cpp
+++ b/src/kitemviews/private/kitemlistviewanimation.cpp
@@ -21,7 +21,7 @@
 
 #include <kitemviews/kitemlistview.h>
 
-#include <KDebug>
+#include <QDebug>
 #include <KGlobalSettings>
 
 #include <QGraphicsWidget>
diff --git a/src/kitemviews/private/kpixmapmodifier.cpp b/src/kitemviews/private/kpixmapmodifier.cpp
index 29aceb66b6..fff8fd6603 100644
--- a/src/kitemviews/private/kpixmapmodifier.cpp
+++ b/src/kitemviews/private/kpixmapmodifier.cpp
@@ -39,7 +39,7 @@
 #include <QPixmap>
 #include <QSize>
 
-#include <KDebug>
+#include <QDebug>
 
 #include <config-X11.h> // for HAVE_XRENDER
 #if defined(Q_WS_X11) && defined(HAVE_XRENDER)
diff --git a/src/settings/trash/trashsettingspage.cpp b/src/settings/trash/trashsettingspage.cpp
index bd01d56b5e..aa4b5a22a5 100644
--- a/src/settings/trash/trashsettingspage.cpp
+++ b/src/settings/trash/trashsettingspage.cpp
@@ -21,7 +21,7 @@
 
 #include <KCModuleProxy>
 #include <KDialog>
-#include <KVBox>
+#include <QVBoxLayout>
 
 #include <QVBoxLayout>
 
@@ -31,8 +31,10 @@ TrashSettingsPage::TrashSettingsPage(QWidget* parent) :
     const int spacing = KDialog::spacingHint();
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
-    KVBox* vBox = new KVBox(this);
-    vBox->setSpacing(spacing);
+    QWidget* vBox = new QWidget(this);
+    QVBoxLayout *vBoxVBoxLayout = new QVBoxLayout(vBox);
+    vBoxVBoxLayout->setMargin(0);
+    vBoxVBoxLayout->setSpacing(spacing);
 
     m_proxy = new KCModuleProxy("kcmtrash");
     topLayout->addWidget(m_proxy);
@@ -40,7 +42,9 @@ TrashSettingsPage::TrashSettingsPage(QWidget* parent) :
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
     // is not stretched vertically.
-    new QWidget(vBox);
+    QWidget *w = new QWidget(vBox);
+    vBoxVBoxLayout->addWidget(w);
+    
     topLayout->addWidget(vBox);
 
     loadSettings();