gtk/: fully remove gtkalias hacks

https://bugzilla.gnome.org/show_bug.cgi?id=623845
author: Javier Jardón <jjardon@gnome.org> 2010-07-09 19:22:23 +0200
committer: Javier Jardón <jjardon@gnome.org> 2010-07-10 02:51:26 +0200
commit: 0a07e9733bb259598a09515a3e4cdbcda5feef57 (patch)
tree: bee311d43223a52378054d1dd6e90c68dcb66b74 /gtk
parent: 404e7d0e0013355549578db5c3981943f536c2b9 (diff)
download: gtk+-0a07e9733bb259598a09515a3e4cdbcda5feef57.tar.gz
244 files changed, 69 insertions, 1144 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 08cc18d479..8e012678ff 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -103,20 +103,9 @@ endif
 gtk.def: gtk.symbols
 	(echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gtk.symbols | $(SED) -e '/^$$/d' -e 's/^/	/' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gtk.def
 
-gtkalias.h: gtk.symbols
-	  $(PERL) $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h
-gtkaliasdef.c: gtk.symbols
-	  $(PERL) $(srcdir)/makegtkalias.pl -def < $(srcdir)/gtk.symbols > gtkaliasdef.c
-
-check-aliases:
-	@$(TESTS_ENVIRONMENT) $(srcdir)/aliasfilescheck.sh
-
-.PHONY: check-aliases
-
 TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)"
-TESTS = aliasfilescheck.sh
 if OS_LINUX
-TESTS += abicheck.sh pltcheck.sh
+TESTS = abicheck.sh
 endif
 
 libgtkincludedir = $(includedir)/gtk-3.0/gtk
@@ -732,13 +721,11 @@ gtk_built_public_sources =			\
 
 # built headers that don't get installed
 gtk_built_private_headers =			\
-	gtkalias.h				\
 	gtkmarshalers.h				\
 	gtkbuiltincache.h			\
 	gtkimcontextsimpleseqs.h
 
 gtk_built_sources =				\
-	gtkaliasdef.c				\
 	gtktypebuiltins.c			\
 	gtktypefuncs.c				\
 	gtkmarshalers.c				\
@@ -794,7 +781,6 @@ stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list
 	&& echo timestamp > $(@F)	
 gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
 	(echo "#include \"gtkmarshalers.h\""; \
-	 echo "#include \"gtkalias.h\""; \
 	 $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body) >> xgen-gmlc \
 	&& cp xgen-gmlc gtkmarshalers.c \
 	&& rm -f xgen-gmlc
@@ -1331,10 +1317,7 @@ EXTRA_DIST +=                   \
 	gtkrc.key.mac		\
 	makefile.msc		\
 	makefile.msc.in		\
-	makegtkalias.pl		\
-	aliasfilescheck.sh	\
 	abicheck.sh		\
-	pltcheck.sh		\
 	gtktypebuiltins.c.template      \
 	gtktypebuiltins.h.template
 
diff --git a/gtk/aliasfilescheck.sh b/gtk/aliasfilescheck.sh
deleted file mode 100755
index 31b49d4510..0000000000
--- a/gtk/aliasfilescheck.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-if test "x$gtk_all_c_sources" = x; then
-	echo gtk_all_c_sources variable not defined
-	exit 1
-fi
-
-grep 'IN_FILE' ${srcdir-.}/gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files
-{ cd ${srcdir-.}; grep '^ *# *define __' $gtk_all_c_sources; } | sed 's/.*define //;s/ *$//' | sort > actual-files
-
-diff expected-files actual-files && rm -f expected-files actual-files
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 6b17f1c2ec..f81d1ebada 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -55,8 +55,6 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkaboutdialog
@@ -2441,6 +2439,3 @@ gtk_show_about_dialog (GtkWindow   *parent,
 
   gtk_window_present (GTK_WINDOW (dialog));
 }
-
-#define __GTK_ABOUT_DIALOG_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index b920f8ea73..79f28591e5 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -36,7 +36,7 @@
 #include "gtkmain.h"		/* For _gtk_boolean_handled_accumulator */
 #include "gdk/gdkkeysyms.h"
 #include "gtkmarshalers.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkaccelgroup
@@ -1466,6 +1466,3 @@ gtk_accelerator_get_default_mod_mask (void)
 {
   return default_accel_mod_mask;
 }
-
-#define __GTK_ACCEL_GROUP_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index c02be06cc5..9193ea5bf1 100644
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -35,7 +35,7 @@
 #include "gtkmain.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 #include <gdk/gdkkeysyms.h>
 
 /**
@@ -899,6 +899,3 @@ gtk_accel_label_refetch (GtkAccelLabel *accel_label)
 
   return FALSE;
 }
-
-#define __GTK_ACCEL_LABEL_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c
index 31028688f4..2070011dbc 100644
--- a/gtk/gtkaccelmap.c
+++ b/gtk/gtkaccelmap.c
@@ -23,8 +23,7 @@
 
 #include "gtkmarshalers.h"
 #include "gtkwindow.h"  /* in lack of GtkAcceleratable */
-#include "gtkintl.h" 
-#include "gtkalias.h"
+#include "gtkintl.h"
 
 #include <glib/gstdio.h>
 
@@ -1032,6 +1031,3 @@ gtk_accel_map_save (const gchar *file_name)
 }
 
 #endif
-
-#define __GTK_ACCEL_MAP_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkaccessible.c b/gtk/gtkaccessible.c
index 8e85b31e34..3a42ccd28c 100644
--- a/gtk/gtkaccessible.c
+++ b/gtk/gtkaccessible.c
@@ -23,7 +23,6 @@
 #include "gtkwidget.h"
 #include "gtkintl.h"
 #include "gtkaccessible.h"
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkaccessible
@@ -116,6 +115,3 @@ gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible)
                       &accessible->widget);
   }
 }
-
-#define __GTK_ACCESSIBLE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index d9440d38dd..8902684c72 100644
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -92,7 +92,6 @@
 #include "gtkprivate.h"
 #include "gtkbuildable.h"
 #include "gtkactivatable.h"
-#include "gtkalias.h"
 
 
 #define GTK_ACTION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ACTION, GtkActionPrivate))
@@ -1826,6 +1825,3 @@ gtk_action_create_menu (GtkAction *action)
 
   return NULL;
 }
-
-#define __GTK_ACTION_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index cab79ee2d1..658a1cad76 100644
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -43,7 +43,6 @@
 #include "gtkbuilderprivate.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define GTK_ACTION_GROUP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ACTION_GROUP, GtkActionGroupPrivate))
 
@@ -1436,6 +1435,3 @@ _gtk_action_group_emit_post_activate (GtkActionGroup *action_group,
 {
   g_signal_emit (action_group, action_group_signals[POST_ACTIVATE], 0, action);
 }
-
-#define __GTK_ACTION_GROUP_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkactivatable.c b/gtk/gtkactivatable.c
index 85abdecfe1..77b019ba4d 100644
--- a/gtk/gtkactivatable.c
+++ b/gtk/gtkactivatable.c
@@ -266,7 +266,6 @@
 #include "gtktypeutils.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 static void gtk_activatable_class_init (gpointer g_iface);
@@ -559,6 +558,3 @@ gtk_activatable_get_use_action_appearance  (GtkActivatable *activatable)
 
   return use_appearance;
 }
-
-#define __GTK_ACTIVATABLE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c
index dd1b3f609d..d8d344e8ed 100644
--- a/gtk/gtkadjustment.c
+++ b/gtk/gtkadjustment.c
@@ -29,7 +29,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 enum
 {
@@ -701,6 +701,3 @@ gtk_adjustment_clamp_page (GtkAdjustment *adjustment,
   if (need_emission)
     gtk_adjustment_value_changed (adjustment);
 }
-
-#define __GTK_ADJUSTMENT_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkalignment.c b/gtk/gtkalignment.c
index 289c56514b..e9c65504c5 100644
--- a/gtk/gtkalignment.c
+++ b/gtk/gtkalignment.c
@@ -48,7 +48,7 @@
 #include "gtksizerequest.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 enum {
   PROP_0,
@@ -714,6 +714,3 @@ gtk_alignment_get_padding (GtkAlignment    *alignment,
   if(padding_right)
     *padding_right = priv->padding_right;
 }
-
-#define __GTK_ALIGNMENT_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 5bea91eb72..703ee1dd02 100644
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -38,8 +38,6 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 
-#include "gtkalias.h"
-
 #include <gdk/gdk.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/x11/gdkx.h>
@@ -711,6 +709,3 @@ gtk_application_class_init (GtkApplicationClass *klass)
                  
   g_type_class_add_private (gobject_class, sizeof (GtkApplicationPrivate));
 }
-
-#define __GTK_APPLICATION_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkarrow.c b/gtk/gtkarrow.c
index b69c297966..22e48db90c 100644
--- a/gtk/gtkarrow.c
+++ b/gtk/gtkarrow.c
@@ -49,7 +49,6 @@
 #include "gtkarrow.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define MIN_ARROW_SIZE  15
 
@@ -303,6 +302,3 @@ gtk_arrow_expose (GtkWidget      *widget,
 
   return FALSE;
 }
-
-#define __GTK_ARROW_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c
index beedd19c2c..c9981518b6 100644
--- a/gtk/gtkaspectframe.c
+++ b/gtk/gtkaspectframe.c
@@ -47,7 +47,7 @@
 #include "gtkaspectframe.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 enum {
   PROP_0,
@@ -350,6 +350,3 @@ gtk_aspect_frame_compute_child_allocation (GtkFrame      *frame,
   else
     GTK_FRAME_CLASS (gtk_aspect_frame_parent_class)->compute_child_allocation (frame, child_allocation);
 }
-
-#define __GTK_ASPECT_FRAME_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index 3c18378cef..164f32668e 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -64,8 +64,6 @@
 #include "gtkprivate.h"
 #include "gtkbuildable.h"
 
-#include "gtkalias.h"
-
 #define GTK_ASSISTANT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_ASSISTANT, GtkAssistantPrivate))
 
 #define HEADER_SPACING 12
@@ -2551,7 +2549,3 @@ gtk_assistant_buildable_custom_finished (GtkBuildable *buildable,
   parent_buildable_iface->custom_finished (buildable, builder, child,
                                            tagname, user_data);
 }
-
-
-#define __GTK_ASSISTANT_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c
index 91822148dd..c675ed7300 100644
--- a/gtk/gtkbbox.c
+++ b/gtk/gtkbbox.c
@@ -59,7 +59,7 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 enum {
   PROP_0,
@@ -830,6 +830,3 @@ gtk_button_box_new (GtkOrientation orientation)
                        "orientation", orientation,
                        NULL);
 }
-
-#define __GTK_BUTTON_BOX_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c
index 595f8c5c7a..bef71f5228 100644
--- a/gtk/gtkbin.c
+++ b/gtk/gtkbin.c
@@ -41,7 +41,7 @@
 #include "gtkbin.h"
 #include "gtksizerequest.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 static void gtk_bin_add         (GtkContainer   *container,
 			         GtkWidget      *widget);
@@ -277,6 +277,3 @@ gtk_bin_get_child (GtkBin *bin)
 
   return bin->child;
 }
-
-#define __GTK_BIN_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c
index c75e220587..406331392a 100644
--- a/gtk/gtkbindings.c
+++ b/gtk/gtkbindings.c
@@ -36,7 +36,6 @@
 #include "gtkkeyhash.h"
 #include "gtkwidget.h"
 #include "gtkrc.h"
-#include "gtkalias.h"
 
 
 /* --- defines --- */
@@ -1676,6 +1675,3 @@ _gtk_binding_reset_parsed (void)
       slist = next;
     }
 }
-
-#define __GTK_BINDINGS_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index 82289f5d24..c044b2f921 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -80,7 +80,7 @@
 #include "gtksizerequest.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 enum {
   PROP_0,
@@ -1712,6 +1712,3 @@ gtk_box_forall (GtkContainer *container,
 	(* callback) (child->widget, callback_data);
     }
 }
-
-#define __GTK_BOX_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkbuildable.c b/gtk/gtkbuildable.c
index 12fc07791d..963efb3c94 100644
--- a/gtk/gtkbuildable.c
+++ b/gtk/gtkbuildable.c
@@ -42,7 +42,6 @@
 #include "gtkbuildable.h"
 #include "gtktypeutils.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 typedef GtkBuildableIface GtkBuildableInterface;
@@ -359,6 +358,3 @@ gtk_buildable_get_internal_child (GtkBuildable *buildable,
 
   return (* iface->get_internal_child) (buildable, builder, childname);
 }
-
-#define __GTK_BUILDABLE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index c6d3b0814f..c8918b4d13 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -253,7 +253,7 @@
 #include "gtkwindow.h"
 #include "gtkicontheme.h"
 #include "gtkstock.h"
-#include "gtkalias.h"
+
 
 static void gtk_builder_class_init     (GtkBuilderClass *klass);
 static void gtk_builder_init           (GtkBuilder      *builder);
@@ -1848,6 +1848,3 @@ _gtk_builder_get_absolute_filename (GtkBuilder *builder, const gchar *string)
   
   return filename;
 }
-
-#define __GTK_BUILDER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index b4f6855136..ef2e5e9e09 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -31,7 +31,7 @@
 #include "gtkversion.h"
 #include "gtktypeutils.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 static void free_property_info (PropertyInfo *info);
 static void free_object_info (ObjectInfo *info);
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index a684c265d4..e7d29f41dc 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -54,7 +54,7 @@
 #include "gtksizerequest.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 static const GtkBorder default_default_border = { 1, 1, 1, 1 };
 static const GtkBorder default_default_outside_border = { 0, 0, 0, 0 };
@@ -2494,6 +2494,3 @@ gtk_button_get_event_window (GtkButton *button)
 
   return button->event_window;
 }
-
-#define __GTK_BUTTON_C__
-#include "gtkaliasdef.c"  
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index bd8cfdc502..1bac951299 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -78,7 +78,6 @@
 #include "gtktooltip.h"
 #include "gtkprivate.h"
 #include "gdk/gdkkeysyms.h"
