clean up includes
decrease even more the use of ICU's C++ API