diff --git a/daemon/src/audio/audiobuffer.h b/daemon/src/audio/audiobuffer.h
index 5b5c95bb482ebb031a892d5e13e467135a39bf8f..95d84007f2aa68cf475f803b9a6237e65879ce19 100644
--- a/daemon/src/audio/audiobuffer.h
+++ b/daemon/src/audio/audiobuffer.h
@@ -42,7 +42,7 @@ class AudioBuffer {
         /**
          * Default constructor.
          */
-        AudioBuffer(size_t sample_num = 0, unsigned channel_num = 1, int sample_rate = 8000);
+        AudioBuffer(size_t sample_num, unsigned channel_num = 1, int sample_rate = 8000);
 
         /**
          * Construtor from existing interleaved data (copied into the buffer).
diff --git a/daemon/src/audio/audioloop.cpp b/daemon/src/audio/audioloop.cpp
index d8a3d4892ba9d4a8b8fbaf18919613141f5acfe2..f1f645ab5899fcfdeef8e5b3c607a75c6a895a75 100644
--- a/daemon/src/audio/audioloop.cpp
+++ b/daemon/src/audio/audioloop.cpp
@@ -46,7 +46,7 @@
 
 AudioLoop::AudioLoop(unsigned int sampleRate) : buffer_(0), pos_(0)
 {
-    buffer_ = new AudioBuffer;
+    buffer_ = new AudioBuffer(0);
     buffer_->setSampleRate(sampleRate);
 }
 
diff --git a/daemon/src/audio/audiortp/audio_rtp_record_handler.cpp b/daemon/src/audio/audiortp/audio_rtp_record_handler.cpp
index ad6eb3f1afb4841aa5d13297a933ac296156d8d3..563b3a063ce20da16afdc0b0ed5c5a80b9094257 100644
--- a/daemon/src/audio/audiortp/audio_rtp_record_handler.cpp
+++ b/daemon/src/audio/audiortp/audio_rtp_record_handler.cpp
@@ -100,7 +100,7 @@ AudioRtpRecord::AudioRtpRecord() :
     , decoderPayloadType_(0)
     , hasDynamicPayloadType_(false)
     , decData_(DEC_BUFFER_SIZE)     // std::tr1::arrays will be 0-initialized
-    , resampledData_()
+    , resampledData_(0)
     , encodedData_()
     , converterEncode_(0)
     , converterDecode_(0)
diff --git a/daemon/src/audio/pulseaudio/pulselayer.cpp b/daemon/src/audio/pulseaudio/pulselayer.cpp
index eeaa34f84e567199e6d3508b2fa86eb7f8f977f6..fe6db989873b12f072504d9404a54b0f4a0351fa 100644
--- a/daemon/src/audio/pulseaudio/pulselayer.cpp
+++ b/daemon/src/audio/pulseaudio/pulselayer.cpp
@@ -80,7 +80,7 @@ PulseLayer::PulseLayer(AudioPreference &pref)
     , ringtone_(0)
     , sinkList_()
     , sourceList_()
-    , mic_buffer_()
+    , mic_buffer_(0)
     , context_(0)
     , mainloop_(pa_threaded_mainloop_new())
     , enumeratingSinks_(false)
diff --git a/daemon/src/audio/sound/tone.cpp b/daemon/src/audio/sound/tone.cpp
index 0062267aa02c2e128087cd1f351fd1b3b480ad1c..4cf0b2e070e4ac7c55b96ed148d5510cb5c20191 100644
--- a/daemon/src/audio/sound/tone.cpp
+++ b/daemon/src/audio/sound/tone.cpp
@@ -48,7 +48,7 @@ Tone::Tone(const std::string& definition, unsigned int sampleRate) :
 {
     fillWavetable();
     delete buffer_;
-    buffer_ = new AudioBuffer();
+    buffer_ = new AudioBuffer(0);
     buffer_->setSampleRate(sampleRate);
     genBuffer(definition); // allocate memory with definition parameter
 }
diff --git a/daemon/test/audiobuffertest.cpp b/daemon/test/audiobuffertest.cpp
index 99109d8b070e5a0c23bbdf0b5d174a6d4ab1dc88..7a1aa9052da8ebb5c783042372545dd2f9000871 100644
--- a/daemon/test/audiobuffertest.cpp
+++ b/daemon/test/audiobuffertest.cpp
@@ -42,7 +42,7 @@ void AudioBufferTest::testAudioBufferConstructors()
     SFLAudioSample test_samples1[] = {};
     SFLAudioSample test_samples2[] = {10, 11, 12, 13, 14, 15, 16, 17};
 
-    AudioBuffer empty_buf;
+    AudioBuffer empty_buf(0);
     CPPUNIT_ASSERT(empty_buf.samples() == 0);
     CPPUNIT_ASSERT(empty_buf.channels() == 1);
     CPPUNIT_ASSERT(empty_buf.getChannel(0)->size() == 0);
@@ -84,7 +84,7 @@ void AudioBufferTest::testAudioBufferMix()
     test_buf1.setChannelNum(2, true);
     CPPUNIT_ASSERT((*test_buf1.getChannel(1))[0] == test_samples1[0]);
 
-    AudioBuffer test_buf2;
+    AudioBuffer test_buf2(0);
     test_buf2.deinterleave(test_samples2, 3, 3);
     CPPUNIT_ASSERT((*test_buf2.getChannel(0))[2] == test_samples2[6]);
     CPPUNIT_ASSERT((*test_buf2.getChannel(1))[1] == test_samples2[4]);