diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce8fe5168..bcf0d5923 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ set(AWE_DOC_FILES
 
 set(AWE_SRCS
     ${SOURCE_DIR}/awesome.c
-    ${SOURCE_DIR}/client.c
+    ${SOURCE_DIR}/objects/client.c
     ${SOURCE_DIR}/strut.c
     ${SOURCE_DIR}/dbus.c
     ${SOURCE_DIR}/root.c
diff --git a/awesome.c b/awesome.c
index 026dc3220..d7b3212ba 100644
--- a/awesome.c
+++ b/awesome.c
@@ -31,7 +31,7 @@
 
 #include "awesome.h"
 #include "spawn.h"
-#include "client.h"
+#include "objects/client.h"
 #include "window.h"
 #include "ewmh.h"
 #include "dbus.h"
diff --git a/event.c b/event.c
index ff6140bd8..92943f114 100644
--- a/event.c
+++ b/event.c
@@ -30,7 +30,7 @@
 #include "objects/tag.h"
 #include "window.h"
 #include "ewmh.h"
-#include "client.h"
+#include "objects/client.h"
 #include "widget.h"
 #include "titlebar.h"
 #include "key.h"
diff --git a/event.h b/event.h
index 5a1a64664..3d9c17e1a 100644
--- a/event.h
+++ b/event.h
@@ -23,7 +23,7 @@
 #define AWESOME_EVENT_H
 
 #include "wibox.h"
-#include "client.h"
+#include "objects/client.h"
 
 static inline int
 awesome_refresh(void)
diff --git a/ewmh.c b/ewmh.c
index 2c784e3c2..2ae6238b4 100644
--- a/ewmh.c
+++ b/ewmh.c
@@ -28,7 +28,7 @@
 #include "ewmh.h"
 #include "objects/tag.h"
 #include "screen.h"
-#include "client.h"
+#include "objects/client.h"
 #include "widget.h"
 #include "wibox.h"
 #include "luaa.h"
diff --git a/luaa.c b/luaa.c
index e93f372af..ea80e837c 100644
--- a/luaa.c
+++ b/luaa.c
@@ -37,7 +37,7 @@
 #include "luaa.h"
 #include "spawn.h"
 #include "objects/tag.h"
-#include "client.h"
+#include "objects/client.h"
 #include "screen.h"
 #include "event.h"
 #include "selection.h"
diff --git a/client.c b/objects/client.c
similarity index 100%
rename from client.c
rename to objects/client.c
diff --git a/client.h b/objects/client.h
similarity index 100%
rename from client.h
rename to objects/client.h
diff --git a/screen.c b/screen.c
index 193098bdf..f5ae7500b 100644
--- a/screen.c
+++ b/screen.c
@@ -27,7 +27,7 @@
 #include "screen.h"
 #include "ewmh.h"
 #include "objects/tag.h"
-#include "client.h"
+#include "objects/client.h"
 #include "widget.h"
 #include "wibox.h"
 #include "luaa.h"
diff --git a/stack.c b/stack.c
index cb58ec33e..39ced9523 100644
--- a/stack.c
+++ b/stack.c
@@ -21,7 +21,7 @@
 
 #include "ewmh.h"
 #include "stack.h"
-#include "client.h"
+#include "objects/client.h"
 
 void
 stack_client_remove(client_t *c)
diff --git a/titlebar.c b/titlebar.c
index c1cb9994e..f3a074909 100644
--- a/titlebar.c
+++ b/titlebar.c
@@ -22,7 +22,7 @@
 #include <xcb/xcb.h>
 
 #include "titlebar.h"
-#include "client.h"
+#include "objects/client.h"
 #include "widget.h"
 #include "wibox.h"
 #include "screen.h"
diff --git a/titlebar.h b/titlebar.h
index 42d0af666..7fc21b28c 100644
--- a/titlebar.h
+++ b/titlebar.h
@@ -23,7 +23,7 @@
 #define AWESOME_TITLEBAR_H
 
 #include "wibox.h"
-#include "client.h"
+#include "objects/client.h"
 #include "window.h"
 
 client_t * client_getbytitlebar(wibox_t *);
diff --git a/wibox.c b/wibox.c
index d66a8fccd..21ba0731f 100644
--- a/wibox.c
+++ b/wibox.c
@@ -24,7 +24,7 @@
 #include "screen.h"
 #include "wibox.h"
 #include "titlebar.h"
-#include "client.h"
+#include "objects/client.h"
 #include "screen.h"
 #include "window.h"
 #include "luaa.h"