Reordered #includes
Added an empty destructor for unique_ptr