diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index deb58677e..8fe1cf61b 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-28  Christopher Faylor  <cgf@redhat.com>
+
+	* cygcheck.cc: Fix typo.  Remove uid_t kludge.  Rely on kludge in
+	sys/cygwin.h instead.
+	* getfacl.c: Add include to remove warning.
+	* mkgroup.c (main): Assign variables outside of parameter passing.
+	This seems to eliminate some compiler warnings.
+
 2002-01-28  Christopher Faylor  <cgf@redhat.com>
 
 	* cygcheck.cc: Use specific cygwin includes, as required.
diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc
index 64b9ff152..4c3a93499 100644
--- a/winsup/utils/cygcheck.cc
+++ b/winsup/utils/cygcheck.cc
@@ -8,17 +8,15 @@
    Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
    details. */
 
-typedef unsigned short uid_t;
-typedef unsigned short gid_t;
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <windows.h>
-#include "cygwin/include/sys/cygwin.h>
+#include "cygwin/include/sys/cygwin.h"
 #include "cygwin/include/mntent.h"
-#include "cygwin/include/time.h"
 #include "cygwin/include/getopt.h"
-#include "cygwin/include/ctype.h"
+#include "time.h"
+#include "ctype.h"
 
 int verbose = 0;
 int registry = 0;
diff --git a/winsup/utils/getfacl.c b/winsup/utils/getfacl.c
index 356d53971..b6eb94020 100644
--- a/winsup/utils/getfacl.c
+++ b/winsup/utils/getfacl.c
@@ -18,6 +18,7 @@ details. */
 #include <sys/types.h>
 #include <sys/acl.h>
 #include <sys/stat.h>
+#include <string.h>
 
 char *
 permstr (mode_t perm)
diff --git a/winsup/utils/mkgroup.c b/winsup/utils/mkgroup.c
index 5dfef1c6f..9644b1842 100644
--- a/winsup/utils/mkgroup.c
+++ b/winsup/utils/mkgroup.c
@@ -528,11 +528,14 @@ main (int argc, char **argv)
       /*
        * Get `None' group
       */
-      GetComputerName (name, (len = 256, &len));
+      len = 256;
+      GetComputerName (name, &len);
       csid = (PSID) malloc (1024);
+      len = 1024;
+      len2 = 256;
       LookupAccountName (NULL, name,
-			 csid, (len = 1024, &len),
-			 dom, (len2 = 256, &len),
+			 csid, &len,
+			 dom, &len,
 			 &use);
       print_special (print_sids, GetSidIdentifierAuthority (csid), 5,
 				 *GetSidSubAuthority (csid, 0),