diff --git a/generator/camera_info_collector.cpp b/generator/camera_info_collector.cpp
index 9f039272e7..51073fc0f2 100644
--- a/generator/camera_info_collector.cpp
+++ b/generator/camera_info_collector.cpp
@@ -20,11 +20,6 @@
 
 namespace generator
 {
-// TODO (@gmoryes) add "inline static ..." after moving to c++17
-double constexpr CamerasInfoCollector::Camera::kCoordEqualityEps;
-double constexpr CamerasInfoCollector::kMaxDistFromCameraToClosestSegmentMeters;
-double constexpr CamerasInfoCollector::kSearchCameraRadiusMeters;
-
 CamerasInfoCollector::CamerasInfoCollector(std::string const & dataFilePath,
                                            std::string const & camerasInfoPath,
                                            std::string const & osmIdsToFeatureIdsPath)
diff --git a/generator/camera_info_collector.hpp b/generator/camera_info_collector.hpp
index 5d050bf5e4..83f195b66c 100644
--- a/generator/camera_info_collector.hpp
+++ b/generator/camera_info_collector.hpp
@@ -41,7 +41,7 @@ public:
 private:
   struct Camera
   {
-    static double constexpr kCoordEqualityEps = 1e-5;
+    inline static double constexpr kCoordEqualityEps = 1e-5;
 
     Camera(m2::PointD const & center, uint8_t maxSpeed, std::vector<routing::SpeedCameraMwmPosition> && ways)
       : m_data(center, maxSpeed, std::move(ways))
@@ -77,8 +77,8 @@ private:
     routing::SpeedCameraMetadata m_data;
   };
 
-  static double constexpr kMaxDistFromCameraToClosestSegmentMeters = 20.0;
-  static double constexpr kSearchCameraRadiusMeters = 10.0;
+  inline static double constexpr kMaxDistFromCameraToClosestSegmentMeters = 20.0;
+  inline static double constexpr kSearchCameraRadiusMeters = 10.0;
 
   bool ParseIntermediateInfo(std::string const & camerasInfoPath,
                              std::map<base::GeoObjectId, uint32_t> const & osmIdToFeatureId);