Index: gdk/gdkevents.c
===================================================================
--- gdk/gdkevents.c	(Revision 21170)
+++ gdk/gdkevents.c	(Arbeitskopie)
@@ -1207,11 +1207,12 @@ gdk_display_set_double_click_time (GdkDi
  * gdk_set_double_click_time:
  * @msec: double click time in milliseconds (thousandths of a second)
  *
- * Set the double click time for the default display. See
- * gdk_display_set_double_click_time(). 
+ * Set the double click time for the default display.
  * See also gdk_display_set_double_click_distance().
- * Applications should <emphasis>not</emphasis> set this, it is a 
+ * Applications should <emphasis>not</emphasis> set this, this is a
  * global user-configured setting.
+ *
+ * Deprecated: 2.16: Use gdk_display_set_double_click_time() instead.
  **/
 void
 gdk_set_double_click_time (guint msec)
Index: gdk/gdkdisplay.c
===================================================================
--- gdk/gdkdisplay.c	(Revision 21170)
+++ gdk/gdkdisplay.c	(Arbeitskopie)
@@ -267,6 +267,8 @@ gdk_display_put_event (GdkDisplay     *d
  *
  * Ungrabs the pointer on the default display, if it is grabbed by this 
  * application.
+ *
+ * Deprecated: 2.16: Use gdk_display_pointer_ungrab() instead.
  **/
 void
 gdk_pointer_ungrab (guint32 time)
@@ -283,7 +285,9 @@ gdk_pointer_ungrab (guint32 time)
  * Note that this does not take the inmplicit pointer grab on button
  * presses into account.
 
- * Return value: %TRUE if the pointer is currently grabbed by this application.* 
+ * Return value: %TRUE if the pointer is currently grabbed by this application.
+ *
+ * Deprecated: 2.16: Use gdk_display_pointer_is_grabbed() instead.
  **/
 gboolean
 gdk_pointer_is_grabbed (void)
@@ -298,6 +302,8 @@ gdk_pointer_is_grabbed (void)
  * 
  * Ungrabs the keyboard on the default display, if it is grabbed by this 
  * application.
+ *
+ * Deprecated: 2.16: Use gdk_display_keyboard_ungrab() instead.
  **/
 void
 gdk_keyboard_ungrab (guint32 time)
@@ -309,6 +315,8 @@ gdk_keyboard_ungrab (guint32 time)
  * gdk_beep:
  * 
  * Emits a short beep on the default display.
+ *
+ * Deprecated: 2.16: Use gdk_display_beep() instead.
  **/
 void
 gdk_beep (void)
@@ -327,6 +335,8 @@ gdk_beep (void)
  * though the amount of data is limited to 20 bytes.
  * 
  * Return value: non-zero on success.
+ *
+ * Deprecated: 2.16: Use gdk_event_send_client_message_for_display() instead.
  **/
 gboolean
 gdk_event_send_client_message (GdkEvent        *event,
@@ -349,6 +359,8 @@ gdk_event_send_client_message (GdkEvent 
  * described in the Inter-Client Communication Conventions Manual (ICCCM).
  * If no windows are found with the WM_STATE property set, the message is sent
  * to all children of the root window.
+ *
+ * Deprecated: 2.16: Use gdk_screen_broadcast_client_message() instead.
  **/
 void
 gdk_event_send_clientmessage_toall (GdkEvent *event)
Index: gdk/gdkscreen.c
===================================================================
--- gdk/gdkscreen.c	(Revision 21170)
+++ gdk/gdkscreen.c	(Arbeitskopie)
@@ -342,6 +342,8 @@ gdk_screen_get_monitor_at_window (GdkScr
  * Returns the width of the default screen in pixels.
  * 
  * Return value: the width of the default screen in pixels.
+ *
+ * Deprecated: 2.16: Use gdk_screen_get_width() instead.
  **/
 gint
 gdk_screen_width (void)
@@ -355,6 +357,8 @@ gdk_screen_width (void)
  * Returns the height of the default screen in pixels.
  * 
  * Return value: the height of the default screen in pixels.
+ *
+ * Deprecated: 2.16: Use gdk_screen_get_height() instead.
  **/
 gint
 gdk_screen_height (void)
@@ -370,6 +374,8 @@ gdk_screen_height (void)
  * 
  * Return value: the width of the default screen in millimeters,
  * though it is not always correct.
+ *
+ * Deprecated: 2.16: Use gdk_screen_get_width_mm() instead.
  **/
 gint
 gdk_screen_width_mm (void)
@@ -385,6 +391,8 @@ gdk_screen_width_mm (void)
  * 
  * Return value: the height of the default screen in millimeters,
  * though it is not always correct.
+ *
+ * Deprecated: 2.16: Use gdk_screen_get_height_mm() instead.
  **/
 gint
 gdk_screen_height_mm (void)
Index: gdk/gdk.h
===================================================================
--- gdk/gdk.h	(Revision 21170)
+++ gdk/gdk.h	(Arbeitskopie)
@@ -130,6 +130,7 @@ gboolean gdk_keyboard_grab_info_libgtk_o
 					     gboolean   *owner_events);
 
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
 void          gdk_pointer_ungrab     (guint32       time_);
 void          gdk_keyboard_ungrab    (guint32       time_);
 gboolean      gdk_pointer_is_grabbed (void);
@@ -141,13 +142,15 @@ gint gdk_screen_width_mm  (void) G_GNUC_
 gint gdk_screen_height_mm (void) G_GNUC_CONST;
 
 void gdk_beep (void);
+#endif
 #endif /* GDK_MULTIHEAD_SAFE */
 
 void gdk_flush (void);
-
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
 void gdk_set_double_click_time             (guint       msec);
 #endif
+#endif
 
 /* Rectangle utilities
  */
@@ -173,10 +176,12 @@ gint       gdk_mbstowcs          (GdkWCh
 
 /* Miscellaneous */
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
 gboolean gdk_event_send_client_message      (GdkEvent       *event,
 					     GdkNativeWindow winid);
 void     gdk_event_send_clientmessage_toall (GdkEvent  *event);
 #endif
+#endif
 gboolean gdk_event_send_client_message_for_display (GdkDisplay *display,
 						    GdkEvent       *event,
 						    GdkNativeWindow winid);
Index: gdk/gdk.symbols
===================================================================
--- gdk/gdk.symbols	(Revision 21170)
+++ gdk/gdk.symbols	(Arbeitskopie)
@@ -78,11 +78,15 @@ gdk_pointer_grab_info_libgtk_only
 
 #if IN_HEADER(__GDK_H__)
 #if IN_FILE(__GDK_DISPLAY_C__)
+#ifndef GDK_DISABLE_DEPRECATED
 gdk_beep
+#endif
 gdk_set_pointer_hooks
+#ifndef GDK_DISABLE_DEPRECATED
 gdk_keyboard_ungrab
 gdk_pointer_is_grabbed
 gdk_pointer_ungrab
+#endif
 gdk_event_send_client_message
 gdk_event_send_clientmessage_toall
 #endif
@@ -122,9 +126,11 @@ gdk_rectangle_union
 
 #if IN_HEADER(__GDK_H__)
 #if IN_FILE(__GDK_EVENTS_C__)
+#ifndef GDK_DISABLE_DEPRECATED
 gdk_set_double_click_time
 #endif
 #endif
+#endif
 
 #if IN_HEADER(__GDK_H__)
 #if IN_FILE(__GDK_C__)
@@ -164,12 +170,14 @@ gdk_input_add_full
 
 #if IN_HEADER(__GDK_H__)
 #if IN_FILE(__GDK_SCREEN_C__)
+#ifndef GDK_DISABLE_DEPRECATED
 gdk_screen_width G_GNUC_CONST
 gdk_screen_width_mm G_GNUC_CONST
 gdk_screen_height G_GNUC_CONST
 gdk_screen_height_mm G_GNUC_CONST
 #endif
 #endif
+#endif
 
 #if IN_HEADER(__GDK_PROPERTY_H__)
 #if IN_FILE(__GDK_SELECTION_C__)
