Removed HeaderIR dependency, inserted IHeaderIR dep