diff --git a/src/BlockArray.cpp b/src/BlockArray.cpp
index b70fd2307..95cfe9d8c 100644
--- a/src/BlockArray.cpp
+++ b/src/BlockArray.cpp
@@ -30,7 +30,7 @@
 
 // KDE
 #include <kde_file.h>
-#include <kdebug.h>
+#include <KDebug>
 
 using namespace Konsole;
 
diff --git a/src/BookmarkHandler.cpp b/src/BookmarkHandler.cpp
index 86fadc19b..164fa0b15 100644
--- a/src/BookmarkHandler.cpp
+++ b/src/BookmarkHandler.cpp
@@ -29,7 +29,7 @@
 #include <QtCore/QFileInfo>
 
 // KDE
-#include <kshell.h>
+#include <KShell>
 
 #include <KBookmarkMenu>
 #include <KDebug>
diff --git a/src/Emulation.cpp b/src/Emulation.cpp
index 1b94cc324..9b42396c3 100644
--- a/src/Emulation.cpp
+++ b/src/Emulation.cpp
@@ -40,7 +40,7 @@
 #include <QtCore/QTime>
 
 // KDE
-#include <kdebug.h>
+#include <KDebug>
 
 // Konsole
 #include "KeyboardTranslator.h"
diff --git a/src/History.cpp b/src/History.cpp
index f06992442..866809641 100644
--- a/src/History.cpp
+++ b/src/History.cpp
@@ -33,7 +33,7 @@
 
 // KDE
 #include <kde_file.h>
-#include <kdebug.h>
+#include <KDebug>
 
 // Reasonable line size
 #define LINE_SIZE    1024
diff --git a/src/History.h b/src/History.h
index 6c0bcf7d9..d602903ed 100644
--- a/src/History.h
+++ b/src/History.h
@@ -27,7 +27,7 @@
 #include <QtCore/QVector>
 
 // KDE
-#include <ktemporaryfile.h>
+#include <KTemporaryFile>
 
 // Konsole
 #include "BlockArray.h"
diff --git a/src/Screen.cpp b/src/Screen.cpp
index 3420ee72b..1dde4acac 100644
--- a/src/Screen.cpp
+++ b/src/Screen.cpp
@@ -36,7 +36,7 @@
 #include <QtCore/QDate>
 
 // KDE
-#include <kdebug.h>
+#include <KDebug>
 
 // Konsole
 #include "konsole_wcwidth.h"
diff --git a/src/Session.cpp b/src/Session.cpp
index eeb77527d..7d4b0b737 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -45,7 +45,7 @@
 #include <KMessageBox>
 #include <KNotification>
 #include <KRun>
-#include <kshell.h>
+#include <KShell>
 #include <KStandardDirs>
 #include <KPtyDevice>
 #include <KUrl>
diff --git a/src/SessionController.cpp b/src/SessionController.cpp
index 7bd990753..d109bb209 100644
--- a/src/SessionController.cpp
+++ b/src/SessionController.cpp
@@ -34,14 +34,14 @@
 #include <KMenu>
 #include <KMessageBox>
 #include <KRun>
-#include <kshell.h>
+#include <KShell>
 #include <KStandardDirs>
 #include <KToggleAction>
 #include <KUrl>
 #include <KXmlGuiWindow>
 #include <KXMLGUIFactory>
 #include <KXMLGUIBuilder>
-#include <kdebug.h>
+#include <KDebug>
 #include <kcodecaction.h>
 #include <kdeversion.h>
 
diff --git a/src/SessionManager.cpp b/src/SessionManager.cpp
index 573fc3d03..edea37732 100644
--- a/src/SessionManager.cpp
+++ b/src/SessionManager.cpp
@@ -31,16 +31,16 @@
 #include <QtCore/QTextCodec>
 
 // KDE
