diff --git a/kdeui/colors/kcolorhelpers_p.h b/kdeui/colors/kcolorhelpers_p.h
index 31e261b9..fe27609d 100644
--- a/kdeui/colors/kcolorhelpers_p.h
+++ b/kdeui/colors/kcolorhelpers_p.h
@@ -21,7 +21,10 @@
 #ifndef KDEUI_COLORS_KCOLORHELPERS_P_H
 #define KDEUI_COLORS_KCOLORHELPERS_P_H
 
-#include <QtGui/QColor>
+#include <QColor>
+#include <QPainter>
+#include <QRect>
+#include <QBrush>
 
 // normalize: like qBound(a, 0.0, 1.0) but without needing the args and with
 // "safer" behavior on NaN (isnan(a) -> return 0.0)
@@ -30,10 +33,6 @@ static inline qreal normalize(qreal a)
     return (a < 1.0 ? (a > 0.0 ? a : 0.0) : 1.0);
 }
 
-#include <QPainter>
-#include <QRect>
-#include <QBrush>
-
 namespace KDEPrivate {
 
 //  fill a rectangle with a brush over chessboard pattern
diff --git a/kdeui/colors/kcolorscheme.h b/kdeui/colors/kcolorscheme.h
index 3aea282d..d0df8c0b 100644
--- a/kdeui/colors/kcolorscheme.h
+++ b/kdeui/colors/kcolorscheme.h
@@ -23,8 +23,7 @@
 #include <kdeui_export.h>
 #include <ksharedconfig.h>
 
-#include <QtGui/QPalette>
-
+#include <QPalette>
 #include <QColor>
 #include <QBrush>
 
@@ -299,7 +298,7 @@ public:
     KColorScheme(const KColorScheme&);
 
     /** Destructor */
-    virtual ~KColorScheme();
+    ~KColorScheme();
 
     /** Standard assignment operator */
     KColorScheme& operator=(const KColorScheme&);
diff --git a/kdeui/fonts/kfontchooser.cpp b/kdeui/fonts/kfontchooser.cpp
index 3080d771..dc422eb3 100644
--- a/kdeui/fonts/kfontchooser.cpp
+++ b/kdeui/fonts/kfontchooser.cpp
@@ -879,8 +879,7 @@ qreal KFontChooser::Private::setupSizeListBox (const QString& family, const QStr
     if (dbase.isSmoothlyScalable(family, style)) {
         // A vector font.
         //>sampleEdit->setPaletteBackgroundPixmap( VectorPixmap ); // TODO
-    }
-    else {
+    } else {
         // A bitmap font.
         //sampleEdit->setPaletteBackgroundPixmap( BitmapPixmap ); // TODO
         QList<int> smoothSizes = dbase.smoothSizes(family, style);