diff --git a/map/framework.cpp b/map/framework.cpp
index 8a176dd13..7c42d9ff3 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -7,7 +7,9 @@
 
 #include "ge0/url_generator.hpp"
 
+#include "routing/index_router.hpp"
 #include "routing/route.hpp"
+#include "routing/routing_helpers.hpp"
 #include "routing/speed_camera_prohibition.hpp"
 
 #include "routing_common/num_mwm_id.hpp"
@@ -18,12 +20,15 @@
 
 #include "storage/storage.hpp"
 #include "storage/country_info_getter.hpp"
+#include "storage/routing_helpers.hpp"
 #include "storage/storage_helpers.hpp"
 
 #include "drape_frontend/color_constants.hpp"
 #include "drape_frontend/gps_track_point.hpp"
 #include "drape_frontend/visual_params.hpp"
 
+#include "editor/editable_data_source.hpp"
+
 #include "descriptions/loader.hpp"
 
 #include "indexer/categories_holder.hpp"
@@ -39,6 +44,7 @@
 #include "indexer/scales.hpp"
 #include "indexer/transliteration_loader.hpp"
 
+#include "platform/local_country_file_utils.hpp"
 #include "platform/localization.hpp"
 #include "platform/measurement_utils.hpp"
 #include "platform/mwm_version.hpp"
@@ -61,6 +67,7 @@
 
 #include "base/logging.hpp"
 #include "base/math.hpp"
+#include "base/stl_helpers.hpp"
 #include "base/string_utils.hpp"
 
 #include "std/target_os.hpp"
@@ -364,10 +371,9 @@ Framework::Framework(FrameworkParams const & params, bool loadMaps)
   editor.SetDelegate(make_unique<search::EditorDelegate>(m_featuresFetcher.GetDataSource()));
   editor.SetInvalidateFn([this](){ InvalidateRect(GetCurrentViewport()); });
 
-  /// @todo Uncomment when we will integrate a traffic provider.
-  // m_trafficManager.SetCurrentDataVersion(m_storage.GetCurrentDataVersion());
-  // m_trafficManager.SetSimplifiedColorScheme(LoadTrafficSimplifiedColors());
-  // m_trafficManager.SetEnabled(LoadTrafficEnabled());
+  m_trafficManager.SetCurrentDataVersion(m_storage.GetCurrentDataVersion());
+  m_trafficManager.SetSimplifiedColorScheme(LoadTrafficSimplifiedColors());
+  m_trafficManager.SetEnabled(LoadTrafficEnabled());
 
   m_isolinesManager.SetEnabled(LoadIsolinesEnabled());
 
diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp
index d3684b2eb..4f9233d8a 100644
--- a/qt/mainwindow.cpp
+++ b/qt/mainwindow.cpp
@@ -876,9 +876,8 @@ void MainWindow::SetLayerEnabled(LayerType type, bool enable)
   switch (type)
   {
   case LayerType::TRAFFIC:
-    /// @todo Uncomment when we will integrate a traffic provider.
-    // frm.GetTrafficManager().SetEnabled(enable);
-    // frm.SaveTrafficEnabled(enable);
+    frm.GetTrafficManager().SetEnabled(enable);
+    frm.SaveTrafficEnabled(enable);
     break;
   case LayerType::TRANSIT:
     frm.GetTransitManager().EnableTransitSchemeMode(enable);