diff --git a/src/InviteeItem.h b/src/InviteeItem.h
index 85ff7a63..582904b4 100644
--- a/src/InviteeItem.h
+++ b/src/InviteeItem.h
@@ -3,7 +3,7 @@
 #include <QLabel>
 #include <QWidget>
 
-#include "mtx.hpp"
+#include <mtx/identifiers.hpp>
 
 class QPushButton;
 
diff --git a/src/Olm.h b/src/Olm.h
index 501a1621..28521413 100644
--- a/src/Olm.h
+++ b/src/Olm.h
@@ -3,7 +3,8 @@
 #include <boost/optional.hpp>
 
 #include <memory>
-#include <mtx.hpp>
+#include <mtx/events.hpp>
+#include <mtx/events/encrypted.hpp>
 #include <mtxclient/crypto/client.hpp>
 
 constexpr auto OLM_ALGO = "m.olm.v1.curve25519-aes-sha2";
diff --git a/src/dialogs/CreateRoom.h b/src/dialogs/CreateRoom.h
index 22ac6a43..a482a636 100644
--- a/src/dialogs/CreateRoom.h
+++ b/src/dialogs/CreateRoom.h
@@ -2,7 +2,7 @@
 
 #include <QFrame>
 
-#include <mtx.hpp>
+#include <mtx/requests.hpp>
 
 class QPushButton;
 class TextField;
diff --git a/src/dialogs/InviteUsers.cpp b/src/dialogs/InviteUsers.cpp
index bacfe498..691035ce 100644
--- a/src/dialogs/InviteUsers.cpp
+++ b/src/dialogs/InviteUsers.cpp
@@ -13,7 +13,7 @@
 #include "InviteeItem.h"
 #include "ui/TextField.h"
 
-#include "mtx.hpp"
+#include <mtx/identifiers.hpp>
 
 using namespace dialogs;