-#define get_irn_out_edge_first(irn) _get_irn_out_edge_first(irn)
-#define get_irn_out_edge_next(irn,last) _get_irn_out_edge_next(irn, last)
-#define get_block_succ_first(irn) _get_block_succ_first(irn)
-#define get_block_succ_next(irn,last) _get_block_succ_next(irn, last)
-#define get_edge_src_irn(edge) _get_edge_src_irn(edge)
-#define get_edge_src_pos(edge) _get_edge_src_pos(edge)
-#define get_edge_private_data(edge,ofs) _get_edge_private_data(edge,ofs)
-#define edges_activated(irg) _edges_activated(irg)
-#define edges_assure(irg) _edges_assure(irg)
-
-#endif /* _FIRM_EDGES_T_H */
+void edges_invalidate_all(ir_node *irn);
+
+/**
+ * Helper function to dump the edge set of a graph,
+ * unused in normal code.
+ */
+void edges_dump_kind(ir_graph *irg, ir_edge_kind_t kind);
+
+/**
+ * Notify normal and block edges.
+ */
+void edges_notify_edge(ir_node *src, int pos, ir_node *tgt,
+ ir_node *old_tgt, ir_graph *irg);
+
+#define get_irn_n_edges_kind(irn, kind) get_irn_n_edges_kind_(irn, kind)
+#define get_edge_src_irn(edge) get_edge_src_irn_(edge)
+#define get_edge_src_pos(edge) get_edge_src_pos_(edge)
+#define get_edge_private_data(edge, ofs) get_edge_private_data_(edge,ofs)
+#define get_irn_out_edge_next(irn, last) get_irn_out_edge_next_(irn, last)
+
+#ifndef get_irn_n_edges
+#define get_irn_n_edges(irn) get_irn_n_edges_kind_(irn, EDGE_KIND_NORMAL)
+#endif
+
+#ifndef get_irn_out_edge_first
+#define get_irn_out_edge_first(irn) get_irn_out_edge_first_kind_(irn, EDGE_KIND_NORMAL)
+#endif
+
+#ifndef get_block_succ_first
+#define get_block_succ_first(irn) get_irn_out_edge_first_kind_(irn, EDGE_KIND_BLOCK)
+#endif
+
+#ifndef get_block_succ_next
+#define get_block_succ_next(irn, last) get_irn_out_edge_next_(irn, last)
+#endif
+
+#endif