Merged hachoir build changes with SBo