Make PLT-reduction work with gcc4, and don't include everything in

2005-03-15  Matthias Clasen  <mclasen@redhat.com>

	Make PLT-reduction work with gcc4, and don't include
	everything in gdkalias.h:

	* gdk/gdk.symbols: Group symbols by header and source file.
	* gdk/makegdkalias.pl: Protect definitions by the same
	preprocessor symbols used to guard the headers. Move
	the alias declarations to a separate file which is
	produced when calling makegdkalias.pl -def
	* gdk/Makefile.am (gdkaliasdef.c): Add a rule to generate this
	file.
	* gdk/*.c, gdk/x11/*.c: Include gdkalias.h after the other
	headers, include gdkaliasdef.c at the bottom.

28 files changed, 103 insertions, 29 deletions

diff --git a/gdk/x11/gdkasync.c b/gdk/x11/gdkasync.c
index 61f25fbdf1..fc9e15d633 100644
--- a/gdk/x11/gdkasync.c
+++ b/gdk/x11/gdkasync.c
@@ -48,9 +48,9 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/extensions/XIproto.h>
 #endif
 #include <X11/Xlibint.h>
-#include "gdkalias.h"
 #include "gdkasync.h"
 #include "gdkx.h"
+#include "gdkalias.h"
 
 typedef struct _ChildInfoChildState ChildInfoChildState;
 typedef struct _ChildInfoState ChildInfoState;
@@ -724,3 +724,5 @@ _gdk_x11_get_window_child_info (GdkDisplay       *display,
   return !state.have_error;
 }
 
+#define __GDK_ASYNC_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index ac212a6281..cd264c6de0 100644
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@@ -27,12 +27,12 @@
 #include <config.h>
 #include <time.h>
 
-#include "gdkalias.h"
 #include "gdkcolor.h"
 #include "gdkinternals.h"
 #include "gdkx.h"
 #include "gdkprivate-x11.h"
 #include "gdkscreen-x11.h"
+#include "gdkalias.h"
 
 typedef struct _GdkColormapPrivateX11  GdkColormapPrivateX11;
 
@@ -1526,3 +1526,6 @@ gdk_colormap_get_screen (GdkColormap *cmap)
 
   return  GDK_COLORMAP_PRIVATE_DATA (cmap)->screen;
 }
+
+#define __GDK_COLOR_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index 68dc9f1a1c..6a7b3335c9 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -31,13 +31,13 @@
 #include <X11/Xcursor/Xcursor.h>
 #endif
 
-#include "gdkalias.h"
 #include "gdkprivate-x11.h"
 #include "gdkcursor.h"
 #include "gdkpixmap-x11.h"
 #include "gdkx.h"
 #include <gdk/gdkpixmap.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include "gdkalias.h"
 
 
 /**
@@ -605,3 +605,5 @@ gdk_display_get_maximal_cursor_size (GdkDisplay *display,
 		    128, 128, width, height);
 }
 
+#define __GDK_CURSOR_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 77e7f5117a..c06603073b 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -30,7 +30,6 @@
 #include <unistd.h>
 
 #include <glib.h>
-#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdkdisplay.h"
 #include "gdkdisplay-x11.h"
@@ -39,6 +38,7 @@
 #include "gdkinternals.h"
 #include "gdkinputprivate.h"
 #include "xsettings-client.h"
+#include "gdkalias.h"
 
 #include <X11/Xatom.h>
 
@@ -1203,3 +1203,6 @@ gdk_x11_display_get_user_time (GdkDisplay *display)
 {
   return GDK_DISPLAY_X11 (display)->user_time;
 }
+
+#define __GDK_DISPLAY_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 3583e906b4..1d844c2fef 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -29,7 +29,6 @@
 #include <X11/Xatom.h>
 #include <string.h>
 
-#include "gdkalias.h"
 #include "gdk.h"          /* For gdk_flush() */
 #include "gdkx.h"
 #include "gdkasync.h"
@@ -39,6 +38,7 @@
 #include "gdkinternals.h"
 #include "gdkscreen-x11.h"
 #include "gdkdisplay-x11.h"
+#include "gdkalias.h"
 
 typedef struct _GdkDragContextPrivateX11 GdkDragContextPrivateX11;
 
