Port away from klocale, remove unused includes, reorganize includes.

Authored by somsubhrabairi.