diff --git a/libfprint/drivers/aes1610.c b/libfprint/drivers/aes1610.c
index bf17c71..0a52194 100644
--- a/libfprint/drivers/aes1610.c
+++ b/libfprint/drivers/aes1610.c
@@ -25,7 +25,7 @@
 
 #define FP_COMPONENT "aes1610"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 #include "aeslib.h"
 
 static void start_capture(struct fp_img_dev *dev);
diff --git a/libfprint/drivers/aes1660.c b/libfprint/drivers/aes1660.c
index a4d0853..e2aeeff 100644
--- a/libfprint/drivers/aes1660.c
+++ b/libfprint/drivers/aes1660.c
@@ -19,7 +19,7 @@
 
 #define FP_COMPONENT "aes1660"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 #include "aeslib.h"
 #include "aesx660.h"
 #include "aes1660.h"
diff --git a/libfprint/drivers/aes2501.c b/libfprint/drivers/aes2501.c
index 27429b9..ab5eaa5 100644
--- a/libfprint/drivers/aes2501.c
+++ b/libfprint/drivers/aes2501.c
@@ -23,7 +23,7 @@
 
 #define FP_COMPONENT "aes2501"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 #include "aeslib.h"
 #include "aes2501.h"
 
diff --git a/libfprint/drivers/aes2550.c b/libfprint/drivers/aes2550.c
index da2134c..0e97f01 100644
--- a/libfprint/drivers/aes2550.c
+++ b/libfprint/drivers/aes2550.c
@@ -23,7 +23,7 @@
 
 #define FP_COMPONENT "aes2550"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 #include "aes2550.h"
 #include "aeslib.h"
 
diff --git a/libfprint/drivers/aes2660.c b/libfprint/drivers/aes2660.c
index 1fe9334..7979d7a 100644
--- a/libfprint/drivers/aes2660.c
+++ b/libfprint/drivers/aes2660.c
@@ -19,7 +19,7 @@
 
 #define FP_COMPONENT "aes2660"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 #include "aeslib.h"
 #include "aesx660.h"
 #include "aes2660.h"
diff --git a/libfprint/drivers/aes3500.c b/libfprint/drivers/aes3500.c
index ca30b30..8a16ebf 100644
--- a/libfprint/drivers/aes3500.c
+++ b/libfprint/drivers/aes3500.c
@@ -29,7 +29,7 @@
 
 #define FP_COMPONENT "aes3500"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 #include "aeslib.h"
 #include "aes3k.h"
 
diff --git a/libfprint/drivers/aes3k.c b/libfprint/drivers/aes3k.c
index 620e8d6..8f384fe 100644
--- a/libfprint/drivers/aes3k.c
+++ b/libfprint/drivers/aes3k.c
@@ -36,7 +36,7 @@
 
 #define FP_COMPONENT "aes3k"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 #include "aeslib.h"
 #include "aes3k.h"
 
diff --git a/libfprint/drivers/aes4000.c b/libfprint/drivers/aes4000.c
index 9b6b277..3a8beba 100644
--- a/libfprint/drivers/aes4000.c
+++ b/libfprint/drivers/aes4000.c
@@ -26,7 +26,7 @@
 
 #define FP_COMPONENT "aes4000"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 #include "aeslib.h"
 #include "aes3k.h"
 
diff --git a/libfprint/drivers/aesx660.c b/libfprint/drivers/aesx660.c
index 5a81403..0e26fb8 100644
--- a/libfprint/drivers/aesx660.c
+++ b/libfprint/drivers/aesx660.c
@@ -23,7 +23,7 @@
 
 #define FP_COMPONENT "aesX660"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 #include "aeslib.h"
 #include "aesx660.h"
 
