diff --git a/state/db.h b/state/db.h
index e6ca089a0..50536e271 100644
--- a/state/db.h
+++ b/state/db.h
@@ -20,4 +20,13 @@ void db_attach(db_handle *db, event_loop *loop);
 /* Disconnect from the global system store. */
 void db_disconnect(db_handle *db);
 
+/**
+ * Returns the client ID, according to the database.
+ *
+ * @param db The handle to the database.
+ * @returns int The client ID for this connection to the database. If
+ *          this client has no connection to the database, returns -1.
+ */
+int get_client_id(db_handle *db);
+
 #endif
diff --git a/state/redis.h b/state/redis.h
index a3e0555e7..cf368b992 100644
--- a/state/redis.h
+++ b/state/redis.h
@@ -65,13 +65,4 @@ void object_table_lookup_callback(redisAsyncContext *c,
                                   void *r,
                                   void *privdata);
 
-/**
- * Returns the client ID, according to Redis.
- *
- * @param db The handle to the Redis database.
- * @returns int The client ID for this connection to Redis. If
- *          this client has no connection to Redis, returns -1.
- */
-int get_client_id(db_handle *db);
-
 #endif