diff --git a/fairmq/Channel.h b/fairmq/Channel.h
index 2b55f70e..446ab376 100644
--- a/fairmq/Channel.h
+++ b/fairmq/Channel.h
@@ -9,7 +9,6 @@
 #ifndef FAIR_MQ_CHANNEL_H
 #define FAIR_MQ_CHANNEL_H
 
-#include <cstdint>   // int64_t
 #include <fairmq/Message.h>
 #include <fairmq/Parts.h>
 #include <fairmq/Properties.h>
@@ -17,8 +16,9 @@
 #include <fairmq/TransportFactory.h>
 #include <fairmq/Transports.h>
 #include <fairmq/UnmanagedRegion.h>
+
+#include <cstdint>   // int64_t
 #include <memory>   // unique_ptr, shared_ptr
-#include <mutex>
 #include <stdexcept>
 #include <string>
 #include <utility>   // std::move
@@ -73,16 +73,16 @@ class Channel
     Channel(const Channel&, std::string name);
 
     /// Move constructor
-    // Channel(Channel&&) = delete;
+    Channel(Channel&&) = default;
 
     /// Assignment operator
     Channel& operator=(const Channel&);
 
     /// Move assignment operator
-    // Channel& operator=(Channel&&) = delete;
+    Channel& operator=(Channel&&) = default;
 
     /// Destructor
-    virtual ~Channel() = default;
+    ~Channel() = default;
     // { LOG(warn) << "Destroying channel '" << fName << "'"; }
 
     struct ChannelConfigurationError : std::runtime_error { using std::runtime_error::runtime_error; };
diff --git a/fairmq/Device.cxx b/fairmq/Device.cxx
index 80bf3ff0..19c8cb17 100644
--- a/fairmq/Device.cxx
+++ b/fairmq/Device.cxx
@@ -47,6 +47,11 @@ struct StateSubscription
         });
     }
 
+    StateSubscription(const StateSubscription&) = delete;
+    StateSubscription(StateSubscription&&) = delete;
+    StateSubscription& operator=(const StateSubscription&) = delete;
+    StateSubscription& operator=(StateSubscription&&) = delete;
+
     ~StateSubscription() {
         fStateMachine.UnsubscribeFromStateChange(fId);
     }
diff --git a/fairmq/Device.h b/fairmq/Device.h
index a29aa181..b71f24bb 100644
--- a/fairmq/Device.h
+++ b/fairmq/Device.h
@@ -61,7 +61,9 @@ class Device
 
   public:
     Device(const Device&) = delete;
-    Device operator=(const Device&) = delete;
+    Device(Device&&) = delete;
+    Device& operator=(const Device&) = delete;
+    Device& operator=(Device&&) = delete;
     virtual ~Device();
 
     /// Outputs the socket transfer rates
diff --git a/fairmq/Message.h b/fairmq/Message.h
index 0d2d81fa..430e1f6b 100644
--- a/fairmq/Message.h
+++ b/fairmq/Message.h
@@ -32,6 +32,11 @@ struct Message
         : fTransport(factory)
     {}
 
+    Message(const Message&) = delete;
+    Message(Message&&) = delete;
+    Message& operator=(const Message&) = delete;
+    Message& operator=(Message&&) = delete;
+
     virtual void Rebuild() = 0;
     virtual void Rebuild(Alignment alignment) = 0;
     virtual void Rebuild(size_t size) = 0;
diff --git a/fairmq/Parts.h b/fairmq/Parts.h
index e2e03d0f..9ff545ee 100644
--- a/fairmq/Parts.h
+++ b/fairmq/Parts.h
@@ -25,13 +25,11 @@ class Parts
   public:
     Parts() = default;
     Parts(const Parts&) = delete;
-    Parts(Parts&& p) = default;
-    Parts& operator=(const Parts&) = delete;
+    Parts(Parts&&) = default;
     template<typename... Ts>
