--- a/src/device.c
+++ b/src/device.c
@@ -47,6 +47,7 @@ static char *fingers[] = {
 	"right-little-finger"
 };
 
+extern struct storage store;
 extern DBusGConnection *fprintd_dbus_conn;
 
 static void fprint_device_claim(FprintDevice *rdev,
--- a/src/file_storage.c
+++ b/src/file_storage.c
@@ -44,6 +44,7 @@
 #define FP_FINGER_IS_VALID(finger) \
 	((finger) >= LEFT_THUMB && (finger) <= RIGHT_LITTLE)
 
+extern struct storage store;
 static char *get_path_to_storedir(uint16_t driver_id, uint32_t devtype, char *base_store)
 {
 	char idstr[5];
--- a/src/main.c
+++ b/src/main.c
@@ -34,6 +34,7 @@
 #include "storage.h"
 #include "file_storage.h"
 
+struct storage store;
 extern DBusGConnection *fprintd_dbus_conn;
 static gboolean no_timeout = FALSE;
 static gboolean g_fatal_warnings = FALSE;
--- a/src/storage.h
+++ b/src/storage.h
@@ -41,10 +41,7 @@ struct storage {
 	storage_discover_prints discover_prints;
 };
 
-typedef struct storage fp_storage;
-
-/* The currently setup store */
-fp_storage store;
+extern struct storage store;
 
 #endif