Add includes and contains alias (fixes #327)