diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0fbaa88d8..df10af304 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,7 +167,6 @@ target_sources(${QUOTIENT_LIB_NAME} PUBLIC FILE_SET HEADERS BASE_DIRS .
         Quotient/jobs/mediathumbnailjob.h
         Quotient/jobs/downloadfilejob.h
         Quotient/keyverificationsession.h
-        Quotient/e2ee/e2ee_common.h
         Quotient/events/keyverificationevent.h
         Quotient/keyimport.h
         Quotient/qt_connection_util.h
@@ -215,7 +214,6 @@ target_sources(${QUOTIENT_LIB_NAME} PUBLIC FILE_SET HEADERS BASE_DIRS .
         Quotient/jobs/mediathumbnailjob.cpp
         Quotient/jobs/downloadfilejob.cpp
         Quotient/keyverificationsession.cpp
-        Quotient/e2ee/e2ee_common.cpp
         Quotient/keyimport.cpp
         libquotientemojis.qrc
 )
diff --git a/Quotient/csapi/keys.h b/Quotient/csapi/keys.h
index 785bcf695..a41c8afd5 100644
--- a/Quotient/csapi/keys.h
+++ b/Quotient/csapi/keys.h
@@ -5,8 +5,6 @@
 #include <Quotient/csapi/definitions/cross_signing_key.h>
 #include <Quotient/csapi/definitions/device_keys.h>
 
-#include <Quotient/e2ee/e2ee_common.h>
-
 #include <Quotient/jobs/basejob.h>
 
 namespace Quotient {
diff --git a/Quotient/events/encryptedevent.cpp b/Quotient/events/encryptedevent.cpp
index ad6bbd606..9856a6a63 100644
--- a/Quotient/events/encryptedevent.cpp
+++ b/Quotient/events/encryptedevent.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "encryptedevent.h"
-#include <Quotient/e2ee/e2ee_common.h>
 
 using namespace Quotient;
 
diff --git a/Quotient/events/encryptionevent.cpp b/Quotient/events/encryptionevent.cpp
index 3e8cfd80b..7d0e86e19 100644
--- a/Quotient/events/encryptionevent.cpp
+++ b/Quotient/events/encryptionevent.cpp
@@ -6,8 +6,6 @@
 
 #include "../logging_categories_p.h"
 
-#include "../e2ee/e2ee_common.h"
-
 using namespace Quotient;
 
 static constexpr std::array encryptionStrings { MegolmV1AesSha2AlgoKey };
diff --git a/Quotient/events/filesourceinfo.cpp b/Quotient/events/filesourceinfo.cpp
index 351331231..35f178679 100644
--- a/Quotient/events/filesourceinfo.cpp
+++ b/Quotient/events/filesourceinfo.cpp
@@ -4,7 +4,6 @@
 
 #include "filesourceinfo.h"
 
-#include "../e2ee/e2ee_common.h"
 #include "../logging_categories_p.h"
 #include "../util.h"
 
diff --git a/Quotient/room.cpp b/Quotient/room.cpp
index 39756a5b4..3c8c96dbb 100644
--- a/Quotient/room.cpp
+++ b/Quotient/room.cpp
@@ -37,8 +37,6 @@
 #include "csapi/rooms.h"
 #include "csapi/tags.h"
 
-#include "e2ee/e2ee_common.h"
-
 #include "events/callevents.h"
 #include "events/encryptionevent.h"
 #include "events/event.h"
diff --git a/gtad/gtad.yaml b/gtad/gtad.yaml
index 9ab0a7215..0b6cbdc4c 100644
--- a/gtad/gtad.yaml
+++ b/gtad/gtad.yaml
@@ -111,7 +111,6 @@ analyzer:
 #      - getFilter<: *Filter
       - OneTimeKeys:
           type: OneTimeKeys
-          imports: '<Quotient/e2ee/e2ee_common.h>'
       - /(Room|Event|RoomEvent)Filter$/: # These do not need std::optional<>
       - //: *UseOptional
     - array: