diff --git a/ChangeLog b/ChangeLog
index 3d34f9dce7..75d0c28cf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 2006-04-03  Matthias Clasen  <mclasen@redhat.com>
 
-	* gdk/win32/gdkpixmap-win32.c: Include gdksreen.h  (#337032,
+	* gdk/gdkinternals.h: 
+	* gdk/x11/gdkmain-x11.c: 
+	* gdk/win32/gdkmain-win32.c: 
+	* gdk/directfb/gdkdisplay-directfb.c: 
+	* gdk/quartz/gdkmain-quartz.c: Make _gdk_windowing_args const.
+
+	* gdk/win32/gdkpixmap-win32.c: Include gdkscreen.h  (#337032,
 	 Kazuki IWAMOTO)
 
 	* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Mention
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3d34f9dce7..75d0c28cf2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,6 +1,12 @@
 2006-04-03  Matthias Clasen  <mclasen@redhat.com>
 
-	* gdk/win32/gdkpixmap-win32.c: Include gdksreen.h  (#337032,
+	* gdk/gdkinternals.h: 
+	* gdk/x11/gdkmain-x11.c: 
+	* gdk/win32/gdkmain-win32.c: 
+	* gdk/directfb/gdkdisplay-directfb.c: 
+	* gdk/quartz/gdkmain-quartz.c: Make _gdk_windowing_args const.
+
+	* gdk/win32/gdkpixmap-win32.c: Include gdkscreen.h  (#337032,
 	 Kazuki IWAMOTO)
 
 	* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Mention
diff --git a/gdk/directfb/gdkdisplay-directfb.c b/gdk/directfb/gdkdisplay-directfb.c
index 16cf8860b3..209bf1dc2e 100644
--- a/gdk/directfb/gdkdisplay-directfb.c
+++ b/gdk/directfb/gdkdisplay-directfb.c
@@ -50,7 +50,7 @@ static gint       gdk_directfb_glyph_surface_cache = 8;
 static gchar 	 *directfb_args;
 
 
-GOptionEntry _gdk_windowing_args[] =
+const GOptionEntry _gdk_windowing_args[] =
 {
   { "dfb",0,0,G_OPTION_ARG_STRING,&directfb_args,N_("directfb arg"),N_("sdl|system")}, 
   { "dfb-help",0,0,G_OPTION_ARG_NONE, NULL,NULL},
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index b38fca6709..d3c1fbad57 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -261,7 +261,7 @@ void _gdk_cursor_destroy (GdkCursor *cursor);
 
 void     _gdk_windowing_init                    (void);
 
-extern GOptionEntry _gdk_windowing_args[];
+extern const GOptionEntry _gdk_windowing_args[];
 void     _gdk_windowing_set_default_display     (GdkDisplay *display);
 
 gchar *_gdk_windowing_substitute_screen_number (const gchar *display_name,
diff --git a/gdk/quartz/gdkmain-quartz.c b/gdk/quartz/gdkmain-quartz.c
index 328b92934e..a4f29c63bc 100644
--- a/gdk/quartz/gdkmain-quartz.c
+++ b/gdk/quartz/gdkmain-quartz.c
@@ -23,7 +23,7 @@
 #include "gdk.h"
 #include <ApplicationServices/ApplicationServices.h>
 
-GOptionEntry _gdk_windowing_args[] = {
+const GOptionEntry _gdk_windowing_args[] = {
   { NULL }
 };
 
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index 0c4be65f21..37ca44b563 100644
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -55,7 +55,7 @@ static gboolean gdk_synchronize = FALSE;
 
 static gboolean dummy;
 
-GOptionEntry _gdk_windowing_args[] = {
+const GOptionEntry _gdk_windowing_args[] = {
   { "sync", 0, 0, G_OPTION_ARG_NONE, &gdk_synchronize, 
     /* Description of --sync in --help output */              N_("Don't batch GDI requests"), NULL },
   { "no-wintab", 0, 0, G_OPTION_ARG_NONE, &_gdk_input_ignore_wintab, 
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 7738abde73..72f7339749 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -87,7 +87,7 @@ static int	    gdk_x_io_error		 (Display     *display);
 static GSList *gdk_error_traps = NULL;               /* List of error traps */
 static GSList *gdk_error_trap_free_list = NULL;      /* Free list */
 
-GOptionEntry _gdk_windowing_args[] = {
+const GOptionEntry _gdk_windowing_args[] = {
   { "sync", 0, 0, G_OPTION_ARG_NONE, &_gdk_synchronize, 
     /* Description of --sync in --help output */ N_("Make X calls synchronous"), NULL },
   { NULL }