Index: uspace/lib/usbhid/src/hiddescriptor.c
===================================================================
--- uspace/lib/usbhid/src/hiddescriptor.c	(revision 3ca4ae9c9b4cde02fa9f3b939ec667020958c088)
+++ uspace/lib/usbhid/src/hiddescriptor.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -134,5 +134,5 @@
  * @retval EOK If report structure was successfully initialized
  */
-int usb_hid_report_init(usb_hid_report_t *report)
+errno_t usb_hid_report_init(usb_hid_report_t *report)
 {
 	if (report == NULL) {
@@ -162,5 +162,5 @@
  *
  */
-int usb_hid_report_append_fields(usb_hid_report_t *report,
+errno_t usb_hid_report_append_fields(usb_hid_report_t *report,
 		usb_hid_report_item_t *report_item) {
 
@@ -356,5 +356,5 @@
  * @retval EOK If report descriptor is successfully parsed
  */
-int usb_hid_parse_report_descriptor(usb_hid_report_t *report, 
+errno_t usb_hid_parse_report_descriptor(usb_hid_report_t *report, 
     const uint8_t *data, size_t size)
 {
Index: uspace/lib/usbhid/src/hidparser.c
===================================================================
--- uspace/lib/usbhid/src/hidparser.c	(revision 3ca4ae9c9b4cde02fa9f3b939ec667020958c088)
+++ uspace/lib/usbhid/src/hidparser.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -127,5 +127,5 @@
  * @return Error code.
  */ 
-int usb_hid_parse_report(const usb_hid_report_t *report, const uint8_t *data, 
+errno_t usb_hid_parse_report(const usb_hid_report_t *report, const uint8_t *data, 
     size_t size, uint8_t *report_id)
 {
@@ -334,5 +334,5 @@
  * @return Error code
  */
-int usb_hid_report_output_translate(usb_hid_report_t *report, 
+errno_t usb_hid_report_output_translate(usb_hid_report_t *report, 
     uint8_t report_id, uint8_t *buffer, size_t size)
 {
Index: uspace/lib/usbhid/src/hidpath.c
===================================================================
--- uspace/lib/usbhid/src/hidpath.c	(revision 3ca4ae9c9b4cde02fa9f3b939ec667020958c088)
+++ uspace/lib/usbhid/src/hidpath.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -73,5 +73,5 @@
  * @return Error code
  */
-int usb_hid_report_path_append_item(usb_hid_report_path_t *usage_path, 
+errno_t usb_hid_report_path_append_item(usb_hid_report_path_t *usage_path, 
                                     int32_t usage_page, int32_t usage)
 {	
@@ -423,5 +423,5 @@
  * @return Error code
  */
-int usb_hid_report_path_set_report_id(usb_hid_report_path_t *path, 
+errno_t usb_hid_report_path_set_report_id(usb_hid_report_path_t *path, 
 	uint8_t report_id)
 {
Index: uspace/lib/usbhid/src/hidreport.c
===================================================================
--- uspace/lib/usbhid/src/hidreport.c	(revision 3ca4ae9c9b4cde02fa9f3b939ec667020958c088)
+++ uspace/lib/usbhid/src/hidreport.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -50,5 +50,5 @@
 #include <usb/hid/hidreport.h>
 
-static int usb_hid_get_report_descriptor(usb_device_t *dev,
+static errno_t usb_hid_get_report_descriptor(usb_device_t *dev,
     uint8_t **report_desc, size_t *size)
 {
@@ -135,5 +135,5 @@
 	 * Get the descriptor from the device.
 	 */
-	int rc = usb_request_get_descriptor(usb_device_get_default_pipe(dev),
+	errno_t rc = usb_request_get_descriptor(usb_device_get_default_pipe(dev),
 	    USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_INTERFACE,
 	    USB_DESCTYPE_HID_REPORT, 0, usb_device_get_iface_number(dev),
@@ -163,5 +163,5 @@
 
 
-int usb_hid_process_report_descriptor(usb_device_t *dev, 
+errno_t usb_hid_process_report_descriptor(usb_device_t *dev, 
     usb_hid_report_t *report, uint8_t **report_desc, size_t *report_size)
 {
@@ -175,5 +175,5 @@
 //	size_t report_size;
 	
-	int rc = usb_hid_get_report_descriptor(dev, report_desc, report_size);
+	errno_t rc = usb_hid_get_report_descriptor(dev, report_desc, report_size);
 	
 	if (rc != EOK) {
Index: uspace/lib/usbhid/src/hidreq.c
===================================================================
--- uspace/lib/usbhid/src/hidreq.c	(revision 3ca4ae9c9b4cde02fa9f3b939ec667020958c088)
+++ uspace/lib/usbhid/src/hidreq.c	(revision a53ed3a8097360ccf174e8d94fb407db919eb66a)
@@ -58,5 +58,5 @@
  * @return Other value inherited from function usb_control_request_set().
  */
-int usbhid_req_set_report(usb_pipe_t *ctrl_pipe, int iface_no,
+errno_t usbhid_req_set_report(usb_pipe_t *ctrl_pipe, int iface_no,
     usb_hid_report_type_t type, uint8_t *buffer, size_t buf_size)
 {
@@ -77,5 +77,5 @@
 	 */
 	
-	int rc;
+	errno_t rc;
 	
 	uint16_t value = 0;
@@ -108,5 +108,5 @@
  * @return Other value inherited from function usb_control_request_set().
  */
-int usbhid_req_set_protocol(usb_pipe_t *ctrl_pipe, int iface_no,
+errno_t usbhid_req_set_protocol(usb_pipe_t *ctrl_pipe, int iface_no,
     usb_hid_protocol_t protocol)
 {
@@ -127,5 +127,5 @@
 	 */
 	
-	int rc;
+	errno_t rc;
 
 	usb_log_debug("Sending Set Protocol request to the device ("
@@ -157,23 +157,23 @@
  * @return Other value inherited from function usb_control_request_set().
  */
-int usbhid_req_set_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t duration)
-{
-	if (ctrl_pipe == NULL) {
-		usb_log_warning("usbhid_req_set_report(): no pipe given.\n");
-		return EINVAL;
-	}
-	
-	if (iface_no < 0) {
-		usb_log_warning("usbhid_req_set_report(): no interface given."
-		    "\n");
-		return EINVAL;
-	}
-	
-	/*
-	 * No need for checking other parameters, as they are checked in
-	 * the called function (usb_control_request_set()).
-	 */
-	
-	int rc;
+errno_t usbhid_req_set_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t duration)
+{
+	if (ctrl_pipe == NULL) {
+		usb_log_warning("usbhid_req_set_report(): no pipe given.\n");
+		return EINVAL;
+	}
+	
+	if (iface_no < 0) {
+		usb_log_warning("usbhid_req_set_report(): no interface given."
+		    "\n");
+		return EINVAL;
+	}
+	
+	/*
+	 * No need for checking other parameters, as they are checked in
+	 * the called function (usb_control_request_set()).
+	 */
+	
+	errno_t rc;
 
 	usb_log_debug("Sending Set Idle request to the device ("
@@ -210,5 +210,5 @@
  * @return Other value inherited from function usb_control_request_set().
  */
-int usbhid_req_get_report(usb_pipe_t *ctrl_pipe, int iface_no, 
+errno_t usbhid_req_get_report(usb_pipe_t *ctrl_pipe, int iface_no, 
     usb_hid_report_type_t type, uint8_t *buffer, size_t buf_size, 
     size_t *actual_size)
@@ -230,5 +230,5 @@
 	 */
 	
-	int rc;
+	errno_t rc;
 
 	uint16_t value = 0;
@@ -262,5 +262,5 @@
  * @return Other value inherited from function usb_control_request_set().
  */
-int usbhid_req_get_protocol(usb_pipe_t *ctrl_pipe, int iface_no, 
+errno_t usbhid_req_get_protocol(usb_pipe_t *ctrl_pipe, int iface_no, 
     usb_hid_protocol_t *protocol)
 {
@@ -281,5 +281,5 @@
 	 */
 	
-	int rc;	
+	errno_t rc;	
 
 	usb_log_debug("Sending Get Protocol request to the device ("
@@ -324,23 +324,23 @@
  *         usb_control_request_set().
  */
-int usbhid_req_get_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t *duration)
-{
-	if (ctrl_pipe == NULL) {
-		usb_log_warning("usbhid_req_set_report(): no pipe given.\n");
-		return EINVAL;
-	}
-	
-	if (iface_no < 0) {
-		usb_log_warning("usbhid_req_set_report(): no interface given."
-		    "\n");
-		return EINVAL;
-	}
-	
-	/*
-	 * No need for checking other parameters, as they are checked in
-	 * the called function (usb_control_request_set()).
-	 */
-	
-	int rc;
+errno_t usbhid_req_get_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t *duration)
+{
+	if (ctrl_pipe == NULL) {
+		usb_log_warning("usbhid_req_set_report(): no pipe given.\n");
+		return EINVAL;
+	}
+	
+	if (iface_no < 0) {
+		usb_log_warning("usbhid_req_set_report(): no interface given."
+		    "\n");
+		return EINVAL;
+	}
+	
+	/*
+	 * No need for checking other parameters, as they are checked in
+	 * the called function (usb_control_request_set()).
+	 */
+	
+	errno_t rc;
 
 	usb_log_debug("Sending Get Idle request to the device ("