Index: uspace/srv/net/il/arp/arp.c
===================================================================
--- uspace/srv/net/il/arp/arp.c	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
+++ uspace/srv/net/il/arp/arp.c	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
@@ -83,8 +83,8 @@
  * @param[in] device	The device specific data.
  */
-static void arp_clear_device(arp_device_ref device)
+static void arp_clear_device(arp_device_t *device)
 {
 	int count;
-	arp_proto_ref proto;
+	arp_proto_t *proto;
 
 	for (count = arp_protos_count(&device->protos) - 1; count >= 0;
@@ -105,5 +105,5 @@
 {
 	int count;
-	arp_device_ref device;
+	arp_device_t *device;
 
 	fibril_rwlock_write_lock(&arp_globals.lock);
@@ -128,6 +128,6 @@
     services_t protocol, measured_string_ref address)
 {
-	arp_device_ref device;
-	arp_proto_ref proto;
+	arp_device_t *device;
+	arp_proto_t *proto;
 
 	fibril_rwlock_write_lock(&arp_globals.lock);
@@ -150,5 +150,5 @@
 static int arp_clear_device_req(int arp_phone, device_id_t device_id)
 {
-	arp_device_ref device;
+	arp_device_t *device;
 
 	fibril_rwlock_write_lock(&arp_globals.lock);
@@ -174,10 +174,10 @@
  * @returns		ENOMEM if there is not enough memory left.
  */
-static int arp_proto_create(arp_proto_ref *proto, services_t service,
+static int arp_proto_create(arp_proto_t **proto, services_t service,
     measured_string_ref address)
 {
 	int rc;
 
-	*proto = (arp_proto_ref) malloc(sizeof(arp_proto_t));
+	*proto = (arp_proto_t *) malloc(sizeof(arp_proto_t));
 	if (!*proto)
 		return ENOMEM;
@@ -215,6 +215,6 @@
     services_t protocol, measured_string_ref address)
 {
-	arp_device_ref device;
-	arp_proto_ref proto;
+	arp_device_t *device;
+	arp_proto_t *proto;
 	hw_type_t hardware;
 	int index;
@@ -260,5 +260,5 @@
 		
 		/* Create a new device */
-		device = (arp_device_ref) malloc(sizeof(arp_device_t));
+		device = (arp_device_t *) malloc(sizeof(arp_device_t));
 		if (!device) {
 			fibril_rwlock_write_unlock(&arp_globals.lock);
@@ -381,5 +381,5 @@
 static int arp_mtu_changed_message(device_id_t device_id, size_t mtu)
 {
-	arp_device_ref device;
+	arp_device_t *device;
 
 	fibril_rwlock_write_lock(&arp_globals.lock);
@@ -418,7 +418,7 @@
 {
 	size_t length;
-	arp_header_ref header;
-	arp_device_ref device;
-	arp_proto_ref proto;
+	arp_header_t *header;
+	arp_device_t *device;
+	arp_proto_t *proto;
 	measured_string_ref hw_source;
 	uint8_t *src_hw;
@@ -436,5 +436,5 @@
 		return ENOENT;
 
-	header = (arp_header_ref) packet_get_data(packet);
+	header = (arp_header_t *) packet_get_data(packet);
 	if ((ntohs(header->hardware) != device->hardware) ||
 	    (length < sizeof(arp_header_t) + header->hardware_length * 2U +
@@ -527,10 +527,10 @@
     measured_string_ref target)
 {
-	arp_device_ref device;
-	arp_proto_ref proto;
+	arp_device_t *device;
+	arp_proto_t *proto;
 	measured_string_ref addr;
 	size_t length;
 	packet_t packet;
-	arp_header_ref header;
+	arp_header_t *header;
 
 	if (!target)
@@ -561,5 +561,5 @@
 		return NULL;
 
-	header = (arp_header_ref) packet_suffix(packet, length);
+	header = (arp_header_t *) packet_suffix(packet, length);
 	if (!header) {
 		pq_release_remote(arp_globals.net_phone, packet_get_id(packet));
Index: uspace/srv/net/il/arp/arp.h
===================================================================
--- uspace/srv/net/il/arp/arp.h	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
+++ uspace/srv/net/il/arp/arp.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
@@ -55,9 +55,4 @@
 typedef struct arp_device arp_device_t;
 
-/** Type definition of the ARP device specific data pointer.
- * @see arp_device
- */
-typedef arp_device_t *arp_device_ref;
-
 /** Type definition of the ARP global data.
  * @see arp_globals
@@ -69,9 +64,4 @@
  */
 typedef struct arp_proto arp_proto_t;
-
-/** Type definition of the ARP protocol specific data pointer.
- * @see arp_proto
- */
-typedef arp_proto_t *arp_proto_ref;
 
 /** ARP address map.
Index: uspace/srv/net/il/arp/arp_header.h
===================================================================
--- uspace/srv/net/il/arp/arp_header.h	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
+++ uspace/srv/net/il/arp/arp_header.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
@@ -46,9 +46,4 @@
 typedef struct arp_header arp_header_t;
 
-/** Type definition of an ARP protocol header pointer.
- * @see arp_header
- */
-typedef arp_header_t *arp_header_ref;
-
 /** ARP protocol header. */
 struct arp_header {
Index: uspace/srv/net/il/ip/ip.c
===================================================================
--- uspace/srv/net/il/ip/ip.c	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
+++ uspace/srv/net/il/ip/ip.c	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
@@ -144,5 +144,5 @@
 static int ip_get_icmp_phone(void)
 {
-	ip_proto_ref proto;
+	ip_proto_t *proto;
 	int phone;
 
@@ -308,5 +308,5 @@
  *			nil_packet_size_req() function.
  */
-static int ip_netif_initialize(ip_netif_ref ip_netif)
+static int ip_netif_initialize(ip_netif_t *ip_netif)
 {
 	measured_string_t names[] = {
@@ -348,5 +348,5 @@
 	char *data;
 	measured_string_t address;
-	ip_route_ref route;
+	ip_route_t *route;
 	in_addr_t gateway;
 	int index;
@@ -378,5 +378,5 @@
 			return ENOTSUP;
 		} else if (ip_netif->ipv == IPV4) {
-			route = (ip_route_ref) malloc(sizeof(ip_route_t));
+			route = (ip_route_t *) malloc(sizeof(ip_route_t));
 			if (!route) {
 				net_free_settings(configuration, data);
@@ -491,5 +491,5 @@
 static int ip_mtu_changed_message(device_id_t device_id, size_t mtu)
 {
-	ip_netif_ref netif;
+	ip_netif_t *netif;
 
 	fibril_rwlock_write_lock(&ip_globals.netifs_lock);
@@ -516,5 +516,5 @@
 static int ip_device_state_message(device_id_t device_id, device_state_t state)
 {
-	ip_netif_ref netif;
+	ip_netif_t *netif;
 
 	fibril_rwlock_write_lock(&ip_globals.netifs_lock);
@@ -993,5 +993,5 @@
  */
 static int
-ip_send_route(packet_t packet, ip_netif_ref netif, ip_route_ref route,
+ip_send_route(packet_t packet, ip_netif_t *netif, ip_route_t *route,
     in_addr_t *src, in_addr_t dest, services_t error)
 {
@@ -1065,9 +1065,9 @@
  * @returns		NULL if no route was found.
  */
-static ip_route_ref
-ip_netif_find_route(ip_netif_ref netif, in_addr_t destination)
+static ip_route_t
+*ip_netif_find_route(ip_netif_t *netif, in_addr_t destination)
 {
 	int index;
-	ip_route_ref route;
+	ip_route_t *route;
 
 	if (!netif)
@@ -1093,8 +1093,8 @@
  * @returns		NULL if no route was found.
  */
-static ip_route_ref ip_find_route(in_addr_t destination) {
+static ip_route_t *ip_find_route(in_addr_t destination) {
 	int index;
-	ip_route_ref route;
-	ip_netif_ref netif;
+	ip_route_t *route;
+	ip_netif_t *netif;
 
 	// start with the last netif - the newest one
@@ -1119,7 +1119,7 @@
  * @returns		NULL if no IP address was found.
  */
-static in_addr_t *ip_netif_address(ip_netif_ref netif)
-{
-	ip_route_ref route;
+static in_addr_t *ip_netif_address(ip_netif_t *netif)
+{
+	ip_route_t *route;
 
 	route = ip_routes_get_index(&netif->routes, 0);
@@ -1147,5 +1147,5 @@
     tl_received_msg_t received_msg)
 {
-	ip_proto_ref proto;
+	ip_proto_t *proto;
 	int index;
 
@@ -1153,5 +1153,5 @@
 		return EINVAL;
 
-	proto = (ip_proto_ref) malloc(sizeof(ip_protos_t));
+	proto = (ip_proto_t *) malloc(sizeof(ip_protos_t));
 	if (!proto)
 		return ENOMEM;
@@ -1180,10 +1180,10 @@
 ip_device_req_local(int il_phone, device_id_t device_id, services_t netif)
 {
-	ip_netif_ref ip_netif;
-	ip_route_ref route;
+	ip_netif_t *ip_netif;
+	ip_route_t *route;
 	int index;
 	int rc;
 
-	ip_netif = (ip_netif_ref) malloc(sizeof(ip_netif_t));
+	ip_netif = (ip_netif_t *) malloc(sizeof(ip_netif_t));
 	if (!ip_netif)
 		return ENOMEM;
@@ -1251,6 +1251,6 @@
 {
 	int addrlen;
-	ip_netif_ref netif;
-	ip_route_ref route;
+	ip_netif_t *netif;
+	ip_route_t *route;
 	struct sockaddr *addr;
 	struct sockaddr_in *address_in;
@@ -1367,5 +1367,5 @@
     size_t *content, size_t *suffix)
 {
-	ip_netif_ref netif;
+	ip_netif_t *netif;
 	int index;
 
@@ -1454,5 +1454,5 @@
     services_t error)
 {
-	ip_proto_ref proto;
+	ip_proto_t *proto;
 	int phone;
 	services_t service;
@@ -1557,5 +1557,5 @@
 	ip_header_ref header;
 	in_addr_t dest;
-	ip_route_ref route;
+	ip_route_t *route;
 	int phone;
 	struct sockaddr *addr;
@@ -1647,6 +1647,6 @@
     in_addr_t netmask, in_addr_t gateway)
 {
-	ip_route_ref route;
-	ip_netif_ref netif;
+	ip_route_t *route;
+	ip_netif_t *netif;
 	int index;
 
@@ -1659,5 +1659,5 @@
 	}
 
-	route = (ip_route_ref) malloc(sizeof(ip_route_t));
+	route = (ip_route_t *) malloc(sizeof(ip_route_t));
 	if (!route) {
 		fibril_rwlock_write_unlock(&ip_globals.netifs_lock);
@@ -1681,5 +1681,5 @@
 ip_set_gateway_req_local(int ip_phone, device_id_t device_id, in_addr_t gateway)
 {
-	ip_netif_ref netif;
+	ip_netif_t *netif;
 
 	fibril_rwlock_write_lock(&ip_globals.netifs_lock);
@@ -1721,7 +1721,7 @@
 	icmp_type_t type;
 	icmp_code_t code;
-	ip_netif_ref netif;
+	ip_netif_t *netif;
 	measured_string_t address;
-	ip_route_ref route;
+	ip_route_t *route;
 	ip_header_ref header;
 
@@ -1782,5 +1782,5 @@
 	in_addr_t *dest;
 	in_addr_t *src;
-	ip_route_ref route;
+	ip_route_t *route;
 	ipv4_pseudo_header_ref header_in;
 
Index: uspace/srv/net/il/ip/ip.h
===================================================================
--- uspace/srv/net/il/ip/ip.h	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
+++ uspace/srv/net/il/ip/ip.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
@@ -59,9 +59,4 @@
 typedef struct ip_netif ip_netif_t;
 
-/** Type definition of the IP network interface specific data pointer.
- * @see ip_netif
- */
-typedef ip_netif_t *ip_netif_ref;
-
 /** Type definition of the IP protocol specific data.
  * @see ip_proto
@@ -69,18 +64,8 @@
 typedef struct ip_proto ip_proto_t;
 
-/** Type definition of the IP protocol specific data pointer.
- * @see ip_proto
- */
-typedef ip_proto_t *ip_proto_ref;
-
 /** Type definition of the IP route specific data.
  *  @see ip_route
  */
 typedef struct ip_route	ip_route_t;
-
-/** Type definition of the IP route specific data pointer.
- *  @see ip_route
- */
-typedef ip_route_t *ip_route_ref;
 
 /** IP network interfaces.
@@ -146,5 +131,5 @@
 	in_addr_t gateway;
 	/** Parent netif. */
-	ip_netif_ref netif;
+	ip_netif_t *netif;
 	/** Target network mask. */
 	in_addr_t netmask;
Index: uspace/srv/net/nil/eth/eth.c
===================================================================
--- uspace/srv/net/nil/eth/eth.c	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
+++ uspace/srv/net/nil/eth/eth.c	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
@@ -178,5 +178,5 @@
 {
 	int index;
-	eth_proto_ref proto;
+	eth_proto_t *proto;
 
 	fibril_rwlock_read_lock(&eth_globals.protos_lock);
@@ -286,5 +286,5 @@
     size_t mtu)
 {
-	eth_device_ref device;
+	eth_device_t *device;
 	int index;
 	measured_string_t names[2] = {
@@ -301,5 +301,5 @@
 	size_t count = sizeof(names) / sizeof(measured_string_t);
 	char *data;
-	eth_proto_ref proto;
+	eth_proto_t *proto;
 	int rc;
 
@@ -342,5 +342,5 @@
 	
 	/* Create a new device */
-	device = (eth_device_ref) malloc(sizeof(eth_device_t));
+	device = (eth_device_t *) malloc(sizeof(eth_device_t));
 	if (!device)
 		return ENOMEM;
@@ -434,12 +434,12 @@
  * @returns		NULL if the packet address length is not big enough.
  */
-static eth_proto_ref eth_process_packet(int flags, packet_t packet)
-{
-	eth_header_snap_ref header;
+static eth_proto_t *eth_process_packet(int flags, packet_t packet)
+{
+	eth_header_snap_t *header;
 	size_t length;
 	eth_type_t type;
 	size_t prefix;
 	size_t suffix;
-	eth_fcs_ref fcs;
+	eth_fcs_t *fcs;
 	uint8_t *data;
 	int rc;
@@ -454,5 +454,5 @@
 	
 	data = packet_get_data(packet);
-	header = (eth_header_snap_ref) data;
+	header = (eth_header_snap_t *) data;
 	type = ntohs(header->header.ethertype);
 	
@@ -461,5 +461,5 @@
 		prefix = sizeof(eth_header_t);
 		suffix = 0;
-		fcs = (eth_fcs_ref) data + length - sizeof(eth_fcs_t);
+		fcs = (eth_fcs_t *) data + length - sizeof(eth_fcs_t);
 		length -= sizeof(eth_fcs_t);
 	} else if(type <= ETH_MAX_CONTENT) {
@@ -487,5 +487,5 @@
 
 		suffix = (type < ETH_MIN_CONTENT) ? ETH_MIN_CONTENT - type : 0U;
-		fcs = (eth_fcs_ref) data + prefix + type + suffix;
+		fcs = (eth_fcs_t *) data + prefix + type + suffix;
 		suffix += length - prefix - type;
 		length = prefix + type + suffix;
@@ -516,7 +516,7 @@
     packet_t packet, services_t target)
 {
-	eth_proto_ref proto;
+	eth_proto_t *proto;
 	packet_t next;
-	eth_device_ref device;
+	eth_device_t *device;
 	int flags;
 
@@ -564,5 +564,5 @@
     size_t *prefix, size_t *content, size_t *suffix)
 {
-	eth_device_ref device;
+	eth_device_t *device;
 
 	if (!addr_len || !prefix || !content || !suffix)
@@ -598,5 +598,5 @@
     measured_string_ref *address)
 {
-	eth_device_ref device;
+	eth_device_t *device;
 
 	if (!address)
@@ -631,5 +631,5 @@
 static int eth_register_message(services_t service, int phone)
 {
-	eth_proto_ref proto;
+	eth_proto_t *proto;
 	int protocol;
 	int index;
@@ -646,5 +646,5 @@
 		return EOK;
 	} else {
-		proto = (eth_proto_ref) malloc(sizeof(eth_proto_t));
+		proto = (eth_proto_t *) malloc(sizeof(eth_proto_t));
 		if (!proto) {
 			fibril_rwlock_write_unlock(&eth_globals.protos_lock);
@@ -688,8 +688,8 @@
     size_t mtu)
 {
-	eth_header_snap_ref header;
-	eth_header_lsap_ref header_lsap;
-	eth_header_ref header_dix;
-	eth_fcs_ref fcs;
+	eth_header_snap_t *header;
+	eth_header_lsap_t *header_lsap;
+	eth_header_t *header_dix;
+	eth_fcs_t *fcs;
 	uint8_t *src;
 	uint8_t *dest;
@@ -697,5 +697,5 @@
 	int i;
 	void *padding;
-	eth_preamble_ref preamble;
+	eth_preamble_t *preamble;
 
 	i = packet_get_addr(packet, &src, &dest);
@@ -795,5 +795,5 @@
     services_t sender)
 {
-	eth_device_ref device;
+	eth_device_t *device;
 	packet_t next;
 	packet_t tmp;
Index: uspace/srv/net/nil/eth/eth.h
===================================================================
--- uspace/srv/net/nil/eth/eth.h	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
+++ uspace/srv/net/nil/eth/eth.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
@@ -54,18 +54,8 @@
 typedef struct eth_device eth_device_t;
 
-/** Type definition of the Ethernet device specific data pointer.
- * @see eth_device
- */
-typedef eth_device_t *eth_device_ref;
-
 /** Type definition of the Ethernet protocol specific data.
  * @see eth_proto
  */
 typedef struct eth_proto eth_proto_t;
-
-/** Type definition of the Ethernet protocol specific data pointer.
- * @see eth_proto
- */
-typedef eth_proto_t *eth_proto_ref;
 
 /** Ethernet device map.
Index: uspace/srv/net/nil/eth/eth_header.h
===================================================================
--- uspace/srv/net/nil/eth/eth_header.h	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
+++ uspace/srv/net/nil/eth/eth_header.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
@@ -58,20 +58,8 @@
 typedef struct eth_header_snap eth_header_snap_t;
 
-/** Type definition of the Ethernet header IEEE 802.3 + 802.2 + SNAP extensions
- * pointer.
- *
- * @see eth_header_snap
- */
-typedef eth_header_snap_t *eth_header_snap_ref;
-
 /** Type definition of the Ethernet header IEEE 802.3 + 802.2 + SNAP extensions.
  * @see eth_header_lsap
  */
 typedef struct eth_header_lsap eth_header_lsap_t;
-
-/** Type definition of the Ethernet header IEEE 802.3 + 802.2 extension pointer.
- * @see eth_header_lsap
- */
-typedef eth_header_lsap_t *eth_header_lsap_ref;
 
 /** Type definition of the Ethernet header LSAP extension.
@@ -80,18 +68,8 @@
 typedef struct eth_ieee_lsap eth_ieee_lsap_t;
 
-/** Type definition of the Ethernet header LSAP extension pointer.
- * @see eth_ieee_lsap
- */
-typedef eth_ieee_lsap_t *eth_ieee_lsap_ref;
-
 /** Type definition of the Ethernet header SNAP extension.
  * @see eth_snap
  */
 typedef struct eth_snap eth_snap_t;
-
-/** Type definition of the Ethernet header SNAP extension pointer.
- * @see eth_snap
- */
-typedef eth_snap_t *eth_snap_ref;
 
 /** Type definition of the Ethernet header preamble.
@@ -100,18 +78,8 @@
 typedef struct eth_preamble eth_preamble_t;
 
-/** Type definition of the Ethernet header preamble pointer.
- * @see eth_preamble
- */
-typedef eth_preamble_t *eth_preamble_ref;
-
 /** Type definition of the Ethernet header.
  * @see eth_header
  */
 typedef struct eth_header eth_header_t;
-
-/** Type definition of the Ethernet header pointer.
- * @see eth_header
- */
-typedef eth_header_t *eth_header_ref;
 
 /** Ethernet header Link Service Access Point extension. */
@@ -219,7 +187,4 @@
 typedef uint32_t eth_fcs_t;
 
-/** Ethernet Frame Check Sequence pointer. */
-typedef eth_fcs_t *eth_fcs_ref;
-
 #endif
 
Index: uspace/srv/net/nil/nildummy/nildummy.c
===================================================================
--- uspace/srv/net/nil/nildummy/nildummy.c	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
+++ uspace/srv/net/nil/nildummy/nildummy.c	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
@@ -153,5 +153,5 @@
     size_t mtu)
 {
-	nildummy_device_ref device;
+	nildummy_device_t *device;
 	int index;
 	int rc;
@@ -192,5 +192,5 @@
 	
 	/* Create a new device */
-	device = (nildummy_device_ref) malloc(sizeof(nildummy_device_t));
+	device = (nildummy_device_t *) malloc(sizeof(nildummy_device_t));
 	if (!device)
 		return ENOMEM;
@@ -250,5 +250,5 @@
     measured_string_ref *address)
 {
-	nildummy_device_ref device;
+	nildummy_device_t *device;
 
 	if (!address)
@@ -282,5 +282,5 @@
     size_t *prefix, size_t *content, size_t *suffix)
 {
-	nildummy_device_ref device;
+	nildummy_device_t *device;
 
 	if (!addr_len || !prefix || !content || !suffix)
@@ -357,5 +357,5 @@
     services_t sender)
 {
-	nildummy_device_ref device;
+	nildummy_device_t *device;
 
 	fibril_rwlock_read_lock(&nildummy_globals.devices_lock);
Index: uspace/srv/net/nil/nildummy/nildummy.h
===================================================================
--- uspace/srv/net/nil/nildummy/nildummy.h	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
+++ uspace/srv/net/nil/nildummy/nildummy.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
@@ -54,18 +54,8 @@
 typedef struct nildummy_device nildummy_device_t;
 
-/** Type definition of the dummy nil device specific data pointer.
- * @see nildummy_device
- */
-typedef nildummy_device_t *nildummy_device_ref;
-
 /** Type definition of the dummy nil protocol specific data.
  * @see nildummy_proto
  */
 typedef struct nildummy_proto nildummy_proto_t;
-
-/** Type definition of the dummy nil protocol specific data pointer.
- * @see nildummy_proto
- */
-typedef nildummy_proto_t *nildummy_proto_ref;
 
 /** Dummy nil device map.
Index: uspace/srv/net/tl/icmp/icmp.c
===================================================================
--- uspace/srv/net/tl/icmp/icmp.c	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
+++ uspace/srv/net/tl/icmp/icmp.c	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
@@ -251,5 +251,5 @@
 	size_t length;
 	uint8_t *data;
-	icmp_reply_ref reply;
+	icmp_reply_t *reply;
 	int reply_key;
 	int index;
@@ -483,5 +483,5 @@
 {
 	int reply_key;
-	icmp_reply_ref reply;
+	icmp_reply_t *reply;
 
 	/* Compute the reply key */
Index: uspace/srv/net/tl/icmp/icmp.h
===================================================================
--- uspace/srv/net/tl/icmp/icmp.h	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
+++ uspace/srv/net/tl/icmp/icmp.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
@@ -49,9 +49,4 @@
  */
 typedef struct icmp_reply icmp_reply_t;
-
-/** Type definition of the ICMP reply data pointer.
- * @see icmp_reply
- */
-typedef icmp_reply_t *icmp_reply_ref;
 
 /** Type definition of the ICMP global data.
Index: uspace/srv/net/tl/tcp/tcp.c
===================================================================
--- uspace/srv/net/tl/tcp/tcp.c	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
+++ uspace/srv/net/tl/tcp/tcp.c	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
@@ -166,8 +166,8 @@
 
 static int tcp_release_and_return(packet_t, int);
-static void tcp_prepare_operation_header(socket_core_ref, tcp_socket_data_ref,
-    tcp_header_ref, int synchronize, int);
+static void tcp_prepare_operation_header(socket_core_ref, tcp_socket_data_t *,
+    tcp_header_t *, int synchronize, int);
 static int tcp_prepare_timeout(int (*)(void *), socket_core_ref,
-    tcp_socket_data_ref, size_t, tcp_socket_state_t, suseconds_t, int);
+    tcp_socket_data_t *, size_t, tcp_socket_state_t, suseconds_t, int);
 static void tcp_free_socket_data(socket_core_ref);
 
@@ -179,34 +179,34 @@
 static int tcp_connect_core(socket_core_ref, socket_cores_ref,
     struct sockaddr *, socklen_t);
-static int tcp_queue_prepare_packet(socket_core_ref, tcp_socket_data_ref,
+static int tcp_queue_prepare_packet(socket_core_ref, tcp_socket_data_t *,
     packet_t, size_t);
-static int tcp_queue_packet(socket_core_ref, tcp_socket_data_ref, packet_t,
+static int tcp_queue_packet(socket_core_ref, tcp_socket_data_t *, packet_t,
     size_t);
-static packet_t tcp_get_packets_to_send(socket_core_ref, tcp_socket_data_ref);
+static packet_t tcp_get_packets_to_send(socket_core_ref, tcp_socket_data_t *);
 static void tcp_send_packets(device_id_t, packet_t);
 
-static void tcp_process_acknowledgement(socket_core_ref, tcp_socket_data_ref,
-    tcp_header_ref);
-static packet_t tcp_send_prepare_packet(socket_core_ref, tcp_socket_data_ref,
+static void tcp_process_acknowledgement(socket_core_ref, tcp_socket_data_t *,
+    tcp_header_t *);
+static packet_t tcp_send_prepare_packet(socket_core_ref, tcp_socket_data_t *,
     packet_t, size_t, size_t);
-static packet_t tcp_prepare_copy(socket_core_ref, tcp_socket_data_ref, packet_t,
+static packet_t tcp_prepare_copy(socket_core_ref, tcp_socket_data_t *, packet_t,
     size_t, size_t);
-/* static */ void tcp_retransmit_packet(socket_core_ref, tcp_socket_data_ref,
+/* static */ void tcp_retransmit_packet(socket_core_ref, tcp_socket_data_t *,
     size_t);
 static int tcp_create_notification_packet(packet_t *, socket_core_ref,
-    tcp_socket_data_ref, int, int);
-static void tcp_refresh_socket_data(tcp_socket_data_ref);
-
-static void tcp_initialize_socket_data(tcp_socket_data_ref);
-
-static int tcp_process_listen(socket_core_ref, tcp_socket_data_ref,
-    tcp_header_ref, packet_t, struct sockaddr *, struct sockaddr *, size_t);
-static int tcp_process_syn_sent(socket_core_ref, tcp_socket_data_ref,
-    tcp_header_ref, packet_t);
-static int tcp_process_syn_received(socket_core_ref, tcp_socket_data_ref,
-    tcp_header_ref, packet_t);
-static int tcp_process_established(socket_core_ref, tcp_socket_data_ref,
-    tcp_header_ref, packet_t, int, size_t);
-static int tcp_queue_received_packet(socket_core_ref, tcp_socket_data_ref,
+    tcp_socket_data_t *, int, int);
+static void tcp_refresh_socket_data(tcp_socket_data_t *);
+
+static void tcp_initialize_socket_data(tcp_socket_data_t *);
+
+static int tcp_process_listen(socket_core_ref, tcp_socket_data_t *,
+    tcp_header_t *, packet_t, struct sockaddr *, struct sockaddr *, size_t);
+static int tcp_process_syn_sent(socket_core_ref, tcp_socket_data_t *,
+    tcp_header_t *, packet_t);
+static int tcp_process_syn_received(socket_core_ref, tcp_socket_data_t *,
+    tcp_header_t *, packet_t);
+static int tcp_process_established(socket_core_ref, tcp_socket_data_t *,
+    tcp_header_t *, packet_t, int, size_t);
+static int tcp_queue_received_packet(socket_core_ref, tcp_socket_data_t *,
     packet_t, int, size_t);
 
@@ -290,7 +290,7 @@
 	size_t offset;
 	int result;
-	tcp_header_ref header;
+	tcp_header_t *header;
 	socket_core_ref socket;
-	tcp_socket_data_ref socket_data;
+	tcp_socket_data_t *socket_data;
 	packet_t next_packet;
 	size_t total_length;
@@ -343,5 +343,5 @@
 
 	/* Get tcp header */
-	header = (tcp_header_ref) packet_get_data(packet);
+	header = (tcp_header_t *) packet_get_data(packet);
 	if (!header)
 		return tcp_release_and_return(packet, NO_DATA);
@@ -380,5 +380,5 @@
 
 	printf("socket id %d\n", socket->socket_id);
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 	assert(socket_data);
 
@@ -497,6 +497,6 @@
 }
 
-int tcp_process_established(socket_core_ref socket, tcp_socket_data_ref
-    socket_data, tcp_header_ref header, packet_t packet, int fragments,
+int tcp_process_established(socket_core_ref socket, tcp_socket_data_t *
+    socket_data, tcp_header_t *header, packet_t packet, int fragments,
     size_t total_length)
 {
@@ -806,5 +806,5 @@
 
 int tcp_queue_received_packet(socket_core_ref socket,
-    tcp_socket_data_ref socket_data, packet_t packet, int fragments,
+    tcp_socket_data_t *socket_data, packet_t packet, int fragments,
     size_t total_length)
 {
@@ -842,6 +842,6 @@
 }
 
-int tcp_process_syn_sent(socket_core_ref socket, tcp_socket_data_ref
-    socket_data, tcp_header_ref header, packet_t packet)
+int tcp_process_syn_sent(socket_core_ref socket, tcp_socket_data_t *
+    socket_data, tcp_header_t *header, packet_t packet)
 {
 	packet_t next_packet;
@@ -901,5 +901,5 @@
 
 int tcp_process_listen(socket_core_ref listening_socket,
-    tcp_socket_data_ref listening_socket_data, tcp_header_ref header,
+    tcp_socket_data_t *listening_socket_data, tcp_header_t *header,
     packet_t packet, struct sockaddr *src, struct sockaddr *dest,
     size_t addrlen)
@@ -907,5 +907,5 @@
 	packet_t next_packet;
 	socket_core_ref socket;
-	tcp_socket_data_ref socket_data;
+	tcp_socket_data_t *socket_data;
 	int socket_id;
 	int listening_socket_id = listening_socket->socket_id;
@@ -922,5 +922,5 @@
 		return tcp_release_and_return(packet, EINVAL);
 
-	socket_data = (tcp_socket_data_ref) malloc(sizeof(*socket_data));
+	socket_data = (tcp_socket_data_t *) malloc(sizeof(*socket_data));
 	if (!socket_data)
 		return tcp_release_and_return(packet, ENOMEM);
@@ -979,5 +979,5 @@
 	}
 	listening_socket_data =
-	    (tcp_socket_data_ref) listening_socket->specific_data;
+	    (tcp_socket_data_t *) listening_socket->specific_data;
 	assert(listening_socket_data);
 
@@ -991,5 +991,5 @@
 		return ENOTSOCK;
 	}
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 	assert(socket_data);
 
@@ -1061,8 +1061,8 @@
 
 int tcp_process_syn_received(socket_core_ref socket,
-    tcp_socket_data_ref socket_data, tcp_header_ref header, packet_t packet)
+    tcp_socket_data_t *socket_data, tcp_header_t *header, packet_t packet)
 {
 	socket_core_ref listening_socket;
-	tcp_socket_data_ref listening_socket_data;
+	tcp_socket_data_t *listening_socket_data;
 	int rc;
 
@@ -1086,5 +1086,5 @@
 	if (listening_socket) {
 		listening_socket_data =
-		    (tcp_socket_data_ref) listening_socket->specific_data;
+		    (tcp_socket_data_t *) listening_socket->specific_data;
 		assert(listening_socket_data);
 
@@ -1128,5 +1128,5 @@
 
 void tcp_process_acknowledgement(socket_core_ref socket,
-    tcp_socket_data_ref socket_data, tcp_header_ref header)
+    tcp_socket_data_t *socket_data, tcp_header_t *header)
 {
 	size_t number;
@@ -1265,5 +1265,5 @@
 }
 
-void tcp_refresh_socket_data(tcp_socket_data_ref socket_data)
+void tcp_refresh_socket_data(tcp_socket_data_t *socket_data)
 {
 	assert(socket_data);
@@ -1281,5 +1281,5 @@
 }
 
-void tcp_initialize_socket_data(tcp_socket_data_ref socket_data)
+void tcp_initialize_socket_data(tcp_socket_data_t *socket_data)
 {
 	assert(socket_data);
@@ -1304,5 +1304,5 @@
 	ipc_call_t answer;
 	int answer_count;
-	tcp_socket_data_ref socket_data;
+	tcp_socket_data_t *socket_data;
 	socket_core_ref socket;
 	packet_dimension_ref packet_dimension;
@@ -1336,5 +1336,5 @@
 		case NET_SOCKET:
 			socket_data =
-			    (tcp_socket_data_ref) malloc(sizeof(*socket_data));
+			    (tcp_socket_data_t *) malloc(sizeof(*socket_data));
 			if (!socket_data) {
 				res = ENOMEM;
@@ -1383,5 +1383,5 @@
 				    SOCKET_GET_SOCKET_ID(call));
 				if (socket) {
-					socket_data = (tcp_socket_data_ref)
+					socket_data = (tcp_socket_data_t *)
 					    socket->specific_data;
 					assert(socket_data);
@@ -1543,5 +1543,5 @@
 	int keep_write_lock = false;
 	socket_core_ref socket;
-	tcp_socket_data_ref socket_data;
+	tcp_socket_data_t *socket_data;
 
 	assert(timeout);
@@ -1561,5 +1561,5 @@
 		goto out;
 	
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 	assert(socket_data);
 	if (socket_data->local_sockets != timeout->local_sockets)
@@ -1619,5 +1619,5 @@
 	tcp_timeout_ref timeout = data;
 	socket_core_ref socket;
-	tcp_socket_data_ref socket_data;
+	tcp_socket_data_t *socket_data;
 	fibril_rwlock_t *local_lock;
 
@@ -1635,5 +1635,5 @@
 
 	if (socket && (socket->socket_id == timeout->socket_id)) {
-		socket_data = (tcp_socket_data_ref) socket->specific_data;
+		socket_data = (tcp_socket_data_t *) socket->specific_data;
 		assert(socket_data);
 		if (socket_data->local_sockets == timeout->local_sockets) {
@@ -1656,5 +1656,5 @@
 }
 
-void tcp_retransmit_packet(socket_core_ref socket, tcp_socket_data_ref
+void tcp_retransmit_packet(socket_core_ref socket, tcp_socket_data_t *
     socket_data, size_t sequence_number)
 {
@@ -1687,5 +1687,5 @@
 {
 	socket_core_ref socket;
-	tcp_socket_data_ref socket_data;
+	tcp_socket_data_t *socket_data;
 
 	assert(local_sockets);
@@ -1700,5 +1700,5 @@
 	
 	/* Get the socket specific data */
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 	assert(socket_data);
 
@@ -1740,5 +1740,5 @@
     struct sockaddr *addr, socklen_t addrlen)
 {
-	tcp_socket_data_ref socket_data;
+	tcp_socket_data_t *socket_data;
 	packet_t packet;
 	int rc;
@@ -1749,5 +1749,5 @@
 
 	/* Get the socket specific data */
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 	assert(socket_data);
 	assert(socket->specific_data == socket_data);
@@ -1829,7 +1829,7 @@
 
 int tcp_queue_prepare_packet(socket_core_ref socket,
-    tcp_socket_data_ref socket_data, packet_t packet, size_t data_length)
-{
-	tcp_header_ref header;
+    tcp_socket_data_t *socket_data, packet_t packet, size_t data_length)
+{
+	tcp_header_t *header;
 	int rc;
 
@@ -1839,5 +1839,5 @@
 
 	/* Get TCP header */
-	header = (tcp_header_ref) packet_get_data(packet);
+	header = (tcp_header_t *) packet_get_data(packet);
 	if (!header)
 		return NO_DATA;
@@ -1859,5 +1859,5 @@
 }
 
-int tcp_queue_packet(socket_core_ref socket, tcp_socket_data_ref socket_data,
+int tcp_queue_packet(socket_core_ref socket, tcp_socket_data_t *socket_data,
     packet_t packet, size_t data_length)
 {
@@ -1881,5 +1881,5 @@
 }
 
-packet_t tcp_get_packets_to_send(socket_core_ref socket, tcp_socket_data_ref
+packet_t tcp_get_packets_to_send(socket_core_ref socket, tcp_socket_data_t *
     socket_data)
 {
@@ -1941,8 +1941,8 @@
 }
 
-packet_t tcp_send_prepare_packet(socket_core_ref socket, tcp_socket_data_ref
+packet_t tcp_send_prepare_packet(socket_core_ref socket, tcp_socket_data_t *
     socket_data, packet_t packet, size_t data_length, size_t sequence_number)
 {
-	tcp_header_ref header;
+	tcp_header_t *header;
 	uint32_t checksum;
 	int rc;
@@ -1961,5 +1961,5 @@
 
 	/* Get the header */
-	header = (tcp_header_ref) packet_get_data(packet);
+	header = (tcp_header_t *) packet_get_data(packet);
 	if (!header) {
 		pq_release_remote(tcp_globals.net_phone, packet_get_id(packet));
@@ -2002,5 +2002,5 @@
 }
 
-packet_t tcp_prepare_copy(socket_core_ref socket, tcp_socket_data_ref
+packet_t tcp_prepare_copy(socket_core_ref socket, tcp_socket_data_t *
     socket_data, packet_t packet, size_t data_length, size_t sequence_number)
 {
@@ -2033,5 +2033,5 @@
 
 void tcp_prepare_operation_header(socket_core_ref socket,
-    tcp_socket_data_ref socket_data, tcp_header_ref header, int synchronize,
+    tcp_socket_data_t *socket_data, tcp_header_t *header, int synchronize,
     int finalize)
 {
@@ -2050,5 +2050,5 @@
 
 int tcp_prepare_timeout(int (*timeout_function)(void *tcp_timeout_t),
-    socket_core_ref socket, tcp_socket_data_ref socket_data,
+    socket_core_ref socket, tcp_socket_data_t *socket_data,
     size_t sequence_number, tcp_socket_state_t state, suseconds_t timeout,
     int globals_read_only)
@@ -2100,5 +2100,5 @@
 {
 	socket_core_ref socket;
-	tcp_socket_data_ref socket_data;
+	tcp_socket_data_t *socket_data;
 	int packet_id;
 	packet_t packet;
@@ -2117,5 +2117,5 @@
 		return NO_DATA;
 
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 
 	/* Check state */
@@ -2158,9 +2158,9 @@
 {
 	socket_core_ref socket;
-	tcp_socket_data_ref socket_data;
+	tcp_socket_data_t *socket_data;
 	packet_dimension_ref packet_dimension;
 	packet_t packet;
 	size_t total_length;
-	tcp_header_ref header;
+	tcp_header_t *header;
 	int index;
 	int result;
@@ -2179,5 +2179,5 @@
 		return NO_DATA;
 
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 
 	/* Check state */
@@ -2233,5 +2233,5 @@
 {
 	socket_core_ref socket;
-	tcp_socket_data_ref socket_data;
+	tcp_socket_data_t *socket_data;
 	packet_t packet;
 	int rc;
@@ -2243,5 +2243,5 @@
 
 	/* Get the socket specific data */
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 	assert(socket_data);
 
@@ -2299,8 +2299,8 @@
 
 int tcp_create_notification_packet(packet_t *packet, socket_core_ref socket,
-    tcp_socket_data_ref socket_data, int synchronize, int finalize)
+    tcp_socket_data_t *socket_data, int synchronize, int finalize)
 {
 	packet_dimension_ref packet_dimension;
-	tcp_header_ref header;
+	tcp_header_t *header;
 	int rc;
 
@@ -2337,5 +2337,5 @@
 	socket_core_ref accepted;
 	socket_core_ref socket;
-	tcp_socket_data_ref socket_data;
+	tcp_socket_data_t *socket_data;
 	packet_dimension_ref packet_dimension;
 	int rc;
@@ -2351,5 +2351,5 @@
 
 	/* Get the socket specific data */
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 	assert(socket_data);
 
@@ -2369,5 +2369,5 @@
 
 		/* Get the socket specific data */
-		socket_data = (tcp_socket_data_ref) accepted->specific_data;
+		socket_data = (tcp_socket_data_t *) accepted->specific_data;
 		assert(socket_data);
 		/* TODO can it be in another state? */
@@ -2407,5 +2407,5 @@
 void tcp_free_socket_data(socket_core_ref socket)
 {
-	tcp_socket_data_ref socket_data;
+	tcp_socket_data_t *socket_data;
 
 	assert(socket);
@@ -2414,5 +2414,5 @@
 
 	/* Get the socket specific data */
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 	assert(socket_data);
 
Index: uspace/srv/net/tl/tcp/tcp.h
===================================================================
--- uspace/srv/net/tl/tcp/tcp.h	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
+++ uspace/srv/net/tl/tcp/tcp.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
@@ -55,18 +55,8 @@
 typedef struct tcp_socket_data tcp_socket_data_t;
 
-/** Type definition of the TCP socket specific data pointer.
- * @see tcp_socket_data
- */
-typedef tcp_socket_data_t *tcp_socket_data_ref;
-
 /** Type definition of the TCP operation data.
  * @see tcp_operation
  */
 typedef struct tcp_operation tcp_operation_t;
-
-/** Type definition of the TCP operation data pointer.
- * @see tcp_operation
- */
-typedef tcp_operation_t *tcp_operation_ref;
 
 /** TCP socket state type definition.
Index: uspace/srv/net/tl/tcp/tcp_header.h
===================================================================
--- uspace/srv/net/tl/tcp/tcp_header.h	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
+++ uspace/srv/net/tl/tcp/tcp_header.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
@@ -59,9 +59,4 @@
 typedef struct tcp_header tcp_header_t;
 
-/** Type definition of the transmission datagram header pointer.
- * @see tcp_header
- */
-typedef tcp_header_t *tcp_header_ref;
-
 /** Type definition of the transmission datagram header option.
  * @see tcp_option
@@ -69,16 +64,6 @@
 typedef struct tcp_option tcp_option_t;
 
-/** Type definition of the transmission datagram header option pointer.
- * @see tcp_option
- */
-typedef tcp_option_t *tcp_option_ref;
-
 /** Type definition of the Maximum segment size TCP option. */
 typedef struct tcp_max_segment_size_option tcp_max_segment_size_option_t;
-
-/** Type definition of the Maximum segment size TCP option pointer.
- * @see tcp_max_segment_size_option
- */
-typedef tcp_max_segment_size_option_t *tcp_max_segment_size_option_ref;
 
 /** Transmission datagram header. */
Index: uspace/srv/net/tl/udp/udp.c
===================================================================
--- uspace/srv/net/tl/udp/udp.c	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
+++ uspace/srv/net/tl/udp/udp.c	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
@@ -223,5 +223,5 @@
 	size_t offset;
 	int result;
-	udp_header_ref header;
+	udp_header_t *header;
 	socket_core_ref socket;
 	packet_t next_packet;
@@ -277,5 +277,5 @@
 
 	/* Get UDP header */
-	header = (udp_header_ref) packet_get_data(packet);
+	header = (udp_header_t *) packet_get_data(packet);
 	if (!header)
 		return udp_release_and_return(packet, NO_DATA);
@@ -460,5 +460,5 @@
 	packet_t packet;
 	packet_t next_packet;
-	udp_header_ref header;
+	udp_header_t *header;
 	int index;
 	size_t total_length;
@@ -615,5 +615,5 @@
 	int packet_id;
 	packet_t packet;
-	udp_header_ref header;
+	udp_header_t *header;
 	struct sockaddr *addr;
 	size_t length;
@@ -644,5 +644,5 @@
 		return udp_release_and_return(packet, NO_DATA);
 	}
-	header = (udp_header_ref) data;
+	header = (udp_header_t *) data;
 
 	/* Set the source address port */
Index: uspace/srv/net/tl/udp/udp_header.h
===================================================================
--- uspace/srv/net/tl/udp/udp_header.h	(revision fb04cba8d949f8b13de326b3aefd058316d54046)
+++ uspace/srv/net/tl/udp/udp_header.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
@@ -49,9 +49,4 @@
 typedef struct udp_header udp_header_t;
 
-/** Type definition of the user datagram header pointer.
- * @see udp_header
- */
-typedef udp_header_t *udp_header_ref;
-
 /** User datagram header. */
 struct udp_header {