Include exclude deprecation simplification