diff --git a/doc/Coding_style b/doc/Coding_style
index a5bc90c8..d57dcf16 100644
--- a/doc/Coding_style
+++ b/doc/Coding_style
@@ -35,7 +35,7 @@ tab for indent next row in if-statement like this:
 		funktion();
 
 The include guards:
-_FILENAME_HH_ 
+FILENAME_HH
 
 
 Function comments:
diff --git a/src/Basemenu.hh b/src/Basemenu.hh
index 126f06e2..14f7c672 100644
--- a/src/Basemenu.hh
+++ b/src/Basemenu.hh
@@ -22,10 +22,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Basemenu.hh,v 1.6 2002/02/08 13:20:23 fluxgen Exp $
+// $Id: Basemenu.hh,v 1.7 2002/02/17 19:00:04 fluxgen Exp $
 
-#ifndef   _BASEMENU_HH_
-#define   _BASEMENU_HH_
+#ifndef   BASEMENU_HH
+#define   BASEMENU_HH
 
 #include <X11/Xlib.h>
 #include <vector>
diff --git a/src/Clientmenu.hh b/src/Clientmenu.hh
index 6edc7f80..d49f5dd8 100644
--- a/src/Clientmenu.hh
+++ b/src/Clientmenu.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef   _CLIENTMENU_HH_
-#define   _CLIENTMENU_HH_
+#ifndef   CLIENTMENU_HH
+#define   CLIENTMENU_HH
 
 // forward declarations
 class Clientmenu;
diff --git a/src/Configmenu.hh b/src/Configmenu.hh
index 28adafb7..eceac82f 100644
--- a/src/Configmenu.hh
+++ b/src/Configmenu.hh
@@ -22,10 +22,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Configmenu.hh,v 1.2 2002/01/09 14:11:20 fluxgen Exp $
+// $Id: Configmenu.hh,v 1.3 2002/02/17 18:57:47 fluxgen Exp $
 
-#ifndef   _CONFIGMENU_HH_
-#define   _CONFIGMENU_HH_
+#ifndef   CONFIGMENU_HH
+#define   CONFIGMENU_HH
 
 // forward declaration
 class Configmenu;
diff --git a/src/DrawUtil.hh b/src/DrawUtil.hh
index 19d2cac2..5131c702 100644
--- a/src/DrawUtil.hh
+++ b/src/DrawUtil.hh
@@ -19,10 +19,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: DrawUtil.hh,v 1.2 2002/01/09 14:11:20 fluxgen Exp $
+// $Id: DrawUtil.hh,v 1.3 2002/02/17 19:00:14 fluxgen Exp $
 
-#ifndef _DRAWUTIL_HH_
-#define _DRAWUTIL_HH_
+#ifndef DRAWUTIL_HH
+#define DRAWUTIL_HH
 
 #include <X11/Xlib.h>
 
diff --git a/src/Icon.hh b/src/Icon.hh
index e6512f71..af4f28a8 100644
--- a/src/Icon.hh
+++ b/src/Icon.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef _ICON_HH_
-#define _ICON_HH_
+#ifndef ICON_HH
+#define ICON_HH
 
 // forward declaration
 class Iconmenu;
diff --git a/src/IconBar.hh b/src/IconBar.hh
index 06ea007f..d0202a30 100644
--- a/src/IconBar.hh
+++ b/src/IconBar.hh
@@ -19,10 +19,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: IconBar.hh,v 1.5 2002/02/04 22:43:15 fluxgen Exp $
+// $Id: IconBar.hh,v 1.6 2002/02/17 18:57:47 fluxgen Exp $
 
-#ifndef _ICONBAR_HH_
-#define _ICONBAR_HH_
+#ifndef ICONBAR_HH
+#define ICONBAR_HH
 
 #include <vector>
 #include "Window.hh"
diff --git a/src/Image.hh b/src/Image.hh
index 7f7c7461..94953f9c 100644
--- a/src/Image.hh
+++ b/src/Image.hh
@@ -22,10 +22,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Image.hh,v 1.4 2002/02/04 22:41:27 fluxgen Exp $
+// $Id: Image.hh,v 1.5 2002/02/17 18:57:47 fluxgen Exp $
 
