Include the correct headers in the test
Fix 32 bit Mac build