diff --git a/osal/win32/osal.c b/osal/win32/osal.c
index d744fea7..fe0fd04b 100644
--- a/osal/win32/osal.c
+++ b/osal/win32/osal.c
@@ -130,23 +130,25 @@ void osal_free(void *ptr)
    free(ptr);
 }
 
-int osal_thread_create(void **thandle, int stacksize, void *func, void *param)
+int osal_thread_create(void *thandle, int stacksize, void *func, void *param)
 {
-   *thandle = CreateThread(NULL, stacksize, func, param, 0, NULL);
-   if(!thandle)
+   PHANDLE phandle = thandle;
+   *phandle = CreateThread(NULL, stacksize, func, param, 0, NULL);
+   if(*phandle != NULL)
    {
       return 0;
    }
    return 1;
 }
 
-int osal_thread_create_rt(void **thandle, int stacksize, void *func, void *param)
+int osal_thread_create_rt(void *thandle, int stacksize, void *func, void *param)
 {
    int ret;
-   ret = osal_thread_create(thandle, stacksize, func, param);
+   PHANDLE phandle = thandle;
+   ret = osal_thread_create(phandle, stacksize, func, param);
    if (ret)
    {
-      ret = SetThreadPriority(*thandle, THREAD_PRIORITY_TIME_CRITICAL);
+	   ret = SetThreadPriority(*phandle, THREAD_PRIORITY_TIME_CRITICAL);
    }
    return ret;
 }
diff --git a/osal/win32/osal_win32.h b/osal/win32/osal_win32.h
index b1c87ffc..d17d20d0 100644
--- a/osal/win32/osal_win32.h
+++ b/osal/win32/osal_win32.h
@@ -29,6 +29,4 @@
     }                                                                         \
   } while (0)
 
-int osal_gettimeofday (struct timeval *tv, struct timezone *tz);
-
 #endif
diff --git a/oshw/win32/oshw.c b/oshw/win32/oshw.c
index c217baa9..247887ec 100644
--- a/oshw/win32/oshw.c
+++ b/oshw/win32/oshw.c
@@ -35,7 +35,6 @@ uint16 oshw_ntohs (uint16 network)
 ec_adaptert * oshw_find_adapters (void)
 {
    int i = 0;
-   int ret = 0;
    pcap_if_t *alldevs;
    pcap_if_t *d;
    ec_adaptert * adapter;
diff --git a/oshw/win32/wpcap/Include/pcap-stdinc.h b/oshw/win32/wpcap/Include/pcap-stdinc.h
index 46100ccc..c48d77ec 100644
--- a/oshw/win32/wpcap/Include/pcap-stdinc.h
+++ b/oshw/win32/wpcap/Include/pcap-stdinc.h
@@ -55,7 +55,7 @@
 #include <io.h>
 
 #ifndef __MINGW32__
-#include "IP6_misc.h"
+#include "ip6_misc.h"
 #endif
 
 #define caddr_t char*