#include <guestfs.h>
+#ifdef HAVE_GETTEXT
+#include "gettext.h"
+#define _(str) dgettext(PACKAGE, (str))
+#define N_(str) dgettext(PACKAGE, (str))
+#else
+#define _(str) str
+#define N_(str) str
+#endif
+
/* in fish.c */
extern guestfs_h *g;
-extern int g_launched;
extern int quit;
extern int verbose;
extern void pod2text (const char *heading, const char *body);
extern char **do_completion (const char *text, int start, int end);
/* in alloc.c */
-extern int do_alloc (int argc, char *argv[]);
+extern int do_alloc (const char *cmd, int argc, char *argv[]);
+
+/* in echo.c */
+extern int do_echo (const char *cmd, int argc, char *argv[]);
+
+/* in edit.c */
+extern int do_edit (const char *cmd, int argc, char *argv[]);
#endif /* FISH_H */