OFMatchV3: fix consistency of OFMatchV3 include structure