Index: uspace/lib/c/generic/inet.c
===================================================================
--- uspace/lib/c/generic/inet.c	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/c/generic/inet.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -44,29 +44,25 @@
 {
 	async_exch_t *exch = async_exchange_begin(inet_sess);
-
+	
 	ipc_call_t answer;
 	aid_t req = async_send_0(exch, INET_CALLBACK_CREATE, &answer);
 	int rc = async_connect_to_me(exch, 0, 0, 0, inet_cb_conn, NULL);
 	async_exchange_end(exch);
-
+	
 	if (rc != EOK)
 		return rc;
-
+	
 	sysarg_t retval;
 	async_wait_for(req, &retval);
-	if (retval != EOK)
-		return retval;
-
-	return EOK;
+	
+	return retval;
 }
 
 static int inet_set_proto(uint8_t protocol)
 {
-	int rc;
-
 	async_exch_t *exch = async_exchange_begin(inet_sess);
-	rc = async_req_1_0(exch, INET_SET_PROTO, protocol);
+	int rc = async_req_1_0(exch, INET_SET_PROTO, protocol);
 	async_exchange_end(exch);
-
+	
 	return rc;
 }
@@ -80,15 +76,15 @@
 	assert(inet_ev_ops == NULL);
 	assert(inet_protocol == 0);
-
+	
 	rc = loc_service_get_id(SERVICE_NAME_INET, &inet_svc,
 	    IPC_FLAG_BLOCKING);
 	if (rc != EOK)
 		return ENOENT;
-
+	
 	inet_sess = loc_service_connect(EXCHANGE_SERIALIZE, inet_svc,
 	    IPC_FLAG_BLOCKING);
 	if (inet_sess == NULL)
 		return ENOENT;
-
+	
 	if (inet_set_proto(protocol) != EOK) {
 		async_hangup(inet_sess);
@@ -96,5 +92,5 @@
 		return EIO;
 	}
-
+	
 	if (inet_callback_create() != EOK) {
 		async_hangup(inet_sess);
@@ -102,5 +98,5 @@
 		return EIO;
 	}
-
+	
 	inet_protocol = protocol;
 	inet_ev_ops = ev_ops;
Index: uspace/lib/c/generic/inetcfg.c
===================================================================
--- uspace/lib/c/generic/inetcfg.c	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/c/generic/inetcfg.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -119,15 +119,15 @@
 
 	assert(inetcfg_sess == NULL);
-
+	
 	rc = loc_service_get_id(SERVICE_NAME_INETCFG, &inet_svc,
 	    IPC_FLAG_BLOCKING);
 	if (rc != EOK)
 		return ENOENT;
-
+	
 	inetcfg_sess = loc_service_connect(EXCHANGE_SERIALIZE, inet_svc,
 	    IPC_FLAG_BLOCKING);
 	if (inetcfg_sess == NULL)
 		return ENOENT;
-
+	
 	return EOK;
 }
Index: uspace/lib/c/generic/inetping.c
===================================================================
--- uspace/lib/c/generic/inetping.c	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/c/generic/inetping.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -49,22 +49,22 @@
 
 	assert(inetping_sess == NULL);
-
+	
 	inetping_ev_ops = ev_ops;
-
+	
 	rc = loc_service_get_id(SERVICE_NAME_INETPING, &inetping_svc,
 	    IPC_FLAG_BLOCKING);
 	if (rc != EOK)
 		return ENOENT;
-
+	
 	inetping_sess = loc_service_connect(EXCHANGE_SERIALIZE, inetping_svc,
 	    IPC_FLAG_BLOCKING);
 	if (inetping_sess == NULL)
 		return ENOENT;
-
+	
 	async_exch_t *exch = async_exchange_begin(inetping_sess);
 
 	rc = async_connect_to_me(exch, 0, 0, 0, inetping_cb_conn, NULL);
 	async_exchange_end(exch);
-
+	
 	if (rc != EOK) {
 		async_hangup(inetping_sess);
@@ -72,5 +72,5 @@
 		return rc;
 	}
-
+	
 	return EOK;
 }
Index: uspace/lib/c/generic/iplink.c
===================================================================
--- uspace/lib/c/generic/iplink.c	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/c/generic/iplink.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -49,29 +49,26 @@
     iplink_t **riplink)
 {
-	iplink_t *iplink = NULL;
-	int rc;
-
-	iplink = calloc(1, sizeof(iplink_t));
+	iplink_t *iplink = calloc(1, sizeof(iplink_t));
 	if (iplink == NULL)
 		return ENOMEM;
-
+	
 	iplink->sess = sess;
 	iplink->ev_ops = ev_ops;
-
+	
 	async_exch_t *exch = async_exchange_begin(sess);
-
-	rc = async_connect_to_me(exch, 0, 0, 0, iplink_cb_conn, iplink);
+	
+	int rc = async_connect_to_me(exch, 0, 0, 0, iplink_cb_conn, iplink);
 	async_exchange_end(exch);
-
+	
 	if (rc != EOK)
 		goto error;
-
+	
 	*riplink = iplink;
 	return EOK;
-
+	
 error:
 	if (iplink != NULL)
 		free(iplink);
-
+	
 	return rc;
 }
Index: uspace/lib/c/generic/net/socket_client.c
===================================================================
--- uspace/lib/c/generic/net/socket_client.c	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/c/generic/net/socket_client.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -283,9 +283,8 @@
 static async_sess_t *socket_get_tcp_sess(void)
 {
-	if (socket_globals.tcp_sess == NULL) {
+	if (socket_globals.tcp_sess == NULL)
 		socket_globals.tcp_sess = service_bind(SERVICE_TCP,
 		    0, 0, SERVICE_TCP, socket_connection);
-	}
-
+	
 	return socket_globals.tcp_sess;
 }
@@ -300,9 +299,8 @@
 static async_sess_t *socket_get_udp_sess(void)
 {
-	if (socket_globals.udp_sess == NULL) {
+	if (socket_globals.udp_sess == NULL)
 		socket_globals.udp_sess = service_bind(SERVICE_UDP,
 		    0, 0, SERVICE_UDP, socket_connection);
-	}
-
+	
 	return socket_globals.udp_sess;
 }
