diff --git a/OpenCL/inc_cipher_aes.cl b/OpenCL/inc_cipher_aes.cl
index 74cf356f2..74b9c3700 100644
--- a/OpenCL/inc_cipher_aes.cl
+++ b/OpenCL/inc_cipher_aes.cl
@@ -3,7 +3,7 @@
  * License.....: MIT
  */
 
-__constant u32a te0[256] =
+__constant static u32a te0[256] =
 {
   0xc66363a5, 0xf87c7c84, 0xee777799, 0xf67b7b8d,
   0xfff2f20d, 0xd66b6bbd, 0xde6f6fb1, 0x91c5c554,
@@ -71,7 +71,7 @@ __constant u32a te0[256] =
   0x7bb0b0cb, 0xa85454fc, 0x6dbbbbd6, 0x2c16163a,
 };
 
-__constant u32a te1[256] =
+__constant static u32a te1[256] =
 {
   0xa5c66363, 0x84f87c7c, 0x99ee7777, 0x8df67b7b,
   0x0dfff2f2, 0xbdd66b6b, 0xb1de6f6f, 0x5491c5c5,
@@ -139,7 +139,7 @@ __constant u32a te1[256] =
   0xcb7bb0b0, 0xfca85454, 0xd66dbbbb, 0x3a2c1616,
 };
 
-__constant u32a te2[256] =
+__constant static u32a te2[256] =
 {
   0x63a5c663, 0x7c84f87c, 0x7799ee77, 0x7b8df67b,
   0xf20dfff2, 0x6bbdd66b, 0x6fb1de6f, 0xc55491c5,
@@ -207,7 +207,7 @@ __constant u32a te2[256] =
   0xb0cb7bb0, 0x54fca854, 0xbbd66dbb, 0x163a2c16,
 };
 
-__constant u32a te3[256] =
+__constant static u32a te3[256] =
 {
   0x6363a5c6, 0x7c7c84f8, 0x777799ee, 0x7b7b8df6,
   0xf2f20dff, 0x6b6bbdd6, 0x6f6fb1de, 0xc5c55491,
@@ -275,7 +275,7 @@ __constant u32a te3[256] =
   0xb0b0cb7b, 0x5454fca8, 0xbbbbd66d, 0x16163a2c,
 };
 
-__constant u32a te4[256] =
+__constant static u32a te4[256] =
 {
   0x63636363, 0x7c7c7c7c, 0x77777777, 0x7b7b7b7b,
   0xf2f2f2f2, 0x6b6b6b6b, 0x6f6f6f6f, 0xc5c5c5c5,
@@ -343,7 +343,7 @@ __constant u32a te4[256] =
   0xb0b0b0b0, 0x54545454, 0xbbbbbbbb, 0x16161616,
 };
 
-__constant u32a td0[256] =
+__constant static u32a td0[256] =
 {
   0x51f4a750, 0x7e416553, 0x1a17a4c3, 0x3a275e96,
   0x3bab6bcb, 0x1f9d45f1, 0xacfa58ab, 0x4be30393,
@@ -411,7 +411,7 @@ __constant u32a td0[256] =
   0x7bcb8461, 0xd532b670, 0x486c5c74, 0xd0b85742,
 };
 
-__constant u32a td1[256] =
+__constant static u32a td1[256] =
 {
   0x5051f4a7, 0x537e4165, 0xc31a17a4, 0x963a275e,
   0xcb3bab6b, 0xf11f9d45, 0xabacfa58, 0x934be303,
@@ -479,7 +479,7 @@ __constant u32a td1[256] =
   0x617bcb84, 0x70d532b6, 0x74486c5c, 0x42d0b857,
 };
 
-__constant u32a td2[256] =
+__constant static u32a td2[256] =
 {
   0xa75051f4, 0x65537e41, 0xa4c31a17, 0x5e963a27,
   0x6bcb3bab, 0x45f11f9d, 0x58abacfa, 0x03934be3,
@@ -547,7 +547,7 @@ __constant u32a td2[256] =
   0x84617bcb, 0xb670d532, 0x5c74486c, 0x5742d0b8,
 };
 
-__constant u32a td3[256] =
+__constant static u32a td3[256] =
 {
   0xf4a75051, 0x4165537e, 0x17a4c31a, 0x275e963a,
   0xab6bcb3b, 0x9d45f11f, 0xfa58abac, 0xe303934b,
@@ -615,7 +615,7 @@ __constant u32a td3[256] =
   0xcb84617b, 0x32b670d5, 0x6c5c7448, 0xb85742d0,
 };
 
-__constant u32a td4[256] =
+__constant static u32a td4[256] =
 {
   0x52525252, 0x09090909, 0x6a6a6a6a, 0xd5d5d5d5,
   0x30303030, 0x36363636, 0xa5a5a5a5, 0x38383838,
@@ -683,7 +683,7 @@ __constant u32a td4[256] =
   0x55555555, 0x21212121, 0x0c0c0c0c, 0x7d7d7d7d,
 };
 
