Removed unused header files in encoder core