diff --git a/test/scenario/network/network_emulation.cc b/test/scenario/network/network_emulation.cc
index bcc015b5f5..4f706cfad3 100644
--- a/test/scenario/network/network_emulation.cc
+++ b/test/scenario/network/network_emulation.cc
@@ -27,9 +27,6 @@ EmulatedIpPacket::EmulatedIpPacket(const rtc::SocketAddress& from,
       to(to),
       data(data),
       arrival_time(arrival_time) {}
-EmulatedIpPacket::~EmulatedIpPacket() = default;
-EmulatedIpPacket::EmulatedIpPacket(EmulatedIpPacket&&) = default;
-EmulatedIpPacket& EmulatedIpPacket::operator=(EmulatedIpPacket&&) = default;
 
 void EmulatedNetworkNode::CreateRoute(
     rtc::IPAddress receiver_ip,
@@ -150,7 +147,7 @@ void EmulatedNetworkNode::RemoveReceiver(rtc::IPAddress dest_ip) {
 }
 
 EmulatedEndpoint::EmulatedEndpoint(uint64_t id,
-                                   rtc::IPAddress ip,
+                                   const rtc::IPAddress& ip,
                                    bool is_enabled,
                                    Clock* clock)
     : id_(id),
diff --git a/test/scenario/network/network_emulation.h b/test/scenario/network/network_emulation.h
index 836b56df42..674e39e10a 100644
--- a/test/scenario/network/network_emulation.h
+++ b/test/scenario/network/network_emulation.h
@@ -44,13 +44,13 @@ struct EmulatedIpPacket {
                    const rtc::SocketAddress& to,
                    rtc::CopyOnWriteBuffer data,
                    Timestamp arrival_time);
-  ~EmulatedIpPacket();
+  ~EmulatedIpPacket() = default;
   // This object is not copyable or assignable.
   EmulatedIpPacket(const EmulatedIpPacket&) = delete;
   EmulatedIpPacket& operator=(const EmulatedIpPacket&) = delete;
   // This object is only moveable.
-  EmulatedIpPacket(EmulatedIpPacket&&);
-  EmulatedIpPacket& operator=(EmulatedIpPacket&&);
+  EmulatedIpPacket(EmulatedIpPacket&&) = default;
+  EmulatedIpPacket& operator=(EmulatedIpPacket&&) = default;
 
   size_t size() const { return data.size(); }
   const uint8_t* cdata() const { return data.cdata(); }
@@ -126,7 +126,7 @@ class EmulatedNetworkNode : public EmulatedNetworkReceiverInterface {
 class EmulatedEndpoint : public EmulatedNetworkReceiverInterface {
  public:
   EmulatedEndpoint(uint64_t id,
-                   rtc::IPAddress ip,
+                   const rtc::IPAddress& ip,
                    bool is_enabled,
                    Clock* clock);
   ~EmulatedEndpoint() override;