diff --git a/ChangeLog b/ChangeLog
index a4ae967a79..1c2a3cf3d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,5 @@
 2005-07-21  Tor Lillqvist  <tml@novell.com>
 
-	* gtk/gtkwindow.c (gtk_window_show): No need for ifdef, can now
-	use GTK_IS_PLUG() with all backends.
-
 	* gtk/gtk.symbols: Make GtkPlug/Socket API available with all
 	backends.
 
@@ -32,6 +29,11 @@
 	* gtk/gtkxembed.c (_gtk_xembed_message_name): New function, used
 	in error messages and debugging output.
 	
+	* gtk/gtkwindow.c (gtk_window_show): No need for ifdef, can now
+	use GTK_IS_PLUG() with all backends.
+
+	* tests/testsocket_common.c: Make it work on Win32, too.
+
 2005-07-21  Tor Lillqvist  <tml@novell.com>
 
 	* gdk/win32/gdkwindow-win32.c (gdk_window_set_title): Use
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a4ae967a79..1c2a3cf3d5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,8 +1,5 @@
 2005-07-21  Tor Lillqvist  <tml@novell.com>
 
-	* gtk/gtkwindow.c (gtk_window_show): No need for ifdef, can now
-	use GTK_IS_PLUG() with all backends.
-
 	* gtk/gtk.symbols: Make GtkPlug/Socket API available with all
 	backends.
 
@@ -32,6 +29,11 @@
 	* gtk/gtkxembed.c (_gtk_xembed_message_name): New function, used
 	in error messages and debugging output.
 	
+	* gtk/gtkwindow.c (gtk_window_show): No need for ifdef, can now
+	use GTK_IS_PLUG() with all backends.
+
+	* tests/testsocket_common.c: Make it work on Win32, too.
+
 2005-07-21  Tor Lillqvist  <tml@novell.com>
 
 	* gdk/win32/gdkwindow-win32.c (gdk_window_set_title): Use
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a4ae967a79..1c2a3cf3d5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,8 +1,5 @@
 2005-07-21  Tor Lillqvist  <tml@novell.com>
 
-	* gtk/gtkwindow.c (gtk_window_show): No need for ifdef, can now
-	use GTK_IS_PLUG() with all backends.
-
 	* gtk/gtk.symbols: Make GtkPlug/Socket API available with all
 	backends.
 
@@ -32,6 +29,11 @@
 	* gtk/gtkxembed.c (_gtk_xembed_message_name): New function, used
 	in error messages and debugging output.
 	
+	* gtk/gtkwindow.c (gtk_window_show): No need for ifdef, can now
+	use GTK_IS_PLUG() with all backends.
+
+	* tests/testsocket_common.c: Make it work on Win32, too.
+
 2005-07-21  Tor Lillqvist  <tml@novell.com>
 
 	* gdk/win32/gdkwindow-win32.c (gdk_window_set_title): Use
diff --git a/tests/testsocket_common.c b/tests/testsocket_common.c
index 6d374de98e..a4760893da 100644
--- a/tests/testsocket_common.c
+++ b/tests/testsocket_common.c
@@ -21,8 +21,12 @@
 #undef GTK_DISABLE_DEPRECATED
 
 #include <config.h>
-#include "x11/gdkx.h"
 #include <gtk/gtk.h>
+#if defined (GDK_WINDOWING_X11)
+#include "x11/gdkx.h"
+#elif defined (GDK_WINDOWING_WIN32)
+#include "win32/gdkwin32.h"
+#endif
 
 enum
 {
@@ -264,7 +268,11 @@ create_child_plug (guint32  xid,
   gtk_widget_show_all (window);
 
   if (GTK_WIDGET_REALIZED (window))
+#if defined (GDK_WINDOWING_X11)
     return GDK_WINDOW_XID (window->window);
+#elif defined (GDK_WINDOWING_WIN32)
+    return (guint32) GDK_WINDOW_HWND (window->window);
+#endif
   else
     return 0;
 }