diff --git a/ChangeLog b/ChangeLog
index f07d70177f..2b901c02e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1998-06-18 19:49  Ulrich Drepper  <drepper@cygnus.com>
+
+	* intl/dcgettext.c: use complete type name.
+	* intl/hash-string.h: Likewise.
+
+	* intl/localealias.c: Undo patch from 1998-04-29.
+	* intl/l10nflist.c: Likewise.
+	* intl/loadinfo.h: Likewise.
+
 1998-06-18  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/i386/elf/start.S (_start): Ensure correct alignment.
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index 2a2b895cc9..9f76abf89a 100644
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -298,7 +298,7 @@ DCGETTEXT (domainname, msgid, category)
       size_t path_max;
       char *ret;
 
-      path_max = (unsigned) PATH_MAX;
+      path_max = (unsigned int) PATH_MAX;
       path_max += 2;		/* The getcwd docs say to do this.  */
 
       dirname = (char *) alloca (path_max + dirname_len);
diff --git a/intl/hash-string.h b/intl/hash-string.h
index 68af3ec6f2..32ca018bda 100644
--- a/intl/hash-string.h
+++ b/intl/hash-string.h
@@ -36,9 +36,9 @@
 /* Defines the so called `hashpjw' function by P.J. Weinberger
    [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
    1986, 1987 Bell Telephone Laboratories, Inc.]  */
-static unsigned long hash_string PARAMS ((const char *__str_param));
+static unsigned long int hash_string PARAMS ((const char *__str_param));
 
-static inline unsigned long
+static inline unsigned long int
 hash_string (str_param)
      const char *str_param;
 {
@@ -50,8 +50,8 @@ hash_string (str_param)
   while (*str != '\0')
     {
       hval <<= 4;
-      hval += (unsigned long) *str++;
-      g = hval & ((unsigned long) 0xf << (HASHWORDBITS - 4));
+      hval += (unsigned long int) *str++;
+      g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
       if (g != 0)
 	{
 	  hval ^= g >> (HASHWORDBITS - 8);
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index bd12a0a955..b205b96c43 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -355,7 +355,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
    names.  */
 const char *
 _nl_normalize_codeset (codeset, name_len)
-     const unsigned char *codeset;
+     const char *codeset;
      size_t name_len;
 {
   int len = 0;
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
index b82dc90d67..35d98f0d9b 100644
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -51,7 +51,7 @@ struct loaded_l10nfile
 };
 
 
-extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset,
+extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
 						  size_t name_len));
 
 extern struct loaded_l10nfile *
diff --git a/intl/localealias.c b/intl/localealias.c
index 7f668ec360..45c16c6e53 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -256,10 +256,10 @@ read_alias_file (fname, fname_len)
 	 b) these fields must be usable as file names and so must not
 	    be that long
        */
-      unsigned char buf[BUFSIZ];
-      unsigned char *alias;
-      unsigned char *value;
-      unsigned char *cp;
+      char buf[BUFSIZ];
+      char *alias;
+      char *value;
+      char *cp;
 
       if (fgets (buf, sizeof buf, fp) == NULL)
 	/* EOF reached.  */