Index: uspace/lib/usbdev/include/usb/dev/alternate_ifaces.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/alternate_ifaces.h	(revision facacc712e3d87d7301754b109c9582ef1ef29e4)
+++ uspace/lib/usbdev/include/usb/dev/alternate_ifaces.h	(revision 847844a5c1c6014e479cb00bf10c9d740927aa2d)
@@ -67,5 +67,5 @@
 
 size_t usb_interface_count_alternates(const uint8_t *, size_t, uint8_t);
-int usb_alternate_interfaces_init(usb_alternate_interfaces_t *,
+errno_t usb_alternate_interfaces_init(usb_alternate_interfaces_t *,
     const uint8_t *, size_t, int);
 void usb_alternate_interfaces_deinit(usb_alternate_interfaces_t *);
Index: uspace/lib/usbdev/include/usb/dev/device.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/device.h	(revision facacc712e3d87d7301754b109c9582ef1ef29e4)
+++ uspace/lib/usbdev/include/usb/dev/device.h	(revision 847844a5c1c6014e479cb00bf10c9d740927aa2d)
@@ -58,5 +58,5 @@
 
 /* DDF parts */
-int usb_device_create_ddf(ddf_dev_t *, const usb_endpoint_description_t **, const char **);
+errno_t usb_device_create_ddf(ddf_dev_t *, const usb_endpoint_description_t **, const char **);
 void usb_device_destroy_ddf(ddf_dev_t *);
 
@@ -76,8 +76,8 @@
 void usb_device_bus_exchange_end(async_exch_t *);
 
-int usb_device_select_interface(usb_device_t *, uint8_t,
+errno_t usb_device_select_interface(usb_device_t *, uint8_t,
     const usb_endpoint_description_t **);
 
-int usb_device_create_pipes(usb_device_t *usb_dev,
+errno_t usb_device_create_pipes(usb_device_t *usb_dev,
     const usb_endpoint_description_t **endpoints);
 void usb_device_destroy_pipes(usb_device_t *);
Index: uspace/lib/usbdev/include/usb/dev/driver.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/driver.h	(revision facacc712e3d87d7301754b109c9582ef1ef29e4)
+++ uspace/lib/usbdev/include/usb/dev/driver.h	(revision 847844a5c1c6014e479cb00bf10c9d740927aa2d)
@@ -43,9 +43,9 @@
 typedef struct {
 	/** Callback when a new device was added to the system. */
-	int (*device_add)(usb_device_t *);
+	errno_t (*device_add)(usb_device_t *);
 	/** Callback when a device is about to be removed from the system. */
-	int (*device_rem)(usb_device_t *);
+	errno_t (*device_rem)(usb_device_t *);
 	/** Callback when a device was removed from the system. */
-	int (*device_gone)(usb_device_t *);
+	errno_t (*device_gone)(usb_device_t *);
 } usb_driver_ops_t;
 
Index: uspace/lib/usbdev/include/usb/dev/pipes.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/pipes.h	(revision facacc712e3d87d7301754b109c9582ef1ef29e4)
+++ uspace/lib/usbdev/include/usb/dev/pipes.h	(revision 847844a5c1c6014e479cb00bf10c9d740927aa2d)
@@ -109,21 +109,21 @@
 } usb_endpoint_mapping_t;
 
-int usb_pipe_initialize(usb_pipe_t *, usb_endpoint_t, usb_transfer_type_t,
+errno_t usb_pipe_initialize(usb_pipe_t *, usb_endpoint_t, usb_transfer_type_t,
     size_t, usb_direction_t, unsigned, usb_dev_session_t *);
-int usb_pipe_initialize_default_control(usb_pipe_t *, usb_dev_session_t *);
+errno_t usb_pipe_initialize_default_control(usb_pipe_t *, usb_dev_session_t *);
 
-int usb_pipe_probe_default_control(usb_pipe_t *);
-int usb_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
+errno_t usb_pipe_probe_default_control(usb_pipe_t *);
+errno_t usb_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
     size_t, const uint8_t *, size_t, usb_dev_session_t *);
 
-int usb_pipe_register(usb_pipe_t *, unsigned);
-int usb_pipe_unregister(usb_pipe_t *);
+errno_t usb_pipe_register(usb_pipe_t *, unsigned);
+errno_t usb_pipe_unregister(usb_pipe_t *);
 
-int usb_pipe_read(usb_pipe_t *, void *, size_t, size_t *);
-int usb_pipe_write(usb_pipe_t *, const void *, size_t);
+errno_t usb_pipe_read(usb_pipe_t *, void *, size_t, size_t *);
+errno_t usb_pipe_write(usb_pipe_t *, const void *, size_t);
 
-int usb_pipe_control_read(usb_pipe_t *, const void *, size_t,
+errno_t usb_pipe_control_read(usb_pipe_t *, const void *, size_t,
     void *, size_t, size_t *);
-int usb_pipe_control_write(usb_pipe_t *, const void *, size_t,
+errno_t usb_pipe_control_write(usb_pipe_t *, const void *, size_t,
     const void *, size_t);
 
Index: uspace/lib/usbdev/include/usb/dev/poll.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/poll.h	(revision facacc712e3d87d7301754b109c9582ef1ef29e4)
+++ uspace/lib/usbdev/include/usb/dev/poll.h	(revision 847844a5c1c6014e479cb00bf10c9d740927aa2d)
@@ -87,5 +87,5 @@
 	 * @return Whether to continue in polling.
 	 */
-	bool (*on_error)(usb_device_t *dev, int err_code, void *arg);
+	bool (*on_error)(usb_device_t *dev, errno_t err_code, void *arg);
 	/** Argument to pass to callbacks. */
 	void *arg;
@@ -95,15 +95,15 @@
 typedef void (*usb_polling_terminted_callback_t)(usb_device_t *, bool, void *);
 
-extern int usb_device_auto_polling(usb_device_t *, usb_endpoint_t,
+extern errno_t usb_device_auto_polling(usb_device_t *, usb_endpoint_t,
     const usb_device_auto_polling_t *, size_t);
 
-extern int usb_device_auto_poll(usb_device_t *, usb_endpoint_t,
+extern errno_t usb_device_auto_poll(usb_device_t *, usb_endpoint_t,
     usb_polling_callback_t, size_t, int, usb_polling_terminted_callback_t, void *);
 
-extern int usb_device_auto_polling_desc(usb_device_t *,
+extern errno_t usb_device_auto_polling_desc(usb_device_t *,
     const usb_endpoint_description_t *, const usb_device_auto_polling_t *,
     size_t);
 
-extern int usb_device_auto_poll_desc(usb_device_t *,
+extern errno_t usb_device_auto_poll_desc(usb_device_t *,
     const usb_endpoint_description_t *, usb_polling_callback_t, size_t, int,
     usb_polling_terminted_callback_t, void *);
Index: uspace/lib/usbdev/include/usb/dev/recognise.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/recognise.h	(revision facacc712e3d87d7301754b109c9582ef1ef29e4)
+++ uspace/lib/usbdev/include/usb/dev/recognise.h	(revision 847844a5c1c6014e479cb00bf10c9d740927aa2d)
@@ -42,12 +42,12 @@
 #include <devman.h>
 
-extern int usb_device_create_match_ids_from_device_descriptor(
+extern errno_t usb_device_create_match_ids_from_device_descriptor(
     const usb_standard_device_descriptor_t *, match_id_list_t *);
 
-extern int usb_device_create_match_ids_from_interface(
+extern errno_t usb_device_create_match_ids_from_interface(
     const usb_standard_device_descriptor_t *,
     const usb_standard_interface_descriptor_t *, match_id_list_t *);
 
-extern int usb_device_create_match_ids(usb_pipe_t *, match_id_list_t *);
+extern errno_t usb_device_create_match_ids(usb_pipe_t *, match_id_list_t *);
 
 #endif
Index: uspace/lib/usbdev/include/usb/dev/request.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/request.h	(revision facacc712e3d87d7301754b109c9582ef1ef29e4)
+++ uspace/lib/usbdev/include/usb/dev/request.h	(revision 847844a5c1c6014e479cb00bf10c9d740927aa2d)
@@ -44,48 +44,48 @@
 #include <usb/request.h>
 
-int usb_control_request_set(usb_pipe_t *,
+errno_t usb_control_request_set(usb_pipe_t *,
     usb_request_type_t, usb_request_recipient_t, uint8_t,
     uint16_t, uint16_t, const void *, size_t);
 
-int usb_control_request_get(usb_pipe_t *,
+errno_t usb_control_request_get(usb_pipe_t *,
     usb_request_type_t, usb_request_recipient_t, uint8_t,
     uint16_t, uint16_t, void *, size_t, size_t *);
 
-int usb_request_get_status(usb_pipe_t *, usb_request_recipient_t,
+errno_t usb_request_get_status(usb_pipe_t *, usb_request_recipient_t,
     uint16_t, uint16_t *);
-int usb_request_clear_feature(usb_pipe_t *, usb_request_type_t,
+errno_t usb_request_clear_feature(usb_pipe_t *, usb_request_type_t,
     usb_request_recipient_t, uint16_t, uint16_t);
-int usb_request_set_feature(usb_pipe_t *, usb_request_type_t,
+errno_t usb_request_set_feature(usb_pipe_t *, usb_request_type_t,
     usb_request_recipient_t, uint16_t, uint16_t);
-int usb_request_get_descriptor(usb_pipe_t *, usb_request_type_t,
+errno_t usb_request_get_descriptor(usb_pipe_t *, usb_request_type_t,
     usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void *, size_t,
     size_t *);
-int usb_request_get_descriptor_alloc(usb_pipe_t *, usb_request_type_t,
+errno_t usb_request_get_descriptor_alloc(usb_pipe_t *, usb_request_type_t,
     usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void **, size_t *);
-int usb_request_get_device_descriptor(usb_pipe_t *,
+errno_t usb_request_get_device_descriptor(usb_pipe_t *,
     usb_standard_device_descriptor_t *);
-int usb_request_get_bare_configuration_descriptor(usb_pipe_t *, int,
+errno_t usb_request_get_bare_configuration_descriptor(usb_pipe_t *, int,
     usb_standard_configuration_descriptor_t *);
-int usb_request_get_full_configuration_descriptor(usb_pipe_t *, int,
+errno_t usb_request_get_full_configuration_descriptor(usb_pipe_t *, int,
     void *, size_t, size_t *);
-int usb_request_get_full_configuration_descriptor_alloc(usb_pipe_t *,
+errno_t usb_request_get_full_configuration_descriptor_alloc(usb_pipe_t *,
     int, const void **, size_t *);
-int usb_request_set_descriptor(usb_pipe_t *, usb_request_type_t,
+errno_t usb_request_set_descriptor(usb_pipe_t *, usb_request_type_t,
     usb_request_recipient_t, uint8_t, uint8_t, uint16_t, const void *, size_t);
 
-int usb_request_get_configuration(usb_pipe_t *, uint8_t *);
-int usb_request_set_configuration(usb_pipe_t *, uint8_t);
+errno_t usb_request_get_configuration(usb_pipe_t *, uint8_t *);
+errno_t usb_request_set_configuration(usb_pipe_t *, uint8_t);
 
-int usb_request_get_interface(usb_pipe_t *, uint8_t, uint8_t *);
-int usb_request_set_interface(usb_pipe_t *, uint8_t, uint8_t);
+errno_t usb_request_get_interface(usb_pipe_t *, uint8_t, uint8_t *);
+errno_t usb_request_set_interface(usb_pipe_t *, uint8_t, uint8_t);
 
-int usb_request_get_supported_languages(usb_pipe_t *,
+errno_t usb_request_get_supported_languages(usb_pipe_t *,
     l18_win_locales_t **, size_t *);
-int usb_request_get_string(usb_pipe_t *, size_t, l18_win_locales_t,
+errno_t usb_request_get_string(usb_pipe_t *, size_t, l18_win_locales_t,
     char **);
 
-int usb_request_clear_endpoint_halt(usb_pipe_t *, uint16_t);
-int usb_pipe_clear_halt(usb_pipe_t *, usb_pipe_t *);
-int usb_request_get_endpoint_status(usb_pipe_t *, usb_pipe_t *, uint16_t *);
+errno_t usb_request_clear_endpoint_halt(usb_pipe_t *, uint16_t);
+errno_t usb_pipe_clear_halt(usb_pipe_t *, usb_pipe_t *);
+errno_t usb_request_get_endpoint_status(usb_pipe_t *, usb_pipe_t *, uint16_t *);
 
 #endif
