diff --git a/olimex.c b/olimex.c
index e9a1cef..b1a288a 100644
--- a/olimex.c
+++ b/olimex.c
@@ -18,6 +18,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <usb.h>
 
diff --git a/rf2500.c b/rf2500.c
index 598180e..84f78f1 100644
--- a/rf2500.c
+++ b/rf2500.c
@@ -17,6 +17,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <usb.h>
 
diff --git a/uif.c b/uif.c
index fb28c72..11a083f 100644
--- a/uif.c
+++ b/uif.c
@@ -36,8 +36,10 @@
 #include "util.h"
 #include "output.h"
 
-#if defined(__APPLE__) || defined(__OpenBSD__)
+#ifndef B460800
 #define B460800 460800
+#endif
+#ifndef B500000
 #define B500000 500000
 #endif
 
@@ -116,13 +118,6 @@ static int open_olimex_iso(const char *device)
 
         return fd;
 }
-#else
-static int open_olimex_iso(const char *device)
-{
-	printc_err("open_olimex_iso: this driver is only supported on "
-		   "Linux\n");
-	return -1;
-}
 #endif
 
 transport_t uif_open(const char *device, uif_type_t type)
diff --git a/usbutil.c b/usbutil.c
index 647c540..f57bc1e 100644
--- a/usbutil.c
+++ b/usbutil.c
@@ -17,6 +17,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include "usbutil.h"
 #include "util.h"