ELF: add header files, begin merging common code, drop .comment