Some more cleanup of includes