diff --git a/libfprint/drivers/elan.c b/libfprint/drivers/elan.c
index 2b31289..90df7e6 100644
--- a/libfprint/drivers/elan.c
+++ b/libfprint/drivers/elan.c
@@ -20,7 +20,7 @@
 
 #define FP_COMPONENT "elan"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 #include "elan.h"
 
 unsigned char elan_get_pixel(struct fpi_frame_asmbl_ctx *ctx,
diff --git a/libfprint/drivers/etes603.c b/libfprint/drivers/etes603.c
index 776ad9a..22da109 100644
--- a/libfprint/drivers/etes603.c
+++ b/libfprint/drivers/etes603.c
@@ -35,7 +35,7 @@
 
 #define FP_COMPONENT "etes603"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 #include "driver_ids.h"
 
 /* libusb defines */
diff --git a/libfprint/drivers/fdu2000.c b/libfprint/drivers/fdu2000.c
index 015e4e4..867cfed 100644
--- a/libfprint/drivers/fdu2000.c
+++ b/libfprint/drivers/fdu2000.c
@@ -19,7 +19,7 @@
 
 #define FP_COMPONENT "fdu2000"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 
 #ifndef HAVE_MEMMEM
 gpointer
diff --git a/libfprint/drivers/upeksonly.c b/libfprint/drivers/upeksonly.c
index 6e18e23..209f788 100644
--- a/libfprint/drivers/upeksonly.c
+++ b/libfprint/drivers/upeksonly.c
@@ -25,7 +25,7 @@
 
 #define FP_COMPONENT "upeksonly"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 #include "upeksonly.h"
 
 #define CTRL_TIMEOUT	1000
diff --git a/libfprint/drivers/upektc.c b/libfprint/drivers/upektc.c
index d8ccf5b..0d78fa6 100644
--- a/libfprint/drivers/upektc.c
+++ b/libfprint/drivers/upektc.c
@@ -20,7 +20,7 @@
 
 #define FP_COMPONENT "upektc"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 #include "upektc.h"
 
 #define UPEKTC_EP_IN (2 | LIBUSB_ENDPOINT_IN)
diff --git a/libfprint/drivers/upektc_img.c b/libfprint/drivers/upektc_img.c
index f637156..1ddb159 100644
--- a/libfprint/drivers/upektc_img.c
+++ b/libfprint/drivers/upektc_img.c
@@ -19,7 +19,7 @@
 
 #define FP_COMPONENT "upektc_img"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 #include "aeslib.h"
 #include "upektc_img.h"
 
diff --git a/libfprint/drivers/upekts.c b/libfprint/drivers/upekts.c
index 6f74d75..9dbfe12 100644
--- a/libfprint/drivers/upekts.c
+++ b/libfprint/drivers/upekts.c
@@ -27,7 +27,7 @@
 
 #define FP_COMPONENT "upekts"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 
 #define EP_IN (1 | LIBUSB_ENDPOINT_IN)
 #define EP_OUT (2 | LIBUSB_ENDPOINT_OUT)
diff --git a/libfprint/drivers/uru4000.c b/libfprint/drivers/uru4000.c
index 3c00218..dfa945d 100644
--- a/libfprint/drivers/uru4000.c
+++ b/libfprint/drivers/uru4000.c
@@ -23,7 +23,7 @@
 #include <nss.h>
 #include <pk11pub.h>
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 
 #define EP_INTR			(1 | LIBUSB_ENDPOINT_IN)
 #define EP_DATA			(2 | LIBUSB_ENDPOINT_IN)
diff --git a/libfprint/drivers/vcom5s.c b/libfprint/drivers/vcom5s.c
index eda67c9..02e57e3 100644
--- a/libfprint/drivers/vcom5s.c
+++ b/libfprint/drivers/vcom5s.c
@@ -19,7 +19,7 @@
 
 #define FP_COMPONENT "vcom5s"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 
 /* TODO:
  * calibration?
diff --git a/libfprint/drivers/vfs0050.c b/libfprint/drivers/vfs0050.c
index 003b1b3..e6d3915 100644
--- a/libfprint/drivers/vfs0050.c
+++ b/libfprint/drivers/vfs0050.c
@@ -19,7 +19,7 @@
 
 #define FP_COMPONENT "vfs0050"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 #include "vfs0050.h"
 
 /* USB functions */
diff --git a/libfprint/drivers/vfs101.c b/libfprint/drivers/vfs101.c
index 98807ee..7c39a64 100644
--- a/libfprint/drivers/vfs101.c
+++ b/libfprint/drivers/vfs101.c
@@ -19,7 +19,7 @@
 
 #define FP_COMPONENT "vfs101"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 
 /* Input-Output usb endpoint */
 #define EP_IN(n)	(n | LIBUSB_ENDPOINT_IN)
diff --git a/libfprint/drivers/vfs301.c b/libfprint/drivers/vfs301.c
index 1c1b8d4..6be8a6f 100644
--- a/libfprint/drivers/vfs301.c
+++ b/libfprint/drivers/vfs301.c
@@ -21,7 +21,7 @@
 
 #define FP_COMPONENT "vfs301"
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 #include "vfs301_proto.h"
 
 /************************** GENERIC STUFF *************************************/
diff --git a/libfprint/drivers/vfs5011.c b/libfprint/drivers/vfs5011.c
index ce19fa3..be66137 100644
--- a/libfprint/drivers/vfs5011.c
+++ b/libfprint/drivers/vfs5011.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "fp_internal.h"
+#include "drivers_api.h"
 #include "vfs5011_proto.h"
 
 /* =================== sync/async USB transfer sequence ==================== */