Update to latest include rules