[#8] Removed more unused header files.