diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 0f3bb9a2578d18a13a8489083d39746958b1b0fa..e438fdd294339b9abf44af18e7265d40edd91524 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -8,5 +8,3 @@ add_library(${PROJECT_NAME} STATIC ${CORE_SRCS} ${CORE_HEADERS})
 
 #This paths will be used by project-dependent project libraries
 target_include_directories(dap_core INTERFACE .)
-
-set(${PROJECT_NAME}_INCLUDE_DIRS ${PROJECT_SOURCE_DIR} CACHE INTERNAL "${PROJECT_NAME}: Include Directories" FORCE)
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 262ca967deece58ad61295837980b5369d0c578d..feed458cb4b5789624ed55ea0692a0b48f9d7f2e 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -50,5 +50,3 @@ add_library(${PROJECT_NAME} STATIC ${CRYPTO_SRCS}
 target_include_directories(dap_crypto INTERFACE .)
 
 target_link_libraries(dap_crypto dap_core)
-
-set(${PROJECT_NAME}_INCLUDE_DIRS ${PROJECT_SOURCE_DIR} CACHE INTERNAL "${PROJECT_NAME}: Include Directories" FORCE)
diff --git a/crypto/dap_enc.c b/crypto/dap_enc.c
index bf3a4615492ee51e7307b53f4c23db41c299a615..0667b73960741479d71255c552ad1bafb5693f5c 100644
--- a/crypto/dap_enc.c
+++ b/crypto/dap_enc.c
@@ -117,7 +117,7 @@ size_t dap_enc_decode(struct dap_enc_key * key,const void * buf, const size_t bu
 
     if(key->dec){
         size_t ret=key->dec(key,proc_buf_const,proc_buf_size,buf_out);
-        if(data_type_in==DAP_ENC_DATA_TYPE_B64 || DAP_ENC_DATA_TYPE_B64_URLSAFE)
+        if(data_type_in==DAP_ENC_DATA_TYPE_B64 || data_type_in == DAP_ENC_DATA_TYPE_B64_URLSAFE)
         	if (proc_buf)
         		free(proc_buf);
         return ret;
diff --git a/crypto/dap_enc.h b/crypto/dap_enc.h
index f6efe8db362f0267752dc8c946a3090a6c40f5aa..e869a5b1b7d2ff0f7193d4dc633e25a9d43858d9 100644
--- a/crypto/dap_enc.h
+++ b/crypto/dap_enc.h
@@ -29,8 +29,8 @@
 extern "C" {
 #endif
 
-int dap_enc_init();
-void dap_enc_deinit();
+int dap_enc_init(void);
+void dap_enc_deinit(void);
 
 size_t dap_enc_code(struct dap_enc_key * key, const void * buf, const size_t buf_size, void * buf_out,
                     dap_enc_data_type_t data_type_out);
diff --git a/crypto/dap_enc_aes.h b/crypto/dap_enc_aes.h
index cf7e38f4899d79b6f416843fa7cd4fd82af3013d..a5c6c95b0af22854d73b9700eaae976bc4bd5305 100755
--- a/crypto/dap_enc_aes.h
+++ b/crypto/dap_enc_aes.h
@@ -16,7 +16,6 @@ void dap_enc_aes_key_new_generate(struct dap_enc_key * a_key,size_t a_size);
 void dap_enc_aes_key_new_from_data(struct dap_enc_key * a_key, const void * a_in, size_t a_in_size);
 void dap_enc_aes_key_new_from_str(struct dap_enc_key * a_key, const char * a_in);
 void dap_enc_aes_key_delete(struct dap_enc_key *a_key);
-int test_key_aes();
 
 size_t dap_enc_aes_decode(struct dap_enc_key* a_key, const void * a_in, size_t a_in_size,void * a_out);
 size_t dap_enc_aes_encode(struct dap_enc_key* a_key, const void * a_in, size_t a_in_size,void * a_out);
diff --git a/crypto/dap_enc_key.h b/crypto/dap_enc_key.h
index 20bd576e6d5719fdd60f64667017a7c47aa51d77..6d9bf3632503a2fda077843f70bd8483e57b0c9d 100644
--- a/crypto/dap_enc_key.h
+++ b/crypto/dap_enc_key.h
@@ -121,8 +121,8 @@ typedef struct dap_enc_key{
     void * _inheritor;
 } dap_enc_key_t;
 
-int dap_enc_key_init();
-void dap_enc_key_deinit();
+int dap_enc_key_init(void);
+void dap_enc_key_deinit(void);
 
 dap_enc_key_t *dap_enc_key_new(dap_enc_key_type_t a_key_type);
 
diff --git a/crypto/dap_enc_sidh16.c b/crypto/dap_enc_sidh16.c
index e0cc9a8eac8ae5a0c100005f2f2ac47a1b041805..808fba8238c4398a0509410369905cce250731e7 100644
--- a/crypto/dap_enc_sidh16.c
+++ b/crypto/dap_enc_sidh16.c
@@ -23,13 +23,6 @@ static int isCompressed(void *_inheritor) {
     return 0;
 }
 
-void test(){
- 
-}
-
-
-
-
 extern bool dap_sidh16_CurveIsogenyStruct_isnull(PCurveIsogenyStruct pCurveIsogeny);
 
 void dap_enc_sidh16_key_new_generate(struct dap_enc_key *a_key, size_t a_size) {
diff --git a/crypto/dap_enc_sidh16.h b/crypto/dap_enc_sidh16.h
index 073038eec7bbcc3ba90e2de1fc5cb96a1674b55f..73371fbc3bff125101af19b6548436d645250d74 100644
--- a/crypto/dap_enc_sidh16.h
+++ b/crypto/dap_enc_sidh16.h
@@ -13,8 +13,6 @@
 #include"liboqs/kex_sidh_cln16/SIDH.h"
 #include "liboqs/kex/kex.h"
 
-
-
 struct dap_enc_key;
 
 extern bool dap_sidh16_CurveIsogenyStruct_isnull(PCurveIsogenyStruct pCurveIsogeny);
diff --git a/libdap.pri b/libdap.pri
index 84e3df15a23a37c15200949adcb74d101b50c314..459a7879683a25037b9104f882ac2e74b54b3177 100644
--- a/libdap.pri
+++ b/libdap.pri
@@ -1,5 +1,4 @@
 include (core/core.pri)
 include (crypto/crypto.pri)
 
-
 INCLUDEPATH += $$PWD