diff --git a/lib/libusbhid/data.c b/lib/libusbhid/data.c
index afc5a211ddc..3b90ac6f956 100644
--- a/lib/libusbhid/data.c
+++ b/lib/libusbhid/data.c
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include "usbhid.h"
 
-int
+int32_t
 hid_get_data(const void *p, const hid_item_t *h)
 {
 	const uint8_t *buf;
@@ -78,12 +78,15 @@ hid_get_data(const void *p, const hid_item_t *h)
 }
 
 void
-hid_set_data(void *p, const hid_item_t *h, int data)
+hid_set_data(void *p, const hid_item_t *h, int32_t data)
 {
 	uint8_t *buf;
 	uint32_t hpos;
 	uint32_t hsize;
-	int i, end, offs, mask;
+	uint32_t mask;
+	int i;
+	int end;
+	int offs;
 
 	buf = p;
 
diff --git a/lib/libusbhid/usbhid.h b/lib/libusbhid/usbhid.h
index d1d3bf0ebbd..5e098eabad0 100644
--- a/lib/libusbhid/usbhid.h
+++ b/lib/libusbhid/usbhid.h
@@ -29,7 +29,7 @@
  *
  */
 
-#include <sys/types.h>
+#include <stdint.h>
 
 typedef struct report_desc *report_desc_t;
 
@@ -102,7 +102,7 @@ int hid_parse_usage_in_page(const char *name);
 int hid_parse_usage_page(const char *name);
 
 /* Extracting/insertion of data, data.c: */
-int hid_get_data(const void *p, const hid_item_t *h);
-void hid_set_data(void *p, const hid_item_t *h, int data);
+int32_t hid_get_data(const void *p, const hid_item_t *h);
+void hid_set_data(void *p, const hid_item_t *h, int32_t data);
 
 __END_DECLS