Index: gdk/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/Makefile.am,v
retrieving revision 1.126
diff -u -p -d -r1.126 Makefile.am
--- gdk/Makefile.am	11 May 2006 17:15:40 -0000	1.126
+++ gdk/Makefile.am	6 Sep 2006 20:26:49 -0000
@@ -24,8 +24,7 @@ INCLUDES =                              
 	-I$(top_srcdir)			\
 	-I$(top_builddir)/gdk		\
 	-I$(top_srcdir)/gdk-pixbuf 	\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
-	-DGDK_DISABLE_DEPRECATED	\
+	-DGDK_PIXBUF_DISABLE_DEPRECATED \
 	$(GTK_DEBUG_FLAGS) 		\
 	$(GDK_DEP_CFLAGS)
 
@@ -202,7 +201,7 @@ gdkaliasdef.c: gdk.symbols
 	 $(PERL) $(srcdir)/makegdkalias.pl -def < $(srcdir)/gdk.symbols > gdkaliasdef.c
 
 if OS_LINUX
-TESTS = abicheck.sh
+TESTS = pltcheck.sh abicheck.sh
 endif
 
 
Index: gdk/abicheck.sh
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/abicheck.sh,v
retrieving revision 1.8
diff -u -p -d -r1.8 abicheck.sh
--- gdk/abicheck.sh	14 Jan 2006 04:45:21 -0000	1.8
+++ gdk/abicheck.sh	6 Sep 2006 20:26:49 -0000
@@ -2,4 +2,4 @@
 
 cpp -DINCLUDE_VARIABLES -P -DALL_FILES -DGDK_ENABLE_BROKEN -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
 nm -D -g --defined-only .libs/libgdk-x11-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
-diff -u expected-abi actual-abi && rm expected-abi actual-abi
+diff -u expected-abi actual-abi && rm -f expected-abi actual-abi
Index: gdk/gdk.symbols
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdk.symbols,v
retrieving revision 1.38
diff -u -p -d -r1.38 gdk.symbols
--- gdk/gdk.symbols	25 Apr 2006 16:45:21 -0000	1.38
+++ gdk/gdk.symbols	6 Sep 2006 20:26:49 -0000
@@ -137,15 +137,12 @@ gdk_threads_set_lock_functions
 #endif
 
 #if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_INPUT_C__)
+#if IN_FILE(__GDK_EVENTS_C__)
 #ifndef GDK_DISABLE_DEPRECATED
 gdk_input_add
 gdk_input_remove
 gdk_input_add_full
 #endif
-#ifdef GTK_COMPILATION
-gdk_input_add_full
-#endif
 #endif
 #endif
 
@@ -642,9 +639,6 @@ gdk_window_clear_area
 gdk_window_clear_area_e
 gdk_window_constrain_size
 gdk_window_destroy
-#ifndef GDK_DISABLE_DEPRECATED
-gdk_window_destroy_notify
-#endif
 gdk_window_end_paint
 gdk_window_foreign_new
 gdk_window_freeze_updates
@@ -1088,6 +1082,12 @@ gdk_spawn_on_screen_with_pipes
 #if IN_HEADER(__GDK_PRIVATE_H__)
 #if IN_FILE(__GDK_EVENTS_C__)
 gdk_synthesize_window_state
+#endif
+#endif
+
+#if IN_HEADER(__GDK_PRIVATE_H__)
+#if IN_FILE(__GDK_WINDOW_X11_C__)
+gdk_window_destroy_notify
 #endif
 #endif
 
Index: gdk/gdkglobals.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkglobals.c,v
retrieving revision 1.32
diff -u -p -d -r1.32 gdkglobals.c
--- gdk/gdkglobals.c	16 Mar 2005 03:17:27 -0000	1.32
+++ gdk/gdkglobals.c	6 Sep 2006 20:26:49 -0000
@@ -30,6 +30,7 @@
 
 #include "gdktypes.h"
 #include "gdkprivate.h"
+#include "gdkalias.h"
 
 guint               _gdk_debug_flags = 0;
 gint                _gdk_error_code = 0;
Index: gdk/gdkpango.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkpango.c,v
retrieving revision 1.57
diff -u -p -d -r1.57 gdkpango.c
--- gdk/gdkpango.c	8 Jul 2006 22:58:06 -0000	1.57
+++ gdk/gdkpango.c	6 Sep 2006 20:26:49 -0000
@@ -28,9 +28,8 @@
 #include "gdkrgb.h"
 #include "gdkprivate.h"
 #include "gdkscreen.h"
-#include "gdkalias.h"
-
 #include "gdkintl.h"
+#include "gdkalias.h"
 
 #define GDK_INFO_KEY "gdk-info"
 
Index: gdk/pltcheck.sh
===================================================================
RCS file: gdk/pltcheck.sh
diff -N gdk/pltcheck.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdk/pltcheck.sh	6 Sep 2006 20:26:49 -0000
@@ -0,0 +1,17 @@
+#!/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 -v 'gdk_pixbuf' | grep gdk && status=1
+done
+
+exit $status
Index: gdk/x11/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/Makefile.am,v
retrieving revision 1.37
diff -u -p -d -r1.37 Makefile.am
--- gdk/x11/Makefile.am	4 May 2006 13:36:29 -0000	1.37
+++ gdk/x11/Makefile.am	6 Sep 2006 20:26:49 -0000
@@ -9,7 +9,6 @@ INCLUDES = 				\
 	-I$(top_srcdir)/gdk		\
 	-I$(top_builddir)/gdk		\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
-	-DGDK_DISABLE_DEPRECATED	\
 	$(GTK_DEBUG_FLAGS) 		\
 	$(GDK_DEP_CFLAGS)
 
Index: gdk/x11/gdkevents-x11.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkevents-x11.c,v
retrieving revision 1.171
diff -u -p -d -r1.171 gdkevents-x11.c
--- gdk/x11/gdkevents-x11.c	29 Jun 2006 15:13:56 -0000	1.171
+++ gdk/x11/gdkevents-x11.c	6 Sep 2006 20:26:49 -0000
@@ -41,9 +41,10 @@
 #include <string.h>
 
 #include "gdkinputprivate.h"
-
+#include "gdksettings.c"
 #include "gdkalias.h"
 
+
 #ifdef HAVE_XKB
 #include <X11/XKBlib.h>
 #endif
@@ -2811,7 +2812,6 @@ gdk_net_wm_supports (GdkAtom property)
   return gdk_x11_screen_supports_net_wm_hint (gdk_screen_get_default (), property);
 }
 
