diff --git a/mingw-w64-headers/crt/ChangeLog b/mingw-w64-headers/crt/ChangeLog
index 16c8c0f..d0c881f 100644
--- a/mingw-w64-headers/crt/ChangeLog
+++ b/mingw-w64-headers/crt/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-23  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* _mingw.h (__debugbreak): Add prototype before the inline as it
+	appears in intrin.h.
+
 2011-07-11  Ruben Van Boxem  <vanboxem.ruben@gmail.com>
 
 	* float.h: Extend guards about Clang's __FLOAT_H.
diff --git a/mingw-w64-headers/crt/_mingw.h.in b/mingw-w64-headers/crt/_mingw.h.in
index 9483412..9580d37 100644
--- a/mingw-w64-headers/crt/_mingw.h.in
+++ b/mingw-w64-headers/crt/_mingw.h.in
@@ -693,6 +693,7 @@
 
 #ifdef __MINGW_INTRIN_INLINE
 #if !defined (__clang__)
+void __cdecl __debugbreak(void);
 __MINGW_INTRIN_INLINE void __cdecl __debugbreak(void)
 {
   __asm__ __volatile__("int $3");
diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index 717e276..c1c6a14 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-23  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* winnt.h: Move the intrin.h include before the __faststorefence
+	inline. Remove the redundant prototype for _m_prefetchw() which
+	is already in intrin.h.
+
 2011-07-21  Ozkan Sezer  <sezeroz@gmail.com>
 
 	* winnt.h (C_ASSERT): Define using EXTERN_C instead of extern.
diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h
index 19c041b..ff481d7 100644
--- a/mingw-w64-headers/include/winnt.h
+++ b/mingw-w64-headers/include/winnt.h
@@ -1464,6 +1464,8 @@
 
     VOID _ReadWriteBarrier(VOID);
 
+#include <intrin.h>
+
 #define FastFence __faststorefence		/* FIXME: implement proprely */
 #define LoadFence _mm_lfence
 #define MemoryFence _mm_mfence
@@ -1475,10 +1477,6 @@
     }
 #endif
 
-    void _m_prefetchw(void *Source);
-
-#include <intrin.h>
-
 #define YieldProcessor _mm_pause
 #define MemoryBarrier __faststorefence		/* FIXME: implement proprely */
 #define PreFetchCacheLine(l,a) _mm_prefetch((CHAR CONST *) a,l)