diff --git a/apps/program-handler/program-handler.c b/apps/program-handler/program-handler.c
index 6a6f2c090..2af8ca5a4 100644
--- a/apps/program-handler/program-handler.c
+++ b/apps/program-handler/program-handler.c
@@ -52,6 +52,7 @@
 #include "contiki.h"
 #include "ctk/ctk.h"
 #include "ctk/ctk-draw.h"
+#include "sys/log.h"
 
 #include "program-handler.h"
 
diff --git a/cpu/native/net/tapdev.c b/cpu/native/net/tapdev.c
index 7386bdc96..73f3da59d 100644
--- a/cpu/native/net/tapdev.c
+++ b/cpu/native/net/tapdev.c
@@ -111,7 +111,7 @@ tapdev_init(void)
     memset(&ifr, 0, sizeof(ifr));
     ifr.ifr_flags = IFF_TAP|IFF_NO_PI;
     if (ioctl(fd, TUNSETIFF, (void *) &ifr) < 0) {
-      perror(buf);
+      perror("ioctl(TUNSETIFF)");
       exit(1);
     }
   }
diff --git a/platform/win32/contiki-conf.h b/platform/win32/contiki-conf.h
index c2b20afa5..638e9a637 100644
--- a/platform/win32/contiki-conf.h
+++ b/platform/win32/contiki-conf.h
@@ -1,6 +1,10 @@
 #ifndef __CONTIKI_CONF_H__
 #define __CONTIKI_CONF_H__
 
+#ifdef __CYGWIN__
+#include <sys/types.h>
+#endif
+
 #define CC_CONF_REGISTER_ARGS 1
 #define CC_CONF_FASTCALL __fastcall
 #define CC_CONF_INLINE   __inline