-#include "gdksettings.c"
 
 static void
 gdk_xsettings_notify_cb (const char       *name,
Index: gdk/x11/gdkglobals-x11.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkglobals-x11.c,v
retrieving revision 1.32
diff -u -p -d -r1.32 gdkglobals-x11.c
--- gdk/x11/gdkglobals-x11.c	16 Mar 2005 03:17:27 -0000	1.32
+++ gdk/x11/gdkglobals-x11.c	6 Sep 2006 20:26:49 -0000
@@ -29,6 +29,7 @@
 
 #include "gdktypes.h"
 #include "gdkprivate-x11.h"
+#include "gdkalias.h"
 
 gboolean          _gdk_use_xshm = TRUE;  /* used as a cmd line arg */
 Display          *gdk_display = NULL;
Index: gdk-pixbuf/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gdk-pixbuf/Makefile.am,v
retrieving revision 1.160
diff -u -p -d -r1.160 Makefile.am
--- gdk-pixbuf/Makefile.am	12 Apr 2006 19:48:26 -0000	1.160
+++ gdk-pixbuf/Makefile.am	6 Sep 2006 20:26:49 -0000
@@ -50,7 +50,7 @@ gdk-pixbuf-aliasdef.c: gdk-pixbuf.symbol
 	 $(PERL) $(srcdir)/makegdkpixbufalias.pl -def < $(srcdir)/gdk-pixbuf.symbols > gdk-pixbuf-aliasdef.c
 
 if OS_LINUX
-TESTS = abicheck.sh
+TESTS = abicheck.sh pltcheck.sh
 endif
 
 lib_LTLIBRARIES = 		\
@@ -273,7 +273,6 @@ INCLUDES = \
 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED		\
 	-DGTK_PREFIX=\"$(prefix)\"		\
 	$(INCLUDED_LOADER_DEFINE) 		\
 	$(GTK_DEBUG_FLAGS)			\
Index: gdk-pixbuf/abicheck.sh
===================================================================
RCS file: /cvs/gnome/gtk+/gdk-pixbuf/abicheck.sh,v
retrieving revision 1.11
diff -u -p -d -r1.11 abicheck.sh
--- gdk-pixbuf/abicheck.sh	14 Jan 2006 04:45:21 -0000	1.11
+++ gdk-pixbuf/abicheck.sh	6 Sep 2006 20:26:49 -0000
@@ -2,4 +2,4 @@
 
 cpp -DINCLUDE_VARIABLES -P -DALL_FILES ${srcdir:-.}/gdk-pixbuf.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
 nm -D -g --defined-only .libs/libgdk_pixbuf-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
-diff -u expected-abi actual-abi && rm expected-abi actual-abi
+diff -u expected-abi actual-abi && rm -f expected-abi actual-abi
Index: gdk-pixbuf/gdk-pixbuf-csource.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk-pixbuf/gdk-pixbuf-csource.c,v
retrieving revision 1.10
diff -u -p -d -r1.10 gdk-pixbuf-csource.c
--- gdk-pixbuf/gdk-pixbuf-csource.c	5 Dec 2004 12:43:47 -0000	1.10
+++ gdk-pixbuf/gdk-pixbuf-csource.c	6 Sep 2006 20:26:49 -0000
@@ -299,4 +299,3 @@ print_blurb (FILE    *bout,
       g_fprintf (bout, "  --g-fatal-warnings         make warnings fatal (abort)\n");
     }
 }
-
Index: gdk-pixbuf/gdk-pixbuf-io.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk-pixbuf/gdk-pixbuf-io.c,v
retrieving revision 1.120
diff -u -p -d -r1.120 gdk-pixbuf-io.c
--- gdk-pixbuf/gdk-pixbuf-io.c	16 Aug 2006 06:01:09 -0000	1.120
+++ gdk-pixbuf/gdk-pixbuf-io.c	6 Sep 2006 20:26:49 -0000
@@ -2277,7 +2277,3 @@ gdk_pixbuf_get_formats (void)
 
 #define __GDK_PIXBUF_IO_C__
 #include "gdk-pixbuf-aliasdef.c"
-
-
-
-
Index: gdk-pixbuf/gdk-pixbuf.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk-pixbuf/gdk-pixbuf.c,v
retrieving revision 1.73
diff -u -p -d -r1.73 gdk-pixbuf.c
--- gdk-pixbuf/gdk-pixbuf.c	14 May 2006 04:00:39 -0000	1.73
+++ gdk-pixbuf/gdk-pixbuf.c	6 Sep 2006 20:26:49 -0000
@@ -30,6 +30,9 @@
 #define GDK_PIXBUF_COMPILATION
 #include "gdk-pixbuf.h"
 #include "gdk-pixbuf-private.h"
+/* Include the marshallers */
+#include <glib-object.h>
+#include "gdk-pixbuf-marshal.c"
 #include "gdk-pixbuf-alias.h"
 
 static void gdk_pixbuf_finalize     (GObject        *object);
@@ -752,12 +755,6 @@ gdk_pixbuf_get_property (GObject        
                   break;
           }
 }
-
-
-
-/* Include the marshallers */
-#include <glib-object.h>
-#include "gdk-pixbuf-marshal.c"
 
 #define __GDK_PIXBUF_C__
 #include "gdk-pixbuf-aliasdef.c"
Index: gdk-pixbuf/gdk-pixdata.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk-pixbuf/gdk-pixdata.c,v
retrieving revision 1.28
diff -u -p -d -r1.28 gdk-pixdata.c
--- gdk-pixbuf/gdk-pixdata.c	14 Mar 2005 19:37:00 -0000	1.28
+++ gdk-pixbuf/gdk-pixdata.c	6 Sep 2006 20:26:49 -0000
@@ -17,9 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 #include <config.h>
-#include "gdk-pixdata.h"
 
 #include "gdk-pixbuf-private.h"
+#include "gdk-pixdata.h"
 #include "gdk-pixbuf-alias.h"
 #include <string.h>
 
Index: gdk-pixbuf/pltcheck.sh
===================================================================
RCS file: gdk-pixbuf/pltcheck.sh
diff -N gdk-pixbuf/pltcheck.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdk-pixbuf/pltcheck.sh	6 Sep 2006 20:26:49 -0000
@@ -0,0 +1,17 @@
+#!/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/libgdk_pixbuf*.so; do
+	echo Checking $so for local PLT entries
+	readelf -r $so | grep 'JU\?MP_SLOT' | grep 'gdk_pixbuf' && status=1
+done
+
+exit $status
Index: gtk/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v
retrieving revision 1.313
diff -u -p -d -r1.313 Makefile.am
--- gtk/Makefile.am	15 Aug 2006 16:15:25 -0000	1.313
+++ gtk/Makefile.am	6 Sep 2006 20:26:49 -0000
@@ -33,7 +33,6 @@ INCLUDES =						\
 	-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf	\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
-	-DGTK_DISABLE_DEPRECATED			\
 	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
 	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
 	$(GTK_DEBUG_FLAGS)				\
@@ -89,8 +88,15 @@ gtkalias.h: gtk.symbols
 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 = gtk_all_c_sources="$(gtk_all_c_sources)"
+TESTS = aliasfilescheck.sh
 if OS_LINUX
-TESTS = abicheck.sh
+TESTS += abicheck.sh pltcheck.sh
 endif
 
 # libtool stuff: set version and export symbols for resolving
@@ -319,7 +325,7 @@ gtk_unix_print_public_h_sources =    \
 
 
 # Installed header files without compatibility guarantees
-# that are not include in gtk/gtk.h
+# that are not included in gtk/gtk.h
 gtk_semi_private_h_sources =    \
 	gtktextlayout.h		\
 	gtkfilesystem.h
@@ -336,7 +342,11 @@ gtk_private_h_sources =		\
 	gtkfilechooserutils.h	\
 	gtkfilesystemmodel.h	\
 	gtkfilesystemunix.h	\
+	gtkhsv.h		\
 	gtkiconcache.h		\
+	gtkintl.h		\
+	gtkkeyhash.h		\
+	gtkmnemonichash.h	\
 	gtkpathbar.h		\
 	gtkplugprivate.h	\
 	gtkprintoperation-private.h\
@@ -348,6 +358,7 @@ gtk_private_h_sources =		\
 	gtksequence.h		\
 	gtksocketprivate.h	\
 	gtktextbtree.h		\
