diff --git a/course/content.py b/course/content.py
index d6456960b02904727b78f0ff71fe427953f4b76e..8bd657cce8a43eba78fe30f9f1b582c9fd0fe77e 100644
--- a/course/content.py
+++ b/course/content.py
@@ -59,7 +59,7 @@ else:
 # {{{ mypy
 
 from typing import (  # noqa
-        cast, Union, Any, List, Tuple, Optional, Callable, Text)
+        cast, Union, Any, List, Tuple, Optional, Callable, Text, Dict)
 
 if False:
     # for mypy
diff --git a/course/enrollment.py b/course/enrollment.py
index 0bc31df9b99e273cd61a2270d96de96989c0d890..b5bb5a1af5c67c5baf688e01f2fe5944abc8069c 100644
--- a/course/enrollment.py
+++ b/course/enrollment.py
@@ -71,7 +71,7 @@ from pytools.lex import RE as REBase  # noqa
 
 # {{{ for mypy
 
-from typing import Any, Tuple, Text, Optional  # noqa
+from typing import Any, Tuple, Text, Optional, List  # noqa
 from course.utils import CoursePageContext  # noqa
 
 # }}}
diff --git a/course/flow.py b/course/flow.py
index b98d1f59f7fbb062040b0069ac46e639caaf932e..04c94c380f583a64d580892c3d86337e80c51a99 100644
--- a/course/flow.py
+++ b/course/flow.py
@@ -84,7 +84,7 @@ from relate.utils import retry_transaction_decorator
 
 # {{{ mypy
 
-from typing import Any, Optional, Iterable, Tuple, Text  # noqa
+from typing import Any, Optional, Iterable, Tuple, Text, List  # noqa
 import datetime  # noqa
 from course.models import (  # noqa
         Course,
diff --git a/course/grades.py b/course/grades.py
index 2c438a6f668c926d60f6a0651ea19bbc69e35585..7c3024fa1f617c72f71a7ff7031f936efec57d46 100644
--- a/course/grades.py
+++ b/course/grades.py
@@ -59,7 +59,7 @@ from course.constants import (
 
 # {{{ for mypy
 
-from typing import cast, Tuple, Text, Optional, Any, Iterable  # noqa
+from typing import cast, Tuple, Text, Optional, Any, Iterable, List  # noqa
 from course.utils import CoursePageContext  # noqa
 from course.content import FlowDesc  # noqa
 from course.models import Course, FlowPageVisitGrade  # noqa
diff --git a/course/grading.py b/course/grading.py
index fe47e1276af5e78d73231e124b76d0042eb15a2d..ca0c2ab958c9068c9b227562cd31aa3486809ee8 100644
--- a/course/grading.py
+++ b/course/grading.py
@@ -55,7 +55,7 @@ from course.constants import (
 
 # {{{ for mypy
 
-from typing import Text, Any, Optional  # noqa
+from typing import Text, Any, Optional, Dict  # noqa
 from course.models import (  # noqa
         GradingOpportunity)
 from course.utils import (  # noqa
diff --git a/course/im.py b/course/im.py
index 612b14cdfd52e9b7cd257c29cbc9dc2a1b2718cb..1deac9c95f3d47dba6309e4f0c8b4bd8a7739c34 100644
--- a/course/im.py
+++ b/course/im.py
@@ -46,6 +46,8 @@ import sleekxmpp
 
 import threading
 
+from typing import List, Dict  # noqa
+
 
 # {{{ instant message
 
diff --git a/course/models.py b/course/models.py
index b0256e2ac25e81df5a45a8bc1aa87f5bbbd0858d..2fc56275b195d0d5f32f008b365ae7c75f069fe8 100644
--- a/course/models.py
+++ b/course/models.py
@@ -59,6 +59,7 @@ from course.page.base import AnswerFeedback
 
 # {{{ mypy
 
+from typing import List, Dict  # noqa
 if False:
     from course.content import FlowDesc  # noqa
 
diff --git a/course/page/base.py b/course/page/base.py
index 1a2439f6c1a3775d44a7c6dab633e1caf4a2bcc8..7b861a55a641433bcfeade0e06c6846ceee120f7 100644
--- a/course/page/base.py
+++ b/course/page/base.py
@@ -44,7 +44,7 @@ from django.conf import settings
 
 # {{{ mypy
 
-from typing import Text, Optional, Any, Tuple  # noqa
+from typing import Text, Optional, Any, Tuple, Dict  # noqa
 from django import http  # noqa
 
 if False:
diff --git a/course/utils.py b/course/utils.py
index 5773dde80a79a0ff29a4dd111a10a38598336bd6..54de5de29290368c2e9b764c78171a8d77322199 100644
--- a/course/utils.py
+++ b/course/utils.py
@@ -55,7 +55,7 @@ from course.page.base import (  # noqa
 # {{{ mypy
 
 if False:
-    from typing import Tuple, List, Text, Iterable, Any, Optional, Union  # noqa
+    from typing import Tuple, List, Text, Iterable, Any, Optional, Union, Dict  # noqa
     from relate.utils import Repo_ish  # noqa
     from course.models import (  # noqa
             Course,
diff --git a/course/validation.py b/course/validation.py
index ed1d4bdd0282fe91e72b09cf3d9e17d929eeeb53..287570e15b0873dedf6b48e9b0da9743ff856e90 100644
--- a/course/validation.py
+++ b/course/validation.py
@@ -43,7 +43,7 @@ from relate.utils import Struct
 
 # {{{ mypy
 
-from typing import Any, Tuple, Optional, Text  # noqa
+from typing import Any, Tuple, Optional, Text, List  # noqa
 if False:
     from relate.utils import Repo_ish  # noqa
     from course.models import Course  # noqa
diff --git a/course/versioning.py b/course/versioning.py
index 943e04ff15b6db9fef5bc8d7b9aefd1201f1ad2f..3e718cc54be32f5cb0bb24c41fe8a20116b11a66 100644
--- a/course/versioning.py
+++ b/course/versioning.py
@@ -67,7 +67,7 @@ from course.constants import (
 # {{{ for mypy
 
 from django import http  # noqa
-from typing import Tuple, List, Text, Any  # noqa
+from typing import Tuple, List, Text, Any, Dict  # noqa
 from dulwich.client import GitClient  # noqa
 
 # }}}
diff --git a/course/views.py b/course/views.py
index f1edc651781b821be55688a52e79f5c48e6c49e1..716d7b849e9a14daf5278d427ebf3e603c833711 100644
--- a/course/views.py
+++ b/course/views.py
@@ -82,7 +82,7 @@ from course.utils import (  # noqa
 
 # {{{ for mypy
 
-from typing import Tuple, List, Text, Optional, Any, Iterable  # noqa
+from typing import Tuple, List, Text, Optional, Any, Iterable, Dict  # noqa
 
 from course.content import (  # noqa
     FlowDesc,
diff --git a/relate/settings.py b/relate/settings.py
index 18a658ea6d144bc36c1a391f771bd7eeedce4926..fe2edd5f34d65e3fb8078c2b89d385d0b45c3492 100644
--- a/relate/settings.py
+++ b/relate/settings.py
@@ -6,7 +6,7 @@ Django settings for RELATE.
 
 if False:
     # for mypy
-    from typing import Callable, Any, Union  # noqa
+    from typing import Callable, Any, Union, Dict  # noqa
 
 # Do not change this file. All these settings can be overridden in
 # local_settings.py.