diff --git a/base/osm_id.cpp b/base/osm_id.cpp
index 64f948fbd7..da21db1b45 100644
--- a/base/osm_id.cpp
+++ b/base/osm_id.cpp
@@ -1,6 +1,7 @@
-#include "base/assert.hpp"
 #include "base/osm_id.hpp"
 
+#include "base/assert.hpp"
+
 #include <sstream>
 
 
diff --git a/generator/booking_quality_check/booking_quality_check.cpp b/generator/booking_quality_check/booking_quality_check.cpp
index 4785710178..107e122428 100644
--- a/generator/booking_quality_check/booking_quality_check.cpp
+++ b/generator/booking_quality_check/booking_quality_check.cpp
@@ -10,9 +10,9 @@
 
 #include "coding/file_name_utils.hpp"
 
+#include "base/osm_id.hpp"
 #include "base/stl_add.hpp"
 #include "base/string_utils.hpp"
-#include "base/osm_id.hpp"
 
 #include <cstdlib>
 #include <cstring>
diff --git a/generator/generator_tests/ugc_test.cpp b/generator/generator_tests/ugc_test.cpp
index 4e93779c22..31426eebff 100644
--- a/generator/generator_tests/ugc_test.cpp
+++ b/generator/generator_tests/ugc_test.cpp
@@ -2,7 +2,6 @@
 
 #include "generator/ugc_db.hpp"
 #include "generator/ugc_translator.hpp"
-#include "base/osm_id.hpp"
 
 #include "ugc/types.hpp"
 
diff --git a/generator/generator_tests_support/routing_helpers.cpp b/generator/generator_tests_support/routing_helpers.cpp
index c546a99b6b..9d5ad9d2b2 100644
--- a/generator/generator_tests_support/routing_helpers.cpp
+++ b/generator/generator_tests_support/routing_helpers.cpp
@@ -3,7 +3,6 @@
 #include "testing/testing.hpp"
 
 #include "generator/gen_mwm_info.hpp"
-#include "base/osm_id.hpp"
 
 #include "coding/file_writer.hpp"
 
diff --git a/generator/restriction_writer.cpp b/generator/restriction_writer.cpp
index 4478b636f1..e4278a2c66 100644
--- a/generator/restriction_writer.cpp
+++ b/generator/restriction_writer.cpp
@@ -1,12 +1,12 @@
 #include "generator/restriction_writer.hpp"
 
 #include "generator/intermediate_elements.hpp"
-#include "base/osm_id.hpp"
 #include "generator/restriction_collector.hpp"
 
 #include "routing/restrictions_serialization.hpp"
 
 #include "base/logging.hpp"
+#include "base/osm_id.hpp"
 
 #include <algorithm>
 #include <fstream>
diff --git a/generator/routing_index_generator.cpp b/generator/routing_index_generator.cpp
index 522038c5be..16afbb3073 100644
--- a/generator/routing_index_generator.cpp
+++ b/generator/routing_index_generator.cpp
@@ -2,7 +2,6 @@
 
 #include "generator/borders_generator.hpp"
 #include "generator/borders_loader.hpp"
-#include "base/osm_id.hpp"
 #include "generator/routing_helpers.hpp"
 
 #include "routing/base/astar_algorithm.hpp"
@@ -29,6 +28,7 @@
 
 #include "base/checked_cast.hpp"
 #include "base/logging.hpp"
+#include "base/osm_id.hpp"
 
 #include <algorithm>
 #include <cstdint>