-#include "gtkalias.h"
 
 /***************************************************************************/
 /* The following date routines are taken from the lib_date package. 
@@ -4027,6 +4026,3 @@ gtk_calendar_get_detail_height_rows (GtkCalendar *calendar)
   g_return_val_if_fail (GTK_IS_CALENDAR (calendar), 0);
   return GTK_CALENDAR_GET_PRIVATE (calendar)->detail_height_rows;
 }
-
-#define __GTK_CALENDAR_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcelleditable.c b/gtk/gtkcelleditable.c
index 55bc63b285..09f47533b0 100644
--- a/gtk/gtkcelleditable.c
+++ b/gtk/gtkcelleditable.c
@@ -33,7 +33,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 typedef GtkCellEditableIface GtkCellEditableInterface;
 G_DEFINE_INTERFACE(GtkCellEditable, gtk_cell_editable, GTK_TYPE_WIDGET)
@@ -147,6 +147,3 @@ gtk_cell_editable_remove_widget (GtkCellEditable *cell_editable)
 
   g_signal_emit_by_name (cell_editable, "remove-widget");
 }
-
-#define __GTK_CELL_EDITABLE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcelllayout.c b/gtk/gtkcelllayout.c
index 2fa3c2d320..985457be85 100644
--- a/gtk/gtkcelllayout.c
+++ b/gtk/gtkcelllayout.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include "gtkcelllayout.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 GType
 gtk_cell_layout_get_type (void)
@@ -442,6 +442,3 @@ _gtk_cell_layout_buildable_add_child (GtkBuildable      *buildable,
   g_return_if_fail (iface->pack_start != NULL);
   iface->pack_start (GTK_CELL_LAYOUT (buildable), GTK_CELL_RENDERER (child), FALSE);
 }
-
-#define __GTK_CELL_LAYOUT_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index 6093719044..d9d95a1369 100644
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -23,7 +23,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtktreeprivate.h"
-#include "gtkalias.h"
+
 
 static void gtk_cell_renderer_get_property  (GObject              *object,
 					     guint                 param_id,
@@ -967,6 +967,3 @@ gtk_cell_renderer_stop_editing (GtkCellRenderer *cell,
 	g_signal_emit (cell, cell_renderer_signals[EDITING_CANCELED], 0);
     }
 }
-
-#define __GTK_CELL_RENDERER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c
index 9dfd2c2a8a..3a3eedca87 100644
--- a/gtk/gtkcellrendereraccel.c
+++ b/gtk/gtkcellrendereraccel.c
@@ -27,7 +27,6 @@
 #include "gtkmain.h"
 #include "gtkprivate.h"
 #include "gdk/gdkkeysyms.h"
-#include "gtkalias.h"
 
 
 #define GTK_CELL_RENDERER_ACCEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelPrivate))
@@ -665,7 +664,3 @@ gtk_cell_renderer_accel_start_editing (GtkCellRenderer      *cell,
   
   return GTK_CELL_EDITABLE (accel->edit_widget);
 }
-
-
-#define __GTK_CELL_RENDERER_ACCEL_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcellrenderercombo.c b/gtk/gtkcellrenderercombo.c
index ba5fabb63d..13ad0304e4 100644
--- a/gtk/gtkcellrenderercombo.c
+++ b/gtk/gtkcellrenderercombo.c
@@ -30,8 +30,6 @@
 #include "gtkcomboboxentry.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
-
 
 #define GTK_CELL_RENDERER_COMBO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_CELL_RENDERER_COMBO, GtkCellRendererComboPrivate))
 
@@ -489,6 +487,3 @@ gtk_cell_renderer_combo_start_editing (GtkCellRenderer     *cell,
 
   return GTK_CELL_EDITABLE (combo);
 }
-
-#define __GTK_CELL_RENDERER_COMBO_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index 2337618890..fd814519d3 100644
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -24,7 +24,7 @@
 #include "gtkicontheme.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
+
 
 static void gtk_cell_renderer_pixbuf_get_property  (GObject                    *object,
 						    guint                       param_id,
@@ -862,6 +862,3 @@ gtk_cell_renderer_pixbuf_render (GtkCellRenderer      *cell,
   if (symbolic)
     g_object_unref (symbolic);
 }
-
-#define __GTK_CELL_RENDERER_PIXBUF_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcellrendererprogress.c b/gtk/gtkcellrendererprogress.c
index 08a7e9ae82..794f02a3ad 100644
--- a/gtk/gtkcellrendererprogress.c
+++ b/gtk/gtkcellrendererprogress.c
@@ -32,7 +32,6 @@
 #include "gtkprogressbar.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define GTK_CELL_RENDERER_PROGRESS_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object),                        \
                                                                                      GTK_TYPE_CELL_RENDERER_PROGRESS, \
@@ -673,6 +672,3 @@ gtk_cell_renderer_progress_render (GtkCellRenderer *cell,
       g_object_unref (layout);
     }
 }
-
-#define __GTK_CELL_RENDERER_PROGRESS_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c
index 2a3961bf20..ab583f91a5 100644
--- a/gtk/gtkcellrendererspin.c
+++ b/gtk/gtkcellrendererspin.c
@@ -26,7 +26,6 @@
 #include "gtkprivate.h"
 #include "gtkspinbutton.h"
 #include "gtkcellrendererspin.h"
-#include "gtkalias.h"
 
 #define GTK_CELL_RENDERER_SPIN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_CELL_RENDERER_SPIN, GtkCellRendererSpinPrivate))
 
@@ -350,7 +349,3 @@ gtk_cell_renderer_spin_new (void)
 {
   return g_object_new (GTK_TYPE_CELL_RENDERER_SPIN, NULL);
 }
-
-
-#define __GTK_CELL_RENDERER_SPIN_C__
-#include  "gtkaliasdef.c"
diff --git a/gtk/gtkcellrendererspinner.c b/gtk/gtkcellrendererspinner.c
index 834433d0cf..8a4125ef94 100644
--- a/gtk/gtkcellrendererspinner.c
+++ b/gtk/gtkcellrendererspinner.c
@@ -33,7 +33,6 @@
 #include "gtkiconfactory.h"
 #include "gtkicontheme.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 /**
@@ -387,6 +386,3 @@ gtk_cell_renderer_spinner_render (GtkCellRenderer *cellr,
                      draw_rect.x, draw_rect.y,
                      draw_rect.width, draw_rect.height);
 }
-
-#define __GTK_CELL_RENDERER_SPINNER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index 8060ade4ac..70def973d3 100644
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -26,7 +26,7 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtktreeprivate.h"
-#include "gtkalias.h"
+
 
 static void gtk_cell_renderer_text_finalize   (GObject                  *object);
 
@@ -1929,6 +1929,3 @@ gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer
       renderer->calc_fixed_height = TRUE;
     }
 }
-
-#define __GTK_CELL_RENDERER_TEXT_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c
index 4282131aa1..a27f44907c 100644
--- a/gtk/gtkcellrenderertoggle.c
+++ b/gtk/gtkcellrenderertoggle.c
@@ -24,7 +24,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtktreeprivate.h"
-#include "gtkalias.h"
+
 
 static void gtk_cell_renderer_toggle_get_property  (GObject                    *object,
 						    guint                       param_id,
@@ -522,6 +522,3 @@ gtk_cell_renderer_toggle_set_activatable (GtkCellRendererToggle *toggle,
       g_object_notify (G_OBJECT (toggle), "activatable");
     }
 }
-
-#define __GTK_CELL_RENDERER_TOGGLE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index a2692114f4..50003dd387 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -27,7 +27,7 @@
 #include "gtkprivate.h"
 #include <gobject/gmarshal.h>
 #include "gtkbuildable.h"
-#include "gtkalias.h"
+
 
 typedef struct _GtkCellViewCellInfo GtkCellViewCellInfo;
 struct _GtkCellViewCellInfo
@@ -1095,7 +1095,3 @@ gtk_cell_view_buildable_custom_tag_end (GtkBuildable *buildable,
     parent_buildable_iface->custom_tag_end (buildable, builder, child, tagname,
 					    data);
 }
-
-
-#define __GTK_CELL_VIEW_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index e7656534aa..9caa978004 100644
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -29,7 +29,6 @@
 #include "gtklabel.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 #define INDICATOR_SIZE     13
@@ -424,6 +423,3 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
 		       x, y, indicator_size, indicator_size);
     }
 }
-
-#define __GTK_CHECK_BUTTON_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index 754382f00e..197eb84a67 100644
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -32,7 +32,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 enum {
   TOGGLED,
@@ -549,6 +549,3 @@ gtk_check_menu_item_set_property (GObject      *object,
       break;
     }
 }
-
-#define __GTK_CHECK_MENU_ITEM_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkclipboard-quartz.c b/gtk/gtkclipboard-quartz.c
index 4b57d774fe..f433070ce1 100644
--- a/gtk/gtkclipboard-quartz.c
+++ b/gtk/gtkclipboard-quartz.c
@@ -32,7 +32,7 @@
 #include "gtkintl.h"
 #include "gtktextbuffer.h"
 #include "gtkquartz.h"
-#include "gtkalias.h"
+
 
 enum {
   OWNER_CHANGE,
@@ -1011,6 +1011,3 @@ _gtk_clipboard_store_all (void)
 {
   /* FIXME: Implement */
 }
-
-#define __GTK_CLIPBOARD_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index 7e3c7ac506..5e34975d7b 100644
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -29,7 +29,6 @@
 #include "gtkmarshalers.h"
 #include "gtktextbufferrichtext.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
@@ -2082,6 +2081,3 @@ _gtk_clipboard_store_all (void)
   g_slist_free (displays);
   
 }
-
-#define __GTK_CLIPBOARD_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index 2bde61da7f..878d12748f 100644
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -44,7 +44,6 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 /* Size of checks and gray levels for alpha compositing checkerboard */
 #define CHECK_SIZE  4
@@ -992,6 +991,3 @@ gtk_color_button_get_property (GObject    *object,
       break;
     }
 }
-
-#define __GTK_COLOR_BUTTON_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index d27ef79de0..af04ed9a63 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -59,7 +59,6 @@
 #include "gtkaccessible.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 /* Number of elements in the custom palatte */
 #define GTK_CUSTOM_PALETTE_WIDTH 10
@@ -2857,7 +2856,3 @@ make_all_relations (AtkObject *atk_obj,
   make_control_relations (atk_obj, priv->green_spinbutton);
   make_control_relations (atk_obj, priv->blue_spinbutton);
 }
-
-#define __GTK_COLOR_SELECTION_C__
-#include "gtkaliasdef.c"
-
diff --git a/gtk/gtkcolorseldialog.c b/gtk/gtkcolorseldialog.c
index 977cb1585e..da0b8fcc03 100644
--- a/gtk/gtkcolorseldialog.c
+++ b/gtk/gtkcolorseldialog.c
@@ -33,7 +33,7 @@
 #include "gtkstock.h"
 #include "gtkintl.h"
 #include "gtkbuildable.h"
-#include "gtkalias.h"
+
 
 enum {
   PROP_0,
@@ -228,7 +228,3 @@ gtk_color_selection_dialog_buildable_get_internal_child (GtkBuildable *buildable
 
     return parent_buildable_iface->get_internal_child (buildable, builder, childname);
 }
-
-
-#define __GTK_COLOR_SELECTION_DIALOG_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index c4e4925994..d7128a764f 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -51,7 +51,6 @@
 #include "gtkintl.h"
 
 #include "gtktreeprivate.h"
-#include "gtkalias.h"
 
 /* WELCOME, to THE house of evil code */
 
@@ -6033,6 +6032,3 @@ gtk_combo_box_buildable_custom_tag_end (GtkBuildable *buildable,
     parent_buildable_iface->custom_tag_end (buildable, builder, child, tagname,
 					    data);
 }
-
-#define __GTK_COMBO_BOX_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcomboboxentry.c b/gtk/gtkcomboboxentry.c
index c63c08561b..f119f8bff0 100644
--- a/gtk/gtkcomboboxentry.c
+++ b/gtk/gtkcomboboxentry.c
@@ -28,7 +28,6 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkbuildable.h"
-#include "gtkalias.h"
 
 #define GTK_COMBO_BOX_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_COMBO_BOX_ENTRY, GtkComboBoxEntryPrivate))
 
@@ -461,6 +460,3 @@ gtk_combo_box_entry_get_active_text (GtkComboBox *combo_box)
 
   return NULL;
 }
-
-#define __GTK_COMBO_BOX_ENTRY_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 4a47afb392..afd2315c7c 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -40,7 +40,6 @@
 #include "gtktoolbar.h"
 #include <gobject/gobjectnotifyqueue.c>
 #include <gobject/gvaluecollector.h>
-#include "gtkalias.h"
 
 
 enum {
@@ -2684,6 +2683,3 @@ gtk_container_propagate_expose (GtkContainer   *container,
       gdk_event_free (child_event);
     }
 }
-
-#define __GTK_CONTAINER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c
index 8d95a11f87..28120b1e82 100644
--- a/gtk/gtkcustompaperunixdialog.c
+++ b/gtk/gtkcustompaperunixdialog.c
@@ -39,7 +39,6 @@
 #include "gtkcustompaperunixdialog.h"
 #include "gtkprintbackend.h"
 #include "gtkprintutils.h"
-#include "gtkalias.h"
 
 #define CUSTOM_PAPER_FILENAME ".gtk-custom-papers"
 
@@ -1181,7 +1180,3 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
 
   load_print_backends (dialog);
 }
-
-
-#define __GTK_CUSTOM_PAPER_UNIX_DIALOG_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index d6b7bcd682..5026290d0b 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -40,7 +40,6 @@
 #include "gtkbindings.h"
 #include "gtkprivate.h"
 #include "gtkbuildable.h"
-#include "gtkalias.h"
 
 #define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_DIALOG, GtkDialogPrivate))
 
@@ -1547,6 +1546,3 @@ gtk_dialog_get_content_area (GtkDialog *dialog)
 
   return dialog->vbox;
 }
-
-#define __GTK_DIALOG_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index 9a4ee30892..9f89a76182 100644
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -44,7 +44,6 @@
 #include "gtkwindow.h"
 #include "gtkintl.h"
 #include "gtkquartz.h"
-#include "gtkalias.h"
 #include "gdk/quartz/gdkquartz.h"
 
 typedef struct _GtkDragSourceSite GtkDragSourceSite;
@@ -1919,6 +1918,3 @@ gtk_drag_check_threshold (GtkWidget *widget,
   return (ABS (current_x - start_x) > drag_threshold ||
 	  ABS (current_y - start_y) > drag_threshold);
 }
-
-#define __GTK_DND_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index a0d878d5c2..2322ec467d 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -51,7 +51,6 @@
 #include "gtkwindow.h"
 #include "gtkintl.h"
 #include "gtkdndcursors.h"
-#include "gtkalias.h"
 
 static GSList *source_widgets = NULL;
 
@@ -4384,6 +4383,3 @@ gtk_drag_check_threshold (GtkWidget *widget,
   return (ABS (current_x - start_x) > drag_threshold ||
 	  ABS (current_y - start_y) > drag_threshold);
 }
-
-#define __GTK_DND_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c
index 0ac5952f2d..e5968f790b 100644
--- a/gtk/gtkdrawingarea.c
+++ b/gtk/gtkdrawingarea.c
@@ -27,7 +27,6 @@
 #include "config.h"
 #include "gtkdrawingarea.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 static void gtk_drawing_area_realize       (GtkWidget           *widget);
@@ -135,6 +134,3 @@ gtk_drawing_area_send_configure (GtkDrawingArea *darea)
   gtk_widget_event (widget, event);
   gdk_event_free (event);
 }
-
-#define __GTK_DRAWING_AREA_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c
index d7eaa945e2..16a000370e 100644
--- a/gtk/gtkeditable.c
+++ b/gtk/gtkeditable.c
@@ -30,7 +30,6 @@
 #include "gtkeditable.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 static void gtk_editable_base_init (gpointer g_class);
@@ -424,6 +423,3 @@ gtk_editable_get_editable (GtkEditable *editable)
 
   return value;
 }
-
-#define __GTK_EDITABLE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index f0fd92c1db..046cc766ed 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -65,7 +65,6 @@
 #include "gtktooltip.h"
 #include "gtkiconfactory.h"
 #include "gtkicontheme.h"
-#include "gtkalias.h"
 
 #define GTK_ENTRY_COMPLETION_KEY "gtk-entry-completion-key"
 
@@ -10030,6 +10029,3 @@ keymap_state_changed (GdkKeymap *keymap,
   else
     remove_capslock_feedback (entry);
 }
-
-#define __GTK_ENTRY_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkentrybuffer.c b/gtk/gtkentrybuffer.c
index 27947b1199..179a720015 100644
--- a/gtk/gtkentrybuffer.c
+++ b/gtk/gtkentrybuffer.c
@@ -24,7 +24,6 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkwidget.h"
-#include "gtkalias.h"
 
 #include <gdk/gdk.h>
 
@@ -749,6 +748,3 @@ gtk_entry_buffer_emit_deleted_text (GtkEntryBuffer *buffer,
   g_return_if_fail (GTK_IS_ENTRY_BUFFER (buffer));
   g_signal_emit (buffer, signals[DELETED_TEXT], 0, position, n_chars);
 }
-
-#define __GTK_ENTRY_BUFFER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index 6225b41dda..12b4240218 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -35,7 +35,6 @@
 #include "gtkmarshalers.h"
 
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 #include <string.h>
 
@@ -2006,6 +2005,3 @@ gtk_entry_completion_get_inline_selection (GtkEntryCompletion *completion)
 
   return completion->priv->inline_selection;
 }
-
-#define __GTK_ENTRY_COMPLETION_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkeventbox.c b/gtk/gtkeventbox.c
index bb334e154f..abad1611bc 100644
--- a/gtk/gtkeventbox.c
+++ b/gtk/gtkeventbox.c
@@ -28,7 +28,7 @@
 #include "gtkeventbox.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 typedef struct
 {
@@ -570,6 +570,3 @@ gtk_event_box_expose (GtkWidget      *widget,
 
   return FALSE;
 }
-
-#define __GTK_EVENT_BOX_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index b7a61f7353..270769640c 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -34,7 +34,6 @@
 #include "gtkprivate.h"
 #include <gdk/gdkkeysyms.h>
 #include "gtkdnd.h"
-#include "gtkalias.h"
 
 #define GTK_EXPANDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_EXPANDER, GtkExpanderPrivate))
 
@@ -1743,6 +1742,3 @@ gtk_expander_get_label_widget (GtkExpander *expander)
 
   return expander->priv->label_widget;
 }
