diff --git a/libfprint/drivers/aeslib.c b/libfprint/drivers/aeslib.c
index 32725406..9942f9e0 100644
--- a/libfprint/drivers/aeslib.c
+++ b/libfprint/drivers/aeslib.c
@@ -27,7 +27,7 @@
 #include <glib.h>
 
 #include "fpi-usb.h"
-#include "assembling.h"
+#include "fpi-assembling.h"
 #include "aeslib.h"
 
 #define MAX_REGWRITES_PER_REQUEST	16
diff --git a/libfprint/drivers_api.h b/libfprint/drivers_api.h
index 4df20601..f65defd5 100644
--- a/libfprint/drivers_api.h
+++ b/libfprint/drivers_api.h
@@ -36,7 +36,7 @@
 #include "fpi-usb.h"
 #include "fpi-data.h"
 #include "fpi-img.h"
-#include "assembling.h"
+#include "fpi-assembling.h"
 #include "drivers/driver_ids.h"
 
 libusb_device_handle *fpi_dev_get_usb_dev(struct fp_dev *dev);
diff --git a/libfprint/assembling.c b/libfprint/fpi-assembling.c
similarity index 99%
rename from libfprint/assembling.c
rename to libfprint/fpi-assembling.c
index 7ff941c5..c192c8fa 100644
--- a/libfprint/assembling.c
+++ b/libfprint/fpi-assembling.c
@@ -29,7 +29,7 @@
 #include <libusb.h>
 #include <glib.h>
 
-#include "assembling.h"
+#include "fpi-assembling.h"
 
 static unsigned int calc_error(struct fpi_frame_asmbl_ctx *ctx,
 			       struct fpi_frame *first_frame,
diff --git a/libfprint/assembling.h b/libfprint/fpi-assembling.h
similarity index 93%
rename from libfprint/assembling.h
rename to libfprint/fpi-assembling.h
index 5c1c9988..c0e2b09d 100644
--- a/libfprint/assembling.h
+++ b/libfprint/fpi-assembling.h
@@ -1,6 +1,4 @@
 /*
- * Image assembling routines
- * Shared functions between libfprint Authentec drivers
  * Copyright (C) 2007 Daniel Drake <dsd@gentoo.org>
  * Copyright (C) 2015 Vasily Khoruzhick <anarsoul@gmail.com>
  *
@@ -19,8 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef __ASSEMBLING_H__
-#define __ASSEMBLING_H__
+#ifndef __FPI_ASSEMBLING_H__
+#define __FPI_ASSEMBLING_H__
 
 #include <fprint.h>
 
diff --git a/libfprint/meson.build b/libfprint/meson.build
index 46ee9178..f00d005b 100644
--- a/libfprint/meson.build
+++ b/libfprint/meson.build
@@ -4,6 +4,8 @@ libfprint_sources = [
     'fpi-async.c',
     'fpi-async.h',
     'core.c',
+    'fpi-assembling.c',
+    'fpi-assembling.h',
     'fpi-data.c',
     'fpi-data.h',
     'fpi-dev.c',
@@ -19,8 +21,6 @@ libfprint_sources = [
     'fpi-usb.h',
     'fpi-usb.c',
     'imgdev.c',
-    'assembling.c',
-    'assembling.h',
     'drivers/driver_ids.h',
 ]