fixes include order, switch indentation, and adds missing map includes to csvback