diff --git a/atoms.cpp b/atoms.cpp
index ddfde44774..040c1146d5 100644
--- a/atoms.cpp
+++ b/atoms.cpp
@@ -9,8 +9,6 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-
-#include <QApplication>
 #include "atoms.h"
 #include "utils.h"
 #include <assert.h>
diff --git a/atoms.h b/atoms.h
index 2e6776d7c7..405872c62b 100644
--- a/atoms.h
+++ b/atoms.h
@@ -11,12 +11,14 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #ifndef KWIN_ATOMS_H
 #define KWIN_ATOMS_H
+
+#include <QApplication>
 #include <X11/Xlib.h>
 
 namespace KWin
 {
 
-class Atoms 
+class Atoms
     {
     public:
         Atoms();
diff --git a/clients/b2/b2client.cpp b/clients/b2/b2client.cpp
index adb51be86d..7ded15934a 100644
--- a/clients/b2/b2client.cpp
+++ b/clients/b2/b2client.cpp
@@ -37,8 +37,6 @@
 #include <QBitmap>
 #include <QLabel>
 
-#include <QPixmap>
-
 #include <X11/Xlib.h>
 #include <QX11Info>
 #include <KDebug>
diff --git a/clients/b2/b2client.h b/clients/b2/b2client.h
index fdc070b1c9..3633619902 100644
--- a/clients/b2/b2client.h
+++ b/clients/b2/b2client.h
@@ -157,6 +157,7 @@ private:
 
 class B2ClientFactory : public QObject, public KDecorationFactory
 {
+    Q_OBJECT
 public:
     B2ClientFactory();
     virtual ~B2ClientFactory();
diff --git a/clients/kwmtheme/kwmthemeclient.cpp b/clients/kwmtheme/kwmthemeclient.cpp
index 785d451843..3c975dc13f 100644
--- a/clients/kwmtheme/kwmthemeclient.cpp
+++ b/clients/kwmtheme/kwmthemeclient.cpp
@@ -1,5 +1,6 @@
-#include <kconfig.h>
 #include "kwmthemeclient.h"
+
+#include <kconfig.h>
 #include <kglobal.h>
 #include <QLayout>
 #include <qdrawutil.h>
diff --git a/clients/laptop/laptopclient.cpp b/clients/laptop/laptopclient.cpp
index ef20a875fc..f251c4bd30 100644
--- a/clients/laptop/laptopclient.cpp
+++ b/clients/laptop/laptopclient.cpp
@@ -13,7 +13,6 @@
 #include <QPixmap>
 #include <QPaintEvent>
 #include <kpixmapeffect.h>
-#include <QPixmap>
 #include <kdrawutil.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/clients/plastik/config/config.cpp b/clients/plastik/config/config.cpp
index 496a206d1f..4ef6c16ab3 100644
--- a/clients/plastik/config/config.cpp
+++ b/clients/plastik/config/config.cpp
@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 
-#include "config.h"
+#include <config.h>
 
 PlastikConfig::PlastikConfig(KConfig* config, QWidget* parent)
     : QObject(parent), m_config(0), m_dialog(0)
diff --git a/clients/plastik/plastikbutton.cpp b/clients/plastik/plastikbutton.cpp
index f7d557fef0..db704b8bc5 100644
--- a/clients/plastik/plastikbutton.cpp
+++ b/clients/plastik/plastikbutton.cpp
@@ -20,6 +20,8 @@
   Boston, MA 02110-1301, USA.
  */
 
+#include "plastikbutton.h"
+
 // #include <kwin/options.h>
 
 #include <QAbstractButton>
@@ -28,10 +30,8 @@
 #include <QPainter>
 #include <QPixmap>
 #include <kpixmapeffect.h>
-#include <QPixmap>
 #include <QTimer>
 
-#include "plastikbutton.h"
 #include "plastikbutton.moc"
 #include "plastikclient.h"
 #include "misc.h"
diff --git a/clients/quartz/quartz.cpp b/clients/quartz/quartz.cpp
index 4a1a4492d0..db30437014 100644
--- a/clients/quartz/quartz.cpp
+++ b/clients/quartz/quartz.cpp
@@ -24,11 +24,9 @@
 #include <QImage>
 #include <QPixmap>
 #include <QApplication>
+#include <QPaintEvent>
 
 #include "quartz.h"
-//Added by qt3to4:
-#include <QPixmap>
-#include <QPaintEvent>
 
 
 namespace Quartz {
diff --git a/effects/mousemark.cpp b/effects/mousemark.cpp
index da1a9355de..7accee00ef 100644
--- a/effects/mousemark.cpp
+++ b/effects/mousemark.cpp
@@ -8,10 +8,10 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-#include <config-X11.h>
-
 #include "mousemark.h"
 
+#include <config-X11.h>
+
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <kglobal.h>
diff --git a/effects/showfps.cpp b/effects/showfps.cpp
index 3d07279132..ff32c62de5 100644
--- a/effects/showfps.cpp
+++ b/effects/showfps.cpp
@@ -8,10 +8,10 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-#include <config-X11.h>
-
 #include "showfps.h"
 
+#include <config-X11.h>
+
 #include <kconfig.h>
 #include <ksharedconfig.h>
 
diff --git a/effects/trackmouse.cpp b/effects/trackmouse.cpp
index 9ca9473a4a..1b097b6340 100644
--- a/effects/trackmouse.cpp
+++ b/effects/trackmouse.cpp
@@ -8,10 +8,10 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-#include <config-X11.h>
-
 #include "trackmouse.h"
 
+#include <config-X11.h>
+
 #include <kglobal.h>
 #include <kstandarddirs.h>
 
diff --git a/lib/kdecoration_plugins_p.cpp b/lib/kdecoration_plugins_p.cpp
index d6d3f4973a..026d76a544 100644
--- a/lib/kdecoration_plugins_p.cpp
+++ b/lib/kdecoration_plugins_p.cpp
@@ -32,7 +32,6 @@ DEALINGS IN THE SOFTWARE.
 #include <klibloader.h>
 #include <kconfiggroup.h>
 #include <assert.h>
-#include <kconfig.h>
 
 #include <QDir>
 #include <QFile>
diff --git a/main.cpp b/main.cpp
index 5ad388e9cb..5504182560 100644
--- a/main.cpp
+++ b/main.cpp
@@ -9,11 +9,11 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
+#include "main.h"
+
 //#define QT_CLEAN_NAMESPACE
 #include <ksharedconfig.h>
 
-#include "main.h"
-
 #include <kglobal.h>
 #include <klocale.h>
 #include <stdlib.h>
diff --git a/scene_xrender.h b/scene_xrender.h
index 3f9343eb9a..b502a038f2 100644
--- a/scene_xrender.h
+++ b/scene_xrender.h
@@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #ifndef KWIN_SCENE_XRENDER_H
 #define KWIN_SCENE_XRENDER_H
 
-#include "config.h"
+#include <config.h>
 
 #include "scene.h"
 
diff --git a/workspace.cpp b/workspace.cpp
index a8898c915f..c2ee51326a 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1138,7 +1138,7 @@ void Workspace::configureWM()
 /*!
   avoids managing a window with title \a title
  */
-void Workspace::doNotManage( QString title )
+void Workspace::doNotManage( const QString &title )
     {
     doNotManageList.append( title );
     }
@@ -1636,7 +1636,7 @@ void Workspace::checkActiveScreen( const Client* c )
     }
 
 // called e.g. when a user clicks on a window, set active screen to be the screen
-// where the click occured
+// where the click occurred
 void Workspace::setActiveScreenMouse( QPoint mousepos )
     {
     if( !options->xineramaEnabled )
diff --git a/workspace.h b/workspace.h
index 795dc5ce70..b35ee74018 100644
--- a/workspace.h
+++ b/workspace.h
@@ -251,7 +251,7 @@ class Workspace : public QObject, public KDecorationDefines
     // dcop interface
         void cascadeDesktop();
         void unclutterDesktop();
-        void doNotManage(QString);
+        void doNotManage( const QString & );
         bool setCurrentDesktop( int new_desktop );
         void nextDesktop();
         void previousDesktop();