@@ -3808,3 +3808,6 @@ gdk_drag_drop_succeeded (GdkDragContext *context)
 
   return !private->drop_failed;
 }
+
+#define __GDK_DND_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index d397911883..1af5cc836d 100644
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -26,7 +26,6 @@
 
 #include <config.h>
 
-#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdkregion-generic.h"
 
@@ -51,6 +50,8 @@
 #include "gdkscreen-x11.h"
 #include "gdkdisplay-x11.h"
 
+#include "gdkalias.h"
+
 static void gdk_x11_draw_rectangle (GdkDrawable    *drawable,
 				    GdkGC          *gc,
 				    gboolean        filled,
@@ -1759,3 +1760,6 @@ _gdk_x11_drawable_draw_xft_glyphs (GdkDrawable      *drawable,
       XftDrawGlyphSpec (draw, &color, xft_font, glyphs, n_glyphs);
     }
 }
+
+#define __GDK_DRAWABLE_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 82ba467e8d..f3327fadcb 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -26,7 +26,6 @@
 
 #include <config.h>
 
-#include "gdkalias.h"
 #include "gdk.h"
 #include "gdkprivate-x11.h"
 #include "gdkinternals.h"
@@ -43,6 +42,8 @@
 
 #include "gdkinputprivate.h"
 
+#include "gdkalias.h"
+
 #ifdef HAVE_XKB
 #include <X11/XKBlib.h>
 #endif
@@ -2933,3 +2934,6 @@ gdk_xsettings_watch_cb (Window   window,
       g_object_unref (gdkwin);
     }
 }
+
+#define __GDK_EVENTS_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkfont-x11.c b/gdk/x11/gdkfont-x11.c
index e7ea781a1e..d4c67b401f 100644
--- a/gdk/x11/gdkfont-x11.c
+++ b/gdk/x11/gdkfont-x11.c
@@ -31,13 +31,13 @@
 #include <X11/Xos.h>
 #include <locale.h>
 
-#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdkfont.h"
 #include "gdkprivate-x11.h"
 #include "gdkinternals.h"
 #include "gdkdisplay-x11.h"
 #include "gdkscreen-x11.h"
+#include "gdkalias.h"
 
 typedef struct _GdkFontPrivateX        GdkFontPrivateX;
 
@@ -840,3 +840,5 @@ gdk_x11_font_get_name (GdkFont *font)
   return private->names->data;
 }
      
+#define __GDK_FONT_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkgc-x11.c b/gdk/x11/gdkgc-x11.c
index 08ffde7bc9..c01128de60 100644
--- a/gdk/x11/gdkgc-x11.c
+++ b/gdk/x11/gdkgc-x11.c
@@ -26,11 +26,11 @@
 
 #include <config.h>
 
-#include "gdkalias.h"
 #include "gdkgc.h"
 #include "gdkprivate-x11.h"
 #include "gdkregion-generic.h"
 #include "gdkx.h"
+#include "gdkalias.h"
 
 #include <string.h>
 
@@ -1302,3 +1302,6 @@ _gdk_windowing_gc_get_foreground (GdkGC    *gc,
   else
     g_warning ("No colormap in _gdk_windowing_gc_get_foreground");
 }
+
+#define __GDK_GC_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkgeometry-x11.c b/gdk/x11/gdkgeometry-x11.c
index 8be30c4f92..f0b33c8636 100644
--- a/gdk/x11/gdkgeometry-x11.c
+++ b/gdk/x11/gdkgeometry-x11.c
@@ -130,7 +130,6 @@
  */
 
 #include <config.h>
-#include "gdkalias.h"
 #include "gdk.h"		/* For gdk_rectangle_intersect */
 #include "gdkprivate-x11.h"
 #include "gdkx.h"
@@ -139,6 +138,7 @@
 #include "gdkscreen-x11.h"
 #include "gdkdisplay-x11.h"
 #include "gdkwindow-x11.h"
+#include "gdkalias.h"
 
 typedef struct _GdkWindowQueueItem GdkWindowQueueItem;
 typedef struct _GdkWindowParentPos GdkWindowParentPos;
