Clean up #includes in diverter.cc