diff --git a/sphinx/__main__.py b/sphinx/__main__.py
index 47a183d08..02bc806e7 100644
--- a/sphinx/__main__.py
+++ b/sphinx/__main__.py
@@ -13,4 +13,4 @@ import sys
 
 from sphinx.cmd.build import main
 
-sys.exit(main(sys.argv[1:]))
+sys.exit(main(sys.argv[1:]))  # type: ignore
diff --git a/sphinx/cmd/build.py b/sphinx/cmd/build.py
index afe49001e..d4ff4f8cf 100644
--- a/sphinx/cmd/build.py
+++ b/sphinx/cmd/build.py
@@ -198,7 +198,7 @@ def make_main(argv=sys.argv[1:]):  # type: ignore
     # type: (List[unicode]) -> int
     """Sphinx build "make mode" entry."""
     from sphinx import make_mode
-    return make_mode.run_make_mode(argv[1:])  # type: ignore
+    return make_mode.run_make_mode(argv[1:])
 
 
 def build_main(argv=sys.argv[1:]):  # type: ignore
@@ -311,4 +311,4 @@ def main(argv=sys.argv[1:]):  # type: ignore
 
 
 if __name__ == '__main__':
-    sys.exit(main(sys.argv[1:]))
+    sys.exit(main(sys.argv[1:]))  # type: ignore
diff --git a/sphinx/cmdline.py b/sphinx/cmdline.py
index fc578422f..00d269912 100644
--- a/sphinx/cmdline.py
+++ b/sphinx/cmdline.py
@@ -18,7 +18,9 @@ from sphinx.deprecation import RemovedInSphinx30Warning
 
 if False:
     # For type annotation
+    import argparse  # NOQA
     from typing import Any, IO, List, Union  # NOQA
+    from sphinx.application import Sphinx  # NOQA
 
 
 def handle_exception(app, args, exception, stderr=sys.stderr):
@@ -47,4 +49,3 @@ def main(argv=sys.argv[1:]):  # type: ignore
     warnings.warn('sphinx.cmdline module is deprecated. Use sphinx.cmd.build instead.',
                   RemovedInSphinx30Warning)
     return build.main(argv)
-