widgets: cleanup includes