diff --git a/drivers/fet_db.c b/drivers/fet_db.c
index 59116d3..230726c 100644
--- a/drivers/fet_db.c
+++ b/drivers/fet_db.c
@@ -1825,7 +1825,7 @@ const struct fet_db_record *fet_db_find_by_msg28(uint8_t *data, int len)
 
 		if (r->msg28_data[0] == data[0] &&
 		    r->msg28_data[1] == data[1]) {
-			const static int coefficients[FET_DB_MSG28_LEN] = {
+			static const int coefficients[FET_DB_MSG28_LEN] = {
 				1, 1, 1, 1, 1, 1, 1, 1,
 				1, 1, 0, 0, 1, 1, 1, 1,
 				10, 1
diff --git a/drivers/tilib.c b/drivers/tilib.c
index 3e12c10..d859db7 100644
--- a/drivers/tilib.c
+++ b/drivers/tilib.c
@@ -90,7 +90,7 @@ struct tilib_device {
 
 #define MID_HALT_ANY		(MID_BREAKPOINT | MID_CPU_STOPPED)
 
-const static MessageID_t my_message_ids = {
+static const MessageID_t my_message_ids = {
 	.uiMsgIdSingleStep	= MID_SINGLE_STEP,
 	.uiMsgIdBreakpoint	= MID_BREAKPOINT,
 	.uiMsgIdStorage		= MID_STORAGE,
diff --git a/simio/simio.c b/simio/simio.c
index ce829e2..2e3fb72 100644
--- a/simio/simio.c
+++ b/simio/simio.c
@@ -337,11 +337,13 @@ int name(address_t addr, datatype data) { \
 \
 	return ret; \
 }
+#define IO_REQUEST_FUNC_S(name, method, datatype) \
+	static IO_REQUEST_FUNC(name, method, datatype)
 
 IO_REQUEST_FUNC(simio_write, write, uint16_t)
 IO_REQUEST_FUNC(simio_read, read, uint16_t *)
-IO_REQUEST_FUNC(static simio_write_b_device, write_b, uint8_t)
-IO_REQUEST_FUNC(static simio_read_b_device, read_b, uint8_t *)
+IO_REQUEST_FUNC_S(simio_write_b_device, write_b, uint8_t)
+IO_REQUEST_FUNC_S(simio_read_b_device, read_b, uint8_t *)
 
 int simio_write_b(address_t addr, uint8_t data)
 {
diff --git a/ui/main.c b/ui/main.c
index a29111e..dcbbfb6 100644
--- a/ui/main.c
+++ b/ui/main.c
@@ -171,7 +171,7 @@ static int parse_cmdline_args(int argc, char **argv,
 			      struct cmdline_args *args)
 {
 	int opt;
-	const static struct option longopts[] = {
+	static const struct option longopts[] = {
 		{"help",                0, 0, 'H'},
 		{"fet-list",            0, 0, 'L'},
 		{"fet-force-id",        1, 0, 'F'},
@@ -189,7 +189,7 @@ static int parse_cmdline_args(int argc, char **argv,
 		switch (opt) {
 		case 'q':
 			{
-				const static union opdb_value v = {
+				static const union opdb_value v = {
 					.boolean = 1
 				};
 
diff --git a/ui/rtools.c b/ui/rtools.c
index 0826988..d1b6f54 100644
--- a/ui/rtools.c
+++ b/ui/rtools.c
@@ -380,7 +380,7 @@ static int do_isearch(address_t addr, address_t len,
 
 int cmd_isearch(char **arg)
 {
-	const static struct {
+	static const struct {
 		const char      *name;
 		int             (*func)(const char *term, char **arg,
 					struct isearch_query *q);
diff --git a/util/opdb.c b/util/opdb.c
index 0e2e0f4..7ddf1bf 100644
--- a/util/opdb.c
+++ b/util/opdb.c
@@ -20,7 +20,7 @@
 #include "opdb.h"
 #include "util.h"
 
-const static struct opdb_key keys[] = {
+static const struct opdb_key keys[] = {
 	{
 		.name = "color",
 		.type = OPDB_TYPE_BOOLEAN,
diff --git a/util/util.c b/util/util.c
index 8acab0b..24a6916 100644
--- a/util/util.c
+++ b/util/util.c
@@ -102,7 +102,7 @@ void ctrlc_init(void)
 #if defined(__CYGWIN__)
        signal(SIGINT, sigint_handler);
 #else
-       const static struct sigaction siga = {
+       static const struct sigaction siga = {
                .sa_handler = sigint_handler,
                .sa_flags = 0
        };