ERT-468 Added ifndef to header file to properly define type