diff --git a/clients/keramik/keramik.cpp b/clients/keramik/keramik.cpp
index aaf32d30fe..4495d298b2 100644
--- a/clients/keramik/keramik.cpp
+++ b/clients/keramik/keramik.cpp
@@ -28,20 +28,16 @@
 #include <QLayout>
 #include <QBitmap>
 #include <QStyle>
-
 #include <QWidget>
 #include <QLabel>
 #include <QEvent>
 #include <QApplication>
-#include <QStyle>
 
 #include <X11/Xlib.h>
 
 #include "keramik.h"
 #include "keramik.moc"
 
-
-
 // -------------------------------------------------------------------------------------------
 
 static void flip( QPixmap *&pix )
diff --git a/clients/laptop/laptopclient.h b/clients/laptop/laptopclient.h
index fe958afaf5..9e34387a87 100644
--- a/clients/laptop/laptopclient.h
+++ b/clients/laptop/laptopclient.h
@@ -4,8 +4,8 @@
  * Copyright (c) 2005 Sandro Giessl <sandro@giessl.com>
  * Ported to the kde3.2 API by Luciano Montanaro <mikelima@cirulla.net>
  */
-#ifndef __KDECLIENT_H
-#define __KDECLIENT_H
+#ifndef LAPTOPCLIENT_H
+#define LAPTOPCLIENT_H
 
 #include <QBitmap>
 #include <QPixmap>
@@ -76,4 +76,4 @@ private:
 
 }
 
-#endif
+#endif // LAPTOPCLIENT_H
diff --git a/clients/modernsystem/modernsys.cpp b/clients/modernsystem/modernsys.cpp
index 5fd8142577..b469751107 100644
--- a/clients/modernsystem/modernsys.cpp
+++ b/clients/modernsystem/modernsys.cpp
@@ -29,7 +29,6 @@
 #include <QPixmap>
 #include <QPaintEvent>
 #include <kpixmapeffect.h>
-#include <QPixmap>
 #include <QPainter>
 #include <QBitmap>
 
diff --git a/clients/redmond/redmond.cpp b/clients/redmond/redmond.cpp
index ca7c24a7f4..1422777852 100644
--- a/clients/redmond/redmond.cpp
+++ b/clients/redmond/redmond.cpp
@@ -23,7 +23,6 @@
 #include <kimageeffect.h>
 #include <kdrawutil.h>
 #include <klocale.h>
-#include <QPixmap>
 
 #include <QBitmap>
 #include <QImage>
diff --git a/effects/demo_shakymove.h b/effects/demo_shakymove.h
index 3093f084ed..e2de1bf8c2 100644
--- a/effects/demo_shakymove.h
+++ b/effects/demo_shakymove.h
@@ -8,8 +8,8 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-#ifndef KWIN_SHAKYMOVE_H
-#define KWIN_SHAKYMOVE_H
+#ifndef DEMO_SHAKYMOVE_H
+#define DEMO_SHAKYMOVE_H
 
 #include <qtimer.h>
 
@@ -38,4 +38,4 @@ class ShakyMoveEffect
 
 } // namespace
 
-#endif
+#endif // DEMO_SHAKYMOVE_H
diff --git a/effects/demo_wavywindows.h b/effects/demo_wavywindows.h
index f410535b2b..e060a76a1a 100644
--- a/effects/demo_wavywindows.h
+++ b/effects/demo_wavywindows.h
@@ -8,13 +8,12 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-#ifndef KWIN_WAVYWINDOWS_H
-#define KWIN_WAVYWINDOWS_H
+#ifndef DEMO_WAVYWINDOWS_H
+#define DEMO_WAVYWINDOWS_H
 
 // Include with base class for effects.
 #include <kwineffects.h>
 
-
 namespace KWin
 {
 
@@ -38,4 +37,4 @@ class WavyWindowsEffect
 
 } // namespace
 
-#endif
+#endif // DEMO_WAVYWINDOWS_H
diff --git a/kcmkwin/kwinoptions/main.cpp b/kcmkwin/kwinoptions/main.cpp
index d223724522..cfafcfb3af 100644
--- a/kcmkwin/kwinoptions/main.cpp
+++ b/kcmkwin/kwinoptions/main.cpp
@@ -182,12 +182,12 @@ void KWinOptions::defaults()
 
 QString KWinOptions::quickHelp() const
 {
-  return i18n("<h1>Window Behavior</h1> Here you can customize the way windows behave when being"
+  return i18n("<p><h1>Window Behavior</h1> Here you can customize the way windows behave when being"
     " moved, resized or clicked on. You can also specify a focus policy as well as a placement"
-    " policy for new windows."
+    " policy for new windows.</p>"
     " <p>Please note that this configuration will not take effect if you do not use"
     " KWin as your window manager. If you do use a different window manager, please refer to its documentation"
-    " for how to customize window behavior.");
+    " for how to customize window behavior.</p>");
 }
 
 void KWinOptions::moduleChanged(bool state)
diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp
index d39ed72387..b1da99040c 100644
--- a/kcmkwin/kwinoptions/windows.cpp
+++ b/kcmkwin/kwinoptions/windows.cpp
@@ -162,7 +162,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, const KComponent
                                       " that was under the mouse has focus."
                                       " New windows will not automatically receive the focus.</li>"
                                       " <li><em>Focus strictly under mouse:</em> Only the window under the mouse pointer is"
-                                      " active. If the mouse points nowhere, nothing has focus."
+                                      " active. If the mouse points nowhere, nothing has focus.</li>"
                                       " </ul>"
                                       "Note that 'Focus under mouse' and 'Focus strictly under mouse' prevent certain"
                                       " features such as the Alt+Tab walk through windows dialog in the KDE mode"
diff --git a/kcmkwin/kwinrules/kcm.cpp b/kcmkwin/kwinrules/kcm.cpp
index 7c37960932..69e07daf8f 100644
--- a/kcmkwin/kwinrules/kcm.cpp
+++ b/kcmkwin/kwinrules/kcm.cpp
@@ -80,11 +80,11 @@ void KCMRules::defaults()
 
 QString KCMRules::quickHelp() const
     {
-    return i18n("<h1>Window-specific Settings</h1> Here you can customize window settings specifically only"
-        " for some windows."
+    return i18n("<p><h1>Window-specific Settings</h1> Here you can customize window settings specifically only"
+        " for some windows.</p>"
         " <p>Please note that this configuration will not take effect if you do not use"
         " KWin as your window manager. If you do use a different window manager, please refer to its documentation"
-        " for how to customize window behavior.");
+        " for how to customize window behavior.</p>");
     }
 
 void KCMRules::moduleChanged( bool state )