diff --git a/third_party/2/gflags.pyi b/third_party/2and3/gflags.pyi
similarity index 95%
rename from third_party/2/gflags.pyi
rename to third_party/2and3/gflags.pyi
index 51ed30421..0cb75a523 100644
--- a/third_party/2/gflags.pyi
+++ b/third_party/2and3/gflags.pyi
@@ -1,4 +1,4 @@
-from typing import Any, Callable, Dict, Iterable, IO, List, Optional, Sequence, Union
+from typing import Any, Callable, Dict, Iterable, IO, List, Optional, Sequence, Text, Union
 from types import ModuleType
 
 class Error(Exception): ...
@@ -123,7 +123,7 @@ class ArgumentParser(object):
     def WriteCustomInfoInXMLFormat(self, outfile: IO[str], indent: str) -> None: ...
 
 class ArgumentSerializer:
-    def Serialize(self, value: Any) -> unicode: ...
+    def Serialize(self, value: Any) -> Text: ...
 
 class ListSerializer(ArgumentSerializer):
     def __init__(self, list_sep: str) -> None: ...
@@ -136,6 +136,11 @@ def register_validator(flag_name: str,
 RegisterValidator = register_validator
 def mark_flag_as_required(flag_name: str, flag_values: FlagValues = ...) -> None: ...
 MarkFlagAsRequired = mark_flag_as_required
+def mark_flags_as_required(flag_names: Iterable[str], flag_values: FlagValues = ...) -> None: ...
+MarkFlagsAsRequired = mark_flags_as_required
+def mark_flags_as_mutual_exclusive(flag_names: Iterable[str], required: bool = ...,
+                                   flag_values: FlagValues = ...) -> None: ...
+MarkFlagsAsMutualExclusive = mark_flags_as_mutual_exclusive
 
 def DEFINE(parser: ArgumentParser, name: str, default: Any, help: str,
            flag_values: FlagValues = ..., serializer: ArgumentSerializer = ..., **args: Any) -> None: ...
@@ -203,7 +208,7 @@ class EnumFlag(Flag):
     def __init__(self, name: str, default: Optional[str], help: str, enum_values: List[str],
                  short_name: str, **args: Any) -> None: ...
 
-def DEFINE_enum(name: str, default: Optional[str], enum_values: List[str], help: str,
+def DEFINE_enum(name: str, default: Optional[str], enum_values: Iterable[str], help: str,
                 flag_values: FlagValues = ..., **args: Any) -> None: ...
 
 class BaseListParser(ArgumentParser):