diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 3ffb6c25d7..42b43a9083 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -318,7 +318,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtktable.xml" />
       <xi:include href="xml/gtkexpander.xml" />
       <xi:include href="xml/gtkorientable.xml" />
-      <xi:include href="xml/gtkextendedlayout.xml" />
+      <xi:include href="xml/gtksizerequest.xml" />
     </chapter>
 
     <chapter id="Ornaments">
diff --git a/docs/reference/gtk/tmpl/gtkicontheme.sgml b/docs/reference/gtk/tmpl/gtkicontheme.sgml
index 07e52dc96f..e18a6ade09 100644
--- a/docs/reference/gtk/tmpl/gtkicontheme.sgml
+++ b/docs/reference/gtk/tmpl/gtkicontheme.sgml
@@ -19,7 +19,7 @@ their icons, but more additional application themes can be
 installed as operating system vendors and users choose.
 </para>
 <para>
-Named icons are similar to the <xref linkend="gtk-Themeable-Stock-Images"/>
+Named icons are similar to the <xref linkend="gtk3-Themeable-Stock-Images"/>
 facility, and the distinction between the two may be a bit confusing.
 A few things to keep in mind:
 </para>
@@ -27,7 +27,7 @@ A few things to keep in mind:
 <listitem>
 <para>
 Stock images usually are used in conjunction with
-<xref linkend="gtk-Stock-Items"/>., such as %GTK_STOCK_OK or
+<xref linkend="gtk3-Stock-Items"/>., such as %GTK_STOCK_OK or
 %GTK_STOCK_OPEN. Named icons are easier to set up and therefore
 are more useful for new icons that an application wants to
 add, such as application icons or window icons.
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index 13da499888..eb60306155 100644
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -110,7 +110,8 @@ struct _GtkImageGIconData
  * @GTK_IMAGE_PIXMAP: the widget contains a #GdkPixmap
  * @GTK_IMAGE_IMAGE: the widget contains a #GdkImage
  * @GTK_IMAGE_PIXBUF: the widget contains a #GdkPixbuf
- * @GTK_IMAGE_STOCK: the widget contains a stock icon name (see <xref linkend="gtk-Stock-Items"/>)
+ * @GTK_IMAGE_STOCK: the widget contains a stock icon name (see
+ *  <xref linkend="gtk3-Stock-Items"/>)
  * @GTK_IMAGE_ICON_SET: the widget contains a #GtkIconSet
  * @GTK_IMAGE_ANIMATION: the widget contains a #GdkPixbufAnimation
  * @GTK_IMAGE_ICON_NAME: the widget contains a named icon.
diff --git a/gtk/gtkstock.c b/gtk/gtkstock.c
index 2ba74ae2cc..21befac32a 100644
--- a/gtk/gtkstock.c
+++ b/gtk/gtkstock.c
@@ -51,7 +51,7 @@ Prebuilt common menu/toolbar items and corresponding icons
  * the user-visible label, keyboard accelerator, and translation domain
  * of the menu or toolbar item; and/or with an icon stored in a
  * #GtkIconFactory. See <link
- * linkend="gtk-Themeable-Stock-Images">GtkIconFactory</link> for
+ * linkend="gtk3-Themeable-Stock-Images">GtkIconFactory</link> for
  * more information on stock icons. The connection between a
  * #GtkStockItem and stock icons is purely conventional (by virtue of
  * using the same stock ID); it's possible to register a stock item but