Redid two files in abbreviations plugin to use new include layout.