@@ -1102,3 +1102,6 @@ gdk_window_clip_changed (GdkWindow *window, GdkRectangle *old_clip, GdkRectangle
   gdk_region_destroy (new_clip_region);
   gdk_region_destroy (old_clip_region);
 }
+
+#define __GDK_GEOMETRY_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkglobals-x11.c b/gdk/x11/gdkglobals-x11.c
index 447aa317c4..5332bc5ede 100644
--- a/gdk/x11/gdkglobals-x11.c
+++ b/gdk/x11/gdkglobals-x11.c
@@ -27,7 +27,6 @@
 #include <config.h>
 #include <stdio.h>
 
-#include "gdkalias.h"
 #include "gdktypes.h"
 #include "gdkprivate-x11.h"
 
diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index f0189cd95a..0ee7356531 100644
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -30,13 +30,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdk.h"		/* For gdk_flush() */
 #include "gdkx.h"
 #include "gdkpixmap.h"
 #include "gdkinternals.h"
 #include "gdkdisplay-x11.h"
+#include "gdkalias.h"
 
 
 /* If this variable is FALSE, it indicates that we should
@@ -251,3 +251,6 @@ gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
       return i;
     }
 }
+
+#define __GDK_IM_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c
index d1970a1639..d6ca243395 100644
--- a/gdk/x11/gdkimage-x11.c
+++ b/gdk/x11/gdkimage-x11.c
@@ -47,7 +47,6 @@
 
 #include <errno.h>
 
-#include "gdkalias.h"
 #include "gdk.h"		/* For gdk_error_trap_* / gdk_flush_* */
 #include "gdkx.h"
 #include "gdkimage.h"
@@ -55,6 +54,7 @@
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
 #include "gdkscreen-x11.h"
+#include "gdkalias.h"
 
 typedef struct _GdkImagePrivateX11     GdkImagePrivateX11;
 
@@ -840,3 +840,6 @@ _gdk_windowing_get_bits_for_depth (GdkDisplay *display,
   return -1;
 }
 
+
+#define __GDK_IMAGE_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkinput-none.c b/gdk/x11/gdkinput-none.c
index f719b1bdf1..0e8cc2c971 100644
--- a/gdk/x11/gdkinput-none.c
+++ b/gdk/x11/gdkinput-none.c
@@ -18,9 +18,9 @@
  */
 
 #include <config.h>
-#include "gdkalias.h"
 #include "gdkinputprivate.h"
 #include "gdkdisplay-x11.h"
+#include "gdkalias.h"
 
 /*
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
@@ -127,3 +127,5 @@ gdk_device_set_mode (GdkDevice   *device,
   return FALSE;
 }
 
+#define __GDK_INPUT_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkinput-x11.c b/gdk/x11/gdkinput-x11.c
index 219e31dd3b..64485aab85 100644
--- a/gdk/x11/gdkinput-x11.c
+++ b/gdk/x11/gdkinput-x11.c
@@ -25,12 +25,12 @@
  */
 
 #include <config.h>
-#include "gdkalias.h"
 #include "gdkinputprivate.h"
 #include "gdkinternals.h"
 #include "gdkx.h"
 #include "gdk.h"		/* For gdk_error_trap_push()/pop() */
 #include "gdkdisplay-x11.h"
+#include "gdkalias.h"
 
 #include <string.h>
 
@@ -833,3 +833,6 @@ gdk_device_get_state (GdkDevice       *device,
       XFreeDeviceState (state);
     }
 }
+
+#define __GDK_INPUT_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkinput-xfree.c b/gdk/x11/gdkinput-xfree.c
index d9cef9bdf3..31000f14a7 100644
--- a/gdk/x11/gdkinput-xfree.c
+++ b/gdk/x11/gdkinput-xfree.c
@@ -18,9 +18,9 @@
  */
 
 #include <config.h>
-#include "gdkalias.h"
 #include "gdkinputprivate.h"
 #include "gdkdisplay-x11.h"
