std folder cleanup & removing not needed boost references.

55 files changed, 84 insertions, 258 deletions

diff --git a/std/algorithm.hpp b/std/algorithm.hpp
index d918197c37..426296336b 100644
--- a/std/algorithm.hpp
+++ b/std/algorithm.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/array.hpp b/std/array.hpp
index 41f70448d3..53b2036fb6 100644
--- a/std/array.hpp
+++ b/std/array.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/atomic.hpp b/std/atomic.hpp
index 0e479ffa0a..f212289344 100644
--- a/std/atomic.hpp
+++ b/std/atomic.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/auto_ptr.hpp b/std/auto_ptr.hpp
index fddf0b3d89..1197110b43 100644
--- a/std/auto_ptr.hpp
+++ b/std/auto_ptr.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/bind.hpp b/std/bind.hpp
index 8656ed21fd..5ce3fd9452 100644
--- a/std/bind.hpp
+++ b/std/bind.hpp
@@ -1,13 +1,9 @@
 #pragma once
-#include "common_defines.hpp"
-#include "target_os.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#ifdef CPP11_IS_SUPPORTED
-
 #include <functional>
 using std::bind;
 using std::ref;
@@ -21,19 +17,6 @@ using std::placeholders::_6;
 using std::placeholders::_7;
 using std::placeholders::_8;
 
-#else
-
-#ifdef OMIM_OS_WINDOWS
-  #define BOOST_BIND_ENABLE_STDCALL
-#endif
-
-#include <boost/bind.hpp>
-using boost::bind;
-using boost::ref;
-using boost::cref;
-
-#endif
-
 #ifdef DEBUG_NEW
 #define new DEBUG_NEW
 #endif
diff --git a/std/bitset.hpp b/std/bitset.hpp
index 2f737e826e..d0902ad414 100644
--- a/std/bitset.hpp
+++ b/std/bitset.hpp
@@ -1,16 +1,10 @@
 #pragma once
-#include "common_defines.hpp"
-#include "target_os.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#ifdef OMIM_USE_DEBUG_STL
-  #include <debug/bitset>
-#else
-  #include <bitset>
-#endif
+#include <bitset>
 using std::bitset;
 
 #ifdef DEBUG_NEW
diff --git a/std/cerrno.hpp b/std/cerrno.hpp
index 6e1b966bca..05b935e846 100644
--- a/std/cerrno.hpp
+++ b/std/cerrno.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/chrono.hpp b/std/chrono.hpp
index bae8000f67..17eddaae10 100644
--- a/std/chrono.hpp
+++ b/std/chrono.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/common_defines.hpp b/std/common_defines.hpp
deleted file mode 100644
index 7486fa6389..0000000000
--- a/std/common_defines.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#ifndef _USE_MATH_DEFINES
-#define _USE_MATH_DEFINES
-#endif
-#define _FILE_OFFSET_BITS 64
-
-#if (__cplusplus > 199711L) || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(_MSC_VER)
-  #define CPP11_IS_SUPPORTED
-#endif
diff --git a/std/complex.hpp b/std/complex.hpp
index da19ea0f9e..24a3b26e3a 100644
--- a/std/complex.hpp
+++ b/std/complex.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/condition_variable.hpp b/std/condition_variable.hpp
index fee4a736a8..74131620de 100644
--- a/std/condition_variable.hpp
+++ b/std/condition_variable.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/cstdarg.hpp b/std/cstdarg.hpp
index 193e85ee9b..04d5705787 100644
--- a/std/cstdarg.hpp
+++ b/std/cstdarg.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/cstdint.hpp b/std/cstdint.hpp
index 8ced63f058..0e37c1b477 100644
--- a/std/cstdint.hpp
+++ b/std/cstdint.hpp
@@ -14,6 +14,9 @@ using std::uint32_t;
 using std::int64_t;
 using std::uint64_t;
 
+#include <cstddef>
+using std::size_t;
+
 #ifdef DEBUG_NEW
 #define new DEBUG_NEW
 #endif
