c++ changes
diff --git a/include/mach.h b/include/mach.h
index bba8b01..e664fe7 100644
--- a/include/mach.h
+++ b/include/mach.h
@@ -270,9 +270,9 @@
 	/* private */
 	Symbol	*sym;		/* cached list of symbols */
 	Symbol	**byname;
+	Symbol	**byxname;
 	uint		nsym;
 	Symbol	*esym;		/* elf symbols */
-	Symbol	**ebyname;
 	uint		nesym;
 	ulong	base;		/* base address for relocatables */
 	Fhdr		*next;		/* link to next fhdr (internal) */
@@ -462,6 +462,8 @@
 struct Symbol
 {
 	char		*name;		/* name of symbol */
+	char		*xname;		/* demangled name */
+
 	/* Symtype	*typedesc;	/* type info, if any */
 	Loc		loc;			/* location of symbol */
 	Loc		hiloc;		/* location of end of symbol */
@@ -485,6 +487,8 @@
 			uint framesize;
 		} stabs;
 	} u;
+	
+	void *aux;	/* for use by client */
 };
 
 /* look through all currently cracked Fhdrs calling their fns */