Fix highlighting of #includes
Remove excess macro highlighting