Index: gdk/gdkdisplay.c
===================================================================
--- gdk/gdkdisplay.c	(Revision 21183)
+++ gdk/gdkdisplay.c	(Arbeitskopie)
@@ -606,11 +606,10 @@ singlehead_default_window_at_pointer  (G
  * is only useful for such low-level tools as an
  * event recorder. Applications should never have any
  * reason to use this facility.
- *
- * This function is not multihead safe. For multihead operation,
- * see gdk_display_set_pointer_hooks().
  * 
  * Return value: the previous pointer hook table
+ *
+ * Deprecated: 2.16: Use gdk_display_set_pointer_hooks() instead.
  **/
 GdkPointerHooks *
 gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks)
Index: gdk/gdk.symbols
===================================================================
--- gdk/gdk.symbols	(Revision 21183)
+++ gdk/gdk.symbols	(Arbeitskopie)
@@ -79,7 +79,9 @@ gdk_pointer_grab_info_libgtk_only
 #if IN_HEADER(__GDK_H__)
 #if IN_FILE(__GDK_DISPLAY_C__)
 gdk_beep
+#ifndef GDK_DISABLE_DEPRECATED
 gdk_set_pointer_hooks
+#endif
 gdk_keyboard_ungrab
 gdk_pointer_is_grabbed
 gdk_pointer_ungrab
@@ -683,7 +685,9 @@ gdk_window_clear_area_e
 gdk_window_constrain_size
 gdk_window_destroy
 gdk_window_end_paint
+#ifndef GDK_DISABLE_DEPRECATED
 gdk_window_foreign_new
+#endif
 gdk_window_freeze_toplevel_updates_libgtk_only
 gdk_window_freeze_updates
 gdk_window_get_children
@@ -693,7 +697,9 @@ gdk_window_get_pointer
 gdk_window_get_position
 gdk_window_get_state
 gdk_window_get_toplevel
+#ifndef GDK_DISABLE_DEPRECATED
 gdk_window_get_toplevels
+#endif
 gdk_window_get_update_area
 gdk_window_get_user_data
 gdk_window_get_window_type
@@ -727,9 +733,9 @@ gdk_window_register_dnd
 #if IN_FILE(__GDK_WINDOW_X11_C__)
 gdk_window_foreign_new_for_display
 gdk_window_focus
-gdk_window_lookup
 gdk_window_lookup_for_display
 #ifndef GDK_DISABLE_DEPRECATED
+gdk_window_lookup
 gdk_window_set_hints
 gdk_window_get_deskrelative_origin
 #endif
Index: gdk/gdkwindow.c
===================================================================
--- gdk/gdkwindow.c	(Revision 21183)
+++ gdk/gdkwindow.c	(Arbeitskopie)
@@ -945,6 +945,8 @@ gdk_screen_get_toplevel_windows (GdkScre
  * its elements need not be freed.
  * 
  * Return value: list of toplevel windows, free with g_list_free()
+ *
+ * Deprecated: 2.16: Use gdk_screen_get_toplevel_windows() instead.
  **/
 GList *
 gdk_window_get_toplevels (void)
@@ -3387,6 +3389,8 @@ gdk_get_default_root_window (void)
  * 
  * Return value: the newly-created #GdkWindow wrapper for the 
  *    native window or %NULL if the window has been destroyed.
+ *
+ * Deprecated: 2.16: Use gdk_window_foreign_new_for_display() instead.
  **/
 GdkWindow *
 gdk_window_foreign_new (GdkNativeWindow anid)
Index: gdk/gdkwindow.h
===================================================================
--- gdk/gdkwindow.h	(Revision 21183)
+++ gdk/gdkwindow.h	(Arbeitskopie)
@@ -447,9 +447,11 @@ gboolean gdk_window_set_static_gravities
 
 /* Functions to create/lookup windows from their native equivalents */ 
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
 GdkWindow*    gdk_window_foreign_new (GdkNativeWindow anid);
 GdkWindow*    gdk_window_lookup      (GdkNativeWindow anid);
 #endif
+#endif
 GdkWindow    *gdk_window_foreign_new_for_display (GdkDisplay      *display,
 						  GdkNativeWindow  anid);
 GdkWindow*    gdk_window_lookup_for_display (GdkDisplay      *display,
@@ -566,8 +568,10 @@ gboolean      gdk_window_get_decorations
 void	      gdk_window_set_functions	 (GdkWindow	  *window,
 					  GdkWMFunction	   functions);
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
 GList *       gdk_window_get_toplevels   (void);
 #endif
+#endif
 
 void          gdk_window_beep            (GdkWindow       *window);
 void          gdk_window_iconify         (GdkWindow       *window);
@@ -640,7 +644,9 @@ void gdk_window_enable_synchronized_conf
 void gdk_window_configure_finished            (GdkWindow *window);
 
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
 GdkPointerHooks *gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks);   
+#endif
 #endif /* GDK_MULTIHEAD_SAFE */
 
 GdkWindow *gdk_get_default_root_window (void);
Index: gdk/x11/gdkwindow-x11.c
===================================================================
--- gdk/x11/gdkwindow-x11.c	(Revision 21183)
+++ gdk/x11/gdkwindow-x11.c	(Arbeitskopie)
@@ -1097,6 +1097,8 @@ gdk_window_lookup_for_display (GdkDispla
  *
  * Return value: the #GdkWindow wrapper for the native window, 
  *    or %NULL if there is none.
+ *
+ * Deprecated: 2.16: Use gdk_window_lookup_for_display() instead.
  **/
 GdkWindow *
 gdk_window_lookup (GdkNativeWindow anid)
