Eliminate some unnecessary includes