diff --git a/map/framework_light.cpp b/map/framework_light.cpp
index d54dd3c6bf..c4f4455508 100644
--- a/map/framework_light.cpp
+++ b/map/framework_light.cpp
@@ -85,7 +85,6 @@ bool Framework::IsBookmarksCloudEnabled() const
 CountryInfoReader::Info Framework::GetLocation(m2::PointD const & pt) const
 {
   ASSERT(m_request & REQUEST_TYPE_LOCATION, (m_request));
-
   CHECK(m_countryInfoReader, ());
 
   return m_countryInfoReader->GetMwmInfo(pt);
@@ -95,18 +94,14 @@ std::vector<CampaignFeature> Framework::GetLocalAdsFeatures(double lat, double l
                                                             double radiusInMeters, uint32_t maxCount)
 {
   ASSERT(m_request & REQUEST_TYPE_LOCAL_ADS_FEATURES, (m_request));
-
   CHECK(m_localAdsFeaturesReader, ());
-
   return m_localAdsFeaturesReader->GetCampaignFeatures(lat, lon, radiusInMeters, maxCount);
 }
 
 Statistics * Framework::GetLocalAdsStatistics()
 {
   ASSERT(m_request & REQUEST_TYPE_LOCAL_ADS_STATISTICS, (m_request));
-
   CHECK(m_localAdsStatistics, ());
-
   return m_localAdsStatistics.get();
 }
 
@@ -115,4 +110,3 @@ boost::optional<notifications::NotificationCandidate> Framework::GetNotification
   return m_notificationManager->GetNotification();
 }
 }  // namespace lightweight
-
diff --git a/map/framework_light.hpp b/map/framework_light.hpp
index c0cc9ba286..f46bff0acf 100644
--- a/map/framework_light.hpp
+++ b/map/framework_light.hpp
@@ -13,7 +13,11 @@
 
 #include "base/assert.hpp"
 
+#include <cstdint>
 #include <memory>
+#include <vector>
+
+#include <boost/optional.hpp>
 
 namespace lightweight
 {
diff --git a/map/map_tests/framework_light_tests.cpp b/map/map_tests/framework_light_tests.cpp
index 9440a5edb5..b6cd72f38f 100644
--- a/map/map_tests/framework_light_tests.cpp
+++ b/map/map_tests/framework_light_tests.cpp
@@ -30,8 +30,7 @@ struct LightFrameworkTest
     {
       Framework f(REQUEST_TYPE_LOCAL_ADS_FEATURES | REQUEST_TYPE_LOCAL_ADS_STATISTICS);
       auto const features = f.GetLocalAdsFeatures(0.0 /* lat */, 0.0 /* lon */,
-                                                                           100 /* radiusInMeters */,
-                                                                           0 /* maxCount */);
+                                                  100 /* radiusInMeters */, 0 /* maxCount */);
       auto stats = f.GetLocalAdsStatistics();
       TEST(stats != nullptr, ());
       TEST_EQUAL(features.size(), 0, ());
diff --git a/ugc/ugc_tests/storage_tests.cpp b/ugc/ugc_tests/storage_tests.cpp
index 9a1e20e500..e2a8caae6e 100644
--- a/ugc/ugc_tests/storage_tests.cpp
+++ b/ugc/ugc_tests/storage_tests.cpp
@@ -439,7 +439,7 @@ UNIT_CLASS_TEST(StorageTest, NumberOfUnsynchronized)
 
 UNIT_CLASS_TEST(StorageTest, GetNumberOfUnsentSeparately)
 {
-  TEST_EQUAL(lightweight::GetNumberOfUnsentUGC(), 0, ());
+  TEST_EQUAL(lightweight::impl::GetNumberOfUnsentUGC(), 0, ());
   auto & builder = MwmBuilder::Builder();
   m2::PointD const cafePoint(1.0, 1.0);
   builder.Build({TestCafe(cafePoint)});
@@ -454,7 +454,7 @@ UNIT_CLASS_TEST(StorageTest, GetNumberOfUnsentSeparately)
     TEST_EQUAL(storage.GetNumberOfUnsynchronized(), 1, ());
   }
 
-  TEST_EQUAL(lightweight::GetNumberOfUnsentUGC(), 1, ());
+  TEST_EQUAL(lightweight::impl::GetNumberOfUnsentUGC(), 1, ());
 
   {
     Storage storage(builder.GetDataSource());
@@ -464,7 +464,7 @@ UNIT_CLASS_TEST(StorageTest, GetNumberOfUnsentSeparately)
     storage.SaveIndex();
   }
 
-  TEST_EQUAL(lightweight::GetNumberOfUnsentUGC(), 0, ());
+  TEST_EQUAL(lightweight::impl::GetNumberOfUnsentUGC(), 0, ());
   TEST(DeleteIndexFile(), ());
 }
 
diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj
index d927b0e25d..5d22cd60a6 100644
--- a/xcode/map/map.xcodeproj/project.pbxproj
+++ b/xcode/map/map.xcodeproj/project.pbxproj
@@ -89,6 +89,7 @@
 		3DD122BD2135708900EDFB53 /* libmetrics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DD122BC2135708900EDFB53 /* libmetrics.a */; };
 		3DF54F80219DD21000D12E37 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DF54F7E219DD21000D12E37 /* utils.cpp */; };
 		3DF54F81219DD21000D12E37 /* utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DF54F7F219DD21000D12E37 /* utils.hpp */; };
+		3DF54F8A21AEA04A00D12E37 /* framework_light.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DF54F8921AEA04900D12E37 /* framework_light.cpp */; };
 		451E692921494C2700764A97 /* purchase.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 451E692721494C2600764A97 /* purchase.hpp */; };
 		451E692A21494C2700764A97 /* purchase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 451E692821494C2700764A97 /* purchase.cpp */; };
 		45201E931CE4AC90008A4842 /* api_mark_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45201E921CE4AC90008A4842 /* api_mark_point.cpp */; };
@@ -324,6 +325,7 @@
 		3DD122BC2135708900EDFB53 /* libmetrics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmetrics.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		3DF54F7E219DD21000D12E37 /* utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utils.cpp; sourceTree = "<group>"; };
 		3DF54F7F219DD21000D12E37 /* utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = utils.hpp; sourceTree = "<group>"; };
+		3DF54F8921AEA04900D12E37 /* framework_light.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = framework_light.cpp; sourceTree = "<group>"; };
 		451E692721494C2600764A97 /* purchase.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = purchase.hpp; sourceTree = "<group>"; };
 		451E692821494C2700764A97 /* purchase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = purchase.cpp; sourceTree = "<group>"; };
 		45201E921CE4AC90008A4842 /* api_mark_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = api_mark_point.cpp; sourceTree = "<group>"; };
@@ -763,6 +765,7 @@
 		675345BD1A4054AD00A0A8C3 /* map */ = {
 			isa = PBXGroup;
 			children = (
+				3DF54F8921AEA04900D12E37 /* framework_light.cpp */,
 				3DF54F7E219DD21000D12E37 /* utils.cpp */,
 				3DF54F7F219DD21000D12E37 /* utils.hpp */,
 				3DD1165E21888AAC007A2ED4 /* notifications */,
@@ -1134,6 +1137,7 @@
 				6753469B1A4054E800A0A8C3 /* track.cpp in Sources */,
 				675346621A4054E800A0A8C3 /* feature_vec_model.cpp in Sources */,
 				454523A9202A0068009275C1 /* cloud.cpp in Sources */,
+				3DF54F8A21AEA04A00D12E37 /* framework_light.cpp in Sources */,
 				674C38621BFF3095000D603B /* user_mark.cpp in Sources */,
 				3DA5723320C195ED007BDE27 /* viewport_search_callback.cpp in Sources */,
 				675346641A4054E800A0A8C3 /* framework.cpp in Sources */,