Update to use xinclude and sort them correctly.