diff --git a/atoms.h b/atoms.h
index 49dc1978e7..25e31023eb 100644
--- a/atoms.h
+++ b/atoms.h
@@ -3,8 +3,8 @@ kwin - the KDE window manager
 
 Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 ******************************************************************/
-#ifndef ATOMS_H
-#define ATOMS_H
+#ifndef KWIN_ATOMS_H
+#define KWIN_ATOMS_H
 #include <X11/Xlib.h>
 
 class Atoms {
diff --git a/client.h b/client.h
index bf4010ea1d..7beb2dbe24 100644
--- a/client.h
+++ b/client.h
@@ -3,8 +3,8 @@ kwin - the KDE window manager
 
 Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 ******************************************************************/
-#ifndef CLIENT_H
-#define CLIENT_H
+#ifndef KWIN_CLIENT_H
+#define KWIN_CLIENT_H
 
 #include "options.h"
 #include <qframe.h>
diff --git a/events.h b/events.h
index 5219217044..3e8c3ee397 100644
--- a/events.h
+++ b/events.h
@@ -4,8 +4,8 @@ kwin - the KDE window manager
 Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 ******************************************************************/
 
-#ifndef EVENTS_H
-#define EVENTS_H
+#ifndef KWIN_EVENTS_H
+#define KWIN_EVENTS_H
 
 class Events
 {
diff --git a/killwindow.h b/killwindow.h
index a33e9e174e..68b40cc680 100644
--- a/killwindow.h
+++ b/killwindow.h
@@ -3,8 +3,8 @@ kwin - the KDE window manager
 
 Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 ******************************************************************/
-#ifndef KILLWINDOW_H
-#define KILLWINDOW_H
+#ifndef KWIN_KILLWINDOW_H
+#define KWIN_KILLWINDOW_H
 
 #include "workspace.h"
 
diff --git a/options.h b/options.h
index b293c45fb1..afeace9f39 100644
--- a/options.h
+++ b/options.h
@@ -3,8 +3,8 @@ kwin - the KDE window manager
 
 Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 ******************************************************************/
-#ifndef OPTIONS_H
-#define OPTIONS_H
+#ifndef KWIN_OPTIONS_H
+#define KWIN_OPTIONS_H
 
 #include <qobject.h>
 #include <qfont.h>
diff --git a/placement.h b/placement.h
index b377f14787..7ace73c5c2 100644
--- a/placement.h
+++ b/placement.h
@@ -7,8 +7,8 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 Placement algorithms
 Copyright (C) 1997 to 2002 Cristian Tibirna <tibirna@kde.org>
 ******************************************************************/
-#ifndef PLACEMENT_H
-#define PLACEMENT_H
+#ifndef KWIN_PLACEMENT_H
+#define KWIN_PLACEMENT_H
 
 #include <qpoint.h>
 #include <qvaluelist.h>
diff --git a/plugins.h b/plugins.h
index da798900ff..67e6c44841 100644
--- a/plugins.h
+++ b/plugins.h
@@ -3,8 +3,8 @@ kwin - the KDE window manager
 								
 Copyright (C) 1999, 2000    Daniel M. Duley <mosfet@kde.org>
 ******************************************************************/
-#ifndef __PLUGINS_H
-#define __PLUGINS_H
+#ifndef KWIN_PLUGINS_H
+#define KWIN_PLUGINS_H
 
 #include <qpopupmenu.h>
 #include <qstringlist.h>
diff --git a/popupinfo.h b/popupinfo.h
index 0773c7069b..fcb4efa8f7 100644
--- a/popupinfo.h
+++ b/popupinfo.h
@@ -3,8 +3,8 @@ kwin - the KDE window manager
 								  
 Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 ******************************************************************/
-#ifndef POPUPINFO_H
-#define POPUPINFO_H
+#ifndef KWIN_POPUPINFO_H
+#define KWIN_POPUPINFO_H
 #include <qwidget.h>
 #include <qtimer.h>
 #include <qvaluelist.h>
diff --git a/tabbox.h b/tabbox.h
index 2e59734b70..fc3a4f9ece 100644
--- a/tabbox.h
+++ b/tabbox.h
@@ -3,8 +3,8 @@ kwin - the KDE window manager
 								  
 Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 ******************************************************************/
-#ifndef TABBOX_H
-#define TABBOX_H
+#ifndef KWIN_TABBOX_H
+#define KWIN_TABBOX_H
 #include <qwidget.h>
 #include <qtimer.h>
 #include <qvaluelist.h>
diff --git a/workspace.h b/workspace.h
index d064f3e51a..4b89898ada 100644
--- a/workspace.h
+++ b/workspace.h
@@ -3,8 +3,8 @@ kwin - the KDE window manager
 
 Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 ******************************************************************/
-#ifndef WORKSPACE_H
-#define WORKSPACE_H
+#ifndef KWIN_WORKSPACE_H
+#define KWIN_WORKSPACE_H
 
 #include <qwidget.h>
 #include <qapplication.h>
@@ -13,7 +13,6 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 #include <qvaluelist.h>
 #include <qptrlist.h>
 #include <qtimer.h>
-#include <config.h>
 #include "options.h"
 #include "KWinInterface.h"
 #include <kshortcut.h>