Index: uspace/lib/drv/generic/driver.c
===================================================================
--- uspace/lib/drv/generic/driver.c	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/drv/generic/driver.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -125,19 +125,17 @@
 static void driver_dev_add(ipc_callid_t iid, ipc_call_t *icall)
 {
-	char *dev_name = NULL;
-	int res;
-	
 	devman_handle_t dev_handle = IPC_GET_ARG1(*icall);
 	devman_handle_t parent_fun_handle = IPC_GET_ARG2(*icall);
 	
 	ddf_dev_t *dev = create_device();
-
+	
 	/* Add one reference that will be dropped by driver_dev_remove() */
 	dev_add_ref(dev);
 	dev->handle = dev_handle;
-
+	
+	char *dev_name = NULL;
 	async_data_write_accept((void **) &dev_name, true, 0, 0, 0, 0);
 	dev->name = dev_name;
-
+	
 	/*
 	 * Currently not used, parent fun handle is stored in context
@@ -146,5 +144,5 @@
 	(void) parent_fun_handle;
 	
-	res = driver->driver_ops->dev_add(dev);
+	int res = driver->driver_ops->dev_add(dev);
 	
 	if (res != EOK) {
@@ -163,12 +161,8 @@
 static void driver_dev_remove(ipc_callid_t iid, ipc_call_t *icall)
 {
-	devman_handle_t devh;
-	ddf_dev_t *dev;
-	int rc;
-	
-	devh = IPC_GET_ARG1(*icall);
+	devman_handle_t devh = IPC_GET_ARG1(*icall);
 	
 	fibril_mutex_lock(&devices_mutex);
-	dev = driver_get_device(devh);
+	ddf_dev_t *dev = driver_get_device(devh);
 	if (dev != NULL)
 		dev_add_ref(dev);
@@ -179,4 +173,6 @@
 		return;
 	}
+	
+	int rc;
 	
 	if (driver->driver_ops->dev_remove != NULL)
@@ -193,12 +189,8 @@
 static void driver_dev_gone(ipc_callid_t iid, ipc_call_t *icall)
 {
-	devman_handle_t devh;
-	ddf_dev_t *dev;
-	int rc;
-	
-	devh = IPC_GET_ARG1(*icall);
+	devman_handle_t devh = IPC_GET_ARG1(*icall);
 	
 	fibril_mutex_lock(&devices_mutex);
-	dev = driver_get_device(devh);
+	ddf_dev_t *dev = driver_get_device(devh);
 	if (dev != NULL)
 		dev_add_ref(dev);
@@ -209,4 +201,6 @@
 		return;
 	}
+	
+	int rc;
 	
 	if (driver->driver_ops->dev_gone != NULL)
@@ -223,9 +217,5 @@
 static void driver_fun_online(ipc_callid_t iid, ipc_call_t *icall)
 {
-	devman_handle_t funh;
-	ddf_fun_t *fun;
-	int rc;
-	
-	funh = IPC_GET_ARG1(*icall);
+	devman_handle_t funh = IPC_GET_ARG1(*icall);
 	
 	/*
@@ -236,5 +226,5 @@
 	fibril_mutex_lock(&functions_mutex);
 	
-	fun = driver_get_function(funh);
+	ddf_fun_t *fun = driver_get_function(funh);
 	if (fun != NULL)
 		fun_add_ref(fun);
@@ -248,4 +238,6 @@
 	
 	/* Call driver entry point */
+	int rc;
+	
 	if (driver->driver_ops->fun_online != NULL)
 		rc = driver->driver_ops->fun_online(fun);
@@ -260,9 +252,5 @@
 static void driver_fun_offline(ipc_callid_t iid, ipc_call_t *icall)
 {
-	devman_handle_t funh;
-	ddf_fun_t *fun;
-	int rc;
-	
-	funh = IPC_GET_ARG1(*icall);
+	devman_handle_t funh = IPC_GET_ARG1(*icall);
 	
 	/*
@@ -273,5 +261,5 @@
 	fibril_mutex_lock(&functions_mutex);
 	
-	fun = driver_get_function(funh);
+	ddf_fun_t *fun = driver_get_function(funh);
 	if (fun != NULL)
 		fun_add_ref(fun);
@@ -285,4 +273,6 @@
 	
 	/* Call driver entry point */
+	int rc;
+	
 	if (driver->driver_ops->fun_offline != NULL)
 		rc = driver->driver_ops->fun_offline(fun);
@@ -597,12 +587,10 @@
 void *ddf_dev_data_alloc(ddf_dev_t *dev, size_t size)
 {
-	void *data;
-
 	assert(dev->driver_data == NULL);
-
-	data = calloc(1, size);
+	
+	void *data = calloc(1, size);
 	if (data == NULL)
 		return NULL;
-
+	
 	dev->driver_data = data;
 	return data;
@@ -634,17 +622,15 @@
 ddf_fun_t *ddf_fun_create(ddf_dev_t *dev, fun_type_t ftype, const char *name)
 {
-	ddf_fun_t *fun;
-
-	fun = create_function();
+	ddf_fun_t *fun = create_function();
 	if (fun == NULL)
 		return NULL;
-
+	
 	/* Add one reference that will be dropped by ddf_fun_destroy() */
 	fun->dev = dev;
 	fun_add_ref(fun);
-
+	
 	fun->bound = false;
 	fun->ftype = ftype;
-
+	
 	fun->name = str_dup(name);
 	if (fun->name == NULL) {
@@ -652,5 +638,5 @@
 		return NULL;
 	}
-
+	
 	return fun;
 }
@@ -659,13 +645,11 @@
 void *ddf_fun_data_alloc(ddf_fun_t *fun, size_t size)
 {
-	void *data;
-
 	assert(fun->bound == false);
 	assert(fun->driver_data == NULL);
-
-	data = calloc(1, size);
+	
+	void *data = calloc(1, size);
 	if (data == NULL)
 		return NULL;
-
+	
 	fun->driver_data = data;
 	return data;
@@ -677,10 +661,11 @@
  * must not be bound.
  *
- * @param fun		Function to destroy
+ * @param fun Function to destroy
+ *
  */
 void ddf_fun_destroy(ddf_fun_t *fun)
 {
 	assert(fun->bound == false);
-
+	
 	/*
 	 * Drop the reference added by ddf_fun_create(). This will deallocate
@@ -697,4 +682,5 @@
 	if (fun->ops == NULL)
 		return NULL;
+	
 	return fun->ops->interfaces[idx];
 }
@@ -709,6 +695,8 @@
  * the same name.
  *
- * @param fun		Function to bind
- * @return		EOK on success or negative error code
+ * @param fun Function to bind
+ *
+ * @return EOK on success or negative error code
+ *
  */
 int ddf_fun_bind(ddf_fun_t *fun)
@@ -717,8 +705,6 @@
 	assert(fun->name != NULL);
 	
-	int res;
-	
 	add_to_functions_list(fun);
-	res = devman_add_function(fun->name, fun->ftype, &fun->match_ids,
+	int res = devman_add_function(fun->name, fun->ftype, &fun->match_ids,
 	    fun->dev->handle, &fun->handle);
 	if (res != EOK) {
@@ -736,17 +722,17 @@
  * the function invisible to the system.
  *
- * @param fun		Function to unbind
- * @return		EOK on success or negative error code
+ * @param fun Function to unbind
+ *
+ * @return EOK on success or negative error code
+ *
  */
 int ddf_fun_unbind(ddf_fun_t *fun)
 {
-	int res;
-	
 	assert(fun->bound == true);
 	
-	res = devman_remove_function(fun->handle);
+	int res = devman_remove_function(fun->handle);
 	if (res != EOK)
 		return res;
-
+	
 	remove_from_functions_list(fun);
 	
@@ -757,14 +743,14 @@
 /** Online function.
  *
- * @param fun		Function to online
- * @return		EOK on success or negative error code
+ * @param fun Function to online
+ *
+ * @return EOK on success or negative error code
+ *
  */
 int ddf_fun_online(ddf_fun_t *fun)
 {
-	int res;
-	
 	assert(fun->bound == true);
 	
-	res = devman_drv_fun_online(fun->handle);
+	int res = devman_drv_fun_online(fun->handle);
 	if (res != EOK)
 		return res;
@@ -775,14 +761,14 @@
 /** Offline function.
  *
- * @param fun		Function to offline
- * @return		EOK on success or negative error code
+ * @param fun Function to offline
+ *
+ * @return EOK on success or negative error code
+ *
  */
 int ddf_fun_offline(ddf_fun_t *fun)
 {
-	int res;
-	
 	assert(fun->bound == true);
 	
-	res = devman_drv_fun_offline(fun->handle);
+	int res = devman_drv_fun_offline(fun->handle);
 	if (res != EOK)
 		return res;
@@ -796,18 +782,19 @@
  * Cannot be called when the function node is bound.
  *
- * @param fun			Function
- * @param match_id_str		Match string
- * @param match_score		Match score
- * @return			EOK on success, ENOMEM if out of memory.
+ * @param fun          Function
+ * @param match_id_str Match string
+ * @param match_score  Match score
+ *
+ * @return EOK on success.
+ * @return ENOMEM if out of memory.
+ *
  */
 int ddf_fun_add_match_id(ddf_fun_t *fun, const char *match_id_str,
     int match_score)
 {
-	match_id_t *match_id;
-	
 	assert(fun->bound == false);
 	assert(fun->ftype == fun_inner);
 	
-	match_id = create_match_id();
+	match_id_t *match_id = create_match_id();
 	if (match_id == NULL)
 		return ENOMEM;
@@ -831,4 +818,5 @@
  *
  * Must only be called when the function is bound.
+ *
  */
 int ddf_fun_add_to_category(ddf_fun_t *fun, const char *cat_name)
@@ -842,6 +830,4 @@
 int ddf_driver_main(driver_t *drv)
 {
-	int rc;
-
 	/*
 	 * Remember the driver structure - driver_ops will be called by generic
@@ -858,5 +844,5 @@
 	 */
 	async_set_client_connection(driver_connection);
-	rc = devman_driver_register(driver->name);
+	int rc = devman_driver_register(driver->name);
 	if (rc != EOK) {
 		printf("Error: Failed to register driver with device manager "
@@ -864,5 +850,5 @@
 		    str_error(rc));
 		
-		return 1;
+		return rc;
 	}
 	
@@ -870,10 +856,10 @@
 	rc = task_retval(0);
 	if (rc != EOK)
-		return 1;
-
+		return rc;
+	
 	async_manager();
 	
 	/* Never reached. */
-	return 0;
+	return EOK;
 }
 
Index: uspace/lib/drv/generic/interrupt.c
===================================================================
--- uspace/lib/drv/generic/interrupt.c	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/drv/generic/interrupt.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -117,6 +117,6 @@
 }
 
-static void
-add_interrupt_context(interrupt_context_list_t *list, interrupt_context_t *ctx)
+static void add_interrupt_context(interrupt_context_list_t *list,
+    interrupt_context_t *ctx)
 {
 	fibril_mutex_lock(&list->mutex);
@@ -134,6 +134,6 @@
 }
 
-static interrupt_context_t *
-find_interrupt_context_by_id(interrupt_context_list_t *list, int id)
+static interrupt_context_t *find_interrupt_context_by_id(
+    interrupt_context_list_t *list, int id)
 {
 	interrupt_context_t *ctx;
@@ -153,6 +153,6 @@
 }
 
-static interrupt_context_t *
-find_interrupt_context(interrupt_context_list_t *list, ddf_dev_t *dev, int irq)
+static interrupt_context_t *find_interrupt_context(
+    interrupt_context_list_t *list, ddf_dev_t *dev, int irq)
 {
 	interrupt_context_t *ctx;
@@ -173,7 +173,6 @@
 
 
-int
-register_interrupt_handler(ddf_dev_t *dev, int irq, interrupt_handler_t *handler,
-    irq_code_t *pseudocode)
+int register_interrupt_handler(ddf_dev_t *dev, int irq,
+    interrupt_handler_t *handler, irq_code_t *pseudocode)
 {
 	interrupt_context_t *ctx = create_interrupt_context();
@@ -193,5 +192,5 @@
 		delete_interrupt_context(ctx);
 	}
-
+	
 	return res;
 }
Index: uspace/lib/drv/generic/log.c
===================================================================
--- uspace/lib/drv/generic/log.c	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/drv/generic/log.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -33,11 +33,11 @@
 #include <io/log.h>
 #include <stdarg.h>
-
 #include <ddf/log.h>
 
 /** Initialize the logging system.
  *
- * @param drv_name	Driver name, will be printed as part of message
- * @param level		Minimum message level to print
+ * @param drv_name Driver name, will be printed as part of message
+ * @param level    Minimum message level to print
+ *
  */
 int ddf_log_init(const char *drv_name, log_level_t level)
@@ -48,13 +48,14 @@
 /** Log a driver message.
  *
- * @param level		Message verbosity level. Message is only printed
- *			if verbosity is less than or equal to current
- *			reporting level.
- * @param fmt		Format string (no trailing newline)
+ * @param level Message verbosity level. Message is only printed
+ *              if verbosity is less than or equal to current
+ *              reporting level.
+ * @param fmt   Format string (no trailing newline)
+ *
  */
 void ddf_msg(log_level_t level, const char *fmt, ...)
 {
 	va_list args;
-
+	
 	va_start(args, fmt);
 	log_msgv(level, fmt, args);
Index: uspace/lib/drv/include/ddf/driver.h
===================================================================
--- uspace/lib/drv/include/ddf/driver.h	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/drv/include/ddf/driver.h	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -81,4 +81,5 @@
 	 */
 	devman_handle_t handle;
+	
 	/** Reference count */
 	atomic_t refcnt;
@@ -104,6 +105,8 @@
 	/** True if bound to the device manager */
 	bool bound;
+	
 	/** Function indentifier (asigned by device manager) */
 	devman_handle_t handle;
+	
 	/** Reference count */
 	atomic_t refcnt;
@@ -114,12 +117,17 @@
 	/** Function type */
 	fun_type_t ftype;
+	
 	/** Function name */
 	const char *name;
+	
 	/** List of device ids for driver matching */
 	match_id_list_t match_ids;
+	
 	/** Driver-specific data associated with this function */
 	void *driver_data;
+	
 	/** Implementation of operations provided by this function */
 	ddf_dev_ops_t *ops;
+	
 	/** Connection handler or @c NULL to use the DDF default handler. */
 	async_client_conn_t conn_handler;
@@ -137,10 +145,14 @@
 	/** Callback method for passing a new device to the device driver */
 	int (*dev_add)(ddf_dev_t *);
+	
 	/** Ask driver to remove a device */
 	int (*dev_remove)(ddf_dev_t *);
+	
 	/** Inform driver a device disappeared */
 	int (*dev_gone)(ddf_dev_t *);
+	
 	/** Ask driver to online a specific function */
 	int (*fun_online)(ddf_fun_t *);
+	
 	/** Ask driver to offline a specific function */
 	int (*fun_offline)(ddf_fun_t *);
Index: uspace/lib/drv/include/ddf/interrupt.h
===================================================================
--- uspace/lib/drv/include/ddf/interrupt.h	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/drv/include/ddf/interrupt.h	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -42,5 +42,4 @@
 #include <ddi.h>
 #include <fibril_synch.h>
-
 #include "driver.h"
 #include "../dev_iface.h"
Index: uspace/lib/drv/include/ops/hw_res.h
===================================================================
--- uspace/lib/drv/include/ops/hw_res.h	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/drv/include/ops/hw_res.h	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -39,5 +39,4 @@
 #include <device/hw_res.h>
 #include <sys/types.h>
-
 #include "../ddf/driver.h"
 
Index: uspace/lib/drv/include/ops/nic.h
===================================================================
--- uspace/lib/drv/include/ops/nic.h	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/drv/include/ops/nic.h	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -40,5 +40,4 @@
 #include <nic/nic.h>
 #include <sys/time.h>
-
 #include "../ddf/driver.h"
 
Index: uspace/lib/nic/include/nic.h
===================================================================
--- uspace/lib/nic/include/nic.h	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/nic/include/nic.h	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -83,4 +83,5 @@
  */
 typedef void (*send_frame_handler)(nic_t *, void *, size_t);
+
 /**
  * The handler for transitions between driver states.
@@ -94,4 +95,5 @@
  */
 typedef int (*state_change_handler)(nic_t *);
+
 /**
  * Handler for unicast filtering mode change.
@@ -106,5 +108,6 @@
  */
 typedef int (*unicast_mode_change_handler)(nic_t *,
-	nic_unicast_mode_t, const nic_address_t *, size_t);
+    nic_unicast_mode_t, const nic_address_t *, size_t);
+
 /**
  * Handler for multicast filtering mode change.
@@ -119,5 +122,6 @@
  */
 typedef int (*multicast_mode_change_handler)(nic_t *,
-	nic_multicast_mode_t, const nic_address_t *, size_t);
+    nic_multicast_mode_t, const nic_address_t *, size_t);
+
 /**
  * Handler for broadcast filtering mode change.
@@ -130,4 +134,5 @@
  */
 typedef int (*broadcast_mode_change_handler)(nic_t *, nic_broadcast_mode_t);
+
 /**
  * Handler for blocked sources list change.
@@ -138,5 +143,6 @@
  */
 typedef void (*blocked_sources_change_handler)(nic_t *,
-	const nic_address_t *, size_t);
+    const nic_address_t *, size_t);
+
 /**
  * Handler for VLAN filtering mask change.
@@ -145,4 +151,5 @@
  */
 typedef void (*vlan_mask_change_handler)(nic_t *, const nic_vlan_mask_t *);
+
 /**
  * Handler called when a WOL virtue is added.
@@ -165,4 +172,5 @@
  */
 typedef int (*wol_virtue_add_handler)(nic_t *, const nic_wol_virtue_t *);
+
 /**
  * Handler called when a WOL virtue is removed.
@@ -174,4 +182,5 @@
  */
 typedef void (*wol_virtue_remove_handler)(nic_t *, const nic_wol_virtue_t *);
+
 /**
  * Handler for poll mode change.
@@ -186,5 +195,6 @@
  */
 typedef int (*poll_mode_change_handler)(nic_t *,
-	nic_poll_mode_t, const struct timeval *);
+    nic_poll_mode_t, const struct timeval *);
+
 /**
  * Event handler called when the NIC should poll its buffers for a new frame
@@ -202,5 +212,5 @@
 extern int nic_driver_init(const char *);
 extern void nic_driver_implement(driver_ops_t *, ddf_dev_ops_t *,
-	nic_iface_t *);
+    nic_iface_t *);
 
 /* Functions called in add_device */
@@ -210,13 +220,13 @@
 extern void nic_set_send_frame_handler(nic_t *, send_frame_handler);
 extern void nic_set_state_change_handlers(nic_t *,
-	state_change_handler, state_change_handler, state_change_handler);
+    state_change_handler, state_change_handler, state_change_handler);
 extern void nic_set_filtering_change_handlers(nic_t *,
-	unicast_mode_change_handler, multicast_mode_change_handler,
-	broadcast_mode_change_handler, blocked_sources_change_handler,
-	vlan_mask_change_handler);
+    unicast_mode_change_handler, multicast_mode_change_handler,
+    broadcast_mode_change_handler, blocked_sources_change_handler,
+    vlan_mask_change_handler);
 extern void nic_set_wol_virtue_change_handlers(nic_t *,
-	wol_virtue_add_handler, wol_virtue_remove_handler);
+    wol_virtue_add_handler, wol_virtue_remove_handler);
 extern void nic_set_poll_handlers(nic_t *,
-	poll_mode_change_handler, poll_request_handler);
+    poll_mode_change_handler, poll_request_handler);
 
 /* General driver functions */
@@ -254,10 +264,10 @@
 extern void nic_report_hw_filtering(nic_t *, int, int, int);
 extern void nic_query_unicast(const nic_t *,
-	nic_unicast_mode_t *, size_t, nic_address_t *, size_t *);
+    nic_unicast_mode_t *, size_t, nic_address_t *, size_t *);
 extern void nic_query_multicast(const nic_t *,
-	nic_multicast_mode_t *, size_t, nic_address_t *, size_t *);
+    nic_multicast_mode_t *, size_t, nic_address_t *, size_t *);
 extern void nic_query_broadcast(const nic_t *, nic_broadcast_mode_t *);
 extern void nic_query_blocked_sources(const nic_t *,
-	size_t, nic_address_t *, size_t *);
+    size_t, nic_address_t *, size_t *);
 extern int nic_query_vlan_mask(const nic_t *, nic_vlan_mask_t *);
 extern int nic_query_wol_max_caps(const nic_t *, nic_wv_type_t);
