diff --git a/Engine.cpp b/Engine.cpp
index 206386dc6df2c4ff585c1c31103de063869e7f0c..fe0f8f8d0d0e10c7f98c0ae5cbd342d5f1c0d047 100644
--- a/Engine.cpp
+++ b/Engine.cpp
@@ -116,8 +116,8 @@
 
 #include "Engine.h"
 
-#include <QVector>
 #include <QApplication>
+#include <QVector>
 
 // ================================================================
 //           Classes SquareStackEntry and SquareStack
diff --git a/highscores.cpp b/highscores.cpp
index b4dd94e9a783d2aa5bebdc5db1c416b5dc83c777..0ab3c7f2086244492715170d87e3d52426b8dd73 100644
--- a/highscores.cpp
+++ b/highscores.cpp
@@ -18,8 +18,8 @@
 
 #include "highscores.h"
 
-#include <QVector>
 #include <QDateTime>
+#include <QVector>
 
 #include <KLocalizedString>
 #include <KConfigGroup>
diff --git a/kexthighscore.cpp b/kexthighscore.cpp
index f42740105c6ed8896331c1cb218255a50159cfb5..db8fbeba78a6cd6cbd926ee37904047c56574b3d 100644
--- a/kexthighscore.cpp
+++ b/kexthighscore.cpp
@@ -20,9 +20,8 @@
 #include "kexthighscore.h"
 
 #include <QLayout>
-//Added by qt3to4:
-#include <QVector>
 #include <QUrlQuery>
+#include <QVector>
 
 #include "kexthighscore_internal.h"
 #include "kexthighscore_gui.h"
diff --git a/kexthighscore.h b/kexthighscore.h
index f86753328de661e38b86f532b8e06adaa9e3fc29..913524218d9381fcabc75f8939100fd981d22e5d 100644
--- a/kexthighscore.h
+++ b/kexthighscore.h
@@ -24,11 +24,9 @@
 
 #include <libkdegames_export.h>
 
-#include <QtCore/QVector>
-#include <QtCore/QUrl>
-
 #include <QLoggingCategory>
-
+#include <QVector>
+#include <QUrl>
 
 namespace KExtHighscore
 {
diff --git a/kexthighscore_gui.h b/kexthighscore_gui.h
index ce62914192b7a9b3a12bb414813fc586d9d69d28..6a1401bbf343f9c85265bfe6863fd306becafc13 100644
--- a/kexthighscore_gui.h
+++ b/kexthighscore_gui.h
@@ -21,13 +21,13 @@
 #define KEXTHIGHSCORE_GUI_H
 
 #include <QCheckBox>
+#include <QDialog>
+#include <QDialogButtonBox>
 #include <QLineEdit>
+#include <QList>
 #include <QTreeWidget>
-#include <QDialogButtonBox>
-#include <QDialog>
-#include <KPageDialog>
 
-#include <QtCore/QList>
+#include <KPageDialog>
 
 #include "kexthighscore.h"
 
diff --git a/kexthighscore_internal.h b/kexthighscore_internal.h
index 194f81f73cb0ed706623b3c4c206afc089ce9eed..fd4fa9a07c08875acba16f7222eab824b1662541 100644
--- a/kexthighscore_internal.h
+++ b/kexthighscore_internal.h
@@ -28,12 +28,11 @@
 
 #include "kexthighscore.h"
 
+#include <QDateTime>
 #include <QLoggingCategory>
-
-#include <QtCore/QTextStream>
-#include <QtCore/QVector>
-#include <QtCore/QDateTime>
-#include <QtCore/QUrl>
+#include <QTextStream>
+#include <QUrl>
+#include <QVector>
 
 class QTextStream;
 class QDomNamedNodeMap;
diff --git a/kexthighscore_item.h b/kexthighscore_item.h
index fe29755e8ef377aa14fc321eb83d988a0fd33335..45adb371e8a45c6231c43aa2c183b44bd02fef91 100644
--- a/kexthighscore_item.h
+++ b/kexthighscore_item.h
@@ -20,9 +20,9 @@
 #ifndef KEXTHIGHSCORE_ITEM_H
 #define KEXTHIGHSCORE_ITEM_H
 
-#include <QtCore/QVariant>
-#include <QtCore/QMap>
-#include <QtCore/QVector>
+#include <QMap>
+#include <QVariant>
+#include <QVector>
 #include <libkdegames_export.h>
 class QWidget;
 
diff --git a/kreversiview.cpp b/kreversiview.cpp
index d2a68c38f1611046ccf1e39215260d831acc939c..de8d37242cf817901913593cddf8d8a48f1b41f2 100644
--- a/kreversiview.cpp
+++ b/kreversiview.cpp
@@ -18,11 +18,10 @@
 */
 
 #include "kreversiview.h"
+#include "colorscheme.h"
 
 #include <KLocalizedString>
 
-
-#include "colorscheme.h"
 #include <QStandardPaths>
 
 KReversiView::KReversiView(KReversiGame* game, QWidget *parent, KgThemeProvider *provider)