diff --git a/hidtest/test.c b/hidtest/test.c
index eb01d88e0..56fb779ff 100644
--- a/hidtest/test.c
+++ b/hidtest/test.c
@@ -19,7 +19,6 @@
 #include <wchar.h>
 #include <string.h>
 #include <stdlib.h>
-
 #include <hidapi.h>
 
 // Headers needed for sleeping.
diff --git a/libusb/hid.c b/libusb/hid.c
index d2ceef5d3..553a3bf8b 100644
--- a/libusb/hid.c
+++ b/libusb/hid.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <ctype.h>
 #include <locale.h>
 #include <errno.h>
@@ -33,9 +34,6 @@
 /* Unix */
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
 #include <fcntl.h>
 #include <wchar.h>
 
diff --git a/linux/hid.c b/linux/hid.c
index 148e48848..247e10295 100644
--- a/linux/hid.c
+++ b/linux/hid.c
@@ -26,24 +26,26 @@
 #include <stdlib.h>
 #include <locale.h>
 #include <errno.h>
-
 /* Unix */
 #include <unistd.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/utsname.h>
 #include <fcntl.h>
 #include <poll.h>
+#include <linux/types.h>
+#include <linux/hid.h>
+#include <stdarg.h>
+#include <wchar.h>
 
 /* Linux */
 #include <linux/hidraw.h>
-#include <linux/version.h>
 #include <linux/input.h>
 #include <libudev.h>
 
 #include "hidapi.h"
 
+struct udev_device;
+
 #ifdef HIDAPI_ALLOW_BUILD_WORKAROUND_KERNEL_2_6_39
 /* This definitions first appeared in Linux Kernel 2.6.39 in linux/hidraw.h.
     hidapi doesn't support kernels older than that,
@@ -616,10 +618,12 @@ static int parse_uevent_info(const char *uevent, unsigned *bus_type,
 			}
 		} else if (strcmp(key, "HID_NAME") == 0) {
 			/* The caller has to free the product name */
+			free(*product_name_utf8);
 			*product_name_utf8 = strdup(value);
 			found_name = 1;
 		} else if (strcmp(key, "HID_UNIQ") == 0) {
 			/* The caller has to free the serial number */
+			free(*serial_number_utf8);
 			*serial_number_utf8 = strdup(value);
 			found_serial = 1;
 		}
diff --git a/mac/hid.c b/mac/hid.c
index a91bc1902..b596421c3 100644
--- a/mac/hid.c
+++ b/mac/hid.c
@@ -29,12 +29,15 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <mach/mach_error.h>
 #include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
 #include <wchar.h>
 #include <locale.h>
 #include <pthread.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <dlfcn.h>
+#include <errno.h>
 
 #include "hidapi_darwin.h"