diff --git a/doc/libfprint-docs.xml b/doc/libfprint-docs.xml
index a330beb..3ef995b 100644
--- a/doc/libfprint-docs.xml
+++ b/doc/libfprint-docs.xml
@@ -59,11 +59,6 @@
       <xi:include href="xml/fpi-assembling.xml"/>
     </chapter>
 
-    <chapter id="driver-hw-matching">
-      <title>Hardware print matching</title>
-      <xi:include href="xml/fpi-async.xml"/>
-      <xi:include href="xml/fpi-data.xml"/>
-    </chapter>
     <xi:include href="xml/fpi-usb.xml"/>
   </part>
 
diff --git a/doc/libfprint-sections.txt b/doc/libfprint-sections.txt
index 36b6573..b0c74fa 100644
--- a/doc/libfprint-sections.txt
+++ b/doc/libfprint-sections.txt
@@ -232,19 +232,6 @@ FpiImgDriverFlags
 fp_img_driver
 </SECTION>
 
-<SECTION>
-<INCLUDE>fpi-async.h</INCLUDE>
-<FILE>fpi-async</FILE>
-fpi_drvcb_close_complete
-fpi_drvcb_enroll_stage_completed
-fpi_drvcb_enroll_started
-fpi_drvcb_enroll_stopped
-fpi_drvcb_open_complete
-fpi_drvcb_report_verify_result
-fpi_drvcb_verify_started
-fpi_drvcb_verify_stopped
-</SECTION>
-
 <SECTION>
 <INCLUDE>fpi-img.h</INCLUDE>
 <FILE>fpi-img</FILE>
@@ -272,15 +259,6 @@ fpi_assemble_frames
 fpi_assemble_lines
 </SECTION>
 
-<SECTION>
-<INCLUDE>fpi-data.h</INCLUDE>
-<FILE>fpi-data</FILE>
-fp_print_data_item
-
-fpi_print_data_new
-fpi_print_data_item_new
-</SECTION>
-
 <SECTION>
 <INCLUDE>fpi-usb.h</INCLUDE>
 <FILE>fpi-usb</FILE>
diff --git a/doc/meson.build b/doc/meson.build
index 591cb8a..8324708 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -6,6 +6,8 @@ private_headers = [
   'aeslib.h',
   'assembling.h',
   'fp_internal.h',
+  'fpi-async.h',
+  'fpi-data.h',
 
   # Drivers
   'aes1660.h',
diff --git a/libfprint/drivers_api.h b/libfprint/drivers_api.h
index 647a208..7867e34 100644
--- a/libfprint/drivers_api.h
+++ b/libfprint/drivers_api.h
@@ -32,7 +32,6 @@
 #include "fpi-poll.h"
 #include "fpi-dev.h"
 #include "fpi-usb.h"
-#include "fpi-data.h"
 #include "fpi-img.h"
 #include "fpi-assembling.h"
 #include "drivers/driver_ids.h"
diff --git a/libfprint/fpi-async.c b/libfprint/fpi-async.c
index c367b4b..ddf5230 100644
--- a/libfprint/fpi-async.c
+++ b/libfprint/fpi-async.c
@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <glib.h>
 
-/**
+/*
  * SECTION:fpi-async
  * @title: Asynchronous operations reporting
  * @short_description: Asynchronous operations reporting functions
diff --git a/libfprint/fpi-data.c b/libfprint/fpi-data.c
index 0465b72..b2609ef 100644
--- a/libfprint/fpi-data.c
+++ b/libfprint/fpi-data.c
@@ -64,7 +64,7 @@ struct fpi_print_data_item_fp2 {
  * in any fashion that suits you.
  */
 
-/**
+/*
  * SECTION: fpi-data
  * @title: Stored prints creation
  * @short_description: Stored prints creation functions