Index: uspace/lib/nic/include/nic_impl.h
===================================================================
--- uspace/lib/nic/include/nic_impl.h	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/nic/include/nic_impl.h	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -53,30 +53,30 @@
 extern int nic_get_stats_impl(ddf_fun_t *dev_fun, nic_device_stats_t *stats);
 extern int nic_unicast_get_mode_impl(ddf_fun_t *dev_fun,
-	nic_unicast_mode_t *, size_t, nic_address_t *, size_t *);
+    nic_unicast_mode_t *, size_t, nic_address_t *, size_t *);
 extern int nic_unicast_set_mode_impl(ddf_fun_t *dev_fun,
-	nic_unicast_mode_t, const nic_address_t *, size_t);
+    nic_unicast_mode_t, const nic_address_t *, size_t);
 extern int nic_multicast_get_mode_impl(ddf_fun_t *dev_fun,
-	nic_multicast_mode_t *, size_t, nic_address_t *, size_t *);
+    nic_multicast_mode_t *, size_t, nic_address_t *, size_t *);
 extern int nic_multicast_set_mode_impl(ddf_fun_t *dev_fun,
-	nic_multicast_mode_t, const nic_address_t *, size_t);
+    nic_multicast_mode_t, const nic_address_t *, size_t);
 extern int nic_broadcast_get_mode_impl(ddf_fun_t *, nic_broadcast_mode_t *);
 extern int nic_broadcast_set_mode_impl(ddf_fun_t *, nic_broadcast_mode_t);
 extern int nic_blocked_sources_get_impl(ddf_fun_t *,
-	size_t, nic_address_t *, size_t *);
+    size_t, nic_address_t *, size_t *);
 extern int nic_blocked_sources_set_impl(ddf_fun_t *, const nic_address_t *, size_t);
 extern int nic_vlan_get_mask_impl(ddf_fun_t *, nic_vlan_mask_t *);
 extern int nic_vlan_set_mask_impl(ddf_fun_t *, const nic_vlan_mask_t *);
 extern int nic_wol_virtue_add_impl(ddf_fun_t *dev_fun, nic_wv_type_t type,
-	const void *data, size_t length, nic_wv_id_t *new_id);
+    const void *data, size_t length, nic_wv_id_t *new_id);
 extern int nic_wol_virtue_remove_impl(ddf_fun_t *dev_fun, nic_wv_id_t id);
 extern int nic_wol_virtue_probe_impl(ddf_fun_t *dev_fun, nic_wv_id_t id,
-	nic_wv_type_t *type, size_t max_length, void *data, size_t *length);
+    nic_wv_type_t *type, size_t max_length, void *data, size_t *length);
 extern int nic_wol_virtue_list_impl(ddf_fun_t *dev_fun, nic_wv_type_t type,
-	size_t max_count, nic_wv_id_t *id_list, size_t *id_count);
+    size_t max_count, nic_wv_id_t *id_list, size_t *id_count);
 extern int nic_wol_virtue_get_caps_impl(ddf_fun_t *, nic_wv_type_t, int *);
 extern int nic_poll_get_mode_impl(ddf_fun_t *,
-	nic_poll_mode_t *, struct timeval *);
+    nic_poll_mode_t *, struct timeval *);
 extern int nic_poll_set_mode_impl(ddf_fun_t *,
-	nic_poll_mode_t, const struct timeval *);
+    nic_poll_mode_t, const struct timeval *);
 extern int nic_poll_now_impl(ddf_fun_t *);
 
