Adopt to recent libosmocore namespace changes and libosmogsm
diff --git a/src/main_stp.c b/src/main_stp.c
index b87a6cb..2451d35 100644
--- a/src/main_stp.c
+++ b/src/main_stp.c
@@ -32,7 +32,7 @@
 
 #include <osmocom/m2ua/m2ua_msg.h>
 
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
 
 #include <osmocom/sccp/sccp.h>
 
@@ -82,7 +82,7 @@
 	return NULL;
 }
 
-static int inject_read_cb(struct bsc_fd *fd, unsigned int what)
+static int inject_read_cb(struct osmo_fd *fd, unsigned int what)
 {
 	struct msgb *msg;
 	struct m2ua_msg_part *data, *link;
@@ -184,7 +184,7 @@
 	bsc->inject_fd.cb = inject_read_cb;
 	bsc->inject_fd.data = bsc;
 
-	if (bsc_register_fd(&bsc->inject_fd) != 0) {
+	if (osmo_fd_register(&bsc->inject_fd) != 0) {
 		LOGP(DINP, LOGL_ERROR, "Failed to register.\n");
 		close(fd);
 		return -1;
@@ -270,7 +270,7 @@
 	}
 
         while (1) {
-		bsc_select_main(0);
+		osmo_select_main(0);
         }
 
 	return 0;