diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index 43944e7..1cf6820 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -16,6 +16,7 @@
 #include <osmocom/crypt/utran_cipher.h>
 
 #include <osmocom/mgcp_client/mgcp_client.h>
+#include <osmocom/mgcp_client/mgcp_client_pool.h>
 
 #include <osmocom/msc/msc_common.h>
 #include <osmocom/msc/neighbor_ident.h>
@@ -216,7 +217,9 @@
 	struct {
 		struct osmo_tdef *tdefs;
 		struct mgcp_client_conf conf;
-		struct mgcp_client *client;
+		/* MGW pool, also includes the single MGCP client as fallback if no
+		 * pool is configured. */
+		struct mgcp_client_pool *mgw_pool;
 	} mgw;
 
 	struct {
diff --git a/include/osmocom/msc/vty.h b/include/osmocom/msc/vty.h
index 1e13846..11d9ed1 100644
--- a/include/osmocom/msc/vty.h
+++ b/include/osmocom/msc/vty.h
@@ -17,6 +17,7 @@
 
 enum bsc_vty_node {
 	GSMNET_NODE = _LAST_OSMOVTY_NODE + 1,
+	MGW_NODE,
 	SUBSCR_NODE,
 	MSC_NODE,
 	MNCC_INT_NODE,