diff --git a/sflphone-common/src/audio/audioloop.cpp b/sflphone-common/src/audio/audioloop.cpp
index 633192de44bf5a4ed82b5d9fb34e28117d3e0fa5..39aa5e76ffe19b747cb67903bc2c05d521f33429 100644
--- a/sflphone-common/src/audio/audioloop.cpp
+++ b/sflphone-common/src/audio/audioloop.cpp
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright (C) 2005 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
@@ -20,6 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include "audioloop.h"
#include <math.h>
#include <strings.h>
diff --git a/sflphone-common/src/audio/codecs/alaw.cpp b/sflphone-common/src/audio/codecs/alaw.cpp
index 9ed3cd56dedfd19cab165897048012f2b49212ca..a32716d6c1a5fdf9e77e06c24f949ea7f62950eb 100644
--- a/sflphone-common/src/audio/codecs/alaw.cpp
+++ b/sflphone-common/src/audio/codecs/alaw.cpp
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
diff --git a/sflphone-common/src/audio/codecs/audiocodec.h b/sflphone-common/src/audio/codecs/audiocodec.h
index 1487fb465dce56cd9a5821ba8cd3a4695398adca..64710f2459863a3d58e6e3b6b5625d5ee63ea345 100644
--- a/sflphone-common/src/audio/codecs/audiocodec.h
+++ b/sflphone-common/src/audio/codecs/audiocodec.h
@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2009 Savoir-Faire Linux inc.
+ * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+ *
+ * Motly borrowed from asterisk's sources (Steve Underwood <steveu@coppice.org>)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
#ifndef _CODEC_AUDIO_H
#define _CODEC_AUDIO_H
diff --git a/sflphone-common/src/audio/codecs/g722.cpp b/sflphone-common/src/audio/codecs/g722.cpp
index 8118b5757e7b330b9271252bcfac53abebab0e6a..ee0ee37717dc72eb0f030cb1a473a69750499461 100644
--- a/sflphone-common/src/audio/codecs/g722.cpp
+++ b/sflphone-common/src/audio/codecs/g722.cpp
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright (C) 2009 Savoir-Faire Linux inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- **/
+ */
diff --git a/sflphone-common/src/audio/codecs/g722.h b/sflphone-common/src/audio/codecs/g722.h
index 4df3334c65b2a8a2d522758faaade819f1933056..9c7abcbb683bd64bc90eb8c50543b70ddde8557f 100644
--- a/sflphone-common/src/audio/codecs/g722.h
+++ b/sflphone-common/src/audio/codecs/g722.h
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright (C) 2009 Savoir-Faire Linux inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- **/
+ */
diff --git a/sflphone-common/src/audio/codecs/ulaw.cpp b/sflphone-common/src/audio/codecs/ulaw.cpp
index 9b619c31eccf80b1e6b946c08a911c4759bfa911..4a1448a023b2d3fef96392bca7d5ef0955c28634 100644
--- a/sflphone-common/src/audio/codecs/ulaw.cpp
+++ b/sflphone-common/src/audio/codecs/ulaw.cpp
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- **/
+ */
diff --git a/sflphone-common/src/audio/ringbuffer.h b/sflphone-common/src/audio/ringbuffer.h
index 96871f825db937f91a9cb1a3c6e1ed44f9d4a8cf..98110d62144f04095cf2014e5cefbd53efe644b4 100644
--- a/sflphone-common/src/audio/ringbuffer.h
+++ b/sflphone-common/src/audio/ringbuffer.h
@@ -1,21 +1,19 @@
/*
- * Copyright (C) 2004-2009 Savoir-Faire Linux inc.
+ * Copyright (C) 2007 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
- *
- * Portions Copyright (C) Dominic Mazzoni (Audacity)
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/sflphone-common/src/audio/sound/tonelist.cpp b/sflphone-common/src/audio/sound/tonelist.cpp
index d28d3a5520006975b78043ad6a6d57ba30b9a331..61d3014a9820b5d2f76cf9e12df298d0a63b9e06 100644
--- a/sflphone-common/src/audio/sound/tonelist.cpp
+++ b/sflphone-common/src/audio/sound/tonelist.cpp
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright (C) 2005 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
diff --git a/sflphone-common/src/audio/sound/tonelist.h b/sflphone-common/src/audio/sound/tonelist.h
index 849af15477a3d18e0d8f906bb324769fe7e32d4f..103ba52d6d5f2a54852f5af8a036147429a39905 100644
--- a/sflphone-common/src/audio/sound/tonelist.h
+++ b/sflphone-common/src/audio/sound/tonelist.h
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright (C) 2005 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
@@ -19,6 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#ifndef __TONELIST_H__
#define __TONELIST_H__
diff --git a/sflphone-common/src/dbus/callmanager.cpp b/sflphone-common/src/dbus/callmanager.cpp
index f4e4eef5da6df5e4164e15731db13c5c3382a295..c847d0d1e9c75c5ca109dc134d1ee82b746884d2 100644
--- a/sflphone-common/src/dbus/callmanager.cpp
+++ b/sflphone-common/src/dbus/callmanager.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright (C) 2007 Savoir-Faire Linux inc.
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
diff --git a/sflphone-common/src/manager.h b/sflphone-common/src/manager.h
index bd5f3fca2275348fe979868d5475009649880f86..f381fe75488a8857f577fab70340425b502e03b4 100644
--- a/sflphone-common/src/manager.h
+++ b/sflphone-common/src/manager.h
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author : Jean-Philippe Barrette-LaPierre
* <jean-philippe.barrette-lapierre@savoirfairelinux.com>
diff --git a/sflphone-common/src/sip/sdpmedia.cpp b/sflphone-common/src/sip/sdpmedia.cpp
index eaed9dfda3ee80ca55912baa958bfe9b3d294ce4..1a581a7c5e3e4e8c120936eb24521b712996efef 100644
--- a/sflphone-common/src/sip/sdpmedia.cpp
+++ b/sflphone-common/src/sip/sdpmedia.cpp
@@ -1,5 +1,4 @@
/*
- *
* Copyright (C) 2009 Savoir-Faire Linux inc.
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
diff --git a/sflphone-common/src/sip/testSdesNegotiator.cpp b/sflphone-common/src/sip/testSdesNegotiator.cpp
deleted file mode 100644
index 46f360f293c7d0eb4f118e28164c21af76d7080b..0000000000000000000000000000000000000000
--- a/sflphone-common/src/sip/testSdesNegotiator.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "SdesNegotiator.h"
-#include <vector>
-#include <iostream>
-
-int main (void)
-{
- std::vector<sfl::CryptoSuiteDefinition> localCapabilities;
- std::vector<std::string> remoteOffer;
-
- remoteOffer.push_back ("a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:d0RmdmcmVCspeEc3QGZiNWpVLFJhQX1cfHAwJSoj|2^20|1:32");
- remoteOffer.push_back ("a=crypto:1 AES_CM_128_HMAC_SHA1_32 inline:NzB4d1BINUAvLEw6UzF3WSJ+PSdFcGdUJShpX1Zj|2^20|1:32");
-
- sfl::SdesNegotiator sdesNegotiator (localCapabilities, remoteOffer);
-
- sdesNegotiator.negotiate();
-
- return 0;
-}