diff --git a/builtin.c b/builtin.c
index f02dce055..13694aacb 100644
--- a/builtin.c
+++ b/builtin.c
@@ -602,7 +602,7 @@ static int builtin_bind( wchar_t **argv )
 
 	woptind=0;
 
-	const static struct woption
+	static const struct woption
 		long_options[] =
 		{
 			{
@@ -773,7 +773,7 @@ static int builtin_block( wchar_t **argv )
 
 	woptind=0;
 
-	const static struct woption
+	static const struct woption
 		long_options[] =
 		{
 			{
@@ -925,7 +925,7 @@ static int builtin_builtin(  wchar_t **argv )
 
 	woptind=0;
 
-	const static struct woption
+	static const struct woption
 		long_options[] =
 		{
 			{
@@ -1015,7 +1015,7 @@ static int builtin_emit( wchar_t **argv )
 
 	woptind=0;
 
-	const static struct woption
+	static const struct woption
 		long_options[] =
 		{
 			{
@@ -1086,7 +1086,7 @@ static int builtin_generic( wchar_t **argv )
 	int argc=builtin_count_args( argv );
 	woptind=0;
 
-	const static struct woption
+	static const struct woption
 		long_options[] =
 		{
 			{
@@ -1256,7 +1256,7 @@ static int builtin_functions( wchar_t **argv )
 
 	woptind=0;
 
-	const static struct woption
+	static const struct woption
 		long_options[] =
 		{
 			{
@@ -1540,7 +1540,7 @@ static int builtin_function( wchar_t **argv )
 	parser_push_block( FUNCTION_DEF );
 	events=al_halloc( current_block );
 
-	const static struct woption
+	static const struct woption
 		long_options[] =
 		{
 			{
@@ -1911,7 +1911,7 @@ static int builtin_random( wchar_t **argv )
 
 	woptind=0;
 
-	const static struct woption
+	static const struct woption
 		long_options[] =
 		{
 			{
@@ -2034,7 +2034,7 @@ static int builtin_read( wchar_t **argv )
 
 	while( 1 )
 	{
-		const static struct woption
+		static const struct woption
 			long_options[] =
 			{
 				{
@@ -3659,7 +3659,7 @@ static int builtin_case( wchar_t **argv )
 /**
    Data about all the builtin commands in fish
 */
-const static builtin_data_t builtin_data[]=
+static const builtin_data_t builtin_data[]=
 {
 	{
 		L"block",  &builtin_block, N_( L"Temporarily block delivery of events" )
diff --git a/builtin_commandline.c b/builtin_commandline.c
index 761589753..f23e1153f 100644
--- a/builtin_commandline.c
+++ b/builtin_commandline.c
@@ -267,7 +267,7 @@ static int builtin_commandline( wchar_t **argv )
 
 	while( 1 )
 	{
-		const static struct woption
+		static const struct woption
 			long_options[] =
 			{
 				{
diff --git a/builtin_complete.c b/builtin_complete.c
index 8b6067da4..1503bd0aa 100644
--- a/builtin_complete.c
+++ b/builtin_complete.c
@@ -28,7 +28,7 @@ Functions used for implementing the complete builtin.
 /**
    Internal storage for the builtin_get_temporary_buffer() function.
 */
-const static wchar_t *temporary_buffer;
+static const wchar_t *temporary_buffer;
 
 /*
   builtin_complete_* are a set of rather silly looping functions that
@@ -320,7 +320,7 @@ static int builtin_complete( wchar_t **argv )
 
 	while( res == 0 )
 	{
-		const static struct woption
+		static const struct woption
 			long_options[] =
 			{
 				{
diff --git a/builtin_jobs.c b/builtin_jobs.c
index 001f5a2a8..8d17dba14 100644
--- a/builtin_jobs.c
+++ b/builtin_jobs.c
@@ -173,7 +173,7 @@ static int builtin_jobs( wchar_t **argv )
 
 	while( 1 )
 	{
-		const static struct woption
+		static const struct woption
 			long_options[] =
 			{
 				{
diff --git a/builtin_set.c b/builtin_set.c
index 4f8274a61..7fa41fa97 100644
--- a/builtin_set.c
+++ b/builtin_set.c
@@ -417,7 +417,7 @@ static int builtin_set( wchar_t **argv )
 	/**
 	   Variables used for parsing the argument list
 	*/
-	const static struct woption
+	static const struct woption
 		long_options[] =
 		{
 			{
diff --git a/builtin_ulimit.c b/builtin_ulimit.c
index 30f68f9aa..80651f926 100644
--- a/builtin_ulimit.c
+++ b/builtin_ulimit.c
@@ -49,7 +49,7 @@ struct resource_t
 /**
    Array of resource_t structs, describing all known resource types.
 */
-const static struct resource_t resource_arr[] =
+static const struct resource_t resource_arr[] =
 {
 	{
 		RLIMIT_CORE, L"Maximum size of core files created", L'c', 1024
@@ -266,7 +266,7 @@ static int builtin_ulimit( wchar_t ** argv )
 
 	while( 1 )
 	{
-		const static struct woption
+		static const struct woption
 			long_options[] =
 			{
 				{
diff --git a/parser.c b/parser.c
index 485f8ac83..702392b69 100644
--- a/parser.c
+++ b/parser.c
@@ -292,7 +292,7 @@ struct block_lookup_entry
 /**
    List of all legal block types
 */
-const static struct block_lookup_entry block_lookup[]=
+static const struct block_lookup_entry block_lookup[]=
 {
 	{
 		WHILE, L"while", WHILE_BLOCK
diff --git a/signal.c b/signal.c
index 6810035e3..2ac38aae6 100644
--- a/signal.c
+++ b/signal.c
@@ -60,7 +60,7 @@ static int block_count=0;
    Lookup table used to convert between signal names and signal ids,
    etc.
 */
-const static struct lookup_entry lookup[] =
+static const struct lookup_entry lookup[] =
 {
 #ifdef SIGHUP
 	{