Now compatible with the new includepath changes.