diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4514336a3..d93fae0e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,6 @@ set(AWE_SRCS
     ${SOURCE_DIR}/mousegrabber.c
     ${SOURCE_DIR}/property.c
     ${SOURCE_DIR}/root.c
-    ${SOURCE_DIR}/screen.c
     ${SOURCE_DIR}/selection.c
     ${SOURCE_DIR}/spawn.c
     ${SOURCE_DIR}/stack.c
@@ -71,6 +70,7 @@ set(AWE_SRCS
     ${SOURCE_DIR}/objects/drawable.c
     ${SOURCE_DIR}/objects/drawin.c
     ${SOURCE_DIR}/objects/key.c
+    ${SOURCE_DIR}/objects/screen.c
     ${SOURCE_DIR}/objects/tag.c
     ${SOURCE_DIR}/objects/timer.c
     ${SOURCE_DIR}/objects/window.c)
diff --git a/awesome.c b/awesome.c
index cb131e99b..33ec50cfd 100644
--- a/awesome.c
+++ b/awesome.c
@@ -39,13 +39,13 @@
 #include "awesome.h"
 #include "spawn.h"
 #include "objects/client.h"
+#include "objects/screen.h"
 #include "xwindow.h"
 #include "ewmh.h"
 #include "dbus.h"
 #include "systray.h"
 #include "event.h"
 #include "property.h"
-#include "screen.h"
 #include "luaa.h"
 #include "common/version.h"
 #include "common/atoms.h"
diff --git a/banning.c b/banning.c
index c20758639..00e165416 100644
--- a/banning.c
+++ b/banning.c
@@ -20,8 +20,8 @@
  */
 
 #include "banning.h"
+#include "objects/screen.h"
 #include "objects/tag.h"
-#include "screen.h"
 
 /** Reban windows following current selected tags.
  * \param screen The screen to arrange.
diff --git a/draw.c b/draw.c
index 1a0e4d8f9..f38e7781b 100644
--- a/draw.c
+++ b/draw.c
@@ -32,8 +32,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "globalconf.h"
-#include "screen.h"
-
+#include "objects/screen.h"
 #include "common/xutil.h"
 
 /** Convert text from any charset to UTF-8 using iconv.
diff --git a/event.c b/event.c
index 0592c3b54..27ff0479d 100644
--- a/event.c
+++ b/event.c
@@ -39,7 +39,7 @@
 #include "mousegrabber.h"
 #include "luaa.h"
 #include "systray.h"
-#include "screen.h"
+#include "objects/screen.h"
 #include "common/atoms.h"
 #include "common/xutil.h"
 
diff --git a/ewmh.c b/ewmh.c
index 817957db2..042cf08c3 100644
--- a/ewmh.c
+++ b/ewmh.c
@@ -26,9 +26,9 @@
 #include <xcb/xcb_atom.h>
 
 #include "ewmh.h"
-#include "objects/tag.h"
-#include "screen.h"
 #include "objects/client.h"
+#include "objects/screen.h"
+#include "objects/tag.h"
 #include "luaa.h"
 #include "common/atoms.h"
 #include "common/buffer.h"
diff --git a/luaa.c b/luaa.c
index 8def66c79..a19fbf0df 100644
--- a/luaa.c
+++ b/luaa.c
@@ -40,7 +40,7 @@
 #include "objects/client.h"
 #include "objects/drawin.h"
 #include "objects/drawable.h"
-#include "screen.h"
+#include "objects/screen.h"
 #include "event.h"
 #include "property.h"
 #include "selection.h"
diff --git a/mouse.c b/mouse.c
index 8caf05dac..5bb7bfa12 100644
--- a/mouse.c
+++ b/mouse.c
@@ -20,7 +20,7 @@
  */
 
 #include "mouse.h"
-#include "screen.h"
+#include "objects/screen.h"
 #include "objects/client.h"
 #include "globalconf.h"
 #include "objects/drawin.h"
diff --git a/objects/client.c b/objects/client.c
index 0dda6a6fa..8f639fb86 100644
--- a/objects/client.c
+++ b/objects/client.c
@@ -24,8 +24,8 @@
 #include <cairo-xcb.h>
 
 #include "objects/tag.h"
+#include "objects/screen.h"
 #include "ewmh.h"
-#include "screen.h"
 #include "systray.h"
 #include "property.h"
 #include "spawn.h"
diff --git a/objects/drawin.c b/objects/drawin.c
index 28ed15945..22fc3966e 100644
--- a/objects/drawin.c
+++ b/objects/drawin.c
@@ -20,10 +20,9 @@
  *
  */
 
-#include "screen.h"
 #include "drawin.h"
 #include "objects/client.h"
-#include "screen.h"
+#include "objects/screen.h"
 #include "xwindow.h"
 #include "luaa.h"
 #include "ewmh.h"
diff --git a/screen.c b/objects/screen.c
similarity index 99%
rename from screen.c
rename to objects/screen.c
index b5716267f..029a92ad7 100644
--- a/screen.c
+++ b/objects/screen.c
@@ -25,11 +25,11 @@
 #include <xcb/xinerama.h>
 #include <xcb/randr.h>
 
-#include "screen.h"
-#include "ewmh.h"
+#include "objects/screen.h"
 #include "objects/tag.h"
 #include "objects/client.h"
 #include "objects/drawin.h"
+#include "ewmh.h"
 #include "luaa.h"
 #include "common/xutil.h"
 
diff --git a/screen.h b/objects/screen.h
similarity index 100%
rename from screen.h
rename to objects/screen.h
diff --git a/objects/window.c b/objects/window.c
index 7e81bf23a..8184dbd77 100644
--- a/objects/window.c
+++ b/objects/window.c
@@ -22,8 +22,8 @@
 #include "luaa.h"
 #include "xwindow.h"
 #include "ewmh.h"
-#include "screen.h"
 #include "property.h"
+#include "objects/screen.h"
 #include "objects/window.h"
 #include "common/atoms.h"
 #include "common/luaobject.h"
diff --git a/property.c b/property.c
index 13c340eef..9b3d26499 100644
--- a/property.c
+++ b/property.c
@@ -21,11 +21,11 @@
 
 #include <xcb/xcb_atom.h>
 
-#include "screen.h"
 #include "property.h"
-#include "objects/client.h"
 #include "ewmh.h"
+#include "objects/client.h"
 #include "objects/drawin.h"
+#include "objects/screen.h"
 #include "xwindow.h"
 #include "luaa.h"
 #include "common/atoms.h"
diff --git a/spawn.c b/spawn.c
index 01e255cc5..d5e393960 100644
--- a/spawn.c
+++ b/spawn.c
@@ -27,7 +27,6 @@
 #include <glib.h>
 
 #include "spawn.h"
-#include "screen.h"
 #include "luaa.h"
 #include "event.h"
 
diff --git a/stack.c b/stack.c
index 42f25abdf..3f21509f8 100644
--- a/stack.c
+++ b/stack.c
@@ -20,7 +20,6 @@
  */
 
 #include "ewmh.h"
-#include "screen.h"
 #include "stack.h"
 #include "objects/client.h"
 #include "objects/drawin.h"
diff --git a/systray.c b/systray.c
index 22a98c9e7..e4824b5f8 100644
--- a/systray.c
+++ b/systray.c
@@ -24,7 +24,6 @@
 #include <xcb/xcb_atom.h>
 
 #include "luaa.h"
-#include "screen.h"
 #include "systray.h"
 #include "xwindow.h"
 #include "common/array.h"