Commit before removing includes
Header changes