convert all files exept curl and new_gpg to utf-8 BOM (reverted from commit 62202ed10617927d5429bc59898e12a366abe744)

161 files changed, 161 insertions, 161 deletions

diff --git a/libs/libaxolotl/src/CMakeLists.txt b/libs/libaxolotl/src/CMakeLists.txt
index 09259944a6..f92978850d 100644
--- a/libs/libaxolotl/src/CMakeLists.txt
+++ b/libs/libaxolotl/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(BUILD_SHARED_LIBS)
+if(BUILD_SHARED_LIBS)
 	find_library(M_LIB m)
 endif()
 
diff --git a/libs/libaxolotl/src/FingerprintProtocol.pb-c.c b/libs/libaxolotl/src/FingerprintProtocol.pb-c.c
index 411baaec7b..f5e62e0301 100644
--- a/libs/libaxolotl/src/FingerprintProtocol.pb-c.c
+++ b/libs/libaxolotl/src/FingerprintProtocol.pb-c.c
@@ -1,4 +1,4 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
 /* Generated from: FingerprintProtocol.proto */
 
 /* Do not generate deprecated warnings for self */
diff --git a/libs/libaxolotl/src/FingerprintProtocol.pb-c.h b/libs/libaxolotl/src/FingerprintProtocol.pb-c.h
index e8c9213b59..8bfce6eaeb 100755
--- a/libs/libaxolotl/src/FingerprintProtocol.pb-c.h
+++ b/libs/libaxolotl/src/FingerprintProtocol.pb-c.h
@@ -1,4 +1,4 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
 /* Generated from: FingerprintProtocol.proto */
 
 #ifndef PROTOBUF_C_FingerprintProtocol_2eproto__INCLUDED
diff --git a/libs/libaxolotl/src/LocalStorageProtocol.pb-c.c b/libs/libaxolotl/src/LocalStorageProtocol.pb-c.c
index 0e593ae69b..afe017187a 100644
--- a/libs/libaxolotl/src/LocalStorageProtocol.pb-c.c
+++ b/libs/libaxolotl/src/LocalStorageProtocol.pb-c.c
@@ -1,4 +1,4 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
 /* Generated from: LocalStorageProtocol.proto */
 
 /* Do not generate deprecated warnings for self */
diff --git a/libs/libaxolotl/src/LocalStorageProtocol.pb-c.h b/libs/libaxolotl/src/LocalStorageProtocol.pb-c.h
index 60cea8133d..86e657e51a 100755
--- a/libs/libaxolotl/src/LocalStorageProtocol.pb-c.h
+++ b/libs/libaxolotl/src/LocalStorageProtocol.pb-c.h
@@ -1,4 +1,4 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
 /* Generated from: LocalStorageProtocol.proto */
 
 #ifndef PROTOBUF_C_LocalStorageProtocol_2eproto__INCLUDED
diff --git a/libs/libaxolotl/src/WhisperTextProtocol.pb-c.c b/libs/libaxolotl/src/WhisperTextProtocol.pb-c.c
index 1b359b7b01..f73c0642fe 100644
--- a/libs/libaxolotl/src/WhisperTextProtocol.pb-c.c
+++ b/libs/libaxolotl/src/WhisperTextProtocol.pb-c.c
@@ -1,4 +1,4 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
 /* Generated from: WhisperTextProtocol.proto */
 
 /* Do not generate deprecated warnings for self */
diff --git a/libs/libaxolotl/src/WhisperTextProtocol.pb-c.h b/libs/libaxolotl/src/WhisperTextProtocol.pb-c.h
index f45027c18e..de589106bb 100755
--- a/libs/libaxolotl/src/WhisperTextProtocol.pb-c.h
+++ b/libs/libaxolotl/src/WhisperTextProtocol.pb-c.h
@@ -1,4 +1,4 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
 /* Generated from: WhisperTextProtocol.proto */
 
 #ifndef PROTOBUF_C_WhisperTextProtocol_2eproto__INCLUDED
diff --git a/libs/libaxolotl/src/curve.c b/libs/libaxolotl/src/curve.c
index 52662b7fe4..afa16799e5 100755
--- a/libs/libaxolotl/src/curve.c
+++ b/libs/libaxolotl/src/curve.c
@@ -1,4 +1,4 @@
-#include "curve.h"
+#include "curve.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libs/libaxolotl/src/curve.h b/libs/libaxolotl/src/curve.h
index f75025616c..9401f88033 100644
--- a/libs/libaxolotl/src/curve.h
+++ b/libs/libaxolotl/src/curve.h
@@ -1,4 +1,4 @@
-#ifndef CURVE_H
+#ifndef CURVE_H
 #define CURVE_H
 
 #include <stdint.h>
diff --git a/libs/libaxolotl/src/curve25519/CMakeLists.txt b/libs/libaxolotl/src/curve25519/CMakeLists.txt
index 37b49f1c41..63a81ff0eb 100644
--- a/libs/libaxolotl/src/curve25519/CMakeLists.txt
+++ b/libs/libaxolotl/src/curve25519/CMakeLists.txt
@@ -1,4 +1,4 @@
-IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-variable -Wno-unused-function -Wno-shadow")
 ENDIF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
 
