Merge "fix: remove headers from generated files"