AST-193: Simplify less inclusion