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/osmo_bsc_rf.c b/openbsc/src/osmo-bsc/osmo_bsc_rf.c
index 6be9625..eb4b867 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_rf.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_rf.c
@@ -27,7 +27,7 @@
 #include <openbsc/osmo_msc_data.h>
 
 #include <osmocom/core/talloc.h>
-#include <osmocom/core/protocol/gsm_12_21.h>
+#include <osmocom/gsm/protocol/gsm_12_21.h>
 
 #include <sys/socket.h>
 #include <sys/un.h>