diff --git a/crypto/dap_enc_bliss.c b/crypto/dap_enc_bliss.c
index e7a1e0cad0053585db72a97c5bfd2fc4b25eadcc..4610d36203672689100ba22694ac64412ebc95ba 100644
--- a/crypto/dap_enc_bliss.c
+++ b/crypto/dap_enc_bliss.c
@@ -5,6 +5,7 @@
 #include "dap_enc_bliss.h"
 #include "dap_common.h"
 #include "dap_rand.h"
+#define LOG_TAG "dap_enc_sig_bliss"
 
 static enum DAP_BLISS_SIGN_SECURITY _bliss_type = MAX_SECURITY; // by default
 
diff --git a/crypto/dap_enc_bliss.h b/crypto/dap_enc_bliss.h
index 9b4d0317629860862e492bdf50140e024a13bbad..73f2f25a7b261b4ddd2a2a1437fd442df2215c9a 100644
--- a/crypto/dap_enc_bliss.h
+++ b/crypto/dap_enc_bliss.h
@@ -1,12 +1,8 @@
-
-#ifndef _DAP_ENC_BLISS_H_
-#define _DAP_ENC_BLISS_H_
+#pragma once
 
 #include "sig_bliss/bliss_b_params.h"
 #include "dap_enc_key.h"
 
-#undef LOG_TAG
-#define LOG_TAG "dap_enc_sig_bliss"
 
 enum DAP_BLISS_SIGN_SECURITY {
     TOY = 0, MAX_SPEED, MIN_SIZE, SPEED_AND_SECURITY, MAX_SECURITY
@@ -28,5 +24,3 @@ size_t dap_enc_sig_bliss_verify_sign(struct dap_enc_key * key,const void * msg,
 
 void dap_enc_sig_bliss_key_delete(struct dap_enc_key *key);
 
-
-#endif
diff --git a/crypto/dap_enc_picnic.c b/crypto/dap_enc_picnic.c
index 902b1245b1a4a1c1120d4672858b545ceca93b93..b13116d2ceaa9ce11818b620c22206adb23c6123 100755
--- a/crypto/dap_enc_picnic.c
+++ b/crypto/dap_enc_picnic.c
@@ -8,6 +8,8 @@
 #include "picnic.h"
 #include "picnic_impl.h"
 
+#define LOG_TAG "dap_enc_picnic_sig"
+
 /**
  * Set the mark that valid keys are present
  */
@@ -74,7 +76,7 @@ void dap_enc_sig_picnic_key_new_generate(struct dap_enc_key * key, const void *k
     if(seed_size >= sizeof(unsigned char) && seed)
         parameters = (((unsigned char*) seed)[0] % (PARAMETER_SET_MAX_INDEX - 1)) + 1;
     else
-        parameters = DAP_PICNIC_SIGN_PARAMETR
+        parameters = DAP_PICNIC_SIGN_PARAMETR;
 
     key->priv_key_data_size = sizeof(picnic_privatekey_t);
     key->pub_key_data_size = sizeof(picnic_publickey_t);
diff --git a/crypto/dap_enc_picnic.h b/crypto/dap_enc_picnic.h
index 4b3522ae01afa7815ccdf7c03165d004b9072d06..7338b6a40e741ce4f886d17e1d4ea5fe856f4613 100755
--- a/crypto/dap_enc_picnic.h
+++ b/crypto/dap_enc_picnic.h
@@ -1,5 +1,27 @@
-#ifndef _DAP_ENC_PICNIC_H_
-#define _DAP_ENC_PICNIC_H_
+/*
+ * Authors:
+ * Dmitriy Gearasimov <gerasimov.dmitriy@demlabs.net>
+ * Anatoly Kurotych <anatoly.kurotych@demlabs.net>
+ * DeM Labs Inc.   https://demlabs.net
+ * Copyright  (c) 2019
+ * All rights reserved.
+
+ This file is part of DAP (Deus Applications Prototypes) the open source project
+
+    DAP (Deus Applicaions Prototypes) 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 3 of the License, or
+    (at your option) any later version.
+
+    DAP 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 any DAP based project.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -8,10 +30,8 @@ extern "C" {
 //#include "../sig_picnic/picnic.h"
 #include "dap_enc_key.h"
 
-#undef LOG_TAG
-#define LOG_TAG "dap_enc_picnic_sig"
 
-#define DAP_PICNIC_SIGN_PARAMETR 1;//determination of the scheme and level of resistance {1-6}
+#define DAP_PICNIC_SIGN_PARAMETR 1//determination of the scheme and level of resistance {1-6}
 
 void dap_enc_sig_picnic_key_new(struct dap_enc_key *key);
 
@@ -33,5 +53,3 @@ size_t dap_enc_picnic_calc_signature_size(struct dap_enc_key *key);
 }
 #endif
 
-#endif
-
diff --git a/crypto/dap_enc_tesla.c b/crypto/dap_enc_tesla.c
index 4aad699db54a5316e1687fa616b29a25fe60af2f..3e23ed6552ccea47700bb43e7de48aba2b05f29e 100755
--- a/crypto/dap_enc_tesla.c
+++ b/crypto/dap_enc_tesla.c
@@ -6,6 +6,8 @@
 #include "dap_common.h"
 #include "dap_rand.h"
 
+#define LOG_TAG "dap_enc_sig_tesla"
+
 static enum DAP_TESLA_SIGN_SECURITY _tesla_type = HEURISTIC_MAX_SECURITY_AND_MAX_SPEED; // by default
 
 void dap_enc_sig_tesla_set_type(enum DAP_TESLA_SIGN_SECURITY type)
diff --git a/crypto/dap_enc_tesla.h b/crypto/dap_enc_tesla.h
index 50c9f037393aa8a25459e5655b928de9ba704566..a3e4c198bf96e4d7ab19fa74072a73a3a9687df9 100755
--- a/crypto/dap_enc_tesla.h
+++ b/crypto/dap_enc_tesla.h
@@ -4,8 +4,6 @@
 #include "sig_tesla/tesla_params.h"
 #include "dap_enc_key.h"
 
-#undef LOG_TAG
-#define LOG_TAG "dap_enc_sig_tesla"
 
 enum DAP_TESLA_SIGN_SECURITY {
     TESLA_TOY = 0, HEURISTIC_MAX_SECURITY_AND_MIN_SIZE, HEURISTIC_MAX_SECURITY_AND_MAX_SPEED, PROVABLY_SECURITY, PROVABLY_MAX_SECURITY
diff --git a/test/libdap-test b/test/libdap-test
index d40ba8973440b7c712d5a64df03a312adcf7c2fd..7b40a4cdfae222f84ccedb11ecae471d01f5e33b 160000
--- a/test/libdap-test
+++ b/test/libdap-test
@@ -1 +1 @@
-Subproject commit d40ba8973440b7c712d5a64df03a312adcf7c2fd
+Subproject commit 7b40a4cdfae222f84ccedb11ecae471d01f5e33b