diff --git a/base/memory_mapped_file.hpp b/base/memory_mapped_file.hpp
index c520d65fb9..f5e5defc2d 100644
--- a/base/memory_mapped_file.hpp
+++ b/base/memory_mapped_file.hpp
@@ -3,10 +3,8 @@
 
 #include "../std/target_os.hpp"
 
-#ifdef OMIM_OS_WINDOWS
-  #include "../std/windows.hpp"
-  #include "../std/stdio.hpp"
-#endif
+#include "../std/windows.hpp"
+#include "../std/stdio.hpp"
 
 class MemoryMappedFile
 {
diff --git a/std/windows.hpp b/std/windows.hpp
index 3484605265..714c555889 100644
--- a/std/windows.hpp
+++ b/std/windows.hpp
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "target_os.hpp"
+
+#ifdef OMIM_OS_WINDOWS
 // These defines are moved to common.pri because
 // they should be equal for all libraries, even for 3party ones
 
@@ -31,3 +34,5 @@
 
 #undef min
 #undef max
+
+#endif // OMIM_OS_WINDOWS