Cleanup: Remove redundant #includes