[REFACTOR] Moved elf.h into include
[REFACTOR] Deleted a patch that didn't apply cleanly.