Fixed cyclic dependency in struct definition