diff --git a/generator/generator.pro b/generator/generator.pro
index 3db8b861ab..d4c5c41030 100644
--- a/generator/generator.pro
+++ b/generator/generator.pro
@@ -24,24 +24,23 @@ SOURCES += \
     feature_merger.cpp \
     feature_sorter.cpp \
     osm2type.cpp \
-    osm_decl.cpp \
     osm_id.cpp \
     osm_source.cpp \
-    osm_xml_parser.cpp \
     routing_generator.cpp \
     statistics.cpp \
     tesselator.cpp \
     unpack_mwm.cpp \
     update_generator.cpp \
-    xml_element.cpp \
+    osm_element.cpp \
 
 HEADERS += \
     borders_generator.hpp \
     borders_loader.hpp \
     check_model.hpp \
     coastlines_generator.hpp \
-    data_cache_file.hpp \
     dumper.hpp \
+    intermediate_data.hpp\
+    intermediate_elements.hpp\
     feature_builder.hpp \
     feature_emitter_iface.hpp \
     feature_generator.hpp \
@@ -52,11 +51,10 @@ HEADERS += \
     osm2meta.hpp \
     osm2type.hpp \
     osm2meta.hpp \
-    osm_decl.hpp \
     osm_element.hpp \
     osm_id.hpp \
     osm_o5m_source.hpp \
-    osm_xml_parser.hpp \
+    osm_xml_source.hpp \
     polygonizer.hpp \
     routing_generator.hpp \
     statistics.hpp \
@@ -65,5 +63,4 @@ HEADERS += \
     update_generator.hpp \
     ways_merger.hpp \
     world_map_generator.hpp \
-    xml_element.hpp \
 
diff --git a/generator/generator_tests/generator_tests.pro b/generator/generator_tests/generator_tests.pro
index 1a3cae120c..6d77918931 100644
--- a/generator/generator_tests/generator_tests.pro
+++ b/generator/generator_tests/generator_tests.pro
@@ -25,7 +25,6 @@ SOURCES += \
     metadata_test.cpp \
     osm_id_test.cpp \
     osm_o5m_source_test.cpp \
-    osm_parser_test.cpp \
     osm_type_test.cpp \
     tesselator_test.cpp \
     triangles_tree_coding_test.cpp \