diff --git a/std/cstdio.hpp b/std/cstdio.hpp
index 6831cc9b85..b85bbd73b9 100644
--- a/std/cstdio.hpp
+++ b/std/cstdio.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/cstdlib.hpp b/std/cstdlib.hpp
index 1155f56edb..e119843d52 100644
--- a/std/cstdlib.hpp
+++ b/std/cstdlib.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/cstring.hpp b/std/cstring.hpp
index 7cc82ec986..bea08b1996 100644
--- a/std/cstring.hpp
+++ b/std/cstring.hpp
@@ -3,7 +3,6 @@
 // - memcpy, memcmp, memset
 
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/ctime.hpp b/std/ctime.hpp
index d85233d54d..2d7f9c786f 100644
--- a/std/ctime.hpp
+++ b/std/ctime.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/deque.hpp b/std/deque.hpp
index 435e0c1db4..a79012c9c9 100644
--- a/std/deque.hpp
+++ b/std/deque.hpp
@@ -1,16 +1,10 @@
 #pragma once
-#include "common_defines.hpp"
-#include "target_os.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#ifdef OMIM_USE_DEBUG_STL
-  #include <debug/deque>
-#else
-  #include <deque>
-#endif
+#include <deque>
 using std::deque;
 
 #ifdef DEBUG_NEW
diff --git a/std/errno.hpp b/std/errno.hpp
index c4f23e6959..05b935e846 100644
--- a/std/errno.hpp
+++ b/std/errno.hpp
@@ -1,18 +1,10 @@
 #pragma once
 
-#include "common_defines.hpp"
-#include "target_os.hpp"
-
 #ifdef new
 #undef new
 #endif
 
-// for errno
-#ifdef OMIM_OS_WINDOWS
-  #include <errno.h>
-#else
-  #include <sys/errno.h>
-#endif
+#include <cerrno>
 
 #ifdef DEBUG_NEW
 #define new DEBUG_NEW
diff --git a/std/exception.hpp b/std/exception.hpp
index 1fe25c8b0e..8e1d903d6c 100644
--- a/std/exception.hpp
+++ b/std/exception.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/fstream.hpp b/std/fstream.hpp
index 2e908221f3..efa32d4463 100644
--- a/std/fstream.hpp
+++ b/std/fstream.hpp
@@ -1,20 +1,12 @@
 #pragma once
-#include "common_defines.hpp"
-#include "target_os.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#ifdef OMIM_OS_BADA
-  #include <ios>
-#else
-  #include <fstream>
-
-  using std::ofstream;
-  using std::ifstream;
-#endif
-
+#include <fstream>
+using std::ofstream;
+using std::ifstream;
 using std::ios;
 
 #ifdef DEBUG_NEW
diff --git a/std/function.hpp b/std/function.hpp
index ba4b1e9cd3..b2965b8970 100644
--- a/std/function.hpp
+++ b/std/function.hpp
@@ -1,22 +1,12 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#ifdef CPP11_IS_SUPPORTED
-
-  #include <functional>
-  using std::function;
-  using std::greater;
-
-#else
-
-  #include <boost/function.hpp>
-  using boost::function;
-
-#endif
+#include <functional>
+using std::function;
+using std::greater;
 
 #ifdef DEBUG_NEW
 #define new DEBUG_NEW
diff --git a/std/functional.hpp b/std/functional.hpp
index c1d5953d80..7e982dd51d 100644
--- a/std/functional.hpp
+++ b/std/functional.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/initializer_list.hpp b/std/initializer_list.hpp
index d11da6739a..0e8899b85e 100644
--- a/std/initializer_list.hpp
+++ b/std/initializer_list.hpp
@@ -1,12 +1,10 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
 #endif
 
 #include <initializer_list>
-
 using std::initializer_list;
 typedef initializer_list<char const *> StringIL;
 
diff --git a/std/iomanip.hpp b/std/iomanip.hpp
index d1812d8c5a..ca0a576fc3 100644
--- a/std/iomanip.hpp
+++ b/std/iomanip.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 #include "target_os.hpp"
 
 #ifdef new
@@ -14,6 +13,7 @@ using std::setfill;
 using std::setprecision;
 using std::setw;
 
+// TODO: Should we force clang/libc++ here?
 #ifndef OMIM_OS_LINUX
 using std::get_time;
 using std::put_time;
diff --git a/std/ios.hpp b/std/ios.hpp
index 5de1f525ec..1f767629ed 100644
--- a/std/ios.hpp
+++ b/std/ios.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/iostream.hpp b/std/iostream.hpp
index d944705db8..106683c45d 100644
--- a/std/iostream.hpp
+++ b/std/iostream.hpp
@@ -1,35 +1,27 @@
 #pragma once
-#include "common_defines.hpp"
 #include "target_os.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#ifdef OMIM_OS_BADA
-  #include <istream>
-  #include <ostream>
+#include <iostream>
 
-#else   // OMIM_OS_BADA
-  #include <iostream>
+using std::cin;
+using std::cout;
+using std::cerr;
 