-    Parts(Ts&&... messages)
-    {
-        AddPart(std::forward<Ts>(messages)...);
-    }
+    Parts(Ts&&... messages) { AddPart(std::forward<Ts>(messages)...); }
+    Parts& operator=(const Parts&) = delete;
+    Parts& operator=(Parts&&) = default;
     ~Parts() = default;
 
     /// Adds part (Message) to the container
diff --git a/fairmq/Plugin.h b/fairmq/Plugin.h
index b9c9f7f2..d969a32b 100644
--- a/fairmq/Plugin.h
+++ b/fairmq/Plugin.h
@@ -48,7 +48,9 @@ class Plugin
            PluginServices* pluginServices);
 
     Plugin(const Plugin&) = delete;
-    Plugin operator=(const Plugin&) = delete;
+    Plugin(Plugin&&) = delete;
+    Plugin& operator=(const Plugin&) = delete;
+    Plugin& operator=(Plugin&&) = delete;
 
     virtual ~Plugin();
 
diff --git a/fairmq/PluginManager.h b/fairmq/PluginManager.h
index 6c17f84e..40b9bf52 100644
--- a/fairmq/PluginManager.h
+++ b/fairmq/PluginManager.h
@@ -49,6 +49,10 @@ class PluginManager
     using PluginFactory = std::unique_ptr<fair::mq::Plugin>(PluginServices&);
 
     PluginManager();
+    PluginManager(const PluginManager&) = delete;
+    PluginManager(PluginManager&&) = delete;
+    PluginManager& operator=(const PluginManager&) = delete;
+    PluginManager& operator=(PluginManager&&) = delete;
     PluginManager(const std::vector<std::string>& args);
 
     ~PluginManager()
diff --git a/fairmq/PluginServices.h b/fairmq/PluginServices.h
index 6f62b748..b82c9ed3 100644
--- a/fairmq/PluginServices.h
+++ b/fairmq/PluginServices.h
@@ -51,7 +51,9 @@ class PluginServices
     }
 
     PluginServices(const PluginServices&) = delete;
-    PluginServices operator=(const PluginServices&) = delete;
+    PluginServices(PluginServices&&) = delete;
+    PluginServices& operator=(const PluginServices&) = delete;
+    PluginServices& operator=(PluginServices&&) = delete;
 
     using DeviceState = fair::mq::State;
     using DeviceStateTransition = fair::mq::Transition;
