diff --git a/awesome.c b/awesome.c
index bd8df3d20..9a37b3fd8 100644
--- a/awesome.c
+++ b/awesome.c
@@ -63,7 +63,7 @@
 
 bool running = true;
 
-AwesomeConf globalconf;
+awesome_t globalconf;
 
 #define a_thread_refresh(id, fct) \
     do { \
diff --git a/client.c b/client.c
index e404aeca0..267a3f464 100644
--- a/client.c
+++ b/client.c
@@ -40,7 +40,7 @@
 #include "common/xutil.h"
 #include "common/xscreen.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 /** Load windows properties, restoring client's tag
  * and floating state before awesome was restarted if any,
diff --git a/dbus.c b/dbus.c
index e56bcde0d..049e7e7eb 100644
--- a/dbus.c
+++ b/dbus.c
@@ -25,7 +25,7 @@
 #include "statusbar.h"
 #include "widget.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 static DBusError err;
 static DBusConnection *dbus_connection = NULL;
diff --git a/event.c b/event.c
index 0467a716d..9851645d3 100644
--- a/event.c
+++ b/event.c
@@ -39,7 +39,7 @@
 #include "common/xscreen.h"
 #include "common/xutil.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 /** Handle mouse button click
  * \param screen screen number
diff --git a/ewmh.c b/ewmh.c
index 8e7df2c15..30297fc29 100644
--- a/ewmh.c
+++ b/ewmh.c
@@ -31,7 +31,7 @@
 #include "widget.h"
 #include "titlebar.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 static xcb_atom_t net_supported;
 static xcb_atom_t net_client_list;
diff --git a/focus.c b/focus.c
index 3ee35a95d..a67f3504c 100644
--- a/focus.c
+++ b/focus.c
@@ -23,7 +23,7 @@
 #include "focus.h"
 #include "client.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 /** Get the client's node focus.
  * \param c The client.
diff --git a/layout.c b/layout.c
index f925a73cc..a3a8a0384 100644
--- a/layout.c
+++ b/layout.c
@@ -34,7 +34,7 @@
 #include "layouts/fibonacci.h"
 #include "layouts/floating.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 /** Arrange windows following current selected layout
  * \param screen the screen to arrange
diff --git a/layouts/fibonacci.c b/layouts/fibonacci.c
index 482752209..6549487bd 100644
--- a/layouts/fibonacci.c
+++ b/layouts/fibonacci.c
@@ -24,7 +24,7 @@
 #include "client.h"
 #include "layouts/fibonacci.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 static void
 layout_fibonacci(int screen, int shape)
diff --git a/layouts/floating.c b/layouts/floating.c
index 6e5d275b0..e054b0c69 100644
--- a/layouts/floating.c
+++ b/layouts/floating.c
@@ -23,7 +23,7 @@
 #include "tag.h"
 #include "layouts/floating.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 void
 layout_floating(int screen)
diff --git a/layouts/max.c b/layouts/max.c
index dc2e3d8b2..c81e07a3f 100644
--- a/layouts/max.c
+++ b/layouts/max.c
@@ -24,7 +24,7 @@
 #include "client.h"
 #include "layouts/max.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 void
 layout_max(int screen)
diff --git a/layouts/tile.c b/layouts/tile.c
index a52d42665..7276f9f65 100644
--- a/layouts/tile.c
+++ b/layouts/tile.c
@@ -27,7 +27,7 @@
 #include "layouts/tile.h"
 #include "common/util.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 static void
 _tile(int screen, const position_t position)
diff --git a/lua.c b/lua.c
index 95f30e6fa..3d4659412 100644
--- a/lua.c
+++ b/lua.c
@@ -19,7 +19,7 @@
 #include "client.h"
 #include "layouts/tile.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 extern bool running;
 extern const name_func_link_t FloatingPlacementList[];
 
diff --git a/mouse.c b/mouse.c
index a35e7c173..8da21775c 100644
--- a/mouse.c
+++ b/mouse.c
@@ -37,7 +37,7 @@
                         | XCB_EVENT_MASK_BUTTON_RELEASE \
                         | XCB_EVENT_MASK_POINTER_MOTION)
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 /** Snap an area to the outside of an area.
  * \param geometry geometry of the area to snap
diff --git a/placement.c b/placement.c
index cfe748b48..c6b34ec58 100644
--- a/placement.c
+++ b/placement.c
@@ -28,7 +28,7 @@
 #include "titlebar.h"
 #include "layouts/floating.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 name_func_link_t FloatingPlacementList[] =
 {
diff --git a/screen.c b/screen.c
index 71afe4b3d..6e2327a36 100644
--- a/screen.c
+++ b/screen.c
@@ -30,7 +30,7 @@
 #include "client.h"
 #include "layouts/floating.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 /** Get screens info
  * \param screen Screen number
diff --git a/statusbar.c b/statusbar.c
index 103332922..955eee4b9 100644
--- a/statusbar.c
+++ b/statusbar.c
@@ -30,7 +30,7 @@
 #include "widget.h"
 #include "window.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 static void
 statusbar_draw(statusbar_t *statusbar)
diff --git a/structs.h b/structs.h
index ad2611b46..3e22a7520 100644
--- a/structs.h
+++ b/structs.h
@@ -339,8 +339,8 @@ typedef struct
 } VirtScreen;
 
 /** Main configuration structure */
