Fix compiling with XL

Created by: masterleinad

These are the changes required to compile using XL and run the test suite. I am happy to drop the second commit that is related to the tests or do feature detection instead.