Index: uspace/lib/c/generic/inet/addr.c
===================================================================
--- uspace/lib/c/generic/inet/addr.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/lib/c/generic/inet/addr.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -290,5 +290,5 @@
 }
 
-static int inet_addr_parse_v4(const char *str, inet_addr_t *raddr,
+static errno_t inet_addr_parse_v4(const char *str, inet_addr_t *raddr,
     int *prefix, char **endptr)
 {
@@ -299,5 +299,5 @@
 
 	while (i < 4) {
-		int rc = str_uint8_t(cur, (const char **)&cur, 10, false, &b);
+		errno_t rc = str_uint8_t(cur, (const char **)&cur, 10, false, &b);
 		if (rc != EOK)
 			return rc;
@@ -339,5 +339,5 @@
 }
 
-static int inet_addr_parse_v6(const char *str, inet_addr_t *raddr, int *prefix,
+static errno_t inet_addr_parse_v6(const char *str, inet_addr_t *raddr, int *prefix,
     char **endptr)
 {
@@ -362,5 +362,5 @@
 		uint16_t bioctet;
 		const char *gend;
-		int rc = str_uint16_t(cur, &gend, 16, false, &bioctet);
+		errno_t rc = str_uint16_t(cur, &gend, 16, false, &bioctet);
 		if (rc != EOK)
 			break;
@@ -446,7 +446,7 @@
  *
  */
-int inet_addr_parse(const char *text, inet_addr_t *addr, char **endptr)
-{
-	int rc;
+errno_t inet_addr_parse(const char *text, inet_addr_t *addr, char **endptr)
+{
+	errno_t rc;
 
 	rc = inet_addr_parse_v4(text, addr, NULL, endptr);
@@ -473,7 +473,7 @@
  *
  */
-int inet_naddr_parse(const char *text, inet_naddr_t *naddr, char **endptr)
-{
-	int rc;
+errno_t inet_naddr_parse(const char *text, inet_naddr_t *naddr, char **endptr)
+{
+	errno_t rc;
 	inet_addr_t addr;
 	int prefix;
@@ -494,5 +494,5 @@
 }
 
-static int inet_addr_format_v4(addr32_t addr, char **bufp)
+static errno_t inet_addr_format_v4(addr32_t addr, char **bufp)
 {
 	int rc;
@@ -506,5 +506,5 @@
 }
 
-static int inet_addr_format_v6(const addr128_t addr, char **bufp)
+static errno_t inet_addr_format_v6(const addr128_t addr, char **bufp)
 {
 	*bufp = (char *) malloc(INET6_ADDRSTRLEN);
@@ -581,7 +581,7 @@
  *
  */
-int inet_addr_format(const inet_addr_t *addr, char **bufp)
-{
-	int rc;
+errno_t inet_addr_format(const inet_addr_t *addr, char **bufp)
+{
+	errno_t rc;
 	int ret;
 
@@ -616,7 +616,7 @@
  *
  */
-int inet_naddr_format(const inet_naddr_t *naddr, char **bufp)
-{
-	int rc;
+errno_t inet_naddr_format(const inet_naddr_t *naddr, char **bufp)
+{
+	errno_t rc;
 	int ret;
 	char *astr;
Index: uspace/lib/c/generic/inet/host.c
===================================================================
--- uspace/lib/c/generic/inet/host.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/lib/c/generic/inet/host.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -54,5 +54,5 @@
  *         extra characters at the end. ENOMEM if out of memory
  */
-int inet_host_parse(const char *str, inet_host_t **rhost,
+errno_t inet_host_parse(const char *str, inet_host_t **rhost,
     char **endptr)
 {
@@ -61,5 +61,5 @@
 	char *name;
 	char *aend;
-	int rc;
+	errno_t rc;
 
 	host = calloc(1, sizeof(inet_host_t));
@@ -106,7 +106,7 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-int inet_host_format(inet_host_t *host, char **rstr)
-{
-	int rc;
+errno_t inet_host_format(inet_host_t *host, char **rstr)
+{
+	errno_t rc;
 	char *str = NULL;
 
@@ -161,8 +161,8 @@
  * @reutrn EOK on success, ENOENT on resolurion failure
  */
-int inet_host_lookup_one(inet_host_t *host, ip_ver_t version, inet_addr_t *addr)
+errno_t inet_host_lookup_one(inet_host_t *host, ip_ver_t version, inet_addr_t *addr)
 {
 	dnsr_hostinfo_t *hinfo = NULL;
-	int rc;
+	errno_t rc;
 
 	switch (host->hform) {
@@ -201,10 +201,10 @@
  *         ENOMEM if out of memory
  */
-int inet_host_plookup_one(const char *str, ip_ver_t version, inet_addr_t *addr,
+errno_t inet_host_plookup_one(const char *str, ip_ver_t version, inet_addr_t *addr,
     char **endptr, const char **errmsg)
 {
 	inet_host_t *host = NULL;
 	char *eptr;
-	int rc;
+	errno_t rc;
 
 	rc = inet_host_parse(str, &host, endptr != NULL ? &eptr : NULL);
Index: uspace/lib/c/generic/inet/hostname.c
===================================================================
--- uspace/lib/c/generic/inet/hostname.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/lib/c/generic/inet/hostname.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -58,5 +58,5 @@
  *         extra characters at the end. ENOMEM if out of memory
  */
-int inet_hostname_parse(const char *str, char **rname, char **endptr)
+errno_t inet_hostname_parse(const char *str, char **rname, char **endptr)
 {
 	const char *c;
Index: uspace/lib/c/generic/inet/hostport.c
===================================================================
--- uspace/lib/c/generic/inet/hostport.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/lib/c/generic/inet/hostport.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -56,5 +56,5 @@
  *         extra characters at the end. ENOMEM if out of memory
  */
-int inet_hostport_parse(const char *str, inet_hostport_t **rhp,
+errno_t inet_hostport_parse(const char *str, inet_hostport_t **rhp,
     char **endptr)
 {
@@ -65,5 +65,5 @@
 	char *aend;
 	const char *pend;
-	int rc;
+	errno_t rc;
 
 	hp = calloc(1, sizeof(inet_hostport_t));
@@ -137,7 +137,7 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-int inet_hostport_format(inet_hostport_t *hp, char **rstr)
-{
-	int rc;
+errno_t inet_hostport_format(inet_hostport_t *hp, char **rstr)
+{
+	errno_t rc;
 	int ret;
 	char *astr, *str;
@@ -211,9 +211,9 @@
  * @return EOK on success, ENOENT on resolution failure
  */
-int inet_hostport_lookup_one(inet_hostport_t *hp, ip_ver_t version,
+errno_t inet_hostport_lookup_one(inet_hostport_t *hp, ip_ver_t version,
     inet_ep_t *ep)
 {
 	dnsr_hostinfo_t *hinfo = NULL;
-	int rc;
+	errno_t rc;
 
 	inet_ep_init(ep);
@@ -255,10 +255,10 @@
  *         ENOMEM if out of memory
  */
-int inet_hostport_plookup_one(const char *str, ip_ver_t version, inet_ep_t *ep,
+errno_t inet_hostport_plookup_one(const char *str, ip_ver_t version, inet_ep_t *ep,
     char **endptr, const char **errmsg)
 {
 	inet_hostport_t *hp = NULL;
 	char *eptr;
-	int rc;
+	errno_t rc;
 
 	rc = inet_hostport_parse(str, &hp, endptr != NULL ? &eptr : NULL);
Index: uspace/lib/c/generic/inet/tcp.c
===================================================================
--- uspace/lib/c/generic/inet/tcp.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/lib/c/generic/inet/tcp.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -42,5 +42,5 @@
 
 static void tcp_cb_conn(ipc_callid_t, ipc_call_t *, void *);
-static int tcp_conn_fibril(void *);
+static errno_t tcp_conn_fibril(void *);
 
 /** Incoming TCP connection info
@@ -61,5 +61,5 @@
  * @return EOK on success or an error code
  */
-static int tcp_callback_create(tcp_t *tcp)
+static errno_t tcp_callback_create(tcp_t *tcp)
 {
 	async_exch_t *exch = async_exchange_begin(tcp->sess);
@@ -68,5 +68,5 @@
 	
 	port_id_t port;
-	int rc = async_create_callback_port(exch, INTERFACE_TCP_CB, 0, 0,
+	errno_t rc = async_create_callback_port(exch, INTERFACE_TCP_CB, 0, 0,
 	    tcp_cb_conn, tcp, &port);
 	
@@ -76,5 +76,5 @@
 		return rc;
 
-	int retval;
+	errno_t retval;
 	async_wait_for(req, &retval);
 
@@ -88,9 +88,9 @@
  *         cannot be contacted
  */
-int tcp_create(tcp_t **rtcp)
+errno_t tcp_create(tcp_t **rtcp)
 {
 	tcp_t *tcp;
 	service_id_t tcp_svcid;
-	int rc;
+	errno_t rc;
 
 	tcp = calloc(1, sizeof(tcp_t));
@@ -161,5 +161,5 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-static int tcp_conn_new(tcp_t *tcp, sysarg_t id, tcp_cb_t *cb, void *arg,
+static errno_t tcp_conn_new(tcp_t *tcp, sysarg_t id, tcp_cb_t *cb, void *arg,
     tcp_conn_t **rconn)
 {
@@ -207,5 +207,5 @@
  * @return EOK on success or an error code.
  */
-int tcp_conn_create(tcp_t *tcp, inet_ep2_t *epp, tcp_cb_t *cb, void *arg,
+errno_t tcp_conn_create(tcp_t *tcp, inet_ep2_t *epp, tcp_cb_t *cb, void *arg,
     tcp_conn_t **rconn)
 {
@@ -216,10 +216,10 @@
 	exch = async_exchange_begin(tcp->sess);
 	aid_t req = async_send_0(exch, TCP_CONN_CREATE, &answer);
-	int rc = async_data_write_start(exch, (void *)epp,
+	errno_t rc = async_data_write_start(exch, (void *)epp,
 	    sizeof(inet_ep2_t));
 	async_exchange_end(exch);
 
 	if (rc != EOK) {
-		int rc_orig;
+		errno_t rc_orig;
 		async_wait_for(req, &rc_orig);
 		if (rc_orig != EOK)
@@ -240,5 +240,5 @@
 	return EOK;
 error:
-	return (int) rc;
+	return (errno_t) rc;
 }
 
@@ -260,5 +260,5 @@
 
 	exch = async_exchange_begin(conn->tcp->sess);
-	int rc = async_req_1_0(exch, TCP_CONN_DESTROY, conn->id);
+	errno_t rc = async_req_1_0(exch, TCP_CONN_DESTROY, conn->id);
 	async_exchange_end(exch);
 
@@ -275,5 +275,5 @@
  * @return EOK on success, EINVAL if no connection with the given ID exists
  */
-static int tcp_conn_get(tcp_t *tcp, sysarg_t id, tcp_conn_t **rconn)
+static errno_t tcp_conn_get(tcp_t *tcp, sysarg_t id, tcp_conn_t **rconn)
 {
 	list_foreach(tcp->conn, ltcp, tcp_conn_t, conn) {
@@ -318,5 +318,5 @@
  * @return EOK on success or an error code
  */
-int tcp_listener_create(tcp_t *tcp, inet_ep_t *ep, tcp_listen_cb_t *lcb,
+errno_t tcp_listener_create(tcp_t *tcp, inet_ep_t *ep, tcp_listen_cb_t *lcb,
     void *larg, tcp_cb_t *cb, void *arg, tcp_listener_t **rlst)
 {
@@ -331,10 +331,10 @@
 	exch = async_exchange_begin(tcp->sess);
 	aid_t req = async_send_0(exch, TCP_LISTENER_CREATE, &answer);
-	int rc = async_data_write_start(exch, (void *)ep,
+	errno_t rc = async_data_write_start(exch, (void *)ep,
 	    sizeof(inet_ep_t));
 	async_exchange_end(exch);
 
 	if (rc != EOK) {
-		int rc_orig;
+		errno_t rc_orig;
 		async_wait_for(req, &rc_orig);
 		if (rc_orig != EOK)
@@ -360,5 +360,5 @@
 error:
 	free(lst);
-	return (int) rc;
+	return (errno_t) rc;
 }
 
@@ -377,5 +377,5 @@
 
 	exch = async_exchange_begin(lst->tcp->sess);
-	int rc = async_req_1_0(exch, TCP_LISTENER_DESTROY, lst->id);
+	errno_t rc = async_req_1_0(exch, TCP_LISTENER_DESTROY, lst->id);
 	async_exchange_end(exch);
 
@@ -392,5 +392,5 @@
  * @return EOK on success, EINVAL if no listener with the given ID is found
  */
-static int tcp_listener_get(tcp_t *tcp, sysarg_t id, tcp_listener_t **rlst)
+static errno_t tcp_listener_get(tcp_t *tcp, sysarg_t id, tcp_listener_t **rlst)
 {
 	list_foreach(tcp->listener, ltcp, tcp_listener_t, lst) {
@@ -424,5 +424,5 @@
  * @return EOK if connection is established, EIO otherwise
  */
-int tcp_conn_wait_connected(tcp_conn_t *conn)
+errno_t tcp_conn_wait_connected(tcp_conn_t *conn)
 {
 	fibril_mutex_lock(&conn->lock);
@@ -448,8 +448,8 @@
  * @return EOK on success or an error code
  */
-int tcp_conn_send(tcp_conn_t *conn, const void *data, size_t bytes)
-{
-	async_exch_t *exch;
-	int rc;
+errno_t tcp_conn_send(tcp_conn_t *conn, const void *data, size_t bytes)
+{
+	async_exch_t *exch;
+	errno_t rc;
 
 	exch = async_exchange_begin(conn->tcp->sess);
@@ -480,10 +480,10 @@
  * @return EOK on success or an error code
  */
-int tcp_conn_send_fin(tcp_conn_t *conn)
+errno_t tcp_conn_send_fin(tcp_conn_t *conn)
 {
 	async_exch_t *exch;
 
 	exch = async_exchange_begin(conn->tcp->sess);
-	int rc = async_req_1_0(exch, TCP_CONN_SEND_FIN, conn->id);
+	errno_t rc = async_req_1_0(exch, TCP_CONN_SEND_FIN, conn->id);
 	async_exchange_end(exch);
 
@@ -496,10 +496,10 @@
  * @return EOK on success or an error code
  */
-int tcp_conn_push(tcp_conn_t *conn)
+errno_t tcp_conn_push(tcp_conn_t *conn)
 {
 	async_exch_t *exch;
 
 	exch = async_exchange_begin(conn->tcp->sess);
-	int rc = async_req_1_0(exch, TCP_CONN_PUSH, conn->id);
+	errno_t rc = async_req_1_0(exch, TCP_CONN_PUSH, conn->id);
 	async_exchange_end(exch);
 
@@ -512,10 +512,10 @@
  * @return EOK on success or an error code
  */
-int tcp_conn_reset(tcp_conn_t *conn)
+errno_t tcp_conn_reset(tcp_conn_t *conn)
 {
 	async_exch_t *exch;
 
 	exch = async_exchange_begin(conn->tcp->sess);
-	int rc = async_req_1_0(exch, TCP_CONN_RESET, conn->id);
+	errno_t rc = async_req_1_0(exch, TCP_CONN_RESET, conn->id);
 	async_exchange_end(exch);
 
@@ -540,5 +540,5 @@
  *         error code in case of other error
  */
-int tcp_conn_recv(tcp_conn_t *conn, void *buf, size_t bsize, size_t *nrecv)
+errno_t tcp_conn_recv(tcp_conn_t *conn, void *buf, size_t bsize, size_t *nrecv)
 {
 	async_exch_t *exch;
@@ -553,5 +553,5 @@
 	exch = async_exchange_begin(conn->tcp->sess);
 	aid_t req = async_send_1(exch, TCP_CONN_RECV, conn->id, &answer);
-	int rc = async_data_read_start(exch, buf, bsize);
+	errno_t rc = async_data_read_start(exch, buf, bsize);
 	async_exchange_end(exch);
 
@@ -562,5 +562,5 @@
 	}
 
-	int retval;
+	errno_t retval;
 	async_wait_for(req, &retval);
 	if (retval != EOK) {
@@ -588,5 +588,5 @@
  * @return EOK on success or an error code
  */
-int tcp_conn_recv_wait(tcp_conn_t *conn, void *buf, size_t bsize,
+errno_t tcp_conn_recv_wait(tcp_conn_t *conn, void *buf, size_t bsize,
     size_t *nrecv)
 {
@@ -602,5 +602,5 @@
 	exch = async_exchange_begin(conn->tcp->sess);
 	aid_t req = async_send_1(exch, TCP_CONN_RECV_WAIT, conn->id, &answer);
-	int rc = async_data_read_start(exch, buf, bsize);
+	errno_t rc = async_data_read_start(exch, buf, bsize);
 	async_exchange_end(exch);
 
@@ -616,5 +616,5 @@
 	}
 
-	int retval;
+	errno_t retval;
 	async_wait_for(req, &retval);
 	if (retval != EOK) {
@@ -641,5 +641,5 @@
 	tcp_conn_t *conn;
 	sysarg_t conn_id;
-	int rc;
+	errno_t rc;
 
 	conn_id = IPC_GET_ARG1(*icall);
@@ -669,5 +669,5 @@
 	tcp_conn_t *conn;
 	sysarg_t conn_id;
-	int rc;
+	errno_t rc;
 
 	conn_id = IPC_GET_ARG1(*icall);
@@ -697,5 +697,5 @@
 	tcp_conn_t *conn;
 	sysarg_t conn_id;
-	int rc;
+	errno_t rc;
 
 	conn_id = IPC_GET_ARG1(*icall);
@@ -725,5 +725,5 @@
 	tcp_conn_t *conn;
 	sysarg_t conn_id;
-	int rc;
+	errno_t rc;
 
 	conn_id = IPC_GET_ARG1(*icall);
@@ -769,5 +769,5 @@
 	fid_t fid;
 	tcp_in_conn_t *cinfo;
-	int rc;
+	errno_t rc;
 
 	lst_id = IPC_GET_ARG1(*icall);
@@ -863,5 +863,5 @@
  * @param arg Argument, incoming connection information (@c tcp_in_conn_t)
  */
-static int tcp_conn_fibril(void *arg)
+static errno_t tcp_conn_fibril(void *arg)
 {
 	tcp_in_conn_t *cinfo = (tcp_in_conn_t *)arg;
Index: uspace/lib/c/generic/inet/udp.c
===================================================================
--- uspace/lib/c/generic/inet/udp.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/lib/c/generic/inet/udp.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -48,5 +48,5 @@
  * @return EOK on success or an error code
  */
-static int udp_callback_create(udp_t *udp)
+static errno_t udp_callback_create(udp_t *udp)
 {
 	async_exch_t *exch = async_exchange_begin(udp->sess);
@@ -55,5 +55,5 @@
 	
 	port_id_t port;
-	int rc = async_create_callback_port(exch, INTERFACE_UDP_CB, 0, 0,
+	errno_t rc = async_create_callback_port(exch, INTERFACE_UDP_CB, 0, 0,
 	    udp_cb_conn, udp, &port);
 	
@@ -63,5 +63,5 @@
 		return rc;
 
-	int retval;
+	errno_t retval;
 	async_wait_for(req, &retval);
 
@@ -75,9 +75,9 @@
  *         cannot be contacted
  */
-int udp_create(udp_t **rudp)
+errno_t udp_create(udp_t **rudp)
 {
 	udp_t *udp;
 	service_id_t udp_svcid;
-	int rc;
+	errno_t rc;
 
 	udp = calloc(1, sizeof(udp_t));
@@ -160,5 +160,5 @@
  * @return EOK on success or an error code.
  */
-int udp_assoc_create(udp_t *udp, inet_ep2_t *epp, udp_cb_t *cb, void *arg,
+errno_t udp_assoc_create(udp_t *udp, inet_ep2_t *epp, udp_cb_t *cb, void *arg,
     udp_assoc_t **rassoc)
 {
@@ -173,10 +173,10 @@
 	exch = async_exchange_begin(udp->sess);
 	aid_t req = async_send_0(exch, UDP_ASSOC_CREATE, &answer);
-	int rc = async_data_write_start(exch, (void *)epp,
+	errno_t rc = async_data_write_start(exch, (void *)epp,
 	    sizeof(inet_ep2_t));
 	async_exchange_end(exch);
 
 	if (rc != EOK) {
-		int rc_orig;
+		errno_t rc_orig;
 		async_wait_for(req, &rc_orig);
 		if (rc_orig != EOK)
@@ -200,5 +200,5 @@
 error:
 	free(assoc);
-	return (int) rc;
+	return (errno_t) rc;
 }
 
@@ -220,5 +220,5 @@
 
 	exch = async_exchange_begin(assoc->udp->sess);
-	int rc = async_req_1_0(exch, UDP_ASSOC_DESTROY, assoc->id);
+	errno_t rc = async_req_1_0(exch, UDP_ASSOC_DESTROY, assoc->id);
 	async_exchange_end(exch);
 
@@ -232,10 +232,10 @@
  * @param flags Flags
  */
-int udp_assoc_set_nolocal(udp_assoc_t *assoc)
+errno_t udp_assoc_set_nolocal(udp_assoc_t *assoc)
 {
 	async_exch_t *exch;
 
 	exch = async_exchange_begin(assoc->udp->sess);
-	int rc = async_req_1_0(exch, UDP_ASSOC_SET_NOLOCAL, assoc->id);
+	errno_t rc = async_req_1_0(exch, UDP_ASSOC_SET_NOLOCAL, assoc->id);
 	async_exchange_end(exch);
 
@@ -252,5 +252,5 @@
  * @return EOK on success or an error code
  */
-int udp_assoc_send_msg(udp_assoc_t *assoc, inet_ep_t *dest, void *data,
+errno_t udp_assoc_send_msg(udp_assoc_t *assoc, inet_ep_t *dest, void *data,
     size_t bytes)
 {
@@ -260,5 +260,5 @@
 	aid_t req = async_send_1(exch, UDP_ASSOC_SEND_MSG, assoc->id, NULL);
 
-	int rc = async_data_write_start(exch, (void *)dest,
+	errno_t rc = async_data_write_start(exch, (void *)dest,
 	    sizeof(inet_ep_t));
 	if (rc != EOK) {
@@ -318,5 +318,5 @@
  * @return EOK on success or an error code.
  */
-int udp_rmsg_read(udp_rmsg_t *rmsg, size_t off, void *buf, size_t bsize)
+errno_t udp_rmsg_read(udp_rmsg_t *rmsg, size_t off, void *buf, size_t bsize)
 {
 	async_exch_t *exch;
@@ -325,5 +325,5 @@
 	exch = async_exchange_begin(rmsg->udp->sess);
 	aid_t req = async_send_1(exch, UDP_RMSG_READ, off, &answer);
-	int rc = async_data_read_start(exch, buf, bsize);
+	errno_t rc = async_data_read_start(exch, buf, bsize);
 	async_exchange_end(exch);
 
@@ -333,5 +333,5 @@
 	}
 
-	int retval;
+	errno_t retval;
 	async_wait_for(req, &retval);
 	if (retval != EOK) {
@@ -382,5 +382,5 @@
  * @return EOK on success or an error code
  */
-static int udp_rmsg_info(udp_t *udp, udp_rmsg_t *rmsg)
+static errno_t udp_rmsg_info(udp_t *udp, udp_rmsg_t *rmsg)
 {
 	async_exch_t *exch;
@@ -390,5 +390,5 @@
 	exch = async_exchange_begin(udp->sess);
 	aid_t req = async_send_0(exch, UDP_RMSG_INFO, &answer);
-	int rc = async_data_read_start(exch, &ep, sizeof(inet_ep_t));
+	errno_t rc = async_data_read_start(exch, &ep, sizeof(inet_ep_t));
 	async_exchange_end(exch);
 
@@ -398,5 +398,5 @@
 	}
 
-	int retval;
+	errno_t retval;
 	async_wait_for(req, &retval);
 	if (retval != EOK)
@@ -415,10 +415,10 @@
  * @return EOK on success or an error code
  */
-static int udp_rmsg_discard(udp_t *udp)
+static errno_t udp_rmsg_discard(udp_t *udp)
 {
 	async_exch_t *exch;
 
 	exch = async_exchange_begin(udp->sess);
-	int rc = async_req_0_0(exch, UDP_RMSG_DISCARD);
+	errno_t rc = async_req_0_0(exch, UDP_RMSG_DISCARD);
 	async_exchange_end(exch);
 
@@ -434,5 +434,5 @@
  * @return EOK on success, EINVAL if no association with the given ID exists
  */
-static int udp_assoc_get(udp_t *udp, sysarg_t id, udp_assoc_t **rassoc)
+static errno_t udp_assoc_get(udp_t *udp, sysarg_t id, udp_assoc_t **rassoc)
 {
 	list_foreach(udp->assoc, ludp, udp_assoc_t, assoc) {
@@ -459,5 +459,5 @@
 	udp_rmsg_t rmsg;
 	udp_assoc_t *assoc;
-	int rc;
+	errno_t rc;
 
 	while (true) {