Correct clang header inclusion

Remove vestige, and prevent a proposed "fix" that would have broken it from doing so

Change-Id: I28cb300d942e7240d0e8d39466aa5cfd277776e1