diff --git a/pluma/smclient/eggsmclient-xsmp.c b/pluma/smclient/eggsmclient-xsmp.c
index 0d359df..df2aa58 100755
--- a/pluma/smclient/eggsmclient-xsmp.c
+++ b/pluma/smclient/eggsmclient-xsmp.c
@@ -36,6 +36,7 @@
 #include <X11/SM/SMlib.h>
 
 #include <gdk/gdk.h>
+#include <gdk/gdkx.h>
 
 #define EGG_TYPE_SM_CLIENT_XSMP            (egg_sm_client_xsmp_get_type ())
 #define EGG_SM_CLIENT_XSMP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_SM_CLIENT_XSMP, EggSMClientXSMP))
diff --git a/tests/document-loader.c b/tests/document-loader.c
index 25721ba..d828af1 100644
--- a/tests/document-loader.c
+++ b/tests/document-loader.c
@@ -21,6 +21,7 @@
  */
 
 #include "pluma-gio-document-loader.h"
+#include "pluma-prefs-manager-app.h"
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 #include <glib.h>
diff --git a/tests/document-output-stream.c b/tests/document-output-stream.c
index 8c9f6de..a7e93a3 100644
--- a/tests/document-output-stream.c
+++ b/tests/document-output-stream.c
@@ -22,6 +22,7 @@
 
 
 #include "pluma-document-output-stream.h"
+#include "pluma-prefs-manager-app.h"
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 #include <glib.h>
diff --git a/tests/document-saver.c b/tests/document-saver.c
index 455ef65..5ac33d5 100644
--- a/tests/document-saver.c
+++ b/tests/document-saver.c
@@ -21,9 +21,11 @@
  */
 
 #include "pluma-gio-document-loader.h"
+#include "pluma-prefs-manager-app.h"
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 #include <glib.h>
+#include <glib/gprintf.h>
 #include <string.h>
 #include <sys/stat.h>
 
diff --git a/tests/smart-converter.c b/tests/smart-converter.c
index 58403ab..722eddd 100644
--- a/tests/smart-converter.c
+++ b/tests/smart-converter.c
@@ -25,6 +25,7 @@
 #include "pluma-encodings.h"
 #include <gio/gio.h>
 #include <glib.h>
+#include <glib/gprintf.h>
 #include <string.h>
 
 #define TEXT_TO_CONVERT "this is some text to make the tests"