-  using std::cin;
-  using std::cout;
-  using std::cerr;
+using std::istream;
+using std::ostream;
 
-  using std::istream;
-  using std::ostream;
-
-  #ifndef OMIM_OS_ANDROID
-    using std::wcin;
-    using std::wcout;
-    using std::wcerr;
-  #endif
-#endif  // OMIM_OS_BADA
+#ifndef OMIM_OS_ANDROID
+  using std::wcin;
+  using std::wcout;
+  using std::wcerr;
+#endif
 
 using std::endl;
 using std::flush;
-using std::locale;
 
 #ifdef DEBUG_NEW
 #define new DEBUG_NEW
diff --git a/std/iterator.hpp b/std/iterator.hpp
index 849626d3e0..0e820b66e1 100644
--- a/std/iterator.hpp
+++ b/std/iterator.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/iterator_facade.hpp b/std/iterator_facade.hpp
index 613240d19f..5bbd3957d9 100644
--- a/std/iterator_facade.hpp
+++ b/std/iterator_facade.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/kdtree.hpp b/std/kdtree.hpp
index 9d95c4199f..bf49e02d73 100644
--- a/std/kdtree.hpp
+++ b/std/kdtree.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/limits.hpp b/std/limits.hpp
index 99415711ea..a229e2db28 100644
--- a/std/limits.hpp
+++ b/std/limits.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/list.hpp b/std/list.hpp
index 991f649c59..0d87f33fb2 100644
--- a/std/list.hpp
+++ b/std/list.hpp
@@ -1,16 +1,10 @@
 #pragma once
-#include "common_defines.hpp"
-#include "target_os.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#ifdef OMIM_USE_DEBUG_STL
-  #include <debug/list>
-#else
-  #include <list>
-#endif
+#include <list>
 using std::list;
 
 #ifdef DEBUG_NEW
diff --git a/std/map.hpp b/std/map.hpp
index 13559c5b9d..09d1506277 100644
--- a/std/map.hpp
+++ b/std/map.hpp
@@ -1,16 +1,10 @@
 #pragma once
-#include "common_defines.hpp"
-#include "target_os.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#ifdef OMIM_USE_DEBUG_STL
-  #include <debug/map>
-#else
-  #include <map>
-#endif
+#include <map>
 using std::map;
 using std::multimap;
 
diff --git a/std/mutex.hpp b/std/mutex.hpp
index 0f024c0647..47a7461fa7 100644
--- a/std/mutex.hpp
+++ b/std/mutex.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/noncopyable.hpp b/std/noncopyable.hpp
index ef159dc084..0c18ade268 100644
--- a/std/noncopyable.hpp
+++ b/std/noncopyable.hpp
@@ -1,10 +1,10 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
 #endif
 
+// TODO: Mirgate to C++11 technics to disable copying.
 #include <boost/noncopyable.hpp>
 using boost::noncopyable;
 
diff --git a/std/numeric.hpp b/std/numeric.hpp
index c77e34b4be..8ef5ca86b6 100644
--- a/std/numeric.hpp
+++ b/std/numeric.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/queue.hpp b/std/queue.hpp
index 6092f48eaf..9b8db780e1 100644
--- a/std/queue.hpp
+++ b/std/queue.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/set.hpp b/std/set.hpp
index 6bf8320321..36c48b0beb 100644
--- a/std/set.hpp
+++ b/std/set.hpp
@@ -1,16 +1,10 @@
 #pragma once
-#include "common_defines.hpp"
-#include "target_os.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#ifdef OMIM_USE_DEBUG_STL
-  #include <debug/set>
-#else
-  #include <set>
-#endif
+#include <set>
 using std::multiset;
 using std::set;
 
diff --git a/std/shared_array.hpp b/std/shared_array.hpp
index d15ed737ed..a1f643284f 100644
--- a/std/shared_array.hpp
+++ b/std/shared_array.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/shared_ptr.hpp b/std/shared_ptr.hpp
index 1fefc06f5d..8bdab56417 100644
--- a/std/shared_ptr.hpp
+++ b/std/shared_ptr.hpp
@@ -1,25 +1,13 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#ifdef CPP11_IS_SUPPORTED
-
 #include <memory>
 using std::shared_ptr;
 using std::make_shared;
 
-#else
-
-#include <boost/shared_ptr.hpp>
-using boost::shared_ptr;
-
-using boost::static_pointer_cast;
-
-#endif
-
 #ifdef DEBUG_NEW
 #define new DEBUG_NEW
 #endif
