-extern struct df *df_init (int);
-extern struct dataflow *df_add_problem (struct df *, struct df_problem *, int);
-extern int df_set_flags (struct dataflow *, int);
-extern int df_clear_flags (struct dataflow *, int);
-extern void df_set_blocks (struct df*, bitmap);
-extern void df_delete_basic_block (struct df *, int);
-extern void df_finish1 (struct df *);
-extern void df_analyze_problem (struct dataflow *, bitmap, bitmap, bitmap, int *, int, bool);
-extern void df_analyze (struct df *);
-extern void df_compact_blocks (struct df *);
-extern void df_bb_replace (struct df *, int, basic_block);
-extern struct df_ref *df_bb_regno_last_use_find (struct df *, basic_block, unsigned int);
-extern struct df_ref *df_bb_regno_first_def_find (struct df *, basic_block, unsigned int);
-extern struct df_ref *df_bb_regno_last_def_find (struct df *, basic_block, unsigned int);
-extern bool df_insn_regno_def_p (struct df *, rtx, unsigned int);
-extern struct df_ref *df_find_def (struct df *, rtx, rtx);
-extern bool df_reg_defined (struct df *, rtx, rtx);
-extern struct df_ref *df_find_use (struct df *, rtx, rtx);
-extern bool df_reg_used (struct df *, rtx, rtx);
-extern void df_iterative_dataflow (struct dataflow *, bitmap, bitmap, int *, int, bool);
-extern void df_dump (struct df *, FILE *);
-extern void df_refs_chain_dump (struct df_ref *, bool, FILE *);
-extern void df_regs_chain_dump (struct df *, struct df_ref *, FILE *);
-extern void df_insn_debug (struct df *, rtx, bool, FILE *);
-extern void df_insn_debug_regno (struct df *, rtx, FILE *);
-extern void df_regno_debug (struct df *, unsigned int, FILE *);
+extern void df_add_problem (struct df_problem *);
+extern enum df_changeable_flags df_set_flags (enum df_changeable_flags);
+extern enum df_changeable_flags df_clear_flags (enum df_changeable_flags);
+extern void df_set_blocks (bitmap);
+extern void df_remove_problem (struct dataflow *);
+extern void df_finish_pass (void);
+extern void df_analyze_problem (struct dataflow *, bitmap, int *, int);
+extern void df_analyze (void);
+extern int df_get_n_blocks (enum df_flow_dir);
+extern int *df_get_postorder (enum df_flow_dir);
+extern void df_simple_dataflow (enum df_flow_dir, df_init_function,
+ df_confluence_function_0, df_confluence_function_n,
+ df_transfer_function, bitmap, int *, int);
+extern void df_mark_solutions_dirty (void);
+extern bool df_get_bb_dirty (basic_block);
+extern void df_set_bb_dirty (basic_block);
+extern void df_compact_blocks (void);
+extern void df_bb_replace (int, basic_block);
+extern void df_bb_delete (int);
+extern void df_verify (void);
+#ifdef DF_DEBUG_CFG
+extern void df_check_cfg_clean (void);
+#endif
+extern struct df_ref *df_bb_regno_first_def_find (basic_block, unsigned int);
+extern struct df_ref *df_bb_regno_last_def_find (basic_block, unsigned int);
+extern struct df_ref *df_find_def (rtx, rtx);
+extern bool df_reg_defined (rtx, rtx);
+extern struct df_ref *df_find_use (rtx, rtx);
+extern bool df_reg_used (rtx, rtx);
+extern void df_worklist_dataflow (struct dataflow *,bitmap, int *, int);
+extern void df_print_regset (FILE *file, bitmap r);
+extern void df_dump (FILE *);
+extern void df_dump_start (FILE *);
+extern void df_dump_top (basic_block, FILE *);
+extern void df_dump_bottom (basic_block, FILE *);
+extern void df_refs_chain_dump (struct df_ref **, bool, FILE *);
+extern void df_regs_chain_dump (struct df_ref *, FILE *);
+extern void df_insn_debug (rtx, bool, FILE *);
+extern void df_insn_debug_regno (rtx, FILE *);
+extern void df_regno_debug (unsigned int, FILE *);