diff --git a/clients/modernsystem/btnhighcolor.h b/clients/modernsystem/btnhighcolor.h
index fa323b9eb5..cc9cdbafdf 100644
--- a/clients/modernsystem/btnhighcolor.h
+++ b/clients/modernsystem/btnhighcolor.h
@@ -1,3 +1,6 @@
+#ifndef __BTNHIGHCOLOR_H
+#define __BTNHIGHCOLOR_H
+
 /* XPM */
 static const char * btnhighcolor_xpm[] = {
 "14 15 75 1",
@@ -91,3 +94,5 @@ static const char * btnhighcolor_xpm[] = {
 " .GcHAAAAF0<. ",
 "  ..I5kk5I..  ",
 "    J.....    "};
+
+#endif // __BTNHIGHCOLOR_H
diff --git a/clients/modernsystem/buttondata.h b/clients/modernsystem/buttondata.h
index 1af5fb8ddf..6b4975587f 100644
--- a/clients/modernsystem/buttondata.h
+++ b/clients/modernsystem/buttondata.h
@@ -1,3 +1,6 @@
+#ifndef __BUTTONDATA_H
+#define __BUTTONDATA_H
+
 /* Image bits processed by KPixmap2Bitmaps */
 
 #define lowcolor_mask_width 14
@@ -40,3 +43,4 @@ static const unsigned char lowcolor_e6e6e6_bits[] = {
  0x00,0x40,0x80,0x00,0x00,0x00,0x39,0x00,0x00,0x00,0x08,0x19,0x0d,0x08,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00 };
 
+#endif // __BUTTONDATA_H
diff --git a/clients/modernsystem/modernsys.h b/clients/modernsystem/modernsys.h
index d9df4fdf06..f30ba1385b 100644
--- a/clients/modernsystem/modernsys.h
+++ b/clients/modernsystem/modernsys.h
@@ -1,11 +1,10 @@
-#ifndef __MODSYSTEMCLIENT_H
-#define __MODSYSTEMCLIENT_H
+#ifndef __MODERNSYS_H
+#define __MODERNSYS_H
 
 #include <QBitmap>
 #include <kcommondecoration.h>
 #include <kdecorationfactory.h>
 
-
 namespace ModernSystem {
 
 class ModernSys;
@@ -68,4 +67,4 @@ private:
 
 }
 
-#endif
+#endif // __MODERNSYS_H
diff --git a/effects/videorecord.h b/effects/videorecord.h
index 3bcccf65dd..0acd184c52 100644
--- a/effects/videorecord.h
+++ b/effects/videorecord.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_VIDEO_H
-#define KWIN_VIDEO_H
+#ifndef KWIN_VIDEORECORD_H
+#define KWIN_VIDEORECORD_H
 
 #include <kwineffects.h>
 
@@ -40,4 +40,4 @@ class VideoRecordEffect
 
 } // namespace
 
-#endif
+#endif // KWIN_VIDEORECORD_H
diff --git a/events.cpp b/events.cpp
index cae2ae4ee3..87dec4c395 100644
--- a/events.cpp
+++ b/events.cpp
@@ -1073,7 +1073,7 @@ void Client::updateMouseGrab()
     if( isActive() && !workspace()->forcedGlobalMouseGrab()) // see Workspace::establishTabBoxGrab()
         {
         // first grab all modifier combinations
-        XGrabButton( display(), AnyButton, AnyModifier, wrapperId(), FALSE,
+        XGrabButton( display(), AnyButton, AnyModifier, wrapperId(), false,
             ButtonPressMask,
             GrabModeSync, GrabModeAsync,
             None, None );
diff --git a/kcmkwin/kwindecoration/pixmaps.h b/kcmkwin/kwindecoration/pixmaps.h
index 76f60b3e93..5a687b04da 100644
--- a/kcmkwin/kwindecoration/pixmaps.h
+++ b/kcmkwin/kwindecoration/pixmaps.h
@@ -28,6 +28,9 @@
 
 */
 
+#ifndef KWINDECORATION_PIXMAPS_H
+#define KWINDECORATION_PIXMAPS_H
+
 // Button icon bitmap data which is hopefully generic enough to be recognized by everyone.
 
 // close.xbm:
@@ -108,3 +111,5 @@ static unsigned char spacer_bits[] = {
    0xac, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x00, 0x00 };
 
 // vim: ts=4
+
+#endif // KWINDECORATION_PIXMAPS_H
diff --git a/kcmkwin/kwinoptions/windows.h b/kcmkwin/kwinoptions/windows.h
index 5113afaef8..3e6b8e7142 100644
--- a/kcmkwin/kwinoptions/windows.h
+++ b/kcmkwin/kwinoptions/windows.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KWINDOWCONFIG_H__
-#define __KWINDOWCONFIG_H__
+#ifndef __KKWMWINDOWS_H__
+#define __KKWMWINDOWS_H__
 
 #include <QWidget>
 #include <kcmodule.h>
@@ -237,4 +237,5 @@ private:
   QComboBox* focusStealing;
   QCheckBox* hideUtilityWindowsForInactive;
 };
-#endif
+
+#endif // __KKWMWINDOWS_H__
diff --git a/lib/kwineffects.h b/lib/kwineffects.h
index 69989c0bd1..1012a3c29b 100644
--- a/lib/kwineffects.h
+++ b/lib/kwineffects.h
@@ -10,8 +10,8 @@ License. See the file "COPYING" for the exact licensing terms.
 
 // TODO MIT or some other license, perhaps move to some lib
 
-#ifndef KWIN_LIB_EFFECTS_H
-#define KWIN_LIB_EFFECTS_H
+#ifndef KWINEFFECTS_H
+#define KWINEFFECTS_H
 
 #include <kwinglobals.h>
 
@@ -652,4 +652,4 @@ float WindowQuad::originalBottom() const
 
 } // namespace
 
-#endif
+#endif // KWINEFFECTS_H