Index: gtk/gtkwidget.c
===================================================================
--- gtk/gtkwidget.c	(Revision 21127)
+++ gtk/gtkwidget.c	(Arbeitskopie)
@@ -7695,6 +7695,8 @@ gtk_widget_set_default_colormap (GdkColo
  * Obtains the default colormap used to create widgets.
  * 
  * Return value: default widget colormap
+ *
+ * Deprecated: 2.16: Use gdk_screen_get_default_colormap() instead.
  **/
 GdkColormap*
 gtk_widget_get_default_colormap (void)
@@ -7709,6 +7711,8 @@ gtk_widget_get_default_colormap (void)
  * used to be useful before gdk_colormap_get_visual() existed.
  * 
  * Return value: visual of the default colormap
+ *
+ * Deprecated: 2.16: Use gdk_colormap_get_visual() instead.
  **/
 GdkVisual*
 gtk_widget_get_default_visual (void)
Index: gtk/gtkwidget.h
===================================================================
--- gtk/gtkwidget.h	(Revision 21127)
+++ gtk/gtkwidget.h	(Arbeitskopie)
@@ -750,9 +750,11 @@ void gtk_widget_style_get          (GtkW
 void	     gtk_widget_set_default_colormap (GdkColormap *colormap);
 GtkStyle*    gtk_widget_get_default_style    (void);
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GTK_DISABLE_DEPRECATED
 GdkColormap* gtk_widget_get_default_colormap (void);
 GdkVisual*   gtk_widget_get_default_visual   (void);
 #endif
+#endif
 
 /* Functions for setting directionality for widgets
  */
Index: gtk/gtkstyle.c
===================================================================
--- gtk/gtkstyle.c	(Revision 21127)
+++ gtk/gtkstyle.c	(Arbeitskopie)
@@ -404,12 +404,7 @@ gtk_style_init (GtkStyle *style)
 {
   gint i;
   
-  GtkSettings *settings = gtk_settings_get_default ();
-  
-  if (settings)
-    _gtk_style_init_for_settings (style, settings);
-  else
-    style->font_desc = pango_font_description_from_string ("Sans 10");
+  style->font_desc = pango_font_description_from_string ("Sans 10");
   
   style->attach_count = 0;
   style->colormap = NULL;
@@ -2120,9 +2115,9 @@ gtk_default_render_icon (GtkStyle       
     }
   else
     {
-      settings = gtk_settings_get_default ();
       GTK_NOTE (MULTIHEAD,
-		g_warning ("Using the default screen for gtk_default_render_icon()"));
+		g_warning ("No screen available for gtk_default_render_icon()"));
+      return NULL;
     }
 
   
Index: gtk/gtkiconfactory.c
===================================================================
--- gtk/gtkiconfactory.c	(Revision 21127)
+++ gtk/gtkiconfactory.c	(Arbeitskopie)
@@ -950,6 +950,8 @@ gtk_icon_size_lookup_for_settings (GtkSe
  * the usual size.
  * 
  * Return value: %TRUE if @size was a valid size
+ *
+ * Deprecated: 2.16: Use gtk_icon_size_lookup_for_settings() instead.
  **/
 gboolean
 gtk_icon_size_lookup (GtkIconSize  size,
Index: gtk/gtkiconfactory.h
===================================================================
--- gtk/gtkiconfactory.h	(Revision 21127)
+++ gtk/gtkiconfactory.h	(Arbeitskopie)
@@ -97,9 +97,11 @@ GtkIconSet* gtk_icon_factory_lookup_defa
  */
 
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GTK_DISABLE_DEPRECATED
 gboolean gtk_icon_size_lookup              (GtkIconSize  size,
 					    gint        *width,
 					    gint        *height);
+#endif
 #endif /* GDK_MULTIHEAD_SAFE */
 gboolean gtk_icon_size_lookup_for_settings (GtkSettings *settings,
 					    GtkIconSize  size,
Index: gtk/gtk.symbols
===================================================================
--- gtk/gtk.symbols	(Revision 21127)
+++ gtk/gtk.symbols	(Arbeitskopie)
@@ -690,7 +690,9 @@ gtk_check_menu_item_toggled
 #if IN_HEADER(__GTK_CLIPBOARD_H__)
 #if IN_FILE(__GTK_CLIPBOARD_C__)
 gtk_clipboard_clear
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_clipboard_get
+#endif
 gtk_clipboard_get_display
 gtk_clipboard_get_for_display
 gtk_clipboard_get_owner
@@ -1752,7 +1754,9 @@ gtk_icon_factory_new
 gtk_icon_factory_remove_default
 gtk_icon_size_from_name
 gtk_icon_size_get_name
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_icon_size_lookup
+#endif
 gtk_icon_size_lookup_for_settings
 gtk_icon_size_register
 gtk_icon_size_register_alias
@@ -2600,13 +2604,17 @@ gtk_pixmap_set_build_insensitive
 
 #if IN_HEADER(__GTK_PLUG_H__)
 #if IN_FILE(__GTK_PLUG_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_plug_construct
+#endif
 gtk_plug_construct_for_display
 gtk_plug_get_id
 gtk_plug_get_embedded
 gtk_plug_get_socket_window
 gtk_plug_get_type G_GNUC_CONST
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_plug_new
+#endif
 gtk_plug_new_for_display
 #endif
 #endif
@@ -3513,7 +3521,9 @@ gtk_separator_tool_item_set_draw
 
 #if IN_HEADER(__GTK_SETTINGS_H__)
 #if IN_FILE(__GTK_SETTINGS_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_settings_get_default
+#endif
 gtk_settings_get_for_screen
 gtk_settings_get_type G_GNUC_CONST
 gtk_settings_install_property
@@ -4775,10 +4785,14 @@ gtk_widget_get_child_visible
 gtk_widget_get_clipboard
 gtk_widget_get_colormap
 gtk_widget_get_composite_name
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_widget_get_default_colormap
+#endif
 gtk_widget_get_default_direction
 gtk_widget_get_default_style
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_widget_get_default_visual
+#endif
 gtk_widget_get_direction
 gtk_widget_get_display
 gtk_widget_get_events
Index: gtk/gtksettings.c
===================================================================
--- gtk/gtksettings.c	(Revision 21127)
+++ gtk/gtksettings.c	(Arbeitskopie)
@@ -1024,6 +1024,8 @@ gtk_settings_get_for_screen (GdkScreen *
  * 
  * Return value: a #GtkSettings object. If there is no default
  *  screen, then returns %NULL.
+ *
+ * Deprecated: 2.16: Use gtk_settings_get_for_screen() instead.
  **/
 GtkSettings*
 gtk_settings_get_default (void)
Index: gtk/gtksettings.h
===================================================================
--- gtk/gtksettings.h	(Revision 21127)
+++ gtk/gtksettings.h	(Arbeitskopie)
@@ -77,8 +77,10 @@ struct _GtkSettingsValue
 /* --- functions --- */
 GType		gtk_settings_get_type		     (void) G_GNUC_CONST;
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GTK_DISABLE_DEPRECATED
 GtkSettings*	gtk_settings_get_default	     (void);
 #endif
+#endif
 GtkSettings*	gtk_settings_get_for_screen	     (GdkScreen *screen);
 
 void		gtk_settings_install_property	     (GParamSpec         *pspec);
Index: gtk/gtkclipboard.c
===================================================================
--- gtk/gtkclipboard.c	(Revision 21127)
+++ gtk/gtkclipboard.c	(Arbeitskopie)
@@ -320,6 +320,8 @@ gtk_clipboard_get_for_display (GdkDispla
  *             been created, it is persistent and, since
  *             it is owned by GTK+, must not be freed or
  *             unrefd.
+ *
+ * Deprecated: 2.16: Use gtk_clipboard_get_for_display() instead.
  **/
 GtkClipboard *
 gtk_clipboard_get (GdkAtom selection)
Index: gtk/gtkclipboard.h
===================================================================
--- gtk/gtkclipboard.h	(Revision 21127)
+++ gtk/gtkclipboard.h	(Arbeitskopie)
@@ -72,8 +72,10 @@ GType         gtk_clipboard_get_type (vo
 GtkClipboard *gtk_clipboard_get_for_display (GdkDisplay   *display,
 					     GdkAtom       selection);
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GTK_DISABLE_DEPRECATED
 GtkClipboard *gtk_clipboard_get             (GdkAtom       selection);
 #endif
+#endif
 
 GdkDisplay   *gtk_clipboard_get_display     (GtkClipboard *clipboard);
 
Index: gtk/gtkplug.c
===================================================================
--- gtk/gtkplug.c	(Revision 21127)
+++ gtk/gtkplug.c	(Arbeitskopie)
@@ -436,6 +436,8 @@ _gtk_plug_remove_from_socket (GtkPlug   
  *
  * Finish the initialization of @plug for a given #GtkSocket identified by
  * @socket_id. This function will generally only be used by classes deriving from #GtkPlug.
+ *
+ * Deprecated: 2.16: Use gtk_plug_construct_for_display() instead.
  **/
 void
 gtk_plug_construct (GtkPlug         *plug,
@@ -501,6 +503,8 @@ gtk_plug_construct_for_display (GtkPlug 
  * can later be plugged into a #GtkSocket by  gtk_socket_add_id().
  * 
  * Return value: the new #GtkPlug widget.
+ *
+ * Deprecated: 2.16: Use gtk_plug_new_for_display() instead.
  **/
 GtkWidget*
 gtk_plug_new (GdkNativeWindow socket_id)
Index: gtk/gtkplug.h
===================================================================
--- gtk/gtkplug.h	(Revision 21127)
+++ gtk/gtkplug.h	(Arbeitskopie)
@@ -79,10 +79,12 @@ struct _GtkPlugClass
 GType      gtk_plug_get_type  (void) G_GNUC_CONST;
 
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GTK_DISABLE_DEPRECATED
 void       gtk_plug_construct (GtkPlug         *plug,
 			       GdkNativeWindow  socket_id);
 GtkWidget* gtk_plug_new       (GdkNativeWindow  socket_id);
 #endif
+#endif
 
 void       gtk_plug_construct_for_display (GtkPlug         *plug,
 					   GdkDisplay      *display,
