Removed unused header includes

See commit d95a8ccf5b059a2e80fd50f4cc7bc9cd4db9719c.