Put bmalloc headers in the right place