This is more correct.
Cleanup in common header.
Interop.