Fix include order so policy aware gated discovery has precedence