diff --git a/daemon/src/audio/audiolayer.cpp b/daemon/src/audio/audiolayer.cpp
index b02bcf10059f255788afb5063e82e089d07ca6ed..fcf588ba0eb9ffea5d458b960923846ca1a71e39 100644
--- a/daemon/src/audio/audiolayer.cpp
+++ b/daemon/src/audio/audiolayer.cpp
@@ -49,6 +49,9 @@ AudioLayer::AudioLayer()
     urgentRingBuffer_.createReadPointer(MainBuffer::DEFAULT_ID);
 }
 
+AudioLayer::~AudioLayer()
+{}
+
 void AudioLayer::flushMain()
 {
     std::lock_guard<std::mutex> lock(mutex_);
diff --git a/daemon/src/audio/audiolayer.h b/daemon/src/audio/audiolayer.h
index 6ad8154aeaec45f0e169fd553e84cffb1d62d577..6e0d6c5ac47ec95afb3aba3bce69d2653cf5d1df 100644
--- a/daemon/src/audio/audiolayer.h
+++ b/daemon/src/audio/audiolayer.h
@@ -80,7 +80,7 @@ class AudioLayer {
         };
 
         AudioLayer();
-        virtual ~AudioLayer() = default;
+        virtual ~AudioLayer();
 
         virtual std::vector<std::string> getCaptureDeviceList() const = 0;
         virtual std::vector<std::string> getPlaybackDeviceList() const = 0;
diff --git a/daemon/src/config/sfl_config.h b/daemon/src/config/sfl_config.h
index d948b9a954dcf36626f034d2f1e6afbf854feaf3..a26da95fcebc45da8ee79ce69056d8f751447ee8 100644
--- a/daemon/src/config/sfl_config.h
+++ b/daemon/src/config/sfl_config.h
@@ -149,10 +149,6 @@ class ConfigTree {
         friend class ConfigTreeIterator;
 
         NON_COPYABLE(ConfigTree);
-    public:
-        ConfigTreeIterator createIterator() {
-            return ConfigTreeIterator(this);
-        }
 };
 
 class ConfigTreeItem {
diff --git a/daemon/src/noncopyable.h b/daemon/src/noncopyable.h
index a43c3db71bb64e237f0ce0ded0e88cbc1be403e0..1f24299013c1fdee050f841db60e91656d44ab48 100644
--- a/daemon/src/noncopyable.h
+++ b/daemon/src/noncopyable.h
@@ -40,7 +40,7 @@
  */
 
 #define NON_COPYABLE(ClassName) \
-    ClassName(const ClassName&); \
-    ClassName& operator=(const ClassName&)
+    ClassName(const ClassName&) = delete; \
+    ClassName& operator=(const ClassName&) = delete
 
 #endif  // NON_COPYABLE_H_