diff --git a/button.h b/button.h
index 72730c2b..1ac1fe40 100644
--- a/button.h
+++ b/button.h
@@ -22,7 +22,7 @@
 #ifndef AWESOME_BUTTON_H
 #define AWESOME_BUTTON_H
 
-#include "structs.h"
+#include "globalconf.h"
 
 /** Mouse buttons bindings */
 struct button_t
diff --git a/color.c b/color.c
index 31d33481..364ceb12 100644
--- a/color.c
+++ b/color.c
@@ -23,7 +23,7 @@
 #include <ctype.h>
 
 #include "color.h"
-#include "structs.h"
+#include "globalconf.h"
 #include "common/xutil.h"
 
 #define RGB_8TO16(i)   (0xffff * ((i) & 0xff) / 0xff)
diff --git a/draw.c b/draw.c
index 7bcb0ab2..9623e84e 100644
--- a/draw.c
+++ b/draw.c
@@ -29,7 +29,7 @@
 #include <ctype.h>
 #include <math.h>
 
-#include "structs.h"
+#include "globalconf.h"
 #include "screen.h"
 
 #include "common/tokenize.h"
diff --git a/ewmh.h b/ewmh.h
index 0a04cc5d..8eea322e 100644
--- a/ewmh.h
+++ b/ewmh.h
@@ -22,7 +22,7 @@
 #ifndef AWESOME_EWMH_H
 #define AWESOME_EWMH_H
 
-#include "structs.h"
+#include "globalconf.h"
 #include "strut.h"
 
 void ewmh_init(int);
diff --git a/structs.h b/globalconf.h
similarity index 96%
rename from structs.h
rename to globalconf.h
index 0675b056..648ec898 100644
--- a/structs.h
+++ b/globalconf.h
@@ -1,7 +1,7 @@
 /*
- * structs.h - basic structs header
+ * globalconf.h - basic globalconf.header
  *
- * Copyright © 2007-2008 Julien Danjou <julien@danjou.info>
+ * Copyright © 2007-2009 Julien Danjou <julien@danjou.info>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef AWESOME_STRUCTS_H
-#define AWESOME_STRUCTS_H
+#ifndef AWESOME_GLOBALCONF_H
+#define AWESOME_GLOBALCONF_H
 
 #define SN_API_NOT_YET_FROZEN
 #include <libsn/sn.h>
diff --git a/hooks.c b/hooks.c
index 05c9848d..1abe0470 100644
--- a/hooks.c
+++ b/hooks.c
@@ -19,7 +19,7 @@
  *
  */
 
-#include "structs.h"
+#include "globalconf.h"
 #include "luaa.h"
 
 #define HANDLE_HOOK(L, h) \
diff --git a/image.c b/image.c
index 76ad084e..2560f12d 100644
--- a/image.c
+++ b/image.c
@@ -23,7 +23,7 @@
 
 #include <Imlib2.h>
 
-#include "structs.h"
+#include "globalconf.h"
 #include "luaa.h"
 #include "common/luaobject.h"
 
diff --git a/key.c b/key.c
index 4d80715b..7d7032c3 100644
--- a/key.c
+++ b/key.c
@@ -27,7 +27,7 @@
 #include <X11/keysym.h>
 #include <X11/XF86keysym.h>
 
-#include "structs.h"
+#include "globalconf.h"
 #include "luaa.h"
 #include "common/xutil.h"
 #include "common/luaobject.h"
diff --git a/keygrabber.c b/keygrabber.c
index 88cfd981..177eef2e 100644
--- a/keygrabber.c
+++ b/keygrabber.c
@@ -21,7 +21,7 @@
 
 #include <unistd.h>
 
-#include "structs.h"
+#include "globalconf.h"
 #include "keygrabber.h"
 #include "key.h"
 #include "luaa.h"
diff --git a/mouse.c b/mouse.c
index 98f4772f..c77752bc 100644
--- a/mouse.c
+++ b/mouse.c
@@ -22,7 +22,7 @@
 #include "mouse.h"
 #include "screen.h"
 #include "client.h"
