diff --git a/CMakeLists.txt b/CMakeLists.txt
index bec208d4..97cfb72d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,7 @@ set(AWE_SRCS
     ${SOURCE_DIR}/screen.c
     ${SOURCE_DIR}/stack.c
     ${SOURCE_DIR}/selection.c
-    ${SOURCE_DIR}/wibox.c
+    ${SOURCE_DIR}/objects/wibox.c
     ${SOURCE_DIR}/systray.c
     ${SOURCE_DIR}/objects/tag.c
     ${SOURCE_DIR}/titlebar.c
diff --git a/event.h b/event.h
index 3d9c17e1..9a865030 100644
--- a/event.h
+++ b/event.h
@@ -1,7 +1,7 @@
 /*
  * event.h - event handlers 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
@@ -22,7 +22,7 @@
 #ifndef AWESOME_EVENT_H
 #define AWESOME_EVENT_H
 
-#include "wibox.h"
+#include "objects/wibox.h"
 #include "objects/client.h"
 
 static inline int
diff --git a/ewmh.c b/ewmh.c
index 61822bd7..7192e2a7 100644
--- a/ewmh.c
+++ b/ewmh.c
@@ -30,7 +30,7 @@
 #include "screen.h"
 #include "objects/client.h"
 #include "objects/widget.h"
-#include "wibox.h"
+#include "objects/wibox.h"
 #include "luaa.h"
 #include "common/atoms.h"
 #include "common/buffer.h"
diff --git a/mouse.c b/mouse.c
index dce53707..4240d42d 100644
--- a/mouse.c
+++ b/mouse.c
@@ -23,7 +23,7 @@
 #include "screen.h"
 #include "objects/client.h"
 #include "globalconf.h"
-#include "wibox.h"
+#include "objects/wibox.h"
 #include "luaa.h"
 #include "common/tokenize.h"
 #include "common/xutil.h"
diff --git a/wibox.c b/objects/wibox.c
similarity index 100%
rename from wibox.c
rename to objects/wibox.c
diff --git a/wibox.h b/objects/wibox.h
similarity index 100%
rename from wibox.h
rename to objects/wibox.h
diff --git a/objects/widgets/systray.c b/objects/widgets/systray.c
index 44901e79..9346da84 100644
--- a/objects/widgets/systray.c
+++ b/objects/widgets/systray.c
@@ -24,7 +24,7 @@
 
 #include "objects/widget.h"
 #include "screen.h"
-#include "wibox.h"
+#include "objects/wibox.h"
 #include "globalconf.h"
 #include "common/xembed.h"
 #include "common/atoms.h"
diff --git a/objects/widgets/textbox.c b/objects/widgets/textbox.c
index 705b725f..6f4f6c4d 100644
--- a/objects/widgets/textbox.c
+++ b/objects/widgets/textbox.c
@@ -20,7 +20,6 @@
  */
 
 #include "objects/widget.h"
-#include "wibox.h"
 #include "luaa.h"
 #include "common/tokenize.h"
 
diff --git a/property.c b/property.c
index 2c2752a1..fe55de05 100644
--- a/property.c
+++ b/property.c
@@ -25,7 +25,7 @@
 #include "property.h"
 #include "objects/client.h"
 #include "ewmh.h"
-#include "wibox.h"
+#include "objects/wibox.h"
 #include "window.h"
 #include "luaa.h"
 #include "common/atoms.h"
diff --git a/root.c b/root.c
index 557cdc0d..58a82036 100644
--- a/root.c
+++ b/root.c
@@ -23,7 +23,7 @@
 
 #include "globalconf.h"
 #include "objects/button.h"
-#include "wibox.h"
+#include "objects/wibox.h"
 #include "luaa.h"
 #include "window.h"
 #include "common/xcursor.h"
diff --git a/screen.c b/screen.c
index f8149f21..5cd0faeb 100644
--- a/screen.c
+++ b/screen.c
@@ -29,7 +29,7 @@
 #include "objects/tag.h"
 #include "objects/client.h"
 #include "objects/widget.h"
-#include "wibox.h"
+#include "objects/wibox.h"
 #include "luaa.h"
 #include "common/xutil.h"
 
diff --git a/titlebar.c b/titlebar.c
index ab708446..cee99713 100644
--- a/titlebar.c
+++ b/titlebar.c
@@ -24,7 +24,7 @@
 #include "titlebar.h"
 #include "objects/client.h"
 #include "objects/widget.h"
-#include "wibox.h"
+#include "objects/wibox.h"
 #include "screen.h"
 #include "luaa.h"
 
diff --git a/titlebar.h b/titlebar.h
index 7fc21b28..2c5c843a 100644
--- a/titlebar.h
+++ b/titlebar.h
@@ -1,7 +1,7 @@
 /*
  * titlebar.h - titlebar management header
  *
- * 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
@@ -22,7 +22,7 @@
 #ifndef AWESOME_TITLEBAR_H
 #define AWESOME_TITLEBAR_H
 
-#include "wibox.h"
+#include "objects/wibox.h"
 #include "objects/client.h"
 #include "window.h"