-
-#define __GTK_EXPANDER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index 996377df92..28f9f0c6d6 100644
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -25,7 +25,6 @@
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 #include "gtkmarshalers.h"
-#include "gtkalias.h"
 
 
 /**
@@ -2755,6 +2754,3 @@ gtk_file_chooser_list_shortcut_folders (GtkFileChooser *chooser)
 }
 
 #endif
-
-#define __GTK_FILE_CHOOSER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 439e3ded68..5086399012 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -53,7 +53,6 @@
 #include "gtkfilechooserbutton.h"
 
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 /* **************** *
  *  Private Macros  *
@@ -2890,6 +2889,3 @@ gtk_file_chooser_button_get_focus_on_click (GtkFileChooserButton *button)
   
   return button->priv->focus_on_click;
 }
-
-#define __GTK_FILE_CHOOSER_BUTTON_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 7f1f31c0e2..e340d7f8a3 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -70,8 +70,6 @@
 #include "gtkvbox.h"
 #include "gtkintl.h"
 
-#include "gtkalias.h"
-
 #include <errno.h>
 #include <string.h>
 #include <time.h>
diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c
index 0660f27d66..ad1f911df7 100644
--- a/gtk/gtkfilechooserdialog.c
+++ b/gtk/gtkfilechooserdialog.c
@@ -29,7 +29,6 @@
 #include "gtkfilesystem.h"
 #include "gtktypebuiltins.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #include <stdarg.h>
 
@@ -461,6 +460,3 @@ gtk_file_chooser_dialog_new (const gchar         *title,
 
   return result;
 }
-
-#define __GTK_FILE_CHOOSER_DIALOG_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkfilechooserembed.c b/gtk/gtkfilechooserembed.c
index 327c5423c4..2ff1e30658 100644
--- a/gtk/gtkfilechooserembed.c
+++ b/gtk/gtkfilechooserembed.c
@@ -22,7 +22,6 @@
 #include "gtkfilechooserembed.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 static void gtk_file_chooser_embed_class_init (gpointer g_iface);
 static void delegate_get_default_size         (GtkFileChooserEmbed *chooser_embed,
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index 4c52924d3e..28cde5d73f 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -30,7 +30,6 @@
 #include "gtkmain.h"
 #include "gtkwindow.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 typedef struct _GtkFileChooserEntryClass GtkFileChooserEntryClass;
 
diff --git a/gtk/gtkfilechoosersettings.c b/gtk/gtkfilechoosersettings.c
index 1fc9623ae4..1c92eeafae 100644
--- a/gtk/gtkfilechoosersettings.c
+++ b/gtk/gtkfilechoosersettings.c
@@ -35,7 +35,6 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 #include "gtkfilechoosersettings.h"
-#include "gtkalias.h"
 
 #define SETTINGS_GROUP		"Filechooser Settings"
 #define LOCATION_MODE_KEY	"LocationMode"
diff --git a/gtk/gtkfilechooserutils.c b/gtk/gtkfilechooserutils.c
index 1f0847bf9d..e0fefcfe03 100644
--- a/gtk/gtkfilechooserutils.c
+++ b/gtk/gtkfilechooserutils.c
@@ -25,7 +25,7 @@
 #include "gtkfilesystem.h"
 #include "gtktypebuiltins.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 static gboolean       delegate_set_current_folder     (GtkFileChooser    *chooser,
 						       GFile             *file,
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index ca37b17936..567f77f152 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -27,7 +27,6 @@
 #include "gtktypebuiltins.h"
 #include "gtkfilechooserembed.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define GTK_FILE_CHOOSER_WIDGET_GET_PRIVATE(o)  (GTK_FILE_CHOOSER_WIDGET (o)->priv)
 
@@ -162,6 +161,3 @@ gtk_file_chooser_widget_new (GtkFileChooserAction action)
 		       "action", action,
 		       NULL);
 }
-
-#define __GTK_FILE_CHOOSER_WIDGET_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index f64c5761bf..f0e437fe05 100644
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -25,8 +25,6 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 
-#include "gtkalias.h"
-
 typedef struct _GtkFileFilterClass GtkFileFilterClass;
 typedef struct _FilterRule FilterRule;
 
@@ -421,6 +419,3 @@ gtk_file_filter_filter (GtkFileFilter           *filter,
 
   return FALSE;
 }
-
-#define __GTK_FILE_FILTER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index ea79fed044..93c77b7edc 100644
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -31,8 +31,6 @@
 #include "gtkicontheme.h"
 #include "gtkprivate.h"
 
-#include "gtkalias.h"
-
 /* #define DEBUG_MODE */
 #ifdef DEBUG_MODE
 #define DEBUG(x) g_debug (x);
diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
index 7c9e1dca0f..5b29b9bc39 100644
--- a/gtk/gtkfilesystemmodel.c
+++ b/gtk/gtkfilesystemmodel.c
@@ -31,7 +31,6 @@
 #include "gtktreedatalist.h"
 #include "gtktreednd.h"
 #include "gtktreemodel.h"
-#include "gtkalias.h"
 
 /*** Structure: how GtkFileSystemModel works
  *
diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c
index 9a0d67f0ee..820d71c64c 100644
--- a/gtk/gtkfixed.c
+++ b/gtk/gtkfixed.c
@@ -28,7 +28,8 @@
 #include "gtkfixed.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
+
 enum {
   CHILD_PROP_0,
   CHILD_PROP_X,
@@ -452,6 +453,3 @@ gtk_fixed_forall (GtkContainer *container,
       (* callback) (child->widget, callback_data);
     }
 }
-
-#define __GTK_FIXED_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 694c61874a..565654e870 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -40,7 +40,6 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #include <string.h>
 #include <stdio.h>
@@ -914,6 +913,3 @@ gtk_font_button_update_font_info (GtkFontButton *font_button)
   
   pango_font_description_free (desc);
 } 
-
-#define __GTK_FONT_BUTTON_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 9e4daabc6c..9438b948ea 100644
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -60,7 +60,6 @@
 #include "gtkaccessible.h"
 #include "gtkprivate.h"
 #include "gtkbuildable.h"
-#include "gtkalias.h"
 
 /* We don't enable the font and style entries because they don't add
  * much in terms of visible effect and have a weird effect on keynav.
@@ -1781,6 +1780,3 @@ gtk_font_selection_dialog_set_preview_text (GtkFontSelectionDialog *fsd,
 
   gtk_font_selection_set_preview_text (GTK_FONT_SELECTION (fsd->fontsel), text);
 }
-
-#define __GTK_FONTSEL_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index 917d563033..01707fc19e 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -32,7 +32,6 @@
 #include "gtkintl.h"
 #include "gtkbuildable.h"
 #include "gtksizerequest.h"
-#include "gtkalias.h"
 
 #define LABEL_PAD 1
 #define LABEL_SIDE_PAD 2
@@ -801,6 +800,3 @@ gtk_frame_size_request_init (GtkSizeRequestIface *iface)
   iface->get_width = gtk_frame_get_width;
   iface->get_height = gtk_frame_get_height;
 }
-
-#define __GTK_FRAME_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkgc.c b/gtk/gtkgc.c
index 80a2d66cfc..d277ee3698 100644
--- a/gtk/gtkgc.c
+++ b/gtk/gtkgc.c
@@ -27,7 +27,6 @@
 #include "config.h"
 #include "gtkgc.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 typedef struct _GtkGCKey       GtkGCKey;
@@ -403,6 +402,3 @@ gtk_gc_drawable_equal (GtkGCDrawable *a,
 {
   return (a->depth == b->depth);
 }
-
-#define __GTK_GC_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index 119ba107ed..55760192bf 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -34,7 +34,7 @@
 #include "gtkwindow.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 typedef struct _GtkHandleBoxPrivate GtkHandleBoxPrivate;
 
@@ -1436,6 +1436,3 @@ gtk_handle_box_end_drag (GtkHandleBox *hb,
 
   private->grab_device = NULL;
 }
-
-#define __GTK_HANDLE_BOX_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkhbbox.c b/gtk/gtkhbbox.c
index 55b0b15098..87174a7f1a 100644
--- a/gtk/gtkhbbox.c
+++ b/gtk/gtkhbbox.c
@@ -28,7 +28,6 @@
 #include "gtkhbbox.h"
 #include "gtkorientable.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 static gint default_layout_style = GTK_BUTTONBOX_EDGE;
 
@@ -57,6 +56,3 @@ _gtk_hbutton_box_get_layout_default (void)
 {
   return default_layout_style;
 }
-
-#define __GTK_HBUTTON_BOX_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkhbox.c b/gtk/gtkhbox.c
index 61855f35af..75d4ab0984 100644
--- a/gtk/gtkhbox.c
+++ b/gtk/gtkhbox.c
@@ -28,7 +28,6 @@
 
 #include "gtkhbox.h"
 #include "gtkorientable.h"
-#include "gtkalias.h"
 
 
 /**
@@ -80,6 +79,3 @@ gtk_hbox_new (gboolean homogeneous,
                        "homogeneous", homogeneous ? TRUE : FALSE,
                        NULL);
 }
-
-#define __GTK_HBOX_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkhpaned.c b/gtk/gtkhpaned.c
index 95afcb72bb..86742f564c 100644
--- a/gtk/gtkhpaned.c
+++ b/gtk/gtkhpaned.c
@@ -28,7 +28,7 @@
 
 #include "gtkhpaned.h"
 #include "gtkorientable.h"
-#include "gtkalias.h"
+
 
 G_DEFINE_TYPE (GtkHPaned, gtk_hpaned, GTK_TYPE_PANED)
 
@@ -49,6 +49,3 @@ gtk_hpaned_new (void)
 {
   return g_object_new (GTK_TYPE_HPANED, NULL);
 }
-
-#define __GTK_HPANED_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkhruler.c b/gtk/gtkhruler.c
index 66e5a1788e..c8893b160b 100644
--- a/gtk/gtkhruler.c
+++ b/gtk/gtkhruler.c
@@ -28,7 +28,7 @@
 
 #include "gtkhruler.h"
 #include "gtkorientable.h"
-#include "gtkalias.h"
+
 
 G_DEFINE_TYPE (GtkHRuler, gtk_hruler, GTK_TYPE_RULER)
 
@@ -49,6 +49,3 @@ gtk_hruler_new (void)
 {
   return g_object_new (GTK_TYPE_HRULER, NULL);
 }
-
-#define __GTK_HRULER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c
index c641dcbcaf..5d4c54e788 100644
--- a/gtk/gtkhscale.c
+++ b/gtk/gtkhscale.c
@@ -31,7 +31,6 @@
 
 #include "gtkhscale.h"
 #include "gtkorientable.h"
-#include "gtkalias.h"
 
 
 G_DEFINE_TYPE (GtkHScale, gtk_hscale, GTK_TYPE_SCALE)
@@ -111,6 +110,3 @@ gtk_hscale_new_with_range (gdouble min,
 
   return GTK_WIDGET (scale);
 }
-
-#define __GTK_HSCALE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkhscrollbar.c b/gtk/gtkhscrollbar.c
index 881e45ee29..f2933a1952 100644
--- a/gtk/gtkhscrollbar.c
+++ b/gtk/gtkhscrollbar.c
@@ -30,7 +30,7 @@
 #include "gtkhscrollbar.h"
 #include "gtkorientable.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 G_DEFINE_TYPE (GtkHScrollbar, gtk_hscrollbar, GTK_TYPE_SCROLLBAR)
 
@@ -65,6 +65,3 @@ gtk_hscrollbar_new (GtkAdjustment *adjustment)
                        "adjustment", adjustment,
                        NULL);
 }
-
-#define __GTK_HSCROLLBAR_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkhseparator.c b/gtk/gtkhseparator.c
index 91d437a1ac..edbc0c96a3 100644
--- a/gtk/gtkhseparator.c
+++ b/gtk/gtkhseparator.c
@@ -28,7 +28,7 @@
 
 #include "gtkhseparator.h"
 #include "gtkorientable.h"
-#include "gtkalias.h"
+
 
 G_DEFINE_TYPE (GtkHSeparator, gtk_hseparator, GTK_TYPE_SEPARATOR)
 
@@ -49,6 +49,3 @@ gtk_hseparator_new (void)
 {
   return g_object_new (GTK_TYPE_HSEPARATOR, NULL);
 }
-
-#define __GTK_HSEPARATOR_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkhsv.c b/gtk/gtkhsv.c
index a8a22cba4d..a59090b03d 100644
--- a/gtk/gtkhsv.c
+++ b/gtk/gtkhsv.c
@@ -40,7 +40,6 @@
 #include "gtkbindings.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 /* Default width/height */
 #define DEFAULT_SIZE 100
@@ -1693,6 +1692,3 @@ gtk_hsv_move (GtkHSV          *hsv,
   
   gtk_hsv_set_color (hsv, hue, sat, val);
 }
-
-#define __GTK_HSV_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c
index 6a433fc97c..73d063aee3 100644
--- a/gtk/gtkiconcache.c
+++ b/gtk/gtkiconcache.c
@@ -22,7 +22,6 @@
 #include "gtkdebug.h"
 #include "gtkiconcache.h"
 #include "gtkiconcachevalidator.h"
-#include "gtkalias.h"
 
 #include <glib/gstdio.h>
 #include <gdk-pixbuf/gdk-pixdata.h>
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 0e6e3d8ed1..b561995ce3 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -38,7 +38,6 @@
 #include "gtkintl.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
-#include "gtkalias.h"
 
 
 static GSList *all_icon_factories = NULL;
@@ -3003,6 +3002,3 @@ gtk_icon_source_get_filename (const GtkIconSource *source)
 }
 
 #endif
-
-#define __GTK_ICON_FACTORY_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 0b06b32988..63dcee7843 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -46,7 +46,6 @@
 #include "gtkmain.h"
 #include "gtksettings.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 #define DEFAULT_THEME_NAME "hicolor"
 
@@ -3810,6 +3809,3 @@ gtk_icon_info_get_filename (GtkIconInfo *icon_info)
 }
 
 #endif
-
-#define __GTK_ICON_THEME_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index f96dbd2777..cf6acff964 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -41,7 +41,6 @@
 #include "gtktextbuffer.h"
 #include "gtktreednd.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkiconview
@@ -9979,8 +9978,3 @@ gtk_icon_view_buildable_custom_tag_end (GtkBuildable *buildable,
     parent_buildable_iface->custom_tag_end (buildable, builder, child, tagname,
 					    data);
 }
-
-
-
-#define __GTK_ICON_VIEW_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index df032f29f5..a234e4a94e 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -35,7 +35,6 @@
 #include "gtkicontheme.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkimage
@@ -2542,6 +2541,3 @@ gtk_image_set_from_file   (GtkImage    *image,
 }
 
 #endif
-
-#define __GTK_IMAGE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c
index f634d71359..605c63ecd9 100644
--- a/gtk/gtkimagemenuitem.c
+++ b/gtk/gtkimagemenuitem.c
@@ -36,7 +36,7 @@
 #include "gtkwindow.h"
 #include "gtkactivatable.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
+
 
 static void gtk_image_menu_item_destroy              (GtkObject        *object);
 static void gtk_image_menu_item_size_request         (GtkWidget        *widget,
@@ -1058,6 +1058,3 @@ gtk_image_menu_item_screen_changed (GtkWidget *widget,
 
   show_image_change_notify (GTK_IMAGE_MENU_ITEM (widget));
 }
-
-#define __GTK_IMAGE_MENU_ITEM_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c
index 7aec5c1d6b..d918a5ab9f 100644
--- a/gtk/gtkimcontext.c
+++ b/gtk/gtkimcontext.c
@@ -23,7 +23,6 @@
 #include "gtkmain.h"		/* For _gtk_boolean_handled_accumulator */
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkimcontext
@@ -709,6 +708,3 @@ gtk_im_context_delete_surrounding (GtkIMContext *context,
 
   return result;
 }
-
-#define __GTK_IM_CONTEXT_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 2f4ddd0e66..f45efcc76f 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -28,7 +28,7 @@
 #include "gtksettings.h"
 #include "gtkwidget.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 typedef struct _GtkComposeTable GtkComposeTable;
 typedef struct _GtkComposeTableCompact GtkComposeTableCompact;
@@ -1143,6 +1143,3 @@ gtk_im_context_simple_add_table (GtkIMContextSimple *context_simple,
 
   context_simple->tables = g_slist_prepend (context_simple->tables, table);
 }
-
-#define __GTK_IM_CONTEXT_SIMPLE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 97967d45fe..70a689d39c 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -38,7 +38,6 @@
 #include "gtkmain.h"
 #include "gtkrc.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 /* Do *not* include "gtkprivate.h" in this file. If you do, the
  * correct_libdir_prefix() and correct_localedir_prefix() functions
diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index 6ba5a98934..cbaebe8a08 100644
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -28,7 +28,6 @@
 #include "gtkradiomenuitem.h"
 #include "gtkintl.h"
 #include "gtkprivate.h" /* To get redefinition of GTK_LOCALE_DIR on Win32 */
-#include "gtkalias.h"
 
 #define NONE_ID "gtk-im-context-none"
 
@@ -709,7 +708,3 @@ gtk_im_multicontext_set_context_id (GtkIMMulticontext *context,
   context->priv->context_id = g_strdup (context_id);
   gtk_im_multicontext_set_slave (context, NULL, FALSE);
 }
-
-
-#define __GTK_IM_MULTICONTEXT_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index f49155b2f9..84127d6d36 100644
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -47,8 +47,6 @@
 #include "gtkprivate.h"
 #include "gtkstock.h"
 #include "gdkkeysyms.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkinfobar
@@ -1259,7 +1257,3 @@ gtk_info_bar_get_message_type (GtkInfoBar *info_bar)
 
   return priv->message_type;
 }
