diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog
index 245a2f2..e8db225 100644
--- a/mingw-w64-crt/ChangeLog
+++ b/mingw-w64-crt/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-10  Ozkan Sezer  <sezeroz@gmail.com>
+
+	A couple of lib32/*.def file fixes from mingw:
+	* lib32/comctl32.def (StrCSpnA, StrCSpnIA, StrCSpnW, StrChrA, StrChrIA,
+	StrChrIW, StrChrW, StrCmpNA, StrCmpNIA, StrCmpNIW, StrCmpNW, StrRChrA,
+	StrRChrIA, StrRChrW, StrRStrIA, StrRStrIW, StrStrA, StrStrIA, StrStrIW,
+	StrStrW, StrToIntA, StrToIntW): Removed erroneous exports which already
+	are in shlwapi.def.
+	* lib32/scsiport.def (ScsiPortGetDeviceBase): Fixed suffix.
+	* lib32/ntoskrnl.def (MmAllocateContiguousMemory): Fixed suffix.
+	* lib32/msimg32.def (GetDCBrushColor, GetDCPenColor): Moved from here...
+	* lib32/gdi32.def (GetDCBrushColor, GetDCPenColor): ... to here.
+
 2010-02-02  Ozkan Sezer  <sezeroz@gmail.com>
 
 	* profile/gmon.c, profile/gmon.h, profile/mcount.c: Remove advertising
diff --git a/mingw-w64-crt/lib32/comctl32.def b/mingw-w64-crt/lib32/comctl32.def
index 8075980..58b0362 100644
--- a/mingw-w64-crt/lib32/comctl32.def
+++ b/mingw-w64-crt/lib32/comctl32.def
@@ -107,28 +107,6 @@
 SendNotifyEx@20
 SetWindowSubclass@16
 ShowHideMenuCtl@12
-StrCSpnA@8
-StrCSpnIA@8
-StrCSpnW@8
-StrChrA@8
-StrChrIA@8
-StrChrIW@8
-StrChrW@8
-StrCmpNA@12
-StrCmpNIA@12
-StrCmpNIW@12
-StrCmpNW@12
-StrRChrA@12
-StrRChrIA@12
-StrRChrW@12
-StrRStrIA@12
-StrRStrIW@12
-StrStrA@8
-StrStrIA@8
-StrStrIW@8
-StrStrW@8
-StrToIntA@4
-StrToIntW@4
 Str_GetPtrA@12
 Str_GetPtrW@12
 Str_SetPtrA@8
diff --git a/mingw-w64-crt/lib32/gdi32.def b/mingw-w64-crt/lib32/gdi32.def
index e4e17ac..067a0ac 100644
--- a/mingw-w64-crt/lib32/gdi32.def
+++ b/mingw-w64-crt/lib32/gdi32.def
@@ -143,7 +143,9 @@
 GetColorSpace@4
 GetCurrentObject@8
 GetCurrentPositionEx@8
+GetDCBrushColor@4
 GetDCOrgEx@8
+GetDCPenColor@4
 GetDIBColorTable@16
 GetDIBits@28
 GetDeviceCaps@8
diff --git a/mingw-w64-crt/lib32/msimg32.def b/mingw-w64-crt/lib32/msimg32.def
index 7dcf215..4f722a1 100644
--- a/mingw-w64-crt/lib32/msimg32.def
+++ b/mingw-w64-crt/lib32/msimg32.def
@@ -1,7 +1,5 @@
 LIBRARY MSIMG32.DLL
 EXPORTS
 AlphaBlend@44
-GetDCBrushColor@4
-GetDCPenColor@4
 GradientFill@24
 TransparentBlt@44
diff --git a/mingw-w64-crt/lib32/ntoskrnl.def b/mingw-w64-crt/lib32/ntoskrnl.def
index ca1447f..33ba2dc 100644
--- a/mingw-w64-crt/lib32/ntoskrnl.def
+++ b/mingw-w64-crt/lib32/ntoskrnl.def
@@ -639,7 +639,7 @@
 ;MmAddVerifierThunks
 ;MmAdjustWorkingSetSize
 MmAdvanceMdl@8
-MmAllocateContiguousMemory@8
+MmAllocateContiguousMemory@12
 MmAllocateContiguousMemorySpecifyCache@20
 MmAllocateMappingAddress@8
 MmAllocateNonCachedMemory@4
diff --git a/mingw-w64-crt/lib32/scsiport.def b/mingw-w64-crt/lib32/scsiport.def
index 1965161..f7050c2 100644
--- a/mingw-w64-crt/lib32/scsiport.def
+++ b/mingw-w64-crt/lib32/scsiport.def
@@ -8,7 +8,7 @@
 ScsiPortFlushDma@4
 ScsiPortFreeDeviceBase@8
 ScsiPortGetBusData@24
-ScsiPortGetDeviceBase@24
+ScsiPortGetDeviceBase@28
 ScsiPortGetLogicalUnit@16
 ScsiPortGetPhysicalAddress@16
 ScsiPortGetSrb@20