diff --git a/libfprint/fpi-core.c b/libfprint/fpi-core.c
index 0a650c3..8009fe1 100644
--- a/libfprint/fpi-core.c
+++ b/libfprint/fpi-core.c
@@ -528,25 +528,6 @@ API_EXPORTED int fp_dev_supports_dscv_print(struct fp_dev *dev,
 		0, print->driver_id, print->devtype, 0);
 }
 
-libusb_device_handle *
-fpi_dev_get_usb_dev(struct fp_dev *dev)
-{
-	return dev->udev;
-}
-
-void
-fpi_dev_set_nr_enroll_stages(struct fp_dev *dev,
-	int nr_enroll_stages)
-{
-	dev->nr_enroll_stages = nr_enroll_stages;
-}
-
-struct fp_print_data *
-fpi_dev_get_verify_data(struct fp_dev *dev)
-{
-	return dev->verify_data;
-}
-
 /**
  * fp_driver_get_name:
  * @drv: the driver
diff --git a/libfprint/fpi-core.h b/libfprint/fpi-core.h
index 1c7b5d7..f350d46 100644
--- a/libfprint/fpi-core.h
+++ b/libfprint/fpi-core.h
@@ -20,7 +20,3 @@
 #include <libusb.h>
 #include <fprint.h>
 
-libusb_device_handle *fpi_dev_get_usb_dev(struct fp_dev *dev);
-void fpi_dev_set_nr_enroll_stages(struct fp_dev *dev,
-				  int nr_enroll_stages);
-struct fp_print_data *fpi_dev_get_verify_data(struct fp_dev *dev);
diff --git a/libfprint/fpi-dev.c b/libfprint/fpi-dev.c
index 59bffa9..f97ee61 100644
--- a/libfprint/fpi-dev.c
+++ b/libfprint/fpi-dev.c
@@ -96,3 +96,22 @@ FP_INSTANCE_DATA (struct fp_dev *dev)
 
 	return dev->instance_data;
 }
+
+libusb_device_handle *
+fpi_dev_get_usb_dev(struct fp_dev *dev)
+{
+	return dev->udev;
+}
+
+void
+fpi_dev_set_nr_enroll_stages(struct fp_dev *dev,
+	int nr_enroll_stages)
+{
+	dev->nr_enroll_stages = nr_enroll_stages;
+}
+
+struct fp_print_data *
+fpi_dev_get_verify_data(struct fp_dev *dev)
+{
+	return dev->verify_data;
+}
diff --git a/libfprint/fpi-dev.h b/libfprint/fpi-dev.h
index b9949ce..6c50956 100644
--- a/libfprint/fpi-dev.h
+++ b/libfprint/fpi-dev.h
@@ -20,6 +20,9 @@
 #ifndef __FPI_DEV_H__
 #define __FPI_DEV_H__
 
+#include <libusb.h>
+#include <fprint.h>
+
 struct fp_dev;
 
 /**
@@ -37,4 +40,9 @@ void                     fp_dev_set_instance_data (struct fp_dev *dev,
 						   void          *instance_data);
 void                    *FP_INSTANCE_DATA         (struct fp_dev *dev);
 
+libusb_device_handle *fpi_dev_get_usb_dev(struct fp_dev *dev);
+void fpi_dev_set_nr_enroll_stages(struct fp_dev *dev,
+				  int nr_enroll_stages);
+struct fp_print_data *fpi_dev_get_verify_data(struct fp_dev *dev);
+
 #endif