diff --git a/src/client.h b/src/client.h
index df90404..7a3c476 100644
--- a/src/client.h
+++ b/src/client.h
@@ -14,6 +14,8 @@
 	BDC_E_CLIENT_CONN_RES,
 };
 
+extern struct osmo_fsm remsim_client_bankd_fsm;
+
 
 enum server_conn_fsm_event {
 	SRVC_E_TCP_UP,
@@ -21,7 +23,20 @@
 	SRVC_E_CLIENT_CONN_RES,
 };
 
-extern struct osmo_fsm remsim_client_bankd_fsm;
+/* representing a client-side connection to a RSPRO server */
+struct rspro_server_conn {
+	/* state */
+	struct ipa_client_conn *conn;
+	struct osmo_fsm_inst *fi;
+
+	/* our own component ID */
+	struct app_comp_id own_comp_id;
+
+	/* configuration */
+	char *server_host;
+	uint16_t server_port;
+};
+
 extern struct osmo_fsm remsim_client_server_fsm;
 
 /* main.c */
diff --git a/src/remsim_client_fsm.c b/src/remsim_client_fsm.c
index 4fb57f3..0b514e6 100644
--- a/src/remsim_client_fsm.c
+++ b/src/remsim_client_fsm.c
@@ -240,20 +240,6 @@
 	{ 0, NULL }
 };
 
-/* representing a client-side connection to a RSPRO server */
-struct rspro_server_conn {
-	/* state */
-	struct ipa_client_conn *conn;
-	struct osmo_fsm_inst *fi;
-
-	/* our own component ID */
-	struct app_comp_id own_comp_id;
-
-	/* configuration */
-	char *server_host;
-	uint16_t server_port;
-};
-
 static void srvc_updown_cb(struct ipa_client_conn *conn, int up)
 {
 	struct rspro_server_conn *srvc = conn->data;