Remove _HEAP and replace by GetHeap()

- removed `heap` from Universe

Signed-off-by: Stefan Marr <git@stefan-marr.de>
Avoid redefinition of DEBUG macro

Signed-off-by: Stefan Marr <git@stefan-marr.de>
Whitespace

Signed-off-by: Stefan Marr <git@stefan-marr.de>