diff --git a/include/osmocom/ctrl/control_cmd.h b/include/osmocom/ctrl/control_cmd.h
index 2e6863a..10717ac 100644
--- a/include/osmocom/ctrl/control_cmd.h
+++ b/include/osmocom/ctrl/control_cmd.h
@@ -4,11 +4,10 @@
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/write_queue.h>
+#include <osmocom/core/logging.h>
 
 #include <osmocom/vty/vector.h>
 
-#include <openbsc/vty.h>
-
 #define CTRL_CMD_ERROR		-1
 #define CTRL_CMD_HANDLED	0
 #define CTRL_CMD_REPLY		1
diff --git a/include/osmocom/ctrl/control_if.h b/include/osmocom/ctrl/control_if.h
index d103332..9ab3b2a 100644
--- a/include/osmocom/ctrl/control_if.h
+++ b/include/osmocom/ctrl/control_if.h
@@ -2,8 +2,10 @@
 #define _CONTROL_IF_H
 
 #include <osmocom/core/write_queue.h>
-#include <openbsc/control_cmd.h>
-#include <openbsc/gsm_data.h>
+#include <osmocom/ctrl/control_cmd.h>
+
+/* FIXME: this must go */
+struct gsm_network;
 
 typedef int (*ctrl_cmd_handler)(struct ctrl_cmd *, void *);