-
-
-#define __GTK_INFO_BAR_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c
index 8c0b3beb5e..08e65f3f2b 100644
--- a/gtk/gtkinvisible.c
+++ b/gtk/gtkinvisible.c
@@ -29,7 +29,6 @@
 #include "gtkinvisible.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 enum {
   PROP_0,
@@ -320,6 +319,3 @@ gtk_invisible_constructor (GType                  type,
 
   return object;
 }
-
-#define __GTK_INVISIBLE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkitem.c b/gtk/gtkitem.c
index b21c1e5fc1..ddcf571c7f 100644
--- a/gtk/gtkitem.c
+++ b/gtk/gtkitem.c
@@ -28,7 +28,6 @@
 #include "gtkitem.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 enum {
@@ -171,6 +170,3 @@ gtk_item_leave (GtkWidget        *widget,
 
   return gtk_widget_event (widget->parent, (GdkEvent*) event);
 }
-
-#define __GTK_ITEM_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkkeyhash.c b/gtk/gtkkeyhash.c
index cbe0b7747c..df67f53af8 100644
--- a/gtk/gtkkeyhash.c
+++ b/gtk/gtkkeyhash.c
@@ -21,7 +21,6 @@
 #include "config.h"
 #include "gtkdebug.h"
 #include "gtkkeyhash.h"
-#include "gtkalias.h"
 
 typedef struct _GtkKeyHashEntry GtkKeyHashEntry;
 
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 71eeb9a03a..0e5c29704a 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -50,7 +50,6 @@
 #include "gtktooltip.h"
 #include "gtksizerequest.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 #define GTK_LABEL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_LABEL, GtkLabelPrivate))
 
@@ -6401,7 +6400,3 @@ gtk_label_query_tooltip (GtkWidget  *widget,
                                                                    keyboard_tip,
                                                                    tooltip);
 }
-
-
-#define __GTK_LABEL_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c
index 868347f645..deb420654b 100644
--- a/gtk/gtklayout.c
+++ b/gtk/gtklayout.c
@@ -35,7 +35,7 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
-#include "gtkalias.h"
+
 
 typedef struct _GtkLayoutChild   GtkLayoutChild;
 
@@ -1076,6 +1076,3 @@ gtk_layout_adjustment_changed (GtkAdjustment *adjustment,
       gdk_window_process_updates (layout->bin_window, TRUE);
     }
 }
-
-#define __GTK_LAYOUT_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
index 572c7166d7..0370d033aa 100644
--- a/gtk/gtklinkbutton.c
+++ b/gtk/gtklinkbutton.c
@@ -40,7 +40,6 @@
 #include "gtklinkbutton.h"
 
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 struct _GtkLinkButtonPrivate
@@ -785,7 +784,3 @@ gtk_link_button_get_visited (GtkLinkButton *link_button)
   
   return link_button->priv->visited;
 }
-
-
-#define __GTK_LINK_BUTTON_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 61b314d8c7..2c2aa80247 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -29,7 +29,6 @@
 #include "gtkintl.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
-#include "gtkalias.h"
 
 #define GTK_LIST_STORE_IS_SORTED(list) (((GtkListStore*)(list))->sort_column_id != GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID)
 #define VALID_ITER(iter, list_store) ((iter)!= NULL && (iter)->user_data != NULL && list_store->stamp == (iter)->stamp && !g_sequence_iter_is_end ((iter)->user_data) && g_sequence_iter_get_sequence ((iter)->user_data) == list_store->seq)
@@ -2382,6 +2381,3 @@ gtk_list_store_buildable_custom_tag_end (GtkBuildable *buildable,
   else
     g_warning ("Unknown custom list store tag: %s", tagname);
 }
-
-#define __GTK_LIST_STORE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 846135da44..cf3cd53da1 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -62,7 +62,6 @@
 #include "gtkwindow.h"
 #include "gtktooltip.h"
 #include "gtkdebug.h"
-#include "gtkalias.h"
 #include "gtkmenu.h"
 #include "gdk/gdkkeysyms.h"
 
@@ -2442,6 +2441,3 @@ _gtk_boolean_handled_accumulator (GSignalInvocationHint *ihint,
   
   return continue_emission;
 }
-
-#define __GTK_MAIN_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index c9b23827a7..f119c6f0a0 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -43,8 +43,6 @@
 #include "gtksettings.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
-
 
 #define DEFAULT_POPUP_DELAY     225
 #define DEFAULT_POPDOWN_DELAY  1000
@@ -5486,6 +5484,3 @@ gtk_menu_get_reserve_toggle_size (GtkMenu *menu)
 
   return !priv->no_toggle_size;
 }
-
-#define __GTK_MENU_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 13329751ce..9f898b5b3b 100644
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -37,8 +37,6 @@
 #include "gtkintl.h"
 #include "gtkwindow.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
-
 
 #define BORDER_SPACING  0
 #define DEFAULT_IPADDING 1
@@ -938,6 +936,3 @@ gtk_menu_bar_set_child_pack_direction (GtkMenuBar       *menubar,
       g_object_notify (G_OBJECT (menubar), "child-pack-direction");
     }
 }
-
-#define __GTK_MENU_BAR_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 76fab0d24d..8e85ced860 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -39,7 +39,6 @@
 #include "gtkbuildable.h"
 #include "gtkactivatable.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 typedef struct {
@@ -2203,8 +2202,3 @@ gtk_menu_item_get_use_underline (GtkMenuItem *menu_item)
 
   return FALSE;
 }
-
-
-
-#define __GTK_MENU_ITEM_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 7c62a3dd29..1a8b80d686 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -42,7 +42,6 @@
 #include "gtkwindow.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define MENU_SHELL_TIMEOUT   500
 
@@ -1860,6 +1859,3 @@ gtk_menu_shell_set_take_focus (GtkMenuShell *menu_shell,
       g_object_notify (G_OBJECT (menu_shell), "take-focus");
     }
 }
-
-#define __GTK_MENU_SHELL_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index 460423d348..08650166c5 100644
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -30,7 +30,6 @@
 #include "gtkmain.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 #define GTK_MENU_TOOL_BUTTON_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), GTK_TYPE_MENU_TOOL_BUTTON, GtkMenuToolButtonPrivate))
@@ -629,6 +628,3 @@ gtk_menu_tool_button_set_arrow_tooltip_markup (GtkMenuToolButton *button,
 
   gtk_widget_set_tooltip_markup (button->priv->arrow_button, markup);
 }
-
-#define __GTK_MENU_TOOL_BUTTON_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index 408cb44b86..2bd1d14396 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -39,7 +39,6 @@
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkmessagedialog
@@ -1034,6 +1033,3 @@ gtk_message_dialog_style_set (GtkWidget *widget,
 
   GTK_WIDGET_CLASS (gtk_message_dialog_parent_class)->style_set (widget, prev_style);
 }
-
-#define __GTK_MESSAGE_DIALOG_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkmisc.c b/gtk/gtkmisc.c
index 93d8421837..d0b4321e38 100644
--- a/gtk/gtkmisc.c
+++ b/gtk/gtkmisc.c
@@ -29,7 +29,6 @@
 #include "gtkmisc.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 
 enum {
@@ -336,6 +335,3 @@ gtk_misc_realize (GtkWidget *widget)
       gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
     }
 }
-
-#define __GTK_MISC_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkmnemonichash.c b/gtk/gtkmnemonichash.c
index 6434e14402..6f85d04f6e 100644
--- a/gtk/gtkmnemonichash.c
+++ b/gtk/gtkmnemonichash.c
@@ -20,7 +20,6 @@
  */
 
 #include "gtkmnemonichash.h"
-#include "gtkalias.h"
 
 struct _GtkMnemnonicHash
 {
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index b0b0e7e18a..b1c958cb4b 100644
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -27,7 +27,6 @@
 #include "gtkdebug.h"
 #include "gtkprivate.h" /* GTK_LIBDIR */
 #include "gtkintl.h" 
-#include "gtkalias.h"
 
 #include <gmodule.h>
 
diff --git a/gtk/gtkmountoperation-x11.c b/gtk/gtkmountoperation-x11.c
index a20c8cf428..3ba7930808 100644
--- a/gtk/gtkmountoperation-x11.c
+++ b/gtk/gtkmountoperation-x11.c
@@ -44,9 +44,6 @@
 
 #include "gtkmountoperationprivate.h"
 
-#include "gtkalias.h"
-
-
 /* ---------------------------------------------------------------------------------------------------- */
 /* these functions are based on code from libwnck (LGPLv2) */
 
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index d611631bb8..120ee69463 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -53,7 +53,6 @@
 #include "gtkicontheme.h"
 #include "gtkimagemenuitem.h"
 #include "gtkmain.h"
-#include "gtkalias.h"
 
 /**
  * SECTION:filesystem
@@ -1525,6 +1524,3 @@ gtk_mount_operation_get_screen (GtkMountOperation *op)
   else
     return gdk_screen_get_default ();
 }
-
-#define __GTK_MOUNT_OPERATION_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index ae8dbdac30..e9810b5a79 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -46,8 +46,6 @@
 #include "gtkdnd.h"
 #include "gtkbuildable.h"
 
-#include "gtkalias.h"
-
 #define SCROLL_DELAY_FACTOR   5
 #define SCROLL_THRESHOLD      12
 #define DND_THRESHOLD_MULTIPLIER 4
@@ -7713,6 +7711,3 @@ gtk_notebook_set_action_widget (GtkNotebook *notebook,
 
   gtk_widget_queue_resize (GTK_WIDGET (notebook));
 }
-
-#define __GTK_NOTEBOOK_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index e4bc937d4f..0b26cfd3f8 100644
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -35,9 +35,6 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 
-#include "gtkalias.h"
-
-
 /**
  * SECTION:gtkobject
  * @Short_description: The base class of the GTK+ type hierarchy
@@ -228,6 +225,3 @@ gtk_object_finalize (GObject *gobject)
   
   G_OBJECT_CLASS (gtk_object_parent_class)->finalize (gobject);
 }
-
-#define __GTK_OBJECT_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkoffscreenwindow.c b/gtk/gtkoffscreenwindow.c
index 0633a787a3..c62e2eb225 100644
--- a/gtk/gtkoffscreenwindow.c
+++ b/gtk/gtkoffscreenwindow.c
@@ -19,7 +19,6 @@
  */
 
 #include "gtkoffscreenwindow.h"
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkoffscreenwindow
@@ -312,6 +311,3 @@ gtk_offscreen_window_get_pixbuf (GtkOffscreenWindow *offscreen)
 
   return pixbuf;
 }
-
-#define __GTK_OFFSCREEN_WINDOW_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkorientable.c b/gtk/gtkorientable.c
index 636f65da8f..33a59df2a7 100644
--- a/gtk/gtkorientable.c
+++ b/gtk/gtkorientable.c
@@ -26,7 +26,6 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 /**
@@ -111,6 +110,3 @@ gtk_orientable_get_orientation (GtkOrientable *orientable)
 
   return orientation;
 }
-
-#define __GTK_ORIENTABLE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkpagesetup.c b/gtk/gtkpagesetup.c
index 0e8c153b77..a69e0821c5 100644
--- a/gtk/gtkpagesetup.c
+++ b/gtk/gtkpagesetup.c
@@ -25,7 +25,6 @@
 #include "gtkprintoperation.h" /* for GtkPrintError */
 #include "gtkintl.h"
 #include "gtktypebuiltins.h"
-#include "gtkalias.h"
 
 #define KEYFILE_GROUP_NAME "Page Setup"
 
@@ -782,6 +781,3 @@ gtk_page_setup_to_key_file (GtkPageSetup *setup,
 			 "Orientation", orientation);
   g_free (orientation);
 }
-
-#define __GTK_PAGE_SETUP_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c
index 19a19a77e1..7543febb21 100644
--- a/gtk/gtkpagesetupunixdialog.c
+++ b/gtk/gtkpagesetupunixdialog.c
@@ -54,8 +54,6 @@
 #include "gtkprintbackend.h"
 #include "gtkpapersize.h"
 #include "gtkprintutils.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkpagesetupunixdialog
@@ -1207,6 +1205,3 @@ gtk_page_setup_unix_dialog_get_print_settings (GtkPageSetupUnixDialog *dialog)
 
   return priv->print_settings;
 }
-
-#define __GTK_PAGE_SETUP_UNIX_DIALOG_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index e17131f8f3..f1103fbcbc 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -35,7 +35,7 @@
 #include "gtkwindow.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 enum {
   PROP_0,
@@ -2247,6 +2247,3 @@ gtk_paned_get_handle_window (GtkPaned *paned)
 
   return paned->handle;
 }
-
-#define __GTK_PANED_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c
index 894dca0b87..bc81d7b271 100644
--- a/gtk/gtkpapersize.c
+++ b/gtk/gtkpapersize.c
@@ -31,7 +31,6 @@
 #include "gtkprintutils.h"
 #include "gtkprintoperation.h"  /* for GtkPrintError */
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #include "paper_names_offsets.c"
 
@@ -920,7 +919,3 @@ gtk_paper_size_to_key_file (GtkPaperSize *size,
   g_key_file_set_double (key_file, group_name,
 			 "Height", gtk_paper_size_get_height (size, GTK_UNIT_MM));
 }
-
-
-#define __GTK_PAPER_SIZE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 10c1f3cb8a..08236dd706 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -33,7 +33,7 @@
 #include "gtkhbox.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
-#include "gtkalias.h"
+
 
 enum {
   PATH_CLICKED,
@@ -1834,6 +1834,3 @@ _gtk_path_bar_down (GtkPathBar *path_bar)
 	}
     }
 }
-
-#define __GTK_PATH_BAR_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkplug-stub.c b/gtk/gtkplug-stub.c
index 92c5f10956..3bd1024aab 100644
--- a/gtk/gtkplug-stub.c
+++ b/gtk/gtkplug-stub.c
@@ -27,7 +27,6 @@
 
 #include "gtkplug.h"
 #include "gtkplugprivate.h"
-#include "gtkalias.h"
 
 GdkNativeWindow
 _gtk_plug_windowing_get_id (GtkPlug *plug)
diff --git a/gtk/gtkplug-win32.c b/gtk/gtkplug-win32.c
index 98440c1cfa..edcaaf4dde 100644
--- a/gtk/gtkplug-win32.c
+++ b/gtk/gtkplug-win32.c
@@ -33,7 +33,6 @@
 #include "win32/gdkwin32.h"
 
 #include "gtkwin32embed.h"
-#include "gtkalias.h"
 
 #if defined(_MSC_VER) && (WINVER < 0x0500)
 #ifndef GA_PARENT
diff --git a/gtk/gtkplug-x11.c b/gtk/gtkplug-x11.c
index d0df6f54c5..f7534935ba 100644
--- a/gtk/gtkplug-x11.c
+++ b/gtk/gtkplug-x11.c
@@ -49,7 +49,6 @@
 #include "x11/gdkx.h"
 
 #include "gtkxembed.h"
-#include "gtkalias.h"
 
 static void xembed_set_info            (GdkWindow     *window,
 					unsigned long  flags);
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 52d2b925f9..3a30ab58e8 100644
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -34,8 +34,6 @@
 #include "gtkprivate.h"
 #include "gtkplugprivate.h"
 
