* Reorg header stuff to make it more compatible with leak checkers