diff --git a/gfx/common/x11_common.c b/gfx/common/x11_common.c
index edcb33f4cc..a885313d4d 100644
--- a/gfx/common/x11_common.c
+++ b/gfx/common/x11_common.c
@@ -31,6 +31,8 @@
 
 #include <X11/extensions/xf86vmode.h>
 
+#include "dbus_common.h"
+
 #include "../../frontend/frontend_driver.h"
 #include "../../input/common/input_x11_common.h"
 #include "../../verbosity.h"
diff --git a/gfx/common/xinerama_common.h b/gfx/common/xinerama_common.h
index bed750930a..e66c17b849 100644
--- a/gfx/common/xinerama_common.h
+++ b/gfx/common/xinerama_common.h
@@ -17,10 +17,6 @@
 #ifndef XINERAMA_COMMON_H__
 #define XINERAMA_COMMON_H__
 
-#ifdef HAVE_CONFIG_H
-#include "../../config.h"
-#endif
-
 #include <boolean.h>
 
 #include "x11_common.h"