diff --git a/src/nt_messagereader.h b/src/nt_messagereader.h
index f4a03595e1..e1d7bd2a5b 100644
--- a/src/nt_messagereader.h
+++ b/src/nt_messagereader.h
@@ -51,9 +51,9 @@ public:
                                 const char* results,
                                 std::size_t results_len) = 0;
 
-private:
-    MessageHandler(const MessageHandler&);
-    MessageHandler& operator= (const MessageHandler&);
+    MessageHandler() = default;
+    MessageHandler(const MessageHandler&) = delete;
+    MessageHandler& operator= (const MessageHandler&) = delete;
 };
 
 class MessageReader : private WireDecoder
@@ -81,10 +81,10 @@ public:
         return WireDecoder::GetError();
     }
 
-private:
-    MessageReader(const MessageReader&);
-    MessageReader& operator= (const MessageReader&);
+    MessageReader(const MessageReader&) = delete;
+    MessageReader& operator= (const MessageReader&) = delete;
 
+private:
     MessageHandler& m_handler;
 };
 
diff --git a/src/nt_messagewriter.h b/src/nt_messagewriter.h
index abf9ee445f..b06cd8713e 100644
--- a/src/nt_messagewriter.h
+++ b/src/nt_messagewriter.h
@@ -69,10 +69,10 @@ public:
                           const NT_Value* results_start,
                           const NT_Value* results_end);
 
-private:
-    MessageWriter(const MessageWriter&);
-    MessageWriter& operator= (const MessageWriter&);
+    MessageWriter(const MessageWriter&) = delete;
+    MessageWriter& operator= (const MessageWriter&) = delete;
 
+private:
     void WriteRpc(unsigned int msg_type,
                   unsigned int id,
                   unsigned int uid,
diff --git a/src/nt_raw_istream.h b/src/nt_raw_istream.h
index 0ba4141bef..ee6d79cb4f 100644
--- a/src/nt_raw_istream.h
+++ b/src/nt_raw_istream.h
@@ -20,9 +20,9 @@ public:
     virtual ~raw_istream() {}
     virtual bool read(void* data, std::size_t len) = 0;
     virtual void close() = 0;
-private:
-    raw_istream(const raw_istream&);
-    raw_istream& operator= (const raw_istream&);
+
+    raw_istream(const raw_istream&) = delete;
+    raw_istream& operator= (const raw_istream&) = delete;
 };
 
 class raw_mem_istream : public raw_istream
diff --git a/src/nt_storage.h b/src/nt_storage.h
index e125edc13f..3f3a5d9410 100644
--- a/src/nt_storage.h
+++ b/src/nt_storage.h
@@ -35,9 +35,8 @@ public:
     NT_Value value;
     unsigned int flags;
 
-private:
-    StorageEntry(const StorageEntry&);
-    StorageEntry& operator= (const StorageEntry&);
+    StorageEntry(const StorageEntry&) = delete;
+    StorageEntry& operator= (const StorageEntry&) = delete;
 };
 
 class Storage
@@ -56,8 +55,8 @@ public:
 private:
     Storage();
     ~Storage();
-    Storage(const Storage&);
-    Storage& operator= (const Storage&);
+    Storage(const Storage&) = delete;
+    Storage& operator= (const Storage&) = delete;
 
     static Storage* m_instance;
 };
diff --git a/src/nt_wiredecoder.h b/src/nt_wiredecoder.h
index 20ad12db09..99894a15d7 100644
--- a/src/nt_wiredecoder.h
+++ b/src/nt_wiredecoder.h
@@ -86,14 +86,14 @@ public:
     bool ReadValue(NT_Type type, NT_Value* value);
     bool ReadString(NT_String* str);
 
+    WireDecoder(const WireDecoder&) = delete;
+    WireDecoder& operator= (const WireDecoder&) = delete;
+
 protected:
     unsigned int m_proto_rev;
     const char* m_error;
 
 private:
-    WireDecoder(const WireDecoder&);
-    WireDecoder& operator= (const WireDecoder&);
-
     void Realloc(std::size_t len);
 
     raw_istream& m_is;
diff --git a/src/nt_wireencoder.h b/src/nt_wireencoder.h
index eb8e764ae1..19f3b80096 100644
--- a/src/nt_wireencoder.h
+++ b/src/nt_wireencoder.h
@@ -86,14 +86,14 @@ public:
     std::size_t GetValueSize(const NT_Value& value);
     std::size_t GetStringSize(const NT_String& str);
 
+    WireEncoder(const WireEncoder&) = delete;
+    WireEncoder& operator= (const WireEncoder&) = delete;
+
 protected:
     unsigned int m_proto_rev;
     const char* m_error;
 
 private:
-    WireEncoder(const WireEncoder&);
-    WireEncoder& operator= (const WireEncoder&);
-
     void ReserveSlow(std::size_t len);
 
     char* m_start;