-#include "gtkalias.h"
-
 /**
  * SECTION:gtkplug
  * @Short_description: Toplevel for embedding into other processes
@@ -1064,6 +1062,3 @@ _gtk_plug_focus_first_last (GtkPlug          *plug,
 
   gtk_widget_child_focus (GTK_WIDGET (plug), direction);
 }
-
-#define __GTK_PLUG_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkprint-win32.c b/gtk/gtkprint-win32.c
index b7faae20f4..7801a7f880 100644
--- a/gtk/gtkprint-win32.c
+++ b/gtk/gtkprint-win32.c
@@ -25,7 +25,6 @@
 
 #include "config.h"
 #include "gtkprint-win32.h"
-#include "gtkalias.h"
 
 void
 gtk_print_win32_devnames_free (GtkPrintWin32Devnames *devnames)
@@ -155,7 +154,3 @@ gtk_print_win32_devnames_from_printer_name (const char *printer_name)
 
   return devnames;
 }
-
-
-#define __GTK_PRINT_WIN32_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c
index c487d33f4d..bdb6a1d2cc 100644
--- a/gtk/gtkprintbackend.c
+++ b/gtk/gtkprintbackend.c
@@ -28,7 +28,6 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkprintbackend.h"
-#include "gtkalias.h"
 
 #define GTK_PRINT_BACKEND_GET_PRIVATE(o)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_PRINT_BACKEND, GtkPrintBackendPrivate))
@@ -837,7 +836,3 @@ gtk_print_backend_destroy (GtkPrintBackend *print_backend)
    */
   g_object_run_dispose (G_OBJECT (print_backend));
 }
-
-
-#define __GTK_PRINT_BACKEND_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkprintcontext.c b/gtk/gtkprintcontext.c
index cdf04d7c2f..105f118262 100644
--- a/gtk/gtkprintcontext.c
+++ b/gtk/gtkprintcontext.c
@@ -20,7 +20,6 @@
 
 #include "config.h"
 #include "gtkprintoperation-private.h"
-#include "gtkalias.h"
 
 typedef struct _GtkPrintContextClass GtkPrintContextClass;
 
@@ -517,7 +516,3 @@ gtk_print_context_create_pango_layout (GtkPrintContext *context)
 
   return layout;
 }
-
-
-#define __GTK_PRINT_CONTEXT_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c
index 928896ab1f..d43e7b1342 100644
--- a/gtk/gtkprinter.c
+++ b/gtk/gtkprinter.c
@@ -29,8 +29,6 @@
 #include "gtkprinter-private.h"
 #include "gtkprintbackend.h"
 #include "gtkprintjob.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkprinter
@@ -1281,7 +1279,3 @@ gtk_print_capabilities_get_type (void)
 
   return etype;
 }
-
-
-#define __GTK_PRINTER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkprinteroption.c b/gtk/gtkprinteroption.c
index 47fcd32755..fbf2545b6d 100644
--- a/gtk/gtkprinteroption.c
+++ b/gtk/gtkprinteroption.c
@@ -23,7 +23,6 @@
 #include <gmodule.h>
 
 #include "gtkprinteroption.h"
-#include "gtkalias.h"
 
 /*****************************************
  *            GtkPrinterOption           *
@@ -232,7 +231,3 @@ gtk_printer_option_get_activates_default (GtkPrinterOption *option)
 
   return option->activates_default;
 }
-
-
-#define __GTK_PRINTER_OPTION_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkprinteroptionset.c b/gtk/gtkprinteroptionset.c
index 5a30c72164..d32d3b8c7d 100644
--- a/gtk/gtkprinteroptionset.c
+++ b/gtk/gtkprinteroptionset.c
@@ -24,7 +24,6 @@
 #include <gmodule.h>
 
 #include "gtkprinteroptionset.h"
-#include "gtkalias.h"
 
 /*****************************************
  *         GtkPrinterOptionSet    *
@@ -192,7 +191,3 @@ gtk_printer_option_set_foreach (GtkPrinterOptionSet *set,
 {
   gtk_printer_option_set_foreach_in_group (set, NULL, func, user_data);
 }
-
-
-#define __GTK_PRINTER_OPTION_SET_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c
index a4e6f0cf43..8831dfc092 100644
--- a/gtk/gtkprinteroptionwidget.c
+++ b/gtk/gtkprinteroptionwidget.c
@@ -41,7 +41,6 @@
 #include "gtkprivate.h"
 
 #include "gtkprinteroptionwidget.h"
-#include "gtkalias.h"
 
 #define GTK_PRINTER_OPTION_WIDGET_GET_PRIVATE(o)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_PRINTER_OPTION_WIDGET, GtkPrinterOptionWidgetPrivate))
@@ -927,6 +926,3 @@ gtk_printer_option_widget_get_value (GtkPrinterOptionWidget *widget)
   
   return "";
 }
-
-#define __GTK_PRINTER_OPTION_WIDGET_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c
index af76152718..e30deb00c6 100644
--- a/gtk/gtkprintjob.c
+++ b/gtk/gtkprintjob.c
@@ -37,7 +37,6 @@
 #include "gtkprinter.h"
 #include "gtkprinter-private.h"
 #include "gtkprintbackend.h"
-#include "gtkalias.h"
 
 #ifndef O_BINARY
 #define O_BINARY 0
@@ -684,7 +683,3 @@ gtk_print_job_send (GtkPrintJob             *job,
 				  priv->spool_io,
                                   callback, user_data, dnotify);
 }
-
-
-#define __GTK_PRINT_JOB_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c
index 896871ab22..d43db01e51 100644
--- a/gtk/gtkprintoperation-unix.c
+++ b/gtk/gtkprintoperation-unix.c
@@ -44,7 +44,7 @@
 #include "gtkprintjob.h"
 #include "gtklabel.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 typedef struct 
 {
@@ -1206,6 +1206,3 @@ find_printer (const gchar *printer,
   if (finder->backends == NULL && !finder->found_printer)
     g_idle_add (find_printer_idle, finder);
 }
-
-#define __GTK_PRINT_OPERATION_UNIX_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c
index 76f8a696ae..ccb3cd929b 100644
--- a/gtk/gtkprintoperation-win32.c
+++ b/gtk/gtkprintoperation-win32.c
@@ -43,7 +43,6 @@
 #include "gtkstock.h"
 #include "gtk.h"
 #include "gtkwin32embedwidget.h"
-#include "gtkalias.h"
 
 #define MAX_PAGE_RANGES 20
 #define STATUS_POLLING_TIME 2000
@@ -2134,6 +2133,3 @@ gtk_print_run_page_setup_dialog_async (GtkWindow            *parent,
   done_cb (new_page_setup, data);
   g_object_unref (new_page_setup);
 }
-
-#define __GTK_PRINT_OPERATION_WIN32_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index a633bcdb7e..60a2df2c68 100644
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -31,7 +31,6 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkmessagedialog.h"
-#include "gtkalias.h"
 
 #define SHOW_PROGRESS_TIME 1200
 
@@ -3308,6 +3307,3 @@ gtk_print_operation_get_n_pages_to_print (GtkPrintOperation *op)
 
   return op->priv->nr_of_pages_to_print;
 }
-
-#define __GTK_PRINT_OPERATION_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkprintoperationpreview.c b/gtk/gtkprintoperationpreview.c
index 3b0ef7c63c..f4c6867a06 100644
--- a/gtk/gtkprintoperationpreview.c
+++ b/gtk/gtkprintoperationpreview.c
@@ -23,7 +23,6 @@
 #include "gtkprintoperationpreview.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 static void gtk_print_operation_preview_base_init (gpointer g_iface);
@@ -176,7 +175,3 @@ gtk_print_operation_preview_is_selected (GtkPrintOperationPreview *preview,
 
   return GTK_PRINT_OPERATION_PREVIEW_GET_IFACE (preview)->is_selected (preview, page_nr);
 }
-
-
-#define __GTK_PRINT_OPERATION_PREVIEW_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkprintsettings.c b/gtk/gtkprintsettings.c
index 6d1c818c2d..5cbcab2da7 100644
--- a/gtk/gtkprintsettings.c
+++ b/gtk/gtkprintsettings.c
@@ -25,7 +25,6 @@
 #include <gtk/gtk.h>
 #include "gtkprintsettings.h"
 #include "gtkprintutils.h"
-#include "gtkalias.h"
 
 
 typedef struct _GtkPrintSettingsClass GtkPrintSettingsClass;
@@ -1921,7 +1920,3 @@ gtk_print_settings_to_key_file (GtkPrintSettings  *settings,
 			      (GtkPrintSettingsFunc) add_value_to_key_file,
 			      &data);
 }
-
-
-#define __GTK_PRINT_SETTINGS_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index c3edb789a7..b43ed84a34 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -56,7 +56,6 @@
 #include "gtkprintunixdialog.h"
 #include "gtkprinteroptionwidget.h"
 #include "gtkprintutils.h"
-#include "gtkalias.h"
 
 #include "gtkmessagedialog.h"
 #include "gtkbutton.h"
@@ -4427,6 +4426,3 @@ gtk_print_unix_dialog_get_embed_page_setup (GtkPrintUnixDialog *dialog)
 
   return dialog->priv->embed_page_setup;
 }
-
-#define __GTK_PRINT_UNIX_DIALOG_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkprintutils.c b/gtk/gtkprintutils.c
index 33896a55a5..dced6e8a4d 100644
--- a/gtk/gtkprintutils.c
+++ b/gtk/gtkprintutils.c
@@ -20,7 +20,6 @@
 
 #include "config.h"
 #include "gtkprintutils.h"
-#include "gtkalias.h"
 
 gdouble
 _gtk_print_convert_to_mm (gdouble len, 
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index 5ea054329b..500f2d1aac 100644
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -31,7 +31,6 @@
 #include "gtkprogressbar.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 #define MIN_HORIZONTAL_BAR_WIDTH   150
@@ -1276,7 +1275,3 @@ gtk_progress_bar_get_ellipsize (GtkProgressBar *pbar)
 
   return pbar->ellipsize;
 }
-
-
-#define __GTK_PROGRESS_BAR_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkquartz.c b/gtk/gtkquartz.c
index 265d9ffa22..e8945591a4 100644
--- a/gtk/gtkquartz.c
+++ b/gtk/gtkquartz.c
@@ -22,7 +22,6 @@
 
 #include "gtkquartz.h"
 #include <gdk/quartz/gdkquartz.h>
-#include "gtkalias.h"
 
 NSImage *
 _gtk_quartz_create_image_from_pixbuf (GdkPixbuf *pixbuf)
diff --git a/gtk/gtkradioaction.c b/gtk/gtkradioaction.c
index f44c2b546c..ac31219393 100644
--- a/gtk/gtkradioaction.c
+++ b/gtk/gtkradioaction.c
@@ -36,8 +36,6 @@
 #include "gtktoggletoolbutton.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkradioaction
@@ -594,6 +592,3 @@ gtk_radio_action_set_current_value (GtkRadioAction *action,
     g_warning ("Radio group does not contain an action with value '%d'",
 	       current_value);
 }
-
-#define __GTK_RADIO_ACTION_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index 24300334c9..4343779ea0 100644
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -30,8 +30,6 @@
 #include "gtkradiobutton.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkradiobutton
@@ -878,6 +876,3 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
 			x, y, indicator_size, indicator_size);
     }
 }
-
-#define __GTK_RADIO_BUTTON_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c
index 9bb5c112fd..4cbdc0e5d9 100644
--- a/gtk/gtkradiomenuitem.c
+++ b/gtk/gtkradiomenuitem.c
@@ -31,7 +31,6 @@
 #include "gtkactivatable.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 enum {
@@ -489,6 +488,3 @@ gtk_radio_menu_item_activate (GtkMenuItem *menu_item)
 
   gtk_widget_queue_draw (GTK_WIDGET (radio_menu_item));
 }
-
-#define __GTK_RADIO_MENU_ITEM_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkradiotoolbutton.c b/gtk/gtkradiotoolbutton.c
index 1aa37da1fb..c39758761f 100644
--- a/gtk/gtkradiotoolbutton.c
+++ b/gtk/gtkradiotoolbutton.c
@@ -25,7 +25,7 @@
 #include "gtkradiobutton.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
+
 
 enum {
   PROP_0,
@@ -252,6 +252,3 @@ gtk_radio_tool_button_set_group (GtkRadioToolButton *button,
 
   gtk_radio_button_set_group (get_radio_button (button), group);
 }
-
-#define __GTK_RADIO_TOOL_BUTTON_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 01c98d61fd..b3fd663b6a 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -39,8 +39,6 @@
 #include "gtkscrollbar.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkrange
@@ -3974,6 +3972,3 @@ _gtk_range_get_stop_positions (GtkRange  *range,
 
   return range->layout->n_marks;
 }
-
-#define __GTK_RANGE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkrbtree.c b/gtk/gtkrbtree.c
index c33a9edcfe..fdd45ad812 100644
--- a/gtk/gtkrbtree.c
+++ b/gtk/gtkrbtree.c
@@ -20,7 +20,6 @@
 #include "config.h"
 #include "gtkrbtree.h"
 #include "gtkdebug.h"
-#include "gtkalias.h"
 
 static GtkRBNode * _gtk_rbnode_new                (GtkRBTree  *tree,
 						   gint        height);
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 32b51e144e..19d0f6cd87 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -56,8 +56,6 @@
 #include "gtksettings.h"
 #include "gtkwindow.h"
 
-#include "gtkalias.h"
-
 #ifdef G_OS_WIN32
 #include <io.h>
 #endif
@@ -4880,6 +4878,3 @@ gtk_rc_parse (const gchar *filename)
 }
 
 #endif
-
-#define __GTK_RC_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkrecentaction.c b/gtk/gtkrecentaction.c
index 458d23f019..41f2a26471 100644
--- a/gtk/gtkrecentaction.c
+++ b/gtk/gtkrecentaction.c
@@ -30,8 +30,6 @@
 #include "gtkrecentchooserutils.h"
 #include "gtkrecentchooserprivate.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkrecentaction
@@ -782,6 +780,3 @@ gtk_recent_action_set_show_numbers (GtkRecentAction *action,
       g_object_unref (action);
     }
 }
-
-#define __GTK_RECENT_ACTION_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkrecentchooser.c b/gtk/gtkrecentchooser.c
index d381df328a..8bcc8e2541 100644
--- a/gtk/gtkrecentchooser.c
+++ b/gtk/gtkrecentchooser.c
@@ -30,8 +30,6 @@
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 #include "gtkmarshalers.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkrecentchooser
@@ -1148,6 +1146,3 @@ _gtk_recent_chooser_get_use_action_appearance (GtkRecentChooser *recent_chooser)
 {
   return !GPOINTER_TO_INT (g_object_get_qdata (G_OBJECT (recent_chooser), quark_gtk_use_action_appearance));
 }
-
-#define __GTK_RECENT_CHOOSER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c
index 7cae6898f1..612a8ec1df 100644
--- a/gtk/gtkrecentchooserdefault.c
+++ b/gtk/gtkrecentchooserdefault.c
@@ -75,7 +75,7 @@
 #include "gtkrecentchooserdefault.h"
 
 #include "gtkprivate.h"
-#include "gtkalias.h"
+
 
 enum 
 {
diff --git a/gtk/gtkrecentchooserdialog.c b/gtk/gtkrecentchooserdialog.c
index c86910f3fa..e8f5b6b5ac 100644
--- a/gtk/gtkrecentchooserdialog.c
+++ b/gtk/gtkrecentchooserdialog.c
@@ -25,7 +25,6 @@
 #include "gtkrecentchooserutils.h"
 #include "gtkrecentmanager.h"
 #include "gtktypebuiltins.h"
-#include "gtkalias.h"
 
 #include <stdarg.h>
 
@@ -395,6 +394,3 @@ gtk_recent_chooser_dialog_new_for_manager (const gchar      *title,
   
   return result;
 }
-
-#define __GTK_RECENT_CHOOSER_DIALOG_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkrecentchoosermenu.c b/gtk/gtkrecentchoosermenu.c
index f77643b658..d922f923cd 100644
--- a/gtk/gtkrecentchoosermenu.c
+++ b/gtk/gtkrecentchoosermenu.c
@@ -45,8 +45,6 @@
 #include "gtkactivatable.h"
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkrecentchoosermenu
@@ -1321,6 +1319,3 @@ gtk_recent_chooser_menu_set_show_numbers (GtkRecentChooserMenu *menu,
   menu->priv->show_numbers = show_numbers;
   g_object_notify (G_OBJECT (menu), "show-numbers");
 }
-
-#define __GTK_RECENT_CHOOSER_MENU_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkrecentchooserutils.c b/gtk/gtkrecentchooserutils.c
index f0a0009022..54f0ff5ce5 100644
--- a/gtk/gtkrecentchooserutils.c
+++ b/gtk/gtkrecentchooserutils.c
@@ -27,7 +27,6 @@
 #include "config.h"
 
 #include "gtkrecentchooserutils.h"
-#include "gtkalias.h"
 
 /* Methods */
 static void      delegate_set_sort_func              (GtkRecentChooser  *chooser,
diff --git a/gtk/gtkrecentchooserwidget.c b/gtk/gtkrecentchooserwidget.c
index 44169a44ea..cc05491c94 100644
--- a/gtk/gtkrecentchooserwidget.c
+++ b/gtk/gtkrecentchooserwidget.c
@@ -24,8 +24,6 @@
 #include "gtkrecentchooserdefault.h"
 #include "gtkrecentchooserutils.h"
 #include "gtktypebuiltins.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkrecentchooserwidget
@@ -208,6 +206,3 @@ gtk_recent_chooser_widget_new_for_manager (GtkRecentManager *manager)
   		       "recent-manager", manager,
   		       NULL);
 }