Index: uspace/lib/nic/src/nic_driver.c
===================================================================
--- uspace/lib/nic/src/nic_driver.c	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/nic/src/nic_driver.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -79,6 +79,5 @@
 }
 
-/**
- * Fill in the default implementations for device options and NIC interface.
+/** Fill in the default implementations for device options and NIC interface.
  *
  * @param driver_ops
Index: uspace/lib/posix/stdbool.h
===================================================================
--- uspace/lib/posix/stdbool.h	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/posix/stdbool.h	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -37,10 +37,12 @@
 
 #ifdef LIBC_BOOL_H_
-#if (!defined(POSIX_STDIO_H_)) \
-		&& (!defined(POSIX_STDLIB_H_)) \
-		&& (!defined(POSIX_STRING_H_))
-#error "You can't include bool.h and stdbool.h at the same time."
+
+#if (!defined(POSIX_STDIO_H_)) && \
+    (!defined(POSIX_STDLIB_H_)) && \
+    (!defined(POSIX_STRING_H_))
+	#error "You can't include bool.h and stdbool.h at the same time."
 #endif
-#endif
+
+#endif /* LIBC_BOOL_H */
 
 #define LIBC_BOOL_H_
Index: uspace/lib/usb/include/usb/ddfiface.h
===================================================================
--- uspace/lib/usb/include/usb/ddfiface.h	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/usb/include/usb/ddfiface.h	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -33,4 +33,5 @@
  * Implementations of DDF interfaces functions.
  */
+
 #ifndef LIBUSB_DDFIFACE_H_
 #define LIBUSB_DDFIFACE_H_
@@ -39,14 +40,15 @@
 #include <usb_iface.h>
 
-int usb_iface_get_hc_handle_device_impl(ddf_fun_t *, devman_handle_t *);
-int usb_iface_get_my_address_forward_impl(ddf_fun_t *, usb_address_t *);
+extern int usb_iface_get_hc_handle_device_impl(ddf_fun_t *, devman_handle_t *);
+extern int usb_iface_get_my_address_forward_impl(ddf_fun_t *, usb_address_t *);
 extern usb_iface_t usb_iface_hub_impl;
 
-int usb_iface_get_my_address_from_device_data(ddf_fun_t *, usb_address_t *);
+extern int usb_iface_get_my_address_from_device_data(ddf_fun_t *, usb_address_t *);
 extern usb_iface_t usb_iface_hub_child_impl;
 
-int usb_iface_get_hc_handle_hc_impl(ddf_fun_t *, devman_handle_t *);
+extern int usb_iface_get_hc_handle_hc_impl(ddf_fun_t *, devman_handle_t *);
 
 #endif
+
 /**
  * @}
Index: uspace/lib/usb/include/usb/debug.h
===================================================================
--- uspace/lib/usb/include/usb/debug.h	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/usb/include/usb/debug.h	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -82,7 +82,7 @@
 /** Default log level. */
 #ifdef CONFIG_USB_VERBOSE
