Added mac-specific include path for malloc.h
Moved all files to a single to avoid duplicate symbol problem while linking in OS X