diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index e88f0e5a8..5b5ae4d7e 100644
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -21,7 +21,6 @@
 #include "kfileitemmodel.h"
 #include "kitemlistview.h"
 
-#include <kmimetype.h>
 #include <KLocale>
 #include <KIO/MetaData>
 #include <QDateTime>
diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp
index 98e867582..e7d18a81a 100644
--- a/src/kitemviews/private/kbaloorolesprovider.cpp
+++ b/src/kitemviews/private/kbaloorolesprovider.cpp
@@ -35,7 +35,7 @@ struct KBalooRolesProviderSingleton
 {
     KBalooRolesProvider instance;
 };
-K_GLOBAL_STATIC(KBalooRolesProviderSingleton, s_balooRolesProvider)
+Q_GLOBAL_STATIC(KBalooRolesProviderSingleton, s_balooRolesProvider)
 
 
 KBalooRolesProvider& KBalooRolesProvider::instance()
diff --git a/src/panels/places/placesitemlistwidget.cpp b/src/panels/places/placesitemlistwidget.cpp
index 83b00d798..18e561864 100644
--- a/src/panels/places/placesitemlistwidget.cpp
+++ b/src/panels/places/placesitemlistwidget.cpp
@@ -19,8 +19,6 @@
 
 #include "placesitemlistwidget.h"
 
-#include "kdebug.h"
-
 PlacesItemListWidget::PlacesItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :
     KStandardItemListWidget(informant, parent)
 {
diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index 9e5f18cc7..431722b62 100644
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -25,7 +25,6 @@
 #include <KConfigGroup>
 #include <KGlobal>
 #include <KLocalizedString>
-#include <KNumInput>
 #include <KServiceTypeTrader>
 #include <KService>
 
@@ -41,6 +40,7 @@
 #include <QScrollBar>
 #include <QShowEvent>
 #include <QSlider>
+#include <QSpinBox>
 #include <QSortFilterProxyModel>
 #include <QVBoxLayout>
 
diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp
index b56ce40c1..0b2729c33 100644
--- a/src/settings/kcm/kcmdolphinnavigation.cpp
+++ b/src/settings/kcm/kcmdolphinnavigation.cpp
@@ -35,9 +35,6 @@ DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget* parent, co
 {
     Q_UNUSED(args);
 
-    //KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
-//KLocale::global()->insertCatalog("dolphin");
-
     setButtons(KCModule::Default | KCModule::Help);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp
index 619e44cc5..8bfdefebb 100644
--- a/src/settings/kcm/kcmdolphinservices.cpp
+++ b/src/settings/kcm/kcmdolphinservices.cpp
@@ -35,9 +35,6 @@ DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const
 {
     Q_UNUSED(args);
 
-    //KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
-//KLocale::global()->insertCatalog("dolphin");
-
     setButtons(KCModule::Default | KCModule::Help);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index f013180ad..0859e568a 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@@ -41,9 +41,6 @@ DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget* parent, cons
 {
     Q_UNUSED(args);
 
-    //KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
-//KLocale::global()->insertCatalog("dolphin");
-
     setButtons(KCModule::Default | KCModule::Help);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
diff --git a/src/statusbar/mountpointobservercache.cpp b/src/statusbar/mountpointobservercache.cpp
index 5be2a9f95..ab3744eac 100644
--- a/src/statusbar/mountpointobservercache.cpp
+++ b/src/statusbar/mountpointobservercache.cpp
@@ -21,7 +21,6 @@
 
 #include "mountpointobserver.h"
 
-#include <KGlobal>
 #include <KMountPoint>
 
 #include <QTimer>
@@ -31,7 +30,7 @@ class MountPointObserverCacheSingleton
 public:
     MountPointObserverCache instance;
 };
-K_GLOBAL_STATIC(MountPointObserverCacheSingleton, s_MountPointObserverCache)
+Q_GLOBAL_STATIC(MountPointObserverCacheSingleton, s_MountPointObserverCache)
 
 
 MountPointObserverCache::MountPointObserverCache() :
diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h
index 2ba7cbf0b..326c419ab 100644
--- a/src/statusbar/statusbarspaceinfo.h
+++ b/src/statusbar/statusbarspaceinfo.h
@@ -23,7 +23,7 @@
 #include <QUrl>
 
 
-#include <kcapacitybar.h>
+#include <KCapacityBar>
 
 class QHideEvent;
 class QShowEvent;
diff --git a/src/views/dolphinnewfilemenuobserver.cpp b/src/views/dolphinnewfilemenuobserver.cpp
index 855f2675a..275e1c4fb 100644
--- a/src/views/dolphinnewfilemenuobserver.cpp
+++ b/src/views/dolphinnewfilemenuobserver.cpp
@@ -19,7 +19,6 @@
 
 #include "dolphinnewfilemenuobserver.h"
 
-#include <KGlobal>
 #include "dolphinnewfilemenu.h"
 
 class DolphinNewFileMenuObserverSingleton
@@ -27,7 +26,7 @@ class DolphinNewFileMenuObserverSingleton
 public:
     DolphinNewFileMenuObserver instance;
 };
-K_GLOBAL_STATIC(DolphinNewFileMenuObserverSingleton, s_DolphinNewFileMenuObserver)
+Q_GLOBAL_STATIC(DolphinNewFileMenuObserverSingleton, s_DolphinNewFileMenuObserver)
 
 DolphinNewFileMenuObserver& DolphinNewFileMenuObserver::instance()
 {
diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index f558f3c5f..6d009ba9a 100644
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -24,8 +24,6 @@
 #include <KIO/CopyJob>
 #include <KIO/FileUndoManager>
 #include <kstringhandler_deprecated.h> //TODO port to QCollator
-#include <knuminput.h>
-#include <kmimetype.h>
 #include <KJobUiDelegate>
 
 #include <QHBoxLayout>
@@ -35,6 +33,7 @@
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QLineEdit>
+#include <QSpinBox>
 #include <KGuiItem>
 
 RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :