diff --git a/indexer/trie_builder.hpp b/indexer/trie_builder.hpp
index b4b919d26a..9c7ff5a839 100644
--- a/indexer/trie_builder.hpp
+++ b/indexer/trie_builder.hpp
@@ -10,7 +10,6 @@
 #include "std/algorithm.hpp"
 #include "std/vector.hpp"
 
-
 // Trie format:
 // [1: header]
 // [node] ... [node]
diff --git a/search/categories_holder.cpp b/search/categories_holder.cpp
index 45470869af..06ad1e5e58 100644
--- a/search/categories_holder.cpp
+++ b/search/categories_holder.cpp
@@ -1,4 +1,5 @@
 #include "categories_holder.hpp"
+
 #include "search_delimiters.hpp"
 #include "search_string_utils.hpp"
 
diff --git a/search/house_detector.cpp b/search/house_detector.cpp
index b2278ae681..95498df05e 100644
--- a/search/house_detector.cpp
+++ b/search/house_detector.cpp
@@ -1,5 +1,6 @@
+#include "house_detector.hpp"
+
 #include "search/algos.hpp"
-#include "search/house_detector.hpp"
 #include "search/search_common.hpp"
 #include "search/search_string_utils.hpp"
 
diff --git a/search/keyword_lang_matcher.cpp b/search/keyword_lang_matcher.cpp
index 35b010b985..d19fb543c8 100644
--- a/search/keyword_lang_matcher.cpp
+++ b/search/keyword_lang_matcher.cpp
@@ -1,4 +1,5 @@
 #include "keyword_lang_matcher.hpp"
+
 #include "search_delimiters.hpp"
 #include "search_string_utils.hpp"
 
diff --git a/search/keyword_matcher.cpp b/search/keyword_matcher.cpp
index 09bb22b245..1fe10ea6ca 100644
--- a/search/keyword_matcher.cpp
+++ b/search/keyword_matcher.cpp
@@ -1,4 +1,5 @@
 #include "keyword_matcher.hpp"
+
 #include "search_delimiters.hpp"
 #include "search_string_utils.hpp"
 
diff --git a/search/locality.cpp b/search/locality.cpp
index 1bee22baa7..7351d3c528 100644
--- a/search/locality.cpp
+++ b/search/locality.cpp
@@ -1,4 +1,5 @@
 #include "locality.hpp"
+
 #include "search_delimiters.hpp"
 #include "search_string_utils.hpp"
 
diff --git a/search/retrieval.cpp b/search/retrieval.cpp
index db6d9bfd6e..25e74fb3b6 100644
--- a/search/retrieval.cpp
+++ b/search/retrieval.cpp
@@ -1,6 +1,7 @@
+#include "retrieval.hpp"
+
 #include "feature_offset_match.hpp"
 #include "interval_set.hpp"
-#include "retrieval.hpp"
 #include "search_index_values.hpp"
 #include "search_trie.hpp"
 
diff --git a/search/search_engine.cpp b/search/search_engine.cpp
index 5e6f92f163..b4dcb59696 100644
--- a/search/search_engine.cpp
+++ b/search/search_engine.cpp
@@ -1,6 +1,5 @@
 #include "search_engine.hpp"
 
-#include "categories_holder.hpp"
 #include "geometry_utils.hpp"
 #include "search_query.hpp"
 #include "search_string_utils.hpp"