Fix include ordering
Fix potential memory leak