Code cleanup, removing unnecessary header inclusion to speed up compilation.