-void target_disas(FILE *out, target_ulong code, unsigned long size, int flags);
-void monitor_disas(target_ulong pc, int nb_insn, int is_physical, int flags);
+void target_disas(FILE *out, target_ulong code, target_ulong size, int flags);
+
+/* The usual mess... FIXME: Remove this condition once dyngen-exec.h is gone */
+#ifndef __DYNGEN_EXEC_H__
+void monitor_disas(Monitor *mon, CPUState *env,
+ target_ulong pc, int nb_insn, int is_physical, int flags);
+#endif