Remove redundant includes
Fix coding style