diff --git a/ChangeLog b/ChangeLog
index 78dcd21866..503f90b839 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-09  Cody Russell  <bratsche@gnome.org>
+
+	* gdk/win32/gdkwin32.h: Add potentially missing #defines for
+	XBUTTON1, etc.  Fixes the build that was broken in r21746.
+
 2009-02-09  Takao Fujiwara  <takao.fujiwara@sun.com>
 
 	Bug 571015 – libprintbackend-cups has unlocalized strings
diff --git a/gdk/win32/gdkwin32.h b/gdk/win32/gdkwin32.h
index c89c90e453..bf1fd4b160 100644
--- a/gdk/win32/gdkwin32.h
+++ b/gdk/win32/gdkwin32.h
@@ -56,6 +56,25 @@ G_BEGIN_DECLS
 #define GDK_ROOT_WINDOW()             ((guint32) HWND_DESKTOP)
 #define GDK_DISPLAY()                 NULL
 
+
+/* These need to be here so gtkstatusicon.c can pick them up if needed. */
+#ifndef WM_XBUTTONDOWN
+#define WM_XBUTTONDOWN 0x020B
+#endif
+#ifndef WM_XBUTTONUP
+#define WM_XBUTTONUP 0x020C
+#endif
+#ifndef GET_XBUTTON_WPARAM
+#define GET_XBUTTON_WPARAM(w) (HIWORD(w))
+#endif
+#ifndef XBUTTON1
+#define XBUTTON1 1
+#endif
+#ifndef XBUTTON2
+#define XBUTTON2 2
+#endif
+
+
 /* Return the Gdk* for a particular HANDLE */
 gpointer      gdk_win32_handle_table_lookup (GdkNativeWindow handle);