diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog
index 1365012..ff738d2 100644
--- a/mingw-w64-crt/ChangeLog
+++ b/mingw-w64-crt/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-20  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* intrins/ilock*.c:  Added non-underscored functions as aliases to the
+	real ones.
+
 2009-09-18  Kai Tietz  <kai.tietz@onevision.com>
 
 	* Implement time_t related functions by stubs in libmingwex.a and do
diff --git a/mingw-w64-crt/intrincs/ilockadd.c b/mingw-w64-crt/intrincs/ilockadd.c
index ed6eddd..3871d93 100644
--- a/mingw-w64-crt/intrincs/ilockadd.c
+++ b/mingw-w64-crt/intrincs/ilockadd.c
@@ -1,6 +1,6 @@
 #include <intrin.h>
 
-long _InterlockedAdd(long volatile *Addend, long Value);			/* not in intrin.h */
+long _InterlockedAdd(long volatile *, long);			/* not in intrin.h */
 long _InterlockedAdd(long volatile *Addend, long Value)
 {
 /* return InterlockedExchangeAdd(Addend,Value) + Value; */
@@ -13,5 +13,5 @@
   return ret + Value;
 }
 
-long InterlockedAdd(long volatile *Addend, long Value) __attribute__((alias("_InterlockedAdd")));
+long InterlockedAdd(long volatile *, long) __attribute__((alias("_InterlockedAdd")));
 
diff --git a/mingw-w64-crt/intrincs/ilockadd64.c b/mingw-w64-crt/intrincs/ilockadd64.c
index 49b61d1..995753d 100644
--- a/mingw-w64-crt/intrincs/ilockadd64.c
+++ b/mingw-w64-crt/intrincs/ilockadd64.c
@@ -1,6 +1,6 @@
 #include <intrin.h>
 
-__int64 _InterlockedAdd64(__int64 volatile *Addend, __int64 Value);			/* not in intrin.h */
+__int64 _InterlockedAdd64(__int64 volatile *, __int64);			/* not in intrin.h */
 __int64 _InterlockedAdd64(__int64 volatile *Addend, __int64 Value)
 {
 /* return InterlockedExchangeAdd64(Addend,Value) + Value; */
@@ -13,5 +13,5 @@
   return ret + Value;
 }
 
-__int64 InterlockedAdd64(__int64 volatile *Addend, __int64 Value) __attribute__((alias("_InterlockedAdd64")));
+__int64 InterlockedAdd64(__int64 volatile *, __int64) __attribute__((alias("_InterlockedAdd64")));
 
diff --git a/mingw-w64-crt/intrincs/ilockand.c b/mingw-w64-crt/intrincs/ilockand.c
index cda4e20..bee5571 100644
--- a/mingw-w64-crt/intrincs/ilockand.c
+++ b/mingw-w64-crt/intrincs/ilockand.c
@@ -8,3 +8,5 @@
   return *Destination;
 }
 
+long InterlockedAnd(long volatile *, long) __attribute__((alias("_InterlockedAnd")));
+
diff --git a/mingw-w64-crt/intrincs/ilockand64.c b/mingw-w64-crt/intrincs/ilockand64.c
index 390bee7..845e9d5 100644
--- a/mingw-w64-crt/intrincs/ilockand64.c
+++ b/mingw-w64-crt/intrincs/ilockand64.c
@@ -7,3 +7,5 @@
   return *Destination;
 }
 
+__int64 InterlockedAnd64(__int64 volatile *, __int64) __attribute__((alias("_InterlockedAnd64")));
+
diff --git a/mingw-w64-crt/intrincs/ilockcxch.c b/mingw-w64-crt/intrincs/ilockcxch.c
index 550efbe..69b795f 100644
--- a/mingw-w64-crt/intrincs/ilockcxch.c
+++ b/mingw-w64-crt/intrincs/ilockcxch.c
@@ -7,3 +7,5 @@
   return prev;
 }
 
+long InterlockedCompareExchange(long volatile *, long, long) __attribute__((alias("_InterlockedCompareExchange")));
+
diff --git a/mingw-w64-crt/intrincs/ilockcxch16.c b/mingw-w64-crt/intrincs/ilockcxch16.c
index 5cddcce..6fe760a 100644
--- a/mingw-w64-crt/intrincs/ilockcxch16.c
+++ b/mingw-w64-crt/intrincs/ilockcxch16.c
@@ -10,3 +10,5 @@
   return prev;
 }
 
