diff --git a/include/mscclpp/core.hpp b/include/mscclpp/core.hpp
index 3e8e84aa8..f55ac3dd8 100644
--- a/include/mscclpp/core.hpp
+++ b/include/mscclpp/core.hpp
@@ -115,7 +115,7 @@ class TcpBootstrap : public Bootstrap {
 
  private:
   // The interal implementation.
-  struct Impl;
+  class Impl;
 
   // Pointer to the internal implementation.
   std::unique_ptr<Impl> pimpl_;
@@ -401,6 +401,8 @@ class Endpoint {
 /// Represents a connection between two processes.
 class Connection {
  public:
+  virtual ~Connection() = default;
+
   /// Write data from a source @ref RegisteredMemory to a destination @ref RegisteredMemory.
   ///
   /// @param dst The destination @ref RegisteredMemory.
@@ -525,6 +527,8 @@ class Context {
 
 /// A base class for objects that can be set up during @ref Communicator::setup().
 struct Setuppable {
+  virtual ~Setuppable() = default;
+
   /// Called inside @ref Communicator::setup() before any call to @ref endSetup() of any @ref Setuppable object that is
   /// being set up within the same @ref Communicator::setup() call.
   ///