diff --git a/base/thread.cpp b/base/thread.cpp
index 37b5c41245..a4524113b2 100644
--- a/base/thread.cpp
+++ b/base/thread.cpp
@@ -182,7 +182,7 @@ namespace threads
 #ifdef OMIM_OS_WINDOWS
     return ::GetCurrentThreadId();
 #else
-    return static_cast<void *>(pthread_self());
+    return reinterpret_cast<void *>(pthread_self());
 #endif
   }
 }
diff --git a/base/thread.hpp b/base/thread.hpp
index c9ad0330e3..7f8467a5b2 100644
--- a/base/thread.hpp
+++ b/base/thread.hpp
@@ -4,6 +4,10 @@
 
 #include "../std/stdint.hpp"
 
+#ifdef OMIM_OS_WINDOWS
+#include "../std/windows.hpp" // for DWORD
+#endif
+
 namespace threads
 {
   class IRoutine