diff --git a/configure.ac b/configure.ac
index 6328975..4e54137 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,7 @@ fi
 PKG_PROG_PKG_CONFIG([0.20])
 
 PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 0.12.0)
+PKG_CHECK_MODULES([OSMOGB], [libosmogb])
 PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.12.0)
 PKG_CHECK_MODULES(OSMOVTY, libosmovty >= 0.12.0)
 PKG_CHECK_MODULES(OSMOCTRL, libosmoctrl >= 0.12.0)
diff --git a/src/Makefile.am b/src/Makefile.am
index 1c3a64a..a13295b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,9 +55,10 @@ gen_sabp.stamp: $(ASN1_ROOT)/sabp/SABP-PDU-Contents.asn $(ASN1TOSTRUCT)
 sabp_decoder.c sabp_encoder.c: gen_sabp.stamp
 
 
-AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include \
 	    $(OSMOCORE_CFLAGS) $(OSMOVTY_CFLAGS) $(OSMOCTRL_CFLAGS) $(OSMOGSM_CFLAGS) \
-	    $(OSMONETIF_CFLAGS) $(ASN1C_CFLAGS) $(OSMOSIGTRAN_CFLAGS)
+	    $(OSMONETIF_CFLAGS) $(ASN1C_CFLAGS) $(OSMOSIGTRAN_CFLAGS) $(OSMOGB_CFLAGS)
+AM_CFLAGS = -Wall
 
 # build the shared RANAP + SABP library
 #