Synching xid libary with scons helpers.