A round at cleaning up headers
Remove more includes