Removed unused headers in encoder core