diff --git a/mingw-w64-headers/include/_mingw.h b/mingw-w64-headers/include/_mingw.h
index 499d805..e4c963e 100755
--- a/mingw-w64-headers/include/_mingw.h
+++ b/mingw-w64-headers/include/_mingw.h
@@ -67,7 +67,9 @@
 #define __int16 short
 #define __int32 int
 #define __int64 long long
+#ifdef _WIN64
 typedef int __int128 __attribute__ ((mode (TI)));
+#endif
 
 #define __ptr32
 #define __ptr64
diff --git a/mingw-w64-headers/include/stralign.h b/mingw-w64-headers/include/stralign.h
index a3fcfda..5826663 100755
--- a/mingw-w64-headers/include/stralign.h
+++ b/mingw-w64-headers/include/stralign.h
@@ -24,7 +24,7 @@
 #define ua_wcsicmp wcsicmp
 #define ua_wcslen wcslen
 #define ua_wcsrchr wcsrchr
-  static __inline PUWSTR static ua_wcscpy(PUWSTR Destination,PCUWSTR Source) { return wcscpy(Destination,Source); }
+  static __inline PUWSTR ua_wcscpy(PUWSTR Destination,PCUWSTR Source) { return wcscpy(Destination,Source); }
 #else
 #define WSTR_ALIGNED(s) (((DWORD_PTR)(s) & (sizeof(WCHAR)-1))==0)
 
diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h
index 699689d..881efee 100755
--- a/mingw-w64-headers/include/winnt.h
+++ b/mingw-w64-headers/include/winnt.h
@@ -1380,25 +1380,24 @@
 
   __CRT_INLINE VOID DbgRaiseAssertionFailure(void) {
     __asm__ __volatile__("int 0x2c ");
-
-    PVOID GetCurrentFiber(void);
-    __CRT_INLINE PVOID GetCurrentFiber(void)
-    {
-      void *ret;
-      __asm__ volatile ("movl	%%fs:0x10,%0"
+  }
+  PVOID GetCurrentFiber(void);
+  __CRT_INLINE PVOID GetCurrentFiber(void)
+  {
+    void *ret;
+    __asm__ volatile ("movl	%%fs:0x10,%0"
 	: "=r" (ret));
-      return ret;
-    }
-
-    PVOID GetFiberData(void);
-    __CRT_INLINE PVOID GetFiberData(void)
-    {
-      void *ret;
-      __asm__ volatile ("movl	%%fs:0x10,%0\n"
+    return ret;
+  }
+  PVOID GetFiberData(void);
+  __CRT_INLINE PVOID GetFiberData(void)
+  {
+    void *ret;
+    __asm__ volatile ("movl	%%fs:0x10,%0\n"
 	"movl	(%0),%0"
 	: "=r" (ret));
-      return ret;
-    }
+    return ret;
+  }
 #endif
 
 #define EXCEPTION_READ_FAULT 0