diff --git a/std/bitset.hpp b/std/bitset.hpp
index 9cad908d89..b8c4246fa6 100644
--- a/std/bitset.hpp
+++ b/std/bitset.hpp
@@ -6,7 +6,7 @@
 #undef new
 #endif
 
-#if defined(DEBUG) && (defined(OMIM_OS_LINUX) || defined(OMIM_OS_MAC))
+#ifdef OMIM_HAS_DEBUG_STL
   #include <debug/bitset>
 #else
   #include <bitset>
diff --git a/std/deque.hpp b/std/deque.hpp
index ccbf329129..f9c543d621 100644
--- a/std/deque.hpp
+++ b/std/deque.hpp
@@ -6,7 +6,7 @@
 #undef new
 #endif
 
-#if defined(DEBUG) && (defined(OMIM_OS_LINUX) || defined(OMIM_OS_MAC))
+#ifdef OMIM_HAS_DEBUG_STL
   #include <debug/deque>
 #else
   #include <deque>
diff --git a/std/list.hpp b/std/list.hpp
index 7566f07b26..114cfe0f7b 100644
--- a/std/list.hpp
+++ b/std/list.hpp
@@ -6,7 +6,7 @@
 #undef new
 #endif
 
-#if defined(DEBUG) && (defined(OMIM_OS_LINUX) || defined(OMIM_OS_MAC))
+#ifdef OMIM_HAS_DEBUG_STL
   #include <debug/list>
 #else
   #include <list>
diff --git a/std/map.hpp b/std/map.hpp
index f41a8e7d7f..b144406026 100644
--- a/std/map.hpp
+++ b/std/map.hpp
@@ -6,7 +6,7 @@
 #undef new
 #endif
 
-#if defined(DEBUG) && (defined(OMIM_OS_LINUX) || defined(OMIM_OS_MAC))
+#ifdef OMIM_HAS_DEBUG_STL
   #include <debug/map>
 #else
   #include <map>
diff --git a/std/set.hpp b/std/set.hpp
index eb70550545..3226daaaf8 100644
--- a/std/set.hpp
+++ b/std/set.hpp
@@ -6,7 +6,7 @@
 #undef new
 #endif
 
-#if defined(DEBUG) && (defined(OMIM_OS_LINUX) || defined(OMIM_OS_MAC))
+#ifdef OMIM_HAS_DEBUG_STL
   #include <debug/set>
 #else
   #include <set>
diff --git a/std/string.hpp b/std/string.hpp
index 49839ee85d..fd2804cfb8 100644
--- a/std/string.hpp
+++ b/std/string.hpp
@@ -6,7 +6,7 @@
 #undef new
 #endif
 
-#if defined(DEBUG) && (defined(OMIM_OS_LINUX) || defined(OMIM_OS_MAC))
+#ifdef OMIM_HAS_DEBUG_STL
   #include <debug/string>
 #else
   #include <string>
diff --git a/std/target_os.hpp b/std/target_os.hpp
index cef471da2e..f6cfac2b82 100644
--- a/std/target_os.hpp
+++ b/std/target_os.hpp
@@ -4,6 +4,7 @@
   #define OMIM_OS_ANDROID
   #define OMIM_OS_NAME "android"
   #define OMIM_OS_MOBILE
+  #define OMIM_HAS_DEBUG_STL 1
 
 #elif defined(_BADA_SIMULATOR) || defined(_BADA_DEVICE)
   #define OMIM_OS_BADA
@@ -27,6 +28,7 @@
     #define OMIM_OS_NAME "mac"
     #define OMIM_OS_DESKTOP
   #endif
+  #define OMIM_HAS_DEBUG_STL 1
 
 #elif defined(_WIN32)
   #define OMIM_OS_WINDOWS
@@ -43,4 +45,6 @@
   #define OMIM_OS_LINUX
   #define OMIM_OS_NAME "linux"
   #define OMIM_OS_DESKTOP
+  #define OMIM_HAS_DEBUG_STL 1
+  
 #endif
diff --git a/std/vector.hpp b/std/vector.hpp
index c7dd3da659..e0c289d8a3 100644
--- a/std/vector.hpp
+++ b/std/vector.hpp
@@ -6,7 +6,7 @@
 #undef new
 #endif
 
-#if defined(DEBUG) && (defined(OMIM_OS_LINUX) || defined(OMIM_OS_MAC))
+#ifdef OMIM_HAS_DEBUG_STL
   #include <debug/vector>
 #else
   #include <vector>