diff --git a/client.cpp b/client.cpp
index e568b26470..7a75876cc3 100644
--- a/client.cpp
+++ b/client.cpp
@@ -58,6 +58,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QWhatsThis>
 // XLib
 #include <X11/extensions/sync.h>
+#include <X11/Xutil.h>
+#include <fixx11h.h>
 #include <xcb/xtest.h>
 // system
 #include <unistd.h>
diff --git a/client.h b/client.h
index 6cf874aafc..ec1d496d2c 100644
--- a/client.h
+++ b/client.h
@@ -36,8 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QWindow>
 // X
 #include <xcb/sync.h>
-#include <X11/Xutil.h>
-#include <fixx11h.h>
 
 // TODO: Cleanup the order of things in this .h file
 
diff --git a/killwindow.cpp b/killwindow.cpp
index 3ef9bb7820..d3e7acb1ae 100644
--- a/killwindow.cpp
+++ b/killwindow.cpp
@@ -29,6 +29,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // XLib
 #include <X11/cursorfont.h>
 #include <X11/Xcursor/Xcursor.h>
+#include <X11/Xutil.h>
+#include <fixx11h.h>
 // XCB
 #include <xcb/xcb_keysyms.h>