diff --git a/openbsc/src/nat/bsc_mgcp_utils.c b/openbsc/src/nat/bsc_mgcp_utils.c
index 48be904..32d988e 100644
--- a/openbsc/src/nat/bsc_mgcp_utils.c
+++ b/openbsc/src/nat/bsc_mgcp_utils.c
@@ -41,7 +41,7 @@
 {
 	struct sccp_connections *mcon;
 	struct tlv_parsed tp;
-	u_int16_t cic;
+	uint16_t cic;
 	uint8_t timeslot;
 	uint8_t multiplex;
 	int combined;
@@ -62,7 +62,7 @@
 		return -1;
 	}
 
-	cic = ntohs(*(u_int16_t *)TLVP_VAL(&tp, GSM0808_IE_CIRCUIT_IDENTITY_CODE));
+	cic = ntohs(*(uint16_t *)TLVP_VAL(&tp, GSM0808_IE_CIRCUIT_IDENTITY_CODE));
 	timeslot = cic & 0x1f;
 	multiplex = (cic & ~0x1f) >> 5;
 
diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.c b/openbsc/tests/bsc-nat/bsc_nat_test.c
index e39ec0c..6771b31 100644
--- a/openbsc/tests/bsc-nat/bsc_nat_test.c
+++ b/openbsc/tests/bsc-nat/bsc_nat_test.c
@@ -132,7 +132,7 @@
 
 struct filter_result {
 	const uint8_t *data;
-	const u_int16_t length;
+	const uint16_t length;
 	const int dir;
 	const int result;
 };