-#  define USB_LOG_LEVEL_DEFAULT USB_LOG_LEVEL_DEBUG
+	#define USB_LOG_LEVEL_DEFAULT USB_LOG_LEVEL_DEBUG
 #else
-#  define USB_LOG_LEVEL_DEFAULT USB_LOG_LEVEL_INFO
+	#define USB_LOG_LEVEL_DEFAULT USB_LOG_LEVEL_INFO
 #endif
 
Index: uspace/lib/usb/src/ddfiface.c
===================================================================
--- uspace/lib/usb/src/ddfiface.c	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/usb/src/ddfiface.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -33,4 +33,5 @@
  * Implementations of DDF interfaces functions (actual implementation).
  */
+
 #include <devman.h>
 #include <async.h>
Index: uspace/lib/usb/src/hc.c
===================================================================
--- uspace/lib/usb/src/hc.c	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/usb/src/hc.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -27,4 +27,5 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup libusb
  * @{
@@ -33,4 +34,5 @@
  * General communication with host controller driver (implementation).
  */
+
 #include <usb/debug.h>
 
@@ -44,4 +46,5 @@
 {
 	assert(connection);
+	
 	fibril_mutex_lock(&connection->guard);
 	if (connection->ref_count == 0) {
@@ -55,12 +58,14 @@
 		}
 	}
+	
 	++connection->ref_count;
 	fibril_mutex_unlock(&connection->guard);
 	return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 static int usb_hc_connection_del_ref(usb_hc_connection_t *connection)
 {
 	assert(connection);
+	
 	fibril_mutex_lock(&connection->guard);
 	if (connection->ref_count == 0) {
@@ -70,4 +75,5 @@
 		return EOK;
 	}
+	
 	--connection->ref_count;
 	int ret = EOK;
@@ -125,5 +131,5 @@
 	return rc;
 }
-/*----------------------------------------------------------------------------*/
+
 void usb_hc_connection_deinitialize(usb_hc_connection_t *connection)
 {
@@ -140,5 +146,5 @@
 	fibril_mutex_unlock(&connection->guard);
 }
-/*----------------------------------------------------------------------------*/
+
 /** Open connection to host controller.
  *
@@ -150,5 +156,5 @@
 	return usb_hc_connection_add_ref(connection);
 }
-/*----------------------------------------------------------------------------*/
+
 /** Close connection to the host controller.
  *
@@ -160,5 +166,5 @@
 	return usb_hc_connection_del_ref(connection);
 }
-/*----------------------------------------------------------------------------*/
+
 /** Ask host controller for free address assignment.
  *
@@ -182,5 +188,5 @@
 	return ret == EOK ? address : ret;
 }
-/*----------------------------------------------------------------------------*/
+
 int usb_hc_bind_address(usb_hc_connection_t * connection,
     usb_address_t address, devman_handle_t handle)
@@ -194,5 +200,5 @@
 	return ret;
 }
-/*----------------------------------------------------------------------------*/
+
 /** Get handle of USB device with given address.
  *
@@ -213,5 +219,5 @@
 	return ret;
 }
-/*----------------------------------------------------------------------------*/
+
 int usb_hc_release_address(usb_hc_connection_t *connection,
     usb_address_t address)
@@ -225,5 +231,5 @@
 	return ret;
 }
-/*----------------------------------------------------------------------------*/
+
 int usb_hc_register_endpoint(usb_hc_connection_t *connection,
     usb_address_t address, usb_endpoint_t endpoint, usb_transfer_type_t type,
@@ -239,5 +245,5 @@
 	return ret;
 }
-/*----------------------------------------------------------------------------*/
+
 int usb_hc_unregister_endpoint(usb_hc_connection_t *connection,
     usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction)
@@ -252,5 +258,5 @@
 	return ret;
 }
-/*----------------------------------------------------------------------------*/
+
 int usb_hc_read(usb_hc_connection_t *connection, usb_address_t address,
     usb_endpoint_t endpoint, uint64_t setup, void *data, size_t size,
@@ -266,5 +272,5 @@
 	return ret;
 }
-/*----------------------------------------------------------------------------*/
+
 int usb_hc_write(usb_hc_connection_t *connection, usb_address_t address,
     usb_endpoint_t endpoint, uint64_t setup, const void *data, size_t size)
Index: uspace/lib/usbdev/include/usb/dev/driver.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/driver.h	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/usbdev/include/usb/dev/driver.h	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -33,4 +33,5 @@
  * USB device driver framework.
  */
+
 #ifndef LIBUSBDEV_DRIVER_H_
 #define LIBUSBDEV_DRIVER_H_
Index: uspace/lib/usbdev/include/usb/dev/hub.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/hub.h	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/usbdev/include/usb/dev/hub.h	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -35,4 +35,5 @@
  * For class specific requests, see usb/classes/hub.h.
  */
