diff --git a/audio/drain/Algo.cpp b/audio/drain/Algo.cpp
index 26e8a38..28e6dfd 100644
--- a/audio/drain/Algo.cpp
+++ b/audio/drain/Algo.cpp
@@ -7,10 +7,6 @@
 #include <functional>
 #include "debug.h"
 
-
-#undef __class__
-#define __class__ "Algo"
-
 audio::drain::Algo::Algo() :
   m_temporary(false),
   m_outputData(),
@@ -114,4 +110,4 @@ void audio::drain::Algo::generateStatus(const std::string& _status) {
 			m_statusFunction(m_name, _status);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/audio/drain/ChannelReorder.cpp b/audio/drain/ChannelReorder.cpp
index d9b6499..f1d7f9a 100644
--- a/audio/drain/ChannelReorder.cpp
+++ b/audio/drain/ChannelReorder.cpp
@@ -10,9 +10,6 @@
 #include "debug.h"
 
 
-#undef __class__
-#define __class__ "ChannelReorder"
-
 audio::drain::ChannelReorder::ChannelReorder() {
 	
 }
diff --git a/audio/drain/EndPointCallback.cpp b/audio/drain/EndPointCallback.cpp
index edf8a52..a1a63a3 100644
--- a/audio/drain/EndPointCallback.cpp
+++ b/audio/drain/EndPointCallback.cpp
@@ -7,8 +7,6 @@
 #include <audio/drain/EndPointCallback.h>
 #include <audio/drain/debug.h>
 
-#undef __class__
-#define __class__ "EndPointCallback"
 
 audio::drain::EndPointCallback::EndPointCallback() :
   m_outputFunction(nullptr),
diff --git a/audio/drain/EndPointRead.cpp b/audio/drain/EndPointRead.cpp
index 9dc6041..9241c63 100644
--- a/audio/drain/EndPointRead.cpp
+++ b/audio/drain/EndPointRead.cpp
@@ -7,8 +7,6 @@
 #include <audio/drain/EndPointRead.h>
 #include <audio/drain/debug.h>
 
-#undef __class__
-#define __class__ "EndPointRead"
 
 audio::drain::EndPointRead::EndPointRead() {
 	
diff --git a/audio/drain/EndPointWrite.cpp b/audio/drain/EndPointWrite.cpp
index 62834f8..2fa4e30 100644
--- a/audio/drain/EndPointWrite.cpp
+++ b/audio/drain/EndPointWrite.cpp
@@ -7,9 +7,6 @@
 #include <audio/drain/debug.h>
 
 
-#undef __class__
-#define __class__ "EndPointWrite"
-
 audio::drain::EndPointWrite::EndPointWrite() :
   m_function(nullptr),
   m_bufferSizeMicroseconds(1000000) {
diff --git a/audio/drain/FormatUpdate.cpp b/audio/drain/FormatUpdate.cpp
index b27ce76..98e329a 100644
--- a/audio/drain/FormatUpdate.cpp
+++ b/audio/drain/FormatUpdate.cpp
@@ -8,9 +8,6 @@
 #include <iostream>
 #include <audio/drain/debug.h>
 
-#undef __class__
-#define __class__ "FormatUpdate"
-
 #ifndef INT16_MAX
 	#define INT16_MAX 0x7fff
 #endif
diff --git a/audio/drain/IOFormatInterface.cpp b/audio/drain/IOFormatInterface.cpp
index ffad731..d42c78f 100644
--- a/audio/drain/IOFormatInterface.cpp
+++ b/audio/drain/IOFormatInterface.cpp
@@ -7,10 +7,6 @@
 #include "IOFormatInterface.h"
 #include "debug.h"
 
-#undef __class__
-#define __class__ "IOFormatInterface"
-
-
 std::ostream& audio::drain::operator <<(std::ostream& _os, const IOFormatInterface& _obj) {
 	_os << "{";
 	if (_obj.getConfigured() == false) {
diff --git a/audio/drain/Process.cpp b/audio/drain/Process.cpp
index 65f59d5..28d1d5b 100644
--- a/audio/drain/Process.cpp
+++ b/audio/drain/Process.cpp
@@ -15,9 +15,6 @@
 #include <audio/drain/Resampler.h>
 #include <audio/drain/debug.h>
 
-#undef __class__
-#define __class__ "Process"
-
 audio::drain::Process::Process() :
   m_isConfigured(false) {
 	m_data.clear();
diff --git a/audio/drain/Resampler.cpp b/audio/drain/Resampler.cpp
index 6e81333..8e245b5 100644
--- a/audio/drain/Resampler.cpp
+++ b/audio/drain/Resampler.cpp
@@ -8,9 +8,6 @@
 #include <iostream>
 #include <audio/drain/debug.h>
 
-#undef __class__
-#define __class__ "Resampler"
-
 audio::drain::Resampler::Resampler() :
   #ifdef HAVE_SPEEX_DSP_RESAMPLE
     m_speexResampler(nullptr),
diff --git a/audio/drain/Volume.cpp b/audio/drain/Volume.cpp
index bfd9474..7d99dc0 100644
--- a/audio/drain/Volume.cpp
+++ b/audio/drain/Volume.cpp
@@ -9,9 +9,6 @@
 #include <math.h>
 #include <audio/drain/debug.h>
 
-#undef __class__
-#define __class__ "Volume"
-
 audio::drain::Volume::Volume() :
   m_volumeAppli(1.0f),
   m_functionConvert(nullptr) {
diff --git a/audio/drain/airtalgo.cpp b/audio/drain/airtalgo.cpp
index 5cbd002..7354aa7 100644
--- a/audio/drain/airtalgo.cpp
+++ b/audio/drain/airtalgo.cpp
@@ -7,6 +7,3 @@
 #include "debug.h"
 
 
-#undef __class__
-#define __class__ ""
-
diff --git a/audio/drain/debugRemove.h b/audio/drain/debugRemove.h
index 54e08e0..0413500 100644
--- a/audio/drain/debugRemove.h
+++ b/audio/drain/debugRemove.h
@@ -1,9 +1,7 @@
-/**
- * @author Edouard DUPIN
- * 
+/** @file
+ * @author Edouard DUPIN 
  * @copyright 2011, Edouard DUPIN, all right reserved
- * 
- * @license BSD 3 clauses (see license file)
+ * @license APACHE v2.0 (see license file)
  */
 
 #ifdef __AUDIO_DRAIN_DEBUG_H__
diff --git a/test/main.cpp b/test/main.cpp
index 8c6aadd..328d773 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -8,10 +8,6 @@
 #include <test-debug/debug.h>
 #include <gtest/gtest.h>
 
-
-#undef __class__
-#define __class__ "test"
-
 int main(int _argc, const char** _argv) {
 	// init Google test :
 	::testing::InitGoogleTest(&_argc, const_cast<char **>(_argv));
diff --git a/tools/drainBiQuadProfiling/appl/Windows.cpp b/tools/drainBiQuadProfiling/appl/Windows.cpp
index bf87067..3a036b4 100644
--- a/tools/drainBiQuadProfiling/appl/Windows.cpp
+++ b/tools/drainBiQuadProfiling/appl/Windows.cpp
@@ -1,9 +1,7 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license APACHE-2 (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2011, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 
 #include <etk/types.h>
@@ -16,10 +14,7 @@
 #include <ewol/widget/Slider.h>
 #include <audio/drain/Equalizer.h>
 
-#undef __class__
-#define __class__ "Windows"
-
-#define APPL_SAVE_FILE_MACRO(type,fileName,dataPointer,nbElement) \
+define APPL_SAVE_FILE_MACRO(type,fileName,dataPointer,nbElement) \
 	do { \
 		static FILE *pointerOnFile = nullptr; \
 		static bool errorOpen = false; \
diff --git a/tools/drainBiQuadProfiling/appl/Windows.h b/tools/drainBiQuadProfiling/appl/Windows.h
index c880a61..a464a08 100644
--- a/tools/drainBiQuadProfiling/appl/Windows.h
+++ b/tools/drainBiQuadProfiling/appl/Windows.h
@@ -1,9 +1,7 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license APACHE-2 (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2011, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 #pragma once
 
diff --git a/tools/drainBiQuadProfiling/appl/debug.cpp b/tools/drainBiQuadProfiling/appl/debug.cpp
index fe697d2..39a482f 100644
--- a/tools/drainBiQuadProfiling/appl/debug.cpp
+++ b/tools/drainBiQuadProfiling/appl/debug.cpp
@@ -1,9 +1,7 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license APACHE-2 (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2011, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 
 
diff --git a/tools/drainBiQuadProfiling/appl/debug.h b/tools/drainBiQuadProfiling/appl/debug.h
index 35c7a7c..0ee9d62 100644
--- a/tools/drainBiQuadProfiling/appl/debug.h
+++ b/tools/drainBiQuadProfiling/appl/debug.h
@@ -1,9 +1,7 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license APACHE-2 (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2011, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 #pragma once
 
diff --git a/tools/drainBiQuadProfiling/appl/main.cpp b/tools/drainBiQuadProfiling/appl/main.cpp
index 40ba8d4..ba0cef2 100644
--- a/tools/drainBiQuadProfiling/appl/main.cpp
+++ b/tools/drainBiQuadProfiling/appl/main.cpp
@@ -1,9 +1,7 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license GPL v3 (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2011, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 
 
diff --git a/tools/drainBiQuadProfiling/appl/main.h b/tools/drainBiQuadProfiling/appl/main.h
index afaac04..49994f4 100644
--- a/tools/drainBiQuadProfiling/appl/main.h
+++ b/tools/drainBiQuadProfiling/appl/main.h
@@ -1,9 +1,7 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license APACHE-2 (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2011, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 #pragma once
 
diff --git a/tools/drainBiQuadProfiling/appl/widget/DisplayFrequency.cpp b/tools/drainBiQuadProfiling/appl/widget/DisplayFrequency.cpp
index 84c971e..fd52df4 100644
--- a/tools/drainBiQuadProfiling/appl/widget/DisplayFrequency.cpp
+++ b/tools/drainBiQuadProfiling/appl/widget/DisplayFrequency.cpp
@@ -1,19 +1,13 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license APACHE-2 (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2011, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 
 #include <appl/widget/DisplayFrequency.h>
 #include <appl/debug.h>
 #include <etk/tool.h>
 
-#undef __class__
-#define __class__ "DisplayFrequency"
-
-
 appl::widget::DisplayFrequency::DisplayFrequency() :
   m_gainMin(0.0f),
   m_gainMax(1.0f),
diff --git a/tools/drainBiQuadProfiling/appl/widget/DisplayFrequency.h b/tools/drainBiQuadProfiling/appl/widget/DisplayFrequency.h
index 5ce69e1..a7511c1 100644
--- a/tools/drainBiQuadProfiling/appl/widget/DisplayFrequency.h
+++ b/tools/drainBiQuadProfiling/appl/widget/DisplayFrequency.h
@@ -1,9 +1,7 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license APACHE-2 (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2011, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 #pragma once
 
diff --git a/tools/drainEqualizerProfiling/appl/Windows.cpp b/tools/drainEqualizerProfiling/appl/Windows.cpp
index 8b4e226..c008161 100644
--- a/tools/drainEqualizerProfiling/appl/Windows.cpp
+++ b/tools/drainEqualizerProfiling/appl/Windows.cpp
@@ -1,9 +1,7 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license APACHE-2 (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2011, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 
 #include <ewol/ewol.h>
@@ -14,9 +12,6 @@
 #include <ewol/widget/Button.h>
 #include <ewol/widget/Slider.h>
 
-#undef __class__
-#define __class__ "Windows"
-
 #define APPL_SAVE_FILE_MACRO(type,fileName,dataPointer,nbElement) \
 	do { \
 		static FILE *pointerOnFile = nullptr; \
diff --git a/tools/drainEqualizerProfiling/appl/Windows.h b/tools/drainEqualizerProfiling/appl/Windows.h
index c96c44e..db01995 100644
--- a/tools/drainEqualizerProfiling/appl/Windows.h
+++ b/tools/drainEqualizerProfiling/appl/Windows.h
@@ -1,9 +1,7 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license APACHE-2 (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2011, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 #pragma once
 
diff --git a/tools/drainEqualizerProfiling/appl/debug.cpp b/tools/drainEqualizerProfiling/appl/debug.cpp
index fe697d2..39a482f 100644
--- a/tools/drainEqualizerProfiling/appl/debug.cpp
+++ b/tools/drainEqualizerProfiling/appl/debug.cpp
@@ -1,9 +1,7 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license APACHE-2 (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2011, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 
 
diff --git a/tools/drainEqualizerProfiling/appl/debug.h b/tools/drainEqualizerProfiling/appl/debug.h
index 35c7a7c..0ee9d62 100644
--- a/tools/drainEqualizerProfiling/appl/debug.h
+++ b/tools/drainEqualizerProfiling/appl/debug.h
@@ -1,9 +1,7 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license APACHE-2 (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2011, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 #pragma once
 
diff --git a/tools/drainEqualizerProfiling/appl/main.cpp b/tools/drainEqualizerProfiling/appl/main.cpp
index 40ba8d4..ba0cef2 100644
--- a/tools/drainEqualizerProfiling/appl/main.cpp
+++ b/tools/drainEqualizerProfiling/appl/main.cpp
@@ -1,9 +1,7 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license GPL v3 (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2011, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 
 
diff --git a/tools/drainEqualizerProfiling/appl/main.h b/tools/drainEqualizerProfiling/appl/main.h
index afaac04..49994f4 100644
--- a/tools/drainEqualizerProfiling/appl/main.h
+++ b/tools/drainEqualizerProfiling/appl/main.h
@@ -1,9 +1,7 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license APACHE-2 (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2011, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 #pragma once
 
diff --git a/tools/drainEqualizerProfiling/appl/widget/DisplayFrequency.cpp b/tools/drainEqualizerProfiling/appl/widget/DisplayFrequency.cpp
index 6911aaa..d00922a 100644
--- a/tools/drainEqualizerProfiling/appl/widget/DisplayFrequency.cpp
+++ b/tools/drainEqualizerProfiling/appl/widget/DisplayFrequency.cpp
@@ -1,19 +1,13 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license APACHE-2 (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2011, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 
 #include <appl/widget/DisplayFrequency.h>
 #include <appl/debug.h>
 #include <etk/tool.h>
 
-#undef __class__
-#define __class__ "DisplayFrequency"
-
-
 appl::widget::DisplayFrequency::DisplayFrequency() :
   m_gainMin(0.0f),
   m_gainMax(1.0f),
diff --git a/tools/drainEqualizerProfiling/appl/widget/DisplayFrequency.h b/tools/drainEqualizerProfiling/appl/widget/DisplayFrequency.h
index 5ce69e1..a7511c1 100644
--- a/tools/drainEqualizerProfiling/appl/widget/DisplayFrequency.h
+++ b/tools/drainEqualizerProfiling/appl/widget/DisplayFrequency.h
@@ -1,9 +1,7 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license APACHE-2 (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2011, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 #pragma once