diff --git a/map/information_display.cpp b/map/information_display.cpp
index d1c5211f34..f76b868025 100644
--- a/map/information_display.cpp
+++ b/map/information_display.cpp
@@ -12,8 +12,6 @@
 #include "../yg/pen_info.hpp"
 #include "../yg/straight_text_element.hpp"
 
-#include "../version/version.hpp"
-
 #include "../base/string_utils.hpp"
 #include "../base/logging.hpp"
 #include "../base/mutex.hpp"
diff --git a/storage/country.cpp b/storage/country.cpp
index af21ffc747..9182923576 100644
--- a/storage/country.cpp
+++ b/storage/country.cpp
@@ -1,13 +1,7 @@
 #include "country.hpp"
 
-//#include "../indexer/data_factory.hpp"
-
-//#include "../coding/file_container.hpp"
-
 #include "../platform/platform.hpp"
 
-#include "../version/version.hpp"
-
 #include "../base/logging.hpp"
 
 #include "../3party/jansson/myjansson.hpp"
diff --git a/storage/storage.cpp b/storage/storage.cpp
index 8a734c32ea..674953770a 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -17,8 +17,6 @@
 #include "../base/logging.hpp"
 #include "../base/string_utils.hpp"
 
-#include "../version/version.hpp"
-
 #include "../std/algorithm.hpp"
 #include "../std/target_os.hpp"
 #include "../std/bind.hpp"
diff --git a/storage/storage_tests/country_test.cpp b/storage/storage_tests/country_test.cpp
deleted file mode 100644
index 73dc75731f..0000000000
--- a/storage/storage_tests/country_test.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "../../testing/testing.hpp"
-
-#include "../country.hpp"
-
-#include "../../version/version.hpp"
-
-#include "../../coding/file_writer.hpp"
-#include "../../coding/file_reader.hpp"
-
-using namespace storage;
-
diff --git a/storage/storage_tests/storage_tests.pro b/storage/storage_tests/storage_tests.pro
index 92f3e88b66..01356fd324 100644
--- a/storage/storage_tests/storage_tests.pro
+++ b/storage/storage_tests/storage_tests.pro
@@ -19,7 +19,6 @@ HEADERS +=
 
 SOURCES += \
   ../../testing/testingmain.cpp \
-  country_test.cpp \
   simple_tree_test.cpp \
   country_info_test.cpp \
   generate_langs.cpp \