Remove a few useless header inclusion via deheader