diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 8d8f59ace9..f8e00b261f 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -5344,10 +5344,8 @@ gtk_window_get_default_size
 gtk_window_get_destroy_with_parent
 gtk_window_get_focus
 gtk_window_get_focus_on_map
-gtk_window_get_frame_dimensions
 gtk_window_get_gravity
 gtk_window_get_group
-gtk_window_get_has_frame
 gtk_window_get_icon
 gtk_window_get_icon_list
 gtk_window_get_icon_name
@@ -5410,10 +5408,14 @@ gtk_window_set_destroy_with_parent
 gtk_window_set_focus
 gtk_window_set_focus_on_map
 gtk_window_set_startup_id
-gtk_window_set_frame_dimensions
 gtk_window_set_geometry_hints
 gtk_window_set_gravity
+#ifndef GTK_DISABLE_DEPRECATED
+gtk_window_get_frame_dimensions
+gtk_window_set_frame_dimensions
+gtk_window_get_has_frame
 gtk_window_set_has_frame
+#endif
 gtk_window_set_icon
 #ifndef _WIN64
 gtk_window_set_icon_from_file PRIVATE
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index afa9249f7c..bd124537aa 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6658,6 +6658,7 @@ gtk_window_expose (GtkWidget      *widget,
  * windows, but it could conceivably be used by X-programs that
  * want to do their own window decorations.
  *
+ * Deprecated: 2.24: This function will be removed in GTK+ 3
  **/
 void
 gtk_window_set_has_frame (GtkWindow *window, 
@@ -6678,6 +6679,8 @@ gtk_window_set_has_frame (GtkWindow *window,
  *
  * Return value: %TRUE if a frame has been added to the window
  *   via gtk_window_set_has_frame().
+ *
+ * Deprecated: 2.24: This function will be removed in GTK+ 3
  **/
 gboolean
 gtk_window_get_has_frame (GtkWindow *window)
@@ -6702,6 +6705,8 @@ gtk_window_get_has_frame (GtkWindow *window)
  *
  * For windows with frames (see gtk_window_set_has_frame()) this function
  * can be used to change the size of the frame border.
+ *
+ * Deprecated: 2.24: This function will be removed in GTK+ 3
  **/
 void
 gtk_window_set_frame_dimensions (GtkWindow *window, 
@@ -7376,6 +7381,8 @@ gtk_window_begin_resize_drag  (GtkWindow    *window,
  * 
  * Retrieves the dimensions of the frame window for this toplevel.
  * See gtk_window_set_has_frame(), gtk_window_set_frame_dimensions().
+ *
+ * Deprecated: 2.24: This function will be removed in GTK+ 3
  **/
 void
 gtk_window_get_frame_dimensions (GtkWindow *window,
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 8c65f760be..1d54b2a739 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -256,7 +256,7 @@ gboolean   gtk_window_is_active                (GtkWindow           *window);
 gboolean   gtk_window_has_toplevel_focus       (GtkWindow           *window);
 
 
-
+#ifndef GTK_DISABLE_DEPRECATED
 /* gtk_window_set_has_frame () must be called before realizing the window_*/
 void       gtk_window_set_has_frame            (GtkWindow *window, 
 						gboolean   setting);
@@ -271,6 +271,7 @@ void       gtk_window_get_frame_dimensions     (GtkWindow *window,
 						gint      *top,
 						gint      *right,
 						gint      *bottom);
+#endif
 void       gtk_window_set_decorated            (GtkWindow *window,
                                                 gboolean   setting);
 gboolean   gtk_window_get_decorated            (GtkWindow *window);