Simplify widget includes