diff --git a/doc/config-reference/compute/section_compute-hypervisors.xml b/doc/config-reference/compute/section_compute-hypervisors.xml
index 4121914b3b..6263d8b477 100644
--- a/doc/config-reference/compute/section_compute-hypervisors.xml
+++ b/doc/config-reference/compute/section_compute-hypervisors.xml
@@ -113,13 +113,13 @@
             can be found in following sections.</para>
         <xi:include href="../../common/tables/nova-hypervisor.xml"/>
     </section>
-    <xi:include href="../../common/section_kvm.xml"/>
-    <xi:include href="../../common/section_qemu.xml"/>
+    <xi:include href="section_hypervisor_kvm.xml"/>
+    <xi:include href="section_hypervisor_qemu.xml"/>
     <xi:include href="section_introduction-to-xen.xml"/>
-    <xi:include href="../../common/section_lxc.xml"/>
-    <xi:include href="../../common/section_vmware.xml"/>
-    <xi:include href="../../common/section_powervm.xml"/>
-    <xi:include href="../../common/section_hyper-v.xml"/>
-    <xi:include href="../../common/section_baremetal.xml"/>
-    <xi:include href="../../common/section_docker.xml"/>
+    <xi:include href="section_hypervisor_lxc.xml"/>
+    <xi:include href="section_hypervisor_vmware.xml"/>
+    <xi:include href="section_hypervisor_powervm.xml"/>
+    <xi:include href="section_hypervisor_hyper-v.xml"/>
+    <xi:include href="section_hypervisor_baremetal.xml"/>
+    <xi:include href="section_hypervisor_docker.xml"/>
 </section>
diff --git a/doc/common/section_baremetal.xml b/doc/config-reference/compute/section_hypervisor_baremetal.xml
similarity index 97%
rename from doc/common/section_baremetal.xml
rename to doc/config-reference/compute/section_hypervisor_baremetal.xml
index 2b0a362586..3e428e6523 100644
--- a/doc/common/section_baremetal.xml
+++ b/doc/config-reference/compute/section_hypervisor_baremetal.xml
@@ -45,5 +45,5 @@ reserved_host_memory_mb=0</programlisting>
             xlink:href="https://wiki.openstack.org/wiki/Baremetal">
             main wiki page</link> for details and implementation suggestions.
     </para>
-<xi:include href="tables/nova-baremetal.xml"/>
+<xi:include href="../../common/tables/nova-baremetal.xml"/>
 </section>
diff --git a/doc/common/section_docker.xml b/doc/config-reference/compute/section_hypervisor_docker.xml
similarity index 97%
rename from doc/common/section_docker.xml
rename to doc/config-reference/compute/section_hypervisor_docker.xml
index fcf7bf2630..1bca9e5869 100644
--- a/doc/common/section_docker.xml
+++ b/doc/config-reference/compute/section_hypervisor_docker.xml
@@ -37,5 +37,5 @@ xml:id="docker">
     <para>Glance also needs to be configured to support the Docker container format, in
     <filename>/etc/glance-api.conf</filename>:
      <programlisting language="ini">container_formats = ami,ari,aki,bare,ovf,docker</programlisting></para>
-<xi:include href="tables/nova-docker.xml"/>
+<xi:include href="../../common/tables/nova-docker.xml"/>
 </section>
diff --git a/doc/common/section_hyper-v.xml b/doc/config-reference/compute/section_hypervisor_hyper-v.xml
similarity index 99%
rename from doc/common/section_hyper-v.xml
rename to doc/config-reference/compute/section_hypervisor_hyper-v.xml
index db5b528d94..59345c508f 100644
--- a/doc/common/section_hyper-v.xml
+++ b/doc/config-reference/compute/section_hypervisor_hyper-v.xml
@@ -344,7 +344,7 @@ volume_api_class=nova.volume.cinder.API
 [database]
 connection=mysql://nova:passwd@<replaceable>IP_ADDRESS</replaceable>/nova</programlisting>
     <para>The following table contains a reference of all optionsfor hyper-v</para>
-    <xi:include href="tables/nova-hyperv.xml"/>
+    <xi:include href="../../common/tables/nova-hyperv.xml"/>
     </section>
     <section xml:id="prepare-hyper-v-images">
         <title>Preparing Images for use with Hyper-V</title>
diff --git a/doc/common/section_kvm.xml b/doc/config-reference/compute/section_hypervisor_kvm.xml
similarity index 99%
rename from doc/common/section_kvm.xml
rename to doc/config-reference/compute/section_hypervisor_kvm.xml
index a90d87498c..95a5568556 100644
--- a/doc/common/section_kvm.xml
+++ b/doc/config-reference/compute/section_hypervisor_kvm.xml
@@ -86,7 +86,7 @@ libvirt_type=kvm</programlisting>
         </listitem>
     </itemizedlist>
 
-    <xi:include href="section_kvm_enable.xml"/>
+    <xi:include href="../../common/section_kvm_enable.xml"/>
 
     <section xml:id="libvirt-xml-cpu-model">
         <title>Specify the CPU model of KVM guests</title>
diff --git a/doc/common/section_lxc.xml b/doc/config-reference/compute/section_hypervisor_lxc.xml
similarity index 100%
rename from doc/common/section_lxc.xml
rename to doc/config-reference/compute/section_hypervisor_lxc.xml
diff --git a/doc/common/section_powervm.xml b/doc/config-reference/compute/section_hypervisor_powervm.xml
similarity index 97%
rename from doc/common/section_powervm.xml
rename to doc/config-reference/compute/section_hypervisor_powervm.xml
index 3412110fff..4bdaf5aa73 100644
--- a/doc/common/section_powervm.xml
+++ b/doc/config-reference/compute/section_hypervisor_powervm.xml
@@ -29,7 +29,7 @@ powervm_mgr_passwd=padmin_user_password
 powervm_img_remote_path=/path/to/remote/image/directory
 powervm_img_local_path=/path/to/local/image/directory/on/compute/host</programlisting>
     </para>
-   <xi:include href="tables/nova-powervm.xml"/>
+   <xi:include href="../../common/tables/nova-powervm.xml"/>
   </section>
   <section xml:id="powervm-limits">
     <title>Limitations</title>
diff --git a/doc/common/section_qemu.xml b/doc/config-reference/compute/section_hypervisor_qemu.xml
similarity index 100%
rename from doc/common/section_qemu.xml
rename to doc/config-reference/compute/section_hypervisor_qemu.xml
diff --git a/doc/common/section_vmware.xml b/doc/config-reference/compute/section_hypervisor_vmware.xml
similarity index 99%
rename from doc/common/section_vmware.xml
rename to doc/config-reference/compute/section_hypervisor_vmware.xml
index 310c9c8fac..193d9cec64 100644
--- a/doc/common/section_vmware.xml
+++ b/doc/config-reference/compute/section_hypervisor_vmware.xml
@@ -277,6 +277,6 @@ is_public=true --property vmware_adaptertype="ide" \
   </section>
   <section xml:id="VMWare_config">
     <title>Configuration Reference</title>
-    <xi:include href="tables/nova-vmware.xml"/>
+    <xi:include href="../../common/tables/nova-vmware.xml"/>
   </section>
 </section>