diff --git a/stdlib/2/os/__init__.pyi b/stdlib/2/os/__init__.pyi
index 2c0dcc768..71139cf5c 100644
--- a/stdlib/2/os/__init__.pyi
+++ b/stdlib/2/os/__init__.pyi
@@ -2,7 +2,7 @@
 
 from typing import (
     List, Tuple, Union, Sequence, Mapping, IO, Any, Optional, AnyStr, Iterator,
-    MutableMapping, NamedTuple, overload
+    Dict, MutableMapping, NamedTuple, overload
 )
 from . import path
 
diff --git a/stdlib/2/unittest.pyi b/stdlib/2/unittest.pyi
index 38b748564..a2a6af215 100644
--- a/stdlib/2/unittest.pyi
+++ b/stdlib/2/unittest.pyi
@@ -5,7 +5,7 @@
 # Only a subset of functionality is included.
 
 from typing import (
-    Any, Callable, Iterable, Tuple, List, TextIO, Sequence,
+    Any, Callable, Dict, Iterable, Tuple, List, TextIO, Sequence,
     overload, TypeVar, Pattern
 )
 from abc import abstractmethod, ABCMeta
diff --git a/stdlib/2and3/logging/handlers.pyi b/stdlib/2and3/logging/handlers.pyi
index 779883a82..50ffa0e59 100644
--- a/stdlib/2and3/logging/handlers.pyi
+++ b/stdlib/2and3/logging/handlers.pyi
@@ -5,7 +5,7 @@ from logging import Handler, FileHandler, LogRecord
 from socket import SocketType
 import ssl
 import sys
-from typing import Any, Callable, List, Optional, Tuple, Union, overload
+from typing import Any, Callable, Dict, List, Optional, Tuple, Union, overload
 if sys.version_info >= (3,):
     from queue import Queue
 else:
diff --git a/stdlib/3/cgi.pyi b/stdlib/3/cgi.pyi
index 1e8f31f62..16f5598e5 100644
--- a/stdlib/3/cgi.pyi
+++ b/stdlib/3/cgi.pyi
@@ -1,4 +1,4 @@
-from typing import Tuple
+from typing import Dict, Tuple
 
 def escape(s: str, quote: bool = ...) -> str: ...
 def parse_header(s: str) -> Tuple[str, Dict[str, str]]: ...
diff --git a/stdlib/3/email/headerregistry.pyi b/stdlib/3/email/headerregistry.pyi
index 40b57d49d..a39f0e21a 100644
--- a/stdlib/3/email/headerregistry.pyi
+++ b/stdlib/3/email/headerregistry.pyi
@@ -2,7 +2,7 @@
 
 import datetime as dt
 import sys
-from typing import Tuple, Optional, Any, Union, Mapping
+from typing import Dict, Tuple, Optional, Any, Union, Mapping
 from email.errors import MessageDefect
 if sys.version_info >= (3, 3):
     from email.policy import Policy
diff --git a/stdlib/3/gc.pyi b/stdlib/3/gc.pyi
index e9bb4ebdf..ec94f29c5 100644
--- a/stdlib/3/gc.pyi
+++ b/stdlib/3/gc.pyi
@@ -1,6 +1,6 @@
 # Stubs for gc
 
-from typing import Any, List, Tuple
+from typing import Any, Dict, List, Tuple
 
 
 DEBUG_COLLECTABLE = ...  # type: int
diff --git a/stdlib/3/http/cookies.pyi b/stdlib/3/http/cookies.pyi
index d3428704e..b693aa7f7 100644
--- a/stdlib/3/http/cookies.pyi
+++ b/stdlib/3/http/cookies.pyi
@@ -1,6 +1,6 @@
 # Stubs for http.cookies (Python 3.5)
 
-from typing import Generic, List, Mapping, MutableMapping, Optional, TypeVar, Union
+from typing import Generic, Dict, List, Mapping, MutableMapping, Optional, TypeVar, Union
 
 _DataType = Union[str, Mapping[str, Union[str, 'Morsel']]]
 _T = TypeVar('_T')
