diff --git a/include/osmocom/rspro/ConfigClientReq.h b/include/osmocom/rspro/ConfigClientReq.h
index 670fb68..73a6768 100644
--- a/include/osmocom/rspro/ConfigClientReq.h
+++ b/include/osmocom/rspro/ConfigClientReq.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/rspro/ClientId.h>
+#include <osmocom/rspro/ClientSlot.h>
 #include <osmocom/rspro/IpPort.h>
 #include <constr_SEQUENCE.h>
 
@@ -21,7 +21,7 @@
 
 /* ConfigClientReq */
 typedef struct ConfigClientReq {
-	ClientId_t	 clientId;
+	ClientSlot_t	 clientSlot;
 	IpPort_t	 bankd;
 	/*
 	 * This type is extensible,
diff --git a/include/osmocom/rspro/ConnectClientReq.h b/include/osmocom/rspro/ConnectClientReq.h
index 46c2d0e..2087d1c 100644
--- a/include/osmocom/rspro/ConnectClientReq.h
+++ b/include/osmocom/rspro/ConnectClientReq.h
@@ -12,17 +12,19 @@
 
 /* Including external dependencies */
 #include <osmocom/rspro/ComponentIdentity.h>
-#include <osmocom/rspro/ClientId.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/* Forward declarations */
+struct ClientSlot;
+
 /* ConnectClientReq */
 typedef struct ConnectClientReq {
 	ComponentIdentity_t	 identity;
-	ClientId_t	*clientId	/* OPTIONAL */;
+	struct ClientSlot	*clientSlot	/* OPTIONAL */;
 	/*
 	 * This type is extensible,
 	 * possible extensions are below.
@@ -39,5 +41,8 @@
 }
 #endif
 
+/* Referred external types */
+#include <osmocom/rspro/ClientSlot.h>
+
 #endif	/* _ConnectClientReq_H_ */
 #include <asn_internal.h>