Merge remote-tracking branch 'upstream/master' into webrtc-video

1 files changed, 2 insertions, 4 deletions

diff --git a/src/CacheCryptoStructs.h b/src/CacheCryptoStructs.h

index a693e233..6256dcf9 100644
--- a/src/CacheCryptoStructs.h
+++ b/src/CacheCryptoStructs.h
@@ -3,10 +3,8 @@
 #include <map>
 #include <mutex>
 
-//#include <nlohmann/json.hpp>
-
-#include <mtx/responses.hpp>
-#include <mtxclient/crypto/client.hpp>
+#include <mtx/responses/crypto.hpp>
+#include <mtxclient/crypto/objects.hpp>
 
 // Extra information associated with an outbound megolm session.
 struct OutboundGroupSessionData