the src/include tree, so that -I backend is no longer necessary anywhere.
Also, clean up some bit rot in contrib tree.