diff --git a/OpenCL/m06211-pure.cl b/OpenCL/m06211-pure.cl
index 8545dd466..5211345de 100644
--- a/OpenCL/m06211-pure.cl
+++ b/OpenCL/m06211-pure.cl
@@ -19,11 +19,6 @@
 #include "inc_cipher_camellia.cl"
 #include "inc_cipher_kuznyechik.cl"
 
-#include "inc_truecrypt_keyfile.cl"
-#include "inc_truecrypt_crc32.cl"
-#include "inc_truecrypt_xts.cl"
-#include "inc_veracrypt_xts.cl"
-
 typedef struct tc
 {
   u32 salt_buf[32];
@@ -36,6 +31,11 @@ typedef struct tc
 
 } tc_t;
 
+#include "inc_truecrypt_keyfile.cl"
+#include "inc_truecrypt_crc32.cl"
+#include "inc_truecrypt_xts.cl"
+#include "inc_veracrypt_xts.cl"
+
 typedef struct tc_tmp
 {
   u32 ipad[16];
diff --git a/OpenCL/m06212-pure.cl b/OpenCL/m06212-pure.cl
index b7e799807..e30bb12db 100644
--- a/OpenCL/m06212-pure.cl
+++ b/OpenCL/m06212-pure.cl
@@ -19,11 +19,6 @@
 #include "inc_cipher_camellia.cl"
 #include "inc_cipher_kuznyechik.cl"
 
-#include "inc_truecrypt_keyfile.cl"
-#include "inc_truecrypt_crc32.cl"
-#include "inc_truecrypt_xts.cl"
-#include "inc_veracrypt_xts.cl"
-
 typedef struct tc
 {
   u32 salt_buf[32];
@@ -36,6 +31,11 @@ typedef struct tc
 
 } tc_t;
 
+#include "inc_truecrypt_keyfile.cl"
+#include "inc_truecrypt_crc32.cl"
+#include "inc_truecrypt_xts.cl"
+#include "inc_veracrypt_xts.cl"
+
 typedef struct tc_tmp
 {
   u32 ipad[16];
diff --git a/OpenCL/m06213-pure.cl b/OpenCL/m06213-pure.cl
index 5027283be..d620b47bb 100644
--- a/OpenCL/m06213-pure.cl
+++ b/OpenCL/m06213-pure.cl
@@ -19,11 +19,6 @@
 #include "inc_cipher_camellia.cl"
 #include "inc_cipher_kuznyechik.cl"
 
-#include "inc_truecrypt_keyfile.cl"
-#include "inc_truecrypt_crc32.cl"
-#include "inc_truecrypt_xts.cl"
-#include "inc_veracrypt_xts.cl"
-
 typedef struct tc
 {
   u32 salt_buf[32];
@@ -36,6 +31,11 @@ typedef struct tc
 
 } tc_t;
 
+#include "inc_truecrypt_keyfile.cl"
+#include "inc_truecrypt_crc32.cl"
+#include "inc_truecrypt_xts.cl"
+#include "inc_veracrypt_xts.cl"
+
 typedef struct tc_tmp
 {
   u32 ipad[16];
diff --git a/OpenCL/m06221-pure.cl b/OpenCL/m06221-pure.cl
index 3daf5d7a9..06103e490 100644
--- a/OpenCL/m06221-pure.cl
+++ b/OpenCL/m06221-pure.cl
@@ -19,11 +19,6 @@
 #include "inc_cipher_camellia.cl"
 #include "inc_cipher_kuznyechik.cl"
 
-#include "inc_truecrypt_keyfile.cl"
-#include "inc_truecrypt_crc32.cl"
-#include "inc_truecrypt_xts.cl"
-#include "inc_veracrypt_xts.cl"
-
 typedef struct tc
 {
   u32 salt_buf[32];
@@ -36,6 +31,11 @@ typedef struct tc
 
 } tc_t;
 
+#include "inc_truecrypt_keyfile.cl"
+#include "inc_truecrypt_crc32.cl"
+#include "inc_truecrypt_xts.cl"
+#include "inc_veracrypt_xts.cl"
+
 typedef struct tc64_tmp
 {
   u64  ipad[8];
diff --git a/OpenCL/m06222-pure.cl b/OpenCL/m06222-pure.cl
index c3a8eb62b..168b38b10 100644
--- a/OpenCL/m06222-pure.cl
+++ b/OpenCL/m06222-pure.cl
@@ -19,11 +19,6 @@
 #include "inc_cipher_camellia.cl"
 #include "inc_cipher_kuznyechik.cl"
 
-#include "inc_truecrypt_keyfile.cl"
-#include "inc_truecrypt_crc32.cl"
-#include "inc_truecrypt_xts.cl"
-#include "inc_veracrypt_xts.cl"
-
 typedef struct tc
 {
   u32 salt_buf[32];
@@ -36,6 +31,11 @@ typedef struct tc
 
 } tc_t;
 
+#include "inc_truecrypt_keyfile.cl"
+#include "inc_truecrypt_crc32.cl"
+#include "inc_truecrypt_xts.cl"
+#include "inc_veracrypt_xts.cl"
+
 typedef struct tc64_tmp
 {
   u64  ipad[8];
diff --git a/OpenCL/m06223-pure.cl b/OpenCL/m06223-pure.cl
index df71f8908..7970f4830 100644
--- a/OpenCL/m06223-pure.cl
+++ b/OpenCL/m06223-pure.cl
@@ -19,11 +19,6 @@
 #include "inc_cipher_camellia.cl"
 #include "inc_cipher_kuznyechik.cl"
 
-#include "inc_truecrypt_keyfile.cl"
-#include "inc_truecrypt_crc32.cl"
-#include "inc_truecrypt_xts.cl"
-#include "inc_veracrypt_xts.cl"
-
 typedef struct tc
 {
   u32 salt_buf[32];
@@ -36,6 +31,11 @@ typedef struct tc
 
 } tc_t;
 
+#include "inc_truecrypt_keyfile.cl"
+#include "inc_truecrypt_crc32.cl"
+#include "inc_truecrypt_xts.cl"
+#include "inc_veracrypt_xts.cl"
+
 typedef struct tc64_tmp
 {
   u64  ipad[8];
diff --git a/OpenCL/m06231-pure.cl b/OpenCL/m06231-pure.cl
index 5ed0b0d96..4694a6c47 100644
--- a/OpenCL/m06231-pure.cl
+++ b/OpenCL/m06231-pure.cl
@@ -19,11 +19,6 @@
 #include "inc_cipher_camellia.cl"
 #include "inc_cipher_kuznyechik.cl"
 
-#include "inc_truecrypt_keyfile.cl"
-#include "inc_truecrypt_crc32.cl"
-#include "inc_truecrypt_xts.cl"
-#include "inc_veracrypt_xts.cl"
-
 typedef struct tc
 {
   u32 salt_buf[32];
@@ -36,6 +31,11 @@ typedef struct tc
 
 } tc_t;
 
+#include "inc_truecrypt_keyfile.cl"
+#include "inc_truecrypt_crc32.cl"
+#include "inc_truecrypt_xts.cl"
+#include "inc_veracrypt_xts.cl"
+
 typedef struct tc_tmp
 {
   u32 ipad[16];
diff --git a/OpenCL/m06232-pure.cl b/OpenCL/m06232-pure.cl
index 6efb5318d..7722c0a26 100644
--- a/OpenCL/m06232-pure.cl
+++ b/OpenCL/m06232-pure.cl
@@ -19,11 +19,6 @@
 #include "inc_cipher_camellia.cl"
 #include "inc_cipher_kuznyechik.cl"
 
-#include "inc_truecrypt_keyfile.cl"
-#include "inc_truecrypt_crc32.cl"
-#include "inc_truecrypt_xts.cl"
-#include "inc_veracrypt_xts.cl"
-
 typedef struct tc
 {
   u32 salt_buf[32];
@@ -36,6 +31,11 @@ typedef struct tc
 
 } tc_t;
 
+#include "inc_truecrypt_keyfile.cl"
+#include "inc_truecrypt_crc32.cl"
+#include "inc_truecrypt_xts.cl"
+#include "inc_veracrypt_xts.cl"
+
 typedef struct tc_tmp
 {
   u32 ipad[16];
diff --git a/OpenCL/m06233-pure.cl b/OpenCL/m06233-pure.cl
index f44255221..e0766cc62 100644
--- a/OpenCL/m06233-pure.cl
+++ b/OpenCL/m06233-pure.cl
@@ -19,11 +19,6 @@
 #include "inc_cipher_camellia.cl"
 #include "inc_cipher_kuznyechik.cl"
 
-#include "inc_truecrypt_keyfile.cl"
-#include "inc_truecrypt_crc32.cl"
-#include "inc_truecrypt_xts.cl"
-#include "inc_veracrypt_xts.cl"
-
 typedef struct tc
 {
   u32 salt_buf[32];
@@ -36,6 +31,11 @@ typedef struct tc
 
 } tc_t;
 
+#include "inc_truecrypt_keyfile.cl"
+#include "inc_truecrypt_crc32.cl"
+#include "inc_truecrypt_xts.cl"
+#include "inc_veracrypt_xts.cl"
+
 typedef struct tc_tmp
 {
   u32 ipad[16];
diff --git a/OpenCL/m13751-pure.cl b/OpenCL/m13751-pure.cl
index 761e79a72..b6ae0dcf3 100644
--- a/OpenCL/m13751-pure.cl
+++ b/OpenCL/m13751-pure.cl
@@ -19,11 +19,6 @@
 #include "inc_cipher_camellia.cl"
 #include "inc_cipher_kuznyechik.cl"
 
-#include "inc_truecrypt_keyfile.cl"
-#include "inc_truecrypt_crc32.cl"
-#include "inc_truecrypt_xts.cl"
-#include "inc_veracrypt_xts.cl"
-
 typedef struct tc
 {
   u32 salt_buf[32];
@@ -36,6 +31,11 @@ typedef struct tc
 
 } tc_t;
 
+#include "inc_truecrypt_keyfile.cl"
+#include "inc_truecrypt_crc32.cl"
+#include "inc_truecrypt_xts.cl"
+#include "inc_veracrypt_xts.cl"
+
 typedef struct tc_tmp
 {
   u32 ipad[16];
diff --git a/OpenCL/m13752-pure.cl b/OpenCL/m13752-pure.cl
index 4909b76fa..575940729 100644
--- a/OpenCL/m13752-pure.cl
+++ b/OpenCL/m13752-pure.cl
@@ -19,11 +19,6 @@
 #include "inc_cipher_camellia.cl"
 #include "inc_cipher_kuznyechik.cl"
 
-#include "inc_truecrypt_keyfile.cl"
-#include "inc_truecrypt_crc32.cl"
-#include "inc_truecrypt_xts.cl"
-#include "inc_veracrypt_xts.cl"
-
 typedef struct tc
 {
   u32 salt_buf[32];
@@ -36,6 +31,11 @@ typedef struct tc
 
 } tc_t;
 
+#include "inc_truecrypt_keyfile.cl"
+#include "inc_truecrypt_crc32.cl"
+#include "inc_truecrypt_xts.cl"
+#include "inc_veracrypt_xts.cl"
+
 typedef struct tc_tmp
 {
   u32 ipad[16];
diff --git a/OpenCL/m13753-pure.cl b/OpenCL/m13753-pure.cl
index 77d97d115..6856ab71b 100644
--- a/OpenCL/m13753-pure.cl
+++ b/OpenCL/m13753-pure.cl
@@ -19,11 +19,6 @@
 #include "inc_cipher_camellia.cl"
 #include "inc_cipher_kuznyechik.cl"
 
-#include "inc_truecrypt_keyfile.cl"
-#include "inc_truecrypt_crc32.cl"
-#include "inc_truecrypt_xts.cl"
-#include "inc_veracrypt_xts.cl"
-
 typedef struct tc
 {
   u32 salt_buf[32];
@@ -36,6 +31,11 @@ typedef struct tc
 
 } tc_t;
 
+#include "inc_truecrypt_keyfile.cl"
+#include "inc_truecrypt_crc32.cl"
+#include "inc_truecrypt_xts.cl"
+#include "inc_veracrypt_xts.cl"
+
 typedef struct tc_tmp
 {
   u32 ipad[16];
diff --git a/OpenCL/m13771-pure.cl b/OpenCL/m13771-pure.cl
index d75822f6c..ad5c454cb 100644
--- a/OpenCL/m13771-pure.cl
+++ b/OpenCL/m13771-pure.cl
@@ -19,11 +19,6 @@
 #include "inc_cipher_camellia.cl"
 #include "inc_cipher_kuznyechik.cl"
 
-#include "inc_truecrypt_keyfile.cl"
-#include "inc_truecrypt_crc32.cl"
-#include "inc_truecrypt_xts.cl"
-#include "inc_veracrypt_xts.cl"
-
 typedef struct tc
 {
   u32 salt_buf[32];
@@ -36,6 +31,11 @@ typedef struct tc
 
 } tc_t;
 
+#include "inc_truecrypt_keyfile.cl"
+#include "inc_truecrypt_crc32.cl"
+#include "inc_truecrypt_xts.cl"
+#include "inc_veracrypt_xts.cl"
+
 typedef struct vc64_sbog_tmp
 {
   u64  ipad_raw[8];
diff --git a/OpenCL/m13772-pure.cl b/OpenCL/m13772-pure.cl
index 7eeaa1ed8..0163c9872 100644
--- a/OpenCL/m13772-pure.cl
+++ b/OpenCL/m13772-pure.cl
@@ -19,11 +19,6 @@
 #include "inc_cipher_camellia.cl"
 #include "inc_cipher_kuznyechik.cl"
 
-#include "inc_truecrypt_keyfile.cl"
-#include "inc_truecrypt_crc32.cl"
-#include "inc_truecrypt_xts.cl"
-#include "inc_veracrypt_xts.cl"
-
 typedef struct tc
 {
   u32 salt_buf[32];
@@ -36,6 +31,11 @@ typedef struct tc
 
 } tc_t;
 
+#include "inc_truecrypt_keyfile.cl"
+#include "inc_truecrypt_crc32.cl"
+#include "inc_truecrypt_xts.cl"
+#include "inc_veracrypt_xts.cl"
+
 typedef struct vc64_sbog_tmp
 {
   u64  ipad_raw[8];
diff --git a/OpenCL/m13773-pure.cl b/OpenCL/m13773-pure.cl
index 2097bddc3..b4db2779c 100644
--- a/OpenCL/m13773-pure.cl
+++ b/OpenCL/m13773-pure.cl
@@ -19,11 +19,6 @@
 #include "inc_cipher_camellia.cl"
 #include "inc_cipher_kuznyechik.cl"
 
-#include "inc_truecrypt_keyfile.cl"
-#include "inc_truecrypt_crc32.cl"
-#include "inc_truecrypt_xts.cl"
-#include "inc_veracrypt_xts.cl"
-
 typedef struct tc
 {
   u32 salt_buf[32];
@@ -36,6 +31,11 @@ typedef struct tc
 
 } tc_t;
 
+#include "inc_truecrypt_keyfile.cl"
+#include "inc_truecrypt_crc32.cl"
+#include "inc_truecrypt_xts.cl"
+#include "inc_veracrypt_xts.cl"
+
 typedef struct vc64_sbog_tmp
 {
   u64  ipad_raw[8];