Includes of <map> removed

They are not needed anymore, since we decided that maps are
too slow allocating memory all the time...