-typedef struct AwesomeConf AwesomeConf;
-struct AwesomeConf
+typedef struct awesome_t awesome_t;
+struct awesome_t
 {
     /** Connection ref */
     xcb_connection_t *connection;
diff --git a/tag.c b/tag.c
index 35461bd74..5756ab69c 100644
--- a/tag.c
+++ b/tag.c
@@ -35,7 +35,7 @@
 
 #include "layoutgen.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 /** View or unview a tag.
  * \param tag the tag
diff --git a/titlebar.c b/titlebar.c
index 93a146f6a..5094b8fdd 100644
--- a/titlebar.c
+++ b/titlebar.c
@@ -29,7 +29,7 @@
 #include "screen.h"
 #include "layouts/floating.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 static char *
 titlebar_text(client_t *c)
diff --git a/widget.c b/widget.c
index 72e9ec10a..d2a54367b 100644
--- a/widget.c
+++ b/widget.c
@@ -25,7 +25,7 @@
 #include "event.h"
 #include "lua.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 #include "widgetgen.h"
 
diff --git a/widgets/graph.c b/widgets/graph.c
index 94fdbe55b..6f706184b 100644
--- a/widgets/graph.c
+++ b/widgets/graph.c
@@ -24,7 +24,7 @@
 #include "screen.h"
 #include "common/draw.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 typedef struct
 {
diff --git a/widgets/iconbox.c b/widgets/iconbox.c
index 9b5b7c7e3..c504c0c24 100644
--- a/widgets/iconbox.c
+++ b/widgets/iconbox.c
@@ -21,9 +21,6 @@
 
 #include "widget.h"
 #include "common/util.h"
-#include "common/configopts.h"
-
-extern AwesomeConf globalconf;
 
 typedef struct
 {
diff --git a/widgets/progressbar.c b/widgets/progressbar.c
index 7a6bd5423..599ea9b67 100644
--- a/widgets/progressbar.c
+++ b/widgets/progressbar.c
@@ -22,7 +22,7 @@
 
 #include "screen.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 typedef struct
 {
diff --git a/widgets/taglist.c b/widgets/taglist.c
index 72c6f5f9d..2512a3484 100644
--- a/widgets/taglist.c
+++ b/widgets/taglist.c
@@ -27,7 +27,7 @@
 #include "common/markup.h"
 #include "common/configopts.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 typedef struct taglist_drawn_area_t taglist_drawn_area_t;
 struct taglist_drawn_area_t
diff --git a/widgets/tasklist.c b/widgets/tasklist.c
index a278924eb..0346384dd 100644
--- a/widgets/tasklist.c
+++ b/widgets/tasklist.c
@@ -28,7 +28,7 @@
 #include "tag.h"
 #include "common/configopts.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 typedef enum
 {
diff --git a/widgets/textbox.c b/widgets/textbox.c
index 3a53c9947..e77000038 100644
--- a/widgets/textbox.c
+++ b/widgets/textbox.c
@@ -25,7 +25,7 @@
 #include "common/util.h"
 #include "common/configopts.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 typedef struct
 {
diff --git a/window.c b/window.c
index 0f5fdb9b7..c8a098dfc 100644
--- a/window.c
+++ b/window.c
@@ -28,7 +28,7 @@
 #include "structs.h"
 #include "window.h"
 
-extern AwesomeConf globalconf;
+extern awesome_t globalconf;
 
 /** Mask shorthands */
 #define BUTTONMASK     (XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE)