Index: uspace/lib/c/generic/net/packet.c
===================================================================
--- uspace/lib/c/generic/net/packet.c	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
+++ uspace/lib/c/generic/net/packet.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
@@ -64,7 +64,4 @@
 typedef packet_t packet_map_t[PACKET_MAP_SIZE];
 
-/** Type definition of the packet map page pointer. */
-typedef packet_map_t * packet_map_ref;
-
 /** Packet map.
  * Maps packet identifiers to the packet references.
@@ -109,5 +106,5 @@
 packet_t pm_find(packet_id_t packet_id)
 {
-	packet_map_ref map;
+	packet_map_t *map;
 	packet_t packet;
 
@@ -140,5 +137,5 @@
 int pm_add(packet_t packet)
 {
-	packet_map_ref map;
+	packet_map_t *map;
 	int rc;
 
@@ -154,5 +151,5 @@
 	} else {
 		do {
-			map = (packet_map_ref) malloc(sizeof(packet_map_t));
+			map = (packet_map_t *) malloc(sizeof(packet_map_t));
 			if (!map) {
 				fibril_rwlock_write_unlock(&pm_globals.lock);
@@ -180,5 +177,5 @@
 	int count;
 	int index;
-	packet_map_ref map;
+	packet_map_t *map;
 	packet_t packet;
 
Index: uspace/lib/c/generic/net/socket_client.c
===================================================================
--- uspace/lib/c/generic/net/socket_client.c	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
+++ uspace/lib/c/generic/net/socket_client.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
@@ -78,9 +78,4 @@
  */
 typedef struct socket socket_t;
-
-/** Type definition of the socket specific data pointer.
- * @see socket
- */
-typedef socket_t *socket_ref;
 
 /** Socket specific data.
@@ -213,5 +208,5 @@
 	ipc_callid_t callid;
 	ipc_call_t call;
-	socket_ref socket;
+	socket_t *socket;
 	int rc;
 
@@ -372,5 +367,5 @@
  */
 static void
