Remove spurious includes