Fix build of bsc-nat and GPRS code after include path change

The last patch changed the osmocore include paths, this fixes some build
problems caused by it
diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c
index 0c10d84..e3b57d9 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c
@@ -29,8 +29,8 @@
 #include <osmocom/sccp/sccp.h>
 
 #include <osmocom/core/talloc.h>
-#include <osmocom/core/gsm0808.h>
-#include <osmocom/core/protocol/gsm_08_08.h>
+#include <osmocom/gsm/gsm0808.h>
+#include <osmocom/gsm/protocol/gsm_08_08.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>