+#include "gdkalias.h"
 
 /*
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c
index 3436696927..f1c7f73647 100644
--- a/gdk/x11/gdkinput.c
+++ b/gdk/x11/gdkinput.c
@@ -30,13 +30,13 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
-#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdkinput.h"
 #include "gdkprivate.h"
 #include "gdkinputprivate.h"
 #include "gdkscreen-x11.h"
 #include "gdkdisplay-x11.h"
+#include "gdkalias.h"
 
 static GdkDeviceAxis gdk_input_core_axes[] = {
   { GDK_AXIS_X, 0, 0 },
@@ -445,3 +445,6 @@ gdk_device_get_axis (GdkDevice  *device,
   
   return FALSE;
 }
+
+#define __GDK_INPUT_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index 2464a5ceb5..42e5b4a64a 100644
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -33,7 +33,6 @@
 #include <limits.h>
 #include <errno.h>
 
-#include "gdkalias.h"
 #include "gdk.h"
 #include "gdkx.h"
 
@@ -41,6 +40,7 @@
 #include "gdkinternals.h"
 #include "gdkdisplay-x11.h"
 #include "gdkkeysyms.h"
+#include "gdkalias.h"
 
 #ifdef HAVE_XKB
 #include <X11/XKBlib.h>
@@ -1446,3 +1446,6 @@ _gdk_x11_get_group_for_state (GdkDisplay      *display,
       return (state & keymap_impl->group_switch_mask) ? 1 : 0;
     }
 }
+
+#define __GDK_KEYS_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 287415ebc5..21e369abf9 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -41,7 +41,6 @@
 #include <X11/XKBlib.h>
 #endif
 
-#include "gdkalias.h"
 #include "gdk.h"
 
 #include "gdkx.h"
@@ -50,6 +49,7 @@
 #include "gdkintl.h"
 #include "gdkregion-generic.h"
 #include "gdkinputprivate.h"
+#include "gdkalias.h"
 
 typedef struct _GdkPredicate  GdkPredicate;
 typedef struct _GdkErrorTrap  GdkErrorTrap;
@@ -797,4 +797,5 @@ gdk_x11_get_default_xdisplay (void)
   return GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 }
 
-
+#define __GDK_MAIN_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkpango-x11.c b/gdk/x11/gdkpango-x11.c
index 3f9cfca21c..9db3f3567a 100644
--- a/gdk/x11/gdkpango-x11.c
+++ b/gdk/x11/gdkpango-x11.c
@@ -20,12 +20,12 @@
 #include <config.h>
 #include <stdlib.h>
 
-#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdkdisplay-x11.h"
 #include "gdkpango.h"
 #include <pango/pangoxft.h>
 #include <pango/pangoxft-render.h>
+#include "gdkalias.h"
 
 #include <math.h>
 
@@ -170,3 +170,5 @@ gdk_pango_context_get_for_screen (GdkScreen *screen)
   return context;
 }
 
+#define __GDK_PANGO_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c
index 9590aace03..6181bccb5d 100644
--- a/gdk/x11/gdkpixmap-x11.c
+++ b/gdk/x11/gdkpixmap-x11.c
@@ -32,7 +32,6 @@
 #include <unistd.h>
 #include <X11/Xlib.h>
 
-#include "gdkalias.h"
 #include "gdkx.h"
 
 #include "gdkpixmap-x11.h"
@@ -41,6 +40,7 @@
 #include "gdkdisplay-x11.h"
 
 #include <gdk/gdkinternals.h>
+#include "gdkalias.h"
 
 typedef struct
 {
@@ -436,3 +436,6 @@ gdk_pixmap_lookup_for_display (GdkDisplay *display, GdkNativeWindow anid)
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
   return (GdkPixmap*) gdk_xid_table_lookup_for_display (display, anid);
 }
+
+#define __GDK_PIXMAP_X11_C__
+#include  "gdkaliasdef.c"
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index dba6a080e7..4069e018a7 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -29,7 +29,6 @@
 #include <X11/Xatom.h>
 #include <string.h>
 
-#include "gdkalias.h"
 #include "gdk.h"          /* For gdk_error_trap_push/pop() */
 #include "gdkx.h"
 #include "gdkproperty.h"
@@ -38,6 +37,7 @@
 #include "gdkdisplay-x11.h"
 #include "gdkscreen-x11.h"
 #include "gdkselection.h"	/* only from predefined atom */
+#include "gdkalias.h"
 
 static GPtrArray *virtual_atom_array;
 static GHashTable *virtual_atom_hash;
