Remove now useless includes
Fix copy paste error
Add missing prototype