diff --git a/libs/utilspp/singleton/LifetimeLibrary.hpp b/libs/utilspp/singleton/LifetimeLibrary.hpp
index 80fba716ab70484e4cd5525be39e9e08cf40a276..27f62ad75066e919c1a212da8a85ea467ea44d7a 100644
--- a/libs/utilspp/singleton/LifetimeLibrary.hpp
+++ b/libs/utilspp/singleton/LifetimeLibrary.hpp
@@ -25,7 +25,7 @@
 #define LIFETIME_LIBRARY_HPP
 
 #include <cassert>
-
+#include <algorithm> 
 #include "PrivateMembers.hpp"
 #include "CreationUsingNew.hpp"
 
diff --git a/libs/utilspp/singleton/LifetimeWithLongevity.hpp b/libs/utilspp/singleton/LifetimeWithLongevity.hpp
index 7683df3d9bcb80e99750063fa387802161ba6324..c7749d43f5fe51a7b313eb6b37bfb986fee97184 100644
--- a/libs/utilspp/singleton/LifetimeWithLongevity.hpp
+++ b/libs/utilspp/singleton/LifetimeWithLongevity.hpp
@@ -25,8 +25,8 @@
 #define LIFETIME_WITH_LONGEVITY_HPP
 
 #include <cassert>
-
 #include "PrivateMembers.hpp"
+#include <algorithm>
 
 namespace utilspp
 {
diff --git a/src/audio/audiofile.cpp b/src/audio/audiofile.cpp
index 2224e3e8f6ee87606e46cd3a3839caed5649a3ee..5d639f296ffe393dbdfdab06bfa45de1ad1def3d 100644
--- a/src/audio/audiofile.cpp
+++ b/src/audio/audiofile.cpp
@@ -25,6 +25,7 @@
 #include <fstream>
 #include <math.h>
 #include <samplerate.h>
+#include <cstring>
 
 AudioFile::AudioFile()
  : AudioLoop(),
diff --git a/src/audio/audioloop.cpp b/src/audio/audioloop.cpp
index 63bfefac4e8b17fd777ebaf2623602a3857566b2..ecf85d1b03f6b8d89c85ff8dcaf9c86f60a920fd 100644
--- a/src/audio/audioloop.cpp
+++ b/src/audio/audioloop.cpp
@@ -22,6 +22,7 @@
  */
 #include "audioloop.h"
 #include <math.h>
+#include <strings.h>
 
 AudioLoop::AudioLoop():_buffer(0),  _size(0), _pos(0), _sampleRate(0) 
 {
diff --git a/src/audio/codecs/Makefile.am b/src/audio/codecs/Makefile.am
index e1bfcbd01a2dc10660cb617c03dfe79032460d27..0f790f478ad395c5c42227946489f383320df0f0 100644
--- a/src/audio/codecs/Makefile.am
+++ b/src/audio/codecs/Makefile.am
@@ -5,7 +5,7 @@ GSM_LIB = libcodec_gsm.so
 libcodec_gsm_so_SOURCES = gsmcodec.cpp
 libcodec_gsm_so_CFLAGS = -fPIC -g -Wall
 libcodec_gsm_so_CXXFLAGS = -fPIC -g -Wall
-libcodec_gsm_so_LDFLAGS = -shared -lc -lgsm
+libcodec_gsm_so_LDFLAGS = --shared -lc -lgsm
 INSTALL_GSM_RULE = install-libcodec_gsm_so
 endif
 
@@ -14,7 +14,7 @@ SPEEX_LIB = libcodec_speex.so
 libcodec_speex_so_SOURCES = speexcodec.cpp
 libcodec_speex_so_CFLAGS = -fPIC -g -Wall
 libcodec_speex_so_CXXFLAGS = -fPIC -g -Wall
-libcodec_speex_so_LDFLAGS = -shared -lc -lspeex
+libcodec_speex_so_LDFLAGS = --shared -lc -lspeex
 INSTALL_SPEEX_RULE = install-libcodec_speex_so
 endif
 
@@ -23,7 +23,7 @@ ILBC_LIB = libcodec_ilbc.so
 libcodec_ilbc_so_SOURCES = ilbc.cpp
 libcodec_ilbc_so_CFLAGS = -fPIC -g -Wall
 libcodec_ilbc_so_CXXFLAGS = -fPIC -g -Wall
-libcodec_ilbc_so_LDFLAGS = -shared ilbc/*.o -lc
+libcodec_ilbc_so_LDFLAGS = --shared ilbc/*.o -lc
 INSTALL_ILBC_RULE = install-libcodec_ilbc_so
 SUBDIRS = ilbc
 endif
@@ -35,12 +35,12 @@ noinst_HEADERS = audiocodec.h
 libcodec_ulaw_so_SOURCES = ulaw.cpp
 libcodec_ulaw_so_CFLAGS = -fPIC -g -Wall
 libcodec_ulaw_so_CXXFLAGS = -fPIC -g -Wall
-libcodec_ulaw_so_LDFLAGS = -shared -lc
+libcodec_ulaw_so_LDFLAGS = --shared -lc
 
 libcodec_alaw_so_SOURCES = alaw.cpp
 libcodec_alaw_so_CFLAGS = -fPIC -g -Wall
 libcodec_alaw_so_CXXFLAGS = -fPIC -g -Wall
-libcodec_alaw_so_LDFLAGS = -shared -lc
+libcodec_alaw_so_LDFLAGS = --shared -lc
 
 
 
diff --git a/src/audio/tone.cpp b/src/audio/tone.cpp
index 646dae56a5c2d0dcac9c9cb835d07e2537c97f0d..91471942ae5e1fa3a87d546156cb95f14526e54d 100644
--- a/src/audio/tone.cpp
+++ b/src/audio/tone.cpp
@@ -25,6 +25,8 @@
  */
 #include "tone.h"
 #include <math.h>
+#include <cstdlib>
+#include <strings.h>
 
 Tone::Tone(const std::string& definition, unsigned int sampleRate) : AudioLoop(), _sampleRate(sampleRate)
 {
diff --git a/src/config/config.cpp b/src/config/config.cpp
index 700f70484e7cb918a11f8f6f90d5284b5ae68f44..c32ea177199f92dfe37646bf60dadd8237840be9 100644
--- a/src/config/config.cpp
+++ b/src/config/config.cpp
@@ -21,6 +21,7 @@
 #include "config.h"
 #include "../global.h"
 #include <fstream>
+#include <cstdlib>
 
 namespace Conf {