diff --git a/std/bitset.hpp b/std/bitset.hpp
index 13f8922d78..9cad908d89 100644
--- a/std/bitset.hpp
+++ b/std/bitset.hpp
@@ -1,11 +1,16 @@
 #pragma once
 #include "common_defines.hpp"
+#include "target_os.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#include <bitset>
+#if defined(DEBUG) && (defined(OMIM_OS_LINUX) || defined(OMIM_OS_MAC))
+  #include <debug/bitset>
+#else
+  #include <bitset>
+#endif
 using std::bitset;
 
 #ifdef DEBUG_NEW
diff --git a/std/deque.hpp b/std/deque.hpp
index a0b88424c3..ccbf329129 100644
--- a/std/deque.hpp
+++ b/std/deque.hpp
@@ -1,11 +1,16 @@
 #pragma once
 #include "common_defines.hpp"
+#include "target_os.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#include <deque>
+#if defined(DEBUG) && (defined(OMIM_OS_LINUX) || defined(OMIM_OS_MAC))
+  #include <debug/deque>
+#else
+  #include <deque>
+#endif
 using std::deque;
 
 #ifdef DEBUG_NEW
diff --git a/std/list.hpp b/std/list.hpp
index 7d67ef780f..7566f07b26 100644
--- a/std/list.hpp
+++ b/std/list.hpp
@@ -1,11 +1,16 @@
 #pragma once
 #include "common_defines.hpp"
+#include "target_os.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#include <list>
+#if defined(DEBUG) && (defined(OMIM_OS_LINUX) || defined(OMIM_OS_MAC))
+  #include <debug/list>
+#else
+  #include <list>
+#endif
 using std::list;
 
 #ifdef DEBUG_NEW
diff --git a/std/map.hpp b/std/map.hpp
index ba40248019..f41a8e7d7f 100644
--- a/std/map.hpp
+++ b/std/map.hpp
@@ -1,11 +1,16 @@
 #pragma once
 #include "common_defines.hpp"
+#include "target_os.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#include <map>
+#if defined(DEBUG) && (defined(OMIM_OS_LINUX) || defined(OMIM_OS_MAC))
+  #include <debug/map>
+#else
+  #include <map>
+#endif
 using std::map;
 using std::multimap;
 
diff --git a/std/set.hpp b/std/set.hpp
index 08824617f1..eb70550545 100644
--- a/std/set.hpp
+++ b/std/set.hpp
@@ -1,11 +1,16 @@
 #pragma once
 #include "common_defines.hpp"
+#include "target_os.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#include <set>
+#if defined(DEBUG) && (defined(OMIM_OS_LINUX) || defined(OMIM_OS_MAC))
+  #include <debug/set>
+#else
+  #include <set>
+#endif
 using std::set;
 
 #ifdef DEBUG_NEW
diff --git a/std/string.hpp b/std/string.hpp
index cd286ade99..49839ee85d 100644
--- a/std/string.hpp
+++ b/std/string.hpp
@@ -6,7 +6,11 @@
 #undef new
 #endif
 
-#include <string>
+#if defined(DEBUG) && (defined(OMIM_OS_LINUX) || defined(OMIM_OS_MAC))
+  #include <debug/string>
+#else
+  #include <string>
+#endif
 
 using std::basic_string;
 using std::string;
diff --git a/std/vector.hpp b/std/vector.hpp
index 6c8d33afbf..c7dd3da659 100644
--- a/std/vector.hpp
+++ b/std/vector.hpp
@@ -1,11 +1,16 @@
 #pragma once
 #include "common_defines.hpp"
+#include "target_os.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#include <vector>
+#if defined(DEBUG) && (defined(OMIM_OS_LINUX) || defined(OMIM_OS_MAC))
+  #include <debug/vector>
+#else
+  #include <vector>
+#endif
 using std::vector;
 
 #ifdef DEBUG_NEW