diff --git a/generator/regions/city.hpp b/generator/regions/city.hpp
index dcf73fbb7f..ce97c10b41 100644
--- a/generator/regions/city.hpp
+++ b/generator/regions/city.hpp
@@ -10,8 +10,9 @@ namespace generator
 {
 namespace regions
 {
-struct City : public RegionWithName, public RegionWithData
+class City : public RegionWithName, public RegionWithData
 {
+public:
   explicit City(FeatureBuilder1 const & fb, RegionDataProxy const & rd)
     : RegionWithName(fb.GetParams().name),
       RegionWithData(rd)
diff --git a/generator/regions/collector_region_info.hpp b/generator/regions/collector_region_info.hpp
index 17bbbaea83..419ba04aa3 100644
--- a/generator/regions/collector_region_info.hpp
+++ b/generator/regions/collector_region_info.hpp
@@ -121,7 +121,6 @@ private:
   MapIsoCode m_mapIsoCode;
 };
 
-
 inline std::ostream & operator<<(std::ostream & out, AdminLevel const & t)
 {
   out << static_cast<int>(t);
diff --git a/generator/regions/region.hpp b/generator/regions/region.hpp
index 4b896e23fc..9155401615 100644
--- a/generator/regions/region.hpp
+++ b/generator/regions/region.hpp
@@ -13,12 +13,13 @@ class RegionDataProxy;
 
 namespace regions
 {
-struct City;
+class City;
 
 // This is a helper class that is needed to represent the region.
 // With this view, further processing is simplified.
-struct Region : public RegionWithName, public RegionWithData
+class Region : public RegionWithName, public RegionWithData
 {
+public:
   explicit Region(FeatureBuilder1 const & fb, RegionDataProxy const & rd);
   // Build a region and its boundary based on the heuristic.
   explicit Region(City const & city);
diff --git a/generator/regions/region_base.hpp b/generator/regions/region_base.hpp
index 1e3f8ff5de..0143e2292f 100644
--- a/generator/regions/region_base.hpp
+++ b/generator/regions/region_base.hpp
@@ -23,8 +23,9 @@ using BoostPoint = boost::geometry::model::point<double, 2, boost::geometry::cs:
 using BoostPolygon = boost::geometry::model::polygon<BoostPoint>;
 using BoostRect = boost::geometry::model::box<BoostPoint>;
 
-struct RegionWithName
+class RegionWithName
 {
+public:
   RegionWithName(StringUtf8Multilang const & name) : m_name(name) {}
 
   // This function will take the following steps:
@@ -40,8 +41,9 @@ protected:
   StringUtf8Multilang m_name;
 };
 
-struct RegionWithData
+class RegionWithData
 {
+public:
   static uint8_t constexpr kNoRank = 0;
 
   RegionWithData(RegionDataProxy const & regionData) : m_regionData(regionData) {}