Restore .h/.cpp implementation in addition to .hpp