diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ccbf047e3682534ea29cdd34eef5767fd97a990..7124f5171b84d427a862982c85fc7291b47a743b 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,14 +3,6 @@ project (dap_crypto)
 
 # fix implicit declaration warnings
 add_definitions ("-D_GNU_SOURCE")
-
-#set(CMAKE_C_FLAGS "-std=c11  -O2 -Wall -Wextra -fPIC -fno-pie -no-pie -fno-ident ")
-#set(CMAKE_ASM_FLAGS "-std=c11  -O2 -Wall -Wextra -fPIC -fno-pie -no-pie -fno-ident ")
-#set(CMAKE_C_FLAGS "-std=c11  -O3 -Wall -Wextra -fPIC -fno-pie -no-pie -fno-ident -ffast-math -ftree-vectorize -mfpmath=sse -mmmx -msse2 -fno-asynchronous-unwind-tables -ffunction-sections -Wl,--gc-sections -Wl,--strip-all")
-#set(CMAKE_ASM_FLAGS "-std=c11  -O3 -Wall -Wextra -fPIC -fno-pie -no-pie -fno-ident -ffast-math -ftree-vectorize -mfpmath=sse -mmmx -msse2 -fno-asynchronous-unwind-tables -ffunction-sections -Wl,--gc-sections -Wl,--strip-all")
-#set(CMAKE_C_FLAGS "-static -Wall -O3 -fno-ident -ffast-math -ftree-vectorize -mfpmath=sse -mmmx -msse2 -fno-asynchronous-unwind-tables -ffunction-sections -Wl,--gc-sections -Wl,--strip-all")
-#set(CMAKE_ASM_FLAGS "-static -Wall -O3 -fno-ident -ffast-math -ftree-vectorize -mfpmath=sse -mmmx -msse2 -fno-asynchronous-unwind-tables -ffunction-sections -Wl,--gc-sections -Wl,--strip-all")
-
 if(NOT SUBMODULES_NO_BUILD)
 
   # Check whether we're on a 32-bit or 64-bit system
diff --git a/src/GOST/dll_import.h b/src/GOST/dll_import.h
index b8216a0fd034ebc7b9c8dbf3ee5625e38901e2a7..025d39d6391e6deb8c5b04f1f296e73da06a9f3c 100644
--- a/src/GOST/dll_import.h
+++ b/src/GOST/dll_import.h
@@ -12,7 +12,7 @@
 #ifdef WIN32
      #define DLL_IMPORT __stdcall
 #else
-     #define DLL_IMPORT __attribute__((stdcall))
+     #define DLL_IMPORT
 #endif
 
 #endif
diff --git a/src/GOST/testgost.c b/test/crypto/testgost.c
similarity index 100%
rename from src/GOST/testgost.c
rename to test/crypto/testgost.c