Add missing includes for OSX

Review 1271 by @srh