move units_arrange_in_columns to unit.h
enable -Wshadow back