diff --git a/sha2.c b/sha2.c
index f0fc9f07..ad588a7e 100644
--- a/sha2.c
+++ b/sha2.c
@@ -242,7 +242,7 @@ void SHA512_Transform(SHA512_CTX*, const sha2_word64*);
 
 /*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/
 /* Hash constant words K for SHA-256: */
-const static sha2_word32 K256[64] = {
+static const sha2_word32 K256[64] = {
 	0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL,
 	0x3956c25bUL, 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL,
 	0xd807aa98UL, 0x12835b01UL, 0x243185beUL, 0x550c7dc3UL,
@@ -262,7 +262,7 @@ const static sha2_word32 K256[64] = {
 };
 
 /* Initial hash value H for SHA-256: */
-const static sha2_word32 sha256_initial_hash_value[8] = {
+static const sha2_word32 sha256_initial_hash_value[8] = {
 	0x6a09e667UL,
 	0xbb67ae85UL,
 	0x3c6ef372UL,
@@ -274,7 +274,7 @@ const static sha2_word32 sha256_initial_hash_value[8] = {
 };
 
 /* Hash constant words K for SHA-384 and SHA-512: */
-const static sha2_word64 K512[80] = {
+static const sha2_word64 K512[80] = {
 	0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL,
 	0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL,
 	0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
@@ -318,7 +318,7 @@ const static sha2_word64 K512[80] = {
 };
 
 /* Initial hash value H for SHA-384 */
-const static sha2_word64 sha384_initial_hash_value[8] = {
+static const sha2_word64 sha384_initial_hash_value[8] = {
 	0xcbbb9d5dc1059ed8ULL,
 	0x629a292a367cd507ULL,
 	0x9159015a3070dd17ULL,
@@ -330,7 +330,7 @@ const static sha2_word64 sha384_initial_hash_value[8] = {
 };
 
 /* Initial hash value H for SHA-512 */
-const static sha2_word64 sha512_initial_hash_value[8] = {
+static const sha2_word64 sha512_initial_hash_value[8] = {
 	0x6a09e667f3bcc908ULL,
 	0xbb67ae8584caa73bULL,
 	0x3c6ef372fe94f82bULL,
diff --git a/strbuf_helpers.c b/strbuf_helpers.c
index dd63d473..3c4e81f0 100644
--- a/strbuf_helpers.c
+++ b/strbuf_helpers.c
@@ -52,7 +52,7 @@ static inline strbuf _toprint(strbuf sb, char c)
   return sb;
 }
 
-static strbuf inline _overrun(strbuf sb, const char *suffix)
+inline static strbuf _overrun(strbuf sb, const char *suffix)
 {
   if (strbuf_overrun(sb)) {
     strbuf_trunc(sb, -strlen(suffix));
@@ -61,7 +61,7 @@ static strbuf inline _overrun(strbuf sb, const char *suffix)
   return sb;
 }
 
-static strbuf inline _overrun_quote(strbuf sb, char quote, const char *suffix)
+inline static strbuf _overrun_quote(strbuf sb, char quote, const char *suffix)
 {
   if (strbuf_overrun(sb)) {
     strbuf_trunc(sb, -strlen(suffix) - (quote ? 1 : 0));