diff --git a/smclient/eggsmclient-private.h b/smclient/eggsmclient-private.h
index 47fda7f2eb..e39cee9161 100644
--- a/smclient/eggsmclient-private.h
+++ b/smclient/eggsmclient-private.h
@@ -20,7 +20,7 @@
 #ifndef __EGG_SM_CLIENT_PRIVATE_H__
 #define __EGG_SM_CLIENT_PRIVATE_H__
 
-#include <gdkconfig.h>
+#include <gdk/gdk.h>
 #include "eggsmclient.h"
 
 G_BEGIN_DECLS
diff --git a/smclient/eggsmclient-xsmp.c b/smclient/eggsmclient-xsmp.c
index 7ae1feb0f2..c838766da7 100644
--- a/smclient/eggsmclient-xsmp.c
+++ b/smclient/eggsmclient-xsmp.c
@@ -35,7 +35,7 @@
 #include <unistd.h>
 #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 ())
@@ -378,7 +378,7 @@ sm_client_xsmp_startup (EggSMClient *client,
       free (ret_client_id);
 
       gdk_threads_enter ();
-      gdk_set_sm_client_id (xsmp->client_id);
+      gdk_x11_set_sm_client_id (xsmp->client_id);
       gdk_threads_leave ();
 
       g_debug ("Got client ID \"%s\"", xsmp->client_id);