Merge "Don't include malloc.h on MacOS"