This class compiles now. Although even after merging, I still see StructureFieldOrderTest failing to build, now I'm sitting on Mac OS, not on Windows. Well, at least no compilation errors show Kernel32UtilTest anymore, so things are probably OK.