Index: uspace/lib/c/include/net/device.h
===================================================================
--- uspace/lib/c/include/net/device.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/lib/c/include/net/device.h	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -59,9 +59,4 @@
  */
 typedef struct device_stats device_stats_t;
-
-/** Type definition of the device usage statistics pointer.
- * @see device_stats
- */
-typedef device_stats_t *device_stats_ref;
 
 /** Device state. */
Index: uspace/lib/c/include/net/packet.h
===================================================================
--- uspace/lib/c/include/net/packet.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/lib/c/include/net/packet.h	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -48,18 +48,8 @@
 typedef struct packet * packet_t;
 
-/** Type definition of the packet pointer.
- * @see packet
- */
-typedef packet_t * packet_ref;
-
 /** Type definition of the packet dimension.
  * @see packet_dimension
  */
 typedef struct packet_dimension	packet_dimension_t;
-
-/** Type definition of the packet dimension pointer.
- * @see packet_dimension
- */
-typedef packet_dimension_t * packet_dimension_ref;
 
 /** Packet dimension. */
Index: uspace/lib/net/generic/generic.c
===================================================================
--- uspace/lib/net/generic/generic.c	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/lib/net/generic/generic.c	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -138,5 +138,5 @@
 int
 generic_packet_size_req_remote(int phone, int message, device_id_t device_id,
-    packet_dimension_ref packet_dimension)
+    packet_dimension_t *packet_dimension)
 {
 	if (!packet_dimension)
Index: uspace/lib/net/generic/packet_remote.c
===================================================================
--- uspace/lib/net/generic/packet_remote.c	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/lib/net/generic/packet_remote.c	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -64,5 +64,5 @@
  */
 static int
-packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size)
+packet_return(int phone, packet_t *packet, packet_id_t packet_id, size_t size)
 {
 	ipc_call_t answer;
@@ -107,5 +107,5 @@
  *			function.
  */
-int packet_translate_remote(int phone, packet_ref packet, packet_id_t packet_id)
+int packet_translate_remote(int phone, packet_t *packet, packet_id_t packet_id)
 {
 	int rc;
Index: uspace/lib/net/il/ip_remote.c
===================================================================
--- uspace/lib/net/il/ip_remote.c	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/lib/net/il/ip_remote.c	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -186,5 +186,5 @@
  */
 int ip_packet_size_req_remote(int ip_phone, device_id_t device_id,
-    packet_dimension_ref packet_dimension)
+    packet_dimension_t *packet_dimension)
 {
 	return generic_packet_size_req_remote(ip_phone, NET_IL_PACKET_SPACE,
Index: uspace/lib/net/include/generic.h
===================================================================
--- uspace/lib/net/include/generic.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/lib/net/include/generic.h	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -52,5 +52,5 @@
     char **);
 extern int generic_packet_size_req_remote(int, int, device_id_t,
-    packet_dimension_ref);
+    packet_dimension_t *);
 extern int generic_received_msg_remote(int, int, device_id_t, packet_id_t,
     services_t, services_t);
Index: uspace/lib/net/include/ip_remote.h
===================================================================
--- uspace/lib/net/include/ip_remote.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/lib/net/include/ip_remote.h	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -44,5 +44,5 @@
 
 extern int ip_set_gateway_req_remote(int, device_id_t, in_addr_t);
-extern int ip_packet_size_req_remote(int, device_id_t, packet_dimension_ref);
+extern int ip_packet_size_req_remote(int, device_id_t, packet_dimension_t *);
 extern int ip_received_error_msg_remote(int, device_id_t, packet_t, services_t,
     services_t);
Index: uspace/lib/net/include/netif_local.h
===================================================================
--- uspace/lib/net/include/netif_local.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/lib/net/include/netif_local.h	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -193,5 +193,5 @@
  */
 extern int netif_get_device_stats(device_id_t device_id,
-    device_stats_ref stats);
+    device_stats_t *stats);
 
 extern int netif_get_addr_req_local(int, device_id_t, measured_string_ref *,
@@ -201,10 +201,10 @@
 extern int netif_start_req_local(int, device_id_t);
 extern int netif_stop_req_local(int, device_id_t);
-extern int netif_stats_req_local(int, device_id_t, device_stats_ref);
+extern int netif_stats_req_local(int, device_id_t, device_stats_t *);
 extern int netif_bind_service_local(services_t, device_id_t, services_t,
     async_client_conn_t);
 
 extern int find_device(device_id_t, netif_device_t **);
-extern void null_device_stats(device_stats_ref);
+extern void null_device_stats(device_stats_t *);
 extern void netif_pq_release(packet_id_t);
 extern packet_t netif_packet_get_1(size_t);
Index: uspace/lib/net/include/netif_remote.h
===================================================================
--- uspace/lib/net/include/netif_remote.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/lib/net/include/netif_remote.h	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -47,5 +47,5 @@
 extern int netif_start_req_remote(int, device_id_t);
 extern int netif_stop_req_remote(int, device_id_t);
-extern int netif_stats_req_remote(int, device_id_t, device_stats_ref);
+extern int netif_stats_req_remote(int, device_id_t, device_stats_t *);
 extern int netif_bind_service_remote(services_t, device_id_t, services_t,
     async_client_conn_t);
Index: uspace/lib/net/include/packet_remote.h
===================================================================
--- uspace/lib/net/include/packet_remote.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/lib/net/include/packet_remote.h	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -37,5 +37,5 @@
 #include <sys/types.h>
 
-extern int packet_translate_remote(int, packet_ref, packet_id_t);
+extern int packet_translate_remote(int, packet_t *, packet_id_t);
 extern packet_t packet_get_4_remote(int, size_t, size_t, size_t, size_t);
 extern packet_t packet_get_1_remote(int, size_t);
Index: uspace/lib/net/include/tl_common.h
===================================================================
--- uspace/lib/net/include/tl_common.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/lib/net/include/tl_common.h	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -51,13 +51,13 @@
 DEVICE_MAP_DECLARE(packet_dimensions, packet_dimension_t);
 
-extern int tl_get_ip_packet_dimension(int, packet_dimensions_ref,
-    device_id_t, packet_dimension_ref *);
+extern int tl_get_ip_packet_dimension(int, packet_dimensions_t *,
+    device_id_t, packet_dimension_t **);
 extern int tl_get_address_port(const struct sockaddr *, int, uint16_t *);
-extern int tl_update_ip_packet_dimension(packet_dimensions_ref, device_id_t,
+extern int tl_update_ip_packet_dimension(packet_dimensions_t *, device_id_t,
     size_t);
 extern int tl_set_address_port(struct sockaddr *, int, uint16_t);
 extern int tl_prepare_icmp_packet(int, int, packet_t, services_t);
-extern int tl_socket_read_packet_data(int, packet_ref, size_t,
-    const packet_dimension_ref, const struct sockaddr *, socklen_t);
+extern int tl_socket_read_packet_data(int, packet_t *, size_t,
+    const packet_dimension_t *, const struct sockaddr *, socklen_t);
 
 #endif
Index: uspace/lib/net/netif/netif_local.c
===================================================================
--- uspace/lib/net/netif/netif_local.c	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/lib/net/netif/netif_local.c	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -181,5 +181,5 @@
  */
 int netif_stats_req_local(int netif_phone, device_id_t device_id,
-    device_stats_ref stats)
+    device_stats_t *stats)
 {
 	fibril_rwlock_read_lock(&netif_globals.lock);
@@ -253,5 +253,5 @@
  * @param[in] stats	The usage statistics.
  */
-void null_device_stats(device_stats_ref stats)
+void null_device_stats(device_stats_t *stats)
 {
 	bzero(stats, sizeof(device_stats_t));
Index: uspace/lib/net/netif/netif_remote.c
===================================================================
--- uspace/lib/net/netif/netif_remote.c	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/lib/net/netif/netif_remote.c	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -138,5 +138,5 @@
  */
 int netif_stats_req_remote(int netif_phone, device_id_t device_id,
-    device_stats_ref stats)
+    device_stats_t *stats)
 {
 	if (!stats)
Index: uspace/lib/net/tl/tl_common.c
===================================================================
--- uspace/lib/net/tl/tl_common.c	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/lib/net/tl/tl_common.c	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -120,6 +120,6 @@
 int
 tl_get_ip_packet_dimension(int ip_phone,
-    packet_dimensions_ref packet_dimensions, device_id_t device_id,
-    packet_dimension_ref *packet_dimension)
+    packet_dimensions_t *packet_dimensions, device_id_t device_id,
+    packet_dimension_t **packet_dimension)
 {
 	int rc;
@@ -162,8 +162,8 @@
  */
 int
-tl_update_ip_packet_dimension(packet_dimensions_ref packet_dimensions,
+tl_update_ip_packet_dimension(packet_dimensions_t *packet_dimensions,
     device_id_t device_id, size_t content)
 {
-	packet_dimension_ref packet_dimension;
+	packet_dimension_t *packet_dimension;
 
 	packet_dimension = packet_dimensions_find(packet_dimensions, device_id);
@@ -287,6 +287,6 @@
  */
 int
-tl_socket_read_packet_data(int packet_phone, packet_ref packet, size_t prefix,
-    const packet_dimension_ref dimension, const struct sockaddr *addr,
+tl_socket_read_packet_data(int packet_phone, packet_t *packet, size_t prefix,
+    const packet_dimension_t *dimension, const struct sockaddr *addr,
     socklen_t addrlen)
 {
Index: uspace/lib/packet/generic/packet_server.c
===================================================================
--- uspace/lib/packet/generic/packet_server.c	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/lib/packet/generic/packet_server.c	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -103,5 +103,5 @@
 };
 
-int packet_translate_local(int phone, packet_ref packet, packet_id_t packet_id)
+int packet_translate_local(int phone, packet_t *packet, packet_id_t packet_id)
 {
 	if (!packet)
Index: uspace/lib/packet/include/packet_local.h
===================================================================
--- uspace/lib/packet/include/packet_local.h	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/lib/packet/include/packet_local.h	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -43,5 +43,5 @@
 /*@{*/
 
-extern int packet_translate_local(int, packet_ref, packet_id_t);
+extern int packet_translate_local(int, packet_t *, packet_id_t);
 extern packet_t packet_get_4_local(int, size_t, size_t, size_t, size_t);
 extern packet_t packet_get_1_local(int, size_t);
Index: uspace/srv/hw/netif/dp8390/dp8390_module.c
===================================================================
--- uspace/srv/hw/netif/dp8390/dp8390_module.c	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/srv/hw/netif/dp8390/dp8390_module.c	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -157,5 +157,6 @@
 }
 
-int netif_get_device_stats(device_id_t device_id, device_stats_ref stats){
+int netif_get_device_stats(device_id_t device_id, device_stats_t *stats)
+{
 	netif_device_t * device;
 	eth_stat_t * de_stat;
Index: uspace/srv/net/netif/lo/lo.c
===================================================================
--- uspace/srv/net/netif/lo/lo.c	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/srv/net/netif/lo/lo.c	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -81,5 +81,5 @@
 }
 
-int netif_get_device_stats(device_id_t device_id, device_stats_ref stats)
+int netif_get_device_stats(device_id_t device_id, device_stats_t *stats)
 {
 	netif_device_t *device;
@@ -93,5 +93,5 @@
 		return rc;
 
-	memcpy(stats, (device_stats_ref) device->specific,
+	memcpy(stats, (device_stats_t *) device->specific,
 	    sizeof(device_stats_t));
 
@@ -145,5 +145,5 @@
 	}
 
-	null_device_stats((device_stats_ref) (*device)->specific);
+	null_device_stats((device_stats_t *) (*device)->specific);
 	(*device)->device_id = device_id;
 	(*device)->nil_phone = -1;
@@ -204,9 +204,9 @@
 	next = packet;
 	do {
-		((device_stats_ref) device->specific)->send_packets++;
-		((device_stats_ref) device->specific)->receive_packets++;
+		((device_stats_t *) device->specific)->send_packets++;
+		((device_stats_t *) device->specific)->receive_packets++;
 		length = packet_get_data_length(next);
-		((device_stats_ref) device->specific)->send_bytes += length;
-		((device_stats_ref) device->specific)->receive_bytes += length;
+		((device_stats_t *) device->specific)->send_bytes += length;
+		((device_stats_t *) device->specific)->receive_bytes += length;
 		next = pq_next(next);
 	} while(next);
Index: uspace/srv/net/tl/tcp/tcp.c
===================================================================
--- uspace/srv/net/tl/tcp/tcp.c	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/srv/net/tl/tcp/tcp.c	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -126,9 +126,4 @@
  */
 typedef struct tcp_timeout tcp_timeout_t;
-
-/** Type definition of the TCP timeout pointer.
- *  @see tcp_timeout
- */
-typedef tcp_timeout_t *tcp_timeout_ref;
 
 /** TCP reply timeout data.
@@ -809,5 +804,5 @@
     size_t total_length)
 {
-	packet_dimension_ref packet_dimension;
+	packet_dimension_t *packet_dimension;
 	int rc;
 
@@ -1306,5 +1301,5 @@
 	tcp_socket_data_t *socket_data;
 	socket_core_ref socket;
-	packet_dimension_ref packet_dimension;
+	packet_dimension_t *packet_dimension;
 
 	/*
@@ -1540,5 +1535,5 @@
 int tcp_timeout(void *data)
 {
-	tcp_timeout_ref timeout = data;
+	tcp_timeout_t *timeout = data;
 	int keep_write_lock = false;
 	socket_core_ref socket;
@@ -1617,5 +1612,5 @@
 int tcp_release_after_timeout(void *data)
 {
-	tcp_timeout_ref timeout = data;
+	tcp_timeout_t *timeout = data;
 	socket_core_ref socket;
 	tcp_socket_data_t *socket_data;
@@ -2054,5 +2049,5 @@
     int globals_read_only)
 {
-	tcp_timeout_ref operation_timeout;
+	tcp_timeout_t *operation_timeout;
 	fid_t fibril;
 
@@ -2159,5 +2154,5 @@
 	socket_core_ref socket;
 	tcp_socket_data_t *socket_data;
-	packet_dimension_ref packet_dimension;
+	packet_dimension_t *packet_dimension;
 	packet_t packet;
 	size_t total_length;
@@ -2301,5 +2296,5 @@
     tcp_socket_data_t *socket_data, int synchronize, int finalize)
 {
-	packet_dimension_ref packet_dimension;
+	packet_dimension_t *packet_dimension;
 	tcp_header_t *header;
 	int rc;
@@ -2338,5 +2333,5 @@
 	socket_core_ref socket;
 	tcp_socket_data_t *socket_data;
-	packet_dimension_ref packet_dimension;
+	packet_dimension_t *packet_dimension;
 	int rc;
 
Index: uspace/srv/net/tl/udp/udp.c
===================================================================
--- uspace/srv/net/tl/udp/udp.c	(revision 4e5c7baa5e949999fdcc71299240dea3d1a5369c)
+++ uspace/srv/net/tl/udp/udp.c	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
@@ -235,5 +235,5 @@
 	struct sockaddr *src;
 	struct sockaddr *dest;
-	packet_dimension_ref packet_dimension;
+	packet_dimension_t *packet_dimension;
 	int rc;
 
@@ -469,5 +469,5 @@
 	size_t headerlen;
 	device_id_t device_id;
-	packet_dimension_ref packet_dimension;
+	packet_dimension_t *packet_dimension;
 	int rc;
 	
@@ -714,5 +714,5 @@
 	ipc_call_t answer;
 	int answer_count;
-	packet_dimension_ref packet_dimension;
+	packet_dimension_t *packet_dimension;
 
 	/*