-#else
-/* new edges are disabled */
-
-#define init_edges()
-#define edges_reroute(old, nw, irg)
-#define edges_init_graph(irg);
-#define edges_notify_edge(src, pos, tgt, old_tgt, irg)
-#define edges_node_deleted(old, irg)
-#define edges_invalidate(irn, irg)
-#define get_irn_out_edge_first(irn) NULL
-#define get_irn_out_edge_next(irn,last) NULL
-#define get_edge_src_irn(edge) NULL
-#define get_edge_src_pos(edge) -1
-#define edges_activated(irg) 0
-#define edges_assure(irg)
-
-#endif /* FIRM_EDGES_INPLACE */
-
-#endif /* _FIRM_EDGES_T_H */
+void edges_invalidate_all(ir_node *irn, 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