diff --git a/openbsc/include/openbsc/db.h b/openbsc/include/openbsc/db.h
index b028a40c9..8bf361fc8 100644
--- a/openbsc/include/openbsc/db.h
+++ b/openbsc/include/openbsc/db.h
@@ -23,7 +23,14 @@
 
 #include <sys/types.h>
 
-#include <openbsc/gsm_subscriber.h>
+struct gsm_equipment;
+struct gsm_network;
+struct gsm_auth_info;
+struct gsm_auth_tuple;
+struct gsm_sms;
+struct gsm_subscriber;
+
+enum gsm_subscriber_field;
 
 /* one time initialisation */
 int db_init(const char *name);
diff --git a/openbsc/src/db.c b/openbsc/src/db.c
index 12422fa83..d67208193 100644
--- a/openbsc/src/db.c
+++ b/openbsc/src/db.c
@@ -30,6 +30,7 @@
 #include <dbi/dbi.h>
 
 #include <openbsc/gsm_data.h>
+#include <openbsc/gsm_subscriber.h>
 #include <openbsc/gsm_04_11.h>
 #include <openbsc/db.h>
 #include <openbsc/debug.h>
diff --git a/openbsc/tests/db/db_test.c b/openbsc/tests/db/db_test.c
index f168acb64..c14dd664d 100644
--- a/openbsc/tests/db/db_test.c
+++ b/openbsc/tests/db/db_test.c
@@ -19,6 +19,7 @@
  */
 
 #include <openbsc/db.h>
+#include <openbsc/gsm_subscriber.h>
 
 #include <stdio.h>
 #include <string.h>