183 files changed, 394 insertions, 148 deletions

diff --git a/bin15/mir_full.sln b/bin15/mir_full.sln
index a88f3606b3..dccdc50963 100644
--- a/bin15/mir_full.sln
+++ b/bin15/mir_full.sln
@@ -375,8 +375,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\libs\liblua\li
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winapi", "..\plugins\MirLua\Modules\WinAPI\WinAPI.vcxproj", "{045BAC91-34D1-4B43-B52B-566801BE7F85}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaxolotl", "..\libs\libaxolotl\libaxolotl.vcxproj", "{620E0BE7-3763-4F35-9DBD-4770104E269C}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hunspell", "..\libs\hunspell\hunspell.vcxproj", "{B80C2C8D-B987-48B6-AFE2-8DA2D17F2F6A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_popup", "..\plugins\MirLua\Modules\m_popup\m_popup.vcxproj", "{D5C9CA74-4E25-478A-B890-75EB13E6DB1C}"
@@ -451,6 +449,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StdPopup", "..\src\core\std
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotesReminders", "..\plugins\NotesAndReminders\NotesReminders.vcxproj", "{EEB57129-946C-4B98-8856-FDA501AE2A5E}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsignal", "..\libs\libsignal\libsignal.vcxproj", "{620E0BE7-3763-4F35-9DBD-4770104E269C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -1801,14 +1801,6 @@ Global
 		{045BAC91-34D1-4B43-B52B-566801BE7F85}.Release|Win32.Build.0 = Release|Win32
 		{045BAC91-34D1-4B43-B52B-566801BE7F85}.Release|x64.ActiveCfg = Release|x64
 		{045BAC91-34D1-4B43-B52B-566801BE7F85}.Release|x64.Build.0 = Release|x64
-		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Debug|Win32.Build.0 = Debug|Win32
-		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Debug|x64.ActiveCfg = Debug|x64
-		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Debug|x64.Build.0 = Debug|x64
-		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Release|Win32.ActiveCfg = Release|Win32
-		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Release|Win32.Build.0 = Release|Win32
-		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Release|x64.ActiveCfg = Release|x64
-		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Release|x64.Build.0 = Release|x64
 		{B80C2C8D-B987-48B6-AFE2-8DA2D17F2F6A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B80C2C8D-B987-48B6-AFE2-8DA2D17F2F6A}.Debug|Win32.Build.0 = Debug|Win32
 		{B80C2C8D-B987-48B6-AFE2-8DA2D17F2F6A}.Debug|x64.ActiveCfg = Debug|x64
@@ -2033,6 +2025,14 @@ Global
 		{EEB57129-946C-4B98-8856-FDA501AE2A5E}.Release|Win32.Build.0 = Release|Win32
 		{EEB57129-946C-4B98-8856-FDA501AE2A5E}.Release|x64.ActiveCfg = Release|x64
 		{EEB57129-946C-4B98-8856-FDA501AE2A5E}.Release|x64.Build.0 = Release|x64
+		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Debug|Win32.Build.0 = Debug|Win32
+		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Debug|x64.ActiveCfg = Debug|x64
+		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Debug|x64.Build.0 = Debug|x64
+		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Release|Win32.ActiveCfg = Release|Win32
+		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Release|Win32.Build.0 = Release|Win32
+		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Release|x64.ActiveCfg = Release|x64
+		{620E0BE7-3763-4F35-9DBD-4770104E269C}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2138,7 +2138,6 @@ Global
 		{27D41D81-991F-4DC6-8749-B0321C87E694} = {329B4E94-C846-4C78-AFD5-8B6B839DCCE1}
 		{BD291BF0-D804-4818-8311-DE871E6BCEAA} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62}
 		{045BAC91-34D1-4B43-B52B-566801BE7F85} = {329B4E94-C846-4C78-AFD5-8B6B839DCCE1}
-		{620E0BE7-3763-4F35-9DBD-4770104E269C} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62}
 		{B80C2C8D-B987-48B6-AFE2-8DA2D17F2F6A} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62}
 		{D5C9CA74-4E25-478A-B890-75EB13E6DB1C} = {329B4E94-C846-4C78-AFD5-8B6B839DCCE1}
 		{E604CD58-4579-4F69-9D6A-2605FD7CF716} = {329B4E94-C846-4C78-AFD5-8B6B839DCCE1}
@@ -2163,6 +2162,7 @@ Global
 		{EFB2355B-82B3-4759-B7D8-95F8E9506291} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}
 		{B3BC3949-6949-41DE-94BF-B112FBFB1A84} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62}
 		{713067DF-65EE-480B-A000-B2A323495F16} = {E7FB43FB-3563-4568-8846-A88FC37449BF}
+		{620E0BE7-3763-4F35-9DBD-4770104E269C} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {29A0C2A8-07A4-4A8B-8BED-8F7D024013D6}
diff --git a/libs/libaxolotl/CMakeLists.txt b/libs/libsignal/CMakeLists.txt
index 2019f621a3..2019f621a3 100644
--- a/libs/libaxolotl/CMakeLists.txt
+++ b/libs/libsignal/CMakeLists.txt
diff --git a/libs/libaxolotl/docs/LICENSE b/libs/libsignal/docs/LICENSE
index 94a0453222..94a0453222 100644
--- a/libs/libaxolotl/docs/LICENSE
+++ b/libs/libsignal/docs/LICENSE
diff --git a/libs/libaxolotl/libaxolotl.vcxproj b/libs/libsignal/libsignal.vcxproj
index 901ffbf3d4..6b305ef6fc 100755..100644
--- a/libs/libaxolotl/libaxolotl.vcxproj
+++ b/libs/libsignal/libsignal.vcxproj
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectName>libaxolotl</ProjectName>

-    <ProjectGuid>{620E0BE7-3763-4F35-9DBD-4770104E269C}</ProjectGuid>

-  </PropertyGroup>

-  <ImportGroup Label="PropertySheets">

-    <Import Project="$(ProjectDir)..\..\build\vc.common\lib.props" />

-  </ImportGroup>

-  <ItemDefinitionGroup>

-    <ClCompile>

-      <PreprocessorDefinitions>_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>.\;src\curve25519\ed25519;src\curve25519\ed25519\nacl_includes;src\curve25519\ed25519\additions\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <DisableSpecificWarnings>4005;4127;4200;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-    </ClCompile>

-    <Link>

-      <ModuleDefinitionFile>src/signal.def</ModuleDefinitionFile>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="src\protobuf-c\*.c">

-      <PrecompiledHeader>NotUsing</PrecompiledHeader>

-    </ClCompile>

-    <ClCompile Include="src\curve25519\*.c">

-      <PrecompiledHeader>NotUsing</PrecompiledHeader>

-    </ClCompile>

-    <ClCompile Include="src\curve25519\ed25519\*.c">

-      <PrecompiledHeader>NotUsing</PrecompiledHeader>

-    </ClCompile>

-    <ClCompile Include="src\curve25519\ed25519\nacl_sha512\*.c">

-      <PrecompiledHeader>NotUsing</PrecompiledHeader>

-    </ClCompile>

-    <ClCompile Include="src\curve25519\ed25519\additions\*.c">

-      <PrecompiledHeader>NotUsing</PrecompiledHeader>

-    </ClCompile>

-    <ClCompile Include="src\curve25519\ed25519\additions\generalized\*.c">

-      <PrecompiledHeader>NotUsing</PrecompiledHeader>

-    </ClCompile>

-   </ItemGroup>

-</Project>

