diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index 8065858b61d..eabc6bbb63e 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -528,7 +528,7 @@ static void restore_context( const CONTEXT *context, SIGCONTEXT *sigcontext )
  *
  * Set the FPU context from a sigcontext. 
  */
-static void inline save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext )
+inline static void save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext )
 {
 #ifdef FPU_sig
     if (FPU_sig(sigcontext))
@@ -548,7 +548,7 @@ static void inline save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext )
  *
  * Restore the FPU context to a sigcontext. 
  */
-static void inline restore_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext )
+inline static void restore_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext )
 {
     /* reset the current interrupt status */
     context->FloatSave.StatusWord &= context->FloatSave.ControlWord | 0xffffff80;
diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c
index 25ac1b6a2de..4554fcb6cd0 100644
--- a/dlls/oleaut32/safearray.c
+++ b/dlls/oleaut32/safearray.c
@@ -50,7 +50,7 @@ duplicateData(SAFEARRAY *psa, SAFEARRAY **ppsaOut);
    A size of zero is defined for the unsupported types.  */
 
 #define VARTYPE_NOT_SUPPORTED 0
-const static ULONG VARTYPE_SIZE[] =
+static const ULONG VARTYPE_SIZE[] =
 {
   /* this is taken from wtypes.h.  Only [S]es are supported by the SafeArray */
 VARTYPE_NOT_SUPPORTED,	/* VT_EMPTY    [V]   [P]    nothing			*/
@@ -99,7 +99,7 @@ VARTYPE_NOT_SUPPORTED,	/* VT_ARRAY    [V]          SAFEARRAY*			*/
 VARTYPE_NOT_SUPPORTED 	/* VT_BYREF    [V]          void* for local use	*/
 };
 
-const static int LAST_VARTYPE = sizeof(VARTYPE_SIZE)/sizeof(ULONG);
+static const int LAST_VARTYPE = sizeof(VARTYPE_SIZE)/sizeof(ULONG);
 
 
 /*************************************************************************
diff --git a/dlls/winaspi/winescsi.h b/dlls/winaspi/winescsi.h
index a13377613fd..5f171d7d603 100644
--- a/dlls/winaspi/winescsi.h
+++ b/dlls/winaspi/winescsi.h
@@ -9,7 +9,7 @@
 		   number on the next write() on this file descriptor */
 
 /* This is what the linux kernel thinks.... */
-const static unsigned char scsi_command_size[8] =
+static const unsigned char scsi_command_size[8] =
 {
 	6, 10, 10, 12,
 	12, 12, 10, 10
diff --git a/server/handle.c b/server/handle.c
index 4b8ccc9b37e..e71c261d499 100644
--- a/server/handle.c
+++ b/server/handle.c
@@ -53,11 +53,11 @@ static struct handle_table *global_table;
 /* handle to table index conversion */
 
 /* handles are a multiple of 4 under NT; handle  0 is not used */
-static int inline index_to_handle( int index )
+inline static int index_to_handle( int index )
 {
     return (index + 1) << 2;
 }
-static int inline handle_to_index( int handle )
+inline static int handle_to_index( int handle )
 {
     return (handle >> 2) - 1;
 }