diff --git a/event.h b/event.h
index dcf1aeef..77cee2b4 100644
--- a/event.h
+++ b/event.h
@@ -24,16 +24,14 @@
 
 #include <xcb/xcb.h>
 
-#include "statusbar.h"
-#include "titlebar.h"
+#include "wibox.h"
 #include "layout.h"
 
 static inline int
 awesome_refresh(xcb_connection_t *c)
 {
     layout_refresh();
-    statusbar_refresh();
-    titlebar_refresh();
+    wibox_refresh();
     return xcb_flush(c);
 }
 
diff --git a/luaa.c b/luaa.c
index 308e5923..32783fae 100644
--- a/luaa.c
+++ b/luaa.c
@@ -46,6 +46,8 @@
 #include "client.h"
 #include "screen.h"
 #include "event.h"
+#include "statusbar.h"
+#include "titlebar.h"
 #include "mouse.h"
 #include "layouts/tile.h"
 #include "common/socket.h"
diff --git a/wibox.c b/wibox.c
index 0c89eef0..88504936 100644
--- a/wibox.c
+++ b/wibox.c
@@ -19,4 +19,15 @@
  *
  */
 
+#include "wibox.h"
+#include "statusbar.h"
+#include "titlebar.h"
+
+void
+wibox_refresh(void)
+{
+    statusbar_refresh();
+    titlebar_refresh();
+}
+
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/wibox.h b/wibox.h
index c8c81705..1d3dd324 100644
--- a/wibox.h
+++ b/wibox.h
@@ -28,6 +28,8 @@
 #include "common/refcount.h"
 #include "common/array.h"
 
+void wibox_refresh(void);
+
 static inline void
 wibox_delete(wibox_t **wibox)
 {