diff --git a/3party/protobuf/protobuf.pro b/3party/protobuf/protobuf.pro
index 9c7ae7c7f8..0bf5d8a0e0 100644
--- a/3party/protobuf/protobuf.pro
+++ b/3party/protobuf/protobuf.pro
@@ -68,7 +68,7 @@ SOURCES += \
 
 }
 
-linux*|android* {
+linux*|android*|win32-g++ {
   SOURCES += src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
 }
 
diff --git a/3party/sgitess/GL/glu.h b/3party/sgitess/GL/glu.h
index d0267d70c7..cbd59c796c 100644
--- a/3party/sgitess/GL/glu.h
+++ b/3party/sgitess/GL/glu.h
@@ -63,7 +63,7 @@
 
 // By VNG: In defines below, in looks like we have a _DLL (wtf???).
 // But now we are linking like static library, so we should redefine GLAPI.
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__MINGW32__)
 #undef GLAPI
 #define GLAPI extern
 #endif
diff --git a/base/object_tracker.cpp b/base/object_tracker.cpp
index 9b6ed574af..f114991a30 100644
--- a/base/object_tracker.cpp
+++ b/base/object_tracker.cpp
@@ -6,6 +6,8 @@
 
 #ifndef OMIM_OS_WINDOWS
   #include <signal.h>
+#else
+  #include "../std/windows.hpp"
 #endif
 
 
diff --git a/base/timer.cpp b/base/timer.cpp
index 7f6056b85a..28eb4f6a16 100644
--- a/base/timer.cpp
+++ b/base/timer.cpp
@@ -17,7 +17,7 @@ Timer::Timer()
 
 double Timer::LocalTime()
 {
-#ifdef OMIM_OS_WINDOWS
+#ifdef OMIM_OS_WINDOWS_NATIVE
   FILETIME ft;
   GetSystemTimeAsFileTime(&ft);
   uint64_t val = ft.dwHighDateTime;