diff --git a/native/cpp/CommonCpp/CryptoTools/Session.h b/native/cpp/CommonCpp/CryptoTools/Session.h
--- a/native/cpp/CommonCpp/CryptoTools/Session.h
+++ b/native/cpp/CommonCpp/CryptoTools/Session.h
@@ -5,6 +5,8 @@
 
 #include "Tools.h"
 
+#include "olm/olm.h"
+
 namespace comm {
 namespace crypto {
 
diff --git a/native/cpp/CommonCpp/CryptoTools/Tools.h b/native/cpp/CommonCpp/CryptoTools/Tools.h
--- a/native/cpp/CommonCpp/CryptoTools/Tools.h
+++ b/native/cpp/CommonCpp/CryptoTools/Tools.h
@@ -4,10 +4,6 @@
 #include <string>
 #include <vector>
 
-#ifndef EMSCRIPTEN
-#include "olm/olm.h"
-#endif
-
 // base64-encoded
 #define KEYSIZE 43
 #define SIGNATURESIZE 86