Interm fix for header only include path until MAID-514 is merged