Refactor the way inclusion works so that the library can supply a default solution