diff --git a/edit.c b/edit.c
index 6739471..78a681c 100644
--- a/edit.c
+++ b/edit.c
@@ -1,4 +1,4 @@
-/**	$MirOS: src/bin/mksh/edit.c,v 1.10 2005/07/12 13:23:59 tg Exp $ */
+/**	$MirOS: src/bin/mksh/edit.c,v 1.11 2005/07/12 13:30:37 tg Exp $ */
 /*	$OpenBSD: edit.c,v 1.29 2005/04/13 02:33:08 deraadt Exp $	*/
 /*	$OpenBSD: edit.h,v 1.8 2005/03/28 21:28:22 deraadt Exp $	*/
 /*	$OpenBSD: emacs.c,v 1.37 2005/03/30 17:16:37 deraadt Exp $	*/
@@ -10,7 +10,7 @@
 #include <ctype.h>
 #include <libgen.h>
 
-__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.10 2005/07/12 13:23:59 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.11 2005/07/12 13:30:37 tg Exp $");
 
 #define	BEL		0x07
 
@@ -334,7 +334,7 @@ x_print_expansions(int nwords, char * const *words, int is_command)
 {
 	int use_copy = 0;
 	int prefix_len;
-	XPtrV l = {};
+	XPtrV l = { NULL, NULL, NULL };
 
 	/* Check if all matches are in the same directory (in this
 	 * case, we want to omit the directory name)
diff --git a/eval.c b/eval.c
index ddd4d31..c062987 100644
--- a/eval.c
+++ b/eval.c
@@ -1,4 +1,4 @@
-/**	$MirOS: src/bin/mksh/eval.c,v 1.6 2005/07/12 13:24:00 tg Exp $ */
+/**	$MirOS: src/bin/mksh/eval.c,v 1.7 2005/07/12 13:30:38 tg Exp $ */
 /*	$OpenBSD: eval.c,v 1.27 2005/03/30 17:16:37 deraadt Exp $	*/
 
 #include "sh.h"
@@ -6,7 +6,7 @@
 #include <dirent.h>
 #include <pwd.h>
 
-__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.6 2005/07/12 13:24:00 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.7 2005/07/12 13:30:38 tg Exp $");
 
 /*
  * string expansion
@@ -149,7 +149,9 @@ expand(char *cp,	/* input word */
 	char *dp, *sp;		/* dest., source */
 	int fdo, word;		/* second pass flags; have word */
 	int doblank;		/* field splitting of parameter/command subst */
-	Expand x = {};		/* expansion variables */
+	Expand x = {		/* expansion variables */
+		NULL, { NULL }, NULL, 0
+	};
 	SubType st_head, *st;
 	int newlines = 0; /* For trailing newlines in COMSUB */
 	int saw_eq, tilde_ok;