diff --git a/std/sstream.hpp b/std/sstream.hpp
index dd6476b512..dce71cfa8a 100644
--- a/std/sstream.hpp
+++ b/std/sstream.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/stack.hpp b/std/stack.hpp
index 88d2bbd4fe..da3b807535 100644
--- a/std/stack.hpp
+++ b/std/stack.hpp
@@ -1,4 +1,4 @@
-#include "common_defines.hpp"
+#pragma once
 
 #ifdef new
 #undef new
diff --git a/std/string.hpp b/std/string.hpp
index 660f5289d6..edccd3dd73 100644
--- a/std/string.hpp
+++ b/std/string.hpp
@@ -1,16 +1,10 @@
 #pragma once
-#include "common_defines.hpp"
-#include "target_os.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#ifdef OMIM_USE_DEBUG_STL
-  #include <debug/string>
-#else
-  #include <string>
-#endif
+#include <string>
 
 using std::basic_string;
 using std::getline;
diff --git a/std/systime.hpp b/std/systime.hpp
index e32d8c9f84..bc6f52e09f 100644
--- a/std/systime.hpp
+++ b/std/systime.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "common_defines.hpp"
 #include "target_os.hpp"
 #include "ctime.hpp"
 
diff --git a/std/thread.hpp b/std/thread.hpp
index e1815b8296..bfb88113ff 100644
--- a/std/thread.hpp
+++ b/std/thread.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/transform_iterator.hpp b/std/transform_iterator.hpp
index c36ab52d28..1ee0560376 100644
--- a/std/transform_iterator.hpp
+++ b/std/transform_iterator.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/tuple.hpp b/std/tuple.hpp
index 2212bac436..760d20f411 100644
--- a/std/tuple.hpp
+++ b/std/tuple.hpp
@@ -1,57 +1,49 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#include <boost/tuple/tuple.hpp>
+#include <tuple>
 #include <boost/tuple/tuple_comparison.hpp>
-using boost::tuple;
-using boost::make_tuple;
-//using boost::get; // "get" is very common name, use "get" member function
-
-/*
-#include <tr1/tuple>
-using std::tr1::tuple;
-using std::tr1::make_tuple;
-using std::tr1::get;
-*/
-
-template <class Tuple> struct tuple_length
-{
-  static const int value = boost::tuples::length<Tuple>::value;
-};
-
-template <int N, class T> struct tuple_element
-{
-  typedef typename boost::tuples::element<N, T>::type type;
-};
-
-namespace impl
-{
-  template <int N> struct for_each_tuple_impl
-  {
-    template <class Tuple, class ToDo> void operator() (Tuple & t, ToDo & toDo)
-    {
-      toDo(boost::tuples::get<N>(t), N);
-      for_each_tuple_impl<N-1> c;
-      c(t, toDo);
-    }
-  };
-
-  template <> struct for_each_tuple_impl<-1>
-  {
-    template <class Tuple, class ToDo> void operator() (Tuple &, ToDo &) {}
-  };
-}
-
-template <class Tuple, class ToDo>
-void for_each_tuple(Tuple & t, ToDo & toDo)
-{
-  impl::for_each_tuple_impl<tuple_length<Tuple>::value-1> c;
-  c(t, toDo);
-}
+using std::tuple;
+using std::make_tuple;
+//using std::get; // "get" is very common name, use "get" member function
+
+//template <class Tuple> struct tuple_length
+//{
+//  static const int value = boost::tuples::length<Tuple>::value;
+//};
+
+//template <int N, class T> struct tuple_element
+//{
+//  typedef typename boost::tuples::element<N, T>::type type;
+//};
+
+//namespace impl
+//{
+//  template <int N> struct for_each_tuple_impl
+//  {
+//    template <class Tuple, class ToDo> void operator() (Tuple & t, ToDo & toDo)
+//    {
+//      toDo(boost::tuples::get<N>(t), N);
+//      for_each_tuple_impl<N-1> c;
+//      c(t, toDo);
+//    }
+//  };
+
+//  template <> struct for_each_tuple_impl<-1>
+//  {
+//    template <class Tuple, class ToDo> void operator() (Tuple &, ToDo &) {}
+//  };
+//}
+
+//template <class Tuple, class ToDo>
+//void for_each_tuple(Tuple & t, ToDo & toDo)
+//{
+//  impl::for_each_tuple_impl<tuple_length<Tuple>::value-1> c;
+//  c(t, toDo);
+//}
 
 #ifdef DEBUG_NEW
 #define new DEBUG_NEW