-#include "structs.h"
+#include "globalconf.h"
 #include "wibox.h"
 #include "luaa.h"
 #include "common/tokenize.h"
diff --git a/mousegrabber.c b/mousegrabber.c
index adf937c0..94b9f97d 100644
--- a/mousegrabber.c
+++ b/mousegrabber.c
@@ -21,7 +21,7 @@
 
 #include <unistd.h>
 
-#include "structs.h"
+#include "globalconf.h"
 #include "mouse.h"
 #include "mousegrabber.h"
 #include "luaa.h"
diff --git a/property.h b/property.h
index 82015feb..7da99b05 100644
--- a/property.h
+++ b/property.h
@@ -22,7 +22,7 @@
 #ifndef AWESOME_PROPERTY_H
 #define AWESOME_PROPERTY_H
 
-#include "structs.h"
+#include "globalconf.h"
 
 void property_update_wm_transient_for(client_t *, xcb_get_property_reply_t *);
 void property_update_wm_client_leader(client_t *c, xcb_get_property_reply_t *);
diff --git a/root.c b/root.c
index f9540ef5..cf9e8f97 100644
--- a/root.c
+++ b/root.c
@@ -21,7 +21,7 @@
 
 #include <xcb/xtest.h>
 
-#include "structs.h"
+#include "globalconf.h"
 #include "button.h"
 #include "wibox.h"
 #include "luaa.h"
diff --git a/screen.h b/screen.h
index 889f1037..7ecb1a8e 100644
--- a/screen.h
+++ b/screen.h
@@ -22,7 +22,7 @@
 #ifndef AWESOME_SCREEN_H
 #define AWESOME_SCREEN_H
 
-#include "structs.h"
+#include "globalconf.h"
 
 struct a_screen
 {
diff --git a/spawn.h b/spawn.h
index d4a58546..9d75f5ae 100644
--- a/spawn.h
+++ b/spawn.h
@@ -22,7 +22,7 @@
 #ifndef AWESOME_SPAWN_H
 #define AWESOME_SPAWN_H
 
-#include "structs.h"
+#include "globalconf.h"
 
 void spawn_init(void);
 void spawn_start_notify(client_t *, const char *);
diff --git a/stack.h b/stack.h
index 39037659..3d221bee 100644
--- a/stack.h
+++ b/stack.h
@@ -22,7 +22,7 @@
 #ifndef AWESOME_STACK_H
 #define AWESOME_STACK_H
 
-#include "structs.h"
+#include "globalconf.h"
 
 void stack_client_remove(client_t *);
 void stack_client_push(client_t *);
diff --git a/timer.c b/timer.c
index cc448dc0..0ba3579f 100644
--- a/timer.c
+++ b/timer.c
@@ -21,7 +21,7 @@
 
 #include <ev.h>
 
-#include "structs.h"
+#include "globalconf.h"
 #include "luaa.h"
 #include "timer.h"
 #include "common/luaobject.h"
diff --git a/widgets/systray.c b/widgets/systray.c
index 054dba8d..19fd6a23 100644
--- a/widgets/systray.c
+++ b/widgets/systray.c
@@ -1,7 +1,7 @@
 /*
  * systray.c - systray widget
  *
- * Copyright © 2008 Julien Danjou <julien@danjou.info>
+ * Copyright © 2008-2009 Julien Danjou <julien@danjou.info>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
 #include "widget.h"
 #include "screen.h"
 #include "wibox.h"
-#include "structs.h"
+#include "globalconf.h"
 #include "common/xembed.h"
 #include "common/atoms.h"
 
diff --git a/window.h b/window.h
index 09214e0e..62225584 100644
--- a/window.h
+++ b/window.h
@@ -22,7 +22,7 @@
 #ifndef AWESOME_WINDOW_H
 #define AWESOME_WINDOW_H
 
-#include "structs.h"
+#include "globalconf.h"
 
 void window_state_set(xcb_window_t, long);
 xcb_get_property_cookie_t window_state_get_unchecked(xcb_window_t);