Move helper classes into helper.hh, clean includes.