+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>libsignal</ProjectName>
+    <ProjectGuid>{620E0BE7-3763-4F35-9DBD-4770104E269C}</ProjectGuid>
+  </PropertyGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\build\vc.common\lib.props" />
+  </ImportGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>.\;.\src;.\src\curve25519\ed25519;.\src\curve25519\ed25519\nacl_includes;.\src\curve25519\ed25519\additions\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4005;4127;4200;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <ModuleDefinitionFile>src/signal.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="src\protobuf-c\*.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\curve25519\*.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\curve25519\ed25519\*.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\curve25519\ed25519\nacl_sha512\*.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\curve25519\ed25519\additions\*.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\curve25519\ed25519\additions\generalized\*.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+   </ItemGroup>
+</Project>
diff --git a/libs/libaxolotl/libaxolotl.vcxproj.filters b/libs/libsignal/libsignal.vcxproj.filters
index de5ad9f66c..fcae13a9d8 100755..100644
--- a/libs/libaxolotl/libaxolotl.vcxproj.filters
+++ b/libs/libsignal/libsignal.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
 </Project>
\ No newline at end of file
diff --git a/libs/libaxolotl/src/CMakeLists.txt b/libs/libsignal/src/CMakeLists.txt
index f92978850d..a4ede650de 100644
--- a/libs/libaxolotl/src/CMakeLists.txt
+++ b/libs/libsignal/src/CMakeLists.txt
@@ -103,4 +103,13 @@ INSTALL(
 	DESTINATION ${INCLUDE_INSTALL_DIR}/signal
 )
 
-INSTALL(TARGETS signal-protocol-c DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS signal-protocol-c
+	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+	RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
+
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/libsignal-protocol-c.pc.in
+		${CMAKE_CURRENT_BINARY_DIR}/libsignal-protocol-c.pc @ONLY)
+
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libsignal-protocol-c.pc DESTINATION "${INSTALL_PKGCONFIG_DIR}")
diff --git a/libs/libaxolotl/src/FingerprintProtocol.pb-c.c b/libs/libsignal/src/FingerprintProtocol.pb-c.c
index 421ee2febb..421ee2febb 100644
--- a/libs/libaxolotl/src/FingerprintProtocol.pb-c.c
+++ b/libs/libsignal/src/FingerprintProtocol.pb-c.c
diff --git a/libs/libaxolotl/src/FingerprintProtocol.pb-c.h b/libs/libsignal/src/FingerprintProtocol.pb-c.h
index dde27d744f..dfc3c60952 100755..100644
--- a/libs/libaxolotl/src/FingerprintProtocol.pb-c.h
+++ b/libs/libsignal/src/FingerprintProtocol.pb-c.h
@@ -4,7 +4,7 @@
 #ifndef PROTOBUF_C_FingerprintProtocol_2eproto__INCLUDED
 #define PROTOBUF_C_FingerprintProtocol_2eproto__INCLUDED
 
-#include "protobuf-c/protobuf-c.h"
+#include <protobuf-c/protobuf-c.h>
 
 PROTOBUF_C__BEGIN_DECLS
 
diff --git a/libs/libaxolotl/src/LocalStorageProtocol.pb-c.c b/libs/libsignal/src/LocalStorageProtocol.pb-c.c
index afe017187a..afe017187a 100644
--- a/libs/libaxolotl/src/LocalStorageProtocol.pb-c.c
+++ b/libs/libsignal/src/LocalStorageProtocol.pb-c.c
diff --git a/libs/libaxolotl/src/LocalStorageProtocol.pb-c.h b/libs/libsignal/src/LocalStorageProtocol.pb-c.h
index 6f67df9129..43b5bce447 100755..100644
--- a/libs/libaxolotl/src/LocalStorageProtocol.pb-c.h
+++ b/libs/libsignal/src/LocalStorageProtocol.pb-c.h
@@ -4,7 +4,7 @@
 #ifndef PROTOBUF_C_LocalStorageProtocol_2eproto__INCLUDED
 #define PROTOBUF_C_LocalStorageProtocol_2eproto__INCLUDED
 
-#include "protobuf-c/protobuf-c.h"
+#include <protobuf-c/protobuf-c.h>
 
 PROTOBUF_C__BEGIN_DECLS
 
diff --git a/libs/libaxolotl/src/WhisperTextProtocol.pb-c.c b/libs/libsignal/src/WhisperTextProtocol.pb-c.c
index f73c0642fe..f73c0642fe 100644
--- a/libs/libaxolotl/src/WhisperTextProtocol.pb-c.c
+++ b/libs/libsignal/src/WhisperTextProtocol.pb-c.c
diff --git a/libs/libaxolotl/src/WhisperTextProtocol.pb-c.h b/libs/libsignal/src/WhisperTextProtocol.pb-c.h
index 287cfde170..bcab2c5d4d 100755..100644
--- a/libs/libaxolotl/src/WhisperTextProtocol.pb-c.h
+++ b/libs/libsignal/src/WhisperTextProtocol.pb-c.h
@@ -4,7 +4,7 @@
 #ifndef PROTOBUF_C_WhisperTextProtocol_2eproto__INCLUDED
 #define PROTOBUF_C_WhisperTextProtocol_2eproto__INCLUDED
 
-#include "protobuf-c/protobuf-c.h"
+#include <protobuf-c/protobuf-c.h>
 
 PROTOBUF_C__BEGIN_DECLS
 
diff --git a/libs/libaxolotl/src/curve.c b/libs/libsignal/src/curve.c
index e39e08bcba..dcb27c17ea 100755..100644
--- a/libs/libaxolotl/src/curve.c
+++ b/libs/libsignal/src/curve.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "protobuf-c/protobuf-c.h"
+#include <protobuf-c/protobuf-c.h>
 
 #include "curve25519/curve25519-donna.h"
 #include "curve25519/ed25519/additions/curve_sigs.h"
@@ -40,13 +40,6 @@ struct ec_public_key_list
     UT_array *values;
 };
 
