diff --git a/stdlib/2/__builtin__.pyi b/stdlib/2/__builtin__.pyi
index fc680ca78..541122b27 100644
--- a/stdlib/2/__builtin__.pyi
+++ b/stdlib/2/__builtin__.pyi
@@ -675,11 +675,6 @@ class xrange(Sized, Iterable[int], Reversible[int]):
     def __getitem__(self, i: int) -> int: ...
     def __reversed__(self) -> Iterator[int]: ...
 
-class module:
-    __name__ = ...  # type: str
-    __file__ = ...  # type: str
-    __dict__ = ...  # type: Dict[unicode, Any]
-
 class property(object):
     def __init__(self, fget: Callable[[Any], Any] = None,
                  fset: Callable[[Any, Any], None] = None,
diff --git a/stdlib/2/abc.pyi b/stdlib/2/abc.pyi
index a2d270f76..e21065e5c 100644
--- a/stdlib/2/abc.pyi
+++ b/stdlib/2/abc.pyi
@@ -1,11 +1,7 @@
 from typing import Any, Dict, Set, Tuple, Type
 import _weakrefset
 
-# mypy has special processing for ABCMeta and abstractmethod.
-
-WeakSet = ...  # type: _weakrefset.WeakSet
-_InstanceType = ...  # type: type
-types = ...  # type: module
+# NOTE: mypy has special processing for ABCMeta and abstractmethod.
 
 def abstractmethod(funcobj: Any) -> Any: ...
 
@@ -23,9 +19,6 @@ class ABCMeta(type):
     def _dump_registry(cls: "ABCMeta", *args: Any, **kwargs: Any) -> None: ...
     def register(cls: "ABCMeta", subclass: Type[Any]) -> None: ...
 
-class _C:
-    pass
-
 # TODO: The real abc.abstractproperty inherits from "property".
 class abstractproperty(object):
     def __new__(cls, func: Any) -> Any: ...
diff --git a/stdlib/2/tokenize.pyi b/stdlib/2/tokenize.pyi
index 159adf96d..834e2197d 100644
--- a/stdlib/2/tokenize.pyi
+++ b/stdlib/2/tokenize.pyi
@@ -102,15 +102,11 @@ chain = ...  # type: type
 double3prog = ...  # type: type
 endprogs = ...  # type: Dict[str, Any]
 pseudoprog = ...  # type: type
-re = ...  # type: module
 single3prog = ...  # type: type
 single_quoted = ...  # type: Dict[str, str]
-string = ...  # type: module
-sys = ...  # type: module
 t = ...  # type: str
 tabsize = ...  # type: int
 tok_name = ...  # type: Dict[int, str]
-token = ...  # type: module
 tokenprog = ...  # type: type
 triple_quoted = ...  # type: Dict[str, str]
 x = ...  # type: str
diff --git a/stdlib/2/types.pyi b/stdlib/2/types.pyi
index 12f38829c..2896d1a37 100644
--- a/stdlib/2/types.pyi
+++ b/stdlib/2/types.pyi
@@ -104,6 +104,7 @@ class ModuleType:
     __name__ = ...  # type: str
     __package__ = ...  # type: Optional[str]
     __path__ = ...  # type: Optional[Iterable[str]]
+    __dict__ = ...  # type: Dict[str, Any]
     def __init__(self, name: str, doc: Optional[str] = ...) -> None: ...
 FileType = file
 XRangeType = xrange
diff --git a/stdlib/2/unittest.pyi b/stdlib/2/unittest.pyi
index 9f3f7d600..52decfedd 100644
--- a/stdlib/2/unittest.pyi
+++ b/stdlib/2/unittest.pyi
@@ -9,6 +9,7 @@ from typing import (
     overload, Set, FrozenSet, TypeVar, Union, Pattern, Type
 )
 from abc import abstractmethod, ABCMeta
+import types
 
 _T = TypeVar('_T')
 _FT = TypeVar('_FT')
@@ -173,4 +174,4 @@ def main(module: str = ..., defaultTest: str = ...,
          testLoader: Any = ...) -> None: ...  # TODO types
 
 # private but occasionally used
-util = ...  # type: module
+util = ...  # type: types.ModuleType
diff --git a/stdlib/3/_importlib_modulespec.pyi b/stdlib/3/_importlib_modulespec.pyi
index 6b80ab68c..bfd27ad2b 100644
--- a/stdlib/3/_importlib_modulespec.pyi
+++ b/stdlib/3/_importlib_modulespec.pyi
@@ -7,7 +7,7 @@
 
 from abc import ABCMeta
 import sys
-from typing import Any, Optional
+from typing import Dict, Any, Optional
 
 if sys.version_info >= (3, 4):
     class ModuleSpec:
@@ -26,6 +26,7 @@ if sys.version_info >= (3, 4):
 class ModuleType:
     __name__ = ...  # type: str
     __file__ = ...  # type: str
+    __dict__ = ...  # type: Dict[str, Any]
     if sys.version_info >= (3, 4):
         __loader__ = ...  # type: Optional[Loader]
         __package__ = ...  # type: Optional[str]
diff --git a/stdlib/3/builtins.pyi b/stdlib/3/builtins.pyi
index 490c7f31a..5264f22c4 100644
--- a/stdlib/3/builtins.pyi
+++ b/stdlib/3/builtins.pyi
@@ -731,12 +731,6 @@ class range(Sequence[int]):
     def __repr__(self) -> str: ...
     def __reversed__(self) -> Iterator[int]: ...
 
-class module:
-    # TODO not defined in builtins!
-    __name__ = ...  # type: str
-    __file__ = ...  # type: str
-    __dict__ = ...  # type: Dict[str, Any]
-
 class property:
     def __init__(self, fget: Callable[[Any], Any] = None,
                  fset: Callable[[Any, Any], None] = None,