Resolving one more include issue
Merge branch 'elemental' into rma-interface