Sort includes and other

13 files changed, 18 insertions, 21 deletions

diff --git a/base/base.cpp b/base/base.cpp
index 53d5c522f5..ab46769aa0 100644
--- a/base/base.cpp
+++ b/base/base.cpp
@@ -4,10 +4,9 @@
 
 #include "std/target_os.hpp"
 
-#include <iostream>
 #include <cassert>
 #include <cstdlib>
-
+#include <iostream>
 
 namespace my
 {
diff --git a/base/base_tests/bits_test.cpp b/base/base_tests/bits_test.cpp
index c7184b6055..c2a43733ea 100644
--- a/base/base_tests/bits_test.cpp
+++ b/base/base_tests/bits_test.cpp
@@ -3,6 +3,8 @@
 #include "base/bits.hpp"
 #include "std/cstdlib.hpp"
 
+#include <vector>
+
 namespace
 {
   template <typename T> uint32_t PopCountSimple(T x)
diff --git a/base/base_tests/string_utils_test.cpp b/base/base_tests/string_utils_test.cpp
index 8f01391353..0f2438bf5c 100644
--- a/base/base_tests/string_utils_test.cpp
+++ b/base/base_tests/string_utils_test.cpp
@@ -10,6 +10,7 @@
 #include "std/unordered_map.hpp"
 #include "std/vector.hpp"
 
+#include <sstream>
 
 /// internal function in base
 namespace strings { UniChar LowerUniChar(UniChar c); }
diff --git a/base/cache.hpp b/base/cache.hpp
index 9efa576f56..df7da76f13 100644
--- a/base/cache.hpp
+++ b/base/cache.hpp
@@ -4,8 +4,8 @@
 #include "base/base.hpp"
 #include "base/macros.hpp"
 
-#include <type_traits>
 #include <memory>
+#include <type_traits>
 #include <utility>
 
 
diff --git a/base/condition.cpp b/base/condition.cpp
index fd66f3b872..1082a04346 100644
--- a/base/condition.cpp
+++ b/base/condition.cpp
@@ -1,15 +1,13 @@
 #include "base/condition.hpp"
+#include "base/mutex.hpp"
 
 #include "std/target_os.hpp"
-
-#include "base/mutex.hpp"
 #include "std/systime.hpp"
 
 #include <pthread.h>
 
-#include <cstdint>
 #include <cerrno>
-
+#include <cstdint>
 
 namespace threads
 {
diff --git a/base/internal/message.hpp b/base/internal/message.hpp
index 03d6d0f957..7fff004c01 100644
--- a/base/internal/message.hpp
+++ b/base/internal/message.hpp
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <array>
 #include <deque>
 #include <functional>
@@ -6,10 +7,10 @@
 #include <iterator>
 #include <list>
 #include <map>
+#include <memory>
 #include <set>
 #include <sstream>
 #include <string>
-#include <memory>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
diff --git a/base/limited_priority_queue.hpp b/base/limited_priority_queue.hpp
index 15bf294bf0..16a5ce6fd8 100644
--- a/base/limited_priority_queue.hpp
+++ b/base/limited_priority_queue.hpp
@@ -11,7 +11,7 @@ namespace my
 {
 
 // Priority queue that stores only N smallest elements.
-template <typename T, typename CompareT = std::less<T> >
+template <typename T, typename CompareT = std::less<T>>
 class limited_priority_queue
 {
 public:
diff --git a/base/logging.cpp b/base/logging.cpp
index 5e77051daa..0f1e002a9b 100644
--- a/base/logging.cpp
+++ b/base/logging.cpp
@@ -5,13 +5,13 @@
 #include "base/thread.hpp"
 #include "base/timer.hpp"
 
+#include "std/target_os.hpp"
+//#include "std/windows.hpp"
+
 #include <iomanip>
 #include <iostream>
 #include <mutex>
 #include <sstream>
-#include "std/target_os.hpp"
-//#include "std/windows.hpp"
-
 
 namespace my
 {
diff --git a/base/matrix.hpp b/base/matrix.hpp
index 63df382938..c33963b890 100644
--- a/base/matrix.hpp
+++ b/base/matrix.hpp
@@ -2,9 +2,8 @@
 
 #include "base/math.hpp"
 
-#include <iomanip>
 #include <initializer_list>
-
+#include <iomanip>
 
 namespace math
 {
diff --git a/base/shared_buffer_manager.hpp b/base/shared_buffer_manager.hpp
index 42a6da9aa2..9aa02b0f01 100644
--- a/base/shared_buffer_manager.hpp
+++ b/base/shared_buffer_manager.hpp
@@ -2,10 +2,10 @@
 
 #include "base/mutex.hpp"
 
-#include <vector>
-#include <memory>
 #include <list>
 #include <map>
+#include <memory>
+#include <vector>
 
 class SharedBufferManager
 {
diff --git a/base/string_format.hpp b/base/string_format.hpp
index a5186fcbaa..c864c56828 100644
--- a/base/string_format.hpp
+++ b/base/string_format.hpp
@@ -2,9 +2,8 @@
 #include "base/base.hpp"
 #include "base/macros.hpp"
 
-#include <string>
 #include <sstream>
-
+#include <string>
 
 namespace strings
 {
diff --git a/base/strings_bundle.hpp b/base/strings_bundle.hpp
index 8cc407bc0b..53e44ef965 100644
--- a/base/strings_bundle.hpp
+++ b/base/strings_bundle.hpp
@@ -1,8 +1,7 @@
 #pragma once
 
-#include <string>
 #include <map>
-
+#include <string>
 
 class StringsBundle
 {
diff --git a/base/timer.cpp b/base/timer.cpp
index 07ca601f6a..706dde5fcb 100644
--- a/base/timer.cpp
+++ b/base/timer.cpp
@@ -15,7 +15,6 @@
 #ifndef OMIM_OS_LINUX
 using std::get_time;
 using std::put_time;
-
 #else
 #include <cassert>