diff --git a/indexer/index.cpp b/indexer/index.cpp
index 8abe36c4b8..2a9b586f32 100644
--- a/indexer/index.cpp
+++ b/indexer/index.cpp
@@ -1,45 +1,10 @@
 #include "indexer/index.hpp"
 
-#include "platform/local_country_file_utils.hpp"
-
-#include "indexer/rank_table.hpp"
-
-#include "coding/file_name_utils.hpp"
-#include "coding/internal/file_data.hpp"
-
 #include "base/logging.hpp"
 
 using platform::CountryFile;
 using platform::LocalCountryFile;
 
-//////////////////////////////////////////////////////////////////////////////////
-// MwmValue implementation
-//////////////////////////////////////////////////////////////////////////////////
-using namespace std;
-
-MwmValue::MwmValue(LocalCountryFile const & localFile)
-  : m_cont(platform::GetCountryReader(localFile, MapOptions::Map)), m_file(localFile)
-{
-  m_factory.Load(m_cont);
-}
-
-void MwmValue::SetTable(MwmInfoEx & info)
-{
-  auto const version = GetHeader().GetFormat();
-  if (version < version::Format::v5)
-    return;
-
-  m_table = info.m_table.lock();
-  if (!m_table)
-  {
-    if (version == version::Format::v5)
-      m_table = feature::FeaturesOffsetsTable::CreateIfNotExistsAndLoad(m_file, m_cont);
-    else
-      m_table = feature::FeaturesOffsetsTable::Load(m_cont);
-    info.m_table = m_table;
-  }
-}
-
 //////////////////////////////////////////////////////////////////////////////////
 // Index implementation
 //////////////////////////////////////////////////////////////////////////////////
diff --git a/indexer/index.hpp b/indexer/index.hpp
index 31bd3e5d36..569e94ff37 100644
--- a/indexer/index.hpp
+++ b/indexer/index.hpp
@@ -27,47 +27,6 @@
 #include <utility>
 #include <vector>
 
-class MwmInfoEx : public MwmInfo
-{
-private:
-  friend class Index;
-  friend class MwmValue;
-
-  // weak_ptr is needed here to access offsets table in already
-  // instantiated MwmValue-s for the MWM, including MwmValues in the
-  // MwmSet's cache. We can't use shared_ptr because of offsets table
-  // must be removed as soon as the last corresponding MwmValue is
-  // destroyed. Also, note that this value must be used and modified
-  // only in MwmValue::SetTable() method, which, in turn, is called
-  // only in the MwmSet critical section, protected by a lock.  So,
-  // there's an implicit synchronization on this field.
-  std::weak_ptr<feature::FeaturesOffsetsTable> m_table;
-};
-
-class MwmValue : public MwmSet::MwmValueBase
-{
-public:
-  FilesContainerR const m_cont;
-  IndexFactory m_factory;
-  platform::LocalCountryFile const m_file;
-
-  std::shared_ptr<feature::FeaturesOffsetsTable> m_table;
-
-  explicit MwmValue(platform::LocalCountryFile const & localFile);
-  void SetTable(MwmInfoEx & info);
-
-  inline feature::DataHeader const & GetHeader() const { return m_factory.GetHeader(); }
-  inline feature::RegionData const & GetRegionData() const { return m_factory.GetRegionData(); }
-  inline version::MwmVersion const & GetMwmVersion() const { return m_factory.GetMwmVersion(); }
-  inline std::string const & GetCountryFileName() const
-  {
-    return m_file.GetCountryFile().GetName();
-  }
-
-  inline bool HasSearchIndex() { return m_cont.IsExist(SEARCH_INDEX_FILE_TAG); }
-  inline bool HasGeometryIndex() { return m_cont.IsExist(INDEX_FILE_TAG); }
-};
-
 class Index : public MwmSet
 {
 protected:
diff --git a/indexer/mwm_set.cpp b/indexer/mwm_set.cpp
index 7f775b955a..703c8586c0 100644
--- a/indexer/mwm_set.cpp
+++ b/indexer/mwm_set.cpp
@@ -3,6 +3,8 @@
 
 #include "coding/reader.hpp"
 
+#include "platform/local_country_file_utils.hpp"
+
 #include "base/assert.hpp"
 #include "base/exception.hpp"
 #include "base/logging.hpp"
@@ -406,6 +408,35 @@ void MwmSet::ClearCache(MwmId const & id)
   ClearCacheImpl(RemoveIfKeepValid(m_cache.begin(), m_cache.end(), sameId), m_cache.end());
 }
 