-#include <klocale.h>
-#include <kicon.h>
-#include <krun.h>
-#include <kshell.h>
-#include <kconfig.h>
-#include <kglobal.h>
-#include <kdebug.h>
-#include <kconfiggroup.h>
-#include <kstandarddirs.h>
-#include <kdesktopfile.h>
+#include <KLocale>
+#include <KIcon>
+#include <KRun>
+#include <KShell>
+#include <KConfig>
+#include <KGlobal>
+#include <KDebug>
+#include <KConfigGroup>
+#include <KStandardDirs>
+#include <KDesktopFile>
 
 // Konsole
 #include "ColorScheme.h"
diff --git a/src/TerminalCharacterDecoder.cpp b/src/TerminalCharacterDecoder.cpp
index 1232afe5f..1866df7d0 100644
--- a/src/TerminalCharacterDecoder.cpp
+++ b/src/TerminalCharacterDecoder.cpp
@@ -26,7 +26,7 @@
 #include <QtCore/QTextStream>
 
 // KDE
-#include <kdebug.h>
+#include <KDebug>
 
 // Konsole
 #include "konsole_wcwidth.h"
diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
index 36e0205bc..b122de035 100644
--- a/src/TerminalDisplay.cpp
+++ b/src/TerminalDisplay.cpp
@@ -42,10 +42,10 @@
 #include <QtGui/QToolTip>
 
 // KDE
-#include <kshell.h>
+#include <KShell>
 #include <KColorScheme>
 #include <KCursor>
-#include <kdebug.h>
+#include <KDebug>
 #include <KLocale>
 #include <KMenu>
 #include <KNotification>
@@ -54,7 +54,7 @@
 #include <KIO/NetAccess>
 #include <konq_operations.h>
 #include <KFileItem>
-#include <klocalizedstring.h>
+#include <KLocalizedString>
 
 // Konsole
 #include "Filter.h"
diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp
index d505e6b74..4359dd44a 100644
--- a/src/ViewContainer.cpp
+++ b/src/ViewContainer.cpp
@@ -41,10 +41,10 @@
 
 // KDE 
 #include <KColorDialog>
-#include <kcolorscheme.h>
-#include <kcolorutils.h>
-#include <kdebug.h>
-#include <kconfiggroup.h>
+#include <KColorScheme>
+#include <KColorUtils>
+#include <KDebug>
+#include <KConfigGroup>
 #include <KLocale>
 #include <KMenu>
 #include <KColorCollection>
diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
index b10c37d00..30d09b2ec 100644
--- a/src/ViewManager.cpp
+++ b/src/ViewManager.cpp
@@ -30,7 +30,7 @@
 #include <QtGui/QMenu>
 
 // KDE
-#include <kdebug.h>
+#include <KDebug>
 #include <KAcceleratorManager>
 #include <KGlobal>
 #include <KLocale>
diff --git a/src/ViewSplitter.cpp b/src/ViewSplitter.cpp
index 043371d7b..431045995 100644
--- a/src/ViewSplitter.cpp
+++ b/src/ViewSplitter.cpp
@@ -26,7 +26,7 @@
 #include <QtGui/QKeyEvent>
 
 // KDE
-#include <kdebug.h>
+#include <KDebug>
 
 // Konsole
 #include "ViewContainer.h"
diff --git a/src/Vt102Emulation.cpp b/src/Vt102Emulation.cpp
index 48693c73a..309c24d88 100644
--- a/src/Vt102Emulation.cpp
+++ b/src/Vt102Emulation.cpp
@@ -48,8 +48,8 @@
 #include <QtCore/QByteRef>
 
 // KDE
-#include <kdebug.h>
-#include <klocale.h>
+#include <KDebug>
+#include <KLocale>
 
 // Konsole
 #include "KeyboardTranslator.h"
diff --git a/src/ZModemDialog.h b/src/ZModemDialog.h
index 15bc2efc5..63b9d602f 100644
--- a/src/ZModemDialog.h
+++ b/src/ZModemDialog.h
@@ -19,7 +19,7 @@
 #ifndef ZMODEM_DIALOG_H
 #define ZMODEM_DIALOG_H
 
-#include <kdialog.h>
+#include <KDialog>
 
 class KTextEdit;