diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am
index 02c8878..59136bd 100644
--- a/openbsc/src/gprs/Makefile.am
+++ b/openbsc/src/gprs/Makefile.am
@@ -28,10 +28,12 @@
 
 OSMO_LIBS = \
 	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOABIS_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOVTY_LIBS) \
 	$(LIBOSMOCTRL_LIBS) \
 	$(LIBOSMOGB_LIBS) \
+	$(LIBGTP_LIBS) \
 	$(NULL)
 
 bin_PROGRAMS = \
@@ -121,6 +123,6 @@
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOVTY_LIBS) \
 	$(LIBCARES_LIBS) \
+	$(LIBGTP_LIBS) \
 	-lrt \
-	-lgtp \
 	$(NULL)
diff --git a/openbsc/tests/gtphub/Makefile.am b/openbsc/tests/gtphub/Makefile.am
index 137924d..5c834b7 100644
--- a/openbsc/tests/gtphub/Makefile.am
+++ b/openbsc/tests/gtphub/Makefile.am
@@ -7,6 +7,8 @@
 	-Wall \
 	-ggdb3 \
 	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBGTP_CFLAGS) \
 	$(NULL)
 
 EXTRA_DIST = \
@@ -35,6 +37,6 @@
 	$(top_builddir)/src/gprs/gtphub.o \
 	$(top_builddir)/src/gprs/gprs_utils.o \
 	$(LIBOSMOCORE_LIBS) \
-	-lgtp \
+	$(LIBGTP_LIBS) \
 	-lrt \
 	$(NULL)
diff --git a/openbsc/tests/mm_auth/Makefile.am b/openbsc/tests/mm_auth/Makefile.am
index 7eb14fa..cb35198 100644
--- a/openbsc/tests/mm_auth/Makefile.am
+++ b/openbsc/tests/mm_auth/Makefile.am
@@ -6,6 +6,7 @@
 AM_CFLAGS = \
 	-Wall \
 	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
 	$(LIBCRYPTO_CFLAGS) \
 	$(NULL)
diff --git a/openbsc/tests/sgsn/Makefile.am b/openbsc/tests/sgsn/Makefile.am
index 6371707..d148c48 100644
--- a/openbsc/tests/sgsn/Makefile.am
+++ b/openbsc/tests/sgsn/Makefile.am
@@ -7,6 +7,7 @@
 	-Wall \
 	-ggdb3 \
 	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
 	$(LIBCARES_CFLAGS) \
 	$(NULL)
@@ -63,7 +64,7 @@
 	$(LIBOSMOGB_LIBS) \
 	$(LIBCARES_LIBS) \
 	$(LIBCRYPTO_LIBS) \
-	-lgtp \
+	$(LIBGTP_LIBS) \
 	-lrt \
 	$(NULL)
 if BUILD_IU
diff --git a/openbsc/tests/xid/Makefile.am b/openbsc/tests/xid/Makefile.am
index e7c4cf0..aaf17ed 100644
--- a/openbsc/tests/xid/Makefile.am
+++ b/openbsc/tests/xid/Makefile.am
@@ -32,7 +32,7 @@
 	$(LIBOSMOGB_LIBS) \
 	$(LIBCARES_LIBS) \
 	$(LIBCRYPTO_LIBS) \
-	-lgtp \
+	$(LIBGTP_LIBS) \
 	-lrt \
 	-lm \
 	$(NULL)