[el2p][pengrebinson] Use the correct headers

Merged Thomas Fetzer requested to merge cleanup/fixdeprecatedwarning into master

Merge request reports