diff --git a/libs/coding/files_container.cpp b/libs/coding/files_container.cpp
index 267e45133..532c66366 100644
--- a/libs/coding/files_container.cpp
+++ b/libs/coding/files_container.cpp
@@ -8,18 +8,13 @@
 #include <cstring>
 #include <sstream>
 
-#ifndef OMIM_OS_WINDOWS
-#include <stdio.h>
+#ifdef OMIM_OS_WINDOWS
+#include "std/windows.hpp"
+#else
+#include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>  // _SC_PAGESIZE
-#ifdef OMIM_OS_ANDROID
-#include <fcntl.h>
-#else
-#include <sys/fcntl.h>
-#endif
-#else
-#include <windows.h>
 #endif
 
 #include <errno.h>
diff --git a/libs/coding/mmap_reader.cpp b/libs/coding/mmap_reader.cpp
index 97ef3bb01..9043cbed1 100644
--- a/libs/coding/mmap_reader.cpp
+++ b/libs/coding/mmap_reader.cpp
@@ -7,16 +7,12 @@
 #include <cstring>
 
 #ifdef OMIM_OS_WINDOWS
-#include <windows.h>
+#include "std/windows.hpp"
 #else
+#include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#ifdef OMIM_OS_ANDROID
-#include <fcntl.h>
-#else
-#include <sys/fcntl.h>
-#endif
 #endif
 
 class MmapReader::MmapData