fixed some missing includes for replacement of miscUtils. added const variant type