Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style