Remove unused header files, too