-
-#define __GTK_RECENT_CHOOSER_WIDGET_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkrecentfilter.c b/gtk/gtkrecentfilter.c
index 5de81cf20d..fd9d0b313c 100644
--- a/gtk/gtkrecentfilter.c
+++ b/gtk/gtkrecentfilter.c
@@ -25,8 +25,6 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 
-#include "gtkalias.h"
-
 typedef struct _GtkRecentFilterClass GtkRecentFilterClass;
 typedef struct _FilterRule FilterRule;
 
@@ -563,6 +561,3 @@ gtk_recent_filter_filter (GtkRecentFilter           *filter,
   
   return FALSE;
 }
-
-#define __GTK_RECENT_FILTER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index a9ee6d37e7..83642357e0 100644
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -39,7 +39,6 @@
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 #include "gtkmarshalers.h"
-#include "gtkalias.h"
 
 /* the file where we store the recently used items */
 #define GTK_RECENTLY_USED_FILE	".recently-used.xbel"
@@ -2324,6 +2323,3 @@ _gtk_recent_manager_sync (void)
       gtk_recent_manager_real_changed (recent_manager_singleton);
     }
 }
-
-#define __GTK_RECENT_MANAGER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c
index 43c23c5eec..2e407816f4 100644
--- a/gtk/gtkruler.c
+++ b/gtk/gtkruler.c
@@ -33,8 +33,6 @@
 #include "gtkruler.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
-
 
 #define RULER_WIDTH           14
 #define MINIMUM_INCR          5
@@ -907,6 +905,3 @@ gtk_ruler_real_draw_pos (GtkRuler *ruler)
 	}
     }
 }
-
-#define __GTK_RULER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index c2f0f3520c..628a9986c0 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -40,8 +40,6 @@
 #include "gtkintl.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
-#include "gtkalias.h"
-
 
 #define	MAX_DIGITS	(64)	/* don't change this,
 				 * a) you don't need to and
@@ -1681,6 +1679,3 @@ gtk_scale_buildable_custom_finished (GtkBuildable *buildable,
       g_slice_free (MarksSubparserData, marks_data);
     }
 }
-
-#define __GTK_SCALE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index dce3937a25..efbfffd723 100644
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -58,8 +58,6 @@
 #include "gtkwindow.h"
 
 #include "gtkintl.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkscalebutton
@@ -1607,6 +1605,3 @@ gtk_scale_button_scale_value_changed (GtkRange *range)
   g_signal_emit (button, signals[VALUE_CHANGED], 0, value);
   g_object_notify (G_OBJECT (button), "value");
 }
-
-#define __GTK_SCALE_BUTTON_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
index 6bd2f6150e..34ef5b60ce 100644
--- a/gtk/gtkscrollbar.c
+++ b/gtk/gtkscrollbar.c
@@ -30,7 +30,6 @@
 #include "gtkscrollbar.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 static void gtk_scrollbar_style_set (GtkWidget *widget,
                                      GtkStyle  *previous);
@@ -148,7 +147,3 @@ gtk_scrollbar_new (GtkOrientation  orientation,
                        "adjustment",  adjustment,
                        NULL);
 }
-
-
-#define __GTK_SCROLLBAR_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 612ff23ab8..674eb85e5e 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -34,8 +34,6 @@
 #include "gtkwindow.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
-
 
 /* scrolled window policy and size requisition handling:
  *
@@ -1903,6 +1901,3 @@ gtk_scrolled_window_get_width_for_height (GtkSizeRequest *widget,
 
   GTK_SIZE_REQUEST_GET_IFACE (widget)->get_width (widget, minimum_width, natural_width);
 }
-
-#define __GTK_SCROLLED_WINDOW_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 5c7db9cc7f..5d6ad033c9 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -70,8 +70,6 @@
 #include "win32/gdkwin32.h"
 #endif
 
-#include "gtkalias.h"
-
 #undef DEBUG_SELECTION
 
 /* Maximum size of a sent chunk, in bytes. Also the default size of
@@ -3157,6 +3155,3 @@ gtk_selection_bytes_per_item (gint format)
     }
   return 0;
 }
-
-#define __GTK_SELECTION_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c
index 58ef60f1ad..45e93f3fb8 100644
--- a/gtk/gtkseparator.c
+++ b/gtk/gtkseparator.c
@@ -30,8 +30,6 @@
 #include "gtkseparator.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkseparator
@@ -265,7 +263,3 @@ gtk_separator_new (GtkOrientation orientation)
                        "orientation", orientation,
                        NULL);
 }
-
-
-#define __GTK_SEPARATOR_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkseparatormenuitem.c b/gtk/gtkseparatormenuitem.c
index d096b5f33c..44ebd97dfa 100644
--- a/gtk/gtkseparatormenuitem.c
+++ b/gtk/gtkseparatormenuitem.c
@@ -26,8 +26,6 @@
 
 #include "config.h"
 #include "gtkseparatormenuitem.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkseparatormenuitem
@@ -65,6 +63,3 @@ gtk_separator_menu_item_new (void)
 {
   return g_object_new (GTK_TYPE_SEPARATOR_MENU_ITEM, NULL);
 }
-
-#define __GTK_SEPARATOR_MENU_ITEM_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkseparatortoolitem.c b/gtk/gtkseparatortoolitem.c
index 2a35efe5f0..db53893536 100644
--- a/gtk/gtkseparatortoolitem.c
+++ b/gtk/gtkseparatortoolitem.c
@@ -25,8 +25,6 @@
 #include "gtkintl.h"
 #include "gtktoolbar.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
-
 
 /**
  * SECTION:gtkseparatortoolitem
@@ -300,6 +298,3 @@ gtk_separator_tool_item_set_draw (GtkSeparatorToolItem *item,
       g_object_notify (G_OBJECT (item), "draw");
     }
 }
-
-#define __GTK_SEPARATOR_TOOL_ITEM_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 99dcb844ee..5818069839 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -28,7 +28,6 @@
 #include "gtkintl.h"
 #include "gtkwidget.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
@@ -2503,7 +2502,3 @@ get_color_scheme (GtkSettings *settings)
 
   return g_string_free (string, FALSE);
 }
-
-
-#define __GTK_SETTINGS_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkshow.c b/gtk/gtkshow.c
index b2b56918a2..e4e5d50d4e 100644
--- a/gtk/gtkshow.c
+++ b/gtk/gtkshow.c
@@ -26,9 +26,6 @@
 
 #include "gtkshow.h"
 
-#include "gtkalias.h"
-
-
 /**
  * gtk_show_uri:
  * @screen: (allow-none): screen to show the uri on or %NULL for the default screen
@@ -75,7 +72,3 @@ gtk_show_uri (GdkScreen    *screen,
 
   return ret;
 }
-
-
-#define __GTK_SHOW_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index fa0be283c7..6031200f14 100644
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -26,7 +26,7 @@
 #include "gtksizegroup.h"
 #include "gtkbuildable.h"
 #include "gtksizerequest.h"
-#include "gtkalias.h"
+
 
 enum {
   PROP_0,
@@ -892,7 +892,3 @@ gtk_size_group_buildable_custom_finished (GtkBuildable  *buildable,
   g_slist_free (data->items);
   g_slice_free (GSListSubParserData, data);
 }
-
-
-#define __GTK_SIZE_GROUP_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtksizerequest.c b/gtk/gtksizerequest.c
index 5114a724f5..d0adb8b219 100644
--- a/gtk/gtksizerequest.c
+++ b/gtk/gtksizerequest.c
@@ -97,7 +97,6 @@
 #include "gtksizegroup.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 /* With GtkSizeRequest, a widget may be requested
  * its width for 2 or maximum 3 heights in one resize
@@ -534,8 +533,3 @@ gtk_size_request_get_size (GtkSizeRequest    *widget,
 	}
     }
 }
-
-
-
-#define __GTK_SIZE_REQUEST_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtksocket-stub.c b/gtk/gtksocket-stub.c
index fbc8aedcfd..b839048b88 100644
--- a/gtk/gtksocket-stub.c
+++ b/gtk/gtksocket-stub.c
@@ -27,7 +27,6 @@
 
 #include "gtksocket.h"
 #include "gtksocketprivate.h"
-#include "gtkalias.h"
 
 GdkNativeWindow
 _gtk_socket_windowing_get_id (GtkSocket *socket)
diff --git a/gtk/gtksocket-win32.c b/gtk/gtksocket-win32.c
index 40875097ee..d8448fedd7 100644
--- a/gtk/gtksocket-win32.c
+++ b/gtk/gtksocket-win32.c
@@ -38,7 +38,6 @@
 #include "win32/gdkwin32.h"
 
 #include "gtkwin32embed.h"
-#include "gtkalias.h"
 
 GdkNativeWindow
 _gtk_socket_windowing_get_id (GtkSocket *socket)
diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c
index 5dbde457a8..8ea321aaef 100644
--- a/gtk/gtksocket-x11.c
+++ b/gtk/gtksocket-x11.c
@@ -45,7 +45,6 @@
 #endif
 
 #include "gtkxembed.h"
-#include "gtkalias.h"
 
 static gboolean xembed_get_info     (GdkWindow     *gdk_window,
 				     unsigned long *version,
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index 5e6a1fb8ec..9d679d11d1 100644
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -39,7 +39,6 @@
 #include "gtkdnd.h"
 #include "gtkintl.h"
 
-#include "gtkalias.h"
 
 /**
  * SECTION:gtksocket
@@ -1046,6 +1045,3 @@ _gtk_socket_advance_toplevel_focus (GtkSocket        *socket,
         return;
     }
 }
-
-#define __GTK_SOCKET_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 7d1280aca9..316f76ae8e 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -42,7 +42,6 @@
 #include "gtksettings.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define MIN_SPIN_BUTTON_WIDTH 30
 #define MAX_TIMER_CALLS       5
@@ -2296,6 +2295,3 @@ gtk_spin_button_update (GtkSpinButton *spin_button)
   else
     gtk_spin_button_set_value (spin_button, val);
 }
-
-#define __GTK_SPIN_BUTTON_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index 736b03f406..b17c0eaa3a 100644
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -36,7 +36,6 @@
 #include "gtkimage.h"
 #include "gtkspinner.h"
 #include "gtkstyle.h"
-#include "gtkalias.h"
 
 
 /**
@@ -626,6 +625,3 @@ gtk_spinner_stop (GtkSpinner *spinner)
 
   gtk_spinner_set_active (spinner, FALSE);
 }
-
-#define __GTK_SPINNER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index 2556c149dd..3d72d43012 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -34,7 +34,6 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkbuildable.h"
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkstatusbar
@@ -1096,6 +1095,3 @@ label_selectable_changed (GtkWidget  *label,
       statusbar->has_resize_grip && statusbar->grip_window)
     gdk_window_raise (statusbar->grip_window);
 }
-
-#define __GTK_STATUSBAR_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index 8e4ebe633c..049ddf8dbc 100644
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -61,8 +61,6 @@
 
 #include "gdkkeysyms.h"
 
-#include "gtkalias.h"
-
 #define BLINK_TIMEOUT 500
 
 enum
@@ -3060,7 +3058,3 @@ gtk_status_icon_set_name (GtkStatusIcon *status_icon,
 
   g_object_notify (G_OBJECT (status_icon), "name");
 }
-
-
-#define __GTK_STATUS_ICON_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkstock.c b/gtk/gtkstock.c
index 21befac32a..29a57890fa 100644
--- a/gtk/gtkstock.c
+++ b/gtk/gtkstock.c
@@ -32,7 +32,6 @@
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
 #include <gdk/gdkkeysyms.h>
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkstock
@@ -553,6 +552,3 @@ init_stock_hash (void)
 				    NULL);
     }
 }
-
-#define __GTK_STOCK_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 5785081c19..836de8ab23 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -39,7 +39,6 @@
 #include "gtkiconfactory.h"
 #include "gtksettings.h"	/* _gtk_settings_parse_convert() */
 #include "gtkintl.h"
-#include "gtkalias.h"
 #include "gtkspinner.h"
 
 
@@ -6305,6 +6304,3 @@ gtk_draw_insertion_cursor (GtkWidget          *widget,
   if (area)
     gdk_gc_set_clip_rectangle (gc, NULL);
 }
-
-#define __GTK_STYLE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktable.c b/gtk/gtktable.c
index 22a283836d..e7eafef82d 100644
--- a/gtk/gtktable.c
+++ b/gtk/gtktable.c
@@ -28,7 +28,7 @@
 #include "gtktable.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 enum
 {
@@ -1639,6 +1639,3 @@ gtk_table_size_allocate_pass2 (GtkTable *table)
 	}
     }
 }
-
-#define __GTK_TABLE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktearoffmenuitem.c b/gtk/gtktearoffmenuitem.c
index 8bdb3bebbe..c64058e3fa 100644
--- a/gtk/gtktearoffmenuitem.c
+++ b/gtk/gtktearoffmenuitem.c
@@ -29,7 +29,6 @@
 #include "gtkmenu.h"
 #include "gtktearoffmenuitem.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define ARROW_SIZE 10
 #define TEAR_LENGTH 5
@@ -250,6 +249,3 @@ gtk_tearoff_menu_item_parent_set (GtkWidget *widget,
 			tearoff_menu_item);
     }  
 }
-
-#define __GTK_TEAROFF_MENU_ITEM_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c
index dac8f1daec..e84d487ee0 100644
--- a/gtk/gtktestutils.c
+++ b/gtk/gtktestutils.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include "gtkalias.h"
 
 #include <locale.h>
 #include <string.h>
@@ -653,6 +652,3 @@ gtk_test_register_all_types (void)
       *tp = 0;
     }
 }
-
-#define __GTK_TEST_UTILS_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index f0cd19ade9..0e999e4bc6 100644
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -64,7 +64,6 @@
 #include "gtktextiterprivate.h"
 #include "gtkdebug.h"
 #include "gtktextmarkprivate.h"