+
 #ifndef LIBUSBDEV_HUB_H_
 #define LIBUSBDEV_HUB_H_
@@ -43,5 +44,5 @@
 #include <usb/hc.h>
 
-int usb_hc_new_device_wrapper(ddf_dev_t *, usb_hc_connection_t *, usb_speed_t,
+extern int usb_hc_new_device_wrapper(ddf_dev_t *, usb_hc_connection_t *, usb_speed_t,
     int (*)(void *), void *, usb_address_t *, ddf_dev_ops_t *, void *,
     ddf_fun_t **);
@@ -60,5 +61,5 @@
 } usb_hub_attached_device_t;
 
-int usb_hub_register_device(usb_hc_connection_t *,
+extern int usb_hub_register_device(usb_hc_connection_t *,
     const usb_hub_attached_device_t *);
 
@@ -69,8 +70,10 @@
 	if (attached_device == NULL)
 		return EBADMEM;
+	
 	return usb_hc_release_address(conn, attached_device->address);
 }
 
 #endif
+
 /**
  * @}
Index: uspace/lib/usbdev/include/usb/dev/recognise.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/recognise.h	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/usbdev/include/usb/dev/recognise.h	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -33,4 +33,5 @@
  * USB device recognition.
  */
+
 #ifndef LIBUSBDEV_RECOGNISE_H_
 #define LIBUSBDEV_RECOGNISE_H_
@@ -41,17 +42,18 @@
 #include <ipc/devman.h>
 
-int usb_device_create_match_ids_from_device_descriptor(
+extern int usb_device_create_match_ids_from_device_descriptor(
     const usb_standard_device_descriptor_t *, match_id_list_t *);
 
-int usb_device_create_match_ids_from_interface(
+extern int usb_device_create_match_ids_from_interface(
     const usb_standard_device_descriptor_t *,
     const usb_standard_interface_descriptor_t *, match_id_list_t *);
 
-int usb_device_create_match_ids(usb_pipe_t *, match_id_list_t *);
+extern int usb_device_create_match_ids(usb_pipe_t *, match_id_list_t *);
 
-int usb_device_register_child_in_devman(usb_pipe_t *ctrl_pipe,
+extern int usb_device_register_child_in_devman(usb_pipe_t *ctrl_pipe,
     ddf_dev_t *, ddf_dev_ops_t *, void *, ddf_fun_t **);
 
 #endif
+
 /**
  * @}
Index: uspace/lib/usbdev/src/altiface.c
===================================================================
--- uspace/lib/usbdev/src/altiface.c	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/usbdev/src/altiface.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -33,4 +33,5 @@
  * Handling alternate interface settings.
  */
+
 #include <usb/dev/driver.h>
 #include <usb/dev/request.h>
Index: uspace/lib/usbdev/src/hub.c
===================================================================
--- uspace/lib/usbdev/src/hub.c	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/usbdev/src/hub.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -33,4 +33,5 @@
  * Functions needed by hub drivers.
  */
+
 #include <usb/dev/hub.h>
 #include <usb/dev/pipes.h>
@@ -114,5 +115,4 @@
 	return EOK;
 }
-
 
 /** Wrapper for registering attached device to the hub.
@@ -160,5 +160,5 @@
     ddf_dev_ops_t *dev_ops, void *new_dev_data, ddf_fun_t **new_fun)
 {
-	if (new_fun == NULL || hc_conn == NULL)
+	if ((new_fun == NULL) || (hc_conn == NULL))
 		return EINVAL;
 
Index: uspace/lib/usbdev/src/recognise.c
===================================================================
--- uspace/lib/usbdev/src/recognise.c	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/usbdev/src/recognise.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -33,4 +33,5 @@
  * Functions for recognition of attached devices.
  */
+
 #include <sys/types.h>
 #include <fibril_synch.h>
@@ -311,4 +312,5 @@
  *	will be written.
  * @return Error code.
+ *
  */
 int usb_device_register_child_in_devman(usb_pipe_t *ctrl_pipe,
@@ -318,23 +320,23 @@
 	if (child_fun == NULL || ctrl_pipe == NULL)
 		return EINVAL;
-
+	
 	if (!dev_ops && dev_data) {
 		usb_log_warning("Using standard fun ops with arbitrary "
 		    "driver data. This does not have to work.\n");
 	}
-
+	
 	/** Index to append after device name for uniqueness. */
 	static atomic_t device_name_index = {0};
 	const size_t this_device_name_index =
 	    (size_t) atomic_preinc(&device_name_index);
-
+	
 	ddf_fun_t *child = NULL;
 	int rc;
-
+	
 	/*
 	 * TODO: Once the device driver framework support persistent
 	 * naming etc., something more descriptive could be created.
 	 */
-	char child_name[12]; /* The format is: "usbAB_aXYZ", length 11 */
+	char child_name[12];  /* The format is: "usbAB_aXYZ", length 11 */
 	rc = snprintf(child_name, sizeof(child_name),
 	    "usb%02zu_a%d", this_device_name_index, ctrl_pipe->wire->address);
@@ -342,5 +344,5 @@
 		goto failure;
 	}
-
+	
 	child = ddf_fun_create(parent, fun_inner, child_name);
 	if (child == NULL) {
@@ -348,14 +350,15 @@
 		goto failure;
 	}
-
-	if (dev_ops != NULL) {
+	
+	if (dev_ops != NULL)
 		child->ops = dev_ops;
-	} else {
+	else
 		child->ops = &child_ops;
-	}
-
+	
 	child->driver_data = dev_data;
-	/* Store the attached device in fun driver data if there is no
-	 * other data */
+	/*
+	 * Store the attached device in fun
+	 * driver data if there is no other data
+	 */
 	if (!dev_data) {
 		usb_hub_attached_device_t *new_device = ddf_fun_data_alloc(
@@ -365,36 +368,33 @@
 			goto failure;
 		}
+		
 		new_device->address = ctrl_pipe->wire->address;
 		new_device->fun = child;
 	}
-
-
+	
 	rc = usb_device_create_match_ids(ctrl_pipe, &child->match_ids);
-	if (rc != EOK) {
+	if (rc != EOK)
 		goto failure;
-	}
-
+	
 	rc = ddf_fun_bind(child);
-	if (rc != EOK) {
+	if (rc != EOK)
 		goto failure;
-	}
-
+	
 	*child_fun = child;
 	return EOK;
-
+	
 failure:
 	if (child != NULL) {
 		/* We know nothing about the data if it came from outside. */
-		if (dev_data) {
+		if (dev_data)
 			child->driver_data = NULL;
-		}
+		
 		/* This takes care of match_id deallocation as well. */
 		ddf_fun_destroy(child);
 	}
-
+	
 	return rc;
 }
 
-
 /**
  * @}
Index: uspace/lib/usbhid/src/hidiface.c
===================================================================
--- uspace/lib/usbhid/src/hidiface.c	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/usbhid/src/hidiface.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -33,4 +33,5 @@
  * Client functions for accessing USB HID interface (implementation).
  */
+
 #include <dev_iface.h>
 #include <usbhid_iface.h>
Index: uspace/lib/usbhost/include/usb/host/hcd.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/hcd.h	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/usbhost/include/usb/host/hcd.h	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -33,4 +33,5 @@
  *
  */
+
 #ifndef LIBUSBHOST_HOST_HCD_H
 #define LIBUSBHOST_HOST_HCD_H
@@ -61,5 +62,5 @@
 	void (*ep_remove_hook)(hcd_t *, endpoint_t *);
 };
