diff --git a/examples/enroll.c b/examples/enroll.c
index 24c13db..159ffbc 100644
--- a/examples/enroll.c
+++ b/examples/enroll.c
@@ -40,18 +40,6 @@ enroll_data_free (EnrollData *enroll_data)
 }
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (EnrollData, enroll_data_free)
 
-FpDevice *discover_device (GPtrArray * devices)
-{
-  FpDevice *dev;
-
-  if (!devices->len)
-    return NULL;
-
-  dev = g_ptr_array_index (devices, 0);
-  printf ("Found device claimed by %s driver\n", fp_device_get_driver (dev));
-  return dev;
-}
-
 static void
 on_device_closed (FpDevice *dev, GAsyncResult *res, void *user_data)
 {
diff --git a/examples/manage-prints.c b/examples/manage-prints.c
index ba72467..b865af7 100644
--- a/examples/manage-prints.c
+++ b/examples/manage-prints.c
@@ -40,18 +40,6 @@ list_data_free (ListData *list_data)
 }
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ListData, list_data_free)
 
-FpDevice *discover_device (GPtrArray * devices)
-{
-  FpDevice *dev;
-
-  if (!devices->len)
-    return NULL;
-
-  dev = g_ptr_array_index (devices, 0);
-  g_print ("Found device claimed by %s driver\n", fp_device_get_driver (dev));
-  return dev;
-}
-
 static void
 on_device_closed (FpDevice     *dev,
                   GAsyncResult *res,
diff --git a/examples/utilities.c b/examples/utilities.c
index bae2389..70f57b2 100644
--- a/examples/utilities.c
+++ b/examples/utilities.c
@@ -23,6 +23,21 @@
 
 #include "utilities.h"
 
+FpDevice *
+discover_device (GPtrArray * devices)
+{
+  FpDevice *dev;
+
+  if (!devices->len)
+    return NULL;
+
+  dev = g_ptr_array_index (devices, 0);
+  g_print ("Found device %s (%s) claimed by %s driver\n",
+           fp_device_get_device_id (dev), fp_device_get_name (dev),
+           fp_device_get_driver (dev));
+  return dev;
+}
+
 const char *
 finger_to_string (FpFinger finger)
 {
@@ -81,7 +96,7 @@ finger_chooser (void)
   };
 
   for (i = all_fingers[0]; i <= G_N_ELEMENTS (all_fingers); ++i)
-    g_print("  [%d] %s\n", (i - all_fingers[0]), finger_to_string (i));
+    g_print ("  [%d] %s\n", (i - all_fingers[0]), finger_to_string (i));
 
   g_print ("> ");
   if (!scanf ("%d%*c", &i))
diff --git a/examples/utilities.h b/examples/utilities.h
index ea2871a..7e436ac 100644
--- a/examples/utilities.h
+++ b/examples/utilities.h
@@ -21,6 +21,7 @@
 #ifndef __UTILITIES_H
 #define __UTILITIES_H
 
+FpDevice * discover_device (GPtrArray *devices);
 FpFinger finger_chooser (void);
 const char * finger_to_string (FpFinger finger);
 
diff --git a/examples/verify.c b/examples/verify.c
index 82673b1..89a9b2c 100644
--- a/examples/verify.c
+++ b/examples/verify.c
@@ -40,18 +40,6 @@ verify_data_free (VerifyData *verify_data)
 }
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (VerifyData, verify_data_free)
 
-FpDevice *discover_device (GPtrArray * devices)
-{
-  FpDevice *dev;
-
-  if (!devices->len)
-    return NULL;
-
-  dev = g_ptr_array_index (devices, 0);
-  printf ("Found device claimed by %s driver\n", fp_device_get_driver (dev));
-  return dev;
-}
-
 static void
 on_device_closed (FpDevice *dev, GAsyncResult *res, void *user_data)
 {