+short InterlockedCompareExchange16(short volatile *, short, short) __attribute__((alias("_InterlockedCompareExchange16")));
+
diff --git a/mingw-w64-crt/intrincs/ilockcxch64.c b/mingw-w64-crt/intrincs/ilockcxch64.c
index a897702..6e2d725 100644
--- a/mingw-w64-crt/intrincs/ilockcxch64.c
+++ b/mingw-w64-crt/intrincs/ilockcxch64.c
@@ -7,3 +7,5 @@
   return prev;
 }
 
+__int64 InterlockedCompareExchange64(__int64 volatile *, __int64, __int64) __attribute__((alias("_InterlockedCompareExchange64")));
+
diff --git a/mingw-w64-crt/intrincs/ilockcxchptr.c b/mingw-w64-crt/intrincs/ilockcxchptr.c
index 971d4b0..2c92728 100644
--- a/mingw-w64-crt/intrincs/ilockcxchptr.c
+++ b/mingw-w64-crt/intrincs/ilockcxchptr.c
@@ -7,3 +7,5 @@
   return prev;
 }
 
+void *InterlockedCompareExchangePointer(void * volatile *, void *, void *) __attribute__((alias("_InterlockedCompareExchangePointer")));
+
diff --git a/mingw-w64-crt/intrincs/ilockdec.c b/mingw-w64-crt/intrincs/ilockdec.c
index b285666..7fe421e 100644
--- a/mingw-w64-crt/intrincs/ilockdec.c
+++ b/mingw-w64-crt/intrincs/ilockdec.c
@@ -9,3 +9,6 @@
 	       : : "memory");
   return ret - 1;
 }
+
+long InterlockedDecrement(long volatile *) __attribute__((alias("_InterlockedDecrement")));
+
diff --git a/mingw-w64-crt/intrincs/ilockdec16.c b/mingw-w64-crt/intrincs/ilockdec16.c
index dd457ac..6362271 100644
--- a/mingw-w64-crt/intrincs/ilockdec16.c
+++ b/mingw-w64-crt/intrincs/ilockdec16.c
@@ -10,3 +10,5 @@
   return ret - 1;
 }
 
+short InterlockedDecrement16(short volatile *) __attribute__((alias("_InterlockedDecrement16")));
+
diff --git a/mingw-w64-crt/intrincs/ilockdec64.c b/mingw-w64-crt/intrincs/ilockdec64.c
index c58e376..57c78d6 100644
--- a/mingw-w64-crt/intrincs/ilockdec64.c
+++ b/mingw-w64-crt/intrincs/ilockdec64.c
@@ -10,3 +10,5 @@
   return ret - 1LL;
 }
 
+__int64 InterlockedDecrement64(__int64 volatile *) __attribute__((alias("_InterlockedDecrement64")));
+
diff --git a/mingw-w64-crt/intrincs/ilockexch.c b/mingw-w64-crt/intrincs/ilockexch.c
index b90ab54..59e3e1d 100644
--- a/mingw-w64-crt/intrincs/ilockexch.c
+++ b/mingw-w64-crt/intrincs/ilockexch.c
@@ -9,3 +9,5 @@
   return Value;
 }
 
+long InterlockedExchange(long volatile *, long) __attribute__((alias("_InterlockedExchange")));
+
diff --git a/mingw-w64-crt/intrincs/ilockexch64.c b/mingw-w64-crt/intrincs/ilockexch64.c
index 245bb3a..055cbf6 100644
--- a/mingw-w64-crt/intrincs/ilockexch64.c
+++ b/mingw-w64-crt/intrincs/ilockexch64.c
@@ -9,3 +9,5 @@
   return Value;
 }
 
+__int64 InterlockedExchange64(__int64 volatile *, __int64) __attribute__((alias("_InterlockedExchange64")));
+
diff --git a/mingw-w64-crt/intrincs/ilockexchadd.c b/mingw-w64-crt/intrincs/ilockexchadd.c
index d6a0ced..eee964c 100644
--- a/mingw-w64-crt/intrincs/ilockexchadd.c
+++ b/mingw-w64-crt/intrincs/ilockexchadd.c
@@ -11,3 +11,5 @@
   return ret;
 }
 
+long InterlockedExchangeAdd(long volatile *, long) __attribute__((alias("_InterlockedExchangeAdd")));
+
diff --git a/mingw-w64-crt/intrincs/ilockexchadd64.c b/mingw-w64-crt/intrincs/ilockexchadd64.c
index 9b2e900..02bf4ae 100644
--- a/mingw-w64-crt/intrincs/ilockexchadd64.c
+++ b/mingw-w64-crt/intrincs/ilockexchadd64.c
@@ -11,3 +11,5 @@
   return ret;
 }
 