@@ -684,3 +684,6 @@ gdk_property_delete (GdkWindow *window,
 		   gdk_x11_atom_to_xatom_for_display (GDK_WINDOW_DISPLAY (window),
 						      property));
 }
+
+#define __GDK_PROPERTY_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index e62dd46bbe..cfe6008b7c 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -27,12 +27,12 @@
 #include <string.h>
 
 #include <glib.h>
-#include "gdkalias.h"
 #include "gdkscreen.h"
 #include "gdkscreen-x11.h"
 #include "gdkdisplay.h"
 #include "gdkdisplay-x11.h"
 #include "gdkx.h"
+#include "gdkalias.h"
 
 #ifdef HAVE_SOLARIS_XINERAMA
 #include <X11/extensions/xinerama.h>
@@ -710,3 +710,6 @@ gdk_screen_make_display_name (GdkScreen *screen)
   return _gdk_windowing_substitute_screen_number (old_display, 
 						  gdk_screen_get_number (screen));
 }
+
+#define __GDK_SCREEN_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index 641647cbd4..12eec95ad5 100644
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -29,13 +29,13 @@
 #include <X11/Xatom.h>
 #include <string.h>
 
-#include "gdkalias.h"
 #include "gdkx.h"
 #include "gdkproperty.h"
 #include "gdkselection.h"
 #include "gdkprivate.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
+#include "gdkalias.h"
 
 typedef struct _OwnerInfo OwnerInfo;
 
@@ -880,3 +880,6 @@ void gdk_free_compound_text (guchar *ctext)
   if (ctext)
     XFree (ctext);
 }
+
+#define __GDK_SELECTION_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkspawn-x11.c b/gdk/x11/gdkspawn-x11.c
index daa25aad5a..ced2b93e8b 100644
--- a/gdk/x11/gdkspawn-x11.c
+++ b/gdk/x11/gdkspawn-x11.c
@@ -22,11 +22,11 @@
 #include <config.h>
 #include <string.h>
 
-#include "gdkalias.h"
 #include "gdkspawn.h"
 
 #include <glib.h>
 #include <gdk/gdk.h>
+#include "gdkalias.h"
 
 extern char **environ;
 
@@ -248,3 +248,6 @@ gdk_spawn_command_line_on_screen (GdkScreen    *screen,
 
   return retval;
 }
+
+#define __GDK_SPAWN_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index 9e403461e3..95b2df7a2a 100644
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -28,11 +28,12 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
-#include "gdkalias.h"
+#include "gdkx.h"
 #include "gdkvisual.h"
 #include "gdkprivate-x11.h"
 #include "gdkscreen-x11.h"
 #include "gdkinternals.h"
+#include "gdkalias.h"
 
 struct _GdkVisualClass
 {
@@ -665,3 +666,6 @@ gdk_visual_get_screen (GdkVisual *visual)
 
   return  ((GdkVisualPrivate*) visual)->screen;
 }
+
+#define __GDK_VISUAL_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 3c86ba9dc0..ac0883b658 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -32,7 +32,6 @@
 #include <netinet/in.h>
 #include <unistd.h>
 
-#include "gdkalias.h"
 #include "gdk.h"
 
 #include "gdkwindow.h"
@@ -44,6 +43,7 @@
 #include "gdkinternals.h"
 #include "MwmUtil.h"
 #include "gdkwindow-x11.h"
+#include "gdkalias.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -5899,3 +5899,6 @@ gdk_window_configure_finished (GdkWindow *window)
     }
 #endif
 }
+
+#define __GDK_WINDOW_X11_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkxid.c b/gdk/x11/gdkxid.c
index 0c1a6051d4..b192f8c8b8 100644
--- a/gdk/x11/gdkxid.c
+++ b/gdk/x11/gdkxid.c
@@ -25,9 +25,10 @@
  */
 
 #include <config.h>
-#include "gdkalias.h"
+#include "gdkx.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
+#include "gdkalias.h"
 #include <stdio.h>
 
 static guint     gdk_xid_hash  (XID *xid);
@@ -124,3 +125,6 @@ gdk_xid_equal (XID *a,
 {
   return (*a == *b);
 }
+
+#define __GDK_XID_C__
+#include "gdkaliasdef.c"