-#include "gtkalias.h"
 
 /*
  * Types
@@ -7289,6 +7288,3 @@ _gtk_text_btree_spew_segment (GtkTextBTree* tree, GtkTextLineSegment * seg)
               seg->body.toggle.info->tag->priority);
     }
 }
-
-#define __GTK_TEXT_BTREE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 0caea4f563..2fec1e50fa 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -40,7 +40,6 @@
 #include "gtktextiterprivate.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 #define GTK_TEXT_BUFFER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_TEXT_BUFFER, GtkTextBufferPrivate))
@@ -4399,6 +4398,3 @@ _gtk_text_buffer_spew (GtkTextBuffer *buffer)
 {
   _gtk_text_btree_spew (get_btree (buffer));
 }
-
-#define __GTK_TEXT_BUFFER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktextbufferrichtext.c b/gtk/gtktextbufferrichtext.c
index 16501f7681..8db902f673 100644
--- a/gtk/gtktextbufferrichtext.c
+++ b/gtk/gtktextbufferrichtext.c
@@ -26,7 +26,6 @@
 #include "gtktextbufferrichtext.h"
 #include "gtktextbufferserialize.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 typedef struct
@@ -822,6 +821,3 @@ deserialize_quark (void)
 
   return quark;
 }
-
-#define __GTK_TEXT_BUFFER_RICH_TEXT_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktextbufferserialize.c b/gtk/gtktextbufferserialize.c
index 1ddb9b0f81..b6948e9d5d 100644
--- a/gtk/gtktextbufferserialize.c
+++ b/gtk/gtktextbufferserialize.c
@@ -32,7 +32,6 @@
 #include "gdk-pixbuf/gdk-pixdata.h"
 #include "gtktextbufferserialize.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 typedef struct
diff --git a/gtk/gtktextchild.c b/gtk/gtktextchild.c
index aaf171576d..ad23def347 100644
--- a/gtk/gtktextchild.c
+++ b/gtk/gtktextchild.c
@@ -53,7 +53,6 @@
 #include "gtktextbtree.h"
 #include "gtktextlayout.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define CHECK_IN_BUFFER(anchor)                                         \
   G_STMT_START {                                                        \
@@ -510,6 +509,3 @@ gtk_text_anchored_child_set_layout (GtkWidget     *child,
   
   _gtk_anchored_child_set_layout (child, layout);
 }
-
-#define __GTK_TEXT_CHILD_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c
index 7f76892a67..f6f0344bf9 100644
--- a/gtk/gtktextdisplay.c
+++ b/gtk/gtktextdisplay.c
@@ -78,7 +78,6 @@
 #include "config.h"
 #include "gtktextdisplay.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 /* DO NOT go putting private headers in here. This file should only
  * use the semi-public headers, as with gtktextview.c.
  */
@@ -916,6 +915,3 @@ gtk_text_layout_draw (GtkTextLayout *layout,
 
   g_slist_free (line_list);
 }
-
-#define __GTK_TEXT_DISPLAY_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index c31277105d..a4cb91b07b 100644
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -31,7 +31,7 @@
 #include "gtktextiterprivate.h"
 #include "gtkintl.h"
 #include "gtkdebug.h"
-#include "gtkalias.h"
+
 #include <string.h>
 
 
@@ -5584,6 +5584,3 @@ _gtk_text_iter_check (const GtkTextIter *iter)
   if (_gtk_text_line_is_last (real->line, real->tree))
     g_error ("Iterator was on last line (past the end iterator)");
 }
-
-#define __GTK_TEXT_ITER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 31139d739e..cf40247b67 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -84,7 +84,6 @@
 #include "gtktextiterprivate.h"
 #include "gtktextutil.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -3721,6 +3720,3 @@ gtk_text_layout_buffer_delete_range (GtkTextBuffer *textbuffer,
 
   gtk_text_layout_update_cursor_line (layout);
 }
-
-#define __GTK_TEXT_LAYOUT_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktextmark.c b/gtk/gtktextmark.c
index e6d5997209..b9fb6377fd 100644
--- a/gtk/gtktextmark.c
+++ b/gtk/gtktextmark.c
@@ -52,7 +52,7 @@
 #include "gtktextbtree.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 static void gtk_text_mark_set_property (GObject         *object,
 				        guint            prop_id,
@@ -490,6 +490,3 @@ mark_segment_check_func (GtkTextLineSegment *seg,
   if (seg->body.mark.line != line)
     g_error ("mark_segment_check_func: seg->body.mark.line bogus");
 }
-
-#define __GTK_TEXT_MARK_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktextsegment.c b/gtk/gtktextsegment.c
index c4383dc7bc..dfd7c7e441 100644
--- a/gtk/gtktextsegment.c
+++ b/gtk/gtktextsegment.c
@@ -61,7 +61,6 @@
 #include "gtktextlayout.h"
 #include "gtktextiterprivate.h"
 #include "gtkdebug.h"
-#include "gtkalias.h"
 
 /*
  *--------------------------------------------------------------
@@ -638,6 +637,3 @@ const GtkTextLineSegmentClass gtk_text_toggle_off_type = {
   toggle_segment_line_change_func,                      /* lineChangeFunc */
   _gtk_toggle_segment_check_func                        /* checkFunc */
 };
-
-#define __GTK_TEXT_SEGMENT_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index 56af5a4e4e..500418c870 100644
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -55,7 +55,6 @@
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -2352,6 +2351,3 @@ _gtk_text_tag_affects_nonsize_appearance (GtkTextTag *tag)
     tag->bg_full_height_set ||
     tag->pg_bg_color_set;
 }
-
-#define __GTK_TEXT_TAG_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c
index dd9eea941e..5b509c4cdf 100644
--- a/gtk/gtktexttagtable.c
+++ b/gtk/gtktexttagtable.c
@@ -29,7 +29,6 @@
 #include "gtkmarshalers.h"
 #include "gtktextbuffer.h" /* just for the lame notify_will_remove_tag hack */
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #include <stdlib.h>
 
@@ -414,6 +413,3 @@ _gtk_text_tag_table_remove_buffer (GtkTextTagTable *table,
   
   table->buffers = g_slist_remove (table->buffers, buffer);
 }
-
-#define __GTK_TEXT_TAG_TABLE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktexttypes.c b/gtk/gtktexttypes.c
index 3e72302b61..df8f6f5dec 100644
--- a/gtk/gtktexttypes.c
+++ b/gtk/gtktexttypes.c
@@ -26,7 +26,6 @@
 
 #include "config.h"
 #include "gtktexttypes.h"
-#include "gtkalias.h"
 
 /* These are used to represent embedded non-character objects
  * if you return a string representation of a text buffer
@@ -44,6 +43,3 @@ gtk_text_byte_begins_utf8_char (const gchar *byte)
 {
   return inline_byte_begins_utf8_char (byte);
 }
-
-#define __GTK_TEXT_TYPES_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktextutil.c b/gtk/gtktextutil.c
index 95e9d7dd0a..11ec8d2c39 100644
--- a/gtk/gtktextutil.c
+++ b/gtk/gtktextutil.c
@@ -35,7 +35,6 @@
 #include "gtktextbuffer.h"
 #include "gtkmenuitem.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define DRAG_ICON_MAX_WIDTH 250
 #define DRAG_ICON_MAX_HEIGHT 250
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 6fbeae68cd..850a97ffac 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -48,7 +48,7 @@
 #include "gtkprivate.h"
 #include "gtktextutil.h"
 #include "gtkwindow.h"
-#include "gtkalias.h"
+
 
 /* How scrolling, validation, exposes, etc. work.
  *
@@ -9354,6 +9354,3 @@ gtk_text_view_move_visually (GtkTextView *text_view,
 
   return gtk_text_layout_move_iter_visually (text_view->layout, iter, count);
 }
-
-#define __GTK_TEXT_VIEW_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c
index d6d9f7940f..7a553226b8 100644
--- a/gtk/gtkthemes.c
+++ b/gtk/gtkthemes.c
@@ -33,7 +33,7 @@
 #include "gtkthemes.h"
 #include "gtkrc.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 typedef struct _GtkThemeEngineClass GtkThemeEngineClass;
 
@@ -191,6 +191,3 @@ gtk_theme_engine_create_rc_style (GtkThemeEngine *engine)
 
   return engine->create_rc_style ();
 }
-
-#define __GTK_THEMES_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktoggleaction.c b/gtk/gtktoggleaction.c
index 5a144bb42d..549d101b43 100644
--- a/gtk/gtktoggleaction.c
+++ b/gtk/gtktoggleaction.c
@@ -37,7 +37,6 @@
 #include "gtktogglebutton.h"
 #include "gtkcheckmenuitem.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 
 /**
@@ -359,6 +358,3 @@ create_menu_item (GtkAction *action)
 		       "draw-as-radio", toggle_action->private_data->draw_as_radio,
 		       NULL);
 }
-
-#define __GTK_TOGGLE_ACTION_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index 54db87ae05..237a5dc1f7 100644
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -33,7 +33,7 @@
 #include "gtkactivatable.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 #define DEFAULT_LEFT_POS  4
 #define DEFAULT_TOP_POS   4
@@ -531,6 +531,3 @@ gtk_toggle_button_update_state (GtkButton *button)
   _gtk_button_set_depressed (button, depressed); 
   gtk_widget_set_state (GTK_WIDGET (toggle_button), new_state);
 }
-
-#define __GTK_TOGGLE_BUTTON_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktoggletoolbutton.c b/gtk/gtktoggletoolbutton.c
index bb26802fe2..a65fdec52b 100644
--- a/gtk/gtktoggletoolbutton.c
+++ b/gtk/gtktoggletoolbutton.c
@@ -30,7 +30,7 @@
 #include "gtktoggleaction.h"
 #include "gtkactivatable.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
+
 
 #define MENU_ID "gtk-toggle-tool-button-menu-id"
 
@@ -446,6 +446,3 @@ gtk_toggle_tool_button_get_active (GtkToggleToolButton *button)
 
   return button->priv->active;
 }
-
-#define __GTK_TOGGLE_TOOL_BUTTON_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 7042d47be0..7e2c2325af 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -56,7 +56,7 @@
 #include "gtkvbox.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 typedef struct _ToolbarContent ToolbarContent;
 
@@ -3678,6 +3678,3 @@ toolbar_rebuild_menu (GtkToolShell *shell)
   
   gtk_widget_queue_resize (GTK_WIDGET (shell));
 }
-
-#define __GTK_TOOLBAR_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index 0e6ae592a9..a138c478eb 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -34,7 +34,6 @@
 #include "gtktoolbar.h"
 #include "gtkactivatable.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 #include <string.h>
 
@@ -1291,7 +1290,3 @@ _gtk_tool_button_get_button (GtkToolButton *button)
 
   return button->priv->button;
 }
-
-
-#define __GTK_TOOL_BUTTON_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c
index eba147a66f..38911a0ad0 100644
--- a/gtk/gtktoolitem.c
+++ b/gtk/gtktoolitem.c
@@ -32,7 +32,7 @@
 #include "gtkintl.h"
 #include "gtkmain.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtktoolitem
@@ -1403,6 +1403,3 @@ gtk_tool_item_toolbar_reconfigured (GtkToolItem *tool_item)
 
   gtk_widget_queue_resize (GTK_WIDGET (tool_item));
 }
-
-#define __GTK_TOOL_ITEM_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktoolitemgroup.c b/gtk/gtktoolitemgroup.c
index 0107b0f001..4e12a22930 100644
--- a/gtk/gtktoolitemgroup.c
+++ b/gtk/gtktoolitemgroup.c
@@ -29,7 +29,6 @@
 #include <string.h>
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define ANIMATION_TIMEOUT        50
 #define ANIMATION_DURATION      (ANIMATION_TIMEOUT * 4)
@@ -2431,7 +2430,3 @@ _gtk_tool_item_group_palette_reconfigured (GtkToolItemGroup *group)
 
   gtk_tool_item_group_header_adjust_style (group);
 }
-
-
-#define __GTK_TOOL_ITEM_GROUP_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
index fa37edcc56..529fd9554a 100644
--- a/gtk/gtktoolpalette.c
+++ b/gtk/gtktoolpalette.c
@@ -29,7 +29,6 @@
 
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 #define DEFAULT_ICON_SIZE       GTK_ICON_SIZE_SMALL_TOOLBAR
 #define DEFAULT_ORIENTATION     GTK_ORIENTATION_VERTICAL
@@ -1925,7 +1924,3 @@ _gtk_tool_palette_get_size_group (GtkToolPalette *palette)
 
   return palette->priv->text_size_group;
 }
-
-
-#define __GTK_TOOL_PALETTE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktoolshell.c b/gtk/gtktoolshell.c
index 11f886ed6c..5a73c08d38 100644
--- a/gtk/gtktoolshell.c
+++ b/gtk/gtktoolshell.c
@@ -24,7 +24,7 @@
 #include "gtktoolshell.h"
 #include "gtkwidget.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtktoolshell
@@ -247,6 +247,3 @@ gtk_tool_shell_get_text_size_group (GtkToolShell *shell)
 
   return NULL;
 }
-
-#define __GTK_TOOL_SHELL_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 67c2f6c9a0..3a50fc05b8 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -33,7 +33,6 @@
 #include "gtkhbox.h"
 #include "gtkalignment.h"
 
-#include "gtkalias.h"
 
 #undef DEBUG_TOOLTIP
 
@@ -1533,7 +1532,3 @@ _gtk_tooltip_handle_event (GdkEvent *event)
 	break;
     }
 }
-
-
-#define __GTK_TOOLTIP_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktrayicon-x11.c b/gtk/gtktrayicon-x11.c
index ae426b3765..f4db5c4d29 100644
--- a/gtk/gtktrayicon-x11.c
+++ b/gtk/gtktrayicon-x11.c
@@ -29,8 +29,6 @@
 #include "gtkprivate.h"
 #include "gtktrayicon.h"
 
-#include "gtkalias.h"
-
 #include "x11/gdkx.h"
 #include <X11/Xatom.h>
 
@@ -997,7 +995,3 @@ _gtk_tray_icon_get_padding (GtkTrayIcon *icon)
 
   return icon->priv->padding;
 }
-
-#define __GTK_TRAY_ICON_X11_C__
-#include "gtkaliasdef.c"
-
diff --git a/gtk/gtktreedatalist.c b/gtk/gtktreedatalist.c
index 282c9640f4..8e644f32fb 100644
--- a/gtk/gtktreedatalist.c
+++ b/gtk/gtktreedatalist.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 #include "gtktreedatalist.h"
-#include "gtkalias.h"
 #include <string.h>
 
 /* node allocation
diff --git a/gtk/gtktreednd.c b/gtk/gtktreednd.c
index 9a1c87fbea..f5f436bf02 100644
--- a/gtk/gtktreednd.c
+++ b/gtk/gtktreednd.c
@@ -21,7 +21,6 @@
 #include <string.h>
 #include "gtktreednd.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 /**
@@ -354,6 +353,3 @@ gtk_tree_get_row_drag_data (GtkSelectionData  *selection_data,
   
   return TRUE;
 }
-
-#define __GTK_TREE_DND_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index d9cf4e7b42..d80ce3a492 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -28,7 +28,6 @@
 #include "gtktreeprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 #define INITIALIZE_TREE_ITER(Iter) \
@@ -2190,6 +2189,3 @@ gtk_tree_row_reference_reordered (GObject     *proxy,
 
   gtk_tree_row_ref_reordered ((RowRefList *)g_object_get_data (proxy, ROW_REF_DATA_STRING), path, iter, new_order);
 }
-
-#define __GTK_TREE_MODEL_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index 7e0ec63b10..c60ac06447 100644
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -23,7 +23,6 @@
 #include "gtkintl.h"
 #include "gtktreednd.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 #include <string.h>
 
 /* ITER FORMAT:
@@ -3529,6 +3528,3 @@ gtk_tree_model_filter_clear_cache (GtkTreeModelFilter *filter)
     gtk_tree_model_filter_clear_cache_helper (filter,
                                               FILTER_LEVEL (filter->priv->root));
 }
-
-#define __GTK_TREE_MODEL_FILTER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 4fe4f3488e..ddb355cc30 100644
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -47,7 +47,7 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtktreednd.h"
-#include "gtkalias.h"
+
 
 typedef struct _SortElt SortElt;
 typedef struct _SortLevel SortLevel;
@@ -2519,6 +2519,3 @@ gtk_tree_model_sort_iter_is_valid (GtkTreeModelSort *tree_model_sort,
   return gtk_tree_model_sort_iter_is_valid_helper (iter,
 						   tree_model_sort->root);
 }
-
-#define __GTK_TREE_MODEL_SORT_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c
index a99c50beeb..7272f43c82 100644
--- a/gtk/gtktreeselection.c
+++ b/gtk/gtktreeselection.c
@@ -24,7 +24,7 @@
 #include "gtkrbtree.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 static void gtk_tree_selection_finalize          (GObject               *object);
 static gint gtk_tree_selection_real_select_all   (GtkTreeSelection      *selection);
@@ -1466,6 +1466,3 @@ gtk_tree_selection_real_select_node (GtkTreeSelection *selection,
 
   return FALSE;
 }
-
-#define __GTK_TREE_SELECTION_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktreesortable.c b/gtk/gtktreesortable.c
index 7b0b29cf17..b699f1eca3 100644
--- a/gtk/gtktreesortable.c
+++ b/gtk/gtktreesortable.c
@@ -22,7 +22,7 @@
 #include "gtktreesortable.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 static void gtk_tree_sortable_base_init (gpointer g_class);
 
@@ -257,6 +257,3 @@ gtk_tree_sortable_has_default_sort_func (GtkTreeSortable *sortable)
   
   return (* iface->has_default_sort_func) (sortable);
 }
-
-#define __GTK_TREE_SORTABLE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index dd5dce09ad..4570007018 100644
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -26,7 +26,7 @@
 #include "gtktreednd.h"
 #include "gtkbuildable.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 #define G_NODE(node) ((GNode *)node)
 #define GTK_TREE_STORE_IS_SORTED(tree) (((GtkTreeStore*)(tree))->sort_column_id != GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID)
@@ -3328,6 +3328,3 @@ gtk_tree_store_buildable_custom_finished (GtkBuildable *buildable,
   g_slist_free (data->items);
   g_slice_free (GSListSubParserData, data);
 }
-
-#define __GTK_TREE_STORE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index e71e2a4ef5..8329753881 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -44,7 +44,6 @@
 #include "gtktreemodelsort.h"
 #include "gtktooltip.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 #define GTK_TREE_VIEW_PRIORITY_VALIDATE (GDK_PRIORITY_REDRAW + 5)
 #define GTK_TREE_VIEW_PRIORITY_SCROLL_SYNC (GTK_TREE_VIEW_PRIORITY_VALIDATE + 2)
@@ -15670,6 +15669,3 @@ gtk_tree_view_get_tooltip_column (GtkTreeView *tree_view)
 
   return tree_view->priv->tooltip_column;
 }
-
-#define __GTK_TREE_VIEW_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 0d953de7af..b0da0ab0fd 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -31,7 +31,7 @@
 #include "gtkarrow.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 enum
 {
@@ -3767,6 +3767,3 @@ gtk_tree_view_column_get_tree_view (GtkTreeViewColumn *tree_column)
 
   return tree_column->tree_view;
 }
-
-#define __GTK_TREE_VIEW_COLUMN_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtktypebuiltins.c.template b/gtk/gtktypebuiltins.c.template
index e15106e8dc..44aabf8431 100644
--- a/gtk/gtktypebuiltins.c.template
+++ b/gtk/gtktypebuiltins.c.template
@@ -2,7 +2,6 @@
 #undef GTK_DISABLE_DEPRECATED
 #include "gtk.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 /*** END file-header ***/
 
