diff --git a/win32/include/_mingw.h b/win32/include/_mingw.h
index 2fc97987..4511d66c 100644
--- a/win32/include/_mingw.h
+++ b/win32/include/_mingw.h
@@ -51,7 +51,7 @@
 #define __GNUC_VA_LIST
 
 #define _CRTIMP extern
-#define __CRT_INLINE extern __inline__
+#define __CRT_INLINE static __inline__
 
 #define _CRT_ALIGN(x) __attribute__((aligned(x)))
 #define DECLSPEC_ALIGN(x) __attribute__((aligned(x)))
diff --git a/win32/include/winapi/winnt.h b/win32/include/winapi/winnt.h
index 4cf685d2..bf5d1270 100644
--- a/win32/include/winapi/winnt.h
+++ b/win32/include/winapi/winnt.h
@@ -1474,7 +1474,7 @@ typedef DWORD LCID;
 #if(defined(_X86_) && !defined(__x86_64))
   __CRT_INLINE VOID MemoryBarrier(VOID) {
     LONG Barrier;
-    __asm__ __volatile__("xchgl %eax,%0 "
+    __asm__ __volatile__("xchgl %%eax,%0 "
       :"=r" (Barrier));
   }
 #define YieldProcessor() __asm__ __volatile__("rep nop ");
@@ -1486,7 +1486,7 @@ typedef DWORD LCID;
 #define PF_NON_TEMPORAL_LEVEL_ALL
 
   __CRT_INLINE VOID DbgRaiseAssertionFailure(void) {
-    __asm__ __volatile__("int 0x2c ");
+    __asm__ __volatile__("int $0x2c ");
   }
   PVOID GetCurrentFiber(void);
   __CRT_INLINE PVOID GetCurrentFiber(void)