-socket_initialize(socket_ref socket, int socket_id, int phone,
+socket_initialize(socket_t *socket, int socket_id, int phone,
     services_t service)
 {
@@ -405,5 +400,5 @@
 int socket(int domain, int type, int protocol)
 {
-	socket_ref socket;
+	socket_t *socket;
 	int phone;
 	int socket_id;
@@ -463,5 +458,5 @@
 
 	// create a new socket structure
-	socket = (socket_ref) malloc(sizeof(socket_t));
+	socket = (socket_t *) malloc(sizeof(socket_t));
 	if (!socket)
 		return ENOMEM;
@@ -524,5 +519,5 @@
     const void *data, size_t datalength)
 {
-	socket_ref socket;
+	socket_t *socket;
 	aid_t message_id;
 	ipcarg_t result;
@@ -588,5 +583,5 @@
 int listen(int socket_id, int backlog)
 {
-	socket_ref socket;
+	socket_t *socket;
 	int result;
 
@@ -627,6 +622,6 @@
 int accept(int socket_id, struct sockaddr * cliaddr, socklen_t * addrlen)
 {
-	socket_ref socket;
-	socket_ref new_socket;
+	socket_t *socket;
+	socket_t *new_socket;
 	aid_t message_id;
 	ipcarg_t ipc_result;
@@ -661,5 +656,5 @@
 
 	// create a new scoket
-	new_socket = (socket_ref) malloc(sizeof(socket_t));
+	new_socket = (socket_t *) malloc(sizeof(socket_t));
 	if (!new_socket) {
 		fibril_mutex_unlock(&socket->accept_lock);
@@ -745,5 +740,5 @@
  * @param[in] socket	The socket to be destroyed.
  */
-static void socket_destroy(socket_ref socket)
+static void socket_destroy(socket_t *socket)
 {
 	int accepted_id;
@@ -770,5 +765,5 @@
 int closesocket(int socket_id)
 {
-	socket_ref socket;
+	socket_t *socket;
 	int rc;
 
@@ -824,5 +819,5 @@
     socklen_t addrlen)
 {
-	socket_ref socket;
+	socket_t *socket;
 	aid_t message_id;
 	ipcarg_t result;
@@ -981,5 +976,5 @@
     int flags, struct sockaddr *fromaddr, socklen_t *addrlen)
 {
-	socket_ref socket;
+	socket_t *socket;
 	aid_t message_id;
 	ipcarg_t ipc_result;
@@ -1163,5 +1158,5 @@
 getsockopt(int socket_id, int level, int optname, void *value, size_t *optlen)
 {
-	socket_ref socket;
+	socket_t *socket;
 	aid_t message_id;
 	ipcarg_t result;
Index: uspace/lib/net/adt/module_map.c
===================================================================
--- uspace/lib/net/adt/module_map.c	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
+++ uspace/lib/net/adt/module_map.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
@@ -63,12 +63,12 @@
  */
 int
-add_module(module_ref *module, modules_ref modules, const char *name,
+add_module(module_t **module, modules_ref modules, const char *name,
     const char *filename, services_t service, task_id_t task_id,
     connect_module_t connect_module)
 {
-	module_ref tmp_module;
+	module_t *tmp_module;
 	int rc;
 
-	tmp_module = (module_ref) malloc(sizeof(module_t));
+	tmp_module = (module_t *) malloc(sizeof(module_t));
 	if (!tmp_module)
 		return ENOMEM;
@@ -104,7 +104,7 @@
  * @returns		NULL if there is no such module.
  */
-module_ref get_running_module(modules_ref modules, char *name)
+module_t *get_running_module(modules_ref modules, char *name)
 {
-	module_ref module;
+	module_t *module;
 
 	module = modules_find(modules, name, 0);
Index: uspace/lib/net/il/ip_client.c
===================================================================
--- uspace/lib/net/il/ip_client.c	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
+++ uspace/lib/net/il/ip_client.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
@@ -53,7 +53,7 @@
 size_t ip_client_header_length(packet_t packet)
 {
-	ip_header_ref header;
-
-	header = (ip_header_ref) packet_get_data(packet);
+	ip_header_t *header;
+
+	header = (ip_header_t *) packet_get_data(packet);
 	if (!header || (packet_get_data_length(packet) < sizeof(ip_header_t)))
 		return 0;
@@ -91,5 +91,5 @@
     size_t data_length, void **header, size_t *headerlen)
 {
-	ipv4_pseudo_header_ref header_in;
+	ipv4_pseudo_header_t *header_in;
 	struct sockaddr_in *address_in;
 
@@ -109,5 +109,5 @@
 		
 		*headerlen = sizeof(*header_in);
-		header_in = (ipv4_pseudo_header_ref) malloc(*headerlen);
+		header_in = (ipv4_pseudo_header_t *) malloc(*headerlen);
 		if (!header_in)
 			return ENOMEM;
@@ -155,5 +155,5 @@
     ip_tos_t tos, int dont_fragment, size_t ipopt_length)
 {
-	ip_header_ref header;
+	ip_header_t *header;
 	uint8_t *data;
 	size_t padding;
@@ -177,5 +177,5 @@
 
 	// set the header
-	header = (ip_header_ref) data;
+	header = (ip_header_t *) data;
 	header->header_length = IP_COMPUTE_HEADER_LENGTH(sizeof(ip_header_t) +
 	    ipopt_length);
@@ -211,7 +211,7 @@
     ip_ttl_t *ttl, ip_tos_t *tos, int *dont_fragment, size_t *ipopt_length)
 {
-	ip_header_ref header;
-
-	header = (ip_header_ref) packet_get_data(packet);
+	ip_header_t *header;
+
+	header = (ip_header_t *) packet_get_data(packet);
 	if (!header || (packet_get_data_length(packet) < sizeof(ip_header_t)))
 		return ENOMEM;
@@ -247,5 +247,5 @@
     size_t data_length)
 {
-	ipv4_pseudo_header_ref header_in;
+	ipv4_pseudo_header_t *header_in;
 
 	if (!header)
@@ -253,5 +253,5 @@
 
 	if (headerlen == sizeof(ipv4_pseudo_header_t)) {
-		header_in = (ipv4_pseudo_header_ref) header;
+		header_in = (ipv4_pseudo_header_t *) header;
 		header_in->data_length = htons(data_length);
 		return EOK;
Index: uspace/lib/net/include/adt/module_map.h
===================================================================
--- uspace/lib/net/include/adt/module_map.h	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
+++ uspace/lib/net/include/adt/module_map.h	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
@@ -48,9 +48,4 @@
 typedef struct module_struct module_t;
 
-/** Type definition of the module structure pointer.
- * @see module_struct
- */
-typedef module_t *module_ref;
-
 /** Module map.
  * Sorted by module names.
@@ -77,7 +72,7 @@
 };
 
-extern int add_module(module_ref *, modules_ref, const char *, const char *,
+extern int add_module(module_t **, modules_ref, const char *, const char *,
     services_t, task_id_t, connect_module_t *);
-extern module_ref get_running_module(modules_ref, char *);
+extern module_t *get_running_module(modules_ref, char *);
 extern task_id_t spawn(const char *);
 
Index: uspace/lib/net/include/icmp_header.h
===================================================================
--- uspace/lib/net/include/icmp_header.h	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
+++ uspace/lib/net/include/icmp_header.h	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
@@ -52,9 +52,4 @@
 typedef struct icmp_echo icmp_echo_t;
 
-/** Type definition of the echo specific data pointer.
- * @see icmp_echo
- */
-typedef icmp_echo_t *icmp_echo_ref;
-
 /** Echo specific data. */
 struct icmp_echo {
@@ -69,9 +64,4 @@
  */
 typedef struct icmp_header icmp_header_t;
-
-/** Type definition of the internet control message header pointer.
- * @see icmp_header
- */
-typedef icmp_header_t *icmp_header_ref;
 
 /** Internet control message header. */
Index: uspace/lib/net/include/ip_header.h
===================================================================
--- uspace/lib/net/include/ip_header.h	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
+++ uspace/lib/net/include/ip_header.h	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
@@ -127,9 +127,4 @@
 typedef struct ip_header ip_header_t;
 
-/** Type definition of the internet header pointer.
- * @see ip_header
- */
-typedef ip_header_t *ip_header_ref;
-
 /** Type definition of the internet option header.
  * @see ip_header
@@ -137,18 +132,8 @@
 typedef struct ip_option ip_option_t;
 
-/** Type definition of the internet option header pointer.
- * @see ip_header
- */
-typedef ip_option_t *ip_option_ref;
-
 /** Type definition of the internet version 4 pseudo header.
  * @see ipv4_pseudo_header
  */
 typedef struct ipv4_pseudo_header ipv4_pseudo_header_t;
-
-/** Type definition of the internet version 4 pseudo header pointer.
- * @see ipv4_pseudo_header
- */
-typedef ipv4_pseudo_header_t *ipv4_pseudo_header_ref;
 
 /** Internet header.
Index: uspace/lib/net/include/socket_core.h
===================================================================
--- uspace/lib/net/include/socket_core.h	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
+++ uspace/lib/net/include/socket_core.h	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
@@ -66,18 +66,8 @@
 typedef struct socket_core socket_core_t;
 
-/** Type definition of the socket core pointer.
- * @see socket_core
- */
-typedef socket_core_t *socket_core_ref;
-
 /** Type definition of the socket port.
  * @see socket_port
  */
 typedef struct socket_port socket_port_t;
-
-/** Type definition of the socket port pointer.
- * @see socket_port
- */
-typedef socket_port_t *socket_port_ref;
 
 /** Socket core. */
@@ -111,5 +101,5 @@
  * the other use the remote addresses.
  */
-GENERIC_CHAR_MAP_DECLARE(socket_port_map, socket_core_ref);
+GENERIC_CHAR_MAP_DECLARE(socket_port_map, socket_core_t *);
 
 /** Ports map.
@@ -119,17 +109,17 @@
 
 extern void socket_cores_release(int, socket_cores_ref, socket_ports_ref,
-    void (*)(socket_core_ref));
+    void (*)(socket_core_t *));
 extern int socket_bind(socket_cores_ref, socket_ports_ref, int, void *, size_t,
     int, int, int);
-extern int socket_bind_free_port(socket_ports_ref, socket_core_ref, int, int,
+extern int socket_bind_free_port(socket_ports_ref, socket_core_t *, int, int,
     int);
 extern int socket_create(socket_cores_ref, int, void *, int *);
 extern int socket_destroy(int, int, socket_cores_ref, socket_ports_ref,
-    void (*)(socket_core_ref));
+    void (*)(socket_core_t *));
 extern int socket_reply_packets(packet_t, size_t *);
-extern socket_core_ref socket_port_find(socket_ports_ref, int, const char *,
+extern socket_core_t *socket_port_find(socket_ports_ref, int, const char *,
     size_t);
-extern void socket_port_release(socket_ports_ref, socket_core_ref);
-extern int socket_port_add(socket_ports_ref, int, socket_core_ref,
+extern void socket_port_release(socket_ports_ref, socket_core_t *);
+extern int socket_port_add(socket_ports_ref, int, socket_core_t *,
     const char *, size_t);
 
Index: uspace/lib/net/tl/icmp_client.c
===================================================================
--- uspace/lib/net/tl/icmp_client.c	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
+++ uspace/lib/net/tl/icmp_client.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
@@ -64,7 +64,7 @@
     icmp_code_t *code, icmp_param_t *pointer, icmp_param_t *mtu)
 {
-	icmp_header_ref header;
+	icmp_header_t *header;
 
-	header = (icmp_header_ref) packet_get_data(packet);
+	header = (icmp_header_t *) packet_get_data(packet);
 	if (!header ||
 	    (packet_get_data_length(packet) < sizeof(icmp_header_t))) {
Index: uspace/lib/net/tl/socket_core.c
===================================================================
--- uspace/lib/net/tl/socket_core.c	(revision f772bc551e29a820f0a9d75296f62d516efddb9a)
+++ uspace/lib/net/tl/socket_core.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
@@ -68,5 +68,5 @@
 INT_MAP_IMPLEMENT(socket_cores, socket_core_t);
 
-GENERIC_CHAR_MAP_IMPLEMENT(socket_port_map, socket_core_ref);
+GENERIC_CHAR_MAP_IMPLEMENT(socket_port_map, socket_core_t *);
 
 INT_MAP_IMPLEMENT(socket_ports, socket_port_t);
@@ -85,7 +85,7 @@
  */
 static void
-socket_destroy_core(int packet_phone, socket_core_ref socket,
+socket_destroy_core(int packet_phone, socket_core_t *socket,
     socket_cores_ref local_sockets, socket_ports_ref global_sockets,
-    void (* socket_release)(socket_core_ref socket))
+    void (* socket_release)(socket_core_t *socket))
 {
 	int packet_id;
@@ -123,5 +123,5 @@
 socket_cores_release(int packet_phone, socket_cores_ref local_sockets,
     socket_ports_ref global_sockets,
-    void (* socket_release)(socket_core_ref socket))
+    void (* socket_release)(socket_core_t *socket))
 {
 	int index;
@@ -160,8 +160,8 @@
  */
 static int
-socket_port_add_core(socket_port_ref socket_port, socket_core_ref socket,
+socket_port_add_core(socket_port_t *socket_port, socket_core_t *socket,
     const char *key, size_t key_length)
 {
-	socket_core_ref *socket_ref;
+	socket_core_t **socket_ref;
 	int rc;
 
@@ -200,8 +200,8 @@
  */
 static int
-socket_bind_insert(socket_ports_ref global_sockets, socket_core_ref socket,
+socket_bind_insert(socket_ports_ref global_sockets, socket_core_t *socket,
     int port)
 {
-	socket_port_ref socket_port;
+	socket_port_t *socket_port;
 	int rc;
 
@@ -262,6 +262,6 @@
     int free_ports_end, int last_used_port)
 {
-	socket_core_ref socket;
-	socket_port_ref socket_port;
+	socket_core_t *socket;
+	socket_port_t *socket_port;
 	struct sockaddr *address;
 	struct sockaddr_in *address_in;
@@ -328,5 +328,5 @@
  */
 int
-socket_bind_free_port(socket_ports_ref global_sockets, socket_core_ref socket,
+socket_bind_free_port(socket_ports_ref global_sockets, socket_core_t *socket,
     int free_ports_start, int free_ports_end, int last_used_port)
 {
@@ -418,5 +418,5 @@
     void *specific_data, int *socket_id)
 {
-	socket_core_ref socket;
+	socket_core_t *socket;
 	int positive;
 	int rc;
@@ -437,5 +437,5 @@
 	}
 	
-	socket = (socket_core_ref) malloc(sizeof(*socket));
+	socket = (socket_core_t *) malloc(sizeof(*socket));
 	if (!socket)
 		return ENOMEM;
@@ -488,7 +488,7 @@
 socket_destroy(int packet_phone, int socket_id, socket_cores_ref local_sockets,
     socket_ports_ref global_sockets,
-    void (*socket_release)(socket_core_ref socket))
-{
-	socket_core_ref socket;
+    void (*socket_release)(socket_core_t *socket))
+{
+	socket_core_t *socket;
 	int accepted_id;
 
@@ -601,10 +601,10 @@
  * @returns		NULL if no socket was found.
  */
-socket_core_ref
+socket_core_t *
 socket_port_find(socket_ports_ref global_sockets, int port, const char *key,
     size_t key_length)
 {
-	socket_port_ref socket_port;
-	socket_core_ref *socket_ref;
+	socket_port_t *socket_port;
+	socket_core_t **socket_ref;
 
 	socket_port = socket_ports_find(global_sockets, port);
@@ -628,8 +628,8 @@
  */
 void
-socket_port_release(socket_ports_ref global_sockets, socket_core_ref socket)
-{
-	socket_port_ref socket_port;
-	socket_core_ref *socket_ref;
+socket_port_release(socket_ports_ref global_sockets, socket_core_t *socket)
+{
+	socket_port_t *socket_port;
+	socket_core_t **socket_ref;
 
 	if (!socket->port)
@@ -680,7 +680,7 @@
 int
 socket_port_add(socket_ports_ref global_sockets, int port,
-    socket_core_ref socket, const char *key, size_t key_length)
-{
-	socket_port_ref socket_port;
+    socket_core_t *socket, const char *key, size_t key_length)
+{
+	socket_port_t *socket_port;
 	int rc;