Index: lib/Xm/Xmos.c
--- lib/Xm/Xmos.c.orig	2002-01-30 16:47:25.000000000 +0100
+++ lib/Xm/Xmos.c	2003-10-24 19:20:16.000000000 +0200
@@ -230,7 +230,6 @@
  ****************/
 {
   int             dirSpecLen;
-  _Xgetpwparams	  pwd_buf;
   struct passwd * pwd_value;
 
   char *          userDir;
@@ -272,7 +271,7 @@
 	    } 
 	  *destPtr = '\0';
 	  
-	  pwd_value = _XGetpwnam(nameBuf, pwd_buf);
+	  pwd_value = getpwnam(nameBuf);
 	  if (pwd_value != NULL)
 	    {   
 	      userDirLen = strlen(pwd_value->pw_dir);
@@ -1017,7 +1016,6 @@
 XmeGetHomeDirName(void)
 {
   uid_t uid;
-  _Xgetpwparams	pwd_buf;
   struct passwd * pwd_value;
 
   char *ptr = NULL;
@@ -1030,11 +1028,11 @@
       if ((ptr = (char *)getenv("HOME")) == NULL) 
 	{
 	  if ((ptr = (char *)getenv(USER_VAR)) != NULL)
-	    pwd_value = _XGetpwnam(ptr, pwd_buf);
+	    pwd_value = getpwnam(ptr);
 	  else 
 	    {
 	      uid = getuid();
-	      pwd_value = _XGetpwuid(uid, pwd_buf);
+	      pwd_value = getpwuid(uid);
             }
 
 	  if (pwd_value != NULL)
Index: tools/wml/Makefile.in
--- tools/wml/Makefile.in.orig	2002-02-14 15:15:49.000000000 +0100
+++ tools/wml/Makefile.in	2003-10-24 19:16:26.000000000 +0200
@@ -121,7 +121,7 @@
 
 wmldbcreate_LDADD = ../../lib/Xm/libXm.la
 
-INCLUDES = ${X_CFLAGS} -I$(srcdir)/../../lib -I$(srcdir)/../../include
+INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../include $(X_CFLAGS)
 
 noinst_LIBRARIES = libwml.a
 libwml_a_SOURCES = wmlparse.y wml.c wmloutkey.c wmlouth.c wmloutmm.c wmloutp1.c wmlresolve.c wmlsynbld.c wmlutils.c
Index: clients/uil/UilDB.c
--- clients/uil/UilDB.c.orig	2002-01-10 21:55:42.000000000 +0100
+++ clients/uil/UilDB.c	2003-10-24 19:19:36.000000000 +0200
@@ -894,7 +894,6 @@
 String get_root_dir_name()
 {
 	int uid;
-	_Xgetpwparams pwd_buf;
 	struct passwd *pwd_value;
 	static char *ptr = NULL;
 	char *outptr;
@@ -905,12 +904,12 @@
 	    {
 	    if((ptr = (char *)getenv(USER_VAR)) != NULL) 
 		{
-		pwd_value = _XGetpwnam(ptr, pwd_buf);
+		pwd_value = getpwnam(ptr);
 		}
 	    else 
 		{
 		uid = getuid();
-		pwd_value = _XGetpwuid(uid, pwd_buf);
+		pwd_value = getpwuid(uid);
 		}
 	    if (pwd_value != NULL)
 		{