Remove use of i18n macros in headers. Prevents our gettext.h being included before...