diff --git a/src/HistorySizeWidget.cpp b/src/HistorySizeWidget.cpp
index c1b36d1a3..e9af3a5aa 100644
--- a/src/HistorySizeWidget.cpp
+++ b/src/HistorySizeWidget.cpp
@@ -49,7 +49,7 @@ HistorySizeWidget::HistorySizeWidget(QWidget* parent)
 
     // focus and select the spinner automatically when appropriate
     _ui->fixedSizeHistoryButton->setFocusProxy(_ui->historyLineSpinner);
-    connect(_ui->fixedSizeHistoryButton , &QRadioButton::clicked , _ui->historyLineSpinner , &KIntSpinBox::selectAll);
+    connect(_ui->fixedSizeHistoryButton , &QRadioButton::clicked , _ui->historyLineSpinner , &KPluralHandlingSpinBox::selectAll);
 
     QButtonGroup* modeGroup = new QButtonGroup(this);
     modeGroup->addButton(_ui->noHistoryButton);
@@ -60,7 +60,7 @@ HistorySizeWidget::HistorySizeWidget(QWidget* parent)
     _ui->historyLineSpinner->setSuffix(ki18ncp("Unit of scrollback", " line", " lines"));
     this->setLineCount(HistorySizeWidget::DefaultLineCount);
 
-    connect(_ui->historyLineSpinner, static_cast<void(KIntSpinBox::*)(int)>(&KIntSpinBox::valueChanged), this, &Konsole::HistorySizeWidget::historySizeChanged);
+    connect(_ui->historyLineSpinner, static_cast<void(KPluralHandlingSpinBox::*)(int)>(&KPluralHandlingSpinBox::valueChanged), this, &Konsole::HistorySizeWidget::historySizeChanged);
 }
 
 HistorySizeWidget::~HistorySizeWidget()
diff --git a/src/HistorySizeWidget.ui b/src/HistorySizeWidget.ui
index fa4378f0f..4b661dbd8 100644
--- a/src/HistorySizeWidget.ui
+++ b/src/HistorySizeWidget.ui
@@ -55,7 +55,7 @@
       </widget>
      </item>
      <item>
-      <widget class="KIntSpinBox" name="historyLineSpinner">
+      <widget class="KPluralHandlingSpinBox" name="historyLineSpinner">
        <property name="toolTip">
         <string>Number of lines of output to remember</string>
        </property>
@@ -112,9 +112,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KIntSpinBox</class>
+   <class>KPluralHandlingSpinBox</class>
    <extends>QSpinBox</extends>
-   <header>knuminput.h</header>
+   <header>KPluralHandlingSpinBox</header>
   </customwidget>
   <customwidget>
    <class>KMessageWidget</class>
diff --git a/src/KeyboardTranslatorManager.cpp b/src/KeyboardTranslatorManager.cpp
index 4ce398f6e..b5d42b0bc 100644
--- a/src/KeyboardTranslatorManager.cpp
+++ b/src/KeyboardTranslatorManager.cpp
@@ -29,7 +29,7 @@
 
 // KDE
 #include <QDebug>
-#include <KGlobal>
+#include <QStandardPaths>
 
 using namespace Konsole;
 
diff --git a/src/SessionController.cpp b/src/SessionController.cpp
index edb00a744..cc9db5fbd 100644
--- a/src/SessionController.cpp
+++ b/src/SessionController.cpp
@@ -53,7 +53,6 @@
 #include <KSharedConfig>
 #include <KConfigGroup>
 
-#include <kdeversion.h>
 #include <KCodecAction>
 
 // Konsole
diff --git a/src/autotests/PartTest.cpp b/src/autotests/PartTest.cpp
index 9efab93af..0c8e99d30 100644
--- a/src/autotests/PartTest.cpp
+++ b/src/autotests/PartTest.cpp
@@ -33,7 +33,6 @@
 #include <KPtyProcess>
 #include <KPtyDevice>
 #include <KDialog>
-#include <KDebug>
 #include <KMainWindow>
 #include <qtest.h>