diff --git a/ChangeLog b/ChangeLog
index 75eefe700c..47173159c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-03  Sven Neumann  <sven@convergence.de>
+
+	* demos/testpixbuf-save.c: include target-specific headers as
+	done in testpixbuf-drawable.c
+
 Wed May  2 20:36:38 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c (gtk_entry_real_insert_text): Reduce
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 75eefe700c..47173159c9 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-05-03  Sven Neumann  <sven@convergence.de>
+
+	* demos/testpixbuf-save.c: include target-specific headers as
+	done in testpixbuf-drawable.c
+
 Wed May  2 20:36:38 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c (gtk_entry_real_insert_text): Reduce
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 75eefe700c..47173159c9 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-05-03  Sven Neumann  <sven@convergence.de>
+
+	* demos/testpixbuf-save.c: include target-specific headers as
+	done in testpixbuf-drawable.c
+
 Wed May  2 20:36:38 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c (gtk_entry_real_insert_text): Reduce
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 75eefe700c..47173159c9 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-05-03  Sven Neumann  <sven@convergence.de>
+
+	* demos/testpixbuf-save.c: include target-specific headers as
+	done in testpixbuf-drawable.c
+
 Wed May  2 20:36:38 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c (gtk_entry_real_insert_text): Reduce
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 75eefe700c..47173159c9 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-05-03  Sven Neumann  <sven@convergence.de>
+
+	* demos/testpixbuf-save.c: include target-specific headers as
+	done in testpixbuf-drawable.c
+
 Wed May  2 20:36:38 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c (gtk_entry_real_insert_text): Reduce
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 75eefe700c..47173159c9 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-05-03  Sven Neumann  <sven@convergence.de>
+
+	* demos/testpixbuf-save.c: include target-specific headers as
+	done in testpixbuf-drawable.c
+
 Wed May  2 20:36:38 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c (gtk_entry_real_insert_text): Reduce
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 75eefe700c..47173159c9 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-05-03  Sven Neumann  <sven@convergence.de>
+
+	* demos/testpixbuf-save.c: include target-specific headers as
+	done in testpixbuf-drawable.c
+
 Wed May  2 20:36:38 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c (gtk_entry_real_insert_text): Reduce
diff --git a/demos/testpixbuf-save.c b/demos/testpixbuf-save.c
index a97fd95858..ce45a8c6c8 100644
--- a/demos/testpixbuf-save.c
+++ b/demos/testpixbuf-save.c
@@ -1,10 +1,15 @@
 
-#include <config.h>
-/* if building outside GTK, remove /x11 part */
-#include <gdk/x11/gdkx.h>
-#include <gtk/gtk.h>
+#include "config.h"
 #include <stdio.h>
 
+#include <gtk/gtk.h>
+
+#ifdef GDK_WINDOWING_X11
+#include <gdk/x11/gdkx.h>
+#elif defined (GDK_WINDOWING_WIN32)
+#include <gdk/win32/gdkwin32.h>
+#endif
+
 
 void
 keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)