diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index 9f65b8beb1..9aa0343eef 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> - 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 fb96511846..5120dfbb42 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 8a4e7bb041..cc7cd1ed2c 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 858101eeef..beed6521eb 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 6675440922..ee3b4e7435 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> - C Library</title>
 
  <indexterm zone="libpq">
diff --git a/doc/src/sgml/maintenance.sgml b/doc/src/sgml/maintenance.sgml
index a062c5febf..f8b8ab40b6 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 cf424f8d02..967efba3b5 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 - Perl Procedural Language</title>
 
   <indexterm zone="plperl">
diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml
index 87aab8730a..95206ebfc1 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> - <acronym>SQL</acronym> Procedural Language</title>
 
  <indexterm zone="plpgsql">
diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
index 8dfa45c734..60a5907464 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 - 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 d12919cb80..d69e99b12e 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 c1185dc4f9..6f4f3bae6f 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 dad24662e7..ea9640f76d 100644
--- a/doc/src/sgml/storage.sgml
+++ b/doc/src/sgml/storage.sgml
@@ -293,7 +293,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 93aad00115..0b4dfc2b17 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>