Fix missing headers for OS X build