@@ -34,6 +33,5 @@ GType
 /*** END value-tail ***/
 
 /*** BEGIN file-tail ***/
-#define __GTK_TYPE_BUILTINS_C__
-#include "gtkaliasdef.c"
+
 /*** END file-tail ***/
diff --git a/gtk/gtktypeutils.c b/gtk/gtktypeutils.c
index b66289d019..1d6f9b44e4 100644
--- a/gtk/gtktypeutils.c
+++ b/gtk/gtktypeutils.c
@@ -30,7 +30,7 @@
 #include "gtktypeutils.h"
 #include "gtkobject.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 GType
 gtk_identifier_get_type (void)
@@ -45,6 +45,3 @@ gtk_identifier_get_type (void)
 
   return our_type;
 }
-
-#define __GTK_TYPE_UTILS_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 29d09b2f2d..884e14f847 100644
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -47,7 +47,6 @@
 #include "gtkuimanager.h"
 #include "gtkwindow.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 
 #undef DEBUG_UI_MANAGER
 
@@ -3076,6 +3075,3 @@ gtk_ui_manager_add_ui_from_file (GtkUIManager *self,
 }
 
 #endif
-
-#define __GTK_UI_MANAGER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkvbbox.c b/gtk/gtkvbbox.c
index ef8ea6c352..af098ec455 100644
--- a/gtk/gtkvbbox.c
+++ b/gtk/gtkvbbox.c
@@ -28,7 +28,7 @@
 #include "gtkvbbox.h"
 #include "gtkorientable.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkvbbox
@@ -90,7 +90,3 @@ _gtk_vbutton_box_get_layout_default (void)
 {
   return default_layout_style;
 }
-
-
-#define __GTK_VBBOX_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkvbox.c b/gtk/gtkvbox.c
index d87002699b..3ab349d4ed 100644
--- a/gtk/gtkvbox.c
+++ b/gtk/gtkvbox.c
@@ -28,7 +28,7 @@
 
 #include "gtkorientable.h"
 #include "gtkvbox.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkvbox
@@ -78,6 +78,3 @@ gtk_vbox_new (gboolean homogeneous,
                        "homogeneous", homogeneous ? TRUE : FALSE,
                        NULL);
 }
-
-#define __GTK_VBOX_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index de16f42605..c3eeeb075a 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -30,7 +30,7 @@
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkviewport
@@ -941,6 +941,3 @@ gtk_viewport_get_height (GtkSizeRequest *widget,
 {
   gtk_viewport_get_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
 }
-
-#define __GTK_VIEWPORT_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkvolumebutton.c b/gtk/gtkvolumebutton.c
index 4ae0c377ba..6352b002c9 100644
--- a/gtk/gtkvolumebutton.c
+++ b/gtk/gtkvolumebutton.c
@@ -34,7 +34,6 @@
 #include "gtktooltip.h"
 #include "gtkintl.h"
 
-#include "gtkalias.h"
 
 /**
  * SECTION:gtkvolumebutton
@@ -186,6 +185,3 @@ cb_value_changed (GtkVolumeButton *button, gdouble value, gpointer user_data)
 {
   gtk_widget_trigger_tooltip_query (GTK_WIDGET (button));
 }
-
-#define __GTK_VOLUME_BUTTON_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkvpaned.c b/gtk/gtkvpaned.c
index 7b9e38f16a..1719dfd02f 100644
--- a/gtk/gtkvpaned.c
+++ b/gtk/gtkvpaned.c
@@ -28,7 +28,7 @@
 
 #include "gtkorientable.h"
 #include "gtkvpaned.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkvpaned
@@ -67,6 +67,3 @@ gtk_vpaned_new (void)
 {
   return g_object_new (GTK_TYPE_VPANED, NULL);
 }
-
-#define __GTK_VPANED_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkvruler.c b/gtk/gtkvruler.c
index 5bff897ab4..61156a0e58 100644
--- a/gtk/gtkvruler.c
+++ b/gtk/gtkvruler.c
@@ -28,7 +28,7 @@
 
 #include "gtkorientable.h"
 #include "gtkvruler.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkvruler
@@ -78,6 +78,3 @@ gtk_vruler_new (void)
 {
   return g_object_new (GTK_TYPE_VRULER, NULL);
 }
-
-#define __GTK_VRULER_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c
index a36402b6f9..d4570f8b0f 100644
--- a/gtk/gtkvscale.c
+++ b/gtk/gtkvscale.c
@@ -31,7 +31,7 @@
 
 #include "gtkvscale.h"
 #include "gtkorientable.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkvscale
@@ -129,6 +129,3 @@ gtk_vscale_new_with_range (gdouble min,
 
   return GTK_WIDGET (scale);
 }
-
-#define __GTK_VSCALE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkvscrollbar.c b/gtk/gtkvscrollbar.c
index 8e87c885ee..59d0664ae5 100644
--- a/gtk/gtkvscrollbar.c
+++ b/gtk/gtkvscrollbar.c
@@ -30,7 +30,7 @@
 #include "gtkorientable.h"
 #include "gtkvscrollbar.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkvscrollbar
@@ -79,6 +79,3 @@ gtk_vscrollbar_new (GtkAdjustment *adjustment)
                        "adjustment", adjustment,
                        NULL);
 }
-
-#define __GTK_VSCROLLBAR_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkvseparator.c b/gtk/gtkvseparator.c
index 77c3f59856..f2dcf81b70 100644
--- a/gtk/gtkvseparator.c
+++ b/gtk/gtkvseparator.c
@@ -28,7 +28,7 @@
 
 #include "gtkorientable.h"
 #include "gtkvseparator.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkvseparator
@@ -67,6 +67,3 @@ gtk_vseparator_new (void)
 {
   return g_object_new (GTK_TYPE_VSEPARATOR, NULL);
 }
-
-#define __GTK_VSEPARATOR_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index d302589a11..a7d391bab8 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -56,7 +56,7 @@
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
 #include "gtksizerequest.h"
-#include "gtkalias.h"
+
 
 /**
  * SECTION:gtkwidget
@@ -11618,6 +11618,3 @@ gtk_widget_send_focus_change (GtkWidget *widget,
 
   return res;
 }
-
-#define __GTK_WIDGET_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkwin32embed.c b/gtk/gtkwin32embed.c
index 242722173b..6d7be9e1f0 100644
--- a/gtk/gtkwin32embed.c
+++ b/gtk/gtkwin32embed.c
@@ -26,7 +26,6 @@
 
 #include "gtkwin32embed.h"
 
-#include "gtkalias.h"
 
 static guint message_type[GTK_WIN32_EMBED_LAST];
 
diff --git a/gtk/gtkwin32embedwidget.c b/gtk/gtkwin32embedwidget.c
index 9c276ea3b4..298c36e7b2 100644
--- a/gtk/gtkwin32embedwidget.c
+++ b/gtk/gtkwin32embedwidget.c
@@ -31,7 +31,6 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 
-#include "gtkalias.h"
 
 static void            gtk_win32_embed_widget_realize               (GtkWidget        *widget);
 static void            gtk_win32_embed_widget_unrealize             (GtkWidget        *widget);
@@ -379,6 +378,3 @@ gtk_win32_embed_widget_set_focus (GtkWindow *window,
 
   gdk_window_focus (GTK_WIDGET(window)->window, 0);
 }
-
-#define __GTK_WIN32_EMBED_WIDGET_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkwindow-decorate.c b/gtk/gtkwindow-decorate.c
index 5ff06123ee..2d671ab08c 100644
--- a/gtk/gtkwindow-decorate.c
+++ b/gtk/gtkwindow-decorate.c
@@ -27,7 +27,6 @@
 #include "gtkmain.h"
 #include "gtkwindow-decorate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
 
 #ifdef DECORATE_WINDOWS
@@ -830,7 +829,3 @@ gtk_decorated_window_move_resize_window (GtkWindow   *window,
 			  x, y, width, height);
 }
 #endif
-
-
-#define __GTK_WINDOW_DECORATE_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 5f1baffad8..3d286abfe3 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -49,7 +49,6 @@
 #include "gtkplug.h"
 #include "gtkbuildable.h"
 #include "gtksizerequest.h"
-#include "gtkalias.h"
 
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
@@ -8810,6 +8809,3 @@ gtk_window_set_default_icon_from_file (const gchar *filename,
 }
 
 #endif
-
-#define __GTK_WINDOW_C__
-#include "gtkaliasdef.c"
diff --git a/gtk/gtkxembed.c b/gtk/gtkxembed.c
index f88c8948e0..d5ab3bfff6 100644
--- a/gtk/gtkxembed.c
+++ b/gtk/gtkxembed.c
@@ -23,7 +23,7 @@
 #include "gtkmain.h"
 #include "gtkprivate.h"
 #include "gtkxembed.h"
-#include "gtkalias.h"
+
 
 typedef struct _GtkXEmbedMessage GtkXEmbedMessage;
 
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index 73bedddcf0..d8830fb2c9 100644
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -85,7 +85,7 @@ gtkbuiltincache.h: gtk-update-icon-cache.exe
 GENERATED = \
 	gtktypebuiltins.h gtktypebuiltins.c \
 	gtkmarshal.h gtkmarshal.c gtkmarshalers.h gtkmarshalers.c \
-	gtk.def gtkalias.h gtkaliasdef.c gtktypefuncs.c
+	gtk.def gtktypefuncs.c
 
 all :						\
 	..\config.h				\
@@ -567,12 +567,6 @@ gtk.def: gtk.symbols makefile.msc
 		-DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= \
 		-DG_GNUC_PRINTF=;G_GNUC_PRINTF gtk.symbols >> gtk.def
 
-gtkalias.h: gtk.symbols
-	$(PERL) makegtkalias.pl < gtk.symbols > gtkalias.h
-
-gtkaliasdef.c: gtk.symbols
-	 $(PERL) makegtkalias.pl -def < gtk.symbols > gtkaliasdef.c
-
 # generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
 # use 'echo' to work around 'command line too long'
 gtktypebuiltins.h: $(gtk_public_h_sources) makefile.msc
diff --git a/gtk/makegtkalias.pl b/gtk/makegtkalias.pl
deleted file mode 100755
index 73233da166..0000000000
--- a/gtk/makegtkalias.pl
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/usr/bin/perl -w
-
-exit 0;
-
-my $do_def = 0;
-
-if (($#ARGV >= 0) && ($ARGV[0] eq "-def")) {
-    shift;
-    $do_def = 1;
-}
-
-print <<EOF;
-/* Generated by makegtkalias.pl */
-
-#ifndef DISABLE_VISIBILITY
-
-#include <glib.h>
-
-#ifdef G_HAVE_GNUC_VISIBILITY
-
-EOF
-
-if ($do_def) {
-    print <<EOF
-#undef IN_FILE
-#define IN_FILE defined
-
-#undef IN_HEADER
-#define IN_HEADER(x) 1
-
-EOF
-} 
-else { 
-    print <<EOF
-#define IN_FILE(x) 1
-#define IN_HEADER defined
-
-EOF
-}
-
-my $in_comment = 0;
-my $in_skipped_section = 0;
-
-while (<>) {
-
-  # ignore empty lines
-  next if /^\s*$/;
-
-  # skip comments
-  if ($_ =~ /^\s*\/\*/)
-  {
-      $in_comment = 1;
-  }
-  
-  if ($in_comment)
-  {
-      if ($_ =~  /\*\/\s$/)
-      {
-	  $in_comment = 0;
-      }
-      
-      next;
-  }
-
-  # handle ifdefs
-  if ($_ =~ /^\#endif/)
-  {
-      if (!$in_skipped_section)
-      {
-	  print $_;
-      }
-
-      $in_skipped_section = 0;
-
-      next;
-  }
-
-  if ($_ =~ /^\#ifdef\s+(INCLUDE_VARIABLES|ALL_FILES)/)
-  {
-      $in_skipped_section = 1;
-  }
-
-  if ($in_skipped_section)
-  {
-      next;
-  }
-
-  if ($_ =~ /^\#ifn?def\s+G/)
-  {
-      print $_;
-      
-      next;
-  }
- 
-  if ($_ =~ /^\#ifndef\s+_WIN64/)
-  {
-      print $_;
-      
-      next;
-  }
- 
-  if ($_ =~ /^\#if.*(IN_FILE|IN_HEADER)/)
-  {
-      print $_;
-      
-      next;
-  }
-
-  chop;
-  my $str = $_;
-  my @words;
-  my $attributes = "";
-
-  @words = split(/ /, $str);
-  $str = shift(@words);
-  chomp($str);
-  my $alias = "IA__".$str;
-  
-  # Drop any Win32 specific .def file syntax,  but keep attributes
-  foreach $word (@words) {
-      $attributes = "$attributes $word" unless $word eq "PRIVATE";
-  }
-      
-  if (!$do_def) {
-    print <<EOF
-extern __typeof ($str) $alias __attribute((visibility("hidden")))$attributes;
-\#define $str $alias
-
-EOF
-  }
-  else {
-    print <<EOF
-\#undef $str 
-extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default")));
-
-EOF
-  }
-}
-
-print <<EOF;
-#endif /* G_HAVE_GNUC_VISIBILITY */
-#endif /* DISABLE_VISIBILITY */
-EOF
-
-
diff --git a/gtk/pltcheck.sh b/gtk/pltcheck.sh
deleted file mode 100755
index d8718cef9d..0000000000
--- a/gtk/pltcheck.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-LANG=C
-
-status=0
-
-if ! which readelf 2>/dev/null >/dev/null; then
-	echo "'readelf' not found; skipping test"
-	exit 0
-fi
-
-for so in .libs/lib*.so; do
-	echo Checking $so for local PLT entries
-	readelf -r $so | grep 'JU\?MP_SLOT' | grep '\<gtk' && status=1
-done
-
-exit $status
author	Javier Jardón <jjardon@gnome.org>	2010-07-09 19:22:23 +0200
committer	Javier Jardón <jjardon@gnome.org>	2010-07-10 02:51:26 +0200
commit	0a07e9733bb259598a09515a3e4cdbcda5feef57 (patch)
tree	bee311d43223a52378054d1dd6e90c68dcb66b74 /gtk
parent	404e7d0e0013355549578db5c3981943f536c2b9 (diff)
download	gtk+-0a07e9733bb259598a09515a3e4cdbcda5feef57.tar.gz