Remove redundant includes
Remove an obsolete function declaration