-/*int curve_internal_fast_tests(int silent)
-{
-    if (all_fast_tests(silent) != 0)
-        return SG_ERR_UNKNOWN;
-    return 0;
-}*/
-
 int curve_decode_point(ec_public_key **public_key, const uint8_t *key_data, size_t key_len, signal_context *global_context)
 {
     ec_public_key *key = 0;
diff --git a/libs/libaxolotl/src/curve.h b/libs/libsignal/src/curve.h
index 18628e8dfb..09bff406da 100755..100644
--- a/libs/libaxolotl/src/curve.h
+++ b/libs/libsignal/src/curve.h
@@ -12,8 +12,6 @@ extern "C" {
 #define CURVE_SIGNATURE_LEN 64
 #define VRF_SIGNATURE_LEN 96
 
-//int curve_internal_fast_tests(int silent);
-
 int curve_decode_point(ec_public_key **public_key, const uint8_t *key_data, size_t key_len, signal_context *global_context);
 int ec_public_key_compare(const ec_public_key *key1, const ec_public_key *key2);
 int ec_public_key_memcmp(const ec_public_key *key1, const ec_public_key *key2);
diff --git a/libs/libaxolotl/src/curve25519/CMakeLists.txt b/libs/libsignal/src/curve25519/CMakeLists.txt
index f71b351cd1..f71b351cd1 100644
--- a/libs/libaxolotl/src/curve25519/CMakeLists.txt
+++ b/libs/libsignal/src/curve25519/CMakeLists.txt
diff --git a/libs/libaxolotl/src/curve25519/curve25519-donna.c b/libs/libsignal/src/curve25519/curve25519-donna.c
index f2c2ac58e6..f2c2ac58e6 100644
--- a/libs/libaxolotl/src/curve25519/curve25519-donna.c
+++ b/libs/libsignal/src/curve25519/curve25519-donna.c
diff --git a/libs/libaxolotl/src/curve25519/curve25519-donna.h b/libs/libsignal/src/curve25519/curve25519-donna.h
index 3e4dfcee04..3e4dfcee04 100644
--- a/libs/libaxolotl/src/curve25519/curve25519-donna.h
+++ b/libs/libsignal/src/curve25519/curve25519-donna.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/compare.c b/libs/libsignal/src/curve25519/ed25519/additions/compare.c
index 8b1e31389f..8b1e31389f 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/compare.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/compare.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/compare.h b/libs/libsignal/src/curve25519/ed25519/additions/compare.h
index 5a2fa910d4..5a2fa910d4 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/compare.h
+++ b/libs/libsignal/src/curve25519/ed25519/additions/compare.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/crypto_additions.h b/libs/libsignal/src/curve25519/ed25519/additions/crypto_additions.h
index 5c4b8f47bf..5c4b8f47bf 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/crypto_additions.h
+++ b/libs/libsignal/src/curve25519/ed25519/additions/crypto_additions.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/crypto_hash_sha512.h b/libs/libsignal/src/curve25519/ed25519/additions/crypto_hash_sha512.h
index a51a190d25..a51a190d25 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/crypto_hash_sha512.h
+++ b/libs/libsignal/src/curve25519/ed25519/additions/crypto_hash_sha512.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/curve_sigs.c b/libs/libsignal/src/curve25519/ed25519/additions/curve_sigs.c
index 325472427c..325472427c 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/curve_sigs.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/curve_sigs.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/curve_sigs.h b/libs/libsignal/src/curve25519/ed25519/additions/curve_sigs.h
index a2d819aef0..a2d819aef0 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/curve_sigs.h
+++ b/libs/libsignal/src/curve25519/ed25519/additions/curve_sigs.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/elligator.c b/libs/libsignal/src/curve25519/ed25519/additions/elligator.c
index 17b03a71f6..17b03a71f6 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/elligator.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/elligator.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_isequal.c b/libs/libsignal/src/curve25519/ed25519/additions/fe_isequal.c
index 67c5d33c96..67c5d33c96 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_isequal.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/fe_isequal.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_isreduced.c b/libs/libsignal/src/curve25519/ed25519/additions/fe_isreduced.c
index 6fbb3beccd..6fbb3beccd 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_isreduced.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/fe_isreduced.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_mont_rhs.c b/libs/libsignal/src/curve25519/ed25519/additions/fe_mont_rhs.c
index bc8393620c..bc8393620c 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_mont_rhs.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/fe_mont_rhs.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_montx_to_edy.c b/libs/libsignal/src/curve25519/ed25519/additions/fe_montx_to_edy.c
index b0f8c63276..b0f8c63276 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_montx_to_edy.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/fe_montx_to_edy.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_sqrt.c b/libs/libsignal/src/curve25519/ed25519/additions/fe_sqrt.c
index a0c9785821..a0c9785821 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_sqrt.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/fe_sqrt.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_isneutral.c b/libs/libsignal/src/curve25519/ed25519/additions/ge_isneutral.c
index d40e443682..d40e443682 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_isneutral.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/ge_isneutral.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_montx_to_p3.c b/libs/libsignal/src/curve25519/ed25519/additions/ge_montx_to_p3.c
index 7a716c5a72..7a716c5a72 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_montx_to_p3.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/ge_montx_to_p3.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_neg.c b/libs/libsignal/src/curve25519/ed25519/additions/ge_neg.c
index d679713fe0..d679713fe0 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_neg.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/ge_neg.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_p3_to_montx.c b/libs/libsignal/src/curve25519/ed25519/additions/ge_p3_to_montx.c
index b539b2f17f..b539b2f17f 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_p3_to_montx.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/ge_p3_to_montx.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_scalarmult.c b/libs/libsignal/src/curve25519/ed25519/additions/ge_scalarmult.c
index e4f741b8d8..e4f741b8d8 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_scalarmult.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/ge_scalarmult.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_scalarmult_cofactor.c b/libs/libsignal/src/curve25519/ed25519/additions/ge_scalarmult_cofactor.c
index 6affbb05d5..6affbb05d5 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_scalarmult_cofactor.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/ge_scalarmult_cofactor.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/ge_p3_add.c b/libs/libsignal/src/curve25519/ed25519/additions/generalized/ge_p3_add.c
index 75d9673d01..75d9673d01 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/ge_p3_add.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/generalized/ge_p3_add.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_constants.h b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_constants.h
index 392a88e57b..392a88e57b 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_constants.h
+++ b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_constants.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_crypto_additions.h b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_crypto_additions.h
index 569ae26f4d..569ae26f4d 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_crypto_additions.h
+++ b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_crypto_additions.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_eddsa.c b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_eddsa.c
index 9755d28ede..9755d28ede 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_eddsa.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_eddsa.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_eddsa.h b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_eddsa.h
index 0c281bcac9..0c281bcac9 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_eddsa.h
+++ b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_eddsa.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_labelset.c b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_labelset.c
index b181cad5dc..b181cad5dc 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_labelset.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_labelset.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_labelset.h b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_labelset.h
index 6ac40da99d..6ac40da99d 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_labelset.h
+++ b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_labelset.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_veddsa.c b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_veddsa.c
index 4e79b4859d..4e79b4859d 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_veddsa.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_veddsa.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_veddsa.h b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_veddsa.h
index 1bc27a6e2b..1bc27a6e2b 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_veddsa.h
+++ b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_veddsa.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_x.c b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_x.c
index d4df5c1f1f..d4df5c1f1f 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_x.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_x.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_x.h b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_x.h
index 3c4c04cb6c..3c4c04cb6c 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/gen_x.h
+++ b/libs/libsignal/src/curve25519/ed25519/additions/generalized/gen_x.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/point_isreduced.c b/libs/libsignal/src/curve25519/ed25519/additions/generalized/point_isreduced.c
index 5541ffebbb..5541ffebbb 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/point_isreduced.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/generalized/point_isreduced.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/sc_isreduced.c b/libs/libsignal/src/curve25519/ed25519/additions/generalized/sc_isreduced.c
index 24193808ad..24193808ad 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/generalized/sc_isreduced.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/generalized/sc_isreduced.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/keygen.c b/libs/libsignal/src/curve25519/ed25519/additions/keygen.c
index de7cdcd598..de7cdcd598 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/keygen.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/keygen.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/keygen.h b/libs/libsignal/src/curve25519/ed25519/additions/keygen.h
index e86e7c5582..e86e7c5582 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/keygen.h
+++ b/libs/libsignal/src/curve25519/ed25519/additions/keygen.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/open_modified.c b/libs/libsignal/src/curve25519/ed25519/additions/open_modified.c
index a156098191..a156098191 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/open_modified.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/open_modified.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/sc_clamp.c b/libs/libsignal/src/curve25519/ed25519/additions/sc_clamp.c
index 7788be9071..7788be9071 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/sc_clamp.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/sc_clamp.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/sc_cmov.c b/libs/libsignal/src/curve25519/ed25519/additions/sc_cmov.c
index 443a5bb71e..443a5bb71e 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/sc_cmov.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/sc_cmov.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/sc_neg.c b/libs/libsignal/src/curve25519/ed25519/additions/sc_neg.c
index ef407d405e..ef407d405e 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/sc_neg.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/sc_neg.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/sign_modified.c b/libs/libsignal/src/curve25519/ed25519/additions/sign_modified.c
index b2fb8c20d3..b2fb8c20d3 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/sign_modified.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/sign_modified.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/utility.c b/libs/libsignal/src/curve25519/ed25519/additions/utility.c
index c59099a9e3..c59099a9e3 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/utility.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/utility.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/utility.h b/libs/libsignal/src/curve25519/ed25519/additions/utility.h
index 35348782df..35348782df 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/utility.h
+++ b/libs/libsignal/src/curve25519/ed25519/additions/utility.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/xeddsa.c b/libs/libsignal/src/curve25519/ed25519/additions/xeddsa.c
index 63b73bf2ed..63b73bf2ed 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/xeddsa.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/xeddsa.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/xeddsa.h b/libs/libsignal/src/curve25519/ed25519/additions/xeddsa.h
index b86d7f0d9d..b86d7f0d9d 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/xeddsa.h
+++ b/libs/libsignal/src/curve25519/ed25519/additions/xeddsa.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/zeroize.c b/libs/libsignal/src/curve25519/ed25519/additions/zeroize.c
index 187e725eb5..187e725eb5 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/zeroize.c
+++ b/libs/libsignal/src/curve25519/ed25519/additions/zeroize.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/zeroize.h b/libs/libsignal/src/curve25519/ed25519/additions/zeroize.h
index 0db68bb4c6..0db68bb4c6 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/zeroize.h
+++ b/libs/libsignal/src/curve25519/ed25519/additions/zeroize.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/base.h b/libs/libsignal/src/curve25519/ed25519/base.h
index 573bd8a05c..573bd8a05c 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/base.h
+++ b/libs/libsignal/src/curve25519/ed25519/base.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/base2.h b/libs/libsignal/src/curve25519/ed25519/base2.h
index 8c538440ff..8c538440ff 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/base2.h
+++ b/libs/libsignal/src/curve25519/ed25519/base2.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/d.h b/libs/libsignal/src/curve25519/ed25519/d.h
index e25f578350..e25f578350 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/d.h
+++ b/libs/libsignal/src/curve25519/ed25519/d.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/d2.h b/libs/libsignal/src/curve25519/ed25519/d2.h
index 01aaec7512..01aaec7512 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/d2.h
+++ b/libs/libsignal/src/curve25519/ed25519/d2.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe.h b/libs/libsignal/src/curve25519/ed25519/fe.h
index 60c308ba46..60c308ba46 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe.h
+++ b/libs/libsignal/src/curve25519/ed25519/fe.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_0.c b/libs/libsignal/src/curve25519/ed25519/fe_0.c
index ec879d7337..ec879d7337 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_0.c
+++ b/libs/libsignal/src/curve25519/ed25519/fe_0.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_1.c b/libs/libsignal/src/curve25519/ed25519/fe_1.c
index 8cf7784844..8cf7784844 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_1.c
+++ b/libs/libsignal/src/curve25519/ed25519/fe_1.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_add.c b/libs/libsignal/src/curve25519/ed25519/fe_add.c
index e6a81da202..e6a81da202 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_add.c
+++ b/libs/libsignal/src/curve25519/ed25519/fe_add.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_cmov.c b/libs/libsignal/src/curve25519/ed25519/fe_cmov.c
index 8ca584fb19..8ca584fb19 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_cmov.c
+++ b/libs/libsignal/src/curve25519/ed25519/fe_cmov.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_copy.c b/libs/libsignal/src/curve25519/ed25519/fe_copy.c
index 9c5bf865a2..9c5bf865a2 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_copy.c
+++ b/libs/libsignal/src/curve25519/ed25519/fe_copy.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_frombytes.c b/libs/libsignal/src/curve25519/ed25519/fe_frombytes.c
index 5c17917487..5c17917487 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_frombytes.c
+++ b/libs/libsignal/src/curve25519/ed25519/fe_frombytes.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_invert.c b/libs/libsignal/src/curve25519/ed25519/fe_invert.c
index bcfdb8ff87..bcfdb8ff87 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_invert.c
+++ b/libs/libsignal/src/curve25519/ed25519/fe_invert.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_isnegative.c b/libs/libsignal/src/curve25519/ed25519/fe_isnegative.c
index 3b2c8b8d52..3b2c8b8d52 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_isnegative.c
+++ b/libs/libsignal/src/curve25519/ed25519/fe_isnegative.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_isnonzero.c b/libs/libsignal/src/curve25519/ed25519/fe_isnonzero.c
index 0e087a783d..0e087a783d 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_isnonzero.c
+++ b/libs/libsignal/src/curve25519/ed25519/fe_isnonzero.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_mul.c b/libs/libsignal/src/curve25519/ed25519/fe_mul.c
index 26ca8b3682..26ca8b3682 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_mul.c
+++ b/libs/libsignal/src/curve25519/ed25519/fe_mul.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_neg.c b/libs/libsignal/src/curve25519/ed25519/fe_neg.c
index 2078ce5284..2078ce5284 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_neg.c
+++ b/libs/libsignal/src/curve25519/ed25519/fe_neg.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_pow22523.c b/libs/libsignal/src/curve25519/ed25519/fe_pow22523.c
index 56675a5902..56675a5902 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_pow22523.c
+++ b/libs/libsignal/src/curve25519/ed25519/fe_pow22523.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_sq.c b/libs/libsignal/src/curve25519/ed25519/fe_sq.c
index 8dd119841c..8dd119841c 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_sq.c
+++ b/libs/libsignal/src/curve25519/ed25519/fe_sq.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_sq2.c b/libs/libsignal/src/curve25519/ed25519/fe_sq2.c
index 026ed3aacf..026ed3aacf 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_sq2.c
+++ b/libs/libsignal/src/curve25519/ed25519/fe_sq2.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_sub.c b/libs/libsignal/src/curve25519/ed25519/fe_sub.c
index 6e26b7df8f..6e26b7df8f 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_sub.c
+++ b/libs/libsignal/src/curve25519/ed25519/fe_sub.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_tobytes.c b/libs/libsignal/src/curve25519/ed25519/fe_tobytes.c
index 0a63baf9c1..0a63baf9c1 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_tobytes.c
+++ b/libs/libsignal/src/curve25519/ed25519/fe_tobytes.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge.h b/libs/libsignal/src/curve25519/ed25519/ge.h
index 55e95f95b6..55e95f95b6 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge.h
+++ b/libs/libsignal/src/curve25519/ed25519/ge.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_add.c b/libs/libsignal/src/curve25519/ed25519/ge_add.c
index da7ff5d2eb..da7ff5d2eb 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_add.c
+++ b/libs/libsignal/src/curve25519/ed25519/ge_add.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_add.h b/libs/libsignal/src/curve25519/ed25519/ge_add.h
index 7481f8ffbe..7481f8ffbe 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_add.h
+++ b/libs/libsignal/src/curve25519/ed25519/ge_add.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_double_scalarmult.c b/libs/libsignal/src/curve25519/ed25519/ge_double_scalarmult.c
index f8bf4bf775..f8bf4bf775 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_double_scalarmult.c
+++ b/libs/libsignal/src/curve25519/ed25519/ge_double_scalarmult.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_frombytes.c b/libs/libsignal/src/curve25519/ed25519/ge_frombytes.c
index 1a059ee93f..1a059ee93f 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_frombytes.c
+++ b/libs/libsignal/src/curve25519/ed25519/ge_frombytes.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_madd.c b/libs/libsignal/src/curve25519/ed25519/ge_madd.c
index 622571774b..622571774b 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_madd.c
+++ b/libs/libsignal/src/curve25519/ed25519/ge_madd.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_madd.h b/libs/libsignal/src/curve25519/ed25519/ge_madd.h
index ecae84952b..ecae84952b 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_madd.h
+++ b/libs/libsignal/src/curve25519/ed25519/ge_madd.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_msub.c b/libs/libsignal/src/curve25519/ed25519/ge_msub.c
index 741ecbf113..741ecbf113 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_msub.c
+++ b/libs/libsignal/src/curve25519/ed25519/ge_msub.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_msub.h b/libs/libsignal/src/curve25519/ed25519/ge_msub.h
index 500f986ba0..500f986ba0 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_msub.h
+++ b/libs/libsignal/src/curve25519/ed25519/ge_msub.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p1p1_to_p2.c b/libs/libsignal/src/curve25519/ed25519/ge_p1p1_to_p2.c
index 9bb5013d66..9bb5013d66 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p1p1_to_p2.c
+++ b/libs/libsignal/src/curve25519/ed25519/ge_p1p1_to_p2.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p1p1_to_p3.c b/libs/libsignal/src/curve25519/ed25519/ge_p1p1_to_p3.c
index 2f57b10968..2f57b10968 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p1p1_to_p3.c
+++ b/libs/libsignal/src/curve25519/ed25519/ge_p1p1_to_p3.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p2_0.c b/libs/libsignal/src/curve25519/ed25519/ge_p2_0.c
index 6191d1e6e4..6191d1e6e4 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p2_0.c
+++ b/libs/libsignal/src/curve25519/ed25519/ge_p2_0.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p2_dbl.c b/libs/libsignal/src/curve25519/ed25519/ge_p2_dbl.c
index 2e332b5cee..2e332b5cee 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p2_dbl.c
+++ b/libs/libsignal/src/curve25519/ed25519/ge_p2_dbl.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p2_dbl.h b/libs/libsignal/src/curve25519/ed25519/ge_p2_dbl.h
index 128efed907..128efed907 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p2_dbl.h
+++ b/libs/libsignal/src/curve25519/ed25519/ge_p2_dbl.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_0.c b/libs/libsignal/src/curve25519/ed25519/ge_p3_0.c
index 401b2935a1..401b2935a1 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_0.c
+++ b/libs/libsignal/src/curve25519/ed25519/ge_p3_0.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_dbl.c b/libs/libsignal/src/curve25519/ed25519/ge_p3_dbl.c
index 0d8a05915d..0d8a05915d 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_dbl.c
+++ b/libs/libsignal/src/curve25519/ed25519/ge_p3_dbl.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_to_cached.c b/libs/libsignal/src/curve25519/ed25519/ge_p3_to_cached.c
index bde64228cf..bde64228cf 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_to_cached.c
+++ b/libs/libsignal/src/curve25519/ed25519/ge_p3_to_cached.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_to_p2.c b/libs/libsignal/src/curve25519/ed25519/ge_p3_to_p2.c
index e532a9e4cb..e532a9e4cb 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_to_p2.c
+++ b/libs/libsignal/src/curve25519/ed25519/ge_p3_to_p2.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_tobytes.c b/libs/libsignal/src/curve25519/ed25519/ge_p3_tobytes.c
index 21cb2fc656..21cb2fc656 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_tobytes.c
+++ b/libs/libsignal/src/curve25519/ed25519/ge_p3_tobytes.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_precomp_0.c b/libs/libsignal/src/curve25519/ed25519/ge_precomp_0.c
index 2e218861d8..2e218861d8 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_precomp_0.c
+++ b/libs/libsignal/src/curve25519/ed25519/ge_precomp_0.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_scalarmult_base.c b/libs/libsignal/src/curve25519/ed25519/ge_scalarmult_base.c
index 421e4fa0fb..421e4fa0fb 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_scalarmult_base.c
+++ b/libs/libsignal/src/curve25519/ed25519/ge_scalarmult_base.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_sub.c b/libs/libsignal/src/curve25519/ed25519/ge_sub.c
index 69f3d54062..69f3d54062 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_sub.c
+++ b/libs/libsignal/src/curve25519/ed25519/ge_sub.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_sub.h b/libs/libsignal/src/curve25519/ed25519/ge_sub.h
index b4ef1f5dd0..b4ef1f5dd0 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_sub.h
+++ b/libs/libsignal/src/curve25519/ed25519/ge_sub.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_tobytes.c b/libs/libsignal/src/curve25519/ed25519/ge_tobytes.c
index 31b3d33e09..31b3d33e09 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_tobytes.c
+++ b/libs/libsignal/src/curve25519/ed25519/ge_tobytes.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_int32.h b/libs/libsignal/src/curve25519/ed25519/nacl_includes/crypto_int32.h
index cae135e6e2..cae135e6e2 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_int32.h
+++ b/libs/libsignal/src/curve25519/ed25519/nacl_includes/crypto_int32.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_int64.h b/libs/libsignal/src/curve25519/ed25519/nacl_includes/crypto_int64.h
index fc92417b62..fc92417b62 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_int64.h
+++ b/libs/libsignal/src/curve25519/ed25519/nacl_includes/crypto_int64.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_sign.h b/libs/libsignal/src/curve25519/ed25519/nacl_includes/crypto_sign.h
index 8472603e91..8472603e91 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_sign.h
+++ b/libs/libsignal/src/curve25519/ed25519/nacl_includes/crypto_sign.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_sign_edwards25519sha512batch.h b/libs/libsignal/src/curve25519/ed25519/nacl_includes/crypto_sign_edwards25519sha512batch.h
index 62fae61163..62fae61163 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_sign_edwards25519sha512batch.h
+++ b/libs/libsignal/src/curve25519/ed25519/nacl_includes/crypto_sign_edwards25519sha512batch.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_uint32.h b/libs/libsignal/src/curve25519/ed25519/nacl_includes/crypto_uint32.h
index 21020d7b57..21020d7b57 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_uint32.h
+++ b/libs/libsignal/src/curve25519/ed25519/nacl_includes/crypto_uint32.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_uint64.h b/libs/libsignal/src/curve25519/ed25519/nacl_includes/crypto_uint64.h
index 5aa0070375..5aa0070375 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_uint64.h
+++ b/libs/libsignal/src/curve25519/ed25519/nacl_includes/crypto_uint64.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_verify_32.h b/libs/libsignal/src/curve25519/ed25519/nacl_includes/crypto_verify_32.h
index 978d845222..978d845222 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_verify_32.h
+++ b/libs/libsignal/src/curve25519/ed25519/nacl_includes/crypto_verify_32.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/nacl_sha512/blocks.c b/libs/libsignal/src/curve25519/ed25519/nacl_sha512/blocks.c
index 1c5f23d5cc..1c5f23d5cc 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/nacl_sha512/blocks.c
+++ b/libs/libsignal/src/curve25519/ed25519/nacl_sha512/blocks.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/nacl_sha512/hash.c b/libs/libsignal/src/curve25519/ed25519/nacl_sha512/hash.c
index 8934cc18a8..8934cc18a8 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/nacl_sha512/hash.c
+++ b/libs/libsignal/src/curve25519/ed25519/nacl_sha512/hash.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/open.c b/libs/libsignal/src/curve25519/ed25519/open.c
index 1ec4cd2bfd..1ec4cd2bfd 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/open.c
+++ b/libs/libsignal/src/curve25519/ed25519/open.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/pow22523.h b/libs/libsignal/src/curve25519/ed25519/pow22523.h
index 60ffe0d34c..60ffe0d34c 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/pow22523.h
+++ b/libs/libsignal/src/curve25519/ed25519/pow22523.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/pow225521.h b/libs/libsignal/src/curve25519/ed25519/pow225521.h
index 109df779a2..109df779a2 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/pow225521.h
+++ b/libs/libsignal/src/curve25519/ed25519/pow225521.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/sc.h b/libs/libsignal/src/curve25519/ed25519/sc.h
index d32ed2e8ca..d32ed2e8ca 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/sc.h
+++ b/libs/libsignal/src/curve25519/ed25519/sc.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/sc_muladd.c b/libs/libsignal/src/curve25519/ed25519/sc_muladd.c
index 6f1e9d02d6..6f1e9d02d6 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/sc_muladd.c
+++ b/libs/libsignal/src/curve25519/ed25519/sc_muladd.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/sc_reduce.c b/libs/libsignal/src/curve25519/ed25519/sc_reduce.c
index d01f5a5737..d01f5a5737 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/sc_reduce.c
+++ b/libs/libsignal/src/curve25519/ed25519/sc_reduce.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/sign.c b/libs/libsignal/src/curve25519/ed25519/sign.c
index de53742a6c..de53742a6c 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/sign.c
+++ b/libs/libsignal/src/curve25519/ed25519/sign.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/sqrtm1.h b/libs/libsignal/src/curve25519/ed25519/sqrtm1.h
index d8caa23b6a..d8caa23b6a 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/sqrtm1.h
+++ b/libs/libsignal/src/curve25519/ed25519/sqrtm1.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/tests/internal_fast_tests.c b/libs/libsignal/src/curve25519/ed25519/tests/internal_fast_tests.c
index 6566e25526..6566e25526 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/tests/internal_fast_tests.c
+++ b/libs/libsignal/src/curve25519/ed25519/tests/internal_fast_tests.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/tests/internal_fast_tests.h b/libs/libsignal/src/curve25519/ed25519/tests/internal_fast_tests.h
index 47f117546d..47f117546d 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/tests/internal_fast_tests.h
+++ b/libs/libsignal/src/curve25519/ed25519/tests/internal_fast_tests.h
diff --git a/libs/libaxolotl/src/curve25519/ed25519/tests/internal_slow_tests.c b/libs/libsignal/src/curve25519/ed25519/tests/internal_slow_tests.c
index 740ddbe843..740ddbe843 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/tests/internal_slow_tests.c
+++ b/libs/libsignal/src/curve25519/ed25519/tests/internal_slow_tests.c
diff --git a/libs/libaxolotl/src/curve25519/ed25519/tests/internal_slow_tests.h b/libs/libsignal/src/curve25519/ed25519/tests/internal_slow_tests.h
index 5a680c6160..5a680c6160 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/tests/internal_slow_tests.h
+++ b/libs/libsignal/src/curve25519/ed25519/tests/internal_slow_tests.h
diff --git a/libs/libaxolotl/src/device_consistency.c b/libs/libsignal/src/device_consistency.c
index a079d11770..a079d11770 100644
--- a/libs/libaxolotl/src/device_consistency.c
+++ b/libs/libsignal/src/device_consistency.c
diff --git a/libs/libaxolotl/src/device_consistency.h b/libs/libsignal/src/device_consistency.h
index 379d04471c..379d04471c 100644
--- a/libs/libaxolotl/src/device_consistency.h
+++ b/libs/libsignal/src/device_consistency.h
diff --git a/libs/libaxolotl/src/fingerprint.c b/libs/libsignal/src/fingerprint.c
index 1058e90571..1058e90571 100644
--- a/libs/libaxolotl/src/fingerprint.c
+++ b/libs/libsignal/src/fingerprint.c
diff --git a/libs/libaxolotl/src/fingerprint.h b/libs/libsignal/src/fingerprint.h
index a09287cdc9..a09287cdc9 100644
--- a/libs/libaxolotl/src/fingerprint.h
+++ b/libs/libsignal/src/fingerprint.h
diff --git a/libs/libaxolotl/src/group_cipher.c b/libs/libsignal/src/group_cipher.c
index 05ea320d98..05ea320d98 100644
--- a/libs/libaxolotl/src/group_cipher.c
+++ b/libs/libsignal/src/group_cipher.c
diff --git a/libs/libaxolotl/src/group_cipher.h b/libs/libsignal/src/group_cipher.h
index 50b194c06f..50b194c06f 100644
--- a/libs/libaxolotl/src/group_cipher.h
+++ b/libs/libsignal/src/group_cipher.h
diff --git a/libs/libaxolotl/src/group_session_builder.c b/libs/libsignal/src/group_session_builder.c
index 13db334c8e..13db334c8e 100644
--- a/libs/libaxolotl/src/group_session_builder.c
+++ b/libs/libsignal/src/group_session_builder.c
diff --git a/libs/libaxolotl/src/group_session_builder.h b/libs/libsignal/src/group_session_builder.h
index 1d87d53a7f..1d87d53a7f 100644
--- a/libs/libaxolotl/src/group_session_builder.h
+++ b/libs/libsignal/src/group_session_builder.h
diff --git a/libs/libaxolotl/src/hkdf.c b/libs/libsignal/src/hkdf.c
index d8df253c8b..d8df253c8b 100644
--- a/libs/libaxolotl/src/hkdf.c
+++ b/libs/libsignal/src/hkdf.c
diff --git a/libs/libaxolotl/src/hkdf.h b/libs/libsignal/src/hkdf.h
index 43ee870401..43ee870401 100644
--- a/libs/libaxolotl/src/hkdf.h
+++ b/libs/libsignal/src/hkdf.h
diff --git a/libs/libaxolotl/src/key_helper.c b/libs/libsignal/src/key_helper.c
index e2de8d48fe..e2de8d48fe 100644
--- a/libs/libaxolotl/src/key_helper.c
+++ b/libs/libsignal/src/key_helper.c
diff --git a/libs/libaxolotl/src/key_helper.h b/libs/libsignal/src/key_helper.h
index f0e5e56042..f0e5e56042 100644
--- a/libs/libaxolotl/src/key_helper.h
+++ b/libs/libsignal/src/key_helper.h
diff --git a/libs/libaxolotl/src/protobuf-c/CMakeLists.txt b/libs/libsignal/src/protobuf-c/CMakeLists.txt
index 1af25df194..1af25df194 100644
--- a/libs/libaxolotl/src/protobuf-c/CMakeLists.txt
+++ b/libs/libsignal/src/protobuf-c/CMakeLists.txt
diff --git a/libs/libaxolotl/src/protobuf-c/protobuf-c.c b/libs/libsignal/src/protobuf-c/protobuf-c.c
index 4f2f5bcc73..4f2f5bcc73 100644
--- a/libs/libaxolotl/src/protobuf-c/protobuf-c.c
+++ b/libs/libsignal/src/protobuf-c/protobuf-c.c
diff --git a/libs/libaxolotl/src/protobuf-c/protobuf-c.h b/libs/libsignal/src/protobuf-c/protobuf-c.h
index 705a1f7003..705a1f7003 100644
--- a/libs/libaxolotl/src/protobuf-c/protobuf-c.h
+++ b/libs/libsignal/src/protobuf-c/protobuf-c.h
diff --git a/libs/libaxolotl/src/protocol.c b/libs/libsignal/src/protocol.c
index c2b97344e6..c2b97344e6 100644
--- a/libs/libaxolotl/src/protocol.c
+++ b/libs/libsignal/src/protocol.c
diff --git a/libs/libaxolotl/src/protocol.h b/libs/libsignal/src/protocol.h
index 73c2df9d86..73c2df9d86 100644
--- a/libs/libaxolotl/src/protocol.h
+++ b/libs/libsignal/src/protocol.h
diff --git a/libs/libaxolotl/src/ratchet.c b/libs/libsignal/src/ratchet.c
index 83ab5a1eac..8c6822007a 100755..100644
--- a/libs/libaxolotl/src/ratchet.c
+++ b/libs/libsignal/src/ratchet.c
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "protobuf-c/protobuf-c.h"
+#include <protobuf-c/protobuf-c.h>
 
 #include "hkdf.h"
 #include "curve.h"
diff --git a/libs/libaxolotl/src/ratchet.h b/libs/libsignal/src/ratchet.h
index e42c98a61e..e42c98a61e 100644
--- a/libs/libaxolotl/src/ratchet.h
+++ b/libs/libsignal/src/ratchet.h
diff --git a/libs/libaxolotl/src/sender_key.c b/libs/libsignal/src/sender_key.c
index 31d7499499..31d7499499 100644
--- a/libs/libaxolotl/src/sender_key.c
+++ b/libs/libsignal/src/sender_key.c
diff --git a/libs/libaxolotl/src/sender_key.h b/libs/libsignal/src/sender_key.h
index 113bb5daa8..113bb5daa8 100644
--- a/libs/libaxolotl/src/sender_key.h
+++ b/libs/libsignal/src/sender_key.h
diff --git a/libs/libaxolotl/src/sender_key_record.c b/libs/libsignal/src/sender_key_record.c
index e6057ae1f0..e6057ae1f0 100644
--- a/libs/libaxolotl/src/sender_key_record.c
+++ b/libs/libsignal/src/sender_key_record.c
diff --git a/libs/libaxolotl/src/sender_key_record.h b/libs/libsignal/src/sender_key_record.h
index f1113ceb62..f1113ceb62 100644
--- a/libs/libaxolotl/src/sender_key_record.h
+++ b/libs/libsignal/src/sender_key_record.h
diff --git a/libs/libaxolotl/src/sender_key_state.c b/libs/libsignal/src/sender_key_state.c
index 0b19cb7412..0b19cb7412 100644
--- a/libs/libaxolotl/src/sender_key_state.c
+++ b/libs/libsignal/src/sender_key_state.c
diff --git a/libs/libaxolotl/src/sender_key_state.h b/libs/libsignal/src/sender_key_state.h
index 968c7fb753..968c7fb753 100644
--- a/libs/libaxolotl/src/sender_key_state.h
+++ b/libs/libsignal/src/sender_key_state.h
diff --git a/libs/libaxolotl/src/session_builder.c b/libs/libsignal/src/session_builder.c
index 2bfd62015f..2bfd62015f 100644
--- a/libs/libaxolotl/src/session_builder.c
+++ b/libs/libsignal/src/session_builder.c
diff --git a/libs/libaxolotl/src/session_builder.h b/libs/libsignal/src/session_builder.h
index 6e56ba24f0..6e56ba24f0 100644
--- a/libs/libaxolotl/src/session_builder.h
+++ b/libs/libsignal/src/session_builder.h
diff --git a/libs/libaxolotl/src/session_builder_internal.h b/libs/libsignal/src/session_builder_internal.h
index 2bf8dba4e0..2bf8dba4e0 100644
--- a/libs/libaxolotl/src/session_builder_internal.h
+++ b/libs/libsignal/src/session_builder_internal.h
diff --git a/libs/libaxolotl/src/session_cipher.c b/libs/libsignal/src/session_cipher.c
index 3f5dcab953..3f5dcab953 100644
--- a/libs/libaxolotl/src/session_cipher.c
+++ b/libs/libsignal/src/session_cipher.c
diff --git a/libs/libaxolotl/src/session_cipher.h b/libs/libsignal/src/session_cipher.h
index 641dfea13b..641dfea13b 100644
--- a/libs/libaxolotl/src/session_cipher.h
+++ b/libs/libsignal/src/session_cipher.h
diff --git a/libs/libaxolotl/src/session_pre_key.c b/libs/libsignal/src/session_pre_key.c
index 416ed6a1f5..416ed6a1f5 100644
--- a/libs/libaxolotl/src/session_pre_key.c
+++ b/libs/libsignal/src/session_pre_key.c
diff --git a/libs/libaxolotl/src/session_pre_key.h b/libs/libsignal/src/session_pre_key.h
index ff8a9a8de2..ff8a9a8de2 100644
--- a/libs/libaxolotl/src/session_pre_key.h
+++ b/libs/libsignal/src/session_pre_key.h
diff --git a/libs/libaxolotl/src/session_record.c b/libs/libsignal/src/session_record.c
index e5ed577b37..e5ed577b37 100644
--- a/libs/libaxolotl/src/session_record.c
+++ b/libs/libsignal/src/session_record.c
diff --git a/libs/libaxolotl/src/session_record.h b/libs/libsignal/src/session_record.h
index ec21d08a7a..ec21d08a7a 100644
--- a/libs/libaxolotl/src/session_record.h
+++ b/libs/libsignal/src/session_record.h
diff --git a/libs/libaxolotl/src/session_state.c b/libs/libsignal/src/session_state.c
index a4dfb9a1d4..a4dfb9a1d4 100644
--- a/libs/libaxolotl/src/session_state.c
+++ b/libs/libsignal/src/session_state.c
diff --git a/libs/libaxolotl/src/session_state.h b/libs/libsignal/src/session_state.h
index ef1ecaed97..ef1ecaed97 100644
--- a/libs/libaxolotl/src/session_state.h
+++ b/libs/libsignal/src/session_state.h
diff --git a/libs/libaxolotl/src/signal.def b/libs/libsignal/src/signal.def
index 9d311f24cd..de31cfe4c0 100755..100644
--- a/libs/libaxolotl/src/signal.def
+++ b/libs/libsignal/src/signal.def
@@ -1,4 +1,4 @@
-LIBRARY libaxolotl.mir
+LIBRARY libsignal.mir
 
 EXPORTS
    signal_type_ref
diff --git a/libs/libaxolotl/src/signal_protocol.c b/libs/libsignal/src/signal_protocol.c
index d9ea5b5921..d9ea5b5921 100644
--- a/libs/libaxolotl/src/signal_protocol.c
+++ b/libs/libsignal/src/signal_protocol.c
diff --git a/libs/libaxolotl/src/signal_protocol.h b/libs/libsignal/src/signal_protocol.h
index 4e71355c2e..4e71355c2e 100644
--- a/libs/libaxolotl/src/signal_protocol.h
+++ b/libs/libsignal/src/signal_protocol.h
diff --git a/libs/libaxolotl/src/signal_protocol_internal.h b/libs/libsignal/src/signal_protocol_internal.h
index de89876c00..3a30a0f027 100755..100644
--- a/libs/libaxolotl/src/signal_protocol_internal.h
+++ b/libs/libsignal/src/signal_protocol_internal.h
@@ -1,7 +1,7 @@
 #ifndef SIGNAL_PROTOCOL_INTERNAL_H
 #define SIGNAL_PROTOCOL_INTERNAL_H
 
-#include "protobuf-c/protobuf-c.h"
+#include <protobuf-c/protobuf-c.h>
 #include "LocalStorageProtocol.pb-c.h"
 #include "signal_protocol.h"
 
diff --git a/libs/libaxolotl/src/signal_protocol_types.h b/libs/libsignal/src/signal_protocol_types.h
index b45fa4c7e0..b45fa4c7e0 100644
--- a/libs/libaxolotl/src/signal_protocol_types.h
+++ b/libs/libsignal/src/signal_protocol_types.h
diff --git a/libs/libaxolotl/src/signal_utarray.h b/libs/libsignal/src/signal_utarray.h
index 682fc0f0bf..682fc0f0bf 100644
--- a/libs/libaxolotl/src/signal_utarray.h
+++ b/libs/libsignal/src/signal_utarray.h
diff --git a/libs/libaxolotl/src/stdafx.cxx b/libs/libsignal/src/stdafx.cxx
index c99d1c63ba..10cc10d318 100644
--- a/libs/libaxolotl/src/stdafx.cxx
+++ b/libs/libsignal/src/stdafx.cxx
@@ -1,19 +1,19 @@
-/*

-

-Copyright (C) 2012-19 Miranda NG team (https://miranda-ng.org)

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation version 2

-of the License.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program. If not, see <http://www.gnu.org/licenses/>.

-*/

-

+/*
+
+Copyright (C) 2012-19 Miranda NG team (https://miranda-ng.org)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation version 2
+of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #include "stdafx.h"
\ No newline at end of file
diff --git a/libs/libaxolotl/src/stdafx.h b/libs/libsignal/src/stdafx.h
index 17bd1fa7cc..44fd8c07ba 100644
--- a/libs/libaxolotl/src/stdafx.h
+++ b/libs/libsignal/src/stdafx.h
@@ -1,26 +1,26 @@
-/*

-

-Miranda NG: the free IM client for Microsoft* Windows*

-

-Copyright (c) 2012-19 Miranda NG team (https://miranda-ng.org),

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#pragma once

-

-#include <stdio.h>

+/*
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-19 Miranda NG team (https://miranda-ng.org),
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#pragma once
+
+#include <stdio.h>
diff --git a/libs/libaxolotl/src/utarray.h b/libs/libsignal/src/utarray.h
index 979e99e98e..979e99e98e 100644
--- a/libs/libaxolotl/src/utarray.h
+++ b/libs/libsignal/src/utarray.h
diff --git a/libs/libaxolotl/src/uthash.h b/libs/libsignal/src/uthash.h
index 775599c9a8..775599c9a8 100644
--- a/libs/libaxolotl/src/uthash.h
+++ b/libs/libsignal/src/uthash.h
diff --git a/libs/libaxolotl/src/utlist.h b/libs/libsignal/src/utlist.h
index 9b5534ffbd..9b5534ffbd 100644
--- a/libs/libaxolotl/src/utlist.h
+++ b/libs/libsignal/src/utlist.h
diff --git a/libs/libaxolotl/src/vpool.c b/libs/libsignal/src/vpool.c
index 97b4ec8dd4..97b4ec8dd4 100644
--- a/libs/libaxolotl/src/vpool.c
+++ b/libs/libsignal/src/vpool.c
diff --git a/libs/libaxolotl/src/vpool.h b/libs/libsignal/src/vpool.h
index 9a54e42825..9a54e42825 100644
--- a/libs/libaxolotl/src/vpool.h
+++ b/libs/libsignal/src/vpool.h
diff --git a/protocols/JabberG/jabber.vcxproj b/protocols/JabberG/jabber.vcxproj
index 76c883041c..193822a287 100755
--- a/protocols/JabberG/jabber.vcxproj
+++ b/protocols/JabberG/jabber.vcxproj
@@ -26,9 +26,6 @@
     <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />

   </ImportGroup>

   <ItemDefinitionGroup>

-    <ClCompile>

-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\libs\libaxolotl\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-    </ClCompile>

     <Link>

       <AdditionalDependencies>libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

@@ -37,7 +34,7 @@
     <ProjectReference Include="..\..\libs\freeimage\freeimage.vcxproj">

       <Project>{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}</Project>

     </ProjectReference>

-    <ProjectReference Include="..\..\libs\libaxolotl\libaxolotl.vcxproj">

+    <ProjectReference Include="..\..\libs\libsignal\libsignal.vcxproj">

       <Project>{620e0be7-3763-4f35-9dbd-4770104e269c}</Project>

     </ProjectReference>

     <ProjectReference Include="..\..\libs\zlib\zlib.vcxproj">

@@ -45,4 +42,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

     </ProjectReference>

   </ItemGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/protocols/JabberG/jabber.vcxproj.filters b/protocols/JabberG/jabber.vcxproj.filters
index de5ad9f66c..7e7e342dd0 100755
--- a/protocols/JabberG/jabber.vcxproj.filters
+++ b/protocols/JabberG/jabber.vcxproj.filters
@@ -1,4 +1,253 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClCompile Include="src\stdafx.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/JabberG/src/jabber_omemo.cpp b/protocols/JabberG/src/jabber_omemo.cpp
index 4dc253d679..60027fabc2 100755
--- a/protocols/JabberG/src/jabber_omemo.cpp
+++ b/protocols/JabberG/src/jabber_omemo.cpp
@@ -29,12 +29,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "stdafx.h"

 #include "jabber_omemo.h"

 

-#include <signal_protocol.h>

-#include <signal_protocol_types.h>

-#include <key_helper.h>

-#include <session_builder.h>

-#include <session_cipher.h>

-#include <protocol.h>

+#include "..\..\libs\libsignal\src\signal_protocol.h"

+#include "..\..\libs\libsignal\src\signal_protocol_types.h"

+#include "..\..\libs\libsignal\src\key_helper.h"

+#include "..\..\libs\libsignal\src\session_builder.h"

+#include "..\..\libs\libsignal\src\session_cipher.h"

+#include "..\..\libs\libsignal\src\protocol.h"

 

 namespace utils {

 	// code from http://stackoverflow.com/questions/3368883/how-does-this-size-of-array-template-function-work

diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
index 7333ca7c5d..9080c18164 100644
--- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
+++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
@@ -185,11 +185,11 @@ Core\stduseronline.dll
 
 Libs\freeimage.mir
 Libs\hunspell.mir
-Libs\libaxolotl.mir
 Libs\libeay32.mir
 Libs\libcurl.mir
 Libs\libjson.mir
 Libs\libmdbx.mir
+Libs\libsignal.mir
 Libs\libssh2.mir
 Libs\mir_app.mir
 Libs\mir_core.mir
diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
index e0467e15b7..8c6f3f6aaf 100644
--- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
+++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
@@ -184,11 +184,11 @@ Core\stduseronline.dll
 
 Libs\freeimage.mir
 Libs\hunspell.mir
-Libs\libaxolotl.mir
 Libs\libeay32.mir
 Libs\libcurl.mir
 Libs\libjson.mir
 Libs\libmdbx.mir
+Libs\libsignal.mir
 Libs\libssh2.mir
 Libs\mir_app.mir
 Libs\mir_core.mir
diff --git a/tools/build_scripts/bin15/z3_PackArchives.txt b/tools/build_scripts/bin15/z3_PackArchives.txt
index 934f28d789..620ef58a67 100644
--- a/tools/build_scripts/bin15/z3_PackArchives.txt
+++ b/tools/build_scripts/bin15/z3_PackArchives.txt
@@ -60,10 +60,10 @@ Core\StdUrl.dll
 Core\StdUserInfo.dll
 Core\StdUserOnline.dll
 Libs\freeimage.mir
-Libs\libaxolotl.mir
 Libs\libeay32.mir
 Libs\libjson.mir
 Libs\libmdbx.mir
+Libs\libsignal.mir
 Libs\mir_app.mir
 Libs\mir_core.mir
 Libs\sqlite3.mir
diff --git a/tools/build_scripts/z2_PackPluginUpdater.bat b/tools/build_scripts/z2_PackPluginUpdater.bat
index 060f07be6b..56ac7e7f82 100644
--- a/tools/build_scripts/z2_PackPluginUpdater.bat
+++ b/tools/build_scripts/z2_PackPluginUpdater.bat
@@ -60,7 +60,7 @@ for /f %%a in ('dir plugins\*.dll /B /L') do (
 	if /I "%%a"=="ICQ.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_ICQ.dll" "Icons\Proto_MRA.dll")
 	if /I "%%a"=="Import.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Libs\sqlite3.mir")
 	if /I "%%a"=="IRC.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_IRC.dll")
-	if /I "%%a"=="Jabber.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_Jabber.dll" "Icons\xStatus_Jabber.dll" "Libs\libaxolotl.mir")
+	if /I "%%a"=="Jabber.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_Jabber.dll" "Icons\xStatus_Jabber.dll" "Libs\libsignal.mir")
 	if /I "%%a"=="Listeningto.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Plugins\Listeningto\*.dll")
 	if /I "%%a"=="MinecraftDynmap.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_MinecraftDynmap.dll")
 	if /I "%%a"=="MirLua.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Scripts\*.dll" "Libs\lua*.dll")