diff --git a/src/stk.c b/src/stk.c
index 2dfae521..0ba43844 100644
--- a/src/stk.c
+++ b/src/stk.c
@@ -417,8 +417,8 @@ static struct stk_menu *stk_menu_create(const char *title,
 static struct stk_menu *stk_menu_create_from_set_up_menu(
 						const struct stk_command *cmd)
 {
-	gboolean soft_key = (cmd->qualifier & (1 << 0)) != 0;
-	gboolean has_help = (cmd->qualifier & (1 << 7)) != 0;
+	bool soft_key = (cmd->qualifier & (1 << 0)) != 0;
+	bool has_help = (cmd->qualifier & (1 << 7)) != 0;
 
 	return stk_menu_create(cmd->setup_menu.alpha_id,
 				&cmd->setup_menu.text_attr,
@@ -432,8 +432,8 @@ static struct stk_menu *stk_menu_create_from_set_up_menu(
 static struct stk_menu *stk_menu_create_from_select_item(
 						const struct stk_command *cmd)
 {
-	gboolean soft_key = (cmd->qualifier & (1 << 2)) != 0;
-	gboolean has_help = (cmd->qualifier & (1 << 7)) != 0;
+	bool soft_key = (cmd->qualifier & (1 << 2)) != 0;
+	bool has_help = (cmd->qualifier & (1 << 7)) != 0;
 
 	return stk_menu_create(cmd->select_item.alpha_id,
 				&cmd->select_item.text_attr,
@@ -462,7 +462,7 @@ static void emit_menu_changed(struct ofono_stk *stk)
 	static struct stk_menu no_menu = {
 		.title = "",
 		.items = &end_item,
-		.has_help = FALSE,
+		.has_help = false,
 		.default_item = -1,
 	};
 	static char *name = "MainMenu";
@@ -1041,7 +1041,7 @@ static gboolean timers_cb(gpointer user_data)
 
 static void timer_value_from_seconds(struct stk_timer_value *val, int seconds)
 {
-	val->has_value = TRUE;
+	val->has_value = true;
 	val->hour = seconds / 3600;
 	seconds -= val->hour * 3600;
 	val->minute = seconds / 60;
@@ -1468,7 +1468,7 @@ static void request_confirmation_cb(enum stk_agent_result result,
 
 		rsp.result.type = STK_RESULT_TYPE_SUCCESS;
 		rsp.get_inkey.text.text = confirm ? "" : NULL;
-		rsp.get_inkey.text.yesno = TRUE;
+		rsp.get_inkey.text.yesno = true;
 
 		if (cmd->duration.interval) {
 			rsp.get_inkey.duration.unit = cmd->duration.unit;
@@ -2020,7 +2020,7 @@ static void send_ussd_callback(int error, int dcs, const unsigned char *msg,
 			rsp.result.type = STK_RESULT_TYPE_SUCCESS;
 			rsp.send_ussd.text.text = msg;
 			rsp.send_ussd.text.len = msg_len;
-			rsp.send_ussd.text.has_text = TRUE;
+			rsp.send_ussd.text.has_text = true;
 		} else
 			rsp.result.type = STK_RESULT_TYPE_USSD_RETURN_ERROR;
 
@@ -2348,7 +2348,7 @@ static void get_time(struct stk_response *rsp)
 	rsp->provide_local_info.datetime.minute = t->tm_min;
 	rsp->provide_local_info.datetime.second = t->tm_sec;
 	rsp->provide_local_info.datetime.timezone = t->tm_gmtoff / 900;
-	rsp->provide_local_info.datetime.has_timezone = TRUE;
+	rsp->provide_local_info.datetime.has_timezone = true;
 
 	return;
 }
diff --git a/src/stkutil.c b/src/stkutil.c
index 609652cf..d3e35c77 100644
--- a/src/stkutil.c
+++ b/src/stkutil.c
@@ -44,16 +44,16 @@ enum stk_data_object_flag {
 };
 
 struct stk_file_iter {
-	const unsigned char *start;
+	const uint8_t *start;
 	unsigned int pos;
 	unsigned int max;
-	unsigned char len;
-	const unsigned char *file;
+	uint8_t len;
+	const uint8_t *file;
 };
 
 struct stk_tlv_builder {
 	struct comprehension_tlv_builder ctlv;
-	unsigned char *value;
+	uint8_t *value;
 	unsigned int len;
 	unsigned int max_len;
 };
@@ -71,7 +71,7 @@ typedef bool (*dataobj_writer)(struct stk_tlv_builder *, const void *, bool);
  */
 struct gsm_sms_tpdu {
 	unsigned int len;
-	unsigned char tpdu[184];
+	uint8_t tpdu[184];
 };
 
 #define CHECK_TEXT_AND_ICON(text, icon_id)			\
@@ -81,7 +81,7 @@ struct gsm_sms_tpdu {
 	if ((text == NULL || text[0] == '\0') && icon_id != 0)	\
 		status = STK_PARSE_RESULT_DATA_NOT_UNDERSTOOD;	\
 
-static char *decode_text(unsigned char dcs, int len, const unsigned char *data)
+static char *decode_text(uint8_t dcs, int len, const unsigned char *data)
 {
 	char *utf8;
 	enum sms_charset charset;
@@ -94,7 +94,7 @@ static char *decode_text(unsigned char dcs, int len, const unsigned char *data)
 	{
 		long written;
 		unsigned long max_to_unpack = len * 8 / 7;
-		unsigned char *unpacked = unpack_7bit(data, len, 0, false,
+		uint8_t *unpacked = unpack_7bit(data, len, 0, false,
 							max_to_unpack,
 							&written, 0);
 		if (unpacked == NULL)
@@ -132,9 +132,9 @@ static bool parse_dataobj_common_bool(struct comprehension_tlv_iter *iter,
 
 /* For data object that only has one byte */
 static bool parse_dataobj_common_byte(struct comprehension_tlv_iter *iter,
-						unsigned char *out)
+						uint8_t *out)
 {
-	const unsigned char *data;
+	const uint8_t *data;
 
 	if (comprehension_tlv_iter_get_length(iter) != 1)
 		return false;
@@ -149,7 +149,7 @@ static bool parse_dataobj_common_byte(struct comprehension_tlv_iter *iter,
 static bool parse_dataobj_common_text(struct comprehension_tlv_iter *iter,
 						char **text)
 {
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if (len < 1)
@@ -168,7 +168,7 @@ static bool parse_dataobj_common_text(struct comprehension_tlv_iter *iter,
 static bool parse_dataobj_common_byte_array(struct comprehension_tlv_iter *iter,
 					struct stk_common_byte_array *array)
 {
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if (len < 1)
@@ -184,7 +184,7 @@ static bool parse_dataobj_common_byte_array(struct comprehension_tlv_iter *iter,
 }
 
 static void stk_file_iter_init(struct stk_file_iter *iter,
-				const unsigned char *start, unsigned int len)
+				const uint8_t *start, unsigned int len)
 {
 	iter->start = start;
 	iter->max = len;
@@ -195,9 +195,9 @@ static bool stk_file_iter_next(struct stk_file_iter *iter)
 {
 	unsigned int pos = iter->pos;
 	const unsigned int max = iter->max;
-	const unsigned char *start = iter->start;
+	const uint8_t *start = iter->start;
 	unsigned int i;
-	unsigned char last_type;
+	uint8_t last_type;
 
 	if (pos + 2 >= max)
 		return false;
@@ -268,7 +268,7 @@ static bool parse_dataobj_address(struct comprehension_tlv_iter *iter,
 					void *user)
 {
 	struct stk_address *addr = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len;
 	char *number;
 
@@ -291,7 +291,7 @@ static bool parse_dataobj_alpha_id(struct comprehension_tlv_iter *iter,
 					void *user)
 {
 	char **alpha_id = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len;
 	char *utf8;
 
@@ -317,7 +317,7 @@ static bool parse_dataobj_subaddress(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct stk_subaddress *subaddr = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len;
 
 	len = comprehension_tlv_iter_get_length(iter);
@@ -340,7 +340,7 @@ static bool parse_dataobj_subaddress(struct comprehension_tlv_iter *iter,
 static bool parse_dataobj_ccp(struct comprehension_tlv_iter *iter, void *user)
 {
 	struct stk_ccp *ccp = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len;
 
 	len = comprehension_tlv_iter_get_length(iter);
@@ -362,7 +362,7 @@ static bool parse_dataobj_cbs_page(struct comprehension_tlv_iter *iter,
 					void *user)
 {
 	struct stk_cbs_page *cp = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len;
 
 	len = comprehension_tlv_iter_get_length(iter);
@@ -384,7 +384,7 @@ static bool parse_dataobj_duration(struct comprehension_tlv_iter *iter,
 					void *user)
 {
 	struct stk_duration *duration = user;
-	const unsigned char *data;
+	const uint8_t *data;
 
 	if (comprehension_tlv_iter_get_length(iter) != 2)
 		return false;
@@ -407,7 +407,7 @@ static bool parse_dataobj_duration(struct comprehension_tlv_iter *iter,
 static bool parse_dataobj_item(struct comprehension_tlv_iter *iter, void *user)
 {
 	struct stk_item *item = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len;
 	char *utf8;
 
@@ -440,8 +440,8 @@ static bool parse_dataobj_item(struct comprehension_tlv_iter *iter, void *user)
 static bool parse_dataobj_item_id(struct comprehension_tlv_iter *iter,
 					void *user)
 {
-	unsigned char *id = user;
-	const unsigned char *data;
+	uint8_t *id = user;
+	const uint8_t *data;
 
 	if (comprehension_tlv_iter_get_length(iter) != 1)
 		return false;
@@ -457,7 +457,7 @@ static bool parse_dataobj_response_len(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct stk_response_length *response_len = user;
-	const unsigned char *data;
+	const uint8_t *data;
 
 	if (comprehension_tlv_iter_get_length(iter) != 2)
 		return false;
@@ -475,9 +475,9 @@ static bool parse_dataobj_result(struct comprehension_tlv_iter *iter,
 					void *user)
 {
 	struct stk_result *result = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len;
-	unsigned char *additional;
+	uint8_t *additional;
 
 	len = comprehension_tlv_iter_get_length(iter);
 	if (len < 1)
@@ -505,7 +505,7 @@ static bool parse_dataobj_gsm_sms_tpdu(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct gsm_sms_tpdu *tpdu = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len;
 
 	len = comprehension_tlv_iter_get_length(iter);
@@ -524,7 +524,7 @@ static bool parse_dataobj_gsm_sms_tpdu(struct comprehension_tlv_iter *iter,
 static bool parse_dataobj_ss(struct comprehension_tlv_iter *iter, void *user)
 {
 	struct stk_ss *ss = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len;
 	char *s;
 
@@ -547,7 +547,7 @@ static bool parse_dataobj_text(struct comprehension_tlv_iter *iter, void *user)
 {
 	char **text = user;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
-	const unsigned char *data;
+	const uint8_t *data;
 	char *utf8;
 
 	if (len <= 1) {
@@ -569,7 +569,7 @@ static bool parse_dataobj_text(struct comprehension_tlv_iter *iter, void *user)
 /* Defined in TS 102.223 Section 8.16 */
 static bool parse_dataobj_tone(struct comprehension_tlv_iter *iter, void *user)
 {
-	unsigned char *byte = user;
+	uint8_t *byte = user;
 	return parse_dataobj_common_byte(iter, byte);
 }
 
@@ -578,7 +578,7 @@ static bool parse_dataobj_ussd(struct comprehension_tlv_iter *iter, void *user)
 {
 	struct stk_ussd_string *us = user;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
-	const unsigned char *data = comprehension_tlv_iter_get_data(iter);
+	const uint8_t *data = comprehension_tlv_iter_get_data(iter);
 
 	if (len <= 1 || len > 161)
 		return false;
@@ -596,7 +596,7 @@ static bool parse_dataobj_file_list(struct comprehension_tlv_iter *iter,
 {
 	struct l_queue **out = user;
 	struct l_queue *fl;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len;
 	struct stk_file *sf;
 	struct stk_file_iter sf_iter;
@@ -632,7 +632,7 @@ static bool parse_dataobj_location_info(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct stk_location_info *li = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len;
 
 	len = comprehension_tlv_iter_get_length(iter);
@@ -675,7 +675,7 @@ static bool parse_dataobj_imei(struct comprehension_tlv_iter *iter,
 					void *user)
 {
 	char *imei = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len;
 	static const char digit_lut[] = "0123456789*#abc\0";
 
@@ -707,8 +707,8 @@ static bool parse_dataobj_help_request(struct comprehension_tlv_iter *iter,
 static bool parse_dataobj_network_measurement_results(
 		struct comprehension_tlv_iter *iter, void *user)
 {
-	unsigned char *nmr = user;
-	const unsigned char *data;
+	uint8_t *nmr = user;
+	const uint8_t *data;
 	unsigned int len;
 
 	len = comprehension_tlv_iter_get_length(iter);
@@ -729,7 +729,7 @@ static bool parse_dataobj_default_text(struct comprehension_tlv_iter *iter,
 {
 	char **text = user;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
-	const unsigned char *data = comprehension_tlv_iter_get_data(iter);
+	const uint8_t *data = comprehension_tlv_iter_get_data(iter);
 	char *utf8;
 
 	/* DCS followed by some text, cannot be 1 */
@@ -750,7 +750,7 @@ static bool parse_dataobj_items_next_action_indicator(
 		struct comprehension_tlv_iter *iter, void *user)
 {
 	struct stk_items_next_action_indicator *inai = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if ((len < 1) || (len > sizeof(inai->list)))
@@ -768,7 +768,7 @@ static bool parse_dataobj_event_list(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct stk_event_list *el = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if (len == 0)
@@ -789,7 +789,7 @@ static bool parse_dataobj_cause(struct comprehension_tlv_iter *iter,
 					void *user)
 {
 	struct stk_cause *cause = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if ((len == 1) || (len > sizeof(cause->cause)))
@@ -811,7 +811,7 @@ static bool parse_dataobj_cause(struct comprehension_tlv_iter *iter,
 static bool parse_dataobj_location_status(struct comprehension_tlv_iter *iter,
 						void *user)
 {
-	unsigned char *byte = user;
+	uint8_t *byte = user;
 
 	return parse_dataobj_common_byte(iter, byte);
 }
@@ -821,7 +821,7 @@ static bool parse_dataobj_transaction_id(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct stk_transaction_id *ti = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if ((len < 1) || (len > sizeof(ti->list)))
@@ -839,7 +839,7 @@ static bool parse_dataobj_bcch_channel_list(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct stk_bcch_channel_list *bcl = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 	unsigned int i;
 
@@ -877,7 +877,7 @@ static bool parse_dataobj_icon_id(struct comprehension_tlv_iter *iter,
 					void *user)
 {
 	struct stk_icon_id *id = user;
-	const unsigned char *data;
+	const uint8_t *data;
 
 	if (comprehension_tlv_iter_get_length(iter) != 2)
 		return false;
@@ -895,7 +895,7 @@ static bool parse_dataobj_item_icon_id_list(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct stk_item_icon_id_list *iiil = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if ((len < 2) || (len > 127))
@@ -913,7 +913,7 @@ static bool parse_dataobj_item_icon_id_list(struct comprehension_tlv_iter *iter,
 static bool parse_dataobj_card_reader_status(
 		struct comprehension_tlv_iter *iter, void *user)
 {
-	unsigned char *byte = user;
+	uint8_t *byte = user;
 
 	return parse_dataobj_common_byte(iter, byte);
 }
@@ -923,7 +923,7 @@ static bool parse_dataobj_card_atr(struct comprehension_tlv_iter *iter,
 					void *user)
 {
 	struct stk_card_atr *ca = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if ((len < 1) || (len > sizeof(ca->atr)))
@@ -941,7 +941,7 @@ static bool parse_dataobj_c_apdu(struct comprehension_tlv_iter *iter,
 					void *user)
 {
 	struct stk_c_apdu *ca = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 	unsigned int pos;
 
@@ -987,7 +987,7 @@ static bool parse_dataobj_r_apdu(struct comprehension_tlv_iter *iter,
 					void *user)
 {
 	struct stk_r_apdu *ra = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if ((len < 2) || (len > 239))
@@ -1010,7 +1010,7 @@ static bool parse_dataobj_r_apdu(struct comprehension_tlv_iter *iter,
 static bool parse_dataobj_timer_id(struct comprehension_tlv_iter *iter,
 					void *user)
 {
-	unsigned char *byte = user;
+	uint8_t *byte = user;
 
 	return parse_dataobj_common_byte(iter, byte);
 }
@@ -1020,7 +1020,7 @@ static bool parse_dataobj_timer_value(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct stk_timer_value *tv = user;
-	const unsigned char *data;
+	const uint8_t *data;
 
 	if (comprehension_tlv_iter_get_length(iter) != 3)
 		return false;
@@ -1039,7 +1039,7 @@ static bool parse_dataobj_datetime_timezone(
 		struct comprehension_tlv_iter *iter, void *user)
 {
 	struct sms_scts *scts = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	int offset = 0;
 
 	if (comprehension_tlv_iter_get_length(iter) != 7)
@@ -1093,7 +1093,7 @@ static bool parse_dataobj_dtmf_string(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	char **dtmf = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if (len < 1)
@@ -1112,7 +1112,7 @@ static bool parse_dataobj_language(struct comprehension_tlv_iter *iter,
 					void *user)
 {
 	char *lang = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if (len != 2)
@@ -1137,7 +1137,7 @@ static bool parse_dataobj_timing_advance(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct stk_timing_advance *ta = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if (len != 2)
@@ -1156,7 +1156,7 @@ static bool parse_dataobj_timing_advance(struct comprehension_tlv_iter *iter,
 static bool parse_dataobj_browser_id(struct comprehension_tlv_iter *iter,
 						void *user)
 {
-	unsigned char *byte = user;
+	uint8_t *byte = user;
 
 	if (!parse_dataobj_common_byte(iter, byte) || *byte > 4)
 		return false;
@@ -1191,7 +1191,7 @@ static bool parse_dataobj_provisioning_file_reference(
 		struct comprehension_tlv_iter *iter, void *user)
 {
 	struct stk_file *f = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	struct stk_file_iter sf_iter;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
@@ -1216,7 +1216,7 @@ static bool parse_dataobj_provisioning_file_reference(
 static bool parse_dataobj_browser_termination_cause(
 		struct comprehension_tlv_iter *iter, void *user)
 {
-	unsigned char *byte = user;
+	uint8_t *byte = user;
 	return parse_dataobj_common_byte(iter, byte);
 }
 
@@ -1225,7 +1225,7 @@ static bool parse_dataobj_bearer_description(
 		struct comprehension_tlv_iter *iter, void *user)
 {
 	struct stk_bearer_description *bd = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if (len < 1)
@@ -1263,7 +1263,7 @@ static bool parse_dataobj_channel_data(struct comprehension_tlv_iter *iter,
 static bool parse_dataobj_channel_data_length(
 		struct comprehension_tlv_iter *iter, void *user)
 {
-	unsigned char *byte = user;
+	uint8_t *byte = user;
 	return parse_dataobj_common_byte(iter, byte);
 }
 
@@ -1271,8 +1271,8 @@ static bool parse_dataobj_channel_data_length(
 static bool parse_dataobj_buffer_size(struct comprehension_tlv_iter *iter,
 						void *user)
 {
-	unsigned short *size = user;
-	const unsigned char *data;
+	uint16_t *size = user;
+	const uint8_t *data;
 
 	if (comprehension_tlv_iter_get_length(iter) != 2)
 		return false;
@@ -1287,8 +1287,8 @@ static bool parse_dataobj_buffer_size(struct comprehension_tlv_iter *iter,
 static bool parse_dataobj_channel_status(
 			struct comprehension_tlv_iter *iter, void *user)
 {
-	unsigned char *status = user;
-	const unsigned char *data;
+	uint8_t *status = user;
+	const uint8_t *data;
 
 	if (comprehension_tlv_iter_get_length(iter) != 2)
 		return false;
@@ -1306,7 +1306,7 @@ static bool parse_dataobj_card_reader_id(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct stk_card_reader_id *cr_id = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if (len < 1)
@@ -1324,8 +1324,8 @@ static bool parse_dataobj_other_address(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct stk_other_address *oa = user;
-	const unsigned char *data;
-	unsigned char len = comprehension_tlv_iter_get_length(iter);
+	const uint8_t *data;
+	uint8_t len = comprehension_tlv_iter_get_length(iter);
 
 	if (len == 0) {
 		oa->type = STK_ADDRESS_AUTO;
@@ -1355,8 +1355,8 @@ static bool parse_dataobj_uicc_te_interface(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct stk_uicc_te_interface *uti = user;
-	const unsigned char *data;
-	unsigned char len = comprehension_tlv_iter_get_length(iter);
+	const uint8_t *data;
+	uint8_t len = comprehension_tlv_iter_get_length(iter);
 
 	if (len != 3)
 		return false;
@@ -1372,8 +1372,8 @@ static bool parse_dataobj_uicc_te_interface(struct comprehension_tlv_iter *iter,
 static bool parse_dataobj_aid(struct comprehension_tlv_iter *iter, void *user)
 {
 	struct stk_aid *aid = user;
-	const unsigned char *data;
-	unsigned char len = comprehension_tlv_iter_get_length(iter);
+	const uint8_t *data;
+	uint8_t len = comprehension_tlv_iter_get_length(iter);
 
 	if ((len > 16) || (len < 12))
 		return false;
@@ -1393,7 +1393,7 @@ static bool parse_dataobj_aid(struct comprehension_tlv_iter *iter, void *user)
 static bool parse_dataobj_access_technology(
 		struct comprehension_tlv_iter *iter, void *user)
 {
-	unsigned char *byte = user;
+	uint8_t *byte = user;
 	return parse_dataobj_common_byte(iter, byte);
 }
 
@@ -1402,7 +1402,7 @@ static bool parse_dataobj_display_parameters(
 		struct comprehension_tlv_iter *iter, void *user)
 {
 	struct stk_display_parameters *dp = user;
-	const unsigned char *data;
+	const uint8_t *data;
 
 	if (comprehension_tlv_iter_get_length(iter) != 3)
 		return false;
@@ -1420,7 +1420,7 @@ static bool parse_dataobj_service_record(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct stk_service_record *sr = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len;
 
 	len = comprehension_tlv_iter_get_length(iter);
@@ -1443,7 +1443,7 @@ static bool parse_dataobj_device_filter(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct stk_device_filter *df = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if (len < 2)
@@ -1470,7 +1470,7 @@ static bool parse_dataobj_service_search(
 		struct comprehension_tlv_iter *iter, void *user)
 {
 	struct stk_service_search *ss = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if (len < 2)
@@ -1497,7 +1497,7 @@ static bool parse_dataobj_attribute_info(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct stk_attribute_info *ai = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if (len < 2)
@@ -1532,7 +1532,7 @@ static bool parse_dataobj_remote_entity_address(
 		struct comprehension_tlv_iter *iter, void *user)
 {
 	struct stk_remote_entity_address *rea = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	data = comprehension_tlv_iter_get_data(iter);
@@ -1560,8 +1560,8 @@ static bool parse_dataobj_remote_entity_address(
 /* Defined in TS 102.223 Section 8.69 */
 static bool parse_dataobj_esn(struct comprehension_tlv_iter *iter, void *user)
 {
-	unsigned char *esn = user;
-	const unsigned char *data;
+	uint8_t *esn = user;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if (len != 4)
@@ -1581,10 +1581,10 @@ static bool parse_dataobj_network_access_name(
 					void *user)
 {
 	char **apn = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
-	unsigned char label_size;
-	unsigned char offset = 0;
+	uint8_t label_size;
+	uint8_t offset = 0;
 	char decoded_apn[100];
 
 	if (len == 0 || len > 100)
@@ -1633,7 +1633,7 @@ static bool parse_dataobj_text_attr(struct comprehension_tlv_iter *iter,
 					void *user)
 {
 	struct stk_text_attribute *attr = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len;
 
 	len = comprehension_tlv_iter_get_length(iter);
@@ -1654,7 +1654,7 @@ static bool parse_dataobj_pdp_act_par(
 			struct comprehension_tlv_iter *iter, void *user)
 {
 	struct stk_pdp_act_par *pcap = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len;
 
 	len = comprehension_tlv_iter_get_length(iter);
@@ -1675,7 +1675,7 @@ static bool parse_dataobj_item_text_attribute_list(
 		struct comprehension_tlv_iter *iter, void *user)
 {
 	struct stk_item_text_attribute_list *ital = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if ((len > sizeof(ital->list)) || (len % 4 != 0))
@@ -1693,7 +1693,7 @@ static bool parse_dataobj_item_text_attribute_list(
 static bool parse_dataobj_utran_meas_qualifier(
 			struct comprehension_tlv_iter *iter, void *user)
 {
-	unsigned char *byte = user;
+	uint8_t *byte = user;
 	return parse_dataobj_common_byte(iter, byte);
 }
 
@@ -1715,7 +1715,7 @@ static bool parse_dataobj_imeisv(struct comprehension_tlv_iter *iter,
 					void *user)
 {
 	char *imeisv = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len;
 	static const char digit_lut[] = "0123456789*#abc\0";
 
@@ -1744,7 +1744,7 @@ static bool parse_dataobj_imeisv(struct comprehension_tlv_iter *iter,
 static bool parse_dataobj_network_search_mode(
 		struct comprehension_tlv_iter *iter, void *user)
 {
-	unsigned char *byte = user;
+	uint8_t *byte = user;
 	return parse_dataobj_common_byte(iter, byte);
 }
 
@@ -1752,7 +1752,7 @@ static bool parse_dataobj_network_search_mode(
 static bool parse_dataobj_battery_state(struct comprehension_tlv_iter *iter,
 						void *user)
 {
-	unsigned char *byte = user;
+	uint8_t *byte = user;
 	return parse_dataobj_common_byte(iter, byte);
 }
 
@@ -1769,8 +1769,8 @@ static bool parse_dataobj_frame_layout(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct stk_frame_layout *fl = user;
-	const unsigned char *data;
-	unsigned char len = comprehension_tlv_iter_get_length(iter);
+	const uint8_t *data;
+	uint8_t len = comprehension_tlv_iter_get_length(iter);
 
 	if (len < 2)
 		return false;
@@ -1793,8 +1793,8 @@ static bool parse_dataobj_frames_info(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct stk_frames_info *fi = user;
-	const unsigned char *data;
-	unsigned char len = comprehension_tlv_iter_get_length(iter);
+	const uint8_t *data;
+	uint8_t len = comprehension_tlv_iter_get_length(iter);
 	unsigned int i;
 
 	if (len < 1)
@@ -1829,7 +1829,7 @@ static bool parse_dataobj_frame_id(struct comprehension_tlv_iter *iter,
 					void *user)
 {
 	struct stk_frame_id *fi = user;
-	const unsigned char *data;
+	const uint8_t *data;
 
 	if (comprehension_tlv_iter_get_length(iter) != 1)
 		return false;
@@ -1849,8 +1849,8 @@ static bool parse_dataobj_frame_id(struct comprehension_tlv_iter *iter,
 static bool parse_dataobj_meid(struct comprehension_tlv_iter *iter,
 					void *user)
 {
-	unsigned char *meid = user;
-	const unsigned char *data;
+	uint8_t *meid = user;
+	const uint8_t *data;
 
 	if (comprehension_tlv_iter_get_length(iter) != 8)
 		return false;
@@ -1868,7 +1868,7 @@ static bool parse_dataobj_mms_reference(struct comprehension_tlv_iter *iter,
 						void *user)
 {
 	struct stk_mms_reference *mr = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if (len < 1)
@@ -1886,7 +1886,7 @@ static bool parse_dataobj_mms_id(struct comprehension_tlv_iter *iter,
 					void *user)
 {
 	struct stk_mms_id *mi = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if (len < 1)
@@ -1904,7 +1904,7 @@ static bool parse_dataobj_mms_transfer_status(
 		struct comprehension_tlv_iter *iter, void *user)
 {
 	struct stk_mms_transfer_status *mts = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if (len < 1)
@@ -1922,7 +1922,7 @@ static bool parse_dataobj_mms_content_id(
 		struct comprehension_tlv_iter *iter, void *user)
 {
 	struct stk_mms_content_id *mci = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if (len < 1)
@@ -1956,7 +1956,7 @@ static bool parse_dataobj_registry_application_data(
 		struct comprehension_tlv_iter *iter, void *user)
 {
 	struct stk_registry_application_data *rad = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	char *utf8;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
@@ -1981,8 +1981,8 @@ static bool parse_dataobj_registry_application_data(
 static bool parse_dataobj_activate_descriptor(
 		struct comprehension_tlv_iter *iter, void *user)
 {
-	unsigned char *byte = user;
-	const unsigned char *data;
+	uint8_t *byte = user;
+	const uint8_t *data;
 
 	if (comprehension_tlv_iter_get_length(iter) != 1)
 		return false;
@@ -2002,7 +2002,7 @@ static bool parse_dataobj_broadcast_network_info(
 		struct comprehension_tlv_iter *iter, void *user)
 {
 	struct stk_broadcast_network_information *bni = user;
-	const unsigned char *data;
+	const uint8_t *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
 	if (len < 2)
@@ -2257,7 +2257,7 @@ static bool parse_provisioning_list(struct comprehension_tlv_iter *iter,
 					void *data)
 {
 	struct l_queue **out = data;
-	unsigned short tag = STK_DATA_OBJECT_TYPE_PROVISIONING_FILE_REF;
+	uint16_t tag = STK_DATA_OBJECT_TYPE_PROVISIONING_FILE_REF;
 	struct comprehension_tlv_iter iter_old;
 	struct stk_file file;
 	struct l_queue *list = l_queue_new();
@@ -3818,12 +3818,12 @@ static enum stk_command_parse_result parse_command_body(
 	};
 }
 
-struct stk_command *stk_command_new_from_pdu(const unsigned char *pdu,
+struct stk_command *stk_command_new_from_pdu(const uint8_t *pdu,
 						unsigned int len)
 {
 	struct ber_tlv_iter ber;
 	struct comprehension_tlv_iter iter;
-	const unsigned char *data;
+	const uint8_t *data;
 	struct stk_command *command;
 
 	ber_tlv_iter_init(&ber, pdu, len);
@@ -3895,7 +3895,7 @@ void stk_command_free(struct stk_command *command)
 }
 
 static bool stk_tlv_builder_init(struct stk_tlv_builder *iter,
-					unsigned char *pdu, unsigned int size)
+					uint8_t *pdu, unsigned int size)
 {
 	iter->value = NULL;
 	iter->len = 0;
@@ -3905,7 +3905,7 @@ static bool stk_tlv_builder_init(struct stk_tlv_builder *iter,
 
 static bool stk_tlv_builder_recurse(struct stk_tlv_builder *iter,
 					struct ber_tlv_builder *btlv,
-					unsigned char tag)
+					uint8_t tag)
 {
 	iter->value = NULL;
 	iter->len = 0;
@@ -3919,7 +3919,7 @@ static bool stk_tlv_builder_recurse(struct stk_tlv_builder *iter,
 
 static bool stk_tlv_builder_open_container(struct stk_tlv_builder *iter,
 						bool cr,
-						unsigned char shorttag,
+						uint8_t shorttag,
 						bool relocatable)
 {
 	if (comprehension_tlv_builder_next(&iter->ctlv, cr, shorttag) != TRUE)
@@ -3948,7 +3948,7 @@ static unsigned int stk_tlv_builder_get_length(struct stk_tlv_builder *iter)
 }
 
 static bool stk_tlv_builder_append_byte(struct stk_tlv_builder *iter,
-						unsigned char num)
+						uint8_t num)
 {
 	if (iter->len >= iter->max_len)
 		return false;
@@ -3958,7 +3958,7 @@ static bool stk_tlv_builder_append_byte(struct stk_tlv_builder *iter,
 }
 
 static bool stk_tlv_builder_append_short(struct stk_tlv_builder *iter,
-						unsigned short num)
+						uint16_t num)
 {
 	if (iter->len + 2 > iter->max_len)
 		return false;
@@ -3972,7 +3972,7 @@ static bool stk_tlv_builder_append_gsm_packed(struct stk_tlv_builder *iter,
 							const char *text)
 {
 	unsigned int len;
-	unsigned char *gsm;
+	uint8_t *gsm;
 	long written = 0;
 
 	if (text == NULL)
@@ -4006,7 +4006,7 @@ static bool stk_tlv_builder_append_gsm_unpacked(struct stk_tlv_builder *iter,
 						const char *text)
 {
 	unsigned int len;
-	unsigned char *gsm;
+	uint8_t *gsm;
 	long written = 0;
 
 	if (text == NULL)
@@ -4081,7 +4081,7 @@ static bool stk_tlv_builder_append_text(struct stk_tlv_builder *iter,
 }
 
 static inline bool stk_tlv_builder_append_bytes(struct stk_tlv_builder *iter,
-						const unsigned char *data,
+						const uint8_t *data,
 						unsigned int length)
 {
 	if (iter->len + length > iter->max_len)
@@ -4098,9 +4098,9 @@ static bool build_dataobj_address(struct stk_tlv_builder *tlv,
 					const void *data, bool cr)
 {
 	const struct stk_address *addr = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_ADDRESS;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_ADDRESS;
 	unsigned int len;
-	unsigned char number[128];
+	uint8_t number[128];
 
 	if (addr->number == NULL)
 		return true;
@@ -4118,9 +4118,9 @@ static bool build_dataobj_address(struct stk_tlv_builder *tlv,
 static bool build_dataobj_alpha_id(struct stk_tlv_builder *tlv,
 					const void *data, bool cr)
 {
-	unsigned char tag = STK_DATA_OBJECT_TYPE_ALPHA_ID;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_ALPHA_ID;
 	int len;
-	unsigned char *string;
+	uint8_t *string;
 
 	if (data == NULL)
 		return true;
@@ -4143,7 +4143,7 @@ static bool build_dataobj_subaddress(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_subaddress *sa = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_SUBADDRESS;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_SUBADDRESS;
 
 	if (!sa->has_subaddr)
 		return true;
@@ -4158,7 +4158,7 @@ static bool build_dataobj_ccp(struct stk_tlv_builder *tlv,
 					const void *data, bool cr)
 {
 	const struct stk_ccp *ccp = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_CCP;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_CCP;
 
 	if (ccp->len == 0)
 		return true;
@@ -4174,8 +4174,8 @@ static bool build_dataobj_cbs_page(struct stk_tlv_builder *tlv,
 					const void *data, bool cr)
 {
 	const struct cbs *page = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_CBS_PAGE;
-	unsigned char pdu[88];
+	uint8_t tag = STK_DATA_OBJECT_TYPE_CBS_PAGE;
+	uint8_t pdu[88];
 
 	if (cbs_encode(page, NULL, pdu) == FALSE)
 		return false;
@@ -4189,8 +4189,8 @@ static bool build_dataobj_cbs_page(struct stk_tlv_builder *tlv,
 static bool build_dataobj_item_id(struct stk_tlv_builder *tlv,
 					const void *data, bool cr)
 {
-	const unsigned char *item_id = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_ITEM_ID;
+	const uint8_t *item_id = data;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_ITEM_ID;
 
 	if (*item_id == 0)
 		return true;
@@ -4205,7 +4205,7 @@ static bool build_dataobj_duration(struct stk_tlv_builder *tlv,
 					const void *data, bool cr)
 {
 	const struct stk_duration *duration = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_DURATION;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_DURATION;
 
 	if (duration->interval == 0x00)
 		return true;
@@ -4221,7 +4221,7 @@ static bool build_dataobj_result(struct stk_tlv_builder *tlv,
 					const void *data, bool cr)
 {
 	const struct stk_result *result = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_RESULT;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_RESULT;
 
 	if (!stk_tlv_builder_open_container(tlv, cr, tag, false))
 		return false;
@@ -4243,8 +4243,8 @@ static bool build_dataobj_gsm_sms_tpdu(struct stk_tlv_builder *tlv,
 {
 	const struct sms_deliver *msg = data;
 	struct sms sms;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_GSM_SMS_TPDU;
-	unsigned char tpdu[165];
+	uint8_t tag = STK_DATA_OBJECT_TYPE_GSM_SMS_TPDU;
+	uint8_t tpdu[165];
 	int tpdu_len;
 
 	sms.type = SMS_TYPE_DELIVER;
@@ -4264,9 +4264,9 @@ static bool build_dataobj_ss_string(struct stk_tlv_builder *tlv,
 					const void *data, bool cr)
 {
 	const struct stk_address *addr = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_SS_STRING;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_SS_STRING;
 	unsigned int len;
-	unsigned char number[128];
+	uint8_t number[128];
 
 	if (addr->number == NULL)
 		return true;
@@ -4285,7 +4285,7 @@ static bool build_dataobj_text(struct stk_tlv_builder *tlv,
 					const void *data, bool cr)
 {
 	const struct stk_answer_text *text = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_TEXT;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_TEXT;
 	bool ret;
 
 	if (text->text == NULL && !text->yesno)
@@ -4323,7 +4323,7 @@ static bool build_dataobj_ussd_text(struct stk_tlv_builder *tlv,
 					const void *data, bool cr)
 {
 	const struct stk_ussd_text *text = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_TEXT;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_TEXT;
 
 	if (!text->has_text)
 		return true;
@@ -4347,7 +4347,7 @@ static bool build_dataobj_ussd_string(struct stk_tlv_builder *tlv,
 					const void *data, bool cr)
 {
 	const struct stk_ussd_string *ussd = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_USSD_STRING;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_USSD_STRING;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, false) &&
 		stk_tlv_builder_append_byte(tlv, ussd->dcs) &&
@@ -4362,7 +4362,7 @@ static bool build_dataobj_file_list(struct stk_tlv_builder *tlv,
 	struct l_queue *fl = (void *) data;
 	const struct l_queue_entry *entry = l_queue_get_entries(fl);
 	const struct stk_file *file;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_FILE_LIST;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_FILE_LIST;
 
 	if (!stk_tlv_builder_open_container(tlv, cr, tag, true))
 		return false;
@@ -4399,7 +4399,7 @@ static bool build_dataobj_location_info(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_location_info *li = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_LOCATION_INFO;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_LOCATION_INFO;
 	uint8_t mccmnc[3];
 
 	if (li->mcc[0] == '\0')
@@ -4437,7 +4437,7 @@ static bool build_dataobj_location_info(struct stk_tlv_builder *tlv,
 static bool build_empty_dataobj_location_info(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
-	unsigned char tag = STK_DATA_OBJECT_TYPE_LOCATION_INFO;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_LOCATION_INFO;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, false) &&
 		stk_tlv_builder_close_container(tlv);
@@ -4453,8 +4453,8 @@ static bool build_dataobj_imei(struct stk_tlv_builder *tlv,
 {
 	char byte0[3];
 	const char *imei = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_IMEI;
-	unsigned char value[8];
+	uint8_t tag = STK_DATA_OBJECT_TYPE_IMEI;
+	uint8_t value[8];
 
 	if (imei == NULL)
 		return true;
@@ -4478,7 +4478,7 @@ static bool build_dataobj_help_request(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const ofono_bool_t *help = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_HELP_REQUEST;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_HELP_REQUEST;
 
 	if (*help != true)
 		return true;
@@ -4493,7 +4493,7 @@ static bool build_dataobj_network_measurement_results(
 						const void *data, bool cr)
 {
 	const struct stk_common_byte_array *nmr = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_NETWORK_MEASUREMENT_RESULTS;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_NETWORK_MEASUREMENT_RESULTS;
 
 	if (!stk_tlv_builder_open_container(tlv, cr, tag, false))
 		return false;
@@ -4510,7 +4510,7 @@ static bool build_dataobj_event_list(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_event_list *list = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_EVENT_LIST;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_EVENT_LIST;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, false) &&
 		stk_tlv_builder_append_bytes(tlv, list->list, list->len) &&
@@ -4534,7 +4534,7 @@ static bool build_dataobj_cause(struct stk_tlv_builder *tlv,
 					const void *data, bool cr)
 {
 	const struct stk_cause *cause = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_CAUSE;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_CAUSE;
 
 	if (!cause->has_cause)
 		return true;
@@ -4549,7 +4549,7 @@ static bool build_dataobj_location_status(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const enum stk_service_state *state = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_LOCATION_STATUS;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_LOCATION_STATUS;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, false) &&
 		stk_tlv_builder_append_byte(tlv, *state) &&
@@ -4561,7 +4561,7 @@ static bool build_dataobj_transaction_ids(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_transaction_id *id = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_TRANSACTION_ID;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_TRANSACTION_ID;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, false) &&
 		stk_tlv_builder_append_bytes(tlv, id->list, id->len) &&
@@ -4585,9 +4585,9 @@ static bool build_dataobj_bcch_channel_list(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_bcch_channel_list *list = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_BCCH_CHANNEL_LIST;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_BCCH_CHANNEL_LIST;
 	unsigned int i, bytes, pos, shift;
-	unsigned char value;
+	uint8_t value;
 
 	if (!list->has_list)
 		return true;
@@ -4618,7 +4618,7 @@ static bool build_dataobj_cc_requested_action(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_common_byte_array *action = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_CALL_CONTROL_REQUESTED_ACTION;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_CALL_CONTROL_REQUESTED_ACTION;
 
 	if (action->array == NULL)
 		return true;
@@ -4633,8 +4633,8 @@ static bool build_dataobj_card_reader_status(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_reader_status *status = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_CARD_READER_STATUS;
-	unsigned char byte;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_CARD_READER_STATUS;
+	uint8_t byte;
 
 	byte = status->id |
 		(status->removable << 3) |
@@ -4652,8 +4652,8 @@ static bool build_dataobj_card_reader_status(struct stk_tlv_builder *tlv,
 static bool build_dataobj_timer_id(struct stk_tlv_builder *tlv,
 					const void *data, bool cr)
 {
-	const unsigned char *id = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_TIMER_ID;
+	const uint8_t *id = data;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_TIMER_ID;
 
 	if (id[0] == 0)
 		return true;
@@ -4668,7 +4668,7 @@ static bool build_dataobj_timer_value(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_timer_value *value = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_TIMER_VALUE;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_TIMER_VALUE;
 
 	if (!value->has_value)
 		return true;
@@ -4687,9 +4687,9 @@ static bool build_dataobj_datetime_timezone(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct sms_scts *scts = data;
-	unsigned char value[7];
+	uint8_t value[7];
 	int offset = 0;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_DATETIME_TIMEZONE;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_DATETIME_TIMEZONE;
 
 	if (scts->month == 0 && scts->day == 0)
 		return true;
@@ -4706,7 +4706,7 @@ static bool build_dataobj_datetime_timezone(struct stk_tlv_builder *tlv,
 static bool build_dataobj_at_response(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
-	unsigned char tag = STK_DATA_OBJECT_TYPE_AT_RESPONSE;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_AT_RESPONSE;
 	int len;
 
 	if (data == NULL)
@@ -4730,7 +4730,7 @@ static bool build_dataobj_at_response(struct stk_tlv_builder *tlv,
 static bool build_dataobj_bc_repeat(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
-	unsigned char tag = STK_DATA_OBJECT_TYPE_BC_REPEAT_INDICATOR;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_BC_REPEAT_INDICATOR;
 	const struct stk_bc_repeat *bcr = data;
 
 	if (!bcr->has_bc_repeat)
@@ -4745,7 +4745,7 @@ static bool build_dataobj_bc_repeat(struct stk_tlv_builder *tlv,
 static bool build_dataobj_language(struct stk_tlv_builder *tlv,
 					const void *data, bool cr)
 {
-	unsigned char tag = STK_DATA_OBJECT_TYPE_LANGUAGE;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_LANGUAGE;
 
 	if (data == NULL)
 		return true;
@@ -4765,7 +4765,7 @@ static bool build_dataobj_timing_advance(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_timing_advance *tadv = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_TIMING_ADVANCE;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_TIMING_ADVANCE;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, false) &&
 		stk_tlv_builder_append_byte(tlv, tadv->status) &&
@@ -4779,7 +4779,7 @@ static bool build_dataobj_browser_termination_cause(
 						const void *data, bool cr)
 {
 	const enum stk_browser_termination_cause *cause = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_BROWSER_TERMINATION_CAUSE;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_BROWSER_TERMINATION_CAUSE;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, false) &&
 		stk_tlv_builder_append_byte(tlv, *cause) &&
@@ -4791,7 +4791,7 @@ static bool build_dataobj_bearer_description(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_bearer_description *bd = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_BEARER_DESCRIPTION;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_BEARER_DESCRIPTION;
 
 	if (bd->type != STK_BEARER_TYPE_GPRS_UTRAN)
 		return true;
@@ -4818,7 +4818,7 @@ static bool build_dataobj_channel_data(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_common_byte_array *cd = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_CHANNEL_DATA;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_CHANNEL_DATA;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, true) &&
 		stk_tlv_builder_append_bytes(tlv, cd->array, cd->len) &&
@@ -4830,8 +4830,8 @@ static bool build_dataobj_channel_data_length(
 						struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
-	const unsigned short *length = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_CHANNEL_DATA_LENGTH;
+	const uint16_t *length = data;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_CHANNEL_DATA_LENGTH;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, false) &&
 		stk_tlv_builder_append_byte(tlv, MIN(*length, 255)) &&
@@ -4842,8 +4842,8 @@ static bool build_dataobj_channel_data_length(
 static bool build_dataobj_buffer_size(struct stk_tlv_builder *tlv,
 					const void *data, bool cr)
 {
-	const unsigned short *buf_size = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_BUFFER_SIZE;
+	const uint16_t *buf_size = data;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_BUFFER_SIZE;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, false) &&
 		stk_tlv_builder_append_short(tlv, *buf_size) &&
@@ -4855,8 +4855,8 @@ static bool build_dataobj_channel_status(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_channel *channel = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_CHANNEL_STATUS;
-	unsigned char byte[2];
+	uint8_t tag = STK_DATA_OBJECT_TYPE_CHANNEL_STATUS;
+	uint8_t byte[2];
 
 	switch (channel->status) {
 	case STK_CHANNEL_PACKET_DATA_SERVICE_NOT_ACTIVATED:
@@ -4889,7 +4889,7 @@ static bool build_dataobj_other_address(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_other_address *addr = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_OTHER_ADDRESS;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_OTHER_ADDRESS;
 	bool ok = false;
 
 	if (!addr->type)
@@ -4924,7 +4924,7 @@ static bool build_dataobj_uicc_te_interface(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_uicc_te_interface *iface = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_UICC_TE_INTERFACE;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_UICC_TE_INTERFACE;
 
 	if (iface->protocol == 0 && iface->port == 0)
 		return true;
@@ -4940,7 +4940,7 @@ static bool build_dataobj_access_technologies(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_access_technologies *techs = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_ACCESS_TECHNOLOGY;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_ACCESS_TECHNOLOGY;
 	int i;
 
 	if (!stk_tlv_builder_open_container(tlv, cr, tag, false))
@@ -4970,7 +4970,7 @@ static bool build_dataobj_display_parameters(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_display_parameters *params = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_DISPLAY_PARAMETERS;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_DISPLAY_PARAMETERS;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, false) &&
 		stk_tlv_builder_append_byte(tlv, params->height) &&
@@ -4984,7 +4984,7 @@ static bool build_dataobj_service_record(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_service_record *rec = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_SERVICE_RECORD;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_SERVICE_RECORD;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, true) &&
 		stk_tlv_builder_append_byte(tlv, rec->tech_id) &&
@@ -4998,7 +4998,7 @@ static bool build_dataobj_remote_entity_address(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_remote_entity_address *addr = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_REMOTE_ENTITY_ADDRESS;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_REMOTE_ENTITY_ADDRESS;
 	bool ok = false;
 
 	if (!addr->has_address)
@@ -5030,7 +5030,7 @@ static bool build_dataobj_esn(struct stk_tlv_builder *tlv,
 					const void *data, bool cr)
 {
 	const uint32_t *esn = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_ESN;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_ESN;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, false) &&
 		stk_tlv_builder_append_short(tlv, *esn >> 16) &&
@@ -5043,7 +5043,7 @@ static bool build_dataobj_pdp_context_params(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_common_byte_array *params = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_PDP_ACTIVATION_PARAMETER;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_PDP_ACTIVATION_PARAMETER;
 
 	if (params->len < 1)
 		return true;
@@ -5066,8 +5066,8 @@ static bool build_dataobj_imeisv(struct stk_tlv_builder *tlv,
 {
 	char byte0[3];
 	const char *imeisv = data;
-	unsigned char value[9];
-	unsigned char tag = STK_DATA_OBJECT_TYPE_IMEISV;
+	uint8_t value[9];
+	uint8_t tag = STK_DATA_OBJECT_TYPE_IMEISV;
 
 	if (imeisv == NULL)
 		return true;
@@ -5091,7 +5091,7 @@ static bool build_dataobj_network_search_mode(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const enum stk_network_search_mode *mode = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_NETWORK_SEARCH_MODE;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_NETWORK_SEARCH_MODE;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, false) &&
 		stk_tlv_builder_append_byte(tlv, *mode) &&
@@ -5103,7 +5103,7 @@ static bool build_dataobj_battery_state(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const enum stk_battery_state *state = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_BATTERY_STATE;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_BATTERY_STATE;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, false) &&
 		stk_tlv_builder_append_byte(tlv, *state) &&
@@ -5115,7 +5115,7 @@ static bool build_dataobj_browsing_status(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_common_byte_array *bs = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_BROWSING_STATUS;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_BROWSING_STATUS;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, true) &&
 		stk_tlv_builder_append_bytes(tlv, bs->array, bs->len) &&
@@ -5127,7 +5127,7 @@ static bool build_dataobj_frames_information(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_frames_info *info = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_FRAMES_INFO;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_FRAMES_INFO;
 	unsigned int i;
 
 	if (!stk_tlv_builder_open_container(tlv, cr, tag, false))
@@ -5151,8 +5151,8 @@ static bool build_dataobj_meid(struct stk_tlv_builder *tlv,
 					const void *data, bool cr)
 {
 	const char *meid = data;
-	unsigned char value[8];
-	unsigned char tag = STK_DATA_OBJECT_TYPE_MEID;
+	uint8_t value[8];
+	uint8_t tag = STK_DATA_OBJECT_TYPE_MEID;
 
 	if (meid == NULL)
 		return true;
@@ -5172,7 +5172,7 @@ static bool build_dataobj_mms_id(struct stk_tlv_builder *tlv,
 					const void *data, bool cr)
 {
 	const struct stk_mms_id *id = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_MMS_ID;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_MMS_ID;
 
 	/* Assume the length is never 0 for a valid ID, however the whole
 	 * data object's presence is conditional.  */
@@ -5189,7 +5189,7 @@ static bool build_dataobj_mms_transfer_status(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_mms_transfer_status *mts = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_MMS_TRANSFER_STATUS;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_MMS_TRANSFER_STATUS;
 
 	/*
 	 * Assume the length is never 0 for a valid Result message, however
@@ -5208,7 +5208,7 @@ static bool build_dataobj_i_wlan_access_status(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const enum stk_i_wlan_access_status *status = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_I_WLAN_ACCESS_STATUS;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_I_WLAN_ACCESS_STATUS;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, false) &&
 		stk_tlv_builder_append_byte(tlv, *status) &&
@@ -5220,7 +5220,7 @@ static bool build_dataobj_mms_notification(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_common_byte_array *msg = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_MMS_NOTIFICATION;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_MMS_NOTIFICATION;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, true) &&
 		stk_tlv_builder_append_bytes(tlv, msg->array, msg->len) &&
@@ -5232,7 +5232,7 @@ static bool build_dataobj_last_envelope(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const ofono_bool_t *last = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_LAST_ENVELOPE;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_LAST_ENVELOPE;
 
 	if (!*last)
 		return true;
@@ -5247,7 +5247,7 @@ static bool build_dataobj_registry_application_data(
 						const void *data, bool cr)
 {
 	const struct stk_registry_application_data *rad = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_REGISTRY_APPLICATION_DATA;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_REGISTRY_APPLICATION_DATA;
 	uint8_t dcs;
 	L_AUTO_FREE_VAR(uint8_t *, name);
 	size_t len;
@@ -5280,7 +5280,7 @@ static bool build_dataobj_broadcast_network_information(
 						const void *data, bool cr)
 {
 	const struct stk_broadcast_network_information *bni = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_BROADCAST_NETWORK_INFO;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_BROADCAST_NETWORK_INFO;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, false) &&
 		stk_tlv_builder_append_byte(tlv, bni->tech) &&
@@ -5293,7 +5293,7 @@ static bool build_dataobj_routing_area_id(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_routing_area_info *rai = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_ROUTING_AREA_INFO;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_ROUTING_AREA_INFO;
 	uint8_t mccmnc[3];
 
 	if (rai->mcc[0] == 0)
@@ -5313,7 +5313,7 @@ static bool build_dataobj_update_attach_type(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const enum stk_update_attach_type *type = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_UPDATE_ATTACH_TYPE;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_UPDATE_ATTACH_TYPE;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, false) &&
 		stk_tlv_builder_append_byte(tlv, *type) &&
@@ -5325,7 +5325,7 @@ static bool build_dataobj_rejection_cause_code(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const enum stk_rejection_cause_code *cause = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_REJECTION_CAUSE_CODE;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_REJECTION_CAUSE_CODE;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, false) &&
 		stk_tlv_builder_append_byte(tlv, *cause) &&
@@ -5337,7 +5337,7 @@ static bool build_dataobj_eps_pdn_conn_params(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_common_byte_array *params = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_EPS_PDN_CONN_ACTIVATION_REQ;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_EPS_PDN_CONN_ACTIVATION_REQ;
 
 	if (params->len < 1)
 		return true;
@@ -5355,7 +5355,7 @@ static bool build_dataobj_tracking_area_id(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_tracking_area_id *tai = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_TRACKING_AREA_ID;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_TRACKING_AREA_ID;
 	uint8_t mccmnc[3];
 
 	if (tai->mcc[0] == 0)
@@ -5616,13 +5616,13 @@ static bool build_send_data(struct stk_tlv_builder *builder,
 				NULL);
 }
 
-const unsigned char *stk_pdu_from_response(const struct stk_response *response,
+const uint8_t *stk_pdu_from_response(const struct stk_response *response,
 						unsigned int *out_length)
 {
 	struct stk_tlv_builder builder;
 	bool ok = true;
-	unsigned char tag;
-	static unsigned char pdu[512];
+	uint8_t tag;
+	static uint8_t pdu[512];
 
 	stk_tlv_builder_init(&builder, pdu, sizeof(pdu));
 
@@ -5787,7 +5787,7 @@ static bool build_envelope_dataobj_device_ids(struct stk_tlv_builder *tlv,
 						const void *data, bool cr)
 {
 	const struct stk_envelope *envelope = data;
-	unsigned char tag = STK_DATA_OBJECT_TYPE_DEVICE_IDENTITIES;
+	uint8_t tag = STK_DATA_OBJECT_TYPE_DEVICE_IDENTITIES;
 
 	return stk_tlv_builder_open_container(tlv, cr, tag, false) &&
 		stk_tlv_builder_append_byte(tlv, envelope->src) &&
@@ -6036,14 +6036,14 @@ static bool build_envelope_terminal_apps(struct stk_tlv_builder *builder,
 				0, &ta->last, NULL);
 }
 
-const unsigned char *stk_pdu_from_envelope(const struct stk_envelope *envelope,
+const uint8_t *stk_pdu_from_envelope(const struct stk_envelope *envelope,
 						unsigned int *out_length)
 {
 	struct ber_tlv_builder btlv;
 	struct stk_tlv_builder builder;
 	bool ok = true;
-	static unsigned char buffer[512];
-	unsigned char *pdu;
+	static uint8_t buffer[512];
+	uint8_t *pdu;
 
 	if (ber_tlv_builder_init(&btlv, buffer, sizeof(buffer)) != TRUE)
 		return NULL;
@@ -6280,7 +6280,7 @@ static void start_format(struct l_string *string, uint16_t attr)
 }
 
 char *stk_text_to_html(const char *utf8,
-				const unsigned short *attrs, int num_attrs)
+				const uint16_t *attrs, int num_attrs)
 {
 	long text_len = l_utf8_strlen(utf8);
 	struct l_string *string = l_string_new(strlen(utf8) + 1);
@@ -6396,9 +6396,9 @@ static const char chars_table[] = {
 	'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
 	'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '+', '.' };
 
-char *stk_image_to_xpm(const unsigned char *img, unsigned int len,
-			enum stk_img_scheme scheme, const unsigned char *clut,
-			unsigned short clut_len)
+char *stk_image_to_xpm(const uint8_t *img, unsigned int len,
+			enum stk_img_scheme scheme, const uint8_t *clut,
+			uint16_t clut_len)
 {
 	uint8_t width, height;
 	unsigned int ncolors, nbits, entry, cpp;
diff --git a/src/stkutil.h b/src/stkutil.h
index 6258e33c..042d10f8 100644
--- a/src/stkutil.h
+++ b/src/stkutil.h
@@ -646,13 +646,13 @@ enum stk_transport_protocol_type {
 
 /* For data object that only has a byte array with undetermined length */
 struct stk_common_byte_array {
-	unsigned char *array;
+	uint8_t *array;
 	unsigned int len;
 };
 
 /* Defined in TS 102.223 Section 8.1 */
 struct stk_address {
-	unsigned char ton_npi;
+	uint8_t ton_npi;
 	char *number;
 };
 
@@ -671,9 +671,9 @@ struct stk_address {
  * bytes."
  */
 struct stk_subaddress {
-	ofono_bool_t has_subaddr;
-	unsigned char len;
-	unsigned char subaddr[23];
+	bool has_subaddr;
+	uint8_t len;
+	uint8_t subaddr[23];
 };
 
 /*
@@ -688,14 +688,14 @@ struct stk_subaddress {
  * The CCP structure is not decoded, but stored as is from the CTLV
  */
 struct stk_ccp {
-	unsigned char len;
-	unsigned char ccp[16];
+	uint8_t len;
+	uint8_t ccp[16];
 };
 
 /* Defined in TS 31.111 Section 8.5 */
 struct stk_cbs_page {
-	unsigned char len;
-	unsigned char page[88];
+	uint8_t len;
+	uint8_t page[88];
 };
 
 /*
@@ -704,12 +704,12 @@ struct stk_cbs_page {
  */
 struct stk_duration {
 	enum stk_duration_type unit;
-	unsigned char interval;
+	uint8_t interval;
 };
 
 /* Defined in TS 102.223 Section 8.9 */
 struct stk_item {
-	unsigned char id;
+	uint8_t id;
 	char *text;
 };
 
@@ -718,27 +718,27 @@ struct stk_item {
  * to 0.
  */
 struct stk_response_length {
-	unsigned char min;
-	unsigned char max;
+	uint8_t min;
+	uint8_t max;
 };
 
 /* Defined in TS 102.223 Section 8.12 */
 struct stk_result {
 	enum stk_result_type type;
 	unsigned int additional_len;
-	unsigned char *additional;
+	uint8_t *additional;
 };
 
 /* Defined in TS 102.223 Section 8.14 */
 struct stk_ss {
-	unsigned char ton_npi;
+	uint8_t ton_npi;
 	char *ss;
 };
 
 /* Defined in TS 131.111 Section 8.17.  Length limit of 160 chars in 23.028 */
 struct stk_ussd_string {
-	unsigned char dcs;
-	unsigned char string[160];
+	uint8_t dcs;
+	uint8_t string[160];
 	int len;
 };
 
@@ -750,7 +750,7 @@ struct stk_ussd_string {
  * 2 bytes of 2nd level Dedicated File and 2 bytes of Elementary File.
  */
 struct stk_file {
-	unsigned char file[8];
+	uint8_t file[8];
 	unsigned int len;
 };
 
@@ -758,13 +758,13 @@ struct stk_file {
 struct stk_location_info {
 	char mnc[OFONO_MAX_MNC_LENGTH + 1];
 	char mcc[OFONO_MAX_MCC_LENGTH + 1];
-	unsigned short lac_tac;
-	ofono_bool_t has_ci;
-	unsigned short ci;
-	ofono_bool_t has_ext_ci;
-	unsigned short ext_ci;
-	ofono_bool_t has_eutran_ci;
-	guint32 eutran_ci;
+	uint16_t lac_tac;
+	bool has_ci;
+	uint16_t ci;
+	bool has_ext_ci;
+	uint16_t ext_ci;
+	bool has_eutran_ci;
+	uint32_t eutran_ci;
 };
 
 /*
@@ -772,7 +772,7 @@ struct stk_location_info {
  * that the maximum size is 127 according to the rules of CTLVs.
  */
 struct stk_items_next_action_indicator {
-	unsigned char list[127];
+	uint8_t list[127];
 	unsigned int len;
 };
 
@@ -781,7 +781,7 @@ struct stk_items_next_action_indicator {
  * one should appear more than once.
  */
 struct stk_event_list {
-	unsigned char list[21];
+	uint8_t list[21];
 	unsigned int len;
 };
 
@@ -789,9 +789,9 @@ struct stk_event_list {
  * According to 102.223 Section 8.26, the maximum length of cause is 30.
  */
 struct stk_cause {
-	unsigned char cause[30];
+	uint8_t cause[30];
 	unsigned int len;
-	ofono_bool_t has_cause;
+	bool has_cause;
 };
 
 /*
@@ -799,7 +799,7 @@ struct stk_cause {
  * that the maximum size is 127 according to the rules of CTLVs.
  */
 struct stk_transaction_id {
-	unsigned char list[127];
+	uint8_t list[127];
 	unsigned int len;
 };
 
@@ -809,9 +809,9 @@ struct stk_transaction_id {
  * is represented as 10 bits, so the maximum number of channel is 127*8/10=101.
  */
 struct stk_bcch_channel_list {
-	unsigned short channels[101];
+	uint16_t channels[101];
 	unsigned int num;
-	ofono_bool_t has_list;
+	bool has_list;
 };
 
 /*
@@ -820,8 +820,8 @@ struct stk_bcch_channel_list {
  * ids of 0, we use icon_id with 0 to denote empty icon_identifier objects
  */
 struct stk_icon_id {
-	unsigned char qualifier;
-	unsigned char id;
+	uint8_t qualifier;
+	uint8_t id;
 };
 
 /*
@@ -831,19 +831,19 @@ struct stk_icon_id {
  * identifier list is 126.
  */
 struct stk_item_icon_id_list {
-	unsigned char qualifier;
-	unsigned char list[126];
+	uint8_t qualifier;
+	uint8_t list[126];
 	unsigned int len;
 };
 
 /* Defined in TS 102.223 Section 8.33 */
 struct stk_reader_status {
 	int id;
-	ofono_bool_t removable;
-	ofono_bool_t present;
-	ofono_bool_t id1_size;
-	ofono_bool_t card_present;
-	ofono_bool_t card_powered;
+	bool removable;
+	bool present;
+	bool id1_size;
+	bool card_present;
+	bool card_powered;
 };
 
 /*
@@ -851,7 +851,7 @@ struct stk_reader_status {
  * that the maximum size is 127 according to the rules of CTLVs.
  */
 struct stk_card_atr {
-	unsigned char atr[127];
+	uint8_t atr[127];
 	unsigned int len;
 };
 
@@ -860,60 +860,60 @@ struct stk_card_atr {
  * of data is 236.
  */
 struct stk_c_apdu {
-	unsigned char cla;
-	unsigned char ins;
-	unsigned char p1;
-	unsigned char p2;
-	unsigned char lc;
-	unsigned char data[236];
-	ofono_bool_t has_le;
-	unsigned char le;
+	uint8_t cla;
+	uint8_t ins;
+	uint8_t p1;
+	uint8_t p2;
+	uint8_t lc;
+	uint8_t data[236];
+	bool has_le;
+	uint8_t le;
 };
 
 /* Defined in TS 102.223 Section 8.36. According to it, the maximum size
  * of data is 237.
  */
 struct stk_r_apdu {
-	unsigned char sw1;
-	unsigned char sw2;
-	unsigned char data[237];
+	uint8_t sw1;
+	uint8_t sw2;
+	uint8_t data[237];
 	unsigned int len;
 };
 
 /* Defined in TS 102.223 Section 8.38 */
 struct stk_timer_value {
-	ofono_bool_t has_value;
-	unsigned char hour;
-	unsigned char minute;
-	unsigned char second;
+	bool has_value;
+	uint8_t hour;
+	uint8_t minute;
+	uint8_t second;
 };
 
 /* Defined in TS 102.223 Section 8.42 */
 struct stk_bc_repeat {
-	ofono_bool_t has_bc_repeat;
-	unsigned char value;
+	bool has_bc_repeat;
+	uint8_t value;
 };
 
 /* Defined in TS 31.111 Section 8.46 */
 struct stk_timing_advance {
-	ofono_bool_t has_value;
+	bool has_value;
 	enum stk_me_status status;
 	/*
 	 * Contains bit periods number according to 3GPP TS
 	 * 44.118 Section 9.3.106 / 3GPP TS 44.018 Section
 	 * 10.5.2.40.1, not microseconds
 	 */
-	unsigned char advance;
+	uint8_t advance;
 };
 
 /* Bearer parameters for GPRS/UTRAN Packet Service/E-UTRAN */
 struct stk_gprs_bearer_parameters {
-	unsigned char precedence;
-	unsigned char delay;
-	unsigned char reliability;
-	unsigned char peak;
-	unsigned char mean;
-	unsigned char pdp_type;
+	uint8_t precedence;
+	uint8_t delay;
+	uint8_t reliability;
+	uint8_t peak;
+	uint8_t mean;
+	uint8_t pdp_type;
 };
 
 /* Defined in TS 31.111 Section 8.52 */
@@ -927,8 +927,8 @@ struct stk_bearer_description {
  * that the maximum size is 127 according to the rules of CTLVs.
  */
 struct stk_card_reader_id {
-	unsigned char id[127];
-	unsigned char len;
+	uint8_t id[127];
+	uint8_t len;
 };
 
 /*
@@ -939,7 +939,7 @@ struct stk_other_address {
 	union {
 		/* Network Byte Order */
 		guint32 ipv4;
-		unsigned char ipv6[16];
+		uint8_t ipv6[16];
 	} addr;
 	enum stk_address_type type;
 };
@@ -947,7 +947,7 @@ struct stk_other_address {
 /* Defined in TS 102.223 Section 8.59 */
 struct stk_uicc_te_interface {
 	enum stk_transport_protocol_type protocol;
-	unsigned short port;
+	uint16_t port;
 };
 
 /*
@@ -957,43 +957,43 @@ struct stk_uicc_te_interface {
  * So the maximum size of aid is 16 bytes.
  */
 struct stk_aid {
-	unsigned char aid[16];
+	uint8_t aid[16];
 	unsigned int len;
 };
 
 /* Defined in TS 102.223 Section 8.62 */
 struct stk_display_parameters {
-	unsigned char height;
-	unsigned char width;
-	unsigned char effects;
+	uint8_t height;
+	uint8_t width;
+	uint8_t effects;
 };
 
 /* Defined in TS 102.223 Section 8.63 */
 struct stk_service_record {
-	unsigned char tech_id;
-	unsigned char serv_id;
-	unsigned char *serv_rec;
+	uint8_t tech_id;
+	uint8_t serv_id;
+	uint8_t *serv_rec;
 	unsigned int len;
 };
 
 /* Defined in TS 102.223 Section 8.64 */
 struct stk_device_filter {
-	unsigned char tech_id;
-	unsigned char *dev_filter;
+	uint8_t tech_id;
+	uint8_t *dev_filter;
 	unsigned int len;
 };
 
 /* Defined in TS 102.223 Section 8.65 */
 struct stk_service_search {
-	unsigned char tech_id;
-	unsigned char *ser_search;
+	uint8_t tech_id;
+	uint8_t *ser_search;
 	unsigned int len;
 };
 
 /* Defined in TS 102.223 Section 8.66 */
 struct stk_attribute_info {
-	unsigned char tech_id;
-	unsigned char *attr_info;
+	uint8_t tech_id;
+	uint8_t *attr_info;
 	unsigned int len;
 };
 
@@ -1002,11 +1002,11 @@ struct stk_attribute_info {
  * 6-bytes IEEE-802 address, or 4-bytes IrDA device address.
  */
 struct stk_remote_entity_address {
-	unsigned char coding_type;
-	ofono_bool_t has_address;
+	uint8_t coding_type;
+	bool has_address;
 	union {
-		unsigned char ieee802[6];
-		unsigned char irda[4];
+		uint8_t ieee802[6];
+		uint8_t irda[4];
 	} addr;
 };
 
@@ -1016,14 +1016,14 @@ struct stk_remote_entity_address {
  * of CTLVs.  Empty attribute options will have len of 0.
  */
 struct stk_text_attribute {
-	unsigned char attributes[127];
-	unsigned char len;
+	uint8_t attributes[127];
+	uint8_t len;
 };
 
 /* Defined in TS 31.111 Section 8.72 */
 struct stk_pdp_act_par {
-	unsigned char par[127];
-	unsigned char len;
+	uint8_t par[127];
+	uint8_t len;
 };
 
 /*
@@ -1033,8 +1033,8 @@ struct stk_pdp_act_par {
  * is 124.
  */
 struct stk_item_text_attribute_list {
-	unsigned char list[124];
-	unsigned char len;
+	uint8_t list[124];
+	uint8_t len;
 };
 
 /*
@@ -1043,8 +1043,8 @@ struct stk_item_text_attribute_list {
  * relative-sized frame. Thus the maximum length of relative size is 126 bytes.
  */
 struct stk_frame_layout {
-	unsigned char layout;
-	unsigned char size[126];
+	uint8_t layout;
+	uint8_t size[126];
 	unsigned int len;
 };
 
@@ -1055,17 +1055,17 @@ struct stk_frame_layout {
  * list is 126 bytes.
  */
 struct stk_frames_info {
-	unsigned char id;
+	uint8_t id;
 	struct {
-		unsigned char width, height;
+		uint8_t width, height;
 	} list[63];
 	unsigned int len;
 };
 
 /* Defined in TS 102.223 Section 8.80 */
 struct stk_frame_id {
-	ofono_bool_t has_id;
-	unsigned char id;
+	bool has_id;
+	uint8_t id;
 };
 
 /*
@@ -1073,8 +1073,8 @@ struct stk_frame_id {
  * that the maximum size is 127 according to the rules of CTLVs.
  */
 struct stk_mms_reference {
-	unsigned char ref[127];
-	unsigned char len;
+	uint8_t ref[127];
+	uint8_t len;
 };
 
 /*
@@ -1082,8 +1082,8 @@ struct stk_mms_reference {
  * that the maximum size is 127 according to the rules of CTLVs.
  */
 struct stk_mms_id {
-	unsigned char id[127];
-	unsigned char len;
+	uint8_t id[127];
+	uint8_t len;
 };
 
 /*
@@ -1091,8 +1091,8 @@ struct stk_mms_id {
  * that the maximum size is 127 according to the rules of CTLVs.
  */
 struct stk_mms_transfer_status {
-	unsigned char status[127];
-	unsigned char len;
+	uint8_t status[127];
+	uint8_t len;
 };
 
 /*
@@ -1100,14 +1100,14 @@ struct stk_mms_transfer_status {
  * that the maximum size is 127 according to the rules of CTLVs.
  */
 struct stk_mms_content_id {
-	unsigned char id[127];
-	unsigned char len;
+	uint8_t id[127];
+	uint8_t len;
 };
 
 /* Defined in TS 102.223 Section 8.88 */
 struct stk_registry_application_data {
-	unsigned short port;
-	unsigned char type;
+	uint16_t port;
+	uint8_t type;
 	char *name;
 };
 
@@ -1118,8 +1118,8 @@ struct stk_registry_application_data {
  * location information is 126 bytes.
  */
 struct stk_broadcast_network_information {
-	unsigned char tech;
-	unsigned char loc_info[126];
+	uint8_t tech;
+	uint8_t loc_info[126];
 	unsigned int len;
 };
 
@@ -1127,21 +1127,21 @@ struct stk_broadcast_network_information {
 struct stk_routing_area_info {
 	char mnc[OFONO_MAX_MNC_LENGTH + 1];
 	char mcc[OFONO_MAX_MCC_LENGTH + 1];
-	unsigned short lac;
-	unsigned char rac;
+	uint16_t lac;
+	uint8_t rac;
 };
 
 /* Defined in TS 131.111 Section 8.99 */
 struct stk_tracking_area_id {
 	char mnc[OFONO_MAX_MNC_LENGTH + 1];
 	char mcc[OFONO_MAX_MCC_LENGTH + 1];
-	unsigned short tac;
+	uint16_t tac;
 };
 
 struct stk_command_display_text {
 	char *text;
 	struct stk_icon_id icon_id;
-	ofono_bool_t immediate_response;
+	bool immediate_response;
 	struct stk_duration duration;
 	struct stk_text_attribute text_attr;
 	struct stk_frame_id frame_id;
@@ -1166,7 +1166,7 @@ struct stk_command_get_input {
 
 struct stk_command_play_tone {
 	char *alpha_id;
-	unsigned char tone;
+	uint8_t tone;
 	struct stk_duration duration;
 	struct stk_icon_id icon_id;
 	struct stk_text_attribute text_attr;
@@ -1191,7 +1191,7 @@ struct stk_command_select_item {
 	char *alpha_id;
 	struct l_queue *items;
 	struct stk_items_next_action_indicator next_act;
-	unsigned char item_id;
+	uint8_t item_id;
 	struct stk_icon_id icon_id;
 	struct stk_item_icon_id_list item_icon_id_list;
 	struct stk_text_attribute text_attr;
@@ -1256,7 +1256,7 @@ struct stk_command_perform_card_apdu {
 };
 
 struct stk_command_timer_mgmt {
-	unsigned char timer_id;
+	uint8_t timer_id;
 	struct stk_timer_value timer_value;
 };
 
@@ -1288,7 +1288,7 @@ struct stk_command_language_notification {
 };
 
 struct stk_command_launch_browser {
-	unsigned char browser_id;
+	uint8_t browser_id;
 	char *url;
 	struct stk_common_byte_array bearer;
 	struct l_queue *prov_file_refs;
@@ -1306,7 +1306,7 @@ struct stk_command_open_channel {
 	char *alpha_id;
 	struct stk_icon_id icon_id;
 	struct stk_bearer_description bearer_desc;
-	unsigned short buf_size;
+	uint16_t buf_size;
 	char *apn;
 	struct stk_other_address local_addr;
 	char *text_usr;
@@ -1327,7 +1327,7 @@ struct stk_command_close_channel {
 struct stk_command_receive_data {
 	char *alpha_id;
 	struct stk_icon_id icon_id;
-	unsigned char data_len;
+	uint8_t data_len;
 	struct stk_text_attribute text_attr;
 	struct stk_frame_id frame_id;
 };
@@ -1391,12 +1391,12 @@ struct stk_command_submit_mms {
 struct stk_command_display_mms {
 	struct l_queue *mms_subm_files;
 	struct stk_mms_id mms_id;
-	ofono_bool_t imd_resp;
+	bool imd_resp;
 	struct stk_frame_id frame_id;
 };
 
 struct stk_command_activate {
-	unsigned char actv_desc;
+	uint8_t actv_desc;
 };
 
 enum stk_command_parse_result {
@@ -1407,9 +1407,9 @@ enum stk_command_parse_result {
 };
 
 struct stk_command {
-	unsigned char number;
-	unsigned char type;
-	unsigned char qualifier;
+	uint8_t number;
+	uint8_t type;
+	uint8_t qualifier;
 	enum stk_device_identity_type src;
 	enum stk_device_identity_type dst;
 	enum stk_command_parse_result status;
@@ -1458,8 +1458,8 @@ struct stk_response_generic {
 
 struct stk_answer_text {
 	char *text;
-	ofono_bool_t packed;
-	ofono_bool_t yesno;
+	bool packed;
+	bool yesno;
 	/*
 	 * If a "Yes/No" answer was requested in a GET INKEY command,
 	 * .yesno must be TRUE and text should be non-NULL to indicate
@@ -1468,14 +1468,14 @@ struct stk_answer_text {
 };
 
 struct stk_ussd_text {
-	ofono_bool_t has_text;
-	const unsigned char *text;
+	bool has_text;
+	const uint8_t *text;
 	int dcs;
 	int len;
 };
 
 struct stk_channel {
-	unsigned char id;
+	uint8_t id;
 	enum stk_channel_status status;
 };
 
@@ -1493,13 +1493,13 @@ struct stk_response_poll_interval {
 };
 
 struct stk_response_select_item {
-	unsigned char item_id;
+	uint8_t item_id;
 };
 
 struct stk_response_set_up_call {
 	struct stk_common_byte_array cc_requested_action;
 	struct {
-		ofono_bool_t cc_modified;
+		bool cc_modified;
 		struct stk_result result;
 	} modified_result;
 };
@@ -1542,7 +1542,7 @@ struct stk_response_local_info {
 };
 
 struct stk_response_timer_mgmt {
-	unsigned char id;
+	uint8_t id;
 	struct stk_timer_value value;
 };
 
@@ -1557,16 +1557,16 @@ struct stk_response_send_ussd {
 struct stk_response_open_channel {
 	struct stk_channel channel;
 	struct stk_bearer_description bearer_desc;
-	unsigned short buf_size;
+	uint16_t buf_size;
 };
 
 struct stk_response_receive_data {
 	struct stk_common_byte_array rx_data;
-	unsigned short rx_remaining;
+	uint16_t rx_remaining;
 };
 
 struct stk_response_send_data {
-	unsigned short tx_avail;
+	uint16_t tx_avail;
 };
 
 struct stk_response_channel_status {
@@ -1574,9 +1574,9 @@ struct stk_response_channel_status {
 };
 
 struct stk_response {
-	unsigned char number;
-	unsigned char type;
-	unsigned char qualifier;
+	uint8_t number;
+	uint8_t type;
+	uint8_t qualifier;
 	enum stk_device_identity_type src;
 	enum stk_device_identity_type dst;
 	struct stk_result result;
@@ -1623,8 +1623,8 @@ struct stk_envelope_cbs_pp_download {
 };
 
 struct stk_envelope_menu_selection {
-	unsigned char item_id;
-	ofono_bool_t help_request;
+	uint8_t item_id;
+	bool help_request;
 };
 
 struct stk_envelope_sms_mo_control {
@@ -1670,12 +1670,12 @@ struct stk_envelope_event_download {
 	enum stk_event_type type;
 	union {
 		struct {
-			unsigned char transaction_id;
+			uint8_t transaction_id;
 			struct stk_address caller_address;
 			struct stk_subaddress caller_subaddress;
 		} mt_call;
 		struct {
-			unsigned char transaction_id;
+			uint8_t transaction_id;
 		} call_connected;
 		struct {
 			struct stk_transaction_id transaction_ids;
@@ -1693,7 +1693,7 @@ struct stk_envelope_event_download {
 		} browser_termination;
 		struct {
 			struct stk_channel channel;
-			unsigned short channel_data_len;
+			uint16_t channel_data_len;
 		} data_available;
 		struct {
 			struct stk_channel channel;
@@ -1729,7 +1729,7 @@ struct stk_envelope_event_download {
 };
 
 struct stk_envelope_timer_expiration {
-	unsigned char id;
+	uint8_t id;
 	struct stk_timer_value value;
 };
 
@@ -1745,13 +1745,13 @@ struct stk_envelope_mms_transfer_status {
 
 struct stk_envelope_mms_notification_download {
 	struct stk_common_byte_array msg;
-	ofono_bool_t last;
+	bool last;
 };
 
 struct stk_envelope_terminal_apps {
 	struct stk_registry_application_data *list;
 	int count;
-	ofono_bool_t last;
+	bool last;
 };
 
 struct stk_envelope {
@@ -1773,16 +1773,15 @@ struct stk_envelope {
 	};
 };
 
-struct stk_command *stk_command_new_from_pdu(const unsigned char *pdu,
-						unsigned int len);
+struct stk_command *stk_command_new_from_pdu(const uint8_t *pdu,
+							unsigned int len);
 void stk_command_free(struct stk_command *command);
 
-const unsigned char *stk_pdu_from_response(const struct stk_response *response,
+const uint8_t *stk_pdu_from_response(const struct stk_response *response,
 						unsigned int *out_length);
-const unsigned char *stk_pdu_from_envelope(const struct stk_envelope *envelope,
+const uint8_t *stk_pdu_from_envelope(const struct stk_envelope *envelope,
 						unsigned int *out_length);
-char *stk_text_to_html(const char *text,
-				const unsigned short *attrs, int num_attrs);
-char *stk_image_to_xpm(const unsigned char *img, unsigned int len,
-			enum stk_img_scheme scheme, const unsigned char *clut,
-			unsigned short clut_len);
+char *stk_text_to_html(const char *text, const uint16_t *attrs, int num_attrs);
+char *stk_image_to_xpm(const uint8_t *img, unsigned int len,
+			enum stk_img_scheme scheme, const uint8_t *clut,
+			uint16_t clut_len);