+__int64 InterlockedExchangeAdd64(__int64 volatile *, __int64) __attribute__((alias("_InterlockedExchangeAdd64")));
+
diff --git a/mingw-w64-crt/intrincs/ilockexchptr.c b/mingw-w64-crt/intrincs/ilockexchptr.c
index 3c21ec6..c866538 100644
--- a/mingw-w64-crt/intrincs/ilockexchptr.c
+++ b/mingw-w64-crt/intrincs/ilockexchptr.c
@@ -9,3 +9,5 @@
   return Value;
 }
 
+void *InterlockedExchangePointer(void * volatile *, void *) __attribute__((alias("_InterlockedExchangePointer")));
+
diff --git a/mingw-w64-crt/intrincs/ilockinc.c b/mingw-w64-crt/intrincs/ilockinc.c
index 0adba46..3d3c509 100644
--- a/mingw-w64-crt/intrincs/ilockinc.c
+++ b/mingw-w64-crt/intrincs/ilockinc.c
@@ -9,3 +9,6 @@
 	       : : "memory");
   return ret + 1;
 }
+
+long InterlockedIncrement(long volatile *) __attribute__((alias("_InterlockedIncrement")));
+
diff --git a/mingw-w64-crt/intrincs/ilockinc16.c b/mingw-w64-crt/intrincs/ilockinc16.c
index 2ae70d2..65a75a6 100644
--- a/mingw-w64-crt/intrincs/ilockinc16.c
+++ b/mingw-w64-crt/intrincs/ilockinc16.c
@@ -10,3 +10,5 @@
   return ret + 1;
 }
 
+short InterlockedIncrement16(short volatile *) __attribute__((alias("_InterlockedIncrement16")));
+
diff --git a/mingw-w64-crt/intrincs/ilockinc64.c b/mingw-w64-crt/intrincs/ilockinc64.c
index 02b011d..978bdf0 100644
--- a/mingw-w64-crt/intrincs/ilockinc64.c
+++ b/mingw-w64-crt/intrincs/ilockinc64.c
@@ -10,3 +10,5 @@
   return ret + 1LL;
 }
 
+__int64 InterlockedIncrement64(__int64 volatile *) __attribute__((alias("_InterlockedIncrement64")));
+
diff --git a/mingw-w64-crt/intrincs/ilockor.c b/mingw-w64-crt/intrincs/ilockor.c
index debdf2a..e421f27 100644
--- a/mingw-w64-crt/intrincs/ilockor.c
+++ b/mingw-w64-crt/intrincs/ilockor.c
@@ -7,3 +7,5 @@
   return *Destination;
 }
 
+long InterlockedOr(long volatile *, long) __attribute__((alias("_InterlockedOr")));
+
diff --git a/mingw-w64-crt/intrincs/ilockor64.c b/mingw-w64-crt/intrincs/ilockor64.c
index ebec02e..052e4fe 100644
--- a/mingw-w64-crt/intrincs/ilockor64.c
+++ b/mingw-w64-crt/intrincs/ilockor64.c
@@ -7,3 +7,5 @@
   return *Destination;
 }
 
+__int64 InterlockedOr64(__int64 volatile *, __int64) __attribute__((alias("_InterlockedOr64")));
+
diff --git a/mingw-w64-crt/intrincs/ilockxor.c b/mingw-w64-crt/intrincs/ilockxor.c
index 3b17db0..ef8a0a5 100644
--- a/mingw-w64-crt/intrincs/ilockxor.c
+++ b/mingw-w64-crt/intrincs/ilockxor.c
@@ -7,3 +7,5 @@
   return *Destination;
 }
 
+long InterlockedXor(long volatile *, long) __attribute__((alias("_InterlockedXor")));
+
diff --git a/mingw-w64-crt/intrincs/ilockxor64.c b/mingw-w64-crt/intrincs/ilockxor64.c
index 2976430..e1c432e 100644
--- a/mingw-w64-crt/intrincs/ilockxor64.c
+++ b/mingw-w64-crt/intrincs/ilockxor64.c
@@ -7,3 +7,5 @@
   return *Destination;
 }
 
+__int64 InterlockedXor64(__int64 volatile *, __int64) __attribute__((alias("_InterlockedXor64")));
+