diff --git a/src/dynamic_fmt.c b/src/dynamic_fmt.c
index e5eb63e..12defb6 100644
--- a/src/dynamic_fmt.c
+++ b/src/dynamic_fmt.c
@@ -15,13 +15,13 @@
  *
  * KNOWN issues, and things to do.
  *
- *   1. MD5 and MD4 MUST both be using same SSE_PARA values, and built the 
+ *   1. MD5 and MD4 MUST both be using same SSE_PARA values, and built the
  *      same (I think).  If not, then MD4 should fall back to X86 mode.
  *   2. Add more crypt types, using the SHA1 'model'.  Currently, all
  *      sha2 crypts have been added (sha224, sha256, sha384, sha512).
  *      others could be any from oSSL, or any that we can get hash files
  *      for (such as GOST, IDA, IDEA, AES, CAST, Whirlpool, etc, etc)
- *   3. create a new optimize flag, MGF_PASS_AFTER_FIXEDSALT and 
+ *   3. create a new optimize flag, MGF_PASS_AFTER_FIXEDSALT and
  *      MGF_PASS_BEFORE_FIXEDSALT.  Then create DynamicFunc__appendsalt_after_pass[12]
  *      These would only be valid for a FIXED length salted format. Then
  *      we can write the pass right into the buffer, and get_key() would read
@@ -40,7 +40,7 @@ static DYNAMIC_primitive_funcp _Funcs_1[] =
 	NULL
 };
 
-WELL, the fixed size salt, it 'may' not be key for the MGF_PASS_BEFORE_FIXEDSALT, I think I can 
+WELL, the fixed size salt, it 'may' not be key for the MGF_PASS_BEFORE_FIXEDSALT, I think I can
 make that 'work' for variable sized salts.  But for the MGF_PASS_AFTER_FIXEDSALT, i.e. crypt($s.$p)
 the fixed size salt IS key.  I would like to store all PW's at salt_len offset in the buffer, and
 simply overwrite the first part of each buffer with the salt, never moving the password after the
@@ -63,11 +63,11 @@ ahead of time.
 #include "config.h"
 #include "sha.h"
 #include "sha2.h"
-#include "gost.h"
 #include "memory.h"
 #include "unicode.h"
 #undef CPU_IA32
 #include "johnswap.h"
+#include "gost.h"
 #include "pkzip.h"
 
 #define STRINGIZE2(s) #s
@@ -6854,7 +6854,7 @@ void DynamicFunc__SHA1_crypt_input2_to_output1_FINAL()
 }
 
 /********************************************************************
- ****  Here are the SHA224 and SHA256 functions!!! 
+ ****  Here are the SHA224 and SHA256 functions!!!
  *******************************************************************/
 void DynamicFunc__SHA224_crypt_input1_append_input2_base16() {
 	union xx { unsigned char u[32]; ARCH_WORD a[32/sizeof(ARCH_WORD)]; } u;
@@ -7346,7 +7346,7 @@ void DynamicFunc__SHA256_crypt_input2_to_output1_FINAL(){
 }
 
 /********************************************************************
- ****  Here are the SHA384 and SHA512 functions!!! 
+ ****  Here are the SHA384 and SHA512 functions!!!
  *******************************************************************/
 void DynamicFunc__SHA384_crypt_input1_append_input2_base16() {
 	union xx { unsigned char u[64]; ARCH_WORD a[32/sizeof(ARCH_WORD)]; } u;
diff --git a/src/gost.h b/src/gost.h
index f1d146f..c91c50a 100644
--- a/src/gost.h
+++ b/src/gost.h
@@ -21,6 +21,7 @@ extern "C" {
 	defined(__x86_64) || defined(__x86_64__) || defined(_M_IX86) || \
 	defined(_M_AMD64) || defined(_M_IA64) || defined(_M_X64)
 /* detect if x86-64 instruction set is supported */
+#if !defined CPU_X64 && !defined CPU_IA32
 # if defined(_LP64) || defined(__LP64__) || defined(__x86_64) || \
 	defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
 #  define CPU_X64
@@ -28,6 +29,7 @@ extern "C" {
 #  define CPU_IA32
 # endif
 #endif
+#endif
 
 #if defined(__GNUC__) && defined(CPU_IA32) && !defined(RHASH_NO_ASM)
 # define USE_GCC_ASM_IA32