diff --git a/libs/libaxolotl/src/curve25519/curve25519-donna.c b/libs/libaxolotl/src/curve25519/curve25519-donna.c
index f28c283525..f2c2ac58e6 100644
--- a/libs/libaxolotl/src/curve25519/curve25519-donna.c
+++ b/libs/libaxolotl/src/curve25519/curve25519-donna.c
@@ -1,4 +1,4 @@
-/* Copyright 2008, Google Inc.
+/* Copyright 2008, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libs/libaxolotl/src/curve25519/curve25519-donna.h b/libs/libaxolotl/src/curve25519/curve25519-donna.h
index 27ca5f2695..3e4dfcee04 100644
--- a/libs/libaxolotl/src/curve25519/curve25519-donna.h
+++ b/libs/libaxolotl/src/curve25519/curve25519-donna.h
@@ -1,4 +1,4 @@
-#ifndef CURVE25519_DONNA_H
+#ifndef CURVE25519_DONNA_H
 #define CURVE25519_DONNA_H
 
 extern int curve25519_donna(uint8_t *, const uint8_t *, const uint8_t *);
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/compare.c b/libs/libaxolotl/src/curve25519/ed25519/additions/compare.c
index 692d8c735e..8b1e31389f 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/compare.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/compare.c
@@ -1,4 +1,4 @@
-#include <string.h>
+#include <string.h>
 #include "compare.h"
 
 /* Const-time comparison from SUPERCOP, but here it's only used for 
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/compare.h b/libs/libaxolotl/src/curve25519/ed25519/additions/compare.h
index 6732976e4c..5a2fa910d4 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/compare.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/compare.h
@@ -1,4 +1,4 @@
-#ifndef __COMPARE_H__
+#ifndef __COMPARE_H__
 #define __COMPARE_H__
 
 int crypto_verify_32_ref(const unsigned char *b1, const unsigned char *b2);
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/crypto_additions.h b/libs/libaxolotl/src/curve25519/ed25519/additions/crypto_additions.h
index 030b4d5c8e..9339ddb981 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/crypto_additions.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/crypto_additions.h
@@ -1,4 +1,4 @@
-
+
 #ifndef __CRYPTO_ADDITIONS__
 #define __CRYPTO_ADDITIONS__
 
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/crypto_hash_sha512.h b/libs/libaxolotl/src/curve25519/ed25519/additions/crypto_hash_sha512.h
index 1ceb0d64f2..a51a190d25 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/crypto_hash_sha512.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/crypto_hash_sha512.h
@@ -1,4 +1,4 @@
-#ifndef crypto_hash_sha512_H
+#ifndef crypto_hash_sha512_H
 #define crypto_hash_sha512_H
 
 extern int crypto_hash_sha512(unsigned char *,const unsigned char *,unsigned long long);
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/curve_sigs.c b/libs/libaxolotl/src/curve25519/ed25519/additions/curve_sigs.c
index 5c8ec5e384..7a49b18aaa 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/curve_sigs.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/curve_sigs.c
@@ -1,4 +1,4 @@
-#include <string.h>
+#include <string.h>
 #include <stdlib.h>
 #include "ge.h"
 #include "curve_sigs.h"
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/curve_sigs.h b/libs/libaxolotl/src/curve25519/ed25519/additions/curve_sigs.h
index 082ed65863..a2d819aef0 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/curve_sigs.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/curve_sigs.h
@@ -1,4 +1,4 @@
-
+
 #ifndef __CURVE_SIGS_H__
 #define __CURVE_SIGS_H__
 
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/elligator.c b/libs/libaxolotl/src/curve25519/ed25519/additions/elligator.c
index c5a1fab230..6feb96bad6 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/elligator.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/elligator.c
@@ -1,4 +1,4 @@
-#include <string.h>
+#include <string.h>
 #include "fe.h"
 #include "ge.h"
 #include "crypto_uint32.h"
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_isequal.c b/libs/libaxolotl/src/curve25519/ed25519/additions/fe_isequal.c
index d1ee01e929..67c5d33c96 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_isequal.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/fe_isequal.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 #include "crypto_verify_32.h"
 
 /*
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_isreduced.c b/libs/libaxolotl/src/curve25519/ed25519/additions/fe_isreduced.c
index 8dbbc69f81..6fbb3beccd 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_isreduced.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/fe_isreduced.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 #include "crypto_verify_32.h"
 
 int fe_isreduced(const unsigned char* s)
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_mont_rhs.c b/libs/libaxolotl/src/curve25519/ed25519/additions/fe_mont_rhs.c
index c20657dec1..bc8393620c 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_mont_rhs.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/fe_mont_rhs.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 
 void fe_mont_rhs(fe v2, fe u) {
   fe A, one;
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_montx_to_edy.c b/libs/libaxolotl/src/curve25519/ed25519/additions/fe_montx_to_edy.c
index 65bcf5db71..b0f8c63276 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_montx_to_edy.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/fe_montx_to_edy.c
@@ -1,4 +1,4 @@
-
+
 #include "fe.h"
 #include "crypto_additions.h"
 
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_sqrt.c b/libs/libaxolotl/src/curve25519/ed25519/additions/fe_sqrt.c
index afb9a34898..a0c9785821 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/fe_sqrt.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/fe_sqrt.c
@@ -1,4 +1,4 @@
-#include <assert.h>
+#include <assert.h>
 #include "fe.h"
 #include "crypto_additions.h"
 
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_isneutral.c b/libs/libaxolotl/src/curve25519/ed25519/additions/ge_isneutral.c
index da62418219..d40e443682 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_isneutral.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/ge_isneutral.c
@@ -1,4 +1,4 @@
-#include "crypto_additions.h"
+#include "crypto_additions.h"
 #include "ge.h"
 
 /*
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_montx_to_p3.c b/libs/libaxolotl/src/curve25519/ed25519/additions/ge_montx_to_p3.c
index 0da35232ed..7a716c5a72 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_montx_to_p3.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/ge_montx_to_p3.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 #include "ge.h"
 #include "assert.h"
 #include "crypto_additions.h"
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_neg.c b/libs/libaxolotl/src/curve25519/ed25519/additions/ge_neg.c
index b9f3d4e4b4..d679713fe0 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_neg.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/ge_neg.c
@@ -1,4 +1,4 @@
-#include "crypto_additions.h"
+#include "crypto_additions.h"
 #include "ge.h"
 
 /*
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_p3_to_montx.c b/libs/libaxolotl/src/curve25519/ed25519/additions/ge_p3_to_montx.c
index fd42be134f..b539b2f17f 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_p3_to_montx.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/ge_p3_to_montx.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 #include "crypto_additions.h"
 
 void ge_p3_to_montx(fe u, const ge_p3 *ed)
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_scalarmult.c b/libs/libaxolotl/src/curve25519/ed25519/additions/ge_scalarmult.c
index 2a8881122d..e4f741b8d8 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_scalarmult.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/ge_scalarmult.c
@@ -1,4 +1,4 @@
-#include "crypto_uint32.h"
+#include "crypto_uint32.h"
 #include "ge.h"
 #include "crypto_additions.h"
 
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_scalarmult_cofactor.c b/libs/libaxolotl/src/curve25519/ed25519/additions/ge_scalarmult_cofactor.c
index e219f2581d..6affbb05d5 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/ge_scalarmult_cofactor.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/ge_scalarmult_cofactor.c
@@ -1,4 +1,4 @@
-#include "crypto_additions.h"
+#include "crypto_additions.h"
 #include "ge.h"
 
 /*
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/keygen.c b/libs/libaxolotl/src/curve25519/ed25519/additions/keygen.c
index 3f37055684..de7cdcd598 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/keygen.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/keygen.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 #include "keygen.h"
 #include "crypto_additions.h"
 
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/keygen.h b/libs/libaxolotl/src/curve25519/ed25519/additions/keygen.h
index b6354dab29..e86e7c5582 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/keygen.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/keygen.h
@@ -1,4 +1,4 @@
-
+
 #ifndef __KEYGEN_H__
 #define __KEYGEN_H__
 
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/open_modified.c b/libs/libaxolotl/src/curve25519/ed25519/additions/open_modified.c
index d5dd9b797f..a156098191 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/open_modified.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/open_modified.c
@@ -1,4 +1,4 @@
-#include <string.h>
+#include <string.h>
 #include "crypto_sign.h"
 #include "crypto_hash_sha512.h"
 #include "crypto_verify_32.h"
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/sc_clamp.c b/libs/libaxolotl/src/curve25519/ed25519/additions/sc_clamp.c
index 3294983906..7788be9071 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/sc_clamp.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/sc_clamp.c
@@ -1,4 +1,4 @@
-#include "crypto_additions.h"
+#include "crypto_additions.h"
 
 void sc_clamp(unsigned char* a)
 {
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/sc_cmov.c b/libs/libaxolotl/src/curve25519/ed25519/additions/sc_cmov.c
index b931461a52..443a5bb71e 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/sc_cmov.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/sc_cmov.c
@@ -1,4 +1,4 @@
-#include "crypto_additions.h"
+#include "crypto_additions.h"
 
 /*
 Replace (f,g) with (g,g) if b == 1;
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/sc_neg.c b/libs/libaxolotl/src/curve25519/ed25519/additions/sc_neg.c
index 199f70a9a1..ef407d405e 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/sc_neg.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/sc_neg.c
@@ -1,4 +1,4 @@
-#include <string.h>
+#include <string.h>
 #include "crypto_additions.h"
 #include "sc.h"
 
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/sign_modified.c b/libs/libaxolotl/src/curve25519/ed25519/additions/sign_modified.c
index 04e6259f15..b2fb8c20d3 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/sign_modified.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/sign_modified.c
@@ -1,4 +1,4 @@
-#include <string.h>
+#include <string.h>
 #include "crypto_sign.h"
 #include "crypto_hash_sha512.h"
 #include "ge.h"
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/utility.c b/libs/libaxolotl/src/curve25519/ed25519/additions/utility.c
index d6a4c13a9d..c59099a9e3 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/utility.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/utility.c
@@ -1,4 +1,4 @@
-#include <stdlib.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include "utility.h"
 
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/utility.h b/libs/libaxolotl/src/curve25519/ed25519/additions/utility.h
index 2b2bbd15c2..35348782df 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/utility.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/utility.h
@@ -1,4 +1,4 @@
-
+
 #ifndef __UTILITY_H__
 #define __UTILITY_H__
 
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/vopen_modified.c b/libs/libaxolotl/src/curve25519/ed25519/additions/vopen_modified.c
index 13c8de0bd8..20b85bb155 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/vopen_modified.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/vopen_modified.c
@@ -1,4 +1,4 @@
-#include <string.h>
+#include <string.h>
 #include "sc.h"
 #include "ge.h"
 #include "crypto_hash_sha512.h"
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/vsign_modified.c b/libs/libaxolotl/src/curve25519/ed25519/additions/vsign_modified.c
index 1480cba533..518b851d63 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/vsign_modified.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/vsign_modified.c
@@ -1,4 +1,4 @@
-#include <string.h>
+#include <string.h>
 #include "crypto_sign.h"
 #include "crypto_hash_sha512.h"
 #include "ge.h"
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/vxeddsa.c b/libs/libaxolotl/src/curve25519/ed25519/additions/vxeddsa.c
index 39dae278ef..8f60169bd4 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/vxeddsa.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/vxeddsa.c
@@ -1,4 +1,4 @@
-#include <string.h>
+#include <string.h>
 #include "ge.h"
 #include "crypto_additions.h"
 #include "zeroize.h"
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/vxeddsa.h b/libs/libaxolotl/src/curve25519/ed25519/additions/vxeddsa.h
index cd29ad6d18..4e48844170 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/vxeddsa.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/vxeddsa.h
@@ -1,4 +1,4 @@
-
+
 #ifndef __VXEDDSA_H__
 #define __VXEDDSA_H__
 
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/xeddsa.c b/libs/libaxolotl/src/curve25519/ed25519/additions/xeddsa.c
index 091b604e63..63b73bf2ed 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/xeddsa.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/xeddsa.c
@@ -1,4 +1,4 @@
-#include <string.h>
+#include <string.h>
 #include "ge.h"
 #include "crypto_additions.h"
 #include "zeroize.h"
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/xeddsa.h b/libs/libaxolotl/src/curve25519/ed25519/additions/xeddsa.h
index 4128289099..b86d7f0d9d 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/xeddsa.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/xeddsa.h
@@ -1,4 +1,4 @@
-
+
 #ifndef __XEDDSA_H__
 #define __XEDDSA_H__
 
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/zeroize.c b/libs/libaxolotl/src/curve25519/ed25519/additions/zeroize.c
index b4940242f8..187e725eb5 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/zeroize.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/zeroize.c
@@ -1,4 +1,4 @@
-#include "zeroize.h"
+#include "zeroize.h"
 
 void zeroize(unsigned char* b, size_t len)
 {
diff --git a/libs/libaxolotl/src/curve25519/ed25519/additions/zeroize.h b/libs/libaxolotl/src/curve25519/ed25519/additions/zeroize.h
index 79ed97500f..0db68bb4c6 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/additions/zeroize.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/additions/zeroize.h
@@ -1,4 +1,4 @@
-#ifndef __ZEROIZE_H__
+#ifndef __ZEROIZE_H__
 #define __ZEROIZE_H__
 
 #include <stdlib.h>
diff --git a/libs/libaxolotl/src/curve25519/ed25519/base.h b/libs/libaxolotl/src/curve25519/ed25519/base.h
index 43f7ed3585..573bd8a05c 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/base.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/base.h
@@ -1,4 +1,4 @@
-{
+{
  {
   { 25967493,-14356035,29566456,3660896,-12694345,4014787,27544626,-11754271,-6079156,2047605 },
   { -12545711,934262,-2722910,3049990,-727428,9406986,12720692,5043384,19500929,-15469378 },
diff --git a/libs/libaxolotl/src/curve25519/ed25519/base2.h b/libs/libaxolotl/src/curve25519/ed25519/base2.h
index 9c936803ea..8c538440ff 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/base2.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/base2.h
@@ -1,4 +1,4 @@
- {
+ {
   { 25967493,-14356035,29566456,3660896,-12694345,4014787,27544626,-11754271,-6079156,2047605 },
   { -12545711,934262,-2722910,3049990,-727428,9406986,12720692,5043384,19500929,-15469378 },
   { -8738181,4489570,9688441,-14785194,10184609,-12363380,29287919,11864899,-24514362,-4438546 },
diff --git a/libs/libaxolotl/src/curve25519/ed25519/d.h b/libs/libaxolotl/src/curve25519/ed25519/d.h
index e37351c077..e25f578350 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/d.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/d.h
@@ -1 +1 @@
--10913610,13857413,-15372611,6949391,114729,-8787816,-6275908,-3247719,-18696448,-12055116
+-10913610,13857413,-15372611,6949391,114729,-8787816,-6275908,-3247719,-18696448,-12055116
diff --git a/libs/libaxolotl/src/curve25519/ed25519/d2.h b/libs/libaxolotl/src/curve25519/ed25519/d2.h
index 35c97db0e6..01aaec7512 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/d2.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/d2.h
@@ -1 +1 @@
--21827239,-5839606,-30745221,13898782,229458,15978800,-12551817,-6495438,29715968,9444199
+-21827239,-5839606,-30745221,13898782,229458,15978800,-12551817,-6495438,29715968,9444199
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe.h b/libs/libaxolotl/src/curve25519/ed25519/fe.h
index 54372d21c8..60c308ba46 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/fe.h
@@ -1,4 +1,4 @@
-#ifndef FE_H
+#ifndef FE_H
 #define FE_H
 
 #include "crypto_int32.h"
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_0.c b/libs/libaxolotl/src/curve25519/ed25519/fe_0.c
index ca25f00ec8..ec879d7337 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_0.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/fe_0.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 
 /*
 h = 0
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_1.c b/libs/libaxolotl/src/curve25519/ed25519/fe_1.c
index 714a5080a3..8cf7784844 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_1.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/fe_1.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 
 /*
 h = 1
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_add.c b/libs/libaxolotl/src/curve25519/ed25519/fe_add.c
index 89d9d96814..e6a81da202 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_add.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/fe_add.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 
 /*
 h = f + g
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_cmov.c b/libs/libaxolotl/src/curve25519/ed25519/fe_cmov.c
index 994982c313..8ca584fb19 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_cmov.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/fe_cmov.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 
 /*
 Replace (f,g) with (g,g) if b == 1;
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_copy.c b/libs/libaxolotl/src/curve25519/ed25519/fe_copy.c
index 66ca4a292b..9c5bf865a2 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_copy.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/fe_copy.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 
 /*
 h = f
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_frombytes.c b/libs/libaxolotl/src/curve25519/ed25519/fe_frombytes.c
index a85abc6032..5c17917487 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_frombytes.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/fe_frombytes.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 #include "crypto_int64.h"
 #include "crypto_uint64.h"
 
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_invert.c b/libs/libaxolotl/src/curve25519/ed25519/fe_invert.c
index cc23321ead..bcfdb8ff87 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_invert.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/fe_invert.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 
 void fe_invert(fe out,const fe z)
 {
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_isnegative.c b/libs/libaxolotl/src/curve25519/ed25519/fe_isnegative.c
index c427b28de6..3b2c8b8d52 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_isnegative.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/fe_isnegative.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 
 /*
 return 1 if f is in {1,3,5,...,q-2}
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_isnonzero.c b/libs/libaxolotl/src/curve25519/ed25519/fe_isnonzero.c
index 654a273ac4..0e087a783d 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_isnonzero.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/fe_isnonzero.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 #include "crypto_verify_32.h"
 
 /*
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_mul.c b/libs/libaxolotl/src/curve25519/ed25519/fe_mul.c
index 536a998638..26ca8b3682 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_mul.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/fe_mul.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 #include "crypto_int64.h"
 
 /*
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_neg.c b/libs/libaxolotl/src/curve25519/ed25519/fe_neg.c
index ae67d6b20d..2078ce5284 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_neg.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/fe_neg.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 
 /*
 h = -f
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_pow22523.c b/libs/libaxolotl/src/curve25519/ed25519/fe_pow22523.c
index 448999c803..56675a5902 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_pow22523.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/fe_pow22523.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 
 void fe_pow22523(fe out,const fe z)
 {
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_sq.c b/libs/libaxolotl/src/curve25519/ed25519/fe_sq.c
index a4a2c5f478..8dd119841c 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_sq.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/fe_sq.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 #include "crypto_int64.h"
 
 /*
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_sq2.c b/libs/libaxolotl/src/curve25519/ed25519/fe_sq2.c
index b58e36935d..026ed3aacf 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_sq2.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/fe_sq2.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 #include "crypto_int64.h"
 
 /*
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_sub.c b/libs/libaxolotl/src/curve25519/ed25519/fe_sub.c
index 05cfe6c07e..6e26b7df8f 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_sub.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/fe_sub.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 
 /*
 h = f - g
diff --git a/libs/libaxolotl/src/curve25519/ed25519/fe_tobytes.c b/libs/libaxolotl/src/curve25519/ed25519/fe_tobytes.c
index 14f88adac1..0a63baf9c1 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/fe_tobytes.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/fe_tobytes.c
@@ -1,4 +1,4 @@
-#include "fe.h"
+#include "fe.h"
 
 /*
 Preconditions:
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge.h b/libs/libaxolotl/src/curve25519/ed25519/ge.h
index 475cb36ceb..55e95f95b6 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge.h
@@ -1,4 +1,4 @@
-#ifndef GE_H
+#ifndef GE_H
 #define GE_H
 
 /*
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_add.c b/libs/libaxolotl/src/curve25519/ed25519/ge_add.c
index 8ef65b6167..da7ff5d2eb 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_add.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_add.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 
 /*
 r = p + q
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_add.h b/libs/libaxolotl/src/curve25519/ed25519/ge_add.h
index a690dee8d6..7481f8ffbe 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_add.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_add.h
@@ -1,4 +1,4 @@
-
+
 /* qhasm: enter ge_add */
 
 /* qhasm: fe X1 */
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_double_scalarmult.c b/libs/libaxolotl/src/curve25519/ed25519/ge_double_scalarmult.c
index 6b9376af4a..f8bf4bf775 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_double_scalarmult.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_double_scalarmult.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 
 static void slide(signed char *r,const unsigned char *a)
 {
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_frombytes.c b/libs/libaxolotl/src/curve25519/ed25519/ge_frombytes.c
index 9cb18ee319..1a059ee93f 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_frombytes.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_frombytes.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 
 static const fe d = {
 #include "d.h"
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_madd.c b/libs/libaxolotl/src/curve25519/ed25519/ge_madd.c
index 22b2bf7f7d..622571774b 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_madd.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_madd.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 
 /*
 r = p + q
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_madd.h b/libs/libaxolotl/src/curve25519/ed25519/ge_madd.h
index ca1c8ba203..ecae84952b 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_madd.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_madd.h
@@ -1,4 +1,4 @@
-
+
 /* qhasm: enter ge_madd */
 
 /* qhasm: fe X1 */
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_msub.c b/libs/libaxolotl/src/curve25519/ed25519/ge_msub.c
index 3e290ea300..741ecbf113 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_msub.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_msub.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 
 /*
 r = p - q
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_msub.h b/libs/libaxolotl/src/curve25519/ed25519/ge_msub.h
index 10f646c6d7..500f986ba0 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_msub.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_msub.h
@@ -1,4 +1,4 @@
-
+
 /* qhasm: enter ge_msub */
 
 /* qhasm: fe X1 */
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p1p1_to_p2.c b/libs/libaxolotl/src/curve25519/ed25519/ge_p1p1_to_p2.c
index 123ec4148e..9bb5013d66 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p1p1_to_p2.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_p1p1_to_p2.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 
 /*
 r = p
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p1p1_to_p3.c b/libs/libaxolotl/src/curve25519/ed25519/ge_p1p1_to_p3.c
index 5f2b9b7d95..2f57b10968 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p1p1_to_p3.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_p1p1_to_p3.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 
 /*
 r = p
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p2_0.c b/libs/libaxolotl/src/curve25519/ed25519/ge_p2_0.c
index b33b321648..6191d1e6e4 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p2_0.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_p2_0.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 
 void ge_p2_0(ge_p2 *h)
 {
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p2_dbl.c b/libs/libaxolotl/src/curve25519/ed25519/ge_p2_dbl.c
index f013b2872a..2e332b5cee 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p2_dbl.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_p2_dbl.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 
 /*
 r = 2 * p
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p2_dbl.h b/libs/libaxolotl/src/curve25519/ed25519/ge_p2_dbl.h
index ec7a105c8b..128efed907 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p2_dbl.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_p2_dbl.h
@@ -1,4 +1,4 @@
-
+
 /* qhasm: enter ge_p2_dbl */
 
 /* qhasm: fe X1 */
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_0.c b/libs/libaxolotl/src/curve25519/ed25519/ge_p3_0.c
index fcfcd63569..401b2935a1 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_0.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_p3_0.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 
 void ge_p3_0(ge_p3 *h)
 {
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_dbl.c b/libs/libaxolotl/src/curve25519/ed25519/ge_p3_dbl.c
index 1091f98e08..0d8a05915d 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_dbl.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_p3_dbl.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 
 /*
 r = 2 * p
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_to_cached.c b/libs/libaxolotl/src/curve25519/ed25519/ge_p3_to_cached.c
index 76cd1f8f82..bde64228cf 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_to_cached.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_p3_to_cached.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 
 /*
 r = p
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_to_p2.c b/libs/libaxolotl/src/curve25519/ed25519/ge_p3_to_p2.c
index d26a09f7ec..e532a9e4cb 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_to_p2.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_p3_to_p2.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 
 /*
 r = p
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_tobytes.c b/libs/libaxolotl/src/curve25519/ed25519/ge_p3_tobytes.c
index a112daf699..21cb2fc656 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_p3_tobytes.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_p3_tobytes.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 
 void ge_p3_tobytes(unsigned char *s,const ge_p3 *h)
 {
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_precomp_0.c b/libs/libaxolotl/src/curve25519/ed25519/ge_precomp_0.c
index 2673d58096..2e218861d8 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_precomp_0.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_precomp_0.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 
 void ge_precomp_0(ge_precomp *h)
 {
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_scalarmult_base.c b/libs/libaxolotl/src/curve25519/ed25519/ge_scalarmult_base.c
index 006225f8d2..421e4fa0fb 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_scalarmult_base.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_scalarmult_base.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 #include "crypto_uint32.h"
 
 static unsigned char equal(signed char b,signed char c)
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_sub.c b/libs/libaxolotl/src/curve25519/ed25519/ge_sub.c
index 84c4d2e208..69f3d54062 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_sub.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_sub.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 
 /*
 r = p - q
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_sub.h b/libs/libaxolotl/src/curve25519/ed25519/ge_sub.h
index 59f082ea5f..b4ef1f5dd0 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_sub.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_sub.h
@@ -1,4 +1,4 @@
-
+
 /* qhasm: enter ge_sub */
 
 /* qhasm: fe X1 */
diff --git a/libs/libaxolotl/src/curve25519/ed25519/ge_tobytes.c b/libs/libaxolotl/src/curve25519/ed25519/ge_tobytes.c
index 59baeed5c1..31b3d33e09 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/ge_tobytes.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/ge_tobytes.c
@@ -1,4 +1,4 @@
-#include "ge.h"
+#include "ge.h"
 
 void ge_tobytes(unsigned char *s,const ge_p2 *h)
 {
diff --git a/libs/libaxolotl/src/curve25519/ed25519/main/main.c b/libs/libaxolotl/src/curve25519/ed25519/main/main.c
index 2f32d6b389..9d6599467e 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/main/main.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/main/main.c
@@ -1,4 +1,4 @@
-#include "tests.h"
+#include "tests.h"
 
 
 int main(int argc, char* argv[])
diff --git a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_int32.h b/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_int32.h
index 3c62609c72..cae135e6e2 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_int32.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_int32.h
@@ -1,4 +1,4 @@
-#ifndef crypto_int32_h
+#ifndef crypto_int32_h
 #define crypto_int32_h
 
 typedef int crypto_int32;
diff --git a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_int64.h b/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_int64.h
index 294490ae44..fc92417b62 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_int64.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_int64.h
@@ -1,4 +1,4 @@
-#ifndef crypto_int64_h
+#ifndef crypto_int64_h
 #define crypto_int64_h
 
 typedef long long crypto_int64;
diff --git a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_sign.h b/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_sign.h
index 4419fcc714..8472603e91 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_sign.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_sign.h
@@ -1,4 +1,4 @@
-#ifndef crypto_sign_H
+#ifndef crypto_sign_H
 #define crypto_sign_H
 
 #include "crypto_sign_edwards25519sha512batch.h"
diff --git a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_sign_edwards25519sha512batch.h b/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_sign_edwards25519sha512batch.h
index 75c357749d..62fae61163 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_sign_edwards25519sha512batch.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_sign_edwards25519sha512batch.h
@@ -1,4 +1,4 @@
-#ifndef crypto_sign_edwards25519sha512batch_H
+#ifndef crypto_sign_edwards25519sha512batch_H
 #define crypto_sign_edwards25519sha512batch_H
 
 #define crypto_sign_edwards25519sha512batch_ref10_SECRETKEYBYTES 64
diff --git a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_uint32.h b/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_uint32.h
index c0b072cc8f..21020d7b57 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_uint32.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_uint32.h
@@ -1,4 +1,4 @@
-#ifndef crypto_uint32_h
+#ifndef crypto_uint32_h
 #define crypto_uint32_h
 
 typedef unsigned int crypto_uint32;
diff --git a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_uint64.h b/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_uint64.h
index 8f385c8757..5aa0070375 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_uint64.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_uint64.h
@@ -1,4 +1,4 @@
-#ifndef crypto_uint64_h
+#ifndef crypto_uint64_h
 #define crypto_uint64_h
 
 typedef unsigned long long crypto_uint64;
diff --git a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_verify_32.h b/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_verify_32.h
index 2eab150ad1..978d845222 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_verify_32.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/nacl_includes/crypto_verify_32.h
@@ -1,4 +1,4 @@
-#ifndef crypto_verify_32_H
+#ifndef crypto_verify_32_H
 #define crypto_verify_32_H
 
 #define crypto_verify_32_ref_BYTES 32
diff --git a/libs/libaxolotl/src/curve25519/ed25519/nacl_sha512/blocks.c b/libs/libaxolotl/src/curve25519/ed25519/nacl_sha512/blocks.c
index ffb60bda6b..1c5f23d5cc 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/nacl_sha512/blocks.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/nacl_sha512/blocks.c
@@ -1,4 +1,4 @@
-#include <stdint.h>
+#include <stdint.h>
 typedef uint64_t uint64;
 
 static uint64 load_bigendian(const unsigned char *x)
diff --git a/libs/libaxolotl/src/curve25519/ed25519/nacl_sha512/hash.c b/libs/libaxolotl/src/curve25519/ed25519/nacl_sha512/hash.c
index 634218d5b0..8934cc18a8 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/nacl_sha512/hash.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/nacl_sha512/hash.c
@@ -1,4 +1,4 @@
-/*
+/*
 20080913
 D. J. Bernstein
 Public domain.
diff --git a/libs/libaxolotl/src/curve25519/ed25519/open.c b/libs/libaxolotl/src/curve25519/ed25519/open.c
index 749673b798..1ec4cd2bfd 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/open.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/open.c
@@ -1,4 +1,4 @@
-#include <string.h>
+#include <string.h>
 #include "crypto_sign.h"
 #include "crypto_hash_sha512.h"
 #include "crypto_verify_32.h"
diff --git a/libs/libaxolotl/src/curve25519/ed25519/pow22523.h b/libs/libaxolotl/src/curve25519/ed25519/pow22523.h
index 4734a420c2..60ffe0d34c 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/pow22523.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/pow22523.h
@@ -1,4 +1,4 @@
-
+
 /* qhasm: fe z1 */
 
 /* qhasm: fe z2 */
diff --git a/libs/libaxolotl/src/curve25519/ed25519/pow225521.h b/libs/libaxolotl/src/curve25519/ed25519/pow225521.h
index 8888e2bfb1..109df779a2 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/pow225521.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/pow225521.h
@@ -1,4 +1,4 @@
-
+
 /* qhasm: fe z1 */
 
 /* qhasm: fe z2 */
diff --git a/libs/libaxolotl/src/curve25519/ed25519/sc.h b/libs/libaxolotl/src/curve25519/ed25519/sc.h
index f01be711c7..d32ed2e8ca 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/sc.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/sc.h
@@ -1,4 +1,4 @@
-#ifndef SC_H
+#ifndef SC_H
 #define SC_H
 
 /*
diff --git a/libs/libaxolotl/src/curve25519/ed25519/sc_muladd.c b/libs/libaxolotl/src/curve25519/ed25519/sc_muladd.c
index da8a30fa1e..6f1e9d02d6 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/sc_muladd.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/sc_muladd.c
@@ -1,4 +1,4 @@
-#include "sc.h"
+#include "sc.h"
 #include "crypto_int64.h"
 #include "crypto_uint32.h"
 #include "crypto_uint64.h"
diff --git a/libs/libaxolotl/src/curve25519/ed25519/sc_reduce.c b/libs/libaxolotl/src/curve25519/ed25519/sc_reduce.c
index 8478577728..d01f5a5737 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/sc_reduce.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/sc_reduce.c
@@ -1,4 +1,4 @@
-#include "sc.h"
+#include "sc.h"
 #include "crypto_int64.h"
 #include "crypto_uint32.h"
 #include "crypto_uint64.h"
diff --git a/libs/libaxolotl/src/curve25519/ed25519/sign.c b/libs/libaxolotl/src/curve25519/ed25519/sign.c
index dd6b4bb075..de53742a6c 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/sign.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/sign.c
@@ -1,4 +1,4 @@
-#include <string.h>
+#include <string.h>
 #include "crypto_sign.h"
 #include "crypto_hash_sha512.h"
 #include "ge.h"
diff --git a/libs/libaxolotl/src/curve25519/ed25519/sqrtm1.h b/libs/libaxolotl/src/curve25519/ed25519/sqrtm1.h
index 8203f7434f..d8caa23b6a 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/sqrtm1.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/sqrtm1.h
@@ -1 +1 @@
--32595792,-7943725,9377950,3500415,12389472,-272473,-25146209,-2005654,326686,11406482
+-32595792,-7943725,9377950,3500415,12389472,-272473,-25146209,-2005654,326686,11406482
diff --git a/libs/libaxolotl/src/curve25519/ed25519/tests/tests.c b/libs/libaxolotl/src/curve25519/ed25519/tests/tests.c
index 3bdc4ea846..a647383e71 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/tests/tests.c
+++ b/libs/libaxolotl/src/curve25519/ed25519/tests/tests.c
@@ -1,4 +1,4 @@
-#include <stdlib.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include "crypto_hash_sha512.h"
diff --git a/libs/libaxolotl/src/curve25519/ed25519/tests/tests.h b/libs/libaxolotl/src/curve25519/ed25519/tests/tests.h
index 8d34dc5427..7ac1e503ca 100644
--- a/libs/libaxolotl/src/curve25519/ed25519/tests/tests.h
+++ b/libs/libaxolotl/src/curve25519/ed25519/tests/tests.h
@@ -1,4 +1,4 @@
-#ifndef __TESTS_H__
+#ifndef __TESTS_H__
 #define __TESTS_H__
 
 /* silent = 0 : prints info+error messages to stdout, abort() on test failure
diff --git a/libs/libaxolotl/src/device_consistency.c b/libs/libaxolotl/src/device_consistency.c
index 91804a07b6..4b18bc1471 100644
--- a/libs/libaxolotl/src/device_consistency.c
+++ b/libs/libaxolotl/src/device_consistency.c
@@ -1,4 +1,4 @@
-#include "device_consistency.h"
+#include "device_consistency.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/libs/libaxolotl/src/device_consistency.h b/libs/libaxolotl/src/device_consistency.h
index b429319eb4..379d04471c 100644
--- a/libs/libaxolotl/src/device_consistency.h
+++ b/libs/libaxolotl/src/device_consistency.h
@@ -1,4 +1,4 @@
-#ifndef DEVICE_CONSISTENCY_H
+#ifndef DEVICE_CONSISTENCY_H
 #define DEVICE_CONSISTENCY_H
 
 #include "signal_protocol_types.h"
diff --git a/libs/libaxolotl/src/fingerprint.c b/libs/libaxolotl/src/fingerprint.c
index cbaeb682a5..42827825cc 100644
--- a/libs/libaxolotl/src/fingerprint.c
+++ b/libs/libaxolotl/src/fingerprint.c
@@ -1,4 +1,4 @@
-#include "fingerprint.h"
+#include "fingerprint.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/libs/libaxolotl/src/fingerprint.h b/libs/libaxolotl/src/fingerprint.h
index bdd45d2fb7..4d61e4f788 100644
--- a/libs/libaxolotl/src/fingerprint.h
+++ b/libs/libaxolotl/src/fingerprint.h
@@ -1,4 +1,4 @@
-#ifndef FINGERPRINT_H
+#ifndef FINGERPRINT_H
 #define FINGERPRINT_H
 
 #include "signal_protocol_types.h"
diff --git a/libs/libaxolotl/src/group_cipher.c b/libs/libaxolotl/src/group_cipher.c
index 9217d8240b..05ea320d98 100644
--- a/libs/libaxolotl/src/group_cipher.c
+++ b/libs/libaxolotl/src/group_cipher.c
@@ -1,4 +1,4 @@
-#include "group_cipher.h"
+#include "group_cipher.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/libs/libaxolotl/src/group_cipher.h b/libs/libaxolotl/src/group_cipher.h
index 3688d24b3a..2ac7e6508f 100644
--- a/libs/libaxolotl/src/group_cipher.h
+++ b/libs/libaxolotl/src/group_cipher.h
@@ -1,4 +1,4 @@
-#ifndef GROUP_CIPHER_H
+#ifndef GROUP_CIPHER_H
 #define GROUP_CIPHER_H
 
 #include <stdint.h>
diff --git a/libs/libaxolotl/src/group_session_builder.c b/libs/libaxolotl/src/group_session_builder.c
index 4b6e639ed3..13db334c8e 100644
--- a/libs/libaxolotl/src/group_session_builder.c
+++ b/libs/libaxolotl/src/group_session_builder.c
@@ -1,4 +1,4 @@
-#include "group_session_builder.h"
+#include "group_session_builder.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/libs/libaxolotl/src/group_session_builder.h b/libs/libaxolotl/src/group_session_builder.h
index 859259c1da..1d87d53a7f 100644
--- a/libs/libaxolotl/src/group_session_builder.h
+++ b/libs/libaxolotl/src/group_session_builder.h
@@ -1,4 +1,4 @@
-#ifndef GROUP_SESSION_BUILDER_H
+#ifndef GROUP_SESSION_BUILDER_H
 #define GROUP_SESSION_BUILDER_H
 
 #include "signal_protocol_types.h"
diff --git a/libs/libaxolotl/src/hkdf.c b/libs/libaxolotl/src/hkdf.c
index 6e28a6d85d..d8df253c8b 100644
--- a/libs/libaxolotl/src/hkdf.c
+++ b/libs/libaxolotl/src/hkdf.c
@@ -1,4 +1,4 @@
-#include "hkdf.h"
+#include "hkdf.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libs/libaxolotl/src/hkdf.h b/libs/libaxolotl/src/hkdf.h
index f3bfdddfd7..43ee870401 100644
--- a/libs/libaxolotl/src/hkdf.h
+++ b/libs/libaxolotl/src/hkdf.h
@@ -1,4 +1,4 @@
-#ifndef HKDF_H
+#ifndef HKDF_H
 #define HKDF_H
 
 #include <stdint.h>
diff --git a/libs/libaxolotl/src/key_helper.c b/libs/libaxolotl/src/key_helper.c
index f72cbb589e..80deb6ab08 100644
--- a/libs/libaxolotl/src/key_helper.c
+++ b/libs/libaxolotl/src/key_helper.c
@@ -1,4 +1,4 @@
-#include "key_helper.h"
+#include "key_helper.h"
 
 #include <assert.h>
 
diff --git a/libs/libaxolotl/src/key_helper.h b/libs/libaxolotl/src/key_helper.h
index e0144e4b05..be3ef8429f 100644
--- a/libs/libaxolotl/src/key_helper.h
+++ b/libs/libaxolotl/src/key_helper.h
@@ -1,4 +1,4 @@
-#ifndef KEY_HELPER_H
+#ifndef KEY_HELPER_H
 #define KEY_HELPER_H
 
 #include <stdint.h>
diff --git a/libs/libaxolotl/src/protobuf-c/CMakeLists.txt b/libs/libaxolotl/src/protobuf-c/CMakeLists.txt
index 6a6422cb80..1af25df194 100644
--- a/libs/libaxolotl/src/protobuf-c/CMakeLists.txt
+++ b/libs/libaxolotl/src/protobuf-c/CMakeLists.txt
@@ -1,4 +1,4 @@
-IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-shadow")
 ENDIF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
 
diff --git a/libs/libaxolotl/src/protobuf-c/protobuf-c.c b/libs/libaxolotl/src/protobuf-c/protobuf-c.c
index 2cdc347c78..4f2f5bcc73 100644
--- a/libs/libaxolotl/src/protobuf-c/protobuf-c.c
+++ b/libs/libaxolotl/src/protobuf-c/protobuf-c.c
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2008-2015, Dave Benson and the protobuf-c authors.
  * All rights reserved.
  *
diff --git a/libs/libaxolotl/src/protobuf-c/protobuf-c.h b/libs/libaxolotl/src/protobuf-c/protobuf-c.h
index 2e5d7695c4..705a1f7003 100644
--- a/libs/libaxolotl/src/protobuf-c/protobuf-c.h
+++ b/libs/libaxolotl/src/protobuf-c/protobuf-c.h
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2008-2014, Dave Benson and the protobuf-c authors.
  * All rights reserved.
  *
diff --git a/libs/libaxolotl/src/protocol.c b/libs/libaxolotl/src/protocol.c
index f4c323d93d..c2b97344e6 100644
--- a/libs/libaxolotl/src/protocol.c
+++ b/libs/libaxolotl/src/protocol.c
@@ -1,4 +1,4 @@
-#include "protocol.h"
+#include "protocol.h"
 
 #include <string.h>
 #include <assert.h>
diff --git a/libs/libaxolotl/src/protocol.h b/libs/libaxolotl/src/protocol.h
index 324f3ac9af..73c2df9d86 100644
--- a/libs/libaxolotl/src/protocol.h
+++ b/libs/libaxolotl/src/protocol.h
@@ -1,4 +1,4 @@
-#ifndef PROTOCOL_H
+#ifndef PROTOCOL_H
 #define PROTOCOL_H
 
 #include <stdint.h>
diff --git a/libs/libaxolotl/src/ratchet.c b/libs/libaxolotl/src/ratchet.c
index 36fdcd975c..83ab5a1eac 100755
--- a/libs/libaxolotl/src/ratchet.c
+++ b/libs/libaxolotl/src/ratchet.c
@@ -1,4 +1,4 @@
-#include "ratchet.h"
+#include "ratchet.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libs/libaxolotl/src/ratchet.h b/libs/libaxolotl/src/ratchet.h
index 21f3c7f6d4..e42c98a61e 100644
--- a/libs/libaxolotl/src/ratchet.h
+++ b/libs/libaxolotl/src/ratchet.h
@@ -1,4 +1,4 @@
-#ifndef RATCHET_H
+#ifndef RATCHET_H
 #define RATCHET_H
 
 #include <stdint.h>
diff --git a/libs/libaxolotl/src/sender_key.c b/libs/libaxolotl/src/sender_key.c
index bcbf0f3cfc..31d7499499 100644
--- a/libs/libaxolotl/src/sender_key.c
+++ b/libs/libaxolotl/src/sender_key.c
@@ -1,4 +1,4 @@
-#include "sender_key.h"
+#include "sender_key.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/libs/libaxolotl/src/sender_key.h b/libs/libaxolotl/src/sender_key.h
index 9ef15edfcf..113bb5daa8 100644
--- a/libs/libaxolotl/src/sender_key.h
+++ b/libs/libaxolotl/src/sender_key.h
@@ -1,4 +1,4 @@
-#ifndef SENDER_KEY
+#ifndef SENDER_KEY
 #define SENDER_KEY
 
 #include <stdint.h>
diff --git a/libs/libaxolotl/src/sender_key_record.c b/libs/libaxolotl/src/sender_key_record.c
index 54bc768153..9c7a2beeed 100644
--- a/libs/libaxolotl/src/sender_key_record.c
+++ b/libs/libaxolotl/src/sender_key_record.c
@@ -1,4 +1,4 @@
-#include "sender_key_record.h"
+#include "sender_key_record.h"
 
 #include <string.h>
 
diff --git a/libs/libaxolotl/src/sender_key_record.h b/libs/libaxolotl/src/sender_key_record.h
index f7c0a7c1cf..4cc4f92715 100644
--- a/libs/libaxolotl/src/sender_key_record.h
+++ b/libs/libaxolotl/src/sender_key_record.h
@@ -1,4 +1,4 @@
-#ifndef SENDER_KEY_RECORD_H
+#ifndef SENDER_KEY_RECORD_H
 #define SENDER_KEY_RECORD_H
 
 #include "signal_protocol_types.h"
diff --git a/libs/libaxolotl/src/sender_key_state.c b/libs/libaxolotl/src/sender_key_state.c
index fc4e3a97a9..0b19cb7412 100644
--- a/libs/libaxolotl/src/sender_key_state.c
+++ b/libs/libaxolotl/src/sender_key_state.c
@@ -1,4 +1,4 @@
-#include "sender_key_state.h"
+#include "sender_key_state.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/libs/libaxolotl/src/sender_key_state.h b/libs/libaxolotl/src/sender_key_state.h
index fef3fed363..968c7fb753 100644
--- a/libs/libaxolotl/src/sender_key_state.h
+++ b/libs/libaxolotl/src/sender_key_state.h
@@ -1,4 +1,4 @@
-#ifndef SENDER_KEY_STATE_H
+#ifndef SENDER_KEY_STATE_H
 #define SENDER_KEY_STATE_H
 
 #include <stdint.h>
diff --git a/libs/libaxolotl/src/session_builder.c b/libs/libaxolotl/src/session_builder.c
index 9ab72ad765..2bfd62015f 100644
--- a/libs/libaxolotl/src/session_builder.c
+++ b/libs/libaxolotl/src/session_builder.c
@@ -1,4 +1,4 @@
-#include "session_builder.h"
+#include "session_builder.h"
 #include "session_builder_internal.h"
 
 #include <assert.h>
diff --git a/libs/libaxolotl/src/session_builder.h b/libs/libaxolotl/src/session_builder.h
index 2a2ccd6b19..6e56ba24f0 100644
--- a/libs/libaxolotl/src/session_builder.h
+++ b/libs/libaxolotl/src/session_builder.h
@@ -1,4 +1,4 @@
-#ifndef SESSION_BUILDER_H
+#ifndef SESSION_BUILDER_H
 #define SESSION_BUILDER_H
 
 #include <stdint.h>
diff --git a/libs/libaxolotl/src/session_builder_internal.h b/libs/libaxolotl/src/session_builder_internal.h
index 269b4f3ddb..2bf8dba4e0 100644
--- a/libs/libaxolotl/src/session_builder_internal.h
+++ b/libs/libaxolotl/src/session_builder_internal.h
@@ -1,4 +1,4 @@
-#ifndef SESSION_BUILDER_INTERNAL_H
+#ifndef SESSION_BUILDER_INTERNAL_H
 #define SESSION_BUILDER_INTERNAL_H
 
 #include <stdint.h>
diff --git a/libs/libaxolotl/src/session_cipher.c b/libs/libaxolotl/src/session_cipher.c
index 74be581a38..3f5dcab953 100644
--- a/libs/libaxolotl/src/session_cipher.c
+++ b/libs/libaxolotl/src/session_cipher.c
@@ -1,4 +1,4 @@
-#include "session_cipher.h"
+#include "session_cipher.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/libs/libaxolotl/src/session_cipher.h b/libs/libaxolotl/src/session_cipher.h
index ded5614cde..0c1cd47f89 100644
--- a/libs/libaxolotl/src/session_cipher.h
+++ b/libs/libaxolotl/src/session_cipher.h
@@ -1,4 +1,4 @@
-#ifndef SESSION_CIPHER_H
+#ifndef SESSION_CIPHER_H
 #define SESSION_CIPHER_H
 
 #include <stdint.h>
diff --git a/libs/libaxolotl/src/session_pre_key.c b/libs/libaxolotl/src/session_pre_key.c
index 7d04e965a1..416ed6a1f5 100644
--- a/libs/libaxolotl/src/session_pre_key.c
+++ b/libs/libaxolotl/src/session_pre_key.c
@@ -1,4 +1,4 @@
-#include "session_pre_key.h"
+#include "session_pre_key.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/libs/libaxolotl/src/session_pre_key.h b/libs/libaxolotl/src/session_pre_key.h
index 08e18c0441..ff8a9a8de2 100644
--- a/libs/libaxolotl/src/session_pre_key.h
+++ b/libs/libaxolotl/src/session_pre_key.h
@@ -1,4 +1,4 @@
-#ifndef SESSION_PRE_KEY_H
+#ifndef SESSION_PRE_KEY_H
 #define SESSION_PRE_KEY_H
 
 #include <stdint.h>
diff --git a/libs/libaxolotl/src/session_record.c b/libs/libaxolotl/src/session_record.c
index bde039a5bc..0f72e90f83 100644
--- a/libs/libaxolotl/src/session_record.c
+++ b/libs/libaxolotl/src/session_record.c
@@ -1,4 +1,4 @@
-#include "session_record.h"
+#include "session_record.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/libs/libaxolotl/src/session_record.h b/libs/libaxolotl/src/session_record.h
index ec775d7c4f..581e232640 100644
--- a/libs/libaxolotl/src/session_record.h
+++ b/libs/libaxolotl/src/session_record.h
@@ -1,4 +1,4 @@
-#ifndef SESSION_RECORD_H
+#ifndef SESSION_RECORD_H
 #define SESSION_RECORD_H
 
 #include <stdint.h>
diff --git a/libs/libaxolotl/src/session_state.c b/libs/libaxolotl/src/session_state.c
index e9dce4e5c2..94cf9d3014 100644
--- a/libs/libaxolotl/src/session_state.c
+++ b/libs/libaxolotl/src/session_state.c
@@ -1,4 +1,4 @@
-#include "session_state.h"
+#include "session_state.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/libs/libaxolotl/src/session_state.h b/libs/libaxolotl/src/session_state.h
index 08fc4c9641..ef1ecaed97 100644
--- a/libs/libaxolotl/src/session_state.h
+++ b/libs/libaxolotl/src/session_state.h
@@ -1,4 +1,4 @@
-#ifndef SESSION_STATE_H
+#ifndef SESSION_STATE_H
 #define SESSION_STATE_H
 
 #include <stdint.h>
diff --git a/libs/libaxolotl/src/signal.def b/libs/libaxolotl/src/signal.def
index 75ec0ef00a..9d311f24cd 100755
--- a/libs/libaxolotl/src/signal.def
+++ b/libs/libaxolotl/src/signal.def
@@ -1,4 +1,4 @@
-LIBRARY libaxolotl.mir
+LIBRARY libaxolotl.mir
 
 EXPORTS
    signal_type_ref
diff --git a/libs/libaxolotl/src/signal_protocol.c b/libs/libaxolotl/src/signal_protocol.c
index 87c9a6e657..11b0c51645 100644
--- a/libs/libaxolotl/src/signal_protocol.c
+++ b/libs/libaxolotl/src/signal_protocol.c
@@ -1,4 +1,4 @@
-#include "signal_protocol.h"
+#include "signal_protocol.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libs/libaxolotl/src/signal_protocol.h b/libs/libaxolotl/src/signal_protocol.h
index 45b7ea9c26..e2ff5d6812 100644
--- a/libs/libaxolotl/src/signal_protocol.h
+++ b/libs/libaxolotl/src/signal_protocol.h
@@ -1,4 +1,4 @@
-#ifndef SIGNAL_PROTOCOL_H
+#ifndef SIGNAL_PROTOCOL_H
 #define SIGNAL_PROTOCOL_H
 
 #include <stdio.h>
diff --git a/libs/libaxolotl/src/signal_protocol_internal.h b/libs/libaxolotl/src/signal_protocol_internal.h
index a5f37af689..de89876c00 100755
--- a/libs/libaxolotl/src/signal_protocol_internal.h
+++ b/libs/libaxolotl/src/signal_protocol_internal.h
@@ -1,4 +1,4 @@
-#ifndef SIGNAL_PROTOCOL_INTERNAL_H
+#ifndef SIGNAL_PROTOCOL_INTERNAL_H
 #define SIGNAL_PROTOCOL_INTERNAL_H
 
 #include "protobuf-c/protobuf-c.h"
diff --git a/libs/libaxolotl/src/signal_protocol_types.h b/libs/libaxolotl/src/signal_protocol_types.h
index c16322cdce..b45fa4c7e0 100644
--- a/libs/libaxolotl/src/signal_protocol_types.h
+++ b/libs/libaxolotl/src/signal_protocol_types.h
@@ -1,4 +1,4 @@
-#ifndef SIGNAL_PROTOCOL_TYPES_H
+#ifndef SIGNAL_PROTOCOL_TYPES_H
 #define SIGNAL_PROTOCOL_TYPES_H
 
 #include <stdint.h>
diff --git a/libs/libaxolotl/src/signal_utarray.h b/libs/libaxolotl/src/signal_utarray.h
index 0b37e673ca..682fc0f0bf 100644
--- a/libs/libaxolotl/src/signal_utarray.h
+++ b/libs/libaxolotl/src/signal_utarray.h
@@ -1,4 +1,4 @@
-#ifndef SIGNAL_UTARRAY_H
+#ifndef SIGNAL_UTARRAY_H
 #define SIGNAL_UTARRAY_H
 
 #include "signal_protocol.h"
diff --git a/libs/libaxolotl/src/stdafx.cxx b/libs/libaxolotl/src/stdafx.cxx
index f2abe4d94b..6f97ed9a4e 100644
--- a/libs/libaxolotl/src/stdafx.cxx
+++ b/libs/libaxolotl/src/stdafx.cxx
@@ -1,4 +1,4 @@
-/*

+/*

 

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

 

diff --git a/libs/libaxolotl/src/stdafx.h b/libs/libaxolotl/src/stdafx.h
index dba8b9e081..f79178b6bb 100644
--- a/libs/libaxolotl/src/stdafx.h
+++ b/libs/libaxolotl/src/stdafx.h
@@ -1,4 +1,4 @@
-/*

+/*

 

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

 

diff --git a/libs/libaxolotl/src/utarray.h b/libs/libaxolotl/src/utarray.h
index 4af4f1bd5f..979e99e98e 100644
--- a/libs/libaxolotl/src/utarray.h
+++ b/libs/libaxolotl/src/utarray.h
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2008-2016, Troy D. Hanson   http://troydhanson.github.com/uthash/
 All rights reserved.
 
diff --git a/libs/libaxolotl/src/uthash.h b/libs/libaxolotl/src/uthash.h
index 7b89358ee8..775599c9a8 100644
--- a/libs/libaxolotl/src/uthash.h
+++ b/libs/libaxolotl/src/uthash.h
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2016, Troy D. Hanson     http://troydhanson.github.com/uthash/
 All rights reserved.
 
diff --git a/libs/libaxolotl/src/utlist.h b/libs/libaxolotl/src/utlist.h
index 25d6c12ffb..9b5534ffbd 100644
--- a/libs/libaxolotl/src/utlist.h
+++ b/libs/libaxolotl/src/utlist.h
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2007-2016, Troy D. Hanson   http://troydhanson.github.com/uthash/
 All rights reserved.
 
diff --git a/libs/libaxolotl/src/vpool.c b/libs/libaxolotl/src/vpool.c
index 01133f97e9..97b4ec8dd4 100644
--- a/libs/libaxolotl/src/vpool.c
+++ b/libs/libaxolotl/src/vpool.c
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2006, 2008 Alexey Vatchenko <av@bsdua.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/libs/libaxolotl/src/vpool.h b/libs/libaxolotl/src/vpool.h
index 8f3f882bcc..04707cb9ae 100644
--- a/libs/libaxolotl/src/vpool.h
+++ b/libs/libaxolotl/src/vpool.h
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2006, 2008 Alexey Vatchenko <av@bsdua.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any