diff --git a/src/bcf/bcf/inmemory_zipfile.py b/src/bcf/bcf/inmemory_zipfile.py
index 2a4d4117ce..bce11fc9d9 100644
--- a/src/bcf/bcf/inmemory_zipfile.py
+++ b/src/bcf/bcf/inmemory_zipfile.py
@@ -6,6 +6,7 @@ Copyright (c) 2017-2020 Anthon van der Neut, Ruamel bvba
 original idea from https://stackoverflow.com/a/19722365/1307905
 """
 
+from __future__ import annotations
 import zipfile
 from io import BytesIO
 from os import PathLike
diff --git a/src/bcf/bcf/v2/bcfxml.py b/src/bcf/bcf/v2/bcfxml.py
index b15199f4dc..c36a9f63e3 100644
--- a/src/bcf/bcf/v2/bcfxml.py
+++ b/src/bcf/bcf/v2/bcfxml.py
@@ -1,5 +1,6 @@
 """BCF XML V2 handler."""
 
+from __future__ import annotations
 import uuid
 import warnings
 import zipfile
diff --git a/src/bcf/bcf/v2/topic.py b/src/bcf/bcf/v2/topic.py
index 0a26cbcc93..bb55e36657 100644
--- a/src/bcf/bcf/v2/topic.py
+++ b/src/bcf/bcf/v2/topic.py
@@ -1,5 +1,6 @@
 """BCF XML V2 Topic handler."""
 
+from __future__ import annotations
 import datetime
 import tempfile
 import uuid
diff --git a/src/bcf/bcf/v3/bcfxml.py b/src/bcf/bcf/v3/bcfxml.py
index 16d920737a..3219bf58b2 100644
--- a/src/bcf/bcf/v3/bcfxml.py
+++ b/src/bcf/bcf/v3/bcfxml.py
@@ -1,5 +1,6 @@
 """BCF XML V3 handlers."""
 
+from __future__ import annotations
 import uuid
 import warnings
 import zipfile
diff --git a/src/bcf/bcf/v3/topic.py b/src/bcf/bcf/v3/topic.py
index b0cfa4268d..613bd24073 100644
--- a/src/bcf/bcf/v3/topic.py
+++ b/src/bcf/bcf/v3/topic.py
@@ -1,5 +1,6 @@
 """BCF XML V3 Topic handler."""
 
+from __future__ import annotations
 import datetime
 import uuid
 import zipfile
diff --git a/src/ifc2ca/ifc2ca.py b/src/ifc2ca/ifc2ca.py
index b380804dbb..5ee3d29154 100644
--- a/src/ifc2ca/ifc2ca.py
+++ b/src/ifc2ca/ifc2ca.py
@@ -16,6 +16,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with Ifc2CA.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import annotations
 import json
 import os
 import subprocess
diff --git a/src/opencdeserver/api/app/models/foundation_other.py b/src/opencdeserver/api/app/models/foundation_other.py
index 3762d20272..486a9b82f2 100644
--- a/src/opencdeserver/api/app/models/foundation_other.py
+++ b/src/opencdeserver/api/app/models/foundation_other.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
 from pydantic import BaseModel
 
 
diff --git a/src/opencdeserver/api/app/models/other.py b/src/opencdeserver/api/app/models/other.py
index abd6c5af79..0300534fdc 100644
--- a/src/opencdeserver/api/app/models/other.py
+++ b/src/opencdeserver/api/app/models/other.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
 from pydantic import BaseModel
 from typing import List
 
diff --git a/src/opencdeserver/api/app/models/request.py b/src/opencdeserver/api/app/models/request.py
index e0d34221a5..40271cf37a 100644
--- a/src/opencdeserver/api/app/models/request.py
+++ b/src/opencdeserver/api/app/models/request.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
 from pydantic import BaseModel
 
 
diff --git a/src/opencdeserver/api/app/security/secure.py b/src/opencdeserver/api/app/security/secure.py
index cc0027d152..77c225ee24 100644
--- a/src/opencdeserver/api/app/security/secure.py
+++ b/src/opencdeserver/api/app/security/secure.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
 from fastapi import Depends, HTTPException, status, Security
 from fastapi.security import OAuth2AuthorizationCodeBearer, SecurityScopes