diff --git a/src/InviteeItem.h b/src/InviteeItem.h
index 85ff7a63563567eac7b9ac414e200e9a22e5225c..582904b4eec2e55c0e71eb60ab0dcdf90037ce12 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 501a16218cc5e117ad65a00542353ade6025cb77..28521413e43790ea27d12de97793083d7453a03c 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 22ac6a43a0c2f4d6e741ba078442ba88450b3e04..a482a63609ceb5f196eace5a642273625e807a83 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 bacfe498672239ef690e6620f2e9cce5dca91860..691035ce0ed68875864a2edf796424b1fa08fc58 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;