+//////////////////////////////////////////////////////////////////////////////////
+// MwmValue implementation
+//////////////////////////////////////////////////////////////////////////////////
+using namespace std;
+
+MwmValue::MwmValue(LocalCountryFile const & localFile)
+: m_cont(platform::GetCountryReader(localFile, MapOptions::Map)), m_file(localFile)
+{
+  m_factory.Load(m_cont);
+}
+
+void MwmValue::SetTable(MwmInfoEx & info)
+{
+  auto const version = GetHeader().GetFormat();
+  if (version < version::Format::v5)
+    return;
+
+  m_table = info.m_table.lock();
+  if (!m_table)
+  {
+    if (version == version::Format::v5)
+      m_table = feature::FeaturesOffsetsTable::CreateIfNotExistsAndLoad(m_file, m_cont);
+    else
+      m_table = feature::FeaturesOffsetsTable::Load(m_cont);
+    info.m_table = m_table;
+  }
+}
+
+
 string DebugPrint(MwmSet::RegResult result)
 {
   switch (result)
diff --git a/indexer/mwm_set.hpp b/indexer/mwm_set.hpp
index a7beba2656..b4cd660d5c 100644
--- a/indexer/mwm_set.hpp
+++ b/indexer/mwm_set.hpp
@@ -9,6 +9,9 @@
 #include "base/macros.hpp"
 
 #include "indexer/feature_meta.hpp"
+#include "indexer/data_factory.hpp"
+#include "indexer/features_offsets_table.hpp"
+
 
 #include "std/atomic.hpp"
 #include "std/deque.hpp"
@@ -88,6 +91,23 @@ protected:
   uint32_t m_numRefs;                 ///< Number of active handles.
 };
 
+class MwmInfoEx : public MwmInfo
+{
+private:
+  friend class Index;
+  friend class MwmValue;
+
+  // weak_ptr is needed here to access offsets table in already
+  // instantiated MwmValue-s for the MWM, including MwmValues in the
+  // MwmSet's cache. We can't use shared_ptr because of offsets table
+  // must be removed as soon as the last corresponding MwmValue is
+  // destroyed. Also, note that this value must be used and modified
+  // only in MwmValue::SetTable() method, which, in turn, is called
+  // only in the MwmSet critical section, protected by a lock.  So,
+  // there's an implicit synchronization on this field.
+  std::weak_ptr<feature::FeaturesOffsetsTable> m_table;
+};
+
 class MwmSet
 {
 public:
@@ -368,7 +388,32 @@ protected:
 
 private:
   base::ObserverListSafe<Observer> m_observers;
-};
+}; // class MwmSet
+
+class MwmValue : public MwmSet::MwmValueBase
+{
+public:
+  FilesContainerR const m_cont;
+  IndexFactory m_factory;
+  platform::LocalCountryFile const m_file;
+
+  std::shared_ptr<feature::FeaturesOffsetsTable> m_table;
+
+  explicit MwmValue(platform::LocalCountryFile const & localFile);
+  void SetTable(MwmInfoEx & info);
+
+  inline feature::DataHeader const & GetHeader() const { return m_factory.GetHeader(); }
+  inline feature::RegionData const & GetRegionData() const { return m_factory.GetRegionData(); }
+  inline version::MwmVersion const & GetMwmVersion() const { return m_factory.GetMwmVersion(); }
+  inline std::string const & GetCountryFileName() const
+  {
+    return m_file.GetCountryFile().GetName();
+  }
+
+  inline bool HasSearchIndex() { return m_cont.IsExist(SEARCH_INDEX_FILE_TAG); }
+  inline bool HasGeometryIndex() { return m_cont.IsExist(INDEX_FILE_TAG); }
+}; // class MwmValue
+
 
 string DebugPrint(MwmSet::RegResult result);
 string DebugPrint(MwmSet::Event::Type type);