3 files changed, 10 insertions, 2 deletions
diff --git a/sphinx/websupport/__init__.py b/sphinx/websupport/__init__.py
index f7b215f83..294a44f4b 100644
--- a/sphinx/websupport/__init__.py
+++ b/sphinx/websupport/__init__.py
@@ -26,6 +26,10 @@ from sphinx.websupport import errors
 from sphinx.websupport.search import BaseSearch, SEARCH_ADAPTERS
 from sphinx.websupport.storage import StorageBackend
 
+if False:
+    # For type annotation
+    from typing import Dict  # NOQA
+
 
 class WebSupport(object):
     """The main API class for the web support package. All interactions
diff --git a/sphinx/websupport/storage/sqlalchemy_db.py b/sphinx/websupport/storage/sqlalchemy_db.py
index 16418ec8f..4b28268b9 100644
--- a/sphinx/websupport/storage/sqlalchemy_db.py
+++ b/sphinx/websupport/storage/sqlalchemy_db.py
@@ -14,9 +14,13 @@ from datetime import datetime
 
 from sqlalchemy import Column, Integer, Text, String, Boolean, \
     ForeignKey, DateTime
-from sqlalchemy.orm import relation, sessionmaker, aliased  # type: ignore
+from sqlalchemy.orm import relation, sessionmaker, aliased
 from sqlalchemy.ext.declarative import declarative_base
 
+if False:
+    # For type annotation
+    from typing import List  # NOQA
+
 Base = declarative_base()
 Session = sessionmaker()
 
diff --git a/sphinx/websupport/storage/sqlalchemystorage.py b/sphinx/websupport/storage/sqlalchemystorage.py
index 8b7d76714..7220fefd6 100644
--- a/sphinx/websupport/storage/sqlalchemystorage.py
+++ b/sphinx/websupport/storage/sqlalchemystorage.py
@@ -12,7 +12,7 @@
 from datetime import datetime
 
 import sqlalchemy
-from sqlalchemy.orm import aliased  # type: ignore
+from sqlalchemy.orm import aliased
 from sqlalchemy.sql import func
 
 from sphinx.websupport.errors import CommentNotAllowedError, \