diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h
index 0ec9b6f45..055b353dc 100644
--- a/openbsc/include/openbsc/gsm_data.h
+++ b/openbsc/include/openbsc/gsm_data.h
@@ -13,12 +13,10 @@
 #include <osmocom/gsm/gsm_utils.h>
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/gsm/rxlev_stat.h>
+#include <osmocom/gsm/sysinfo.h>
 
 #include <osmocom/gsm/protocol/gsm_08_58.h>
 
-#include <openbsc/system_information.h>
-#include <openbsc/rest_octets.h>
-
 struct osmo_msc_data;
 struct osmo_bsc_sccp_con;
 struct gsm_sms_queue;
@@ -110,6 +108,8 @@ enum gsm_lchan_state {
 
 #ifdef ROLE_BSC
 
+#include <openbsc/rest_octets.h>
+
 #define OBSC_NM_W_ACK_CB(__msgb) (__msgb)->cb[3]
 
 /* the data structure stored in msgb->cb for openbsc apps */