-#ifndef   _IMAGE_HH_
-#define   _IMAGE_HH_
+#ifndef   IMAGE_HH
+#define   IMAGE_HH
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/src/Keys.hh b/src/Keys.hh
index 659be936..143715bd 100644
--- a/src/Keys.hh
+++ b/src/Keys.hh
@@ -19,10 +19,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Keys.hh,v 1.5 2002/02/04 06:42:00 fluxgen Exp $
+// $Id: Keys.hh,v 1.6 2002/02/17 18:57:47 fluxgen Exp $
 
-#ifndef _KEYS_HH_
-#define _KEYS_HH_
+#ifndef KEYS_HH
+#define KEYS_HH
 
 #include <string>
 #include <vector>
diff --git a/src/LinkedList.hh b/src/LinkedList.hh
index aa6bc281..fa6d570b 100644
--- a/src/LinkedList.hh
+++ b/src/LinkedList.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
 // DEALINGS IN THE SOFTWARE.
   
-#ifndef   _LINKEDLIST_HH_
-#define   _LINKEDLIST_HH_
+#ifndef   LINKEDLIST_HH
+#define   LINKEDLIST_HH
 
 
 class __llist_node {
diff --git a/src/Netizen.hh b/src/Netizen.hh
index bb127354..5e7dbedb 100644
--- a/src/Netizen.hh
+++ b/src/Netizen.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef	 _NETIZEN_HH_
-#define	 _NETIZEN_HH_
+#ifndef	 NETIZEN_HH
+#define	 NETIZEN_HH
 
 // forward declaration
 class Netizen;
diff --git a/src/NotCopyable.hh b/src/NotCopyable.hh
index dea4aae7..1d119f0c 100644
--- a/src/NotCopyable.hh
+++ b/src/NotCopyable.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef _NOTCOPYABLE_HH_
-#define _NOTCOPYABLE_HH_
+#ifndef NOTCOPYABLE_HH
+#define NOTCOPYABLE_HH
 // inherit this class to 
 // disable assignment and copy
 class NotCopyable
diff --git a/src/Resource.hh b/src/Resource.hh
index 9b314e7c..42156a82 100644
--- a/src/Resource.hh
+++ b/src/Resource.hh
@@ -19,10 +19,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Resource.hh,v 1.2 2002/01/21 02:11:49 fluxgen Exp $
+// $Id: Resource.hh,v 1.3 2002/02/17 18:57:47 fluxgen Exp $
 
-#ifndef _RESOURCE_HH_
-#define _RESOURCE_HH_
+#ifndef RESOURCE_HH
+#define RESOURCE_HH
 
 #include "NotCopyable.hh"
 #include <string>
diff --git a/src/Rootmenu.hh b/src/Rootmenu.hh
index 839bcbc1..0fabc432 100644
--- a/src/Rootmenu.hh
+++ b/src/Rootmenu.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef  _ROOTMENU_HH_
-#define  _ROOTMENU_HH_
+#ifndef  ROOTMENU_HH
+#define  ROOTMENU_HH
 
 // forward declarations
 class Rootmenu;
diff --git a/src/Slit.hh b/src/Slit.hh
index 43a91e9e..2c29af6c 100644
--- a/src/Slit.hh
+++ b/src/Slit.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
 // DEALINGS IN THE SOFTWARE.
   
-#ifndef   _SLIT_HH_
-#define   _SLIT_HH_
+#ifndef   SLIT_HH
+#define   SLIT_HH
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/src/StringUtil.hh b/src/StringUtil.hh
index 4ac3bfff..a931fa2d 100644
--- a/src/StringUtil.hh
+++ b/src/StringUtil.hh
@@ -19,10 +19,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//$Id: StringUtil.hh,v 1.5 2002/01/21 01:56:39 fluxgen Exp $
+//$Id: StringUtil.hh,v 1.6 2002/02/17 18:52:20 fluxgen Exp $
 
-#ifndef _STRINGUTIL_HH_
-#define _STRINGUTIL_HH_
+#ifndef STRINGUTIL_HH
+#define STRINGUTIL_HH
 
 #include <string>
 
diff --git a/src/Tab.hh b/src/Tab.hh
index 4f3af12c..d23255ad 100644
--- a/src/Tab.hh
+++ b/src/Tab.hh
@@ -19,10 +19,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Tab.hh,v 1.10 2002/02/04 06:51:15 fluxgen Exp $
+// $Id: Tab.hh,v 1.11 2002/02/17 18:52:02 fluxgen Exp $
 
-#ifndef _TAB_HH_
-#define _TAB_HH_
+#ifndef TAB_HH
+#define TAB_HH
 
 #ifndef _IMAGE_HH_
 #include "Image.hh"
diff --git a/src/Theme.hh b/src/Theme.hh
index 03651147..5cafbf63 100644
--- a/src/Theme.hh
+++ b/src/Theme.hh
@@ -42,10 +42,10 @@
 //  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 //  DEALINGS IN THE SOFTWARE.
 
-// $Id: Theme.hh,v 1.5 2002/01/08 00:14:40 fluxgen Exp $
+// $Id: Theme.hh,v 1.6 2002/02/17 18:49:50 fluxgen Exp $
 
-#ifndef _THEME_HH_
-#define _THEME_HH_
+#ifndef THEME_HH
+#define THEME_HH
 
 
 #ifndef _IMAGE_HH_
diff --git a/src/Timer.hh b/src/Timer.hh
index 0cc6bbe6..bf40c3c6 100644
--- a/src/Timer.hh
+++ b/src/Timer.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
 // DEALINGS IN THE SOFTWARE.
   
-#ifndef   _TIMER_HH_
-#define   _TIMER_HH_
+#ifndef   TIMER_HH
+#define   TIMER_HH
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index 48725005..adbe7e3f 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -19,10 +19,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.hh,v 1.6 2002/02/04 22:38:41 fluxgen Exp $
+// $Id: Toolbar.hh,v 1.7 2002/02/17 18:49:02 fluxgen Exp $
 
-#ifndef   _TOOLBAR_HH_
-#define   _TOOLBAR_HH_
+#ifndef   TOOLBAR_HH
+#define   TOOLBAR_HH
 
 #include <X11/Xlib.h>
 #ifndef _BASEMENU_HH_
diff --git a/src/Windowmenu.hh b/src/Windowmenu.hh
index 794d0918..b4b97810 100644
--- a/src/Windowmenu.hh
+++ b/src/Windowmenu.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef   _WINDOWMENU_HH_
-#define   _WINDOWMENU_HH_
+#ifndef   WINDOWMENU_HH
+#define   WINDOWMENU_HH
 
 // forward declaration
 class Windowmenu;
diff --git a/src/Workspace.hh b/src/Workspace.hh
index 0c76f0c7..1d496254 100644
--- a/src/Workspace.hh
+++ b/src/Workspace.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef   _WORKSPACE_HH_
-#define   _WORKSPACE_HH_
+#ifndef   WORKSPACE_HH
+#define   WORKSPACE_HH
 
 #include <X11/Xlib.h>
 #include <string>
diff --git a/src/Workspacemenu.hh b/src/Workspacemenu.hh
index 8e2cc483..fc186544 100644
--- a/src/Workspacemenu.hh
+++ b/src/Workspacemenu.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef   _WORKSPACEMENU_HH_
-#define   _WORKSPACEMENU_HH_
+#ifndef   WORKSPACEMENU_HH
+#define   WORKSPACEMENU_HH
 
 // forward declaration
 class Workspacemenu;
diff --git a/src/XrmDatabaseHelper.hh b/src/XrmDatabaseHelper.hh
index b0620656..ed8d7613 100644
--- a/src/XrmDatabaseHelper.hh
+++ b/src/XrmDatabaseHelper.hh
@@ -19,14 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XrmDatabaseHelper.hh,v 1.3 2002/02/04 07:03:46 fluxgen Exp $
+// $Id: XrmDatabaseHelper.hh,v 1.4 2002/02/17 18:44:07 fluxgen Exp $
 
 // This is a helper for XrmDatabase
 // when database goes out of scope
 // the XrmDatabase variable will be destroyed.
 
-#ifndef _XRMDATABASEHELPER_HH_
-#define _XRMDATABASEHELPER_HH_
+#ifndef XRMDATABASEHELPER_HH
+#define XRMDATABASEHELPER_HH
 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
diff --git a/src/i18n.hh b/src/i18n.hh
index 46b5c1c5..15d5a926 100644
--- a/src/i18n.hh
+++ b/src/i18n.hh
@@ -22,10 +22,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: i18n.hh,v 1.4 2002/01/11 11:54:48 fluxgen Exp $
+// $Id: i18n.hh,v 1.5 2002/02/17 18:41:44 fluxgen Exp $
 
-#ifndef   _I18N_HH_
-#define   _I18N_HH_
+#ifndef   I18N_HH
+#define   I18N_HH
 
 #ifdef    NLS
 #  include "../nls/blackbox-nls.hh"