diff --git a/fairmq/Poller.h b/fairmq/Poller.h
index 335e7f1b..678d19d8 100644
--- a/fairmq/Poller.h
+++ b/fairmq/Poller.h
@@ -17,6 +17,12 @@ namespace fair::mq {
 
 struct Poller
 {
+    Poller() = default;
+    Poller(const Poller&) = delete;
+    Poller(Poller&&) = delete;
+    Poller& operator=(const Poller&) = delete;
+    Poller& operator=(Poller&&) = delete;
+
     virtual void Poll(int timeout) = 0;
     virtual bool CheckInput(int index) = 0;
     virtual bool CheckOutput(int index) = 0;
diff --git a/fairmq/ProgOptions.h b/fairmq/ProgOptions.h
index bec9042c..6d367fef 100644
--- a/fairmq/ProgOptions.h
+++ b/fairmq/ProgOptions.h
@@ -33,7 +33,11 @@ class ProgOptions
 {
   public:
     ProgOptions();
-    virtual ~ProgOptions() = default;
+    ProgOptions(const ProgOptions&) = delete;
+    ProgOptions(ProgOptions&&) = delete;
+    ProgOptions& operator=(const ProgOptions&) = delete;
+    ProgOptions& operator=(ProgOptions&&) = delete;
+    ~ProgOptions() = default;
 
     void ParseAll(const std::vector<std::string>& cmdArgs, bool allowUnregistered);
     void ParseAll(int argc, char const* const* argv, bool allowUnregistered = true);
diff --git a/fairmq/Socket.h b/fairmq/Socket.h
index 085c01e8..7b0574dd 100644
--- a/fairmq/Socket.h
+++ b/fairmq/Socket.h
@@ -30,9 +30,11 @@ enum class TransferCode : int
 struct Socket
 {
     Socket() = default;
-    Socket(TransportFactory* fac)
-        : fTransport(fac)
-    {}
+    Socket(TransportFactory* fac) : fTransport(fac) {}
+    Socket(const Socket&) = delete;
+    Socket(Socket&&) = delete;
+    Socket& operator=(const Socket&) = delete;
+    Socket& operator=(Socket&&) = delete;
 
     virtual std::string GetId() const = 0;
 
diff --git a/fairmq/StateMachine.cxx b/fairmq/StateMachine.cxx
index 81c1d339..e1de3854 100644
--- a/fairmq/StateMachine.cxx
+++ b/fairmq/StateMachine.cxx
@@ -84,8 +84,6 @@ struct Machine_ : public state_machine_def<Machine_>
         , fNewStatePending(false)
     {}
 
-    virtual ~Machine_() = default;
-
     // initial states
     using initial_state = bmpl::vector<IDLE_S, OK_S>;
 
diff --git a/fairmq/StateMachine.h b/fairmq/StateMachine.h
index 6eac3a5a..d95e2636 100644
--- a/fairmq/StateMachine.h
+++ b/fairmq/StateMachine.h
@@ -23,7 +23,11 @@ class StateMachine
 {
   public:
     StateMachine();
-    virtual ~StateMachine();
+    StateMachine(const StateMachine&) = delete;
+    StateMachine(StateMachine&&) = delete;
+    StateMachine& operator=(const StateMachine&) = delete;
+    StateMachine& operator=(StateMachine&&) = delete;
+    ~StateMachine();
 
     bool ChangeState(Transition transition);
     bool ChangeState(const std::string& transition) { return ChangeState(GetTransition(transition)); }
diff --git a/fairmq/StateQueue.h b/fairmq/StateQueue.h
index 8bb4ab32..58ce146d 100644
--- a/fairmq/StateQueue.h
+++ b/fairmq/StateQueue.h
@@ -24,6 +24,10 @@ class StateQueue
 {
   public:
     StateQueue() = default;
+    StateQueue(const StateQueue&) = delete;
+    StateQueue(StateQueue&&) = delete;
+    StateQueue& operator=(const StateQueue&) = delete;
+    StateQueue& operator=(StateQueue&&) = delete;
     ~StateQueue() = default;
 
     fair::mq::State WaitForNext()
diff --git a/fairmq/TransportFactory.h b/fairmq/TransportFactory.h
index f8c3d02a..b63576ba 100644
--- a/fairmq/TransportFactory.h
+++ b/fairmq/TransportFactory.h
@@ -43,6 +43,11 @@ class TransportFactory
         : fkId(std::move(id))
     {}
 
+    TransportFactory(const TransportFactory&) = delete;
+    TransportFactory(TransportFactory&&) = delete;
+    TransportFactory& operator=(const TransportFactory&) = delete;
+    TransportFactory& operator=(TransportFactory&&) = delete;
+
     auto GetId() const -> const std::string { return fkId; };
 
     /// Get a pointer to the associated polymorphic memory resource
diff --git a/fairmq/UnmanagedRegion.h b/fairmq/UnmanagedRegion.h
index 6636000e..11a7595b 100644
--- a/fairmq/UnmanagedRegion.h
+++ b/fairmq/UnmanagedRegion.h
@@ -78,6 +78,11 @@ struct UnmanagedRegion
         : fTransport(factory)
     {}
 
+    UnmanagedRegion(const UnmanagedRegion&) = delete;
+    UnmanagedRegion(UnmanagedRegion&&) = delete;
+    UnmanagedRegion& operator=(const UnmanagedRegion&) = delete;
+    UnmanagedRegion& operator=(UnmanagedRegion&&) = delete;
+
     virtual void* GetData() const = 0;
     virtual size_t GetSize() const = 0;
     virtual uint16_t GetId() const = 0;
diff --git a/fairmq/ofi/Context.h b/fairmq/ofi/Context.h
index 1f0ad79c..32cbc5fb 100644
--- a/fairmq/ofi/Context.h
+++ b/fairmq/ofi/Context.h
@@ -54,6 +54,10 @@ class Context
     Context(FairMQTransportFactory& sendFactory,
             FairMQTransportFactory& receiveFactory,
             int numberIoThreads = 1);
+    Context(const Context&) = delete;
+    Context(Context&&) = delete;
+    Context& operator=(const Context&) = delete;
+    Context& operator=(Context&&) = delete;
     ~Context();
 
     auto GetAsiofiVersion() const -> std::string;
diff --git a/fairmq/ofi/Message.h b/fairmq/ofi/Message.h
index 8f5e4bd0..20ab2613 100644
--- a/fairmq/ofi/Message.h
+++ b/fairmq/ofi/Message.h
@@ -46,7 +46,9 @@ class Message final : public fair::mq::Message
             void* hint = 0);
 
     Message(const Message&) = delete;
-    Message operator=(const Message&) = delete;
+    Message(Message&&) = delete;
+    Message& operator=(const Message&) = delete;
+    Message& operator=(Message&&) = delete;
 
     auto Rebuild() -> void override;
     auto Rebuild(Alignment alignment) -> void override;
diff --git a/fairmq/ofi/Socket.h b/fairmq/ofi/Socket.h
index c68d2868..4e05caed 100644
--- a/fairmq/ofi/Socket.h
+++ b/fairmq/ofi/Socket.h
@@ -36,7 +36,9 @@ class Socket final : public fair::mq::Socket
   public:
     Socket(Context& context, const std::string& type, const std::string& name, const std::string& id = "");
     Socket(const Socket&) = delete;
-    Socket operator=(const Socket&) = delete;
+    Socket(Socket&&) = delete;
+    Socket& operator=(const Socket&) = delete;
+    Socket& operator=(Socket&&) = delete;
 
     auto GetId() const -> std::string override { return fId; }
 
diff --git a/fairmq/ofi/TransportFactory.h b/fairmq/ofi/TransportFactory.h
index 2163f9f2..49afef14 100644
--- a/fairmq/ofi/TransportFactory.h
+++ b/fairmq/ofi/TransportFactory.h
@@ -55,10 +55,11 @@ struct TransportFactory final : mq::TransportFactory
         }
     }
 
-    TransportFactory(TransportFactory const&) = delete;
-    TransportFactory& operator=(TransportFactory const&) = delete;
-    TransportFactory(TransportFactory&&) = default;
-    TransportFactory& operator=(TransportFactory&&) = default;
+    TransportFactory(const TransportFactory&) = delete;
+    TransportFactory(TransportFactory&&) = delete;
+    TransportFactory& operator=(const TransportFactory&) = delete;
+    TransportFactory& operator=(TransportFactory&&) = delete;
+    ~TransportFactory() = default;
 
     auto CreateMessage() -> std::unique_ptr<mq::Message> override
     {
diff --git a/fairmq/plugins/config/Config.h b/fairmq/plugins/config/Config.h
index 4c288cbe..896eeb27 100644
--- a/fairmq/plugins/config/Config.h
+++ b/fairmq/plugins/config/Config.h
@@ -21,6 +21,10 @@ class Config : public Plugin
 {
   public:
     Config(const std::string& name, Plugin::Version version, const std::string& maintainer, const std::string& homepage, PluginServices* pluginServices);
+    Config(const Config&) = delete;
+    Config(Config&&) = delete;
+    Config& operator=(const Config&) = delete;
+    Config& operator=(Config&&) = delete;
 
     ~Config();
 };
diff --git a/fairmq/plugins/control/Control.cxx b/fairmq/plugins/control/Control.cxx
index 3c056502..7e690336 100644
--- a/fairmq/plugins/control/Control.cxx
+++ b/fairmq/plugins/control/Control.cxx
@@ -119,9 +119,9 @@ auto ControlPluginProgramOptions() -> Plugin::ProgOptions
     return pluginOptions;
 }
 
-struct terminal_config
+struct TerminalConfig
 {
-    terminal_config()
+    TerminalConfig()
     {
         termios t;
         tcgetattr(STDIN_FILENO, &t); // get the current terminal I/O structure
@@ -130,7 +130,12 @@ struct terminal_config
         tcsetattr(STDIN_FILENO, TCSANOW, &t); // apply the new settings
     }
 
-    ~terminal_config()
+    TerminalConfig(const TerminalConfig&) = delete;
+    TerminalConfig(TerminalConfig&&) = delete;
+    TerminalConfig& operator=(const TerminalConfig&) = delete;
+    TerminalConfig& operator=(TerminalConfig&&) = delete;
+
+    ~TerminalConfig()
     {
         termios t;
         tcgetattr(STDIN_FILENO, &t); // get the current terminal I/O structure
@@ -150,7 +155,7 @@ try {
     cinfd[0].events = POLLIN;
     cinfd[0].revents = 0;
 
-    terminal_config tconfig;
+    TerminalConfig tconfig;
 
     bool color = GetProperty<bool>("color");
 
diff --git a/fairmq/plugins/control/Control.h b/fairmq/plugins/control/Control.h
index d55bd810..7cce6798 100644
--- a/fairmq/plugins/control/Control.h
+++ b/fairmq/plugins/control/Control.h
@@ -28,6 +28,10 @@ class Control : public Plugin
 {
   public:
     Control(const std::string& name, Plugin::Version version, const std::string& maintainer, const std::string& homepage, PluginServices* pluginServices);
+    Control(const Control&) = delete;
+    Control(Control&&) = delete;
+    Control& operator=(const Control&) = delete;
+    Control& operator=(Control&&) = delete;
 
     ~Control();
 
diff --git a/fairmq/shmem/Manager.h b/fairmq/shmem/Manager.h
index 501caad4..ecf62aad 100644
--- a/fairmq/shmem/Manager.h
+++ b/fairmq/shmem/Manager.h
@@ -293,9 +293,10 @@ class Manager
     }
 
     Manager() = delete;
-
     Manager(const Manager&) = delete;
-    Manager operator=(const Manager&) = delete;
+    Manager(Manager&&) = delete;
+    Manager& operator=(const Manager&) = delete;
+    Manager& operator=(Manager&&) = delete;
 
     void ZeroSegment(uint16_t id)
     {
diff --git a/fairmq/shmem/Message.h b/fairmq/shmem/Message.h
index 9ae654be..b249455b 100644
--- a/fairmq/shmem/Message.h
+++ b/fairmq/shmem/Message.h
@@ -136,7 +136,9 @@ class Message final : public fair::mq::Message
     }
 
     Message(const Message&) = delete;
-    Message operator=(const Message&) = delete;
+    Message(Message&&) = delete;
+    Message& operator=(const Message&) = delete;
+    Message& operator=(Message&&) = delete;
 
     void Rebuild() override
     {
diff --git a/fairmq/shmem/Monitor.cxx b/fairmq/shmem/Monitor.cxx
index 94bb20cd..6146bdbe 100644
--- a/fairmq/shmem/Monitor.cxx
+++ b/fairmq/shmem/Monitor.cxx
@@ -60,6 +60,11 @@ struct TerminalConfig
         tcsetattr(STDIN_FILENO, TCSANOW, &t); // apply the new settings
     }
 
+    TerminalConfig(const TerminalConfig&) = delete;
+    TerminalConfig(TerminalConfig&&) = delete;
+    TerminalConfig& operator=(const TerminalConfig&) = delete;
+    TerminalConfig& operator=(TerminalConfig&&) = delete;
+
     ~TerminalConfig()
     {
         termios t;
diff --git a/fairmq/shmem/Monitor.h b/fairmq/shmem/Monitor.h
index 894e5114..285c2f58 100644
--- a/fairmq/shmem/Monitor.h
+++ b/fairmq/shmem/Monitor.h
@@ -53,9 +53,10 @@ class Monitor
 {
   public:
     Monitor(std::string shmId, bool selfDestruct, bool interactive, bool viewOnly, unsigned int timeoutInMS, unsigned int intervalInMS, bool runAsDaemon, bool cleanOnExit);
-
     Monitor(const Monitor&) = delete;
-    Monitor operator=(const Monitor&) = delete;
+    Monitor(Monitor&&) = delete;
+    Monitor& operator=(const Monitor&) = delete;
+    Monitor& operator=(Monitor&&) = delete;
 
     virtual ~Monitor();
 
diff --git a/fairmq/shmem/Poller.h b/fairmq/shmem/Poller.h
index ddca0ee5..d37b8643 100644
--- a/fairmq/shmem/Poller.h
+++ b/fairmq/shmem/Poller.h
@@ -102,7 +102,9 @@ class Poller final : public fair::mq::Poller
     }
 
     Poller(const Poller&) = delete;
-    Poller operator=(const Poller&) = delete;
+    Poller(Poller&&) = delete;
+    Poller& operator=(const Poller&) = delete;
+    Poller& operator=(Poller&&) = delete;
 
     void SetItemEvents(zmq_pollitem_t& item, int type)
     {
diff --git a/fairmq/shmem/Region.h b/fairmq/shmem/Region.h
index 96d2ddd2..52cd0018 100644
--- a/fairmq/shmem/Region.h
+++ b/fairmq/shmem/Region.h
@@ -113,6 +113,8 @@ struct Region
 
     Region(const Region&) = delete;
     Region(Region&&) = delete;
+    Region& operator=(const Region&) = delete;
+    Region& operator=(Region&&) = delete;
 
     void InitializeQueues()
     {
diff --git a/fairmq/shmem/Socket.h b/fairmq/shmem/Socket.h
index 39527a95..86442e06 100644
--- a/fairmq/shmem/Socket.h
+++ b/fairmq/shmem/Socket.h
@@ -35,6 +35,11 @@ struct ZMsg
     explicit ZMsg(size_t size) { int rc __attribute__((unused)) = zmq_msg_init_size(&fMsg, size); assert(rc == 0); }
     ~ZMsg() { int rc __attribute__((unused)) = zmq_msg_close(&fMsg); assert(rc == 0); }
 
+    ZMsg(const ZMsg&) = delete;
+    ZMsg(ZMsg&&) = delete;
+    ZMsg& operator=(const ZMsg&) = delete;
+    ZMsg& operator=(ZMsg&&) = delete;
+
     void* Data() { return zmq_msg_data(&fMsg); }
     size_t Size() { return zmq_msg_size(&fMsg); }
     zmq_msg_t* Msg() { return &fMsg; }
@@ -100,7 +105,9 @@ class Socket final : public fair::mq::Socket
     }
 
     Socket(const Socket&) = delete;
-    Socket operator=(const Socket&) = delete;
+    Socket(Socket&&) = delete;
+    Socket& operator=(const Socket&) = delete;
+    Socket& operator=(Socket&&) = delete;
 
     std::string GetId() const override { return fId; }
 
diff --git a/fairmq/shmem/TransportFactory.h b/fairmq/shmem/TransportFactory.h
index 5f6a0b49..3aedf39d 100644
--- a/fairmq/shmem/TransportFactory.h
+++ b/fairmq/shmem/TransportFactory.h
@@ -89,7 +89,9 @@ class TransportFactory final : public fair::mq::TransportFactory
     }
 
     TransportFactory(const TransportFactory&) = delete;
-    TransportFactory operator=(const TransportFactory&) = delete;
+    TransportFactory(TransportFactory&&) = delete;
+    TransportFactory& operator=(const TransportFactory&) = delete;
+    TransportFactory& operator=(TransportFactory&&) = delete;
 
     MessagePtr CreateMessage() override
     {
diff --git a/fairmq/shmem/UnmanagedRegion.h b/fairmq/shmem/UnmanagedRegion.h
index f01fc379..009899b4 100644
--- a/fairmq/shmem/UnmanagedRegion.h
+++ b/fairmq/shmem/UnmanagedRegion.h
@@ -51,6 +51,11 @@ class UnmanagedRegion final : public fair::mq::UnmanagedRegion
         fRegionId = result.second;
     }
 
+    UnmanagedRegion(const UnmanagedRegion&) = delete;
+    UnmanagedRegion(UnmanagedRegion&&) = delete;
+    UnmanagedRegion& operator=(const UnmanagedRegion&) = delete;
+    UnmanagedRegion& operator=(UnmanagedRegion&&) = delete;
+
     void* GetData() const override { return fRegion->get_address(); }
     size_t GetSize() const override { return fRegion->get_size(); }
     uint16_t GetId() const override { return fRegionId; }
diff --git a/fairmq/zeromq/Context.h b/fairmq/zeromq/Context.h
index f9ec24ed..b6fe3964 100644
--- a/fairmq/zeromq/Context.h
+++ b/fairmq/zeromq/Context.h
@@ -56,7 +56,9 @@ class Context
     }
 
     Context(const Context&) = delete;
-    Context operator=(const Context&) = delete;
+    Context(Context&&) = delete;
+    Context& operator=(const Context&) = delete;
+    Context& operator=(Context&&) = delete;
 
     void SubscribeToRegionEvents(RegionEventCallback callback)
     {
diff --git a/fairmq/zeromq/Message.h b/fairmq/zeromq/Message.h
index b93edafa..b012666c 100644
--- a/fairmq/zeromq/Message.h
+++ b/fairmq/zeromq/Message.h
@@ -33,6 +33,11 @@ class Message final : public fair::mq::Message
     friend class Socket;
 
   public:
+    Message(const Message&) = delete;
+    Message(Message&&) = delete;
+    Message& operator=(const Message&) = delete;
+    Message& operator=(Message&&) = delete;
+
     Message(FairMQTransportFactory* factory = nullptr)
         : fair::mq::Message(factory)
         , fMsg(std::make_unique<zmq_msg_t>())
diff --git a/fairmq/zeromq/Poller.h b/fairmq/zeromq/Poller.h
index 3eaf04cf..bd708e97 100644
--- a/fairmq/zeromq/Poller.h
+++ b/fairmq/zeromq/Poller.h
@@ -24,6 +24,12 @@ namespace fair::mq::zmq
 class Poller final : public fair::mq::Poller
 {
   public:
+    Poller() = default;
+    Poller(const Poller&) = delete;
+    Poller(Poller&&) = delete;
+    Poller& operator=(const Poller&) = delete;
+    Poller& operator=(Poller&&) = delete;
+
     Poller(const std::vector<Channel>& channels)
         : fItems()
         , fNumItems(0)
@@ -102,9 +108,6 @@ class Poller final : public fair::mq::Poller
         }
     }
 
-    Poller(const Poller&) = delete;
-    Poller operator=(const Poller&) = delete;
-
     void SetItemEvents(zmq_pollitem_t& item, int type)
     {
         if (type == ZMQ_REQ || type == ZMQ_REP || type == ZMQ_PAIR || type == ZMQ_DEALER || type == ZMQ_ROUTER) {
diff --git a/fairmq/zeromq/Socket.h b/fairmq/zeromq/Socket.h
index 9e097cf2..5a3d6985 100644
--- a/fairmq/zeromq/Socket.h
+++ b/fairmq/zeromq/Socket.h
@@ -72,7 +72,9 @@ class Socket final : public fair::mq::Socket
     }
 
     Socket(const Socket&) = delete;
-    Socket operator=(const Socket&) = delete;
+    Socket(Socket&&) = delete;
+    Socket& operator=(const Socket&) = delete;
+    Socket& operator=(Socket&&) = delete;
 
     std::string GetId() const override { return fId; }
 
diff --git a/fairmq/zeromq/TransportFactory.h b/fairmq/zeromq/TransportFactory.h
index be8b82b7..d27ec167 100644
--- a/fairmq/zeromq/TransportFactory.h
+++ b/fairmq/zeromq/TransportFactory.h
@@ -44,7 +44,9 @@ class TransportFactory final : public FairMQTransportFactory
     }
 
     TransportFactory(const TransportFactory&) = delete;
-    TransportFactory operator=(const TransportFactory&) = delete;
+    TransportFactory(TransportFactory&&) = delete;
+    TransportFactory& operator=(const TransportFactory&) = delete;
+    TransportFactory& operator=(TransportFactory&&) = delete;
 
     MessagePtr CreateMessage() override
     {
diff --git a/fairmq/zeromq/UnmanagedRegion.h b/fairmq/zeromq/UnmanagedRegion.h
index 3f6a32bc..49894ec5 100644
--- a/fairmq/zeromq/UnmanagedRegion.h
+++ b/fairmq/zeromq/UnmanagedRegion.h
@@ -59,7 +59,9 @@ class UnmanagedRegion final : public fair::mq::UnmanagedRegion
     }
 
     UnmanagedRegion(const UnmanagedRegion&) = delete;
-    UnmanagedRegion operator=(const UnmanagedRegion&) = delete;
+    UnmanagedRegion(UnmanagedRegion&&) = delete;
+    UnmanagedRegion& operator=(const UnmanagedRegion&) = delete;
+    UnmanagedRegion& operator=(UnmanagedRegion&&) = delete;
 
     virtual void* GetData() const override { return fBuffer; }
     virtual size_t GetSize() const override { return fSize; }
diff --git a/test/device/_config.cxx b/test/device/_config.cxx
index 4872936e..ceae68e2 100644
--- a/test/device/_config.cxx
+++ b/test/device/_config.cxx
@@ -67,6 +67,11 @@ class TestDevice : public FairMQDevice
         ChangeState(fair::mq::Transition::Run);
     }
 
+    TestDevice(const TestDevice&) = delete;
+    TestDevice(TestDevice&&) = delete;
+    TestDevice& operator=(const TestDevice&) = delete;
+    TestDevice& operator=(TestDevice&&) = delete;
+
     ~TestDevice()
     {
         WaitForState(fair::mq::State::Running);
diff --git a/test/device/_error_state.cxx b/test/device/_error_state.cxx
index 71ea82a1..335d2b9f 100644
--- a/test/device/_error_state.cxx
+++ b/test/device/_error_state.cxx
@@ -44,6 +44,11 @@ class BadDevice : public FairMQDevice
         parts.AddPart(NewMessage());
     }
 
+    BadDevice(const BadDevice&) = delete;
+    BadDevice(BadDevice&&) = delete;
+    BadDevice& operator=(const BadDevice&) = delete;
+    BadDevice& operator=(BadDevice&&) = delete;
+
     ~BadDevice()
     {
         ChangeState(fair::mq::Transition::ResetDevice);
diff --git a/test/memory_resources/_memory_resources.cxx b/test/memory_resources/_memory_resources.cxx
index f7a177df..380c763f 100644
--- a/test/memory_resources/_memory_resources.cxx
+++ b/test/memory_resources/_memory_resources.cxx
@@ -39,6 +39,9 @@ struct TestData
         ++nallocations;
     }
 
+    TestData& operator=(const TestData&) = delete;
+    TestData& operator=(TestData&&) = delete;
+
     TestData(const TestData& in)
         : i{in.i}
     {
diff --git a/test/plugin_services/_config.cxx b/test/plugin_services/_config.cxx
index 392bfa0f..3f94171d 100644
--- a/test/plugin_services/_config.cxx
+++ b/test/plugin_services/_config.cxx
@@ -17,7 +17,10 @@ struct MyClass
     MyClass() = default;
     MyClass(std::string a) : msg(std::move(a)) {}
     MyClass(const MyClass&) = default;
-    MyClass& operator=(const MyClass& b) = default;
+    MyClass(MyClass&&) = default;
+    MyClass& operator=(const MyClass&) = default;
+    MyClass& operator=(MyClass&&) = default;
+    ~MyClass() = default;
     std::string msg;
 };