-__constant u32a rcon[] =
+__constant static u32a rcon[] =
 {
   0x01000000, 0x02000000, 0x04000000, 0x08000000,
   0x10000000, 0x20000000, 0x40000000, 0x80000000,
diff --git a/OpenCL/inc_cipher_twofish.cl b/OpenCL/inc_cipher_twofish.cl
index a81611cc8..8a326c347 100644
--- a/OpenCL/inc_cipher_twofish.cl
+++ b/OpenCL/inc_cipher_twofish.cl
@@ -21,7 +21,7 @@
 
 #define extract_byte(x,n) (((x) >> (8 * (n))) & 0xff)
 
-__constant u32a q_tab[2][256] =
+__constant static u32a q_tab[2][256] =
 {
   {
     0xA9, 0x67, 0xB3, 0xE8, 0x04, 0xFD, 0xA3, 0x76, 0x9A, 0x92, 0x80, 0x78,
@@ -75,7 +75,7 @@ __constant u32a q_tab[2][256] =
 
 #define q(n,x) q_tab[n][x]
 
-__constant u32a  m_tab[4][256] =
+__constant static u32a  m_tab[4][256] =
 {
   { 0xBCBC3275, 0xECEC21F3, 0x202043C6, 0xB3B3C9F4, 0xDADA03DB, 0x02028B7B,
     0xE2E22BFB, 0x9E9EFAC8, 0xC9C9EC4A, 0xD4D409D3, 0x18186BE6, 0x1E1E9F6B,
diff --git a/OpenCL/inc_common.cl b/OpenCL/inc_common.cl
index 56e7a7632..3b11d722a 100644
--- a/OpenCL/inc_common.cl
+++ b/OpenCL/inc_common.cl
@@ -3,7 +3,7 @@
  * License.....: MIT
  */
 
-__constant u32a c_append_helper[64][16] =
+__constant static u32a c_append_helper[64][16] =
 {
   { 0x000000ff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
   { 0x0000ff00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
diff --git a/OpenCL/inc_hash_sha224.cl b/OpenCL/inc_hash_sha224.cl
index 4f35938a6..51436aa28 100644
--- a/OpenCL/inc_hash_sha224.cl
+++ b/OpenCL/inc_hash_sha224.cl
@@ -4,7 +4,7 @@
 // input buf needs to be in algorithm native byte order (md5 = LE, sha256 = BE, etc)
 // input buf needs to be 64 byte aligned when using md5_update()
 
-__constant u32a k_sha256[64] =
+__constant static u32a k_sha256[64] =
 {
   SHA256C00, SHA256C01, SHA256C02, SHA256C03,
   SHA256C04, SHA256C05, SHA256C06, SHA256C07,
diff --git a/OpenCL/inc_hash_sha256.cl b/OpenCL/inc_hash_sha256.cl
index 75fd99acf..0ae1e5b75 100644
--- a/OpenCL/inc_hash_sha256.cl
+++ b/OpenCL/inc_hash_sha256.cl
@@ -4,7 +4,7 @@
 // input buf needs to be in algorithm native byte order (md5 = LE, sha256 = BE, etc)
 // input buf needs to be 64 byte aligned when using md5_update()
 
-__constant u32a k_sha256[64] =
+__constant static u32a k_sha256[64] =
 {
   SHA256C00, SHA256C01, SHA256C02, SHA256C03,
   SHA256C04, SHA256C05, SHA256C06, SHA256C07,
diff --git a/OpenCL/inc_hash_sha384.cl b/OpenCL/inc_hash_sha384.cl
index 8302cd379..c5471c011 100644
--- a/OpenCL/inc_hash_sha384.cl
+++ b/OpenCL/inc_hash_sha384.cl
@@ -4,7 +4,7 @@
 // input buf needs to be in algorithm native byte order (md5 = LE, sha1 = BE, etc)
 // input buf needs to be 128 byte aligned when using sha512_update()
 
-__constant u64a k_sha384[80] =
+__constant static u64a k_sha384[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/inc_hash_sha512.cl b/OpenCL/inc_hash_sha512.cl
index 6c58834eb..d8f7d9ca8 100644
--- a/OpenCL/inc_hash_sha512.cl
+++ b/OpenCL/inc_hash_sha512.cl
@@ -4,7 +4,7 @@
 // input buf needs to be in algorithm native byte order (md5 = LE, sha1 = BE, etc)
 // input buf needs to be 128 byte aligned when using sha512_update()
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/inc_hash_whirlpool.cl b/OpenCL/inc_hash_whirlpool.cl
index c0057b1b9..66db07440 100644
--- a/OpenCL/inc_hash_whirlpool.cl
+++ b/OpenCL/inc_hash_whirlpool.cl
@@ -6,7 +6,7 @@
 
 #define R 10
 
-__constant u32a Ch[8][256] =
+__constant static u32a Ch[8][256] =
 {
   {
     0x18186018, 0x23238c23, 0xc6c63fc6, 0xe8e887e8,
@@ -538,7 +538,7 @@ __constant u32a Ch[8][256] =
   }
 };
 
-__constant u32a Cl[8][256] =
+__constant static u32a Cl[8][256] =
 {
   {
     0xc07830d8, 0x05af4626, 0x7ef991b8, 0x136fcdfb,
@@ -1070,7 +1070,7 @@ __constant u32a Cl[8][256] =
   },
 };
 
-__constant u32a rch[R + 1] =
+__constant static u32a rch[R + 1] =
 {
   0x00000000,
   0x1823c6e8,
@@ -1085,7 +1085,7 @@ __constant u32a rch[R + 1] =
   0xca2dbf07,
 };
 
-__constant u32a rcl[R + 1] =
+__constant static u32a rcl[R + 1] =
 {
   0x00000000,
   0x87b8014f,
diff --git a/OpenCL/inc_luks_af.cl b/OpenCL/inc_luks_af.cl
index 47059bca1..9946c209c 100644
--- a/OpenCL/inc_luks_af.cl
+++ b/OpenCL/inc_luks_af.cl
@@ -1,7 +1,7 @@
 
 // basically normal XXX_transform() but with a different name to avoid collisions with function nameing
 
-__constant u32a AF_k_sha256[64] =
+__constant static u32a AF_k_sha256[64] =
 {
   SHA256C00, SHA256C01, SHA256C02, SHA256C03,
   SHA256C04, SHA256C05, SHA256C06, SHA256C07,
@@ -21,7 +21,7 @@ __constant u32a AF_k_sha256[64] =
   SHA256C3c, SHA256C3d, SHA256C3e, SHA256C3f,
 };
 
-__constant u64a AF_k_sha512[80] =
+__constant static u64a AF_k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/inc_luks_essiv.cl b/OpenCL/inc_luks_essiv.cl
index 5011ffed4..ecf3e1da4 100644
--- a/OpenCL/inc_luks_essiv.cl
+++ b/OpenCL/inc_luks_essiv.cl
@@ -1,4 +1,4 @@
-__constant u32a ESSIV_k_sha256[64] =
+__constant static u32a ESSIV_k_sha256[64] =
 {
   SHA256C00, SHA256C01, SHA256C02, SHA256C03,
   SHA256C04, SHA256C05, SHA256C06, SHA256C07,
diff --git a/OpenCL/inc_truecrypt_crc32.cl b/OpenCL/inc_truecrypt_crc32.cl
index f6b5a5eaa..b8e464b74 100644
--- a/OpenCL/inc_truecrypt_crc32.cl
+++ b/OpenCL/inc_truecrypt_crc32.cl
@@ -1,4 +1,4 @@
-__constant u32a crc32tab[0x100] =
+__constant static u32a crc32tab[0x100] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
diff --git a/OpenCL/m01500_a0.cl b/OpenCL/m01500_a0.cl
index 0a0987643..42c5496cf 100644
--- a/OpenCL/m01500_a0.cl
+++ b/OpenCL/m01500_a0.cl
@@ -34,7 +34,7 @@
   a  = a ^ tt;              \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x00820200, 0x00020000, 0x80800000, 0x80820200,
@@ -182,7 +182,7 @@ __constant u32a c_SPtrans[8][64] =
   },
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m01500_a1.cl b/OpenCL/m01500_a1.cl
index c7c2e53a5..177628442 100644
--- a/OpenCL/m01500_a1.cl
+++ b/OpenCL/m01500_a1.cl
@@ -32,7 +32,7 @@
   a  = a ^ tt;              \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x00820200, 0x00020000, 0x80800000, 0x80820200,
@@ -180,7 +180,7 @@ __constant u32a c_SPtrans[8][64] =
   },
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m01700_a0-optimized.cl b/OpenCL/m01700_a0-optimized.cl
index 2ca3eb0c0..b891f704c 100644
--- a/OpenCL/m01700_a0-optimized.cl
+++ b/OpenCL/m01700_a0-optimized.cl
@@ -14,7 +14,7 @@
 #include "inc_rp_optimized.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m01700_a1-optimized.cl b/OpenCL/m01700_a1-optimized.cl
index 028064dc9..e55f1f9a3 100644
--- a/OpenCL/m01700_a1-optimized.cl
+++ b/OpenCL/m01700_a1-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m01700_a3-optimized.cl b/OpenCL/m01700_a3-optimized.cl
index c2b6aef5a..e06cb28c8 100644
--- a/OpenCL/m01700_a3-optimized.cl
+++ b/OpenCL/m01700_a3-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m01710_a0-optimized.cl b/OpenCL/m01710_a0-optimized.cl
index 4000020fe..821abb685 100644
--- a/OpenCL/m01710_a0-optimized.cl
+++ b/OpenCL/m01710_a0-optimized.cl
@@ -14,7 +14,7 @@
 #include "inc_rp_optimized.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m01710_a1-optimized.cl b/OpenCL/m01710_a1-optimized.cl
index 58ede3289..72fb2a125 100644
--- a/OpenCL/m01710_a1-optimized.cl
+++ b/OpenCL/m01710_a1-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m01710_a3-optimized.cl b/OpenCL/m01710_a3-optimized.cl
index 27ed660d7..0a061a901 100644
--- a/OpenCL/m01710_a3-optimized.cl
+++ b/OpenCL/m01710_a3-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m01720_a0-optimized.cl b/OpenCL/m01720_a0-optimized.cl
index f83139b4a..47c07083a 100644
--- a/OpenCL/m01720_a0-optimized.cl
+++ b/OpenCL/m01720_a0-optimized.cl
@@ -14,7 +14,7 @@
 #include "inc_rp_optimized.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m01720_a1-optimized.cl b/OpenCL/m01720_a1-optimized.cl
index d4d0d6a87..72c2715a2 100644
--- a/OpenCL/m01720_a1-optimized.cl
+++ b/OpenCL/m01720_a1-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m01720_a3-optimized.cl b/OpenCL/m01720_a3-optimized.cl
index d83ed5651..4604afb06 100644
--- a/OpenCL/m01720_a3-optimized.cl
+++ b/OpenCL/m01720_a3-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m01730_a0-optimized.cl b/OpenCL/m01730_a0-optimized.cl
index ad7cc2ee7..efb24779a 100644
--- a/OpenCL/m01730_a0-optimized.cl
+++ b/OpenCL/m01730_a0-optimized.cl
@@ -14,7 +14,7 @@
 #include "inc_rp_optimized.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m01730_a1-optimized.cl b/OpenCL/m01730_a1-optimized.cl
index 59e0893c9..dbb3141df 100644
--- a/OpenCL/m01730_a1-optimized.cl
+++ b/OpenCL/m01730_a1-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m01730_a3-optimized.cl b/OpenCL/m01730_a3-optimized.cl
index 973936593..26d2e4e43 100644
--- a/OpenCL/m01730_a3-optimized.cl
+++ b/OpenCL/m01730_a3-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m01740_a0-optimized.cl b/OpenCL/m01740_a0-optimized.cl
index a6594db83..a8a8eced1 100644
--- a/OpenCL/m01740_a0-optimized.cl
+++ b/OpenCL/m01740_a0-optimized.cl
@@ -14,7 +14,7 @@
 #include "inc_rp_optimized.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m01740_a1-optimized.cl b/OpenCL/m01740_a1-optimized.cl
index c0548edbf..310af40ae 100644
--- a/OpenCL/m01740_a1-optimized.cl
+++ b/OpenCL/m01740_a1-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m01740_a3-optimized.cl b/OpenCL/m01740_a3-optimized.cl
index c1747ad3c..dc2ac9796 100644
--- a/OpenCL/m01740_a3-optimized.cl
+++ b/OpenCL/m01740_a3-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m03000_a0.cl b/OpenCL/m03000_a0.cl
index 1200a0256..ed8ee83b5 100644
--- a/OpenCL/m03000_a0.cl
+++ b/OpenCL/m03000_a0.cl
@@ -34,7 +34,7 @@
   a  = a ^ tt;              \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x02080800, 0x00080000, 0x02000002, 0x02080802,
@@ -182,7 +182,7 @@ __constant u32a c_SPtrans[8][64] =
   }
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m03000_a1.cl b/OpenCL/m03000_a1.cl
index c93bb7d6c..aea2f080b 100644
--- a/OpenCL/m03000_a1.cl
+++ b/OpenCL/m03000_a1.cl
@@ -32,7 +32,7 @@
   a  = a ^ tt;              \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x02080800, 0x00080000, 0x02000002, 0x02080802,
@@ -180,7 +180,7 @@ __constant u32a c_SPtrans[8][64] =
   }
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m03100_a0-optimized.cl b/OpenCL/m03100_a0-optimized.cl
index dabca7d99..6890c4a19 100644
--- a/OpenCL/m03100_a0-optimized.cl
+++ b/OpenCL/m03100_a0-optimized.cl
@@ -53,7 +53,7 @@
   PERM_OP (l, r, tt,  4, 0x0f0f0f0f);  \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x02080800, 0x00080000, 0x02000002, 0x02080802,
@@ -201,7 +201,7 @@ __constant u32a c_SPtrans[8][64] =
   }
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m03100_a1-optimized.cl b/OpenCL/m03100_a1-optimized.cl
index 8aaae3252..636836c30 100644
--- a/OpenCL/m03100_a1-optimized.cl
+++ b/OpenCL/m03100_a1-optimized.cl
@@ -51,7 +51,7 @@
   PERM_OP (l, r, tt,  4, 0x0f0f0f0f);  \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x02080800, 0x00080000, 0x02000002, 0x02080802,
@@ -199,7 +199,7 @@ __constant u32a c_SPtrans[8][64] =
   }
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m03100_a3-optimized.cl b/OpenCL/m03100_a3-optimized.cl
index 632edd0b1..fb2d246fd 100644
--- a/OpenCL/m03100_a3-optimized.cl
+++ b/OpenCL/m03100_a3-optimized.cl
@@ -50,7 +50,7 @@
   PERM_OP (l, r, tt,  4, 0x0f0f0f0f);  \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x02080800, 0x00080000, 0x02000002, 0x02080802,
@@ -198,7 +198,7 @@ __constant u32a c_SPtrans[8][64] =
   }
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m03200.cl b/OpenCL/m03200.cl
index cb908ccaa..283e2aa75 100644
--- a/OpenCL/m03200.cl
+++ b/OpenCL/m03200.cl
@@ -14,7 +14,7 @@
 
 // http://www.schneier.com/code/constants.txt
 
-__constant u32a c_sbox0[256] =
+__constant static u32a c_sbox0[256] =
 {
   0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
   0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
@@ -82,7 +82,7 @@ __constant u32a c_sbox0[256] =
   0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
 };
 
-__constant u32a c_sbox1[256] =
+__constant static u32a c_sbox1[256] =
 {
   0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
   0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
@@ -150,7 +150,7 @@ __constant u32a c_sbox1[256] =
   0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
 };
 
-__constant u32a c_sbox2[256] =
+__constant static u32a c_sbox2[256] =
 {
   0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
   0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
@@ -218,7 +218,7 @@ __constant u32a c_sbox2[256] =
   0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
 };
 
-__constant u32a c_sbox3[256] =
+__constant static u32a c_sbox3[256] =
 {
   0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
   0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
diff --git a/OpenCL/m05000_a0-optimized.cl b/OpenCL/m05000_a0-optimized.cl
index 260e40324..f011502de 100644
--- a/OpenCL/m05000_a0-optimized.cl
+++ b/OpenCL/m05000_a0-optimized.cl
@@ -14,7 +14,7 @@
 #include "inc_rp_optimized.cl"
 #include "inc_simd.cl"
 
-__constant u64a keccakf_rndc[24] =
+__constant static u64a keccakf_rndc[24] =
 {
   0x0000000000000001, 0x0000000000008082, 0x800000000000808a,
   0x8000000080008000, 0x000000000000808b, 0x0000000080000001,
diff --git a/OpenCL/m05000_a1-optimized.cl b/OpenCL/m05000_a1-optimized.cl
index 39c370c52..de6415087 100644
--- a/OpenCL/m05000_a1-optimized.cl
+++ b/OpenCL/m05000_a1-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u64a keccakf_rndc[24] =
+__constant static u64a keccakf_rndc[24] =
 {
   0x0000000000000001, 0x0000000000008082, 0x800000000000808a,
   0x8000000080008000, 0x000000000000808b, 0x0000000080000001,
diff --git a/OpenCL/m05000_a3-optimized.cl b/OpenCL/m05000_a3-optimized.cl
index 7334426ba..e7da770e3 100644
--- a/OpenCL/m05000_a3-optimized.cl
+++ b/OpenCL/m05000_a3-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u64a keccakf_rndc[24] =
+__constant static u64a keccakf_rndc[24] =
 {
   0x0000000000000001, 0x0000000000008082, 0x800000000000808a,
   0x8000000080008000, 0x000000000000808b, 0x0000000080000001,
diff --git a/OpenCL/m05500_a0-optimized.cl b/OpenCL/m05500_a0-optimized.cl
index 0e564e3ce..560f6ed5e 100644
--- a/OpenCL/m05500_a0-optimized.cl
+++ b/OpenCL/m05500_a0-optimized.cl
@@ -34,7 +34,7 @@
   a  = a ^ tt;              \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x02080800, 0x00080000, 0x02000002, 0x02080802,
@@ -182,7 +182,7 @@ __constant u32a c_SPtrans[8][64] =
   }
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m05500_a0.cl b/OpenCL/m05500_a0.cl
index b9659b0f1..fda2805b2 100644
--- a/OpenCL/m05500_a0.cl
+++ b/OpenCL/m05500_a0.cl
@@ -35,7 +35,7 @@
   a  = a ^ tt;              \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x02080800, 0x00080000, 0x02000002, 0x02080802,
@@ -183,7 +183,7 @@ __constant u32a c_SPtrans[8][64] =
   }
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m05500_a1-optimized.cl b/OpenCL/m05500_a1-optimized.cl
index d8aff3fff..45c20539f 100644
--- a/OpenCL/m05500_a1-optimized.cl
+++ b/OpenCL/m05500_a1-optimized.cl
@@ -32,7 +32,7 @@
   a  = a ^ tt;              \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x02080800, 0x00080000, 0x02000002, 0x02080802,
@@ -180,7 +180,7 @@ __constant u32a c_SPtrans[8][64] =
   }
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m05500_a1.cl b/OpenCL/m05500_a1.cl
index 2c8a2eaf5..0d06309a1 100644
--- a/OpenCL/m05500_a1.cl
+++ b/OpenCL/m05500_a1.cl
@@ -33,7 +33,7 @@
   a  = a ^ tt;              \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x02080800, 0x00080000, 0x02000002, 0x02080802,
@@ -181,7 +181,7 @@ __constant u32a c_SPtrans[8][64] =
   }
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m05500_a3-optimized.cl b/OpenCL/m05500_a3-optimized.cl
index f1231c240..f044b9a76 100644
--- a/OpenCL/m05500_a3-optimized.cl
+++ b/OpenCL/m05500_a3-optimized.cl
@@ -32,7 +32,7 @@
   a  = a ^ tt;              \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x02080800, 0x00080000, 0x02000002, 0x02080802,
@@ -180,7 +180,7 @@ __constant u32a c_SPtrans[8][64] =
   }
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m05500_a3.cl b/OpenCL/m05500_a3.cl
index aa201fd4e..7c4d79717 100644
--- a/OpenCL/m05500_a3.cl
+++ b/OpenCL/m05500_a3.cl
@@ -33,7 +33,7 @@
   a  = a ^ tt;              \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x02080800, 0x00080000, 0x02000002, 0x02080802,
@@ -181,7 +181,7 @@ __constant u32a c_SPtrans[8][64] =
   }
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m05800-optimized.cl b/OpenCL/m05800-optimized.cl
index 06ce6f8b8..eac541f45 100644
--- a/OpenCL/m05800-optimized.cl
+++ b/OpenCL/m05800-optimized.cl
@@ -13,7 +13,7 @@
 #define COMPARE_S "inc_comp_single.cl"
 #define COMPARE_M "inc_comp_multi.cl"
 
-__constant u32a c_pc_dec[1024] =
+__constant static u32a c_pc_dec[1024] =
 {
   0x00000030,
   0x00000031,
@@ -1041,7 +1041,7 @@ __constant u32a c_pc_dec[1024] =
   0x33323031,
 };
 
-__constant u32a c_pc_len[1024] =
+__constant static u32a c_pc_len[1024] =
 {
   1,
   1,
diff --git a/OpenCL/m05800.cl b/OpenCL/m05800.cl
index 11ce6f564..83b2fd9cc 100644
--- a/OpenCL/m05800.cl
+++ b/OpenCL/m05800.cl
@@ -13,7 +13,7 @@
 #define COMPARE_S "inc_comp_single.cl"
 #define COMPARE_M "inc_comp_multi.cl"
 
-__constant u32a c_pc_dec[1024] =
+__constant static u32a c_pc_dec[1024] =
 {
   0x00000030,
   0x00000031,
@@ -1041,7 +1041,7 @@ __constant u32a c_pc_dec[1024] =
   0x33323031,
 };
 
-__constant u32a c_pc_len[1024] =
+__constant static u32a c_pc_len[1024] =
 {
   1,
   1,
diff --git a/OpenCL/m06900_a0-optimized.cl b/OpenCL/m06900_a0-optimized.cl
index 87f8d41c7..2a41f78dc 100644
--- a/OpenCL/m06900_a0-optimized.cl
+++ b/OpenCL/m06900_a0-optimized.cl
@@ -14,7 +14,7 @@
 #include "inc_rp_optimized.cl"
 #include "inc_simd.cl"
 
-__constant u32a c_tables[4][256] =
+__constant static u32a c_tables[4][256] =
 {
   {
     0x00072000, 0x00075000, 0x00074800, 0x00071000,
diff --git a/OpenCL/m06900_a1-optimized.cl b/OpenCL/m06900_a1-optimized.cl
index df9f944c6..5724f1cb0 100644
--- a/OpenCL/m06900_a1-optimized.cl
+++ b/OpenCL/m06900_a1-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u32a c_tables[4][256] =
+__constant static u32a c_tables[4][256] =
 {
   {
     0x00072000, 0x00075000, 0x00074800, 0x00071000,
diff --git a/OpenCL/m06900_a3-optimized.cl b/OpenCL/m06900_a3-optimized.cl
index b3f90217f..bcde422b6 100644
--- a/OpenCL/m06900_a3-optimized.cl
+++ b/OpenCL/m06900_a3-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u32a c_tables[4][256] =
+__constant static u32a c_tables[4][256] =
 {
   {
     0x00072000, 0x00075000, 0x00074800, 0x00071000,
diff --git a/OpenCL/m07700_a0-optimized.cl b/OpenCL/m07700_a0-optimized.cl
index 387a9ddc8..cd2d2519f 100644
--- a/OpenCL/m07700_a0-optimized.cl
+++ b/OpenCL/m07700_a0-optimized.cl
@@ -28,7 +28,7 @@
   (a)[((n)/4)+1]  = x >> 32;        \
 }
 
-__constant u32a sapb_trans_tbl[256] =
+__constant static u32a sapb_trans_tbl[256] =
 {
   // first value hack for 0 byte as part of an optimization
   0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -49,7 +49,7 @@ __constant u32a sapb_trans_tbl[256] =
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
 };
 
-__constant u32a bcodeArray[48] =
+__constant static u32a bcodeArray[48] =
 {
   0x14, 0x77, 0xf3, 0xd4, 0xbb, 0x71, 0x23, 0xd0, 0x03, 0xff, 0x47, 0x93, 0x55, 0xaa, 0x66, 0x91,
   0xf2, 0x88, 0x6b, 0x99, 0xbf, 0xcb, 0x32, 0x1a, 0x19, 0xd9, 0xa7, 0x82, 0x22, 0x49, 0xa2, 0x51,
diff --git a/OpenCL/m07700_a1-optimized.cl b/OpenCL/m07700_a1-optimized.cl
index 609e38268..ab491fedd 100644
--- a/OpenCL/m07700_a1-optimized.cl
+++ b/OpenCL/m07700_a1-optimized.cl
@@ -26,7 +26,7 @@
   (a)[((n)/4)+1]  = x >> 32;        \
 }
 
-__constant u32a sapb_trans_tbl[256] =
+__constant static u32a sapb_trans_tbl[256] =
 {
   // first value hack for 0 byte as part of an optimization
   0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -47,7 +47,7 @@ __constant u32a sapb_trans_tbl[256] =
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
 };
 
-__constant u32a bcodeArray[48] =
+__constant static u32a bcodeArray[48] =
 {
   0x14, 0x77, 0xf3, 0xd4, 0xbb, 0x71, 0x23, 0xd0, 0x03, 0xff, 0x47, 0x93, 0x55, 0xaa, 0x66, 0x91,
   0xf2, 0x88, 0x6b, 0x99, 0xbf, 0xcb, 0x32, 0x1a, 0x19, 0xd9, 0xa7, 0x82, 0x22, 0x49, 0xa2, 0x51,
diff --git a/OpenCL/m07700_a3-optimized.cl b/OpenCL/m07700_a3-optimized.cl
index 4e07726ad..e944ca4c0 100644
--- a/OpenCL/m07700_a3-optimized.cl
+++ b/OpenCL/m07700_a3-optimized.cl
@@ -17,7 +17,7 @@
 #define GETCHAR(a,p)  (((a)[(p) / 4] >> (((p) & 3) * 8)) & 0xff)
 #define PUTCHAR(a,p,c) ((a)[(p) / 4] = (((a)[(p) / 4] & ~(0xff << (((p) & 3) * 8))) | ((c) << (((p) & 3) * 8))))
 
-__constant u32a sapb_trans_tbl[256] =
+__constant static u32a sapb_trans_tbl[256] =
 {
   // first value hack for 0 byte as part of an optimization
   0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -38,7 +38,7 @@ __constant u32a sapb_trans_tbl[256] =
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
 };
 
-__constant u32a bcodeArray[48] =
+__constant static u32a bcodeArray[48] =
 {
   0x14, 0x77, 0xf3, 0xd4, 0xbb, 0x71, 0x23, 0xd0, 0x03, 0xff, 0x47, 0x93, 0x55, 0xaa, 0x66, 0x91,
   0xf2, 0x88, 0x6b, 0x99, 0xbf, 0xcb, 0x32, 0x1a, 0x19, 0xd9, 0xa7, 0x82, 0x22, 0x49, 0xa2, 0x51,
diff --git a/OpenCL/m07800_a0-optimized.cl b/OpenCL/m07800_a0-optimized.cl
index 26484ceb5..149f64ec9 100644
--- a/OpenCL/m07800_a0-optimized.cl
+++ b/OpenCL/m07800_a0-optimized.cl
@@ -16,7 +16,7 @@
 #include "inc_simd.cl"
 #include "inc_hash_sha1.cl"
 
-__constant u32a theMagicArray[64] =
+__constant static u32a theMagicArray[64] =
 {
   0x91ac5114, 0x9f675443, 0x24e73be0, 0x28747bc2, 0x863313eb, 0x5a4fcb5c, 0x080a7337, 0x0e5d1c2f,
   0x338fe6e5, 0xf89baedd, 0x16f24b8d, 0x2ce1d4dc, 0xb0cbdf9d, 0xd4706d17, 0xf94d423f, 0x9b1b1194,
diff --git a/OpenCL/m07800_a1-optimized.cl b/OpenCL/m07800_a1-optimized.cl
index 6049e360f..1a5206ec5 100644
--- a/OpenCL/m07800_a1-optimized.cl
+++ b/OpenCL/m07800_a1-optimized.cl
@@ -14,7 +14,7 @@
 #include "inc_simd.cl"
 #include "inc_hash_sha1.cl"
 
-__constant u32a theMagicArray[64] =
+__constant static u32a theMagicArray[64] =
 {
   0x91ac5114, 0x9f675443, 0x24e73be0, 0x28747bc2, 0x863313eb, 0x5a4fcb5c, 0x080a7337, 0x0e5d1c2f,
   0x338fe6e5, 0xf89baedd, 0x16f24b8d, 0x2ce1d4dc, 0xb0cbdf9d, 0xd4706d17, 0xf94d423f, 0x9b1b1194,
diff --git a/OpenCL/m07800_a3-optimized.cl b/OpenCL/m07800_a3-optimized.cl
index 6bd622723..00d7045bd 100644
--- a/OpenCL/m07800_a3-optimized.cl
+++ b/OpenCL/m07800_a3-optimized.cl
@@ -14,7 +14,7 @@
 #include "inc_simd.cl"
 #include "inc_hash_sha1.cl"
 
-__constant u32a theMagicArray[64] =
+__constant static u32a theMagicArray[64] =
 {
   0x91ac5114, 0x9f675443, 0x24e73be0, 0x28747bc2, 0x863313eb, 0x5a4fcb5c, 0x080a7337, 0x0e5d1c2f,
   0x338fe6e5, 0xf89baedd, 0x16f24b8d, 0x2ce1d4dc, 0xb0cbdf9d, 0xd4706d17, 0xf94d423f, 0x9b1b1194,
diff --git a/OpenCL/m08000_a0-optimized.cl b/OpenCL/m08000_a0-optimized.cl
index 12eb8d5cf..ea4dfecea 100644
--- a/OpenCL/m08000_a0-optimized.cl
+++ b/OpenCL/m08000_a0-optimized.cl
@@ -14,7 +14,7 @@
 #include "inc_rp_optimized.cl"
 #include "inc_simd.cl"
 
-__constant u32a k_sha256[64] =
+__constant static u32a k_sha256[64] =
 {
   SHA256C00, SHA256C01, SHA256C02, SHA256C03,
   SHA256C04, SHA256C05, SHA256C06, SHA256C07,
diff --git a/OpenCL/m08000_a1-optimized.cl b/OpenCL/m08000_a1-optimized.cl
index 5c35b8c43..f5fa0abdf 100644
--- a/OpenCL/m08000_a1-optimized.cl
+++ b/OpenCL/m08000_a1-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u32a k_sha256[64] =
+__constant static u32a k_sha256[64] =
 {
   SHA256C00, SHA256C01, SHA256C02, SHA256C03,
   SHA256C04, SHA256C05, SHA256C06, SHA256C07,
diff --git a/OpenCL/m08000_a3-optimized.cl b/OpenCL/m08000_a3-optimized.cl
index 37ad0ab06..ab8d6bbb2 100644
--- a/OpenCL/m08000_a3-optimized.cl
+++ b/OpenCL/m08000_a3-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u32a k_sha256[64] =
+__constant static u32a k_sha256[64] =
 {
   SHA256C00, SHA256C01, SHA256C02, SHA256C03,
   SHA256C04, SHA256C05, SHA256C06, SHA256C07,
diff --git a/OpenCL/m08500_a0.cl b/OpenCL/m08500_a0.cl
index 49e603d03..2e6e92505 100644
--- a/OpenCL/m08500_a0.cl
+++ b/OpenCL/m08500_a0.cl
@@ -52,7 +52,7 @@
   PERM_OP (l, r, tt,  4, 0x0f0f0f0f);  \
 }
 
-__constant u32a c_ascii_to_ebcdic_pc[256] =
+__constant static u32a c_ascii_to_ebcdic_pc[256] =
 {
   // little hack, can't crack 0-bytes in password, but who cares
   //    0xab, 0xa8, 0xae, 0xad, 0xc4, 0xf1, 0xf7, 0xf4, 0x86, 0xa1, 0xe0, 0xbc, 0xb3, 0xb0, 0xb6, 0xb5,
@@ -74,7 +74,7 @@ __constant u32a c_ascii_to_ebcdic_pc[256] =
   0x13, 0x10, 0x16, 0x15, 0x7f, 0x7c, 0x73, 0x70, 0x76, 0x75, 0x5e, 0x5d, 0x52, 0x51, 0x57, 0x54,
 };
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x02080800, 0x00080000, 0x02000002, 0x02080802,
@@ -222,7 +222,7 @@ __constant u32a c_SPtrans[8][64] =
   }
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m08500_a1.cl b/OpenCL/m08500_a1.cl
index c1d927375..6f59374b1 100644
--- a/OpenCL/m08500_a1.cl
+++ b/OpenCL/m08500_a1.cl
@@ -50,7 +50,7 @@
   PERM_OP (l, r, tt,  4, 0x0f0f0f0f);  \
 }
 
-__constant u32a c_ascii_to_ebcdic_pc[256] =
+__constant static u32a c_ascii_to_ebcdic_pc[256] =
 {
   // little hack, can't crack 0-bytes in password, but who cares
   //    0xab, 0xa8, 0xae, 0xad, 0xc4, 0xf1, 0xf7, 0xf4, 0x86, 0xa1, 0xe0, 0xbc, 0xb3, 0xb0, 0xb6, 0xb5,
@@ -72,7 +72,7 @@ __constant u32a c_ascii_to_ebcdic_pc[256] =
   0x13, 0x10, 0x16, 0x15, 0x7f, 0x7c, 0x73, 0x70, 0x76, 0x75, 0x5e, 0x5d, 0x52, 0x51, 0x57, 0x54,
 };
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x02080800, 0x00080000, 0x02000002, 0x02080802,
@@ -220,7 +220,7 @@ __constant u32a c_SPtrans[8][64] =
   }
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m08500_a3.cl b/OpenCL/m08500_a3.cl
index 71c636154..82cb3f59c 100644
--- a/OpenCL/m08500_a3.cl
+++ b/OpenCL/m08500_a3.cl
@@ -50,7 +50,7 @@
   PERM_OP (l, r, tt,  4, 0x0f0f0f0f);  \
 }
 
-__constant u32a c_ascii_to_ebcdic_pc[256] =
+__constant static u32a c_ascii_to_ebcdic_pc[256] =
 {
   // little hack, can't crack 0-bytes in password, but who cares
   //    0xab, 0xa8, 0xae, 0xad, 0xc4, 0xf1, 0xf7, 0xf4, 0x86, 0xa1, 0xe0, 0xbc, 0xb3, 0xb0, 0xb6, 0xb5,
@@ -72,7 +72,7 @@ __constant u32a c_ascii_to_ebcdic_pc[256] =
   0x13, 0x10, 0x16, 0x15, 0x7f, 0x7c, 0x73, 0x70, 0x76, 0x75, 0x5e, 0x5d, 0x52, 0x51, 0x57, 0x54,
 };
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x02080800, 0x00080000, 0x02000002, 0x02080802,
@@ -220,7 +220,7 @@ __constant u32a c_SPtrans[8][64] =
   }
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m08600_a0.cl b/OpenCL/m08600_a0.cl
index 6afc72f1d..a2b0f90ca 100644
--- a/OpenCL/m08600_a0.cl
+++ b/OpenCL/m08600_a0.cl
@@ -15,7 +15,7 @@
 #include "inc_rp.cl"
 #include "inc_simd.cl"
 
-__constant u32a lotus_magic_table[256] =
+__constant static u32a lotus_magic_table[256] =
 {
   0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a,
   0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0,
diff --git a/OpenCL/m08600_a1.cl b/OpenCL/m08600_a1.cl
index 9d3f65f63..7155873cb 100644
--- a/OpenCL/m08600_a1.cl
+++ b/OpenCL/m08600_a1.cl
@@ -13,7 +13,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u32a lotus_magic_table[256] =
+__constant static u32a lotus_magic_table[256] =
 {
   0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a,
   0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0,
diff --git a/OpenCL/m08600_a3.cl b/OpenCL/m08600_a3.cl
index 3d1f6ae77..7c571a3da 100644
--- a/OpenCL/m08600_a3.cl
+++ b/OpenCL/m08600_a3.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u32a lotus_magic_table[256] =
+__constant static u32a lotus_magic_table[256] =
 {
   0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a,
   0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0,
diff --git a/OpenCL/m08700_a0-optimized.cl b/OpenCL/m08700_a0-optimized.cl
index bfda0bd09..6da04c1e2 100644
--- a/OpenCL/m08700_a0-optimized.cl
+++ b/OpenCL/m08700_a0-optimized.cl
@@ -15,7 +15,7 @@
 #include "inc_rp_optimized.cl"
 #include "inc_simd.cl"
 
-__constant u32a lotus_magic_table[256] =
+__constant static u32a lotus_magic_table[256] =
 {
   0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a,
   0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0,
diff --git a/OpenCL/m08700_a1-optimized.cl b/OpenCL/m08700_a1-optimized.cl
index 6d142aac9..13f1f0a2c 100644
--- a/OpenCL/m08700_a1-optimized.cl
+++ b/OpenCL/m08700_a1-optimized.cl
@@ -13,7 +13,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u32a lotus_magic_table[256] =
+__constant static u32a lotus_magic_table[256] =
 {
   0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a,
   0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0,
diff --git a/OpenCL/m08700_a3-optimized.cl b/OpenCL/m08700_a3-optimized.cl
index 06dbef6e1..b54293536 100644
--- a/OpenCL/m08700_a3-optimized.cl
+++ b/OpenCL/m08700_a3-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u32a lotus_magic_table[256] =
+__constant static u32a lotus_magic_table[256] =
 {
   0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a,
   0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0,
diff --git a/OpenCL/m09000.cl b/OpenCL/m09000.cl
index 9353e2bad..87002b801 100644
--- a/OpenCL/m09000.cl
+++ b/OpenCL/m09000.cl
@@ -14,7 +14,7 @@
 
 // http://www.schneier.com/code/constants.txt
 
-__constant u32a c_sbox0[256] =
+__constant static u32a c_sbox0[256] =
 {
   0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
   0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
@@ -82,7 +82,7 @@ __constant u32a c_sbox0[256] =
   0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
 };
 
-__constant u32a c_sbox1[256] =
+__constant static u32a c_sbox1[256] =
 {
   0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
   0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
@@ -150,7 +150,7 @@ __constant u32a c_sbox1[256] =
   0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
 };
 
-__constant u32a c_sbox2[256] =
+__constant static u32a c_sbox2[256] =
 {
   0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
   0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
@@ -218,7 +218,7 @@ __constant u32a c_sbox2[256] =
   0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
 };
 
-__constant u32a c_sbox3[256] =
+__constant static u32a c_sbox3[256] =
 {
   0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
   0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
@@ -286,7 +286,7 @@ __constant u32a c_sbox3[256] =
   0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
 };
 
-__constant u32a c_pbox[18] =
+__constant static u32a c_pbox[18] =
 {
   0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
   0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
diff --git a/OpenCL/m09100.cl b/OpenCL/m09100.cl
index 844e084d1..72a2119d4 100644
--- a/OpenCL/m09100.cl
+++ b/OpenCL/m09100.cl
@@ -17,7 +17,7 @@
 #define COMPARE_M "inc_comp_multi.cl"
 
 // breaks if used with u8a on AMDGPU-PRO
-__constant u8a lotus64_table[64] =
+__constant static u8a lotus64_table[64] =
 {
   '0', '1', '2', '3', '4', '5', '6', '7',
   '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
@@ -30,7 +30,7 @@ __constant u8a lotus64_table[64] =
 };
 
 // break if used with u8 on NVidia driver 378.x
-__constant u8a lotus_magic_table[256] =
+__constant static u8a lotus_magic_table[256] =
 {
   0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a,
   0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0,
diff --git a/OpenCL/m10400_a0-optimized.cl b/OpenCL/m10400_a0-optimized.cl
index edcde2035..3acc03bc3 100644
--- a/OpenCL/m10400_a0-optimized.cl
+++ b/OpenCL/m10400_a0-optimized.cl
@@ -16,7 +16,7 @@
 #include "inc_simd.cl"
 #include "inc_hash_md5.cl"
 
-__constant u32a padding[8] =
+__constant static u32a padding[8] =
 {
   0x5e4ebf28,
   0x418a754e,
diff --git a/OpenCL/m10400_a1-optimized.cl b/OpenCL/m10400_a1-optimized.cl
index a5ff564c7..e90bb3395 100644
--- a/OpenCL/m10400_a1-optimized.cl
+++ b/OpenCL/m10400_a1-optimized.cl
@@ -14,7 +14,7 @@
 #include "inc_simd.cl"
 #include "inc_hash_md5.cl"
 
-__constant u32a padding[8] =
+__constant static u32a padding[8] =
 {
   0x5e4ebf28,
   0x418a754e,
diff --git a/OpenCL/m10400_a3-optimized.cl b/OpenCL/m10400_a3-optimized.cl
index 2a1eee4bf..20aa97767 100644
--- a/OpenCL/m10400_a3-optimized.cl
+++ b/OpenCL/m10400_a3-optimized.cl
@@ -14,7 +14,7 @@
 #include "inc_simd.cl"
 #include "inc_hash_md5.cl"
 
-__constant u32a padding[8] =
+__constant static u32a padding[8] =
 {
   0x5e4ebf28,
   0x418a754e,
diff --git a/OpenCL/m10410_a0-optimized.cl b/OpenCL/m10410_a0-optimized.cl
index df317dbf9..4b4112c77 100644
--- a/OpenCL/m10410_a0-optimized.cl
+++ b/OpenCL/m10410_a0-optimized.cl
@@ -16,7 +16,7 @@
 #include "inc_simd.cl"
 #include "inc_hash_md5.cl"
 
-__constant u32a padding[8] =
+__constant static u32a padding[8] =
 {
   0x5e4ebf28,
   0x418a754e,
diff --git a/OpenCL/m10410_a1-optimized.cl b/OpenCL/m10410_a1-optimized.cl
index 0d45cce00..73f402b77 100644
--- a/OpenCL/m10410_a1-optimized.cl
+++ b/OpenCL/m10410_a1-optimized.cl
@@ -14,7 +14,7 @@
 #include "inc_simd.cl"
 #include "inc_hash_md5.cl"
 
-__constant u32a padding[8] =
+__constant static u32a padding[8] =
 {
   0x5e4ebf28,
   0x418a754e,
diff --git a/OpenCL/m10410_a3-optimized.cl b/OpenCL/m10410_a3-optimized.cl
index acaef2830..d064c488a 100644
--- a/OpenCL/m10410_a3-optimized.cl
+++ b/OpenCL/m10410_a3-optimized.cl
@@ -14,7 +14,7 @@
 #include "inc_simd.cl"
 #include "inc_hash_md5.cl"
 
-__constant u32a padding[8] =
+__constant static u32a padding[8] =
 {
   0x5e4ebf28,
   0x418a754e,
diff --git a/OpenCL/m10420_a0-optimized.cl b/OpenCL/m10420_a0-optimized.cl
index 70bd96102..329673edc 100644
--- a/OpenCL/m10420_a0-optimized.cl
+++ b/OpenCL/m10420_a0-optimized.cl
@@ -15,7 +15,7 @@
 #include "inc_simd.cl"
 #include "inc_hash_md5.cl"
 
-__constant u32a padding[8] =
+__constant static u32a padding[8] =
 {
   0x5e4ebf28,
   0x418a754e,
diff --git a/OpenCL/m10420_a1-optimized.cl b/OpenCL/m10420_a1-optimized.cl
index bb494073d..cfbfaeb7f 100644
--- a/OpenCL/m10420_a1-optimized.cl
+++ b/OpenCL/m10420_a1-optimized.cl
@@ -13,7 +13,7 @@
 #include "inc_simd.cl"
 #include "inc_hash_md5.cl"
 
-__constant u32a padding[8] =
+__constant static u32a padding[8] =
 {
   0x5e4ebf28,
   0x418a754e,
diff --git a/OpenCL/m10420_a3-optimized.cl b/OpenCL/m10420_a3-optimized.cl
index a5a884c5e..2dff3e821 100644
--- a/OpenCL/m10420_a3-optimized.cl
+++ b/OpenCL/m10420_a3-optimized.cl
@@ -13,7 +13,7 @@
 #include "inc_simd.cl"
 #include "inc_hash_md5.cl"
 
-__constant u32a padding[8] =
+__constant static u32a padding[8] =
 {
   0x5e4ebf28,
   0x418a754e,
diff --git a/OpenCL/m10500.cl b/OpenCL/m10500.cl
index df455cdfe..df17517ec 100644
--- a/OpenCL/m10500.cl
+++ b/OpenCL/m10500.cl
@@ -13,7 +13,7 @@
 #define COMPARE_S "inc_comp_single.cl"
 #define COMPARE_M "inc_comp_multi.cl"
 
-__constant u32a padding[8] =
+__constant static u32a padding[8] =
 {
   0x5e4ebf28,
   0x418a754e,
diff --git a/OpenCL/m10800_a0-optimized.cl b/OpenCL/m10800_a0-optimized.cl
index bf216e34c..e49902848 100644
--- a/OpenCL/m10800_a0-optimized.cl
+++ b/OpenCL/m10800_a0-optimized.cl
@@ -14,7 +14,7 @@
 #include "inc_rp_optimized.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha384[80] =
+__constant static u64a k_sha384[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m10800_a1-optimized.cl b/OpenCL/m10800_a1-optimized.cl
index 787025f87..72acdc33b 100644
--- a/OpenCL/m10800_a1-optimized.cl
+++ b/OpenCL/m10800_a1-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha384[80] =
+__constant static u64a k_sha384[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m10800_a3-optimized.cl b/OpenCL/m10800_a3-optimized.cl
index 65f357f67..92c24ce87 100644
--- a/OpenCL/m10800_a3-optimized.cl
+++ b/OpenCL/m10800_a3-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha384[80] =
+__constant static u64a k_sha384[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m11500_a0-optimized.cl b/OpenCL/m11500_a0-optimized.cl
index 51436a929..8b7eaae95 100644
--- a/OpenCL/m11500_a0-optimized.cl
+++ b/OpenCL/m11500_a0-optimized.cl
@@ -15,7 +15,7 @@
 #include "inc_rp_optimized.cl"
 #include "inc_simd.cl"
 
-__constant u32a crc32tab[0x100] =
+__constant static u32a crc32tab[0x100] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
diff --git a/OpenCL/m11500_a1-optimized.cl b/OpenCL/m11500_a1-optimized.cl
index 2570b368d..c94d5ced0 100644
--- a/OpenCL/m11500_a1-optimized.cl
+++ b/OpenCL/m11500_a1-optimized.cl
@@ -13,7 +13,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u32a crc32tab[0x100] =
+__constant static u32a crc32tab[0x100] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
diff --git a/OpenCL/m11500_a3-optimized.cl b/OpenCL/m11500_a3-optimized.cl
index acda130e1..ff009e2aa 100644
--- a/OpenCL/m11500_a3-optimized.cl
+++ b/OpenCL/m11500_a3-optimized.cl
@@ -13,7 +13,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u32a crc32tab[0x100] =
+__constant static u32a crc32tab[0x100] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
diff --git a/OpenCL/m11700_a0-optimized.cl b/OpenCL/m11700_a0-optimized.cl
index d26030296..113dc0655 100644
--- a/OpenCL/m11700_a0-optimized.cl
+++ b/OpenCL/m11700_a0-optimized.cl
@@ -41,7 +41,7 @@
 
 // constants
 
-__constant u64a sbob_sl64[8][256] =
+__constant static u64a sbob_sl64[8][256] =
 {
   {
     0xd031c397ce553fe6,
@@ -2109,7 +2109,7 @@ __constant u64a sbob_sl64[8][256] =
   },
 };
 
-__constant u64a sbob_rc64[12][8] =
+__constant static u64a sbob_rc64[12][8] =
 {
   {
     0xe9daca1eda5b08b1,
diff --git a/OpenCL/m11700_a1-optimized.cl b/OpenCL/m11700_a1-optimized.cl
index 8551f1f0d..d06115300 100644
--- a/OpenCL/m11700_a1-optimized.cl
+++ b/OpenCL/m11700_a1-optimized.cl
@@ -39,7 +39,7 @@
 
 // constants
 
-__constant u64a sbob_sl64[8][256] =
+__constant static u64a sbob_sl64[8][256] =
 {
   {
     0xd031c397ce553fe6,
@@ -2107,7 +2107,7 @@ __constant u64a sbob_sl64[8][256] =
   },
 };
 
-__constant u64a sbob_rc64[12][8] =
+__constant static u64a sbob_rc64[12][8] =
 {
   {
     0xe9daca1eda5b08b1,
diff --git a/OpenCL/m11700_a3-optimized.cl b/OpenCL/m11700_a3-optimized.cl
index 3156f50a8..54e1858f9 100644
--- a/OpenCL/m11700_a3-optimized.cl
+++ b/OpenCL/m11700_a3-optimized.cl
@@ -39,7 +39,7 @@
 
 // constants
 
-__constant u64a sbob_sl64[8][256] =
+__constant static u64a sbob_sl64[8][256] =
 {
   {
     0xd031c397ce553fe6,
@@ -2107,7 +2107,7 @@ __constant u64a sbob_sl64[8][256] =
   },
 };
 
-__constant u64a sbob_rc64[12][8] =
+__constant static u64a sbob_rc64[12][8] =
 {
   {
     0xe9daca1eda5b08b1,
diff --git a/OpenCL/m11800_a0-optimized.cl b/OpenCL/m11800_a0-optimized.cl
index fb180d74e..9647d7e81 100644
--- a/OpenCL/m11800_a0-optimized.cl
+++ b/OpenCL/m11800_a0-optimized.cl
@@ -41,7 +41,7 @@
 
 // constants
 
-__constant u64a sbob_sl64[8][256] =
+__constant static u64a sbob_sl64[8][256] =
 {
   {
     0xd031c397ce553fe6,
@@ -2109,7 +2109,7 @@ __constant u64a sbob_sl64[8][256] =
   },
 };
 
-__constant u64a sbob_rc64[12][8] =
+__constant static u64a sbob_rc64[12][8] =
 {
   {
     0xe9daca1eda5b08b1,
diff --git a/OpenCL/m11800_a1-optimized.cl b/OpenCL/m11800_a1-optimized.cl
index 50a5b0045..c3d838592 100644
--- a/OpenCL/m11800_a1-optimized.cl
+++ b/OpenCL/m11800_a1-optimized.cl
@@ -39,7 +39,7 @@
 
 // constants
 
-__constant u64a sbob_sl64[8][256] =
+__constant static u64a sbob_sl64[8][256] =
 {
   {
     0xd031c397ce553fe6,
@@ -2107,7 +2107,7 @@ __constant u64a sbob_sl64[8][256] =
   },
 };
 
-__constant u64a sbob_rc64[12][8] =
+__constant static u64a sbob_rc64[12][8] =
 {
   {
     0xe9daca1eda5b08b1,
diff --git a/OpenCL/m11800_a3-optimized.cl b/OpenCL/m11800_a3-optimized.cl
index 9b9ce9111..db609fae2 100644
--- a/OpenCL/m11800_a3-optimized.cl
+++ b/OpenCL/m11800_a3-optimized.cl
@@ -39,7 +39,7 @@
 
 // constants
 
-__constant u64a sbob_sl64[8][256] =
+__constant static u64a sbob_sl64[8][256] =
 {
   {
     0xd031c397ce553fe6,
@@ -2107,7 +2107,7 @@ __constant u64a sbob_sl64[8][256] =
   },
 };
 
-__constant u64a sbob_rc64[12][8] =
+__constant static u64a sbob_rc64[12][8] =
 {
   {
     0xe9daca1eda5b08b1,
diff --git a/OpenCL/m12400.cl b/OpenCL/m12400.cl
index cd73d18d8..7ad9d767e 100644
--- a/OpenCL/m12400.cl
+++ b/OpenCL/m12400.cl
@@ -50,7 +50,7 @@
   PERM_OP (l, r, tt,  4, 0x0f0f0f0f);  \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x00820200, 0x00020000, 0x80800000, 0x80820200,
@@ -198,7 +198,7 @@ __constant u32a c_SPtrans[8][64] =
   },
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m14000_a0.cl b/OpenCL/m14000_a0.cl
index afca41a8a..7a851db23 100644
--- a/OpenCL/m14000_a0.cl
+++ b/OpenCL/m14000_a0.cl
@@ -52,7 +52,7 @@
   PERM_OP (l, r, tt,  4, 0x0f0f0f0f);  \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     /* nibble 0 */
@@ -208,7 +208,7 @@ __constant u32a c_SPtrans[8][64] =
   },
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m14000_a1.cl b/OpenCL/m14000_a1.cl
index faf95aaf5..bb3ed9c95 100644
--- a/OpenCL/m14000_a1.cl
+++ b/OpenCL/m14000_a1.cl
@@ -50,7 +50,7 @@
   PERM_OP (l, r, tt,  4, 0x0f0f0f0f);  \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x02080800, 0x00080000, 0x02000002, 0x02080802,
@@ -198,7 +198,7 @@ __constant u32a c_SPtrans[8][64] =
   }
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m14100_a0.cl b/OpenCL/m14100_a0.cl
index 2d038630b..7244acdef 100644
--- a/OpenCL/m14100_a0.cl
+++ b/OpenCL/m14100_a0.cl
@@ -52,7 +52,7 @@
   PERM_OP (l, r, tt,  4, 0x0f0f0f0f);  \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     /* nibble 0 */
@@ -208,7 +208,7 @@ __constant u32a c_SPtrans[8][64] =
   },
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m14100_a1.cl b/OpenCL/m14100_a1.cl
index 69cde6c9a..1b5811c0b 100644
--- a/OpenCL/m14100_a1.cl
+++ b/OpenCL/m14100_a1.cl
@@ -50,7 +50,7 @@
   PERM_OP (l, r, tt,  4, 0x0f0f0f0f);  \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x02080800, 0x00080000, 0x02000002, 0x02080802,
@@ -198,7 +198,7 @@ __constant u32a c_SPtrans[8][64] =
   }
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m14100_a3.cl b/OpenCL/m14100_a3.cl
index deff80f71..ea0a09504 100644
--- a/OpenCL/m14100_a3.cl
+++ b/OpenCL/m14100_a3.cl
@@ -50,7 +50,7 @@
   PERM_OP (l, r, tt,  4, 0x0f0f0f0f);  \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x02080800, 0x00080000, 0x02000002, 0x02080802,
@@ -198,7 +198,7 @@ __constant u32a c_SPtrans[8][64] =
   }
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m14900_a0-optimized.cl b/OpenCL/m14900_a0-optimized.cl
index 687147247..a1e4fd029 100644
--- a/OpenCL/m14900_a0-optimized.cl
+++ b/OpenCL/m14900_a0-optimized.cl
@@ -15,7 +15,7 @@
 #include "inc_rp_optimized.cl"
 #include "inc_simd.cl"
 
-__constant u8a c_ftable[256] =
+__constant static u8a c_ftable[256] =
 {
   0xa3, 0xd7, 0x09, 0x83, 0xf8, 0x48, 0xf6, 0xf4,
   0xb3, 0x21, 0x15, 0x78, 0x99, 0xb1, 0xaf, 0xf9,
diff --git a/OpenCL/m14900_a1-optimized.cl b/OpenCL/m14900_a1-optimized.cl
index 8c4fbe764..c37e1155a 100644
--- a/OpenCL/m14900_a1-optimized.cl
+++ b/OpenCL/m14900_a1-optimized.cl
@@ -13,7 +13,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u8a c_ftable[256] =
+__constant static u8a c_ftable[256] =
 {
   0xa3, 0xd7, 0x09, 0x83, 0xf8, 0x48, 0xf6, 0xf4,
   0xb3, 0x21, 0x15, 0x78, 0x99, 0xb1, 0xaf, 0xf9,
diff --git a/OpenCL/m14900_a3-optimized.cl b/OpenCL/m14900_a3-optimized.cl
index d929214c9..56beb4e49 100644
--- a/OpenCL/m14900_a3-optimized.cl
+++ b/OpenCL/m14900_a3-optimized.cl
@@ -13,7 +13,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u8a c_ftable[256] =
+__constant static u8a c_ftable[256] =
 {
   0xa3, 0xd7, 0x09, 0x83, 0xf8, 0x48, 0xf6, 0xf4,
   0xb3, 0x21, 0x15, 0x78, 0x99, 0xb1, 0xaf, 0xf9,
diff --git a/OpenCL/m15000_a0-optimized.cl b/OpenCL/m15000_a0-optimized.cl
index f4191d712..ebb39bd78 100644
--- a/OpenCL/m15000_a0-optimized.cl
+++ b/OpenCL/m15000_a0-optimized.cl
@@ -14,7 +14,7 @@
 #include "inc_rp_optimized.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m15000_a1-optimized.cl b/OpenCL/m15000_a1-optimized.cl
index 53e4c7864..de2394049 100644
--- a/OpenCL/m15000_a1-optimized.cl
+++ b/OpenCL/m15000_a1-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m15000_a3-optimized.cl b/OpenCL/m15000_a3-optimized.cl
index 593930b67..bda2c0735 100644
--- a/OpenCL/m15000_a3-optimized.cl
+++ b/OpenCL/m15000_a3-optimized.cl
@@ -12,7 +12,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u64a k_sha512[80] =
+__constant static u64a k_sha512[80] =
 {
   SHA512C00, SHA512C01, SHA512C02, SHA512C03,
   SHA512C04, SHA512C05, SHA512C06, SHA512C07,
diff --git a/OpenCL/m15300.cl b/OpenCL/m15300.cl
index 9757b715f..ed7f51788 100644
--- a/OpenCL/m15300.cl
+++ b/OpenCL/m15300.cl
@@ -55,7 +55,7 @@
   PERM_OP (l, r, tt,  4, 0x0f0f0f0f);  \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     /* nibble 0 */
@@ -211,7 +211,7 @@ __constant u32a c_SPtrans[8][64] =
   },
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
diff --git a/OpenCL/m15600.cl b/OpenCL/m15600.cl
index 8aae51dbb..8a23bd17e 100644
--- a/OpenCL/m15600.cl
+++ b/OpenCL/m15600.cl
@@ -16,7 +16,7 @@
 #define COMPARE_S "inc_comp_single.cl"
 #define COMPARE_M "inc_comp_multi.cl"
 
-__constant u64a keccakf_rndc[24] =
+__constant static u64a keccakf_rndc[24] =
 {
   0x0000000000000001, 0x0000000000008082, 0x800000000000808a,
   0x8000000080008000, 0x000000000000808b, 0x0000000080000001,
diff --git a/OpenCL/m15700.cl b/OpenCL/m15700.cl
index 61b2d976b..35f3729d2 100644
--- a/OpenCL/m15700.cl
+++ b/OpenCL/m15700.cl
@@ -243,7 +243,7 @@ void scrypt_smix (uint4 *X, uint4 *T, __global uint4 *V0, __global uint4 *V1, __
   st[4 + s] ^= ~bc0 & bc1;      \
 }
 
-__constant u64a keccakf_rndc[24] =
+__constant static u64a keccakf_rndc[24] =
 {
   0x0000000000000001, 0x0000000000008082, 0x800000000000808a,
   0x8000000080008000, 0x000000000000808b, 0x0000000080000001,
diff --git a/OpenCL/m16000_a0.cl b/OpenCL/m16000_a0.cl
index 294066492..65972017e 100644
--- a/OpenCL/m16000_a0.cl
+++ b/OpenCL/m16000_a0.cl
@@ -34,7 +34,7 @@
   a  = a ^ tt;              \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x00820200, 0x00020000, 0x80800000, 0x80820200,
@@ -182,7 +182,7 @@ __constant u32a c_SPtrans[8][64] =
   },
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
@@ -330,7 +330,7 @@ __constant u32a c_skb[8][64] =
   },
 };
 
-__constant u32a c_tripcode_salt[128] =
+__constant static u32a c_tripcode_salt[128] =
 {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/OpenCL/m16000_a1.cl b/OpenCL/m16000_a1.cl
index 8abcdb013..a60cc3179 100644
--- a/OpenCL/m16000_a1.cl
+++ b/OpenCL/m16000_a1.cl
@@ -32,7 +32,7 @@
   a  = a ^ tt;              \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x00820200, 0x00020000, 0x80800000, 0x80820200,
@@ -180,7 +180,7 @@ __constant u32a c_SPtrans[8][64] =
   },
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
@@ -328,7 +328,7 @@ __constant u32a c_skb[8][64] =
   },
 };
 
-__constant u32a c_tripcode_salt[128] =
+__constant static u32a c_tripcode_salt[128] =
 {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/OpenCL/m16000_a3.cl b/OpenCL/m16000_a3.cl
index 30b471382..bbfb6e8fa 100644
--- a/OpenCL/m16000_a3.cl
+++ b/OpenCL/m16000_a3.cl
@@ -32,7 +32,7 @@
   a  = a ^ tt;              \
 }
 
-__constant u32a c_SPtrans[8][64] =
+__constant static u32a c_SPtrans[8][64] =
 {
   {
     0x00820200, 0x00020000, 0x80800000, 0x80820200,
@@ -180,7 +180,7 @@ __constant u32a c_SPtrans[8][64] =
   },
 };
 
-__constant u32a c_skb[8][64] =
+__constant static u32a c_skb[8][64] =
 {
   {
     0x00000000, 0x00000010, 0x20000000, 0x20000010,
@@ -328,7 +328,7 @@ __constant u32a c_skb[8][64] =
   },
 };
 
-__constant u32a c_tripcode_salt[128] =
+__constant static u32a c_tripcode_salt[128] =
 {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/OpenCL/m16300.cl b/OpenCL/m16300.cl
index 7e47c7d20..c0a5de79a 100644
--- a/OpenCL/m16300.cl
+++ b/OpenCL/m16300.cl
@@ -17,7 +17,7 @@
 #define COMPARE_S "inc_comp_single.cl"
 #define COMPARE_M "inc_comp_multi.cl"
 
-__constant u64a keccakf_rndc[24] =
+__constant static u64a keccakf_rndc[24] =
 {
   0x0000000000000001, 0x0000000000008082, 0x800000000000808a,
   0x8000000080008000, 0x000000000000808b, 0x0000000080000001,
diff --git a/docs/changes.txt b/docs/changes.txt
index b6f05ebec..152fabf4f 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -42,6 +42,8 @@
 - Files: Copy include/ folder and its content to case SHARED is set to 1 in Makefile
 - Hash Parser: Changed the way large strings are handled/truncated within the event buffer if they are too large to fit
 - Hash Parser: Fixed our use of strtok_r () calls
+- OpenCL Kernels: Replace variables from uXX to uXXa if used in __constant space
+- OpenCL Kernels: Use static declaraction for uXXa variables used in __constant space
 - Self Test: Skip self-test for mode 8900 user-configurable scrypt settings are incompatible to fixed settings in the self-test hash
 - Self Test: Skip self-test for mode 15700 because settings are too high and create a too long startup time
 - Terminal: Send clear line code to the same output stream as the next message following