diff --git a/src/core/display-private.h b/src/core/display-private.h
index 6008de05f..220fd4da0 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -31,10 +31,6 @@
 #include <X11/extensions/sync.h>
 #include <X11/Xlib.h>
 
-#ifdef HAVE_STARTUP_NOTIFICATION
-#include <libsn/sn.h>
-#endif
-
 #include "clutter/clutter.h"
 #include "core/keybindings-private.h"
 #include "core/meta-gesture-tracker-private.h"
diff --git a/src/tests/test-utils.c b/src/tests/test-utils.c
index 0f4c16510..b0e7022c2 100644
--- a/src/tests/test-utils.c
+++ b/src/tests/test-utils.c
@@ -23,6 +23,7 @@
 
 #include <gio/gio.h>
 #include <string.h>
+#include <X11/Xlib-xcb.h>
 
 #include "core/display-private.h"
 #include "core/window-private.h"
diff --git a/src/x11/meta-startup-notification-x11.c b/src/x11/meta-startup-notification-x11.c
index 70aa2ac0f..42be6d580 100644
--- a/src/x11/meta-startup-notification-x11.c
+++ b/src/x11/meta-startup-notification-x11.c
@@ -20,6 +20,7 @@
 #include "meta-startup-notification-x11.h"
 
 #include <gio/gdesktopappinfo.h>
+#include <libsn/sn.h>
 
 #include "core/display-private.h"
 #include "core/startup-notification-private.h"