Poll: cleanup #includes