diff --git a/OpenCL/m00400-optimized.cl b/OpenCL/m00400-optimized.cl
index 64225af92..8ddeb789a 100644
--- a/OpenCL/m00400-optimized.cl
+++ b/OpenCL/m00400-optimized.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct phpass_tmp
 {
diff --git a/OpenCL/m00400-pure.cl b/OpenCL/m00400-pure.cl
index 3b6715fa1..6fa76b732 100644
--- a/OpenCL/m00400-pure.cl
+++ b/OpenCL/m00400-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct phpass_tmp
 {
diff --git a/OpenCL/m00500-optimized.cl b/OpenCL/m00500-optimized.cl
index d68754ed2..f44294283 100644
--- a/OpenCL/m00500-optimized.cl
+++ b/OpenCL/m00500-optimized.cl
@@ -13,8 +13,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct md5crypt_tmp
 {
diff --git a/OpenCL/m00500-pure.cl b/OpenCL/m00500-pure.cl
index 02b21547d..6c9700639 100644
--- a/OpenCL/m00500-pure.cl
+++ b/OpenCL/m00500-pure.cl
@@ -13,8 +13,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct md5crypt_tmp
 {
diff --git a/OpenCL/m01500_a3-pure.cl b/OpenCL/m01500_a3-pure.cl
index 4f8b8992f..2b26036fb 100644
--- a/OpenCL/m01500_a3-pure.cl
+++ b/OpenCL/m01500_a3-pure.cl
@@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_common.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single_bs.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi_bs.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single_bs.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi_bs.cl)
 
 #ifdef IS_NV
 #define KXX_DECL
diff --git a/OpenCL/m01600-optimized.cl b/OpenCL/m01600-optimized.cl
index 555f38c45..7f5bd7f5e 100644
--- a/OpenCL/m01600-optimized.cl
+++ b/OpenCL/m01600-optimized.cl
@@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct md5crypt_tmp
 {
diff --git a/OpenCL/m01600-pure.cl b/OpenCL/m01600-pure.cl
index 19fad7c4b..ac1722da9 100644
--- a/OpenCL/m01600-pure.cl
+++ b/OpenCL/m01600-pure.cl
@@ -13,8 +13,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct md5crypt_tmp
 {
diff --git a/OpenCL/m01800-optimized.cl b/OpenCL/m01800-optimized.cl
index 208158365..e994b7985 100644
--- a/OpenCL/m01800-optimized.cl
+++ b/OpenCL/m01800-optimized.cl
@@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define PUTCHAR64_BE(a,p,c) ((PRIVATE_AS u8 *)(a))[(p) ^ 7] = (u8) (c)
 #define GETCHAR64_BE(a,p)   ((PRIVATE_AS u8 *)(a))[(p) ^ 7]
diff --git a/OpenCL/m01800-pure.cl b/OpenCL/m01800-pure.cl
index 350b0ff6b..77bf38ba5 100644
--- a/OpenCL/m01800-pure.cl
+++ b/OpenCL/m01800-pure.cl
@@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct sha512crypt_tmp
 {
diff --git a/OpenCL/m02100-pure.cl b/OpenCL/m02100-pure.cl
index a1c8cad35..ec97d1d15 100644
--- a/OpenCL/m02100-pure.cl
+++ b/OpenCL/m02100-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct dcc2_tmp
 {
diff --git a/OpenCL/m02500-pure.cl b/OpenCL/m02500-pure.cl
index 64d77a139..06deaf856 100644
--- a/OpenCL/m02500-pure.cl
+++ b/OpenCL/m02500-pure.cl
@@ -27,8 +27,8 @@
 #include "inc_cipher_aes.h"
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct wpa_eapol
 {
diff --git a/OpenCL/m03000_a3-pure.cl b/OpenCL/m03000_a3-pure.cl
index e8872d39b..74716d0d4 100644
--- a/OpenCL/m03000_a3-pure.cl
+++ b/OpenCL/m03000_a3-pure.cl
@@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_common.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single_bs.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi_bs.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single_bs.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi_bs.cl)
 
 #ifdef IS_NV
 #define KXX_DECL
diff --git a/OpenCL/m03200-pure.cl b/OpenCL/m03200-pure.cl
index 8e5a16567..6f522ee8d 100644
--- a/OpenCL/m03200-pure.cl
+++ b/OpenCL/m03200-pure.cl
@@ -10,8 +10,8 @@
 #include M2S(INCLUDE_PATH/inc_common.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct bcrypt_tmp
 {
diff --git a/OpenCL/m05200-pure.cl b/OpenCL/m05200-pure.cl
index 38dd27532..57aea1a72 100644
--- a/OpenCL/m05200-pure.cl
+++ b/OpenCL/m05200-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pwsafe3_tmp
 {
diff --git a/OpenCL/m05800-optimized.cl b/OpenCL/m05800-optimized.cl
index 7ab1a8912..fd615b7dc 100644
--- a/OpenCL/m05800-optimized.cl
+++ b/OpenCL/m05800-optimized.cl
@@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct androidpin_tmp
 {
diff --git a/OpenCL/m05800-pure.cl b/OpenCL/m05800-pure.cl
index 6aa023432..4624de63e 100644
--- a/OpenCL/m05800-pure.cl
+++ b/OpenCL/m05800-pure.cl
@@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct androidpin_tmp
 {
diff --git a/OpenCL/m06300-optimized.cl b/OpenCL/m06300-optimized.cl
index 92e7b50db..c8cc8779b 100644
--- a/OpenCL/m06300-optimized.cl
+++ b/OpenCL/m06300-optimized.cl
@@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct md5crypt_tmp
 {
diff --git a/OpenCL/m06300-pure.cl b/OpenCL/m06300-pure.cl
index 1c2c50757..11a02d988 100644
--- a/OpenCL/m06300-pure.cl
+++ b/OpenCL/m06300-pure.cl
@@ -13,8 +13,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct md5crypt_tmp
 {
diff --git a/OpenCL/m06400-pure.cl b/OpenCL/m06400-pure.cl
index 1105f8a3f..9dbbfe7d4 100644
--- a/OpenCL/m06400-pure.cl
+++ b/OpenCL/m06400-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct sha256aix_tmp
 {
diff --git a/OpenCL/m06500-pure.cl b/OpenCL/m06500-pure.cl
index 5eefb2083..fe8ef3e9a 100644
--- a/OpenCL/m06500-pure.cl
+++ b/OpenCL/m06500-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct sha512aix_tmp
 {
diff --git a/OpenCL/m06600-pure.cl b/OpenCL/m06600-pure.cl
index edbd92bc4..c98902f42 100644
--- a/OpenCL/m06600-pure.cl
+++ b/OpenCL/m06600-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct agilekey_tmp
 {
diff --git a/OpenCL/m06700-pure.cl b/OpenCL/m06700-pure.cl
index 0d13c7a08..35d041efa 100644
--- a/OpenCL/m06700-pure.cl
+++ b/OpenCL/m06700-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct sha1aix_tmp
 {
diff --git a/OpenCL/m06800-pure.cl b/OpenCL/m06800-pure.cl
index f55756b82..d386938fa 100644
--- a/OpenCL/m06800-pure.cl
+++ b/OpenCL/m06800-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct lastpass_tmp
 {
diff --git a/OpenCL/m07100-pure.cl b/OpenCL/m07100-pure.cl
index a98ce6114..55dcdb066 100644
--- a/OpenCL/m07100-pure.cl
+++ b/OpenCL/m07100-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pbkdf2_sha512_tmp
 {
diff --git a/OpenCL/m07400-optimized.cl b/OpenCL/m07400-optimized.cl
index 2451081ba..0615d5414 100644
--- a/OpenCL/m07400-optimized.cl
+++ b/OpenCL/m07400-optimized.cl
@@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define MIN(a,b) (((a) < (b)) ? (a) : (b))
 
diff --git a/OpenCL/m07400-pure.cl b/OpenCL/m07400-pure.cl
index eae958565..d17aafd9f 100644
--- a/OpenCL/m07400-pure.cl
+++ b/OpenCL/m07400-pure.cl
@@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct sha256crypt_tmp
 {
diff --git a/OpenCL/m07900-pure.cl b/OpenCL/m07900-pure.cl
index a5c98d380..9fdc23cbb 100644
--- a/OpenCL/m07900-pure.cl
+++ b/OpenCL/m07900-pure.cl
@@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct drupal7_tmp
 {
diff --git a/OpenCL/m08200-pure.cl b/OpenCL/m08200-pure.cl
index cf3a3f52c..49d951cb7 100644
--- a/OpenCL/m08200-pure.cl
+++ b/OpenCL/m08200-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pbkdf2_sha512_tmp
 {
diff --git a/OpenCL/m08900-pure.cl b/OpenCL/m08900-pure.cl
index d9b4415a0..3e87dd01b 100644
--- a/OpenCL/m08900-pure.cl
+++ b/OpenCL/m08900-pure.cl
@@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct
 {
diff --git a/OpenCL/m09000-pure.cl b/OpenCL/m09000-pure.cl
index 2bbc03ec9..7e9c7298a 100644
--- a/OpenCL/m09000-pure.cl
+++ b/OpenCL/m09000-pure.cl
@@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pwsafe2_tmp
 {
diff --git a/OpenCL/m09100-pure.cl b/OpenCL/m09100-pure.cl
index d5094bf1d..307dcfab8 100644
--- a/OpenCL/m09100-pure.cl
+++ b/OpenCL/m09100-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct lotus8_tmp
 {
diff --git a/OpenCL/m09400-pure.cl b/OpenCL/m09400-pure.cl
index 05463a1ca..be2626141 100644
--- a/OpenCL/m09400-pure.cl
+++ b/OpenCL/m09400-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct office2007_tmp
 {
diff --git a/OpenCL/m09500-pure.cl b/OpenCL/m09500-pure.cl
index 159fde36f..e009a1b80 100644
--- a/OpenCL/m09500-pure.cl
+++ b/OpenCL/m09500-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct office2010
 {
diff --git a/OpenCL/m09600-pure.cl b/OpenCL/m09600-pure.cl
index 71a868fe2..aeb397a20 100644
--- a/OpenCL/m09600-pure.cl
+++ b/OpenCL/m09600-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct office2013_tmp
 {
diff --git a/OpenCL/m10300-pure.cl b/OpenCL/m10300-pure.cl
index 0c9e4250a..8976ad795 100644
--- a/OpenCL/m10300-pure.cl
+++ b/OpenCL/m10300-pure.cl
@@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct saph_sha1_tmp
 {
diff --git a/OpenCL/m10500-pure.cl b/OpenCL/m10500-pure.cl
index 2d520d6af..905b88f5a 100644
--- a/OpenCL/m10500-pure.cl
+++ b/OpenCL/m10500-pure.cl
@@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_rc4.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pdf
 {
diff --git a/OpenCL/m10700-optimized.cl b/OpenCL/m10700-optimized.cl
index 7fdfa6fc2..570f600c8 100644
--- a/OpenCL/m10700-optimized.cl
+++ b/OpenCL/m10700-optimized.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #if defined IS_AMD && defined IS_GPU
 #define HC_INLINE
diff --git a/OpenCL/m10700-pure.cl b/OpenCL/m10700-pure.cl
index 6e58a362b..5fd51b12c 100644
--- a/OpenCL/m10700-pure.cl
+++ b/OpenCL/m10700-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define PUTCHAR(a,p,c)    ((PRIVATE_AS u8 *)(a))[(p)] = (u8) (c)
 #define GETCHAR(a,p)      ((PRIVATE_AS u8 *)(a))[(p)]
diff --git a/OpenCL/m10900-pure.cl b/OpenCL/m10900-pure.cl
index 8b14c7a92..009715af6 100644
--- a/OpenCL/m10900-pure.cl
+++ b/OpenCL/m10900-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pbkdf2_sha256_tmp
 {
diff --git a/OpenCL/m11900-pure.cl b/OpenCL/m11900-pure.cl
index b72e92db3..fee24abc7 100644
--- a/OpenCL/m11900-pure.cl
+++ b/OpenCL/m11900-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pbkdf2_md5
 {
diff --git a/OpenCL/m12000-pure.cl b/OpenCL/m12000-pure.cl
index 8d6abc8b6..5c2385bdf 100644
--- a/OpenCL/m12000-pure.cl
+++ b/OpenCL/m12000-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pbkdf2_sha1_tmp
 {
diff --git a/OpenCL/m12200-pure.cl b/OpenCL/m12200-pure.cl
index d6e014dde..39eb3016e 100644
--- a/OpenCL/m12200-pure.cl
+++ b/OpenCL/m12200-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct ecryptfs_tmp
 {
diff --git a/OpenCL/m12300-pure.cl b/OpenCL/m12300-pure.cl
index 5736db41a..32fcafb4b 100644
--- a/OpenCL/m12300-pure.cl
+++ b/OpenCL/m12300-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct oraclet_tmp
 {
diff --git a/OpenCL/m12400-pure.cl b/OpenCL/m12400-pure.cl
index 4c3da8d98..e515bc907 100644
--- a/OpenCL/m12400-pure.cl
+++ b/OpenCL/m12400-pure.cl
@@ -10,8 +10,8 @@
 #include M2S(INCLUDE_PATH/inc_common.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct bsdicrypt_tmp
 {
diff --git a/OpenCL/m12500-optimized.cl b/OpenCL/m12500-optimized.cl
index 34295e745..01abd8805 100644
--- a/OpenCL/m12500-optimized.cl
+++ b/OpenCL/m12500-optimized.cl
@@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define ROUNDS 0x40000
 
diff --git a/OpenCL/m12500-pure.cl b/OpenCL/m12500-pure.cl
index 87830c612..246fad578 100644
--- a/OpenCL/m12500-pure.cl
+++ b/OpenCL/m12500-pure.cl
@@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define ROUNDS 0x40000
 
diff --git a/OpenCL/m12700-pure.cl b/OpenCL/m12700-pure.cl
index 55ed63931..497b44a75 100644
--- a/OpenCL/m12700-pure.cl
+++ b/OpenCL/m12700-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct mywallet_tmp
 {
diff --git a/OpenCL/m12800-pure.cl b/OpenCL/m12800-pure.cl
index 9a4436b38..fb8848dcf 100644
--- a/OpenCL/m12800-pure.cl
+++ b/OpenCL/m12800-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pbkdf2_sha256_tmp
 {
diff --git a/OpenCL/m12900-pure.cl b/OpenCL/m12900-pure.cl
index d13b7d109..c3c9d4d32 100644
--- a/OpenCL/m12900-pure.cl
+++ b/OpenCL/m12900-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pbkdf2_sha256_tmp
 {
diff --git a/OpenCL/m13000-pure.cl b/OpenCL/m13000-pure.cl
index 549eeed55..c2ccb8f96 100644
--- a/OpenCL/m13000-pure.cl
+++ b/OpenCL/m13000-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pbkdf2_sha256_tmp
 {
diff --git a/OpenCL/m13400-pure.cl b/OpenCL/m13400-pure.cl
index 6ab420288..49d52dc21 100644
--- a/OpenCL/m13400-pure.cl
+++ b/OpenCL/m13400-pure.cl
@@ -13,8 +13,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_twofish.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct keepass_tmp
 {
diff --git a/OpenCL/m13600-pure.cl b/OpenCL/m13600-pure.cl
index e817b7915..5a114304e 100644
--- a/OpenCL/m13600-pure.cl
+++ b/OpenCL/m13600-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pbkdf2_sha1_tmp
 {
diff --git a/OpenCL/m14000_a3-pure.cl b/OpenCL/m14000_a3-pure.cl
index a148d2d8f..c799e7570 100644
--- a/OpenCL/m14000_a3-pure.cl
+++ b/OpenCL/m14000_a3-pure.cl
@@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_common.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single_bs.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi_bs.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single_bs.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi_bs.cl)
 
 #ifdef IS_NV
 #define KXX_DECL
diff --git a/OpenCL/m14611-pure.cl b/OpenCL/m14611-pure.cl
index c26c540ae..5f17847d5 100644
--- a/OpenCL/m14611-pure.cl
+++ b/OpenCL/m14611-pure.cl
@@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define MAX_ENTROPY 7.0
 
diff --git a/OpenCL/m14612-pure.cl b/OpenCL/m14612-pure.cl
index 1ab947920..c2a662234 100644
--- a/OpenCL/m14612-pure.cl
+++ b/OpenCL/m14612-pure.cl
@@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_serpent.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define MAX_ENTROPY 7.0
 
diff --git a/OpenCL/m14613-pure.cl b/OpenCL/m14613-pure.cl
index d40554469..d45c84014 100644
--- a/OpenCL/m14613-pure.cl
+++ b/OpenCL/m14613-pure.cl
@@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_twofish.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define MAX_ENTROPY 7.0
 
diff --git a/OpenCL/m14621-pure.cl b/OpenCL/m14621-pure.cl
index 4dda5922d..4b1e2b050 100644
--- a/OpenCL/m14621-pure.cl
+++ b/OpenCL/m14621-pure.cl
@@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define MAX_ENTROPY 7.0
 
diff --git a/OpenCL/m14622-pure.cl b/OpenCL/m14622-pure.cl
index bc8879f01..2acc9ea23 100644
--- a/OpenCL/m14622-pure.cl
+++ b/OpenCL/m14622-pure.cl
@@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_serpent.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define MAX_ENTROPY 7.0
 
diff --git a/OpenCL/m14623-pure.cl b/OpenCL/m14623-pure.cl
index 5ca24440a..f50b9d154 100644
--- a/OpenCL/m14623-pure.cl
+++ b/OpenCL/m14623-pure.cl
@@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_twofish.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define MAX_ENTROPY 7.0
 
diff --git a/OpenCL/m14631-pure.cl b/OpenCL/m14631-pure.cl
index 005b91be1..05a6f1c74 100644
--- a/OpenCL/m14631-pure.cl
+++ b/OpenCL/m14631-pure.cl
@@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define MAX_ENTROPY 7.0
 
diff --git a/OpenCL/m14632-pure.cl b/OpenCL/m14632-pure.cl
index a7b3c8901..ed2e1ad31 100644
--- a/OpenCL/m14632-pure.cl
+++ b/OpenCL/m14632-pure.cl
@@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_serpent.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define MAX_ENTROPY 7.0
 
diff --git a/OpenCL/m14633-pure.cl b/OpenCL/m14633-pure.cl
index e30aae7d0..387e65f28 100644
--- a/OpenCL/m14633-pure.cl
+++ b/OpenCL/m14633-pure.cl
@@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_twofish.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define MAX_ENTROPY 7.0
 
diff --git a/OpenCL/m14641-pure.cl b/OpenCL/m14641-pure.cl
index ae7b58363..acb24e150 100644
--- a/OpenCL/m14641-pure.cl
+++ b/OpenCL/m14641-pure.cl
@@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define MAX_ENTROPY 7.0
 
diff --git a/OpenCL/m14642-pure.cl b/OpenCL/m14642-pure.cl
index 40618e4cd..1be6dd262 100644
--- a/OpenCL/m14642-pure.cl
+++ b/OpenCL/m14642-pure.cl
@@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_serpent.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define MAX_ENTROPY 7.0
 
diff --git a/OpenCL/m14643-pure.cl b/OpenCL/m14643-pure.cl
index c0620f16e..0245df186 100644
--- a/OpenCL/m14643-pure.cl
+++ b/OpenCL/m14643-pure.cl
@@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_twofish.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define MAX_ENTROPY 7.0
 
diff --git a/OpenCL/m14700-pure.cl b/OpenCL/m14700-pure.cl
index baf1c833a..fc5acfd8d 100644
--- a/OpenCL/m14700-pure.cl
+++ b/OpenCL/m14700-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct itunes_backup
 {
diff --git a/OpenCL/m15100-pure.cl b/OpenCL/m15100-pure.cl
index a63cd7338..97138fc42 100644
--- a/OpenCL/m15100-pure.cl
+++ b/OpenCL/m15100-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pbkdf1_sha1_tmp
 {
diff --git a/OpenCL/m15300-pure.cl b/OpenCL/m15300-pure.cl
index 96190d7ee..7c8b953fd 100644
--- a/OpenCL/m15300-pure.cl
+++ b/OpenCL/m15300-pure.cl
@@ -16,8 +16,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_des.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct dpapimk
 {
diff --git a/OpenCL/m15600-pure.cl b/OpenCL/m15600-pure.cl
index 9476450a2..391bdf13c 100644
--- a/OpenCL/m15600-pure.cl
+++ b/OpenCL/m15600-pure.cl
@@ -31,8 +31,8 @@ typedef struct ethereum_pbkdf2
 
 } ethereum_pbkdf2_t;
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 CONSTANT_VK u64a keccakf_rndc[24] =
 {
diff --git a/OpenCL/m15700-pure.cl b/OpenCL/m15700-pure.cl
index bf29a8b0c..93a91094b 100644
--- a/OpenCL/m15700-pure.cl
+++ b/OpenCL/m15700-pure.cl
@@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct
 {
diff --git a/OpenCL/m15900-pure.cl b/OpenCL/m15900-pure.cl
index 640c6de90..9cff5d883 100644
--- a/OpenCL/m15900-pure.cl
+++ b/OpenCL/m15900-pure.cl
@@ -17,8 +17,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct dpapimk_tmp_v2
 {
diff --git a/OpenCL/m16200-pure.cl b/OpenCL/m16200-pure.cl
index 295098c9f..85cc819b3 100644
--- a/OpenCL/m16200-pure.cl
+++ b/OpenCL/m16200-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct apple_secure_notes_tmp
 {
diff --git a/OpenCL/m16300-pure.cl b/OpenCL/m16300-pure.cl
index a1198f630..2ec4c9152 100644
--- a/OpenCL/m16300-pure.cl
+++ b/OpenCL/m16300-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct ethereum_presale
 {
diff --git a/OpenCL/m16800-pure.cl b/OpenCL/m16800-pure.cl
index 07800f705..710252ef3 100644
--- a/OpenCL/m16800-pure.cl
+++ b/OpenCL/m16800-pure.cl
@@ -21,8 +21,8 @@
 #include "inc_hash_sha1.h"
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct wpa_pbkdf2_tmp
 {
diff --git a/OpenCL/m16801-pure.cl b/OpenCL/m16801-pure.cl
index 52752731d..a98ad6424 100644
--- a/OpenCL/m16801-pure.cl
+++ b/OpenCL/m16801-pure.cl
@@ -21,8 +21,8 @@
 #include "inc_hash_sha1.h"
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct wpa_pmk_tmp
 {
diff --git a/OpenCL/m16900-pure.cl b/OpenCL/m16900-pure.cl
index 020cbfdc4..88bde3454 100644
--- a/OpenCL/m16900-pure.cl
+++ b/OpenCL/m16900-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pbkdf2_sha256_tmp
 {
diff --git a/OpenCL/m18300-pure.cl b/OpenCL/m18300-pure.cl
index cc6137526..d2ecaa88a 100644
--- a/OpenCL/m18300-pure.cl
+++ b/OpenCL/m18300-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct apple_secure_notes_tmp
 {
diff --git a/OpenCL/m18400-pure.cl b/OpenCL/m18400-pure.cl
index 2c61f4a4f..6d0a5857b 100644
--- a/OpenCL/m18400-pure.cl
+++ b/OpenCL/m18400-pure.cl
@@ -16,8 +16,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct odf12_tmp
 {
diff --git a/OpenCL/m18600-pure.cl b/OpenCL/m18600-pure.cl
index ce1a94062..e674228e1 100644
--- a/OpenCL/m18600-pure.cl
+++ b/OpenCL/m18600-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct odf11_tmp
 {
diff --git a/OpenCL/m18800-pure.cl b/OpenCL/m18800-pure.cl
index 4a1f09201..93ebf5aca 100644
--- a/OpenCL/m18800-pure.cl
+++ b/OpenCL/m18800-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct bsp_tmp
 {
diff --git a/OpenCL/m18900-pure.cl b/OpenCL/m18900-pure.cl
index 5f3b5f6d4..707ba438c 100644
--- a/OpenCL/m18900-pure.cl
+++ b/OpenCL/m18900-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct android_backup_tmp
 {
diff --git a/OpenCL/m19000-pure.cl b/OpenCL/m19000-pure.cl
index 4d87c4a57..42ee3dd54 100644
--- a/OpenCL/m19000-pure.cl
+++ b/OpenCL/m19000-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct qnx_md5_tmp
 {
diff --git a/OpenCL/m19100-pure.cl b/OpenCL/m19100-pure.cl
index b8b8027a8..64b402b6e 100644
--- a/OpenCL/m19100-pure.cl
+++ b/OpenCL/m19100-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct qnx_sha256_tmp
 {
diff --git a/OpenCL/m19200-pure.cl b/OpenCL/m19200-pure.cl
index 60efd6126..4d62da229 100644
--- a/OpenCL/m19200-pure.cl
+++ b/OpenCL/m19200-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct qnx_sha512_tmp
 {
diff --git a/OpenCL/m20600-pure.cl b/OpenCL/m20600-pure.cl
index d1c17adcb..1373bb96c 100644
--- a/OpenCL/m20600-pure.cl
+++ b/OpenCL/m20600-pure.cl
@@ -16,8 +16,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct omt_sha256_tmp
 {
diff --git a/OpenCL/m21500-pure.cl b/OpenCL/m21500-pure.cl
index 5231cea9c..a181cc4a6 100644
--- a/OpenCL/m21500-pure.cl
+++ b/OpenCL/m21500-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct solarwinds_tmp
 {
diff --git a/OpenCL/m21600-pure.cl b/OpenCL/m21600-pure.cl
index d1d891d78..8852a3c4a 100644
--- a/OpenCL/m21600-pure.cl
+++ b/OpenCL/m21600-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct web2py_sha512_tmp
 {
diff --git a/OpenCL/m21700-pure.cl b/OpenCL/m21700-pure.cl
index 765142eec..920f0efa5 100644
--- a/OpenCL/m21700-pure.cl
+++ b/OpenCL/m21700-pure.cl
@@ -16,7 +16,7 @@
 #include M2S(INCLUDE_PATH/inc_ecc_secp256k1.cl)
 #endif
 
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct electrum
 {
diff --git a/OpenCL/m22000-pure.cl b/OpenCL/m22000-pure.cl
index 4fefb20e5..a4d497ce5 100644
--- a/OpenCL/m22000-pure.cl
+++ b/OpenCL/m22000-pure.cl
@@ -27,8 +27,8 @@
 #include "inc_cipher_aes.h"
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct wpa_pbkdf2_tmp
 {
diff --git a/OpenCL/m22001-pure.cl b/OpenCL/m22001-pure.cl
index 2b97e8ad7..18f30c028 100644
--- a/OpenCL/m22001-pure.cl
+++ b/OpenCL/m22001-pure.cl
@@ -27,8 +27,8 @@
 #include "inc_cipher_aes.h"
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct wpa_pmk_tmp
 {
diff --git a/OpenCL/m22400-pure.cl b/OpenCL/m22400-pure.cl
index 6556ade65..4e81400f0 100644
--- a/OpenCL/m22400-pure.cl
+++ b/OpenCL/m22400-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct aescrypt
 {
diff --git a/OpenCL/m22700-pure.cl b/OpenCL/m22700-pure.cl
index 0cfd8facc..22b801ce5 100644
--- a/OpenCL/m22700-pure.cl
+++ b/OpenCL/m22700-pure.cl
@@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 // fixed MultiBit salt (not a bug)
 
diff --git a/OpenCL/m23200-pure.cl b/OpenCL/m23200-pure.cl
index d7c464ebc..eebe40906 100644
--- a/OpenCL/m23200-pure.cl
+++ b/OpenCL/m23200-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct xmpp_tmp
 {
diff --git a/OpenCL/m23400-pure.cl b/OpenCL/m23400-pure.cl
index c56b8b960..77baf0362 100644
--- a/OpenCL/m23400-pure.cl
+++ b/OpenCL/m23400-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct bitwarden_tmp
 {
diff --git a/OpenCL/m23700-optimized.cl b/OpenCL/m23700-optimized.cl
index e539a5c9b..c3c823464 100644
--- a/OpenCL/m23700-optimized.cl
+++ b/OpenCL/m23700-optimized.cl
@@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define ROUNDS 0x40000
 
diff --git a/OpenCL/m23700-pure.cl b/OpenCL/m23700-pure.cl
index 959185015..fa5393eda 100644
--- a/OpenCL/m23700-pure.cl
+++ b/OpenCL/m23700-pure.cl
@@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define ROUNDS 0x40000
 
diff --git a/OpenCL/m23800-optimized.cl b/OpenCL/m23800-optimized.cl
index 4c29a53bc..2d7bc57e6 100644
--- a/OpenCL/m23800-optimized.cl
+++ b/OpenCL/m23800-optimized.cl
@@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define ROUNDS 0x40000
 
diff --git a/OpenCL/m23800-pure.cl b/OpenCL/m23800-pure.cl
index aabb0bcee..6eca59377 100644
--- a/OpenCL/m23800-pure.cl
+++ b/OpenCL/m23800-pure.cl
@@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define ROUNDS 0x40000
 
diff --git a/OpenCL/m24100-pure.cl b/OpenCL/m24100-pure.cl
index 94337e49a..8f8842e7c 100644
--- a/OpenCL/m24100-pure.cl
+++ b/OpenCL/m24100-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct mongodb_sha1_tmp
 {
diff --git a/OpenCL/m24200-pure.cl b/OpenCL/m24200-pure.cl
index 663cdaefe..6cf9e8a79 100644
--- a/OpenCL/m24200-pure.cl
+++ b/OpenCL/m24200-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct mongodb_sha256_tmp
 {
diff --git a/OpenCL/m24410-pure.cl b/OpenCL/m24410-pure.cl
index 07fac3fa4..6b7461ccb 100644
--- a/OpenCL/m24410-pure.cl
+++ b/OpenCL/m24410-pure.cl
@@ -16,8 +16,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_des.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pkcs_sha1_tmp
 {
diff --git a/OpenCL/m24420-pure.cl b/OpenCL/m24420-pure.cl
index c43f6ddd7..6bc2b6eb0 100644
--- a/OpenCL/m24420-pure.cl
+++ b/OpenCL/m24420-pure.cl
@@ -16,8 +16,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_des.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pkcs_sha256_tmp
 {
diff --git a/OpenCL/m24610-pure.cl b/OpenCL/m24610-pure.cl
index 9165fbcaf..798070ddb 100644
--- a/OpenCL/m24610-pure.cl
+++ b/OpenCL/m24610-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct sqlcipher_sha1_tmp
 {
diff --git a/OpenCL/m24620-pure.cl b/OpenCL/m24620-pure.cl
index c5fab00e6..863e9cc31 100644
--- a/OpenCL/m24620-pure.cl
+++ b/OpenCL/m24620-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct sqlcipher_sha256_tmp
 {
diff --git a/OpenCL/m24630-pure.cl b/OpenCL/m24630-pure.cl
index ac49525e1..d1c26a400 100644
--- a/OpenCL/m24630-pure.cl
+++ b/OpenCL/m24630-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct sqlcipher_sha512_tmp
 {
diff --git a/OpenCL/m25000-pure.cl b/OpenCL/m25000-pure.cl
index eb11bb16e..a6325c37a 100644
--- a/OpenCL/m25000-pure.cl
+++ b/OpenCL/m25000-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define SNMPV3_SALT_MAX             1500
 #define SNMPV3_ENGINEID_MAX         34
diff --git a/OpenCL/m25100-pure.cl b/OpenCL/m25100-pure.cl
index 6812110f6..63fdebd20 100644
--- a/OpenCL/m25100-pure.cl
+++ b/OpenCL/m25100-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define SNMPV3_SALT_MAX             1500
 #define SNMPV3_ENGINEID_MAX         34
diff --git a/OpenCL/m25200-pure.cl b/OpenCL/m25200-pure.cl
index ac6ac6e97..82ae963dc 100644
--- a/OpenCL/m25200-pure.cl
+++ b/OpenCL/m25200-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define SNMPV3_SALT_MAX             1500
 #define SNMPV3_ENGINEID_MAX         34
diff --git a/OpenCL/m25300-pure.cl b/OpenCL/m25300-pure.cl
index 2898c867e..b7f6ebceb 100644
--- a/OpenCL/m25300-pure.cl
+++ b/OpenCL/m25300-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct office2016_tmp
 {
diff --git a/OpenCL/m25400-pure.cl b/OpenCL/m25400-pure.cl
index 8a02c2143..5063d09f1 100644
--- a/OpenCL/m25400-pure.cl
+++ b/OpenCL/m25400-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_rc4.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pdf
 {
diff --git a/OpenCL/m25500-pure.cl b/OpenCL/m25500-pure.cl
index cfca26aee..c5be7fef7 100644
--- a/OpenCL/m25500-pure.cl
+++ b/OpenCL/m25500-pure.cl
@@ -16,8 +16,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes-gcm.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pbkdf2_sha256_tmp
 {
diff --git a/OpenCL/m25600-pure.cl b/OpenCL/m25600-pure.cl
index f59e4a6f1..d53a828db 100644
--- a/OpenCL/m25600-pure.cl
+++ b/OpenCL/m25600-pure.cl
@@ -23,8 +23,8 @@
 #define uint_to_hex_lower8(i) make_u32x (u16_bin_to_u32_hex ((i).s0), u16_bin_to_u32_hex ((i).s1), u16_bin_to_u32_hex ((i).s2), u16_bin_to_u32_hex ((i).s3), u16_bin_to_u32_hex ((i).s4), u16_bin_to_u32_hex ((i).s5), u16_bin_to_u32_hex ((i).s6), u16_bin_to_u32_hex ((i).s7), u16_bin_to_u32_hex ((i).s8), u16_bin_to_u32_hex ((i).s9), u16_bin_to_u32_hex ((i).sa), u16_bin_to_u32_hex ((i).sb), u16_bin_to_u32_hex ((i).sc), u16_bin_to_u32_hex ((i).sd), u16_bin_to_u32_hex ((i).se), u16_bin_to_u32_hex ((i).sf))
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct bcrypt_tmp
 {
diff --git a/OpenCL/m25800-pure.cl b/OpenCL/m25800-pure.cl
index 9cff9cd32..8658e17c8 100644
--- a/OpenCL/m25800-pure.cl
+++ b/OpenCL/m25800-pure.cl
@@ -23,8 +23,8 @@
 #define uint_to_hex_lower8(i) make_u32x (u16_bin_to_u32_hex ((i).s0), u16_bin_to_u32_hex ((i).s1), u16_bin_to_u32_hex ((i).s2), u16_bin_to_u32_hex ((i).s3), u16_bin_to_u32_hex ((i).s4), u16_bin_to_u32_hex ((i).s5), u16_bin_to_u32_hex ((i).s6), u16_bin_to_u32_hex ((i).s7), u16_bin_to_u32_hex ((i).s8), u16_bin_to_u32_hex ((i).s9), u16_bin_to_u32_hex ((i).sa), u16_bin_to_u32_hex ((i).sb), u16_bin_to_u32_hex ((i).sc), u16_bin_to_u32_hex ((i).sd), u16_bin_to_u32_hex ((i).se), u16_bin_to_u32_hex ((i).sf))
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct bcrypt_tmp
 {
diff --git a/OpenCL/m25900-pure.cl b/OpenCL/m25900-pure.cl
index 8df8f3e6f..00c2637ed 100644
--- a/OpenCL/m25900-pure.cl
+++ b/OpenCL/m25900-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct blocks
 {
diff --git a/OpenCL/m26100-pure.cl b/OpenCL/m26100-pure.cl
index a4cdbb253..83cba94e4 100644
--- a/OpenCL/m26100-pure.cl
+++ b/OpenCL/m26100-pure.cl
@@ -16,8 +16,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct mozilla_aes_tmp
 {
diff --git a/OpenCL/m26500-pure.cl b/OpenCL/m26500-pure.cl
index 79d1c1b6d..7e73390e4 100644
--- a/OpenCL/m26500-pure.cl
+++ b/OpenCL/m26500-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct iphone_passcode_tmp
 {
diff --git a/OpenCL/m26600-pure.cl b/OpenCL/m26600-pure.cl
index 92594fb5c..906edc9bf 100644
--- a/OpenCL/m26600-pure.cl
+++ b/OpenCL/m26600-pure.cl
@@ -16,8 +16,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes-gcm.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pbkdf2_sha256_tmp
 {
diff --git a/OpenCL/m26700-pure.cl b/OpenCL/m26700-pure.cl
index 033aa063d..74bb30284 100644
--- a/OpenCL/m26700-pure.cl
+++ b/OpenCL/m26700-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha224.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define SNMPV3_SALT_MAX             1500
 #define SNMPV3_ENGINEID_MAX         34
diff --git a/OpenCL/m26800-pure.cl b/OpenCL/m26800-pure.cl
index c7224399d..9fa5ce34d 100644
--- a/OpenCL/m26800-pure.cl
+++ b/OpenCL/m26800-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define SNMPV3_SALT_MAX             1500
 #define SNMPV3_ENGINEID_MAX         34
diff --git a/OpenCL/m26900-pure.cl b/OpenCL/m26900-pure.cl
index 05d826892..616a3c5c1 100644
--- a/OpenCL/m26900-pure.cl
+++ b/OpenCL/m26900-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha384.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define SNMPV3_SALT_MAX             1500
 #define SNMPV3_ENGINEID_MAX         34
diff --git a/OpenCL/m27000-pure.cl b/OpenCL/m27000-pure.cl
index eed9c3c5e..5f85c8f2b 100644
--- a/OpenCL/m27000-pure.cl
+++ b/OpenCL/m27000-pure.cl
@@ -16,8 +16,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md4.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define PERM_OP(a,b,tt,n,m) \
 {                           \
diff --git a/OpenCL/m27100-pure.cl b/OpenCL/m27100-pure.cl
index df2c190a3..d3cb273f5 100644
--- a/OpenCL/m27100-pure.cl
+++ b/OpenCL/m27100-pure.cl
@@ -17,8 +17,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #ifdef KERNEL_STATIC
 DECLSPEC u8 hex_convert (const u8 c)
diff --git a/OpenCL/m27300-pure.cl b/OpenCL/m27300-pure.cl
index cb2067a2b..6d21ba03c 100644
--- a/OpenCL/m27300-pure.cl
+++ b/OpenCL/m27300-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 #define SNMPV3_SALT_MAX             1500
 #define SNMPV3_ENGINEID_MAX         34
diff --git a/OpenCL/m27400-pure.cl b/OpenCL/m27400-pure.cl
index 74137bade..d86b95d6c 100644
--- a/OpenCL/m27400-pure.cl
+++ b/OpenCL/m27400-pure.cl
@@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct pbkdf2_sha1_tmp
 {
diff --git a/OpenCL/m27500-pure.cl b/OpenCL/m27500-pure.cl
index eac544f85..e4120dd15 100644
--- a/OpenCL/m27500-pure.cl
+++ b/OpenCL/m27500-pure.cl
@@ -15,7 +15,7 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct vbox
 {
diff --git a/OpenCL/m27600-pure.cl b/OpenCL/m27600-pure.cl
index 39ec4d221..0825425ad 100644
--- a/OpenCL/m27600-pure.cl
+++ b/OpenCL/m27600-pure.cl
@@ -15,7 +15,7 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif
 
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct vbox
 {
diff --git a/OpenCL/m28100-pure.cl b/OpenCL/m28100-pure.cl
index 28f4025b4..46d707055 100644
--- a/OpenCL/m28100-pure.cl
+++ b/OpenCL/m28100-pure.cl
@@ -16,8 +16,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct winhello
 {
diff --git a/OpenCL/m28200-pure.cl b/OpenCL/m28200-pure.cl
index 8d3c5a828..a34757aba 100644
--- a/OpenCL/m28200-pure.cl
+++ b/OpenCL/m28200-pure.cl
@@ -13,8 +13,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes-gcm.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct exodus_tmp
 {
diff --git a/OpenCL/m28600-pure.cl b/OpenCL/m28600-pure.cl
index d91e91bea..9b534a4d5 100644
--- a/OpenCL/m28600-pure.cl
+++ b/OpenCL/m28600-pure.cl
@@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif
 
-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
 
 typedef struct postgres_sha256_tmp
 {