Include directives lost in the merge