diff --git a/common/swindow.c b/common/swindow.c
index 4c111516b..4516b9fd4 100644
--- a/common/swindow.c
+++ b/common/swindow.c
@@ -19,9 +19,7 @@
  *
  */
 
-#include <X11/Xlib.h>
 
-#include "common/draw.h"
 #include "common/swindow.h"
 #include "common/util.h"
 
diff --git a/common/swindow.h b/common/swindow.h
index cab5476f4..a0931fe99 100644
--- a/common/swindow.h
+++ b/common/swindow.h
@@ -22,6 +22,8 @@
 #ifndef AWESOME_COMMON_SWINDOW_H
 #define AWESOME_COMMON_SWINDOW_H
 
+#include "common/draw.h"
+
 /** A simple window */
 typedef struct SimpleWindow
 {