Removed automatically generated headers
Merge origin/master