diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am
index ab2517e..d059aee 100644
--- a/openbsc/src/gprs/Makefile.am
+++ b/openbsc/src/gprs/Makefile.am
@@ -92,7 +92,6 @@
 	sgsn_cdr.c \
 	sgsn_ares.c \
 	slhc.c \
-	oap.c \
 	gprs_llc_xid.c \
 	v42bis.c \
 	$(NULL)
@@ -137,9 +136,9 @@
 gsup_test_client_SOURCES = \
 	gprs_gsup_client.c \
 	gsup_test_client.c \
-	oap.c \
 	$(NULL)
 gsup_test_client_LDADD = \
+	$(top_builddir)/src/libcommon/libcommon.a \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOVTY_LIBS) \
diff --git a/openbsc/src/libcommon/Makefile.am b/openbsc/src/libcommon/Makefile.am
index 6cfebc2..6582d1e 100644
--- a/openbsc/src/libcommon/Makefile.am
+++ b/openbsc/src/libcommon/Makefile.am
@@ -23,6 +23,7 @@
 	debug.c \
 	gsm_data.c \
 	gsm_data_shared.c \
+	oap_client.c \
 	socket.c \
 	talloc_ctx.c \
 	gsm_subscriber_base.c \
diff --git a/openbsc/src/gprs/oap.c b/openbsc/src/libcommon/oap_client.c
similarity index 100%
rename from openbsc/src/gprs/oap.c
rename to openbsc/src/libcommon/oap_client.c
diff --git a/openbsc/tests/oap/Makefile.am b/openbsc/tests/oap/Makefile.am
index bb9ebb2..c17abb5 100644
--- a/openbsc/tests/oap/Makefile.am
+++ b/openbsc/tests/oap/Makefile.am
@@ -27,7 +27,6 @@
 	$(NULL)
 
 oap_test_LDADD = \
-	$(top_builddir)/src/gprs/oap.o \
 	$(top_builddir)/src/gprs/gprs_utils.o \
 	$(top_builddir)/src/libcommon/libcommon.a \
 	$(LIBOSMOCORE_LIBS) \
diff --git a/openbsc/tests/sgsn/Makefile.am b/openbsc/tests/sgsn/Makefile.am
index 9e1a5a8..00b80f6 100644
--- a/openbsc/tests/sgsn/Makefile.am
+++ b/openbsc/tests/sgsn/Makefile.am
@@ -54,7 +54,6 @@
 	$(top_builddir)/src/gprs/gprs_utils.o \
 	$(top_builddir)/src/gprs/gprs_subscriber.o \
 	$(top_builddir)/src/gprs/gprs_gb_parse.o \
-	$(top_builddir)/src/gprs/oap.o \
         $(top_builddir)/src/gprs/gprs_llc_xid.o \
 	$(top_builddir)/src/gprs/gprs_sndcp_xid.o \
         $(top_builddir)/src/gprs/slhc.o \