Eliminate two missed #includes of !