Index: uspace/lib/drv/generic/driver.c
===================================================================
--- uspace/lib/drv/generic/driver.c	(revision 1e5d01bb594a6e472579d21a7da4f3f782adddad)
+++ uspace/lib/drv/generic/driver.c	(revision 4bf0926eafdfba5eb055645d92feb2f44e40542f)
@@ -126,5 +126,5 @@
 		return;
 	}
-
+	
 	ddf_dev_t *dev = create_device();
 	if (!dev) {
@@ -133,5 +133,5 @@
 		return;
 	}
-
+	
 	/* Add one reference that will be dropped by driver_dev_remove() */
 	dev_add_ref(dev);
Index: uspace/lib/drv/generic/remote_ahci.c
===================================================================
--- uspace/lib/drv/generic/remote_ahci.c	(revision 1e5d01bb594a6e472579d21a7da4f3f782adddad)
+++ uspace/lib/drv/generic/remote_ahci.c	(revision 4bf0926eafdfba5eb055645d92feb2f44e40542f)
@@ -226,5 +226,5 @@
 		return;
 	}	
-
+	
 	const int ret = ahci_iface->get_sata_device_name(fun,
 	    sata_dev_name_length, sata_dev_name);
@@ -235,5 +235,5 @@
 	    (real_size == sata_dev_name_length))
 		async_data_read_finalize(cid, sata_dev_name, sata_dev_name_length);
-
+	
 	free(sata_dev_name);
 	async_answer_0(callid, ret);
Index: uspace/lib/drv/generic/remote_usb.c
===================================================================
--- uspace/lib/drv/generic/remote_usb.c	(revision 1e5d01bb594a6e472579d21a7da4f3f782adddad)
+++ uspace/lib/drv/generic/remote_usb.c	(revision 4bf0926eafdfba5eb055645d92feb2f44e40542f)
@@ -91,7 +91,10 @@
 
 /** Tell devman handle of the usb device function.
- * @param[in] exch IPC communication exchange
+ *
+ * @param[in]  exch   IPC communication exchange
  * @param[out] handle devman handle of the HC used by the target device.
+ *
  * @return Error code.
+ *
  */
 int usb_get_my_device_handle(async_exch_t *exch, devman_handle_t *handle)
@@ -119,6 +122,9 @@
 
 /** Release default USB address.
+ *
  * @param[in] exch IPC communication exchange
+ *
  * @return Error code.
+ *
  */
 int usb_release_default_address(async_exch_t *exch)
@@ -131,7 +137,10 @@
 
 /** Trigger USB device enumeration
- * @param[in] exch IPC communication exchange
+ *
+ * @param[in]  exch   IPC communication exchange
  * @param[out] handle Identifier of the newly added device (if successful)
+ *
  * @return Error code.
+ *
  */
 int usb_device_enumerate(async_exch_t *exch, unsigned port)
@@ -145,7 +154,10 @@
 
 /** Trigger USB device enumeration
- * @param[in] exch IPC communication exchange
+ *
+ * @param[in] exch   IPC communication exchange
  * @param[in] handle Identifier of the device
+ *
  * @return Error code.
+ *
  */
 int usb_device_remove(async_exch_t *exch, unsigned port)
Index: uspace/lib/drv/include/usb_iface.h
===================================================================
--- uspace/lib/drv/include/usb_iface.h	(revision 1e5d01bb594a6e472579d21a7da4f3f782adddad)
+++ uspace/lib/drv/include/usb_iface.h	(revision 4bf0926eafdfba5eb055645d92feb2f44e40542f)
@@ -44,22 +44,25 @@
 typedef async_sess_t usb_dev_session_t;
 
-usb_dev_session_t *usb_dev_connect(devman_handle_t);
-usb_dev_session_t *usb_dev_connect_to_self(ddf_dev_t *);
-void usb_dev_disconnect(usb_dev_session_t *);
+extern usb_dev_session_t *usb_dev_connect(devman_handle_t);
+extern usb_dev_session_t *usb_dev_connect_to_self(ddf_dev_t *);
+extern void usb_dev_disconnect(usb_dev_session_t *);
 
-int usb_get_my_interface(async_exch_t *, int *);
-int usb_get_my_device_handle(async_exch_t *, devman_handle_t *);
+extern int usb_get_my_interface(async_exch_t *, int *);
+extern int usb_get_my_device_handle(async_exch_t *, devman_handle_t *);
 
-int usb_reserve_default_address(async_exch_t *, usb_speed_t);
-int usb_release_default_address(async_exch_t *);
+extern int usb_reserve_default_address(async_exch_t *, usb_speed_t);
+extern int usb_release_default_address(async_exch_t *);
 
-int usb_device_enumerate(async_exch_t *, unsigned port);
-int usb_device_remove(async_exch_t *, unsigned port);
+extern int usb_device_enumerate(async_exch_t *, unsigned port);
+extern int usb_device_remove(async_exch_t *, unsigned port);
 
-int usb_register_endpoint(async_exch_t *, usb_endpoint_t, usb_transfer_type_t,
-    usb_direction_t, size_t, unsigned, unsigned);
-int usb_unregister_endpoint(async_exch_t *, usb_endpoint_t, usb_direction_t);
-int usb_read(async_exch_t *, usb_endpoint_t, uint64_t, void *, size_t, size_t *);
-int usb_write(async_exch_t *, usb_endpoint_t, uint64_t, const void *, size_t);
+extern int usb_register_endpoint(async_exch_t *, usb_endpoint_t,
+    usb_transfer_type_t, usb_direction_t, size_t, unsigned, unsigned);
+extern int usb_unregister_endpoint(async_exch_t *, usb_endpoint_t,
+    usb_direction_t);
+extern int usb_read(async_exch_t *, usb_endpoint_t, uint64_t, void *, size_t,
+    size_t *);
+extern int usb_write(async_exch_t *, usb_endpoint_t, uint64_t, const void *,
+    size_t);
 
 /** Callback for outgoing transfer. */
Index: uspace/lib/drv/include/usbhc_iface.h
===================================================================
--- uspace/lib/drv/include/usbhc_iface.h	(revision 1e5d01bb594a6e472579d21a7da4f3f782adddad)
+++ uspace/lib/drv/include/usbhc_iface.h	(revision 4bf0926eafdfba5eb055645d92feb2f44e40542f)
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 
-int usbhc_read(async_exch_t *, usb_address_t, usb_endpoint_t,
+extern int usbhc_read(async_exch_t *, usb_address_t, usb_endpoint_t,
     uint64_t, void *, size_t, size_t *);
-int usbhc_write(async_exch_t *, usb_address_t, usb_endpoint_t,
+extern int usbhc_write(async_exch_t *, usb_address_t, usb_endpoint_t,
     uint64_t, const void *, size_t);