diff --git a/gtk/gtk.h b/gtk/gtk.h
index ed8d798..aaa0a8c 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -172,7 +172,6 @@
 #include <gtk/gtkstock.h>
 #include <gtk/gtkstyle.h>
 #include <gtk/gtktable.h>
-#include <gtk/gtktearoffmenuitem.h>
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktextbufferrichtext.h>
 #include <gtk/gtktextchild.h>
@@ -238,6 +237,7 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtktipsquery.h>
 #include <gtk/gtktooltips.h>
+#include <gtk/gtktearoffmenuitem.h>
 
 #undef __GTK_H_INSIDE__
 
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 0bdf1de..e580cb5 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -550,6 +550,13 @@ gtk_menu_class_init (GtkMenuClass *class)
 						        GTK_TYPE_WIDGET,
 						        GTK_PARAM_READWRITE));
 
+
+#ifndef GTK_DISABLE_DEPRECATED
+  /**
+   * GtkMenu:tearoff-title:
+   *
+   * Deprecated: 2.20
+   **/
   g_object_class_install_property (gobject_class,
                                    PROP_TEAROFF_TITLE,
                                    g_param_spec_string ("tearoff-title",
@@ -564,6 +571,7 @@ gtk_menu_class_init (GtkMenuClass *class)
    * A boolean that indicates whether the menu is torn-off.
    *
    * Since: 2.6
+   * Deprecated: 2.20
    **/
   g_object_class_install_property (gobject_class,
                                    PROP_TEAROFF_STATE,
@@ -572,6 +580,7 @@ gtk_menu_class_init (GtkMenuClass *class)
 							 P_("A boolean that indicates whether the menu is torn-off"),
 							 FALSE,
 							 GTK_PARAM_READWRITE));
+#endif /* GTK_DISABLE_DEPRECATED */
 
   /**
    * GtkMenu:monitor:
@@ -1983,7 +1992,12 @@ tearoff_window_destroyed (GtkWidget *widget,
   gtk_menu_set_tearoff_state (menu, FALSE);
 }
 
-void       
+/**
+ * gtk_menu_set_tearoff_state:
+ *
+ * Deprecated: 2.20
+ */
+void
 gtk_menu_set_tearoff_state (GtkMenu  *menu,
 			    gboolean  torn_off)
 {
@@ -2099,6 +2113,8 @@ gtk_menu_set_tearoff_state (GtkMenu  *menu,
  * gtk_menu_set_tearoff_state ().
  *
  * Return value: %TRUE if the menu is currently torn off.
+ *
+ * Deprecated: 2.20
  **/
 gboolean
 gtk_menu_get_tearoff_state (GtkMenu *menu)
diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index 694457a..0b872d5 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -173,9 +173,11 @@ void	   gtk_menu_detach		  (GtkMenu	       *menu);
  */
 GtkWidget* gtk_menu_get_attach_widget	  (GtkMenu	       *menu);
 
+#ifndef GTK_DISABLE_DEPRECATED
 void       gtk_menu_set_tearoff_state     (GtkMenu             *menu,
 					   gboolean             torn_off);
 gboolean   gtk_menu_get_tearoff_state     (GtkMenu             *menu);
+#endif /* GTK_DISABLE_DEPRECATED */
 
 /* This sets the window manager title for the window that
  * appears when a menu is torn off
diff --git a/gtk/gtktearoffmenuitem.h b/gtk/gtktearoffmenuitem.h
index a30b0ec..dfb74ef 100644
--- a/gtk/gtktearoffmenuitem.h
+++ b/gtk/gtktearoffmenuitem.h
@@ -24,6 +24,8 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef GTK_DISABLE_DEPRECATED
+
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
@@ -73,3 +75,5 @@ GtkWidget* gtk_tearoff_menu_item_new	      (void);
 G_END_DECLS
 
 #endif /* __GTK_TEAROFF_MENU_ITEM_H__ */
+
+#endif /* GTK_DISABLE_DEPRECATED */
