diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7909ad7f..ce8fe516 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,7 @@ set(AWE_SRCS
     ${SOURCE_DIR}/selection.c
     ${SOURCE_DIR}/wibox.c
     ${SOURCE_DIR}/systray.c
-    ${SOURCE_DIR}/tag.c
+    ${SOURCE_DIR}/objects/tag.c
     ${SOURCE_DIR}/titlebar.c
     ${SOURCE_DIR}/widget.c
     ${SOURCE_DIR}/window.c
diff --git a/banning.c b/banning.c
index df54ef94..2349ef37 100644
--- a/banning.c
+++ b/banning.c
@@ -20,7 +20,8 @@
  */
 
 #include "banning.h"
-#include "client.h"
+#include "objects/tag.h"
+#include "window.h"
 #include "titlebar.h"
 #include "screen.h"
 
diff --git a/client.c b/client.c
index 5f99d95a..9ff46ead 100644
--- a/client.c
+++ b/client.c
@@ -22,7 +22,7 @@
 #include <xcb/xcb_atom.h>
 #include <xcb/xcb_image.h>
 
-#include "tag.h"
+#include "objects/tag.h"
 #include "ewmh.h"
 #include "screen.h"
 #include "titlebar.h"
diff --git a/event.c b/event.c
index a68f07d6..ff6140bd 100644
--- a/event.c
+++ b/event.c
@@ -27,7 +27,7 @@
 
 #include "awesome.h"
 #include "event.h"
-#include "tag.h"
+#include "objects/tag.h"
 #include "window.h"
 #include "ewmh.h"
 #include "client.h"
diff --git a/ewmh.c b/ewmh.c
index 43edb7af..2c784e3c 100644
--- a/ewmh.c
+++ b/ewmh.c
@@ -26,7 +26,7 @@
 #include <xcb/xcb_atom.h>
 
 #include "ewmh.h"
-#include "tag.h"
+#include "objects/tag.h"
 #include "screen.h"
 #include "client.h"
 #include "widget.h"
diff --git a/luaa.c b/luaa.c
index 7a806677..e93f372a 100644
--- a/luaa.c
+++ b/luaa.c
@@ -36,7 +36,7 @@
 #include "ewmh.h"
 #include "luaa.h"
 #include "spawn.h"
-#include "tag.h"
+#include "objects/tag.h"
 #include "client.h"
 #include "screen.h"
 #include "event.h"
diff --git a/screen.c b/screen.c
index 745e47f0..193098bd 100644
--- a/screen.c
+++ b/screen.c
@@ -26,7 +26,7 @@
 
 #include "screen.h"
 #include "ewmh.h"
-#include "tag.h"
+#include "objects/tag.h"
 #include "client.h"
 #include "widget.h"
 #include "wibox.h"