diff --git a/hnodeb/HNBGW_ConnectionHandler.ttcn b/hnodeb/HNBGW_ConnectionHandler.ttcn
index ac280b0ec..076cb8271 100644
--- a/hnodeb/HNBGW_ConnectionHandler.ttcn
+++ b/hnodeb/HNBGW_ConnectionHandler.ttcn
@@ -40,10 +40,8 @@ import from GTP_CodecPort all;
 import from GTPU_Types all;
 
 /* this component represents a single Iuh connection at the HNBGW. */
-type component HNBGW_ConnHdlr extends StatsD_ConnHdlr, GTP_ConnHdlr {
+type component HNBGW_ConnHdlr extends Iuh_ConnHdlr, GTP_ConnHdlr, StatsD_ConnHdlr {
 	port TELNETasp_PT HNBVTY;
-	port HNBAP_PT HNBAP;
-	port RUA_PT RUA;
 	/* HNBLLIF Interface of HNodeB */
 	port HNBLLIF_CODEC_PT LLSK;
 	var integer g_llsk_conn_id;
diff --git a/library/Iuh_Emulation.ttcn b/library/Iuh_Emulation.ttcn
index bc8e7c335..e05afe553 100644
--- a/library/Iuh_Emulation.ttcn
+++ b/library/Iuh_Emulation.ttcn
@@ -38,6 +38,13 @@ import from Osmocom_Types all;
 import from IPL4asp_Types all;
 import from DNS_Helpers all;
 
+/* General "base class" component definition, of which specific implementations
+ * derive themselves by means of the "extends" feature */
+type component Iuh_ConnHdlr {
+	port HNBAP_PT HNBAP;
+	port RUA_PT RUA;
+};
+
 type enumerated IUHEM_EventUpDown {
 	IUHEM_EVENT_DOWN,
 	IUHEM_EVENT_UP