Changed plugins to point to new includes