OwnPtr can be unique_ptr
Remove unnecessary includes
Fix up move semantics on unique_ptr