do wrc more portable
restructure header files
remove %n format specifier