diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn
index 2cb50bc..b7e02ec 100644
--- a/library/GSM_RR_Types.ttcn
+++ b/library/GSM_RR_Types.ttcn
@@ -135,8 +135,6 @@
 	} with { variant "FIELDLENGTH(8)" };
 
 	type octetstring RestOctets  with { variant "PADDING(yes), PADDING_PATTERN('00101011'B)" };
-	type hexstring GsmBcdString with { variant "HEXORDER(low)" };
-	type GsmBcdString BcdMccMnc with { variant "FIELDLENGTH(6)" };
 
 	type record L2PseudoLength {
 		uint6_t		l2_plen,
@@ -219,18 +217,9 @@
 		hsn := hsn
 	};
 
-	/* TS 24.008 10.5.1.1 */
-	type uint16_t CellIdentity;
-
 	/* TS 24.008 10.5.1.2 */
 	type uint4_t CipheringKeySeqNr (0..7);
 
-	/* 24.008 10.5.1.3 */
-	type record LocationAreaIdentification {
-		BcdMccMnc	mcc_mnc,
-		uint16_t	lac
-	} with { variant "" };
-
 	/* TS 24.008 10.5.1.4 */
 	type enumerated MobileIdentityType {
 		MI_TYPE_NONE	(0),
@@ -424,15 +413,6 @@
 		uint3_t		non_drx_timer
 	} with { variant "" };
 
-	/* 24.008 10.5.5.15 */
-	type record RoutingAreaIdentification {
-		LocationAreaIdentification	lai,
-		uint8_t				rac
-	} with { variant "" };
-
-	external function enc_RoutingAreaIdentification(RoutingAreaIdentification rai) return octetstring
-	with { extension "prototype(convert)" extension "encode(RAW)" }
-
 	/* 44.018 10.5.2.16 */
 	type record IaRestOctHL {
 		uint6_t		freq_par_len,
diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn
index 5340fee..ee6635b 100644
--- a/library/GSM_Types.ttcn
+++ b/library/GSM_Types.ttcn
@@ -356,5 +356,26 @@
 	return (fn / 51) mod 8;
 }
 
+type hexstring GsmBcdString with { variant "HEXORDER(low)" };
+type GsmBcdString BcdMccMnc with { variant "FIELDLENGTH(6)" };
+
+/* 24.008 10.5.1.3 */
+type record LocationAreaIdentification {
+	BcdMccMnc	mcc_mnc,
+	uint16_t	lac
+} with { variant "" };
+
+/* 24.008 10.5.5.15 */
+type record RoutingAreaIdentification {
+	LocationAreaIdentification	lai,
+	uint8_t				rac
+} with { variant "" };
+
+external function enc_RoutingAreaIdentification(RoutingAreaIdentification rai) return octetstring
+with { extension "prototype(convert)" extension "encode(RAW)" }
+
+/* TS 24.008 10.5.1.1 */
+type uint16_t CellIdentity;
+
 
 } with { encode "RAW"; variant "FIELDORDER(msb)" }
diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn
index 7ddaada..c5b0953 100644
--- a/library/Osmocom_Gb_Types.ttcn
+++ b/library/Osmocom_Gb_Types.ttcn
@@ -6,7 +6,6 @@
 	import from General_Types all;
 	import from Osmocom_Types all;
 	import from GSM_Types all;
-	import from GSM_RR_Types all;
 	import from BSSGP_Types all
 	import from NS_Types all
 	import from Native_Functions all;
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 0e656a3..ec18b53 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -15,6 +15,7 @@
 
 import from General_Types all;
 import from Osmocom_Types all;
+import from GSM_Types all;
 import from Native_Functions all;
 import from NS_Types all;
 import from NS_Emulation all;