From 31760a1f6089fb59475ba79faa3eb97e4cf00f68 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Wed, 27 Apr 2016 15:17:14 +0200
Subject: [PATCH] oap_message.h: Remove dependency to openbsc include

This is a first step to moving oap_messages.h to libosmocore
---
 openbsc/include/openbsc/oap_messages.h | 2 +-
 openbsc/src/gprs/oap.c                 | 2 ++
 openbsc/src/gprs/oap_messages.c        | 1 -
 openbsc/tests/oap/oap_test.c           | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/openbsc/include/openbsc/oap_messages.h b/openbsc/include/openbsc/oap_messages.h
index b7f4ccada..e76287bae 100644
--- a/openbsc/include/openbsc/oap_messages.h
+++ b/openbsc/include/openbsc/oap_messages.h
@@ -22,8 +22,8 @@
 #pragma once
 
 #include <stdint.h>
+#include <osmocom/core/msgb.h>
 #include <osmocom/gsm/protocol/gsm_04_08_gprs.h>
-#include <openbsc/gsm_data.h>
 
 /* Some numbers are out of sequence because (so far) they match gprs_gsup_iei.
  */
diff --git a/openbsc/src/gprs/oap.c b/openbsc/src/gprs/oap.c
index f5d7a9570..eb0dd19d1 100644
--- a/openbsc/src/gprs/oap.c
+++ b/openbsc/src/gprs/oap.c
@@ -20,6 +20,8 @@
  *
  */
 
+#include <string.h>
+
 #include <osmocom/core/utils.h>
 #include <osmocom/crypt/auth.h>
 
diff --git a/openbsc/src/gprs/oap_messages.c b/openbsc/src/gprs/oap_messages.c
index d5750a612..ccb3c81a2 100644
--- a/openbsc/src/gprs/oap_messages.c
+++ b/openbsc/src/gprs/oap_messages.c
@@ -24,7 +24,6 @@
 #include <openbsc/oap_messages.h>
 
 #include <openbsc/debug.h>
-#include <openbsc/gprs_utils.h>
 
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/core/msgb.h>
diff --git a/openbsc/tests/oap/oap_test.c b/openbsc/tests/oap/oap_test.c
index 9a2063bdc..4ee5d4207 100644
--- a/openbsc/tests/oap/oap_test.c
+++ b/openbsc/tests/oap/oap_test.c
@@ -26,6 +26,7 @@
 #include <openbsc/oap_messages.h>
 
 #include <stdio.h>
+#include <string.h>
 
 static void test_oap_api(void)
 {