Index: uspace/lib/usbhost/include/usb/host/endpoint.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/endpoint.h	(revision f527f5844b885cc12373c416ede48539086c2748)
+++ uspace/lib/usbhost/include/usb/host/endpoint.h	(revision 4bf0926eafdfba5eb055645d92feb2f44e40542f)
@@ -88,26 +88,28 @@
 } endpoint_t;
 
-endpoint_t * endpoint_create(usb_address_t address, usb_endpoint_t endpoint,
-    usb_direction_t direction, usb_transfer_type_t type, usb_speed_t speed,
-    size_t max_packet_size, unsigned packets, size_t bw,
-    usb_address_t tt_address, unsigned tt_port);
-void endpoint_destroy(endpoint_t *instance);
+extern endpoint_t *endpoint_create(usb_address_t, usb_endpoint_t,
+    usb_direction_t, usb_transfer_type_t, usb_speed_t, size_t, unsigned int,
+    size_t, usb_address_t, unsigned int);
+extern void endpoint_destroy(endpoint_t *);
 
-void endpoint_add_ref(endpoint_t *instance);
-void endpoint_del_ref(endpoint_t *instance);
+extern void endpoint_add_ref(endpoint_t *);
+extern void endpoint_del_ref(endpoint_t *);
 
-void endpoint_set_hc_data(endpoint_t *instance,
-    void *data, int (*toggle_get)(void *), void (*toggle_set)(void *, int));
-void endpoint_clear_hc_data(endpoint_t *instance);
+extern void endpoint_set_hc_data(endpoint_t *, void *, int (*)(void *),
+    void (*)(void *, int));
+extern void endpoint_clear_hc_data(endpoint_t *);
 
-void endpoint_use(endpoint_t *instance);
-void endpoint_release(endpoint_t *instance);
+extern void endpoint_use(endpoint_t *);
+extern void endpoint_release(endpoint_t *);
 
-int endpoint_toggle_get(endpoint_t *instance);
-void endpoint_toggle_set(endpoint_t *instance, int toggle);
+extern int endpoint_toggle_get(endpoint_t *);
+extern void endpoint_toggle_set(endpoint_t *, int);
 
 /** list_get_instance wrapper.
+ *
  * @param item Pointer to link member.
+ *
  * @return Pointer to endpoint_t structure.
+ *
  */
 static inline endpoint_t * endpoint_get_instance(link_t *item)
@@ -116,4 +118,5 @@
 }
 #endif
+
 /**
  * @}
Index: uspace/lib/usbhost/include/usb/host/hcd.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/hcd.h	(revision f527f5844b885cc12373c416ede48539086c2748)
+++ uspace/lib/usbhost/include/usb/host/hcd.h	(revision 4bf0926eafdfba5eb055645d92feb2f44e40542f)
@@ -81,6 +81,5 @@
 };
 
-void hcd_init(hcd_t *hcd, usb_speed_t max_speed, size_t bandwidth,
-    bw_count_func_t bw_count);
+extern void hcd_init(hcd_t *, usb_speed_t, size_t, bw_count_func_t);
 
 static inline void hcd_set_implementation(hcd_t *hcd, void *data,
@@ -102,9 +101,9 @@
 }
 
-usb_address_t hcd_request_address(hcd_t *hcd, usb_speed_t speed);
+extern usb_address_t hcd_request_address(hcd_t *, usb_speed_t);
 
-int hcd_release_address(hcd_t *hcd, usb_address_t address);
+extern int hcd_release_address(hcd_t *, usb_address_t);
 
-int hcd_reserve_default_address(hcd_t *hcd, usb_speed_t speed);
+extern int hcd_reserve_default_address(hcd_t *, usb_speed_t);
 
 static inline int hcd_release_default_address(hcd_t *hcd)
@@ -113,20 +112,19 @@
 }
 
-int hcd_add_ep(hcd_t *hcd, usb_target_t target, usb_direction_t dir,
-    usb_transfer_type_t type, size_t max_packet_size, unsigned packets,
-    size_t size, usb_address_t tt_address, unsigned tt_port);
+extern int hcd_add_ep(hcd_t *, usb_target_t, usb_direction_t,
+    usb_transfer_type_t, size_t, unsigned int, size_t, usb_address_t,
+    unsigned int);
 
-int hcd_remove_ep(hcd_t *hcd, usb_target_t target, usb_direction_t dir);
+extern int hcd_remove_ep(hcd_t *, usb_target_t, usb_direction_t);
 
-int hcd_send_batch(hcd_t *hcd, usb_target_t target, usb_direction_t direction,
-    void *data, size_t size, uint64_t setup_data,
-    usbhc_iface_transfer_in_callback_t in,
-    usbhc_iface_transfer_out_callback_t out, void *arg, const char* name);
+extern int hcd_send_batch(hcd_t *, usb_target_t, usb_direction_t, void *,
+    size_t, uint64_t, usbhc_iface_transfer_in_callback_t,
+    usbhc_iface_transfer_out_callback_t, void *, const char *);
 
-ssize_t hcd_send_batch_sync(hcd_t *hcd, usb_target_t target,
-    usb_direction_t dir, void *data, size_t size, uint64_t setup_data,
-    const char* name);
+extern ssize_t hcd_send_batch_sync(hcd_t *, usb_target_t, usb_direction_t,
+    void *, size_t, uint64_t, const char *);
 
 #endif
+
 /**
  * @}
Index: uspace/lib/usbhost/src/usb_transfer_batch.c
===================================================================
--- uspace/lib/usbhost/src/usb_transfer_batch.c	(revision f527f5844b885cc12373c416ede48539086c2748)
+++ uspace/lib/usbhost/src/usb_transfer_batch.c	(revision 4bf0926eafdfba5eb055645d92feb2f44e40542f)
@@ -56,13 +56,10 @@
  * @return Pointer to valid usb_transfer_batch_t structure, NULL on failure.
  */
-usb_transfer_batch_t * usb_transfer_batch_create(
-    endpoint_t *ep,
-    char *buffer,
+usb_transfer_batch_t *usb_transfer_batch_create(endpoint_t *ep, char *buffer,
     size_t buffer_size,
     uint64_t setup_buffer,
     usbhc_iface_transfer_in_callback_t func_in,
     usbhc_iface_transfer_out_callback_t func_out,
-    void *arg
-    )
+    void *arg)
 {
 	if (func_in == NULL && func_out == NULL)