diff --git a/kmcommands.cpp b/kmcommands.cpp
index e638dea21..c2a226107 100644
--- a/kmcommands.cpp
+++ b/kmcommands.cpp
@@ -501,7 +501,7 @@ KMCommand::Result KMUrlSaveCommand::execute()
     if (mUrl.isEmpty()) {
         return OK;
     }
-    const KUrl saveUrl = KFileDialog::getSaveUrl(mUrl.fileName(), QString(),
+    const QUrl saveUrl = KFileDialog::getSaveUrl(mUrl.fileName(), QString(),
                          parentWidget());
     if (saveUrl.isEmpty()) {
         return Canceled;
@@ -509,7 +509,7 @@ KMCommand::Result KMUrlSaveCommand::execute()
     if (KIO::NetAccess::exists(saveUrl, KIO::NetAccess::DestinationSide, parentWidget())) {
         if (KMessageBox::warningContinueCancel(0,
                                                xi18nc("@info", "File <filename>%1</filename> exists.<nl/>Do you want to replace it?",
-                                                       saveUrl.pathOrUrl()), i18n("Save to File"), KGuiItem(i18n("&Replace")))
+                                                       saveUrl.toDisplayString()), i18n("Save to File"), KGuiItem(i18n("&Replace")))
                 != KMessageBox::Continue) {
             return Canceled;
         }
@@ -1616,7 +1616,7 @@ KMCommand::Result KMResendMessageCommand::execute()
     return OK;
 }
 
-KMShareImageCommand::KMShareImageCommand(const KUrl &url, QWidget *parent)
+KMShareImageCommand::KMShareImageCommand(const QUrl &url, QWidget *parent)
     : KMCommand(parent),
       mUrl(url)
 {
diff --git a/kmcommands.h b/kmcommands.h
index 2bb384f45..7ea1c0650 100644
--- a/kmcommands.h
+++ b/kmcommands.h
@@ -18,7 +18,7 @@
 #include <AkonadiCore/item.h>
 #include <AkonadiCore/itemfetchscope.h>
 #include <AkonadiCore/collection.h>
-#include <KUrl>
+#include <QUrl>
 namespace Akonadi
 {
 class Tag;
@@ -188,7 +188,7 @@ public:
 private:
     Result execute() Q_DECL_OVERRIDE;
 
-    KUrl mUrl;
+    QUrl mUrl;
     Akonadi::Item mMessage;
 };
 
@@ -611,11 +611,11 @@ class KMAIL_EXPORT KMShareImageCommand : public KMCommand
     Q_OBJECT
 
 public:
-    explicit KMShareImageCommand(const KUrl &url, QWidget *parent);
+    explicit KMShareImageCommand(const QUrl &url, QWidget *parent);
 
 private:
     Result execute() Q_DECL_OVERRIDE;
-    KUrl mUrl;
+    QUrl mUrl;
 };
 
 class KMAIL_EXPORT KMFetchMessageCommand : public KMCommand
diff --git a/kmkernel.h b/kmkernel.h
index 90ece4ef5..a8a87e564 100644
--- a/kmkernel.h
+++ b/kmkernel.h
@@ -11,7 +11,7 @@
 #include <QDBusObjectPath>
 #include <Solid/Networking>
 
-#include <kurl.h>
+#include <qurl.h>
 
 #include "kmail_export.h"
 #include "settings/globalsettings.h"