Re: Remove heap.h