-/*----------------------------------------------------------------------------*/
+
 /** Initialize hcd_t structure.
  * Initializes device and endpoint managers. Sets data and hook pointer to NULL.
@@ -79,5 +80,5 @@
 	hcd->ep_remove_hook = NULL;
 }
-/*----------------------------------------------------------------------------*/
+
 /** Check registered endpoints and reset toggle bit if necessary.
  * @param hcd hcd_t structure, non-null.
@@ -92,5 +93,5 @@
 	    &hcd->ep_manager, target, (const uint8_t *)setup_data);
 }
-/*----------------------------------------------------------------------------*/
+
 /** Data retrieve wrapper.
  * @param fun ddf function, non-null.
@@ -102,8 +103,9 @@
 	return fun->driver_data;
 }
-/*----------------------------------------------------------------------------*/
+
 extern usbhc_iface_t hcd_iface;
 
 #endif
+
 /**
  * @}
Index: uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -26,4 +26,5 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup libusbhost
  * @{
@@ -32,4 +33,5 @@
  * USB transfer transaction structures.
  */
+
 #ifndef LIBUSBHOST_HOST_USB_TRANSFER_BATCH_H
 #define LIBUSBHOST_HOST_USB_TRANSFER_BATCH_H
@@ -115,5 +117,5 @@
 void usb_transfer_batch_finish_error(const usb_transfer_batch_t *instance,
     const void* data, size_t size, int error);
-/*----------------------------------------------------------------------------*/
+
 /** Finish batch using stored error value and transferred size.
  *
@@ -128,5 +130,5 @@
 	    instance, data, instance->transfered_size, instance->error);
 }
-/*----------------------------------------------------------------------------*/
+
 /** Determine batch direction based on the callbacks present
  * @param[in] instance Batch structure to use, non-null.
@@ -153,5 +155,7 @@
 	assert(false);
 }
+
 #endif
+
 /**
  * @}
Index: uspace/lib/usbhost/src/iface.c
===================================================================
--- uspace/lib/usbhost/src/iface.c	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/usbhost/src/iface.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -26,4 +26,5 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup libusbhost
  * @{
@@ -32,4 +33,5 @@
  * @brief HCD DDF interface implementation
  */
+
 #include <ddf/driver.h>
 #include <errno.h>
@@ -98,5 +100,5 @@
 	return ret;
 }
-/*----------------------------------------------------------------------------*/
+
 /** Calls ep_add_hook upon endpoint registration.
  * @param ep Endpoint to be registered.
@@ -113,5 +115,5 @@
 	return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 /** Calls ep_remove_hook upon endpoint removal.
  * @param ep Endpoint to be unregistered.
@@ -126,5 +128,5 @@
 		hcd->ep_remove_hook(hcd, ep);
 }
-/*----------------------------------------------------------------------------*/
+
 /** Calls ep_remove_hook upon endpoint removal. Prints warning.
  * @param ep Endpoint to be unregistered.
@@ -141,5 +143,5 @@
 		hcd->ep_remove_hook(hcd, ep);
 }
-/*----------------------------------------------------------------------------*/
+
 /** Request address interface function.
  *
@@ -164,5 +166,5 @@
 	    &hcd->dev_manager, address, strict, speed);
 }
-/*----------------------------------------------------------------------------*/
+
 /** Bind address interface function.
  *
@@ -183,5 +185,5 @@
 	    &hcd->dev_manager, address, handle);
 }
-/*----------------------------------------------------------------------------*/
+
 /** Find device handle by address interface function.
  *
@@ -200,5 +202,5 @@
 	    &hcd->dev_manager, address, handle, NULL);
 }
-/*----------------------------------------------------------------------------*/
+
 /** Release address interface function.
  *
@@ -218,5 +220,5 @@
 	return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 /** Register endpoint interface function.
  * @param fun DDF function.
@@ -254,5 +256,5 @@
 	    register_helper, hcd);
 }
-/*----------------------------------------------------------------------------*/
+
 /** Unregister endpoint interface function.
  * @param fun DDF function.
@@ -274,5 +276,5 @@
 	    endpoint, direction, unregister_helper, hcd);
 }
-/*----------------------------------------------------------------------------*/
+
 /** Inbound communication interface function.
  * @param fun DDF function.
@@ -292,5 +294,5 @@
 	    setup_data, callback, NULL, arg, "READ");
 }
-/*----------------------------------------------------------------------------*/
+
 /** Outbound communication interface function.
  * @param fun DDF function.
@@ -310,5 +312,5 @@
 	    setup_data, NULL, callback, arg, "WRITE");
 }
-/*----------------------------------------------------------------------------*/
+
 /** usbhc Interface implementation using hcd_t from libusbhost library. */
 usbhc_iface_t hcd_iface = {
@@ -324,4 +326,5 @@
 	.write = usb_write,
 };
+
 /**
  * @}
Index: uspace/lib/usbvirt/src/device.c
===================================================================
--- uspace/lib/usbvirt/src/device.c	(revision df3f85f587bec2d6d4f0bafd93d5020c1af44c68)
+++ uspace/lib/usbvirt/src/device.c	(revision b16e77d9272f85a010982f527df99e7361f4cfe7)
@@ -33,4 +33,5 @@
  * Virtual USB device main routines.
  */
+
 #include <errno.h>
 #include <str.h>