Revert "Don't use the combined implementation for Linux"

This reverts commit 0bd75b619ab6440307e88e2747e94f168f18f0b6.
Add the ICU headers to system headers