diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog
index a2467cb..8c1eb69 100644
--- a/mingw-w64-crt/ChangeLog
+++ b/mingw-w64-crt/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-15  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* profile/gmon.h: Don't define BSD u_* types. Include _bsd_types.h
+	instead.
+	* profile/profil.h: Likewise.
+
 2010-06-10  Jacek Caban  <jacek@codeweavers.com>
 
 	* libsrc/msctf-uuid.c: New.
diff --git a/mingw-w64-crt/profile/gmon.h b/mingw-w64-crt/profile/gmon.h
index 4b798e1..919a1f2 100644
--- a/mingw-w64-crt/profile/gmon.h
+++ b/mingw-w64-crt/profile/gmon.h
@@ -47,13 +47,7 @@
 #include <profile.h>
 
 #ifdef __MINGW32__
-#ifndef _BSDTYPES_DEFINED
-typedef unsigned char u_char;
-typedef unsigned short u_short;
-typedef unsigned int u_int;
-typedef unsigned long u_long;
-#define _BSDTYPES_DEFINED
-#endif /* _BSDTYPES_DEFINED */
+#include <_bsd_types.h>
 #endif /* __MINGW32__*/
 
 /*
diff --git a/mingw-w64-crt/profile/profil.h b/mingw-w64-crt/profile/profil.h
index 894b29b..a2e1fea 100644
--- a/mingw-w64-crt/profile/profil.h
+++ b/mingw-w64-crt/profile/profil.h
@@ -38,13 +38,7 @@
 
 typedef void *_WINHANDLE;
 #ifdef __MINGW32__
-#ifndef _BSDTYPES_DEFINED
-typedef unsigned char u_char;
-typedef unsigned short u_short;
-typedef unsigned int u_int;
-typedef unsigned long u_long;
-#define _BSDTYPES_DEFINED
-#endif /* _BSDTYPES_DEFINED */
+#include <_bsd_types.h>
 #endif /* __MINGW32__*/
 
 struct profinfo {
diff --git a/mingw-w64-headers/crt/ChangeLog b/mingw-w64-headers/crt/ChangeLog
index 4f05087..60b8167 100644
--- a/mingw-w64-headers/crt/ChangeLog
+++ b/mingw-w64-headers/crt/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-15  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* _bsd_types.h: Moved from include/mingw_inc/_bsd_types.h.
+	Changed its include guard to _BSDTYPES_DEFINED.
+
 2010-06-12  Kai Tietz  <kai.tietz@onevision.com>
 
 	* _mingw_mac.h (__MINGW_STRING_AW): New helper macro.
diff --git a/mingw-w64-headers/include/mingw_inc/_bsd_types.h b/mingw-w64-headers/crt/_bsd_types.h
similarity index 62%
rename from mingw-w64-headers/include/mingw_inc/_bsd_types.h
rename to mingw-w64-headers/crt/_bsd_types.h
index 600271d..c119666 100644
--- a/mingw-w64-headers/include/mingw_inc/_bsd_types.h
+++ b/mingw-w64-headers/crt/_bsd_types.h
@@ -4,15 +4,18 @@
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
-#ifndef ___WSA_BSD_TYPES_H
-#define ___WSA_BSD_TYPES_H
+#ifndef _BSDTYPES_DEFINED
+#define _BSDTYPES_DEFINED
 
 typedef unsigned char	u_char;
 typedef unsigned short	u_short;
 typedef unsigned int	u_int;
 typedef unsigned long	u_long;
-__MINGW_EXTENSION
-typedef unsigned __int64 u_int64;
+#if defined(__GNUC__) || \
+    defined(__GNUG__)
+__extension__
+#endif /* gcc / g++ */
+typedef unsigned long long u_int64;
 
-#endif /* ___WSA_BSD_TYPES_H */
+#endif /* _BSDTYPES_DEFINED */
 
diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index 18fcef7..025ca9d 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,14 @@
+2010-06-15  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* mingw_inc/_bsd_types.h: Moved to crt/_bsd_types.h. Changed its
+	include guard to _BSDTYPES_DEFINED.
+	* af_irda.h: Adjusted for _bsdtypes.h.
+	* inaddr.h: Likewise.
+	* in6addr.h: Likewise.
+	* mingw_inc/_ip_types.h: Likewise.
+	* winsock.h: Likewise.
+	* winsock2.h: Likewise.
+
 2010-06-14  Ozkan Sezer  <sezeroz@gmail.com>
 
 	* ks.h, ksmedia.h, ksproxy.h: Added #endif comments.
diff --git a/mingw-w64-headers/include/af_irda.h b/mingw-w64-headers/include/af_irda.h
index fb83971..52eaa6e 100644
--- a/mingw-w64-headers/include/af_irda.h
+++ b/mingw-w64-headers/include/af_irda.h
@@ -6,7 +6,7 @@
 #ifndef __AFIRDA__
 #define __AFIRDA__
 
-#include <mingw_inc/_bsd_types.h>
+#include <_bsd_types.h>
 
 #define WINDOWS_AF_IRDA 26
 #define WINDOWS_PF_IRDA WINDOWS_AF_IRDA
diff --git a/mingw-w64-headers/include/in6addr.h b/mingw-w64-headers/include/in6addr.h
index ea9d7fe..9f20f62 100644
--- a/mingw-w64-headers/include/in6addr.h
+++ b/mingw-w64-headers/include/in6addr.h
@@ -6,7 +6,7 @@
 
 #ifndef s6_addr
 
-#include <mingw_inc/_bsd_types.h>
+#include <_bsd_types.h>
 
 typedef struct in6_addr {
   union {
diff --git a/mingw-w64-headers/include/inaddr.h b/mingw-w64-headers/include/inaddr.h
index d595e5e..f7a5492 100644
--- a/mingw-w64-headers/include/inaddr.h
+++ b/mingw-w64-headers/include/inaddr.h
@@ -6,7 +6,7 @@
 
 #ifndef s_addr
 
-#include <mingw_inc/_bsd_types.h>
+#include <_bsd_types.h>
 
 typedef struct in_addr {
   union {
diff --git a/mingw-w64-headers/include/mingw_inc/_ip_types.h b/mingw-w64-headers/include/mingw_inc/_ip_types.h
index 3286e15..0defa74 100644
--- a/mingw-w64-headers/include/mingw_inc/_ip_types.h
+++ b/mingw-w64-headers/include/mingw_inc/_ip_types.h
@@ -7,7 +7,7 @@
 #ifndef _MINGW_IP_TYPES_H
 #define _MINGW_IP_TYPES_H
 
-#include <mingw_inc/_bsd_types.h>
+#include <_bsd_types.h>
 
 #define h_addr h_addr_list[0]
 
diff --git a/mingw-w64-headers/include/winsock.h b/mingw-w64-headers/include/winsock.h
index f18e945..ccd8868 100644
--- a/mingw-w64-headers/include/winsock.h
+++ b/mingw-w64-headers/include/winsock.h
@@ -24,8 +24,8 @@
 #define WSAAPI			WINAPI
 
 #include <_timeval.h>
+#include <_bsd_types.h>
 #include <inaddr.h>
-#include <mingw_inc/_bsd_types.h>
 #include <mingw_inc/_socket_types.h>
 #include <mingw_inc/_fd_types.h>
 #include <mingw_inc/_ip_types.h>
diff --git a/mingw-w64-headers/include/winsock2.h b/mingw-w64-headers/include/winsock2.h
index ee5c18c..8270217 100644
--- a/mingw-w64-headers/include/winsock2.h
+++ b/mingw-w64-headers/include/winsock2.h
@@ -42,8 +42,8 @@
 #include <mingw_inc/_ws1_undef.h>
 
 #include <_timeval.h>
+#include <_bsd_types.h>
 #include <inaddr.h>
-#include <mingw_inc/_bsd_types.h>
 #include <mingw_inc/_socket_types.h>
 #include <mingw_inc/_fd_types.h>
 #include <mingw_inc/_ip_types.h>