+	gtktextbufferserialize.h\
 	gtktextchildprivate.h	\
 	gtktextiterprivate.h	\
 	gtktextmarkprivate.h	\
@@ -362,7 +373,7 @@ gtk_private_h_sources =		\
 	gtkwindow-decorate.h
 
 # GTK+ C sources to build the library from
-gtk_c_sources =                 \
+gtk_base_c_sources =            \
 	fnmatch.c		\
 	gtkaboutdialog.c	\
 	gtkaccelgroup.c		\
@@ -440,7 +451,6 @@ gtk_c_sources =                 \
 	gtkhscrollbar.c		\
 	gtkhseparator.c		\
 	gtkhsv.c		\
-	gtkhsv.h		\
 	gtkiconcache.c		\
 	gtkiconfactory.c	\
 	gtkicontheme.c		\
@@ -452,12 +462,10 @@ gtk_c_sources =                 \
 	gtkimmodule.c		\
 	gtkimmulticontext.c	\
 	gtkinputdialog.c	\
-	gtkintl.h		\
 	gtkinvisible.c		\
 	gtkitem.c		\
 	gtkitemfactory.c	\
 	gtkkeyhash.c		\
-	gtkkeyhash.h		\
 	gtklabel.c		\
 	gtklayout.c		\
 	gtklinkbutton.c		\
@@ -475,7 +483,6 @@ gtk_c_sources =                 \
 	gtkmessagedialog.c	\
 	gtkmisc.c		\
 	gtkmnemonichash.c	\
-	gtkmnemonichash.h	\
 	gtkmodules.c		\
 	gtknotebook.c		\
 	gtkobject.c		\
@@ -535,14 +542,11 @@ gtk_c_sources =                 \
 	gtktextbuffer.c		\
 	gtktextbufferrichtext.c	\
 	gtktextbufferserialize.c\
-	gtktextbufferserialize.h\
 	gtktextchild.c		\
 	gtktextdisplay.c	\
 	gtktextiter.c		\
-	gtktextiterprivate.h	\
 	gtktextlayout.c		\
 	gtktextmark.c		\
-	gtktextmarkprivate.h	\
 	gtktextsegment.c	\
 	gtktexttag.c		\
 	gtktexttagtable.c	\
@@ -584,19 +588,11 @@ gtk_c_sources =                 \
 	gtkwidget.c		\
 	gtkwindow-decorate.c    \
 	gtkwindow.c		\
-	xembed.h		\
 	$(gtk_clipboard_dnd_c_sources)
+gtk_c_sources = $(gtk_base_c_sources)
+gtk_all_c_sources = $(gtk_base_c_sources)
 
-if OS_UNIX
-gtk_private_h_sources += \
-	gtkfilesystemunix.h		\
-	gtkprintbackend.h		\
-	gtkprinter-private.h		\
-	gtkprinteroption.h		\
-	gtkprinteroptionset.h		\
-	gtkprinteroptionwidget.h
-
-gtk_c_sources += \
+gtk_os_unix_c_sources = \
 	gtkfilesystemunix.c		\
 	gtkpagesetupunixdialog.c	\
 	gtkprinter.c			\
@@ -607,30 +603,51 @@ gtk_c_sources += \
 	gtkprintoperation-unix.c	\
 	gtkprintunixdialog.c		\
         gtkprintbackend.c
+gtk_all_c_sources += $(gtk_os_unix_c_sources)
+if OS_UNIX
+gtk_private_h_sources += \
+	gtkfilesystemunix.h		\
+	gtkprintbackend.h		\
+	gtkprinter-private.h		\
+	gtkprinteroption.h		\
+	gtkprinteroptionset.h		\
+	gtkprinteroptionwidget.h
+gtk_c_sources += $(gtk_os_unix_c_sources)
 endif
 
-if OS_WIN32
-gtk_private_h_sources += gtkfilesystemwin32.h gtkprint-win32.h
-
-gtk_c_sources += \
+gtk_os_win32_c_sources = \
 	gtkfilesystemwin32.c		\
 	gtkprint-win32.c		\
 	gtkprintoperation-win32.c
+gtk_all_c_sources += $(gtk_os_win32_c_sources)
+if OS_WIN32
+gtk_private_h_sources += gtkfilesystemwin32.h gtkprint-win32.h
+gtk_c_sources += $(gtk_os_win32_c_sources)
 endif
 
-if USE_X11
-gtk_private_h_sources += gtkxembed.h gtktrayicon.h
-gtk_c_sources += \
+gtk_use_x11_c_sources = \
 	gtkplug-x11.c   \
 	gtksocket-x11.c \
 	gtkxembed.c     \
 	gtktrayicon-x11.c
+gtk_use_win32_c_sources = \
+	gtkplug-win32.c   \
+	gtksocket-win32.c \
+	gtkwin32embed.c   \
+	gtkwin32embedwidget.c
+gtk_use_stuc_c_sources = \
+	gtkplug-stub.c   \
+	gtksocket-stub.c
+gtk_all_c_sources += $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_stuc_c_sources)
+if USE_X11
+gtk_private_h_sources += gtkxembed.h gtktrayicon.h xembed.h
+gtk_c_sources += $(gtk_use_x11_c_sources)
 else
 if USE_WIN32
 gtk_private_h_sources += gtkwin32embed.h gtkwin32embedwidget.h
-gtk_c_sources +=         gtkplug-win32.c gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c
+gtk_c_sources += $(gtk_use_win32_c_sources)
 else
-gtk_c_sources +=         gtkplug-stub.c gtksocket-stub.c
+gtk_c_sources += $(gtk_use_stub_c_sources)
 endif
 endif
 
@@ -653,7 +670,7 @@ gtk_built_public_sources =			\
 	gtkmarshal.h				\
 	gtktypebuiltins.h
 
-# built sources that don't get installed
+# built headers that don't get installed
 gtk_built_private_headers =			\
 	gtkalias.h				\
 	gtkmarshalers.h				\
@@ -663,7 +680,6 @@ gtk_built_sources =				\
 	gtkaliasdef.c				\
 	gtktypebuiltins.c			\
 	gtkmarshalers.c				\
-	gtkmarshalers.h				\
 	gtkmarshal.c				\
 	${gtk_built_private_headers}		\
 	${gtk_built_public_sources}
@@ -717,7 +733,9 @@ stamp-gtkmarshalers.h: @REBUILD@ gtkmars
 	&& rm -f xgen-gmlh \
 	&& echo timestamp > $(@F)	
 gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
