diff --git a/demo/demo.c b/demo/demo.c
index 903df2b..178fde8 100644
--- a/demo/demo.c
+++ b/demo/demo.c
@@ -281,7 +281,7 @@ static void usage(const char *progname)
 
 int main(int argc, char **argv)
 {
-	const static struct option longopts[] = {
+	static const struct option longopts[] = {
 		{"help",		0, 0, 'H'},
 		{"version",		0, 0, 'V'},
 		{NULL,			0, 0, 0}
diff --git a/demo/dthash.c b/demo/dthash.c
index 12dc3e9..888dc1f 100644
--- a/demo/dthash.c
+++ b/demo/dthash.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include "dthash.h"
 
-const static uint32_t crc32_tab[] = {
+static const uint32_t crc32_tab[] = {
 	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
 	0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
 	0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
diff --git a/demo/scanner.c b/demo/scanner.c
index d2afe3f..7c6c38e 100644
--- a/demo/scanner.c
+++ b/demo/scanner.c
@@ -166,7 +166,7 @@ static void usage(const char *progname)
 
 int main(int argc, char **argv)
 {
-	const static struct option longopts[] = {
+	static const struct option longopts[] = {
 		{"help",		0, 0, 'H'},
 		{"version",		0, 0, 'V'},
 		{NULL,			0, 0, 0}
diff --git a/lib/decode.c b/lib/decode.c
index 2e0e244..13782b8 100644
--- a/lib/decode.c
+++ b/lib/decode.c
@@ -117,7 +117,7 @@ static const uint8_t gf256_log[256] = {
 	0x74, 0xd6, 0xf4, 0xea, 0xa8, 0x50, 0x58, 0xaf
 };
 
-const static struct galois_field gf256 = {
+static const struct galois_field gf256 = {
 	.p = 255,
 	.log = gf256_log,
 	.exp = gf256_exp