SERVER-13635: remove some includes