diff --git a/include/vfw.h b/include/vfw.h
index ea1770390ed..bfb6f0d450e 100644
--- a/include/vfw.h
+++ b/include/vfw.h
@@ -387,7 +387,7 @@ DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,L
 
 LRESULT	VFWAPI	ICSendMessage(HIC hic, UINT msg, DWORD_PTR dw1, DWORD_PTR dw2);
 
-inline static LRESULT VFWAPI ICDecompressEx(HIC hic, DWORD dwFlags,
+static inline LRESULT VFWAPI ICDecompressEx(HIC hic, DWORD dwFlags,
 					    LPBITMAPINFOHEADER lpbiSrc, LPVOID lpSrc,
 					    int xSrc, int ySrc, int dxSrc, int dySrc,
 					    LPBITMAPINFOHEADER lpbiDst, LPVOID lpDst,
@@ -411,7 +411,7 @@ inline static LRESULT VFWAPI ICDecompressEx(HIC hic, DWORD dwFlags,
     return ICSendMessage(hic, ICM_DECOMPRESSEX, (DWORD_PTR)&ic, sizeof(ic));
 }
 
-inline static LRESULT VFWAPI ICDecompressExBegin(HIC hic, DWORD dwFlags,
+static inline LRESULT VFWAPI ICDecompressExBegin(HIC hic, DWORD dwFlags,
 						 LPBITMAPINFOHEADER lpbiSrc,
 						 LPVOID lpSrc,
 						 int xSrc, int ySrc, int dxSrc, int dySrc,
@@ -439,7 +439,7 @@ inline static LRESULT VFWAPI ICDecompressExBegin(HIC hic, DWORD dwFlags,
     ic.dyDst = dyDst;
     return ICSendMessage(hic, ICM_DECOMPRESSEX_BEGIN, (DWORD_PTR)&ic, sizeof(ic));
 }
-inline static LRESULT VFWAPI ICDecompressExQuery(HIC hic, DWORD dwFlags,
+static inline LRESULT VFWAPI ICDecompressExQuery(HIC hic, DWORD dwFlags,
 						 LPBITMAPINFOHEADER lpbiSrc,
 						 LPVOID lpSrc,
 						 int xSrc, int ySrc, int dxSrc, int dySrc,
@@ -519,14 +519,14 @@ HIC	VFWAPI	ICGetDisplayFormat(HIC hic, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHE
 #define ICGetStateSize(hic) \
     ICGetState(hic, NULL, 0)
 
-inline static DWORD ICGetDefaultQuality(HIC hic)
+static inline DWORD ICGetDefaultQuality(HIC hic)
 {
    DWORD dwICValue;
    ICSendMessage(hic, ICM_GETDEFAULTQUALITY, (DWORD_PTR)(LPVOID)&dwICValue, sizeof(DWORD));
    return dwICValue;
 }
 
-inline static DWORD ICGetDefaultKeyFrameRate(HIC hic)
+static inline DWORD ICGetDefaultKeyFrameRate(HIC hic)
 {
    DWORD dwICValue;
    ICSendMessage(hic, ICM_GETDEFAULTKEYFRAMERATE, (DWORD_PTR)(LPVOID)&dwICValue, sizeof(DWORD));
@@ -609,7 +609,7 @@ typedef struct {
 
 DWORD VFWAPIV ICDraw(HIC hic,DWORD dwFlags,LPVOID lpFormat,LPVOID lpData,DWORD cbData,LONG lTime);
 
-inline static LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpbiIn,
+static inline LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpbiIn,
 						 LPBITMAPINFOHEADER lpbiOut,
 						 int dxSrc, int dySrc,
 						 int dxDst, int dyDst,
@@ -666,7 +666,7 @@ inline static LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpb
 #define ICDrawRenderBuffer(hic) \
     ICSendMessage(hic, ICM_DRAW_RENDERBUFFER, 0, 0)
 
-inline static LRESULT VFWAPI ICSetStatusProc(HIC hic, DWORD dwFlags, LRESULT lParam,
+static inline LRESULT VFWAPI ICSetStatusProc(HIC hic, DWORD dwFlags, LRESULT lParam,
 					     LONG (CALLBACK *fpfnStatus)(LPARAM, UINT, LONG))
 {
     ICSETSTATUSPROC ic;
diff --git a/include/win.h b/include/win.h
index 951eeac660f..1857422442f 100644
--- a/include/win.h
+++ b/include/win.h
@@ -90,14 +90,14 @@ extern void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos,
 extern void USER_Lock(void);
 extern void USER_Unlock(void);
 
-inline static HWND WIN_GetFullHandle( HWND hwnd )
+static inline HWND WIN_GetFullHandle( HWND hwnd )
 {
     if (!HIWORD(hwnd) && hwnd) hwnd = WIN_Handle32( LOWORD(hwnd) );
     return hwnd;
 }
 
 /* to release pointers retrieved by WIN_GetPtr */
-inline static void WIN_ReleasePtr( WND *ptr )
+static inline void WIN_ReleasePtr( WND *ptr )
 {
     USER_Unlock();
 }
diff --git a/include/wincon.h b/include/wincon.h
index 61bdea5c327..49130c308da 100644
--- a/include/wincon.h
+++ b/include/wincon.h
@@ -176,7 +176,7 @@ typedef struct tagINPUT_RECORD
  * structures is different between Windows and gcc on i386. */
 DWORD WINAPI GetLargestConsoleWindowSize(HANDLE);
 
-inline static COORD __wine_GetLargestConsoleWindowSize_wrapper(HANDLE h)
+static inline COORD __wine_GetLargestConsoleWindowSize_wrapper(HANDLE h)
 {
     union {
       COORD c;
diff --git a/include/winsock.h b/include/winsock.h
index d31c84d2f88..80266f241a5 100644
--- a/include/winsock.h
+++ b/include/winsock.h
@@ -523,11 +523,11 @@ int WINAPI __WSAFDIsSet(SOCKET,WS(fd_set)*);
 
 #else  /* WORDS_BIGENDIAN */
 
-inline static u_short __wine_ushort_swap(u_short s)
+static inline u_short __wine_ushort_swap(u_short s)
 {
     return (s >> 8) | (s << 8);
 }
-inline static u_long __wine_ulong_swap(u_long l)
+static inline u_long __wine_ulong_swap(u_long l)
 {
     return ((u_long)__wine_ushort_swap((u_short)l) << 16) | __wine_ushort_swap((u_short)(l >> 16));
 }
diff --git a/include/winternl.h b/include/winternl.h
index e128268dbc7..1dc60115576 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -2278,7 +2278,7 @@ extern NTSTATUS wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRI
 #define RtlRetrieveUlonglong(p,s) memcpy((p), (s), sizeof(ULONGLONG))
 #define RtlZeroMemory(Destination,Length) memset((Destination),0,(Length))
 
-inline static BOOLEAN RtlCheckBit(PCRTL_BITMAP lpBits, ULONG ulBit)
+static inline BOOLEAN RtlCheckBit(PCRTL_BITMAP lpBits, ULONG ulBit)
 {
     if (lpBits && ulBit < lpBits->SizeOfBitMap &&
         lpBits->Buffer[ulBit >> 5] & (1 << (ulBit & 31)))
@@ -2287,11 +2287,11 @@ inline static BOOLEAN RtlCheckBit(PCRTL_BITMAP lpBits, ULONG ulBit)
 }
 
 /* These are implemented as __fastcall, so we can't let Winelib apps link with them */
-inline static USHORT RtlUshortByteSwap(USHORT s)
+static inline USHORT RtlUshortByteSwap(USHORT s)
 {
     return (s >> 8) | (s << 8);
 }
-inline static ULONG RtlUlongByteSwap(ULONG i)
+static inline ULONG RtlUlongByteSwap(ULONG i)
 {
 #if defined(__i386__) && defined(__GNUC__)
     ULONG ret;