Fixed includes - added fixed one, be more platform independent
- Fix strtol*() with xlocale (on e.g. x86_64) (closes #2544)