Remove more name space pollution from .inc files

llvm-svn: 299222
4 files changed