diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index d9adc23a56..2771e3b1a8 100644
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/ecpg.sgml -->
 
-<chapter id="ecpg" xreflabel="ecpg">
+<chapter id="ecpg">
  <title><application>ECPG</application> &mdash; Embedded <acronym>SQL</acronym> in C</title>
 
  <indexterm zone="ecpg"><primary>embedded SQL</primary><secondary>in C</secondary></indexterm>
diff --git a/doc/src/sgml/geqo.sgml b/doc/src/sgml/geqo.sgml
index 13fcf233bb..39d2163d16 100644
--- a/doc/src/sgml/geqo.sgml
+++ b/doc/src/sgml/geqo.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/geqo.sgml -->
 
- <chapter id="geqo" xreflabel="geqo">
+ <chapter id="geqo">
   <title>Genetic Query Optimizer</title>
 
   <para>
diff --git a/doc/src/sgml/gin.sgml b/doc/src/sgml/gin.sgml
index b4f6abae12..0182b44585 100644
--- a/doc/src/sgml/gin.sgml
+++ b/doc/src/sgml/gin.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/gin.sgml -->
 
-<chapter id="gin" xreflabel="gin">
+<chapter id="gin">
 <title>GIN Indexes</title>
 
    <indexterm>
diff --git a/doc/src/sgml/gist.sgml b/doc/src/sgml/gist.sgml
index 60d77411e0..a7eec1e949 100644
--- a/doc/src/sgml/gist.sgml
+++ b/doc/src/sgml/gist.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/gist.sgml -->
 
-<chapter id="gist" xreflabel="gist">
+<chapter id="gist">
 <title>GiST Indexes</title>
 
    <indexterm>
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 19e1979144..dfc292872a 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/libpq.sgml -->
 
-<chapter id="libpq" xreflabel="libpq">
+<chapter id="libpq">
  <title><application>libpq</application> &mdash; C Library</title>
 
  <indexterm zone="libpq">
diff --git a/doc/src/sgml/maintenance.sgml b/doc/src/sgml/maintenance.sgml
index 54bc1abd84..39075ea8f3 100644
--- a/doc/src/sgml/maintenance.sgml
+++ b/doc/src/sgml/maintenance.sgml
@@ -707,7 +707,7 @@ HINT:  Stop the postmaster and vacuum that database in single-user mode.
    </sect3>
   </sect2>
 
-  <sect2 id="autovacuum" xreflabel="autovacuum">
+  <sect2 id="autovacuum">
    <title>The Autovacuum Daemon</title>
 
    <indexterm>
diff --git a/doc/src/sgml/plperl.sgml b/doc/src/sgml/plperl.sgml
index 1a9768316d..033ed6960c 100644
--- a/doc/src/sgml/plperl.sgml
+++ b/doc/src/sgml/plperl.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/plperl.sgml -->
 
- <chapter id="plperl" xreflabel="PL/Perl">
+ <chapter id="plperl">
   <title>PL/Perl &mdash; Perl Procedural Language</title>
 
   <indexterm zone="plperl">
diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml
index 71e5400422..05d2705604 100644
--- a/doc/src/sgml/plpgsql.sgml
+++ b/doc/src/sgml/plpgsql.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/plpgsql.sgml -->
 
-<chapter id="plpgsql" xreflabel="PL/pgSQL">
+<chapter id="plpgsql">
   <title><application>PL/pgSQL</application> &mdash; <acronym>SQL</acronym> Procedural Language</title>
 
  <indexterm zone="plpgsql">
diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
index facc3a93e2..1921915b17 100644
--- a/doc/src/sgml/plpython.sgml
+++ b/doc/src/sgml/plpython.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/plpython.sgml -->
 
-<chapter id="plpython" xreflabel="PL/Python">
+<chapter id="plpython">
  <title>PL/Python &mdash; Python Procedural Language</title>
 
  <indexterm zone="plpython"><primary>PL/Python</primary></indexterm>
diff --git a/doc/src/sgml/spgist.sgml b/doc/src/sgml/spgist.sgml
index edf4a67e52..0e04a08679 100644
--- a/doc/src/sgml/spgist.sgml
+++ b/doc/src/sgml/spgist.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/spgist.sgml -->
 
-<chapter id="spgist" xreflabel="SP-GiST">
+<chapter id="spgist">
 <title>SP-GiST Indexes</title>
 
    <indexterm>
diff --git a/doc/src/sgml/spi.sgml b/doc/src/sgml/spi.sgml
index 3b2a614929..3199141b52 100644
--- a/doc/src/sgml/spi.sgml
+++ b/doc/src/sgml/spi.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/spi.sgml -->
 
-<chapter id="spi" xreflabel="spi">
+<chapter id="spi">
  <title>Server Programming Interface</title>
 
  <indexterm zone="spi">
diff --git a/doc/src/sgml/storage.sgml b/doc/src/sgml/storage.sgml
index ea08d0b614..3234adb639 100644
--- a/doc/src/sgml/storage.sgml
+++ b/doc/src/sgml/storage.sgml
@@ -301,7 +301,7 @@ where <replaceable>PPP</replaceable> is the PID of the owning backend and
 
 </sect1>
 
-<sect1 id="storage-toast" xreflabel="TOAST">
+<sect1 id="storage-toast">
 
 <title>TOAST</title>
 
diff --git a/doc/src/sgml/vacuumlo.sgml b/doc/src/sgml/vacuumlo.sgml
index e0dc748e09..26b764d54b 100644
--- a/doc/src/sgml/vacuumlo.sgml
+++ b/doc/src/sgml/vacuumlo.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/vacuumlo.sgml -->
 
-<refentry id="vacuumlo" xreflabel="vacuumlo">
+<refentry id="vacuumlo">
  <indexterm zone="vacuumlo">
   <primary>vacuumlo</primary>
  </indexterm>