diff --git a/stdlib/3/unittest/__init__.pyi b/stdlib/3/unittest/__init__.pyi
index 3ab143b50..14b2f3e24 100644
--- a/stdlib/3/unittest/__init__.pyi
+++ b/stdlib/3/unittest/__init__.pyi
@@ -1,7 +1,7 @@
 # Stubs for unittest
 
 from typing import (
-    Any, Callable, Iterable, Iterator, List, Optional, Pattern, Sequence,
+    Any, Callable, Dict, Iterable, Iterator, List, Optional, Pattern, Sequence,
     TextIO, Tuple, Type, TypeVar, Union,
     overload,
 )
diff --git a/stdlib/3/urllib/request.pyi b/stdlib/3/urllib/request.pyi
index 24b88da89..b8d21903b 100644
--- a/stdlib/3/urllib/request.pyi
+++ b/stdlib/3/urllib/request.pyi
@@ -1,8 +1,8 @@
 # Stubs for urllib.request (Python 3.4)
 
 from typing import (
-    Any, Callable, List, IO, Mapping, Optional, Sequence, Tuple, TypeVar, Union,
-    overload,
+    Any, Callable, Dict, List, IO, Mapping, Optional, Sequence, Tuple, TypeVar,
+    Union, overload,
 )
 from http.client import HTTPResponse, HTTPMessage
 from http.cookiejar import CookieJar
diff --git a/third_party/2/pymssql.pyi b/third_party/2/pymssql.pyi
index 3f697ab93..3f75b313d 100644
--- a/third_party/2/pymssql.pyi
+++ b/third_party/2/pymssql.pyi
@@ -1,6 +1,6 @@
 from datetime import datetime, date, time
 
-from typing import Any, Tuple, Iterable, List, Optional, Union, Sequence
+from typing import Any, Dict, Tuple, Iterable, List, Optional, Union, Sequence
 
 Scalar = Union[int, float, str, datetime, date, time]
 Result = Union[Tuple[Scalar, ...], Dict[str, Scalar]]
diff --git a/third_party/2/six/__init__.pyi b/third_party/2/six/__init__.pyi
index 7ed44fc62..efecada14 100644
--- a/third_party/2/six/__init__.pyi
+++ b/third_party/2/six/__init__.pyi
@@ -4,7 +4,7 @@ from __future__ import print_function
 
 import types
 from typing import (
-    Any, AnyStr, Callable, Iterable, Mapping, Optional,
+    Any, AnyStr, Callable, Dict, Iterable, Mapping, Optional,
     Pattern, Tuple, TypeVar, Union, overload, ValuesView, KeysView, ItemsView
 )
 import typing
diff --git a/third_party/2and3/markupsafe/__init__.pyi b/third_party/2and3/markupsafe/__init__.pyi
index 2c31440c6..723d329b3 100644
--- a/third_party/2and3/markupsafe/__init__.pyi
+++ b/third_party/2and3/markupsafe/__init__.pyi
@@ -4,7 +4,7 @@
 
 import sys
 
-from typing import Any, Callable, Iterable, List, Optional, Text, Tuple, Union
+from typing import Any, Callable, Dict, Iterable, List, Optional, Text, Tuple, Union
 from collections import Mapping
 from markupsafe._compat import text_type
 import string
diff --git a/third_party/3.6/click/decorators.pyi b/third_party/3.6/click/decorators.pyi
index 764878c68..a3dcdddeb 100644
--- a/third_party/3.6/click/decorators.pyi
+++ b/third_party/3.6/click/decorators.pyi
@@ -1,4 +1,4 @@
-from typing import Any, Callable, List, TypeVar, Union
+from typing import Any, Callable, Dict, List, TypeVar, Union
 
 from click.core import Command, Group, Argument, Option, Parameter, Context
 from click.types import ParamType