Removed the outdated, duplicate header files.