-	(echo "#include \"gtkalias.h\""; $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body) >> xgen-gmlc \
+	(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
 
@@ -731,7 +749,11 @@ stamp-gtkmarshal.h: @REBUILD@ gtkmarshal
 	&& rm -f xgen-gmh \
 	&& echo timestamp > $(@F)
 gtkmarshal.c: @REBUILD@ gtkmarshal.list
-	(echo "#include \"gtkalias.h\""; $(GLIB_GENMARSHAL) --prefix=gtk_marshal $(srcdir)/gtkmarshal.list --body) >> xgen-gmc \
+	(echo "#include \"gtkmarshal.h\""; \
+	 echo "#include \"gtkalias.h\""; \
+	 $(GLIB_GENMARSHAL) --prefix=gtk_marshal $(srcdir)/gtkmarshal.list --body; \
+	 echo "#define __gtk_marshal_MARSHAL_C__"; \
+	 echo "#include \"gtkaliasdef.c\"") >> xgen-gmc \
 	&& cp xgen-gmc gtkmarshal.c \
 	&& rm -f xgen-gmc 
 
Index: gtk/abicheck.sh
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/abicheck.sh,v
retrieving revision 1.10
diff -u -p -d -r1.10 abicheck.sh
--- gtk/abicheck.sh	14 Jan 2006 04:45:22 -0000	1.10
+++ gtk/abicheck.sh	6 Sep 2006 20:26:49 -0000
@@ -2,4 +2,4 @@
 
 cpp -DINCLUDE_VARIABLES -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DALL_FILES ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
 nm -D -g --defined-only .libs/libgtk-x11-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
-diff -u expected-abi actual-abi && rm expected-abi actual-abi
+diff -u expected-abi actual-abi && rm -f expected-abi actual-abi
Index: gtk/aliasfilescheck.sh
===================================================================
RCS file: gtk/aliasfilescheck.sh
diff -N gtk/aliasfilescheck.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gtk/aliasfilescheck.sh	6 Sep 2006 20:26:49 -0000
@@ -0,0 +1,12 @@
+#! /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' gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files
+grep '^ *# *define __' $gtk_all_c_sources | sed 's/.*define //;s/ *$//' | sort > actual-files
+
+diff expected-files actual-files && rm -f expected-files actual-files
+
Index: gtk/gtk.symbols
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtk.symbols,v
retrieving revision 1.128
diff -u -p -d -r1.128 gtk.symbols
--- gtk/gtk.symbols	10 Jul 2006 15:48:00 -0000	1.128
+++ gtk/gtk.symbols	6 Sep 2006 20:26:50 -0000
@@ -596,8 +596,8 @@ gtk_check_button_new_with_mnemonic
 #endif
 #endif
 
-#if IN_HEADER(__GTK_MENU_CHECK_ITEM_H__)
-#if IN_FILE(__GTK_MENU_CHECK_ITEM_C__)
+#if IN_HEADER(__GTK_CHECK_MENU_ITEM_H__)
+#if IN_FILE(__GTK_CHECK_MENU_ITEM_C__)
 gtk_check_menu_item_get_active
 gtk_check_menu_item_get_draw_as_radio
 gtk_check_menu_item_get_inconsistent
@@ -884,8 +884,8 @@ gtk_container_unset_focus_chain
 #endif
 #endif
 
-#if IN_HEADER(__C_TREE_H__)
-#if IN_FILE(__G_TREE_C__)
+#if IN_HEADER(__GTK_CTREE_H__)
+#if IN_FILE(__GTK_CTREE_C__)
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_ctree_collapse
 gtk_ctree_collapse_recursive
@@ -1477,7 +1477,6 @@ gtk_file_system_unix_new
 #ifdef G_OS_WIN32
 gtk_file_system_win32_get_type G_GNUC_CONST
 gtk_file_system_win32_new
-_gtk_file_system_win32_path_compare
 #endif
 #endif
 #endif
@@ -1537,8 +1536,8 @@ gtk_font_button_set_use_size
 #endif
 #endif
 
-#if IN_HEADER(__GTK_FONSEL_H__)
-#if IN_FILE(__GTK_FONSEL_C__)
+#if IN_HEADER(__GTK_FONTSEL_H__)
+#if IN_FILE(__GTK_FONTSEL_C__)
 gtk_font_selection_dialog_get_font_name
 gtk_font_selection_dialog_get_preview_text
 gtk_font_selection_dialog_get_type G_GNUC_CONST
@@ -1939,7 +1938,7 @@ gtk_item_toggle
 #endif
 #endif
 
-#if IN_HEADER(__GTK_ITEM__FACTORY_H__)
+#if IN_HEADER(__GTK_ITEM_FACTORY_H__)
 #if IN_FILE(__GTK_ITEM_FACTORY_C__)
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_item_factories_path_delete
@@ -2189,6 +2188,7 @@ gtk_input_dialog_new
 
 #if IN_HEADER(__gtk_marshal_MARSHAL_H__)
 #if IN_FILE(__gtk_marshal_MARSHAL_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_marshal_BOOLEAN__POINTER
 gtk_marshal_BOOLEAN__POINTER_INT_INT
 gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT
@@ -2217,6 +2217,7 @@ gtk_marshal_VOID__UINT_POINTER_UINT_UINT
 gtk_marshal_VOID__UINT_STRING
 #endif
 #endif
+#endif
 
 #if IN_HEADER(__GTK_MENU_BAR_H__)
 #if IN_FILE(__GTK_MENU_BAR_C__)
@@ -4371,19 +4372,21 @@ gtk_vbox_new
 #endif
 #endif
 
-#if IN_HEADER(__GTK_VBUTTONBOX_H__)
-#if IN_FILE(__GTK_VBUTTONBOX_C__)
+#if IN_HEADER(__GTK_VBBOX_H__)
+#if IN_FILE(__GTK_VBBOX_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_vbutton_box_get_layout_default
 gtk_vbutton_box_get_spacing_default
-gtk_vbutton_box_get_type G_GNUC_CONST
-gtk_vbutton_box_new
 gtk_vbutton_box_set_layout_default
 gtk_vbutton_box_set_spacing_default
 #endif
+gtk_vbutton_box_get_type G_GNUC_CONST
+gtk_vbutton_box_new
+#endif
 #endif
 
-#if IN_HEADER(__GTK_VIEPORT_H__)
-#if IN_FILE(__GTK_VIEPORT_C__)
+#if IN_HEADER(__GTK_VIEWPORT_H__)
+#if IN_FILE(__GTK_VIEWPORT_C__)
 gtk_viewport_get_hadjustment
 gtk_viewport_get_shadow_type
 gtk_viewport_get_type G_GNUC_CONST
@@ -4684,6 +4687,14 @@ gtk_window_stick
 gtk_window_unfullscreen
 gtk_window_unmaximize
 gtk_window_unstick
+#endif
+#endif
+
+#if IN_HEADER(__GTK_WIN32_EMBED_WIDGET_H__)
+#if IN_FILE(__GTK_WIN32_EMBED_WIDGET_C__)
+#ifdef G_OS_WIN32
+gtk_win32_embed_widget_get_type G_GNUC_CONST
+#endif
 #endif
 #endif
 
Index: gtk/gtkcalendar.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcalendar.c,v
retrieving revision 1.111
diff -u -p -d -r1.111 gtkcalendar.c
--- gtk/gtkcalendar.c	6 Aug 2006 04:41:31 -0000	1.111
+++ gtk/gtkcalendar.c	6 Sep 2006 20:26:50 -0000
@@ -49,7 +49,6 @@
 
 #undef GTK_DISABLE_DEPRECATED
 #include "gtkcalendar.h"
-#define GTK_DISABLE_DEPRECATED
 
 #include "gtkdnd.h"
 #include "gtkintl.h"
Index: gtk/gtkclipboard-quartz.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkclipboard-quartz.c,v
retrieving revision 1.4
diff -u -p -d -r1.4 gtkclipboard-quartz.c
--- gtk/gtkclipboard-quartz.c	19 Jul 2006 18:55:27 -0000	1.4
+++ gtk/gtkclipboard-quartz.c	6 Sep 2006 20:26:50 -0000
@@ -30,10 +30,9 @@
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 #include "gtktextbuffer.h"
-
 #include "gtkquartz.h"
+#include "gtkalias.h"
 
 enum {
   OWNER_CHANGE,
Index: gtk/gtkdnd-quartz.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkdnd-quartz.c,v
retrieving revision 1.6
diff -u -p -d -r1.6 gtkdnd-quartz.c
--- gtk/gtkdnd-quartz.c	8 Aug 2006 21:18:09 -0000	1.6
+++ gtk/gtkdnd-quartz.c	6 Sep 2006 20:26:50 -0000
@@ -43,9 +43,8 @@
 #include "gtkstock.h"
 #include "gtkwindow.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
-
 #include "gtkquartz.h"
+#include "gtkalias.h"
 #include "gdk/quartz/gdkquartz.h"
 
 typedef struct _GtkDragSourceSite GtkDragSourceSite;
Index: gtk/gtkdnd.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkdnd.c,v
retrieving revision 1.155
diff -u -p -d -r1.155 gtkdnd.c
--- gtk/gtkdnd.c	18 Jul 2006 22:16:44 -0000	1.155
+++ gtk/gtkdnd.c	6 Sep 2006 20:26:50 -0000
@@ -43,6 +43,7 @@
 #include "gtkstock.h"
 #include "gtkwindow.h"
 #include "gtkintl.h"
+#include "gtkdndcursors.h"
 #include "gtkalias.h"
 
 static GSList *source_widgets = NULL;
@@ -299,8 +300,6 @@ static void     set_icon_stock_pixbuf   
 /************************
  * Cursor and Icon data *
  ************************/
-
-#include "gtkdndcursors.h"
 
 static struct {
   GdkDragAction action;
Index: gtk/gtkexpander.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkexpander.c,v
retrieving revision 1.28
diff -u -p -d -r1.28 gtkexpander.c
--- gtk/gtkexpander.c	14 May 2006 04:25:29 -0000	1.28
+++ gtk/gtkexpander.c	6 Sep 2006 20:26:50 -0000
@@ -32,8 +32,8 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include <gdk/gdkkeysyms.h>
-#include "gtkalias.h"
 #include "gtkdnd.h"
+#include "gtkalias.h"
 
 #define GTK_EXPANDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_EXPANDER, GtkExpanderPrivate))
 
Index: gtk/gtkfilechooserdefault.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkfilechooserdefault.c,v
retrieving revision 1.328
diff -u -p -d -r1.328 gtkfilechooserdefault.c
--- gtk/gtkfilechooserdefault.c	18 Jul 2006 16:36:16 -0000	1.328
+++ gtk/gtkfilechooserdefault.c	6 Sep 2006 20:26:50 -0000
@@ -8559,6 +8559,3 @@ shortcuts_model_filter_new (GtkFileChoos
 
   return GTK_TREE_MODEL (model);
 }
-
-#define __GTK_FILE_CHOOSER_DEFAULT_C__
-#include "gtkaliasdef.c"
Index: gtk/gtkfilechooserembed.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkfilechooserembed.c,v
retrieving revision 1.16
diff -u -p -d -r1.16 gtkfilechooserembed.c
--- gtk/gtkfilechooserembed.c	6 Jul 2006 05:14:01 -0000	1.16
+++ gtk/gtkfilechooserembed.c	6 Sep 2006 20:26:50 -0000
@@ -219,6 +219,3 @@ _gtk_file_chooser_embed_get_resizable_hi
 
   GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->get_resizable_hints (chooser_embed, resize_horizontally, resize_vertically);
 }
-
-#define __GTK_FILE_CHOOSER_EMBED_C__
-#include "gtkaliasdef.c"
Index: gtk/gtkfilechooserentry.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkfilechooserentry.c,v
retrieving revision 1.38
diff -u -p -d -r1.38 gtkfilechooserentry.c
--- gtk/gtkfilechooserentry.c	15 Aug 2006 18:11:13 -0000	1.38
+++ gtk/gtkfilechooserentry.c	6 Sep 2006 20:26:50 -0000
@@ -1075,6 +1075,3 @@ _gtk_file_chooser_entry_get_is_folder (G
 
   return retval;
 }
-
-#define __GTK_FILE_CHOOSER_ENTRY_C__
-#include "gtkaliasdef.c"
Index: gtk/gtkfilechoosersettings.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkfilechoosersettings.c,v
retrieving revision 1.3
diff -u -p -d -r1.3 gtkfilechoosersettings.c
--- gtk/gtkfilechoosersettings.c	14 May 2006 04:25:29 -0000	1.3
+++ gtk/gtkfilechoosersettings.c	6 Sep 2006 20:26:50 -0000
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 #include "gtkfilechoosersettings.h"
+#include "gtkalias.h"
 
 /* Increment this every time you change the configuration format */
 #define CONFIG_VERSION 0
Index: gtk/gtkfilechooserutils.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkfilechooserutils.c,v
retrieving revision 1.26
diff -u -p -d -r1.26 gtkfilechooserutils.c
--- gtk/gtkfilechooserutils.c	1 Sep 2005 05:11:39 -0000	1.26
+++ gtk/gtkfilechooserutils.c	6 Sep 2006 20:26:50 -0000
@@ -360,6 +360,3 @@ delegate_confirm_overwrite (GtkFileChoos
   g_signal_emit_by_name (data, "confirm-overwrite", &conf);
   return conf;
 }
-
-#define __GTK_FILE_CHOOSER_UTILS_C__
-#include "gtkaliasdef.c"
Index: gtk/gtkfilesel.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkfilesel.c,v
retrieving revision 1.174
diff -u -p -d -r1.174 gtkfilesel.c
--- gtk/gtkfilesel.c	6 Jul 2006 05:14:01 -0000	1.174
+++ gtk/gtkfilesel.c	6 Sep 2006 20:26:51 -0000
@@ -78,7 +78,6 @@
 
 #undef GTK_DISABLE_DEPRECATED
 #include "gtkoptionmenu.h"
-#define GTK_DISABLE_DEPRECATED
 
 #define WANT_HPANED 1
 #include "gtkhpaned.h"
Index: gtk/gtkfilesystem.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkfilesystem.c,v
retrieving revision 1.59
diff -u -p -d -r1.59 gtkfilesystem.c
--- gtk/gtkfilesystem.c	15 Aug 2006 17:28:34 -0000	1.59
+++ gtk/gtkfilesystem.c	6 Sep 2006 20:26:51 -0000
@@ -24,8 +24,8 @@
 #include "gtkicontheme.h"
 #include "gtkmodules.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 #include "gtkstock.h"
+#include "gtkalias.h"
 
 #include <string.h>
 
Index: gtk/gtkfilesystemmodel.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkfilesystemmodel.c,v
retrieving revision 1.45
diff -u -p -d -r1.45 gtkfilesystemmodel.c
--- gtk/gtkfilesystemmodel.c	14 May 2006 04:25:29 -0000	1.45
+++ gtk/gtkfilesystemmodel.c	6 Sep 2006 20:26:51 -0000
@@ -2021,6 +2021,3 @@ root_files_removed_callback (GtkFileFold
 {
   do_files_removed (model, NULL, paths);
 }
-
-#define __GTK_FILE_SYSTEM_MODEL_C__
-#include "gtkaliasdef.c"
Index: gtk/gtkiconcache.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkiconcache.c,v
retrieving revision 1.16
diff -u -p -d -r1.16 gtkiconcache.c
--- gtk/gtkiconcache.c	31 Mar 2006 05:17:56 -0000	1.16
+++ gtk/gtkiconcache.c	6 Sep 2006 20:26:51 -0000
@@ -21,6 +21,8 @@
 
 #include "gtkdebug.h"
 #include "gtkiconcache.h"
+#include "gtkalias.h"
+
 #include <glib/gstdio.h>
 #include <gdk-pixbuf/gdk-pixdata.h>
 
Index: gtk/gtkinputdialog.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkinputdialog.c,v
retrieving revision 1.53
diff -u -p -d -r1.53 gtkinputdialog.c
--- gtk/gtkinputdialog.c	29 Jun 2006 09:18:05 -0000	1.53
+++ gtk/gtkinputdialog.c	6 Sep 2006 20:26:51 -0000
@@ -52,7 +52,6 @@
 
 #undef GTK_DISABLE_DEPRECATED
 #include "gtkoptionmenu.h"
-#define GTK_DISABLE_DEPRECATED
 
 #include "gtkintl.h"
 #include "gtkalias.h"
Index: gtk/gtkitemfactory.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkitemfactory.c,v
retrieving revision 1.91
diff -u -p -d -r1.91 gtkitemfactory.c
--- gtk/gtkitemfactory.c	28 Jun 2006 16:09:17 -0000	1.91
+++ gtk/gtkitemfactory.c	6 Sep 2006 20:26:51 -0000
@@ -32,7 +32,6 @@
 #undef GTK_DISABLE_DEPRECATED
 #include	"gtkitemfactory.h"
 #include	"gtkoptionmenu.h"
-#define GTK_DISABLE_DEPRECATED
 #include	"gtkmenubar.h"
 #include	"gtkmenu.h"
 #include	"gtkmenuitem.h"
@@ -54,7 +53,7 @@
 #endif
 #include	<stdio.h>
 
-#include 	"gtkalias.h"
+#include "gtkalias.h"
 
 /* --- defines --- */
 #define		ITEM_FACTORY_STRING	((gchar*) item_factory_string)
Index: gtk/gtkmnemonichash.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkmnemonichash.c,v
retrieving revision 1.2
diff -u -p -d -r1.2 gtkmnemonichash.c
--- gtk/gtkmnemonichash.c	27 Mar 2006 18:30:22 -0000	1.2
+++ gtk/gtkmnemonichash.c	6 Sep 2006 20:26:51 -0000
@@ -20,6 +20,7 @@
  */
 
 #include "gtkmnemonichash.h"
+#include "gtkalias.h"
 
 struct _GtkMnemnonicHash
 {
Index: gtk/gtkmodules.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkmodules.c,v
retrieving revision 1.8
diff -u -p -d -r1.8 gtkmodules.c
--- gtk/gtkmodules.c	16 Dec 2005 19:06:08 -0000	1.8
+++ gtk/gtkmodules.c	6 Sep 2006 20:26:51 -0000
@@ -27,6 +27,7 @@
 #include "gtkdebug.h"
 #include "gtkprivate.h" /* GTK_LIBDIR */
 #include "gtkintl.h" 
+#include "gtkalias.h"
 
 #include <gmodule.h>
 #include <pango/pango-utils.h>	/* For pango_split_file_list */
Index: gtk/gtknotebook.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtknotebook.c,v
retrieving revision 1.226
diff -u -p -d -r1.226 gtknotebook.c
--- gtk/gtknotebook.c	16 Aug 2006 14:38:02 -0000	1.226
+++ gtk/gtknotebook.c	6 Sep 2006 20:26:51 -0000
@@ -37,8 +37,8 @@
 #include "gtkmarshalers.h"
 #include "gtkbindings.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 #include "gtkdnd.h"
+#include "gtkalias.h"
 
 #define SCROLL_DELAY_FACTOR   5
 #define SCROLL_THRESHOLD      12
Index: gtk/gtkoptionmenu.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkoptionmenu.c,v
retrieving revision 1.86
diff -u -p -d -r1.86 gtkoptionmenu.c
--- gtk/gtkoptionmenu.c	6 Jul 2006 05:14:01 -0000	1.86
+++ gtk/gtkoptionmenu.c	6 Sep 2006 20:26:51 -0000
@@ -33,7 +33,6 @@
 
 #undef GTK_DISABLE_DEPRECATED
 #include "gtkoptionmenu.h"
-#define GTK_DISABLE_DEPRECATED
 
 #include "gtkprivate.h"
 #include "gtkalias.h"
Index: gtk/gtkpathbar.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkpathbar.c,v
retrieving revision 1.56
diff -u -p -d -r1.56 gtkpathbar.c
--- gtk/gtkpathbar.c	6 Jul 2006 05:14:01 -0000	1.56
+++ gtk/gtkpathbar.c	6 Sep 2006 20:26:51 -0000
@@ -1653,3 +1653,6 @@ _gtk_path_bar_down (GtkPathBar *path_bar
 	}
     }
 }
+
+#define __GTK_PATH_BAR_C__
+#include "gtkaliasdef.c"
Index: gtk/gtkpathbar.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkpathbar.h,v
retrieving revision 1.20
diff -u -p -d -r1.20 gtkpathbar.h
--- gtk/gtkpathbar.h	1 May 2006 21:41:12 -0000	1.20
+++ gtk/gtkpathbar.h	6 Sep 2006 20:26:51 -0000
@@ -17,8 +17,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __GTK_PATH_BAR__
-#define __GTK_PATH_BAR__
+#ifndef __GTK_PATH_BAR_H__
+#define __GTK_PATH_BAR_H__
 
 #include "gtkcontainer.h"
 #include "gtkfilesystem.h"
@@ -91,4 +91,4 @@ void     _gtk_path_bar_down            (
 
 G_END_DECLS
 
-#endif /* __GTK_PATH_BAR__ */
+#endif /* __GTK_PATH_BAR_H__ */
Index: gtk/gtkplug-stub.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkplug-stub.c,v
retrieving revision 1.2
diff -u -p -d -r1.2 gtkplug-stub.c
--- gtk/gtkplug-stub.c	22 Nov 2005 10:03:32 -0000	1.2
+++ gtk/gtkplug-stub.c	6 Sep 2006 20:26:51 -0000
@@ -27,6 +27,7 @@
 
 #include "gtkplug.h"
 #include "gtkplugprivate.h"
+#include "gtkalias.h"
 
 GdkNativeWindow
 _gtk_plug_windowing_get_id (GtkPlug *plug)
Index: gtk/gtkplug-win32.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkplug-win32.c,v
retrieving revision 1.2
diff -u -p -d -r1.2 gtkplug-win32.c
--- gtk/gtkplug-win32.c	26 Jul 2005 20:42:18 -0000	1.2
+++ gtk/gtkplug-win32.c	6 Sep 2006 20:26:51 -0000
@@ -33,6 +33,7 @@
 #include "win32/gdkwin32.h"
 
 #include "gtkwin32embed.h"
+#include "gtkalias.h"
 
 #if defined(_MSC_VER) && (WINVER < 0x0500)
 #ifndef GA_PARENT
Index: gtk/gtkplug-x11.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkplug-x11.c,v
retrieving revision 1.2
diff -u -p -d -r1.2 gtkplug-x11.c
--- gtk/gtkplug-x11.c	13 Sep 2005 19:57:41 -0000	1.2
+++ gtk/gtkplug-x11.c	6 Sep 2006 20:26:51 -0000
@@ -25,7 +25,6 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include "gtkalias.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkplug.h"
@@ -35,6 +34,7 @@
 #include "x11/gdkx.h"
 
 #include "gtkxembed.h"
+#include "gtkalias.h"
 
 static void xembed_set_info            (GdkWindow     *window,
 					unsigned long  flags);
Index: gtk/gtkprintoperation-unix.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkprintoperation-unix.c,v
retrieving revision 1.37
diff -u -p -d -r1.37 gtkprintoperation-unix.c
--- gtk/gtkprintoperation-unix.c	10 Jul 2006 16:59:43 -0000	1.37
+++ gtk/gtkprintoperation-unix.c	6 Sep 2006 20:26:51 -0000
@@ -44,8 +44,8 @@
 #include "gtkprinter-private.h"
 #include "gtkprintjob.h"
 #include "gtklabel.h"
-#include "gtkalias.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 typedef struct 
 {
Index: gtk/gtkprintoperation-win32.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkprintoperation-win32.c,v
retrieving revision 1.13
diff -u -p -d -r1.13 gtkprintoperation-win32.c
--- gtk/gtkprintoperation-win32.c	12 Jun 2006 02:32:16 -0000	1.13
+++ gtk/gtkprintoperation-win32.c	6 Sep 2006 20:26:51 -0000
@@ -40,9 +40,9 @@
 #include "gtkinvisible.h"
 #include "gtkplug.h"
 #include "gtkstock.h"
-#include "gtkalias.h"
 #include "gtk.h"
 #include "gtkwin32embedwidget.h"
+#include "gtkalias.h"
 
 #define MAX_PAGE_RANGES 20
 #define STATUS_POLLING_TIME 2000
@@ -1909,3 +1909,6 @@ gtk_print_run_page_setup_dialog_async (G
   done_cb (new_page_setup, data);
   g_object_unref (new_page_setup);
 }
+
+#define __GTK_PRINT_OPERATION_WIN32_C__
+#include "gtkaliasdef.c"
Index: gtk/gtkprintutils.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkprintutils.c,v
retrieving revision 1.1
diff -u -p -d -r1.1 gtkprintutils.c
--- gtk/gtkprintutils.c	23 Apr 2006 05:48:04 -0000	1.1
+++ gtk/gtkprintutils.c	6 Sep 2006 20:26:51 -0000
@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "gtkprintutils.h"
+#include "gtkalias.h"
 
 gdouble
 _gtk_print_convert_to_mm (gdouble len, 
Index: gtk/gtkprogress.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkprogress.c,v
retrieving revision 1.43
diff -u -p -d -r1.43 gtkprogress.c
--- gtk/gtkprogress.c	6 Jul 2006 05:14:01 -0000	1.43
+++ gtk/gtkprogress.c	6 Sep 2006 20:26:51 -0000
@@ -29,7 +29,6 @@
 #include <string.h>
 #undef GTK_DISABLE_DEPRECATED
 #include "gtkprogress.h" 
-#define GTK_DISABLE_DEPRECATED
 #include "gtkprivate.h" 
 #include "gtkintl.h"
 #include "gtkalias.h"
Index: gtk/gtkquartz.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkquartz.c,v
retrieving revision 1.1
diff -u -p -d -r1.1 gtkquartz.c
--- gtk/gtkquartz.c	21 Mar 2006 16:50:47 -0000	1.1
+++ gtk/gtkquartz.c	6 Sep 2006 20:26:51 -0000
@@ -21,6 +21,7 @@
 #include <config.h>
 
 #include "gtkquartz.h"
+#include "gtkalias.h"
 
 NSImage *
 _gtk_quartz_create_image_from_pixbuf (GdkPixbuf *pixbuf)
Index: gtk/gtkrecentchooserdefault.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkrecentchooserdefault.c,v
retrieving revision 1.8
diff -u -p -d -r1.8 gtkrecentchooserdefault.c
--- gtk/gtkrecentchooserdefault.c	6 Aug 2006 23:44:46 -0000	1.8
+++ gtk/gtkrecentchooserdefault.c	6 Sep 2006 20:26:51 -0000
@@ -2069,6 +2069,3 @@ _gtk_recent_chooser_default_new (GtkRece
   		       "recent-manager", manager,
   		       NULL);
 }
-
-#define __GTK_RECENT_CHOOSER_DEFAULT_C__
-#include "gtkaliasdef.c"
Index: gtk/gtkrecentchooserutils.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkrecentchooserutils.c,v
retrieving revision 1.4
diff -u -p -d -r1.4 gtkrecentchooserutils.c
--- gtk/gtkrecentchooserutils.c	6 Jul 2006 05:14:02 -0000	1.4
+++ gtk/gtkrecentchooserutils.c	6 Sep 2006 20:26:51 -0000
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include "gtkrecentchooserutils.h"
+#include "gtkalias.h"
 
 /* Methods */
 static void      delegate_set_sort_func              (GtkRecentChooser  *chooser,
Index: gtk/gtksequence.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtksequence.c,v
retrieving revision 1.9
diff -u -p -d -r1.9 gtksequence.c
--- gtk/gtksequence.c	30 Nov 2004 22:58:10 -0000	1.9
+++ gtk/gtksequence.c	6 Sep 2006 20:26:51 -0000
@@ -20,6 +20,7 @@
 #include <glib.h>
 
 #include "gtksequence.h"
+#include "gtkalias.h"
 
 typedef struct _GtkSequenceNode GtkSequenceNode;
 
Index: gtk/gtksignal.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtksignal.c,v
retrieving revision 1.85
diff -u -p -d -r1.85 gtksignal.c
--- gtk/gtksignal.c	20 Mar 2005 07:01:22 -0000	1.85
+++ gtk/gtksignal.c	6 Sep 2006 20:26:51 -0000
@@ -21,7 +21,7 @@
 
 #include	<config.h>
 #include	"gtksignal.h"
-#include 	"gtkalias.h"
+#include "gtkalias.h"
 
 /* the real parameter limit is of course given by GSignal, bu we need
  * an upper limit for the implementations. so this should be adjusted
Index: gtk/gtksocket-stub.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtksocket-stub.c,v
retrieving revision 1.2
diff -u -p -d -r1.2 gtksocket-stub.c
--- gtk/gtksocket-stub.c	22 Nov 2005 10:03:32 -0000	1.2
+++ gtk/gtksocket-stub.c	6 Sep 2006 20:26:51 -0000
@@ -27,6 +27,7 @@
 
 #include "gtksocket.h"
 #include "gtksocketprivate.h"
+#include "gtkalias.h"
 
 GdkNativeWindow
 _gtk_socket_windowing_get_id (GtkSocket *socket)
Index: gtk/gtksocket-win32.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtksocket-win32.c,v
retrieving revision 1.1
diff -u -p -d -r1.1 gtksocket-win32.c
--- gtk/gtksocket-win32.c	21 Jul 2005 13:26:27 -0000	1.1
+++ gtk/gtksocket-win32.c	6 Sep 2006 20:26:51 -0000
@@ -38,6 +38,7 @@
 #include "win32/gdkwin32.h"
 
 #include "gtkwin32embed.h"
+#include "gtkalias.h"
 
 GdkNativeWindow
 _gtk_socket_windowing_get_id (GtkSocket *socket)
Index: gtk/gtkstatusicon.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkstatusicon.c,v
retrieving revision 1.21
diff -u -p -d -r1.21 gtkstatusicon.c
--- gtk/gtkstatusicon.c	6 Jul 2006 05:14:02 -0000	1.21
+++ gtk/gtkstatusicon.c	6 Sep 2006 20:26:51 -0000
@@ -39,8 +39,6 @@
 #include "gtkprivate.h"
 #include "gtkwidget.h"
 
-#include "gtkalias.h"
-
 #ifdef GDK_WINDOWING_WIN32
 #include "gtkicontheme.h"
 #include "gtklabel.h"
@@ -48,6 +46,8 @@
 #include "win32/gdkwin32.h"
 #define WM_GTK_TRAY_NOTIFICATION (WM_USER+1)
 #endif
+
+#include "gtkalias.h"
 
 #define BLINK_TIMEOUT 500
 
Index: gtk/gtkstyle.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkstyle.c,v
retrieving revision 1.199
diff -u -p -d -r1.199 gtkstyle.c
--- gtk/gtkstyle.c	6 Aug 2006 05:58:19 -0000	1.199
+++ gtk/gtkstyle.c	6 Sep 2006 20:26:52 -0000
@@ -32,7 +32,6 @@
 #include "gtkmarshalers.h"
 #undef GTK_DISABLE_DEPRECATED
 #include "gtkoptionmenu.h"
-#define GTK_DISABLE_DEPRECATED
 #include "gtkrc.h"
 #include "gtkspinbutton.h"
 #include "gtkstyle.h"
Index: gtk/gtktextbufferrichtext.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktextbufferrichtext.c,v
retrieving revision 1.3
diff -u -p -d -r1.3 gtktextbufferrichtext.c
--- gtk/gtktextbufferrichtext.c	24 Apr 2006 05:42:12 -0000	1.3
+++ gtk/gtktextbufferrichtext.c	6 Sep 2006 20:26:52 -0000
@@ -25,8 +25,8 @@
 
 #include "gtktextbufferrichtext.h"
 #include "gtktextbufferserialize.h"
-#include "gtkalias.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 
 typedef struct
Index: gtk/gtktextbufferserialize.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktextbufferserialize.c,v
retrieving revision 1.5
diff -u -p -d -r1.5 gtktextbufferserialize.c
--- gtk/gtktextbufferserialize.c	15 Aug 2006 15:01:15 -0000	1.5
+++ gtk/gtktextbufferserialize.c	6 Sep 2006 20:26:52 -0000
@@ -31,8 +31,8 @@
 
 #include "gdk-pixbuf/gdk-pixdata.h"
 #include "gtktextbufferserialize.h"
-
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 
 typedef struct
Index: gtk/gtktipsquery.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktipsquery.c,v
retrieving revision 1.41
diff -u -p -d -r1.41 gtktipsquery.c
--- gtk/gtktipsquery.c	1 Sep 2005 05:11:42 -0000	1.41
+++ gtk/gtktipsquery.c	6 Sep 2006 20:26:52 -0000
@@ -36,7 +36,7 @@
 #include	"gtkmain.h"
 #include        "gtkmarshalers.h"
 #include	"gtkintl.h"
-#include 	"gtkalias.h"
+#include "gtkalias.h"
 
 
 
Index: gtk/gtktoolitem.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktoolitem.c,v
retrieving revision 1.35
diff -u -p -d -r1.35 gtktoolitem.c
--- gtk/gtktoolitem.c	14 May 2006 04:25:31 -0000	1.35
+++ gtk/gtktoolitem.c	6 Sep 2006 20:26:52 -0000
@@ -27,8 +27,8 @@
 #include "gtkseparatormenuitem.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
-#include "gtkalias.h"
 #include "gtkprivate.h"
+#include "gtkalias.h"
 
 #include <string.h>
 
Index: gtk/gtktreemodelfilter.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktreemodelfilter.c,v
retrieving revision 1.47
diff -u -p -d -r1.47 gtktreemodelfilter.c
--- gtk/gtktreemodelfilter.c	16 Aug 2006 14:35:02 -0000	1.47
+++ gtk/gtktreemodelfilter.c	6 Sep 2006 20:26:52 -0000
@@ -22,8 +22,8 @@
 #include "gtktreemodelfilter.h"
 #include "gtkintl.h"
 #include "gtktreednd.h"
-#include "gtkalias.h"
 #include "gtkprivate.h"
+#include "gtkalias.h"
 #include <string.h>
 
 /* ITER FORMAT:
Index: gtk/gtkvbbox.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkvbbox.c,v
retrieving revision 1.26
diff -u -p -d -r1.26 gtkvbbox.c
--- gtk/gtkvbbox.c	14 May 2006 04:25:33 -0000	1.26
+++ gtk/gtkvbbox.c	6 Sep 2006 20:26:52 -0000
@@ -277,5 +277,5 @@ gtk_vbutton_box_size_allocate (GtkWidget
     }
 }
   
-#define __GTK_VBBOX_C__  
+#define __GTK_VBBOX_C__
 #include "gtkaliasdef.c"
Index: gtk/gtkvbbox.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkvbbox.h,v
retrieving revision 1.13
diff -u -p -d -r1.13 gtkvbbox.h
--- gtk/gtkvbbox.h	21 Jun 2005 05:35:43 -0000	1.13
+++ gtk/gtkvbbox.h	6 Sep 2006 20:26:52 -0000
@@ -24,8 +24,8 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef __GTK_VBUTTON_BOX_H__
-#define __GTK_VBUTTON_BOX_H__
+#ifndef __GTK_VBBOX_H__
+#define __GTK_VBBOX_H__
 
 
 #include <gtk/gtkbbox.h>
@@ -73,4 +73,4 @@ void gtk_vbutton_box_set_layout_default 
 G_END_DECLS
 
 
-#endif /* __GTK_VBUTTON_BOX_H__ */
+#endif /* __GTK_VBBOX_H__ */
Index: gtk/gtkwin32embed.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkwin32embed.c,v
retrieving revision 1.1
diff -u -p -d -r1.1 gtkwin32embed.c
--- gtk/gtkwin32embed.c	21 Jul 2005 13:26:27 -0000	1.1
+++ gtk/gtkwin32embed.c	6 Sep 2006 20:26:52 -0000
@@ -26,6 +26,8 @@
 
 #include "gtkwin32embed.h"
 
+#include "gtkalias.h"
+
 static guint message_type[GTK_WIN32_EMBED_LAST];
 
 static GSList *current_messages;
@@ -130,6 +132,3 @@ _gtk_win32_embed_get_focus_wrapped (void
 
   return (msg->lParam & GTK_WIN32_EMBED_FOCUS_WRAPAROUND) != 0;
 }
-
-
-
Index: gtk/makegtkalias.pl
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/makegtkalias.pl,v
retrieving revision 1.11
diff -u -p -d -r1.11 makegtkalias.pl
--- gtk/makegtkalias.pl	20 Mar 2005 07:01:23 -0000	1.11
+++ gtk/makegtkalias.pl	6 Sep 2006 20:26:52 -0000
@@ -16,11 +16,6 @@ print <<EOF;
 
 #ifdef G_HAVE_GNUC_VISIBILITY
 
-#ifndef GTK_DISABLE_DEPRECATED
-#define GTK_DISABLE_DEPRECATED
-#define REENABLE_DEPRECATED
-#endif
-
 EOF
 
 if ($do_def) {
@@ -134,10 +129,6 @@ EOF
 }
 
 print <<EOF;
-#ifdef REENABLE_DEPRECATED
-#undef GTK_DISABLE_DEPRECATED
-#endif
-
 #endif /* G_HAVE_GNUC_VISIBILITY */
 #endif /* DISABLE_VISIBILITY */
 EOF
Index: gtk/pltcheck.sh
===================================================================
RCS file: gtk/pltcheck.sh
diff -N gtk/pltcheck.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gtk/pltcheck.sh	6 Sep 2006 20:26:52 -0000
@@ -0,0 +1,17 @@
+#!/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