diff --git a/std/type_traits.hpp b/std/type_traits.hpp
index 59068a4180..ca2a399e48 100644
--- a/std/type_traits.hpp
+++ b/std/type_traits.hpp
@@ -1,33 +1,23 @@
 #pragma once
-#include "common_defines.hpp"
 #include "target_os.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#ifdef OMIM_OS_MAC
-// http://stackoverflow.com/questions/8173620/c-boost-1-48-type-traits-and-cocoa-inclusion-weirdness
-// Cocoa defines "check" macros as is. It breaks compilation of boost/type_traits.
-#ifdef check
-#undef check
-#endif
-#endif
-
 #include <type_traits>
 
-using std::enable_if;
 using std::conditional;
-
-using std::is_same;
-using std::make_signed;
-using std::make_unsigned;
-using std::is_signed;
-using std::is_unsigned;
+using std::enable_if;
+using std::is_arithmetic;
 using std::is_floating_point;
 using std::is_integral;
-using std::is_arithmetic;
 using std::is_pod;
+using std::is_same;
+using std::is_signed;
+using std::is_unsigned;
+using std::make_signed;
+using std::make_unsigned;
 using std::underlying_type;
 
 /// @todo clang on linux doesn't have is_trivially_copyable.
diff --git a/std/typeinfo.hpp b/std/typeinfo.hpp
index 8a27fdb5fa..cb2baaa949 100644
--- a/std/typeinfo.hpp
+++ b/std/typeinfo.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/unique_ptr.hpp b/std/unique_ptr.hpp
index 0d647a4df5..536fa25230 100644
--- a/std/unique_ptr.hpp
+++ b/std/unique_ptr.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
@@ -9,7 +8,7 @@
 using std::unique_ptr;
 
 /// @todo(y): replace this hand-written helper function by
-/// std::make_unique when it will be available.
+/// std::make_unique when it will be available in C++14
 template <typename T, typename... Args>
 unique_ptr<T> make_unique(Args &&... args)
 {
diff --git a/std/unordered_map.hpp b/std/unordered_map.hpp
index e6b9fb90f1..886da44f68 100644
--- a/std/unordered_map.hpp
+++ b/std/unordered_map.hpp
@@ -1,13 +1,12 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#include <boost/unordered_map.hpp>
-using boost::unordered_map;
-using boost::unordered_multimap;
+#include <unordered_map>
+using std::unordered_map;
+using std::unordered_multimap;
 
 #ifdef DEBUG_NEW
 #define new DEBUG_NEW
diff --git a/std/unordered_set.hpp b/std/unordered_set.hpp
index 2377ed7f2a..8fb84a9e7b 100644
--- a/std/unordered_set.hpp
+++ b/std/unordered_set.hpp
@@ -1,12 +1,12 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#include <boost/unordered_set.hpp>
-using boost::unordered_set;
+#include <unordered_set>
+using std::unordered_set;
+using std::unordered_multiset;
 
 #ifdef DEBUG_NEW
 #define new DEBUG_NEW
diff --git a/std/utility.hpp b/std/utility.hpp
index 0b140c2ad9..64d61997b1 100644
--- a/std/utility.hpp
+++ b/std/utility.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
diff --git a/std/vector.hpp b/std/vector.hpp
index d4c5c02f07..06b0d1c3e6 100644
--- a/std/vector.hpp
+++ b/std/vector.hpp
@@ -1,16 +1,10 @@
 #pragma once
-#include "common_defines.hpp"
-#include "target_os.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#ifdef OMIM_USE_DEBUG_STL
-  #include <debug/vector>
-#else
-  #include <vector>
-#endif
+#include <vector>
 using std::vector;
 
 #ifdef DEBUG_NEW
diff --git a/std/weak_ptr.hpp b/std/weak_ptr.hpp
index e7cba78b95..76dbc557f2 100644
--- a/std/weak_ptr.hpp
+++ b/std/weak_ptr.hpp
@@ -1,22 +1,12 @@
 #pragma once
-#include "common_defines.hpp"
 
 #ifdef new
 #undef new
 #endif
 
-#ifdef CPP11_IS_SUPPORTED
-
 #include <memory>
 using std::weak_ptr;
 
-#else
-
-#include <boost/weak_ptr.hpp>
-using boost::weak_ptr;
-
-#endif
-
 #ifdef DEBUG_NEW
 #define new DEBUG_NEW
 #endif