diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am
index 8ea95e0a8..2466ce859 100644
--- a/openbsc/include/openbsc/Makefile.am
+++ b/openbsc/include/openbsc/Makefile.am
@@ -54,7 +54,7 @@ noinst_HEADERS = \
 	mncc_int.h \
 	nat_rewrite_trie.h \
 	network_listen.h \
-	oap.h \
+	oap_client.h \
 	openbscdefines.h \
 	osmo_bsc.h \
 	osmo_bsc_grace.h \
diff --git a/openbsc/include/openbsc/gsup_client.h b/openbsc/include/openbsc/gsup_client.h
index d21a54d83..a113225e1 100644
--- a/openbsc/include/openbsc/gsup_client.h
+++ b/openbsc/include/openbsc/gsup_client.h
@@ -23,7 +23,7 @@
 
 #include <osmocom/core/timer.h>
 
-#include <openbsc/oap.h>
+#include <openbsc/oap_client.h>
 
 #define GSUP_CLIENT_RECONNECT_INTERVAL 10
 #define GSUP_CLIENT_PING_INTERVAL 20
diff --git a/openbsc/include/openbsc/oap.h b/openbsc/include/openbsc/oap_client.h
similarity index 100%
rename from openbsc/include/openbsc/oap.h
rename to openbsc/include/openbsc/oap_client.h
diff --git a/openbsc/include/openbsc/sgsn.h b/openbsc/include/openbsc/sgsn.h
index c8dcc0de8..1ede2c930 100644
--- a/openbsc/include/openbsc/sgsn.h
+++ b/openbsc/include/openbsc/sgsn.h
@@ -6,7 +6,7 @@
 #include <osmocom/crypt/gprs_cipher.h>
 #include <osmocom/gprs/gprs_ns.h>
 #include <openbsc/gprs_sgsn.h>
-#include <openbsc/oap.h>
+#include <openbsc/oap_client.h>
 
 #include <ares.h>
 
diff --git a/openbsc/src/gprs/oap.c b/openbsc/src/gprs/oap.c
index ac2b2a4ca..92140c17d 100644
--- a/openbsc/src/gprs/oap.c
+++ b/openbsc/src/gprs/oap.c
@@ -26,7 +26,7 @@
 #include <osmocom/crypt/auth.h>
 #include <osmocom/gsm/oap.h>
 
-#include <openbsc/oap.h>
+#include <openbsc/oap_client.h>
 #include <openbsc/debug.h>
 
 int oap_client_init(struct oap_client_config *config,
diff --git a/openbsc/tests/oap/oap_test.c b/openbsc/tests/oap/oap_test.c
index a6f54f67e..adac91132 100644
--- a/openbsc/tests/oap/oap_test.c
+++ b/openbsc/tests/oap/oap_test.c
@@ -22,7 +22,7 @@
 #include <osmocom/gsm/oap.h>
 
 #include <openbsc/debug.h>
-#include <openbsc/oap.h>
+#include <openbsc/oap_client.h>
 
 #include <stdio.h>
 #include <string.h>