diff --git a/third_party/2.7/six/moves.pyi b/third_party/2.7/six/moves.pyi
index 7bffb166f..790253e09 100644
--- a/third_party/2.7/six/moves.pyi
+++ b/third_party/2.7/six/moves.pyi
@@ -18,3 +18,7 @@ def zip(iter1: Iterable[_T1], iter2: Iterable[_T2],
 def zip(iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3],
         iter4: Iterable[_T4]) -> Iterator[Tuple[_T1, _T2,
                                                _T3, _T4]]: ... # TODO more than four iterables
+
+# For re-export.
+import cStringIO as cStringIO
+import cPickle as cPickle
diff --git a/third_party/3/six/moves.pyi b/third_party/3/six/moves.pyi
new file mode 100644
index 000000000..790253e09
--- /dev/null
+++ b/third_party/3/six/moves.pyi
@@ -0,0 +1,24 @@
+# Provisional stubs for six.moves (Python 2.7)
+
+from typing import overload, TypeVar, Tuple, Iterable, Iterator
+
+_T1 = TypeVar('_T1')
+_T2 = TypeVar('_T2')
+_T3 = TypeVar('_T3')
+_T4 = TypeVar('_T4')
+
+@overload
+def zip(iter1: Iterable[_T1]) -> Iterator[Tuple[_T1]]: ...
+@overload
+def zip(iter1: Iterable[_T1], iter2: Iterable[_T2]) -> Iterator[Tuple[_T1, _T2]]: ...
+@overload
+def zip(iter1: Iterable[_T1], iter2: Iterable[_T2],
+        iter3: Iterable[_T3]) -> Iterator[Tuple[_T1, _T2, _T3]]: ...
+@overload
+def zip(iter1: Iterable[_T1], iter2: Iterable[_T2], iter3: Iterable[_T3],
+        iter4: Iterable[_T4]) -> Iterator[Tuple[_T1, _T2,
+                                               _T3, _T4]]: ... # TODO more than four iterables
+
+# For re-export.
+import cStringIO as cStringIO
+import cPickle as cPickle