diff --git a/autotests/callcandidateseventtest.cpp b/autotests/callcandidateseventtest.cpp
index 679fbed4d..4b170ba48 100644
--- a/autotests/callcandidateseventtest.cpp
+++ b/autotests/callcandidateseventtest.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "events/callevents.h"
+#include <Quotient/events/callevents.h>
 
 #include <QtTest/QtTest>
 
diff --git a/autotests/testfilecrypto.cpp b/autotests/testfilecrypto.cpp
index 29521060c..3fd497542 100644
--- a/autotests/testfilecrypto.cpp
+++ b/autotests/testfilecrypto.cpp
@@ -4,7 +4,7 @@
 
 #include "testfilecrypto.h"
 
-#include "events/filesourceinfo.h"
+#include <Quotient/events/filesourceinfo.h>
 
 #include <qtest.h>
 
diff --git a/autotests/testgroupsession.cpp b/autotests/testgroupsession.cpp
index f25360837..70e968118 100644
--- a/autotests/testgroupsession.cpp
+++ b/autotests/testgroupsession.cpp
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "testgroupsession.h"
-#include "e2ee/qolminboundsession.h"
-#include "e2ee/qolmoutboundsession.h"
+#include <Quotient/e2ee/qolminboundsession.h>
+#include <Quotient/e2ee/qolmoutboundsession.h>
 
 using namespace Quotient;
 
diff --git a/autotests/testkeyverification.cpp b/autotests/testkeyverification.cpp
index c32951fad..39f9f12f4 100644
--- a/autotests/testkeyverification.cpp
+++ b/autotests/testkeyverification.cpp
@@ -6,7 +6,7 @@
 #include <QTest>
 #include "testutils.h"
 #include <QtCore/QDateTime>
-#include <e2ee/qolmaccount.h>
+#include <Quotient/e2ee/qolmaccount.h>
 #include "olm/sas.h"
 
 class TestKeyVerificationSession : public QObject
diff --git a/autotests/testolmaccount.cpp b/autotests/testolmaccount.cpp
index 1d4ac1507..390235d18 100644
--- a/autotests/testolmaccount.cpp
+++ b/autotests/testolmaccount.cpp
@@ -5,14 +5,14 @@
 
 #include "testolmaccount.h"
 
-#include <connection.h>
-#include <csapi/joining.h>
-#include <e2ee/qolmaccount.h>
-#include <e2ee/qolmutility.h>
-#include <events/encryptionevent.h>
-#include <events/filesourceinfo.h>
-#include <networkaccessmanager.h>
-#include <room.h>
+#include <Quotient/connection.h>
+#include <Quotient/csapi/joining.h>
+#include <Quotient/e2ee/qolmaccount.h>
+#include <Quotient/e2ee/qolmutility.h>
+#include <Quotient/events/encryptionevent.h>
+#include <Quotient/events/filesourceinfo.h>
+#include <Quotient/networkaccessmanager.h>
+#include <Quotient/room.h>
 
 #include "testutils.h"
 
diff --git a/autotests/testolmsession.cpp b/autotests/testolmsession.cpp
index 4078ee678..932549b91 100644
--- a/autotests/testolmsession.cpp
+++ b/autotests/testolmsession.cpp
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "e2ee/qolmsession.h"
-#include "e2ee/qolmaccount.h"
+#include <Quotient/e2ee/qolmsession.h>
+#include <Quotient/e2ee/qolmaccount.h>
 #include "testolmsession.h"
 
 using namespace Quotient;
diff --git a/autotests/testolmutility.cpp b/autotests/testolmutility.cpp
index abf7fc6ed..9e8524bbd 100644
--- a/autotests/testolmutility.cpp
+++ b/autotests/testolmutility.cpp
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "testolmutility.h"
-#include "e2ee/qolmaccount.h"
-#include "e2ee/qolmutility.h"
+#include <Quotient/e2ee/qolmaccount.h>
+#include <Quotient/e2ee/qolmutility.h>
 
 #include <olm/olm.h>
 
diff --git a/autotests/testutils.h b/autotests/testutils.h
index d967454fa..8b615ab9b 100644
--- a/autotests/testutils.h
+++ b/autotests/testutils.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <connection.h>
-#include <networkaccessmanager.h>
+#include <Quotient/connection.h>
+#include <Quotient/networkaccessmanager.h>
 
 #include <QtTest/QSignalSpy>
 
diff --git a/autotests/utiltests.cpp b/autotests/utiltests.cpp
index e3ec63d03..ce808d0a4 100644
--- a/autotests/utiltests.cpp
+++ b/autotests/utiltests.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2021 Kitsune Ral <kitsune-ral@users.sf.net>
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "omittable.h"
+#include <Quotient/omittable.h>
 
 #include <QtTest/QtTest>
 
diff --git a/quotest/quotest.cpp b/quotest/quotest.cpp
index 447234e63..7baddbb4d 100644
--- a/quotest/quotest.cpp
+++ b/quotest/quotest.cpp
@@ -1,21 +1,21 @@
 // SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "connection.h"
-#include "room.h"
-#include "user.h"
-#include "uriresolver.h"
-#include "networkaccessmanager.h"
-#include "qt_connection_util.h"
-
-#include "csapi/joining.h"
-#include "csapi/leaving.h"
-#include "csapi/room_send.h"
-
-#include "events/reactionevent.h"
-#include "events/redactionevent.h"
-#include "events/simplestateevents.h"
-#include "events/roommemberevent.h"
+#include <Quotient/connection.h>
+#include <Quotient/room.h>
+#include <Quotient/user.h>
+#include <Quotient/uriresolver.h>
+#include <Quotient/networkaccessmanager.h>
+#include <Quotient/qt_connection_util.h>
+
+#include <Quotient/csapi/joining.h>
+#include <Quotient/csapi/leaving.h>
+#include <Quotient/csapi/room_send.h>
+
+#include <Quotient/events/reactionevent.h>
+#include <Quotient/events/redactionevent.h>
+#include <Quotient/events/simplestateevents.h>
+#include <Quotient/events/roommemberevent.h>
 
 #include <QtTest/QSignalSpy>
 #include <QtCore/QCoreApplication>