diff --git a/reactos/lib/ntdll/stdlib/atoi64.c b/reactos/lib/ntdll/stdlib/atoi64.c
index 82cae0032cb..43c36d53e98 100644
--- a/reactos/lib/ntdll/stdlib/atoi64.c
+++ b/reactos/lib/ntdll/stdlib/atoi64.c
@@ -1,4 +1,4 @@
-/* $Id: atoi64.c,v 1.2 2000/01/06 00:26:15 dwelch Exp $
+/* $Id: atoi64.c,v 1.3 2002/07/18 18:12:59 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -9,8 +9,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-typedef long long __int64;
-
 __int64
 _atoi64 (const char *nptr)
 {
diff --git a/reactos/lib/ntdll/stdlib/itoa.c b/reactos/lib/ntdll/stdlib/itoa.c
index 1f1e2d2cd3d..c4185e9ea5b 100644
--- a/reactos/lib/ntdll/stdlib/itoa.c
+++ b/reactos/lib/ntdll/stdlib/itoa.c
@@ -11,16 +11,13 @@
 /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
 #include <stdlib.h>
 
-typedef long long __int64;
-typedef unsigned long long __uint64;
-
 char *
 _i64toa(__int64 value, char *string, int radix)
 {
   char tmp[65];
   char *tp = tmp;
   __int64 i;
-  __uint64 v;
+  unsigned __int64 v;
   __int64 sign;
   char *sp;
 
@@ -33,7 +30,7 @@ _i64toa(__int64 value, char *string, int radix)
   if (sign)
     v = -value;
   else
-    v = (__uint64)value;
+    v = (unsigned __int64)value;
   while (v || tp == tmp)
   {
     i = v % radix;
diff --git a/reactos/lib/ntdll/stdlib/itow.c b/reactos/lib/ntdll/stdlib/itow.c
index 0081e220e7c..47537b6dde2 100644
--- a/reactos/lib/ntdll/stdlib/itow.c
+++ b/reactos/lib/ntdll/stdlib/itow.c
@@ -11,16 +11,13 @@
 /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
 #include <stdlib.h>
 
-typedef long long __int64;
-typedef unsigned long long __uint64;
-
 wchar_t *
 _i64tow(__int64 value, wchar_t *string, int radix)
 {
   wchar_t tmp[65];
   wchar_t *tp = tmp;
   __int64 i;
-  __uint64 v;
+  unsigned __int64 v;
   __int64 sign;
   wchar_t *sp;
 
@@ -33,7 +30,7 @@ _i64tow(__int64 value, wchar_t *string, int radix)
   if (sign)
     v = -value;
   else
-    v = (__uint64)value;
+    v = (unsigned __int64)value;
   while (v || tp == tmp)
   {
     i = v % radix;
diff --git a/reactos/lib/ntdll/stdlib/mbstowcs.c b/reactos/lib/ntdll/stdlib/mbstowcs.c
index 316da06032f..f35ccb37845 100644
--- a/reactos/lib/ntdll/stdlib/mbstowcs.c
+++ b/reactos/lib/ntdll/stdlib/mbstowcs.c
@@ -1,4 +1,4 @@
-/* $Id: mbstowcs.c,v 1.1 1999/12/30 14:38:54 ekohl Exp $
+/* $Id: mbstowcs.c,v 1.2 2002/07/18 18:12:59 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -38,4 +38,4 @@ size_t mbstowcs (wchar_t *wcstr, const char *mbstr, size_t count)
 	return (size_t)Size;
 }
 
-/* EOF */
\ No newline at end of file
+/* EOF */
diff --git a/reactos/lib/ntdll/stdlib/wcstombs.c b/reactos/lib/ntdll/stdlib/wcstombs.c
index 770a71d1e9a..00cb250a862 100644
--- a/reactos/lib/ntdll/stdlib/wcstombs.c
+++ b/reactos/lib/ntdll/stdlib/wcstombs.c
@@ -1,4 +1,4 @@
-/* $Id: wcstombs.c,v 1.1 1999/12/30 14:38:54 ekohl Exp $
+/* $Id: wcstombs.c,v 1.2 2002/07/18 18:12:59 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -38,4 +38,4 @@ size_t wcstombs (char *mbstr, const wchar_t *wcstr, size_t count)
 	return (size_t)Size;
 }
 
-/* EOF */
\ No newline at end of file
+/* EOF */
diff --git a/reactos/lib/ntdll/stdlib/wtoi64.c b/reactos/lib/ntdll/stdlib/wtoi64.c
index e1754826e85..ecca8dec27f 100644
--- a/reactos/lib/ntdll/stdlib/wtoi64.c
+++ b/reactos/lib/ntdll/stdlib/wtoi64.c
@@ -1,4 +1,4 @@
-/* $Id: wtoi64.c,v 1.2 2000/01/06 00:26:15 dwelch Exp $
+/* $Id: wtoi64.c,v 1.3 2002/07/18 18:12:59 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -9,9 +9,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-typedef long long __int64;
-typedef unsigned long long __uint64;
-
 __int64
 _wtoi64 (const wchar_t *nptr)
 {