diff --git a/audio/orchestra/api/Alsa.cpp b/audio/orchestra/api/Alsa.cpp
index 446276c..007c95b 100644
--- a/audio/orchestra/api/Alsa.cpp
+++ b/audio/orchestra/api/Alsa.cpp
@@ -8,24 +8,24 @@
 
 #if defined(ORCHESTRA_BUILD_ALSA)
 
-#include <alsa/asoundlib.hpp>
-#include <unistd.hpp>
+#include <alsa/asoundlib.h>
+#include <unistd.h>
 #include <audio/orchestra/Interface.hpp>
 #include <audio/orchestra/debug.hpp>
 #include <etk/stdTools.hpp>
 #include <ethread/tools.hpp>
-#include <limits.h>
+#include <climits>
 #include <audio/orchestra/api/Alsa.hpp>
 extern "C" {
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sched.h>
-#include <errno.h>
 #include <getopt.h>
 #include <sys/time.h>
 #include <poll.h>
 }
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <cmath>
 
 ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Alsa::create() {
diff --git a/audio/orchestra/api/Android.cpp b/audio/orchestra/api/Android.cpp
index 73a2ad1..25e2f8c 100644
--- a/audio/orchestra/api/Android.cpp
+++ b/audio/orchestra/api/Android.cpp
@@ -13,7 +13,7 @@
 #include <audio/orchestra/debug.hpp>
 #include <audio/orchestra/api/AndroidNativeInterface.hpp>
 #include <audio/orchestra/api/Android.hpp>
-#include <limits.h>
+#include <climits>
 
 ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Android::create() {
 	ATA_INFO("Create Android device ... ");
diff --git a/audio/orchestra/api/CoreIos.mm b/audio/orchestra/api/CoreIos.mm
index 2e9fc53..9be51cf 100644
--- a/audio/orchestra/api/CoreIos.mm
+++ b/audio/orchestra/api/CoreIos.mm
@@ -11,10 +11,10 @@
 #import <AudioToolbox/AudioToolbox.h>
 
 #include <unistd.h>
-#include <audio/orchestra/Interface.h>
-#include <audio/orchestra/debug.h>
-#include <limits.h>
-#include <audio/orchestra/api/CoreIos.h>
+#include <audio/orchestra/Interface.hpp>
+#include <audio/orchestra/debug.hpp>
+#include <climits>
+#include <audio/orchestra/api/CoreIos.hpp>
 
 ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::CoreIos::create() {
 	ATA_INFO("Create CoreIos device ... ");
diff --git a/audio/orchestra/api/Ds.cpp b/audio/orchestra/api/Ds.cpp
index ee7c20d..4bbb9ea 100644
--- a/audio/orchestra/api/Ds.cpp
+++ b/audio/orchestra/api/Ds.cpp
@@ -25,7 +25,7 @@ ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Ds::create() {
 // Changed device query structure for RtAudio 4.0.7, January 2010
 
 #include <dsound.h>
-#include <assert.h>
+#include <cassert>
 #include <algorithm>
 
 #if defined(__MINGW32__)
diff --git a/audio/orchestra/api/Jack.cpp b/audio/orchestra/api/Jack.cpp
index b265bdd..ddfa2fc 100644
--- a/audio/orchestra/api/Jack.cpp
+++ b/audio/orchestra/api/Jack.cpp
@@ -8,11 +8,11 @@
 // must run before :          
 #if defined(ORCHESTRA_BUILD_JACK)
 #include <unistd.h>
-#include <limits.h>
+#include <climits>
 #include <iostream>
 #include <audio/orchestra/Interface.hpp>
 #include <audio/orchestra/debug.hpp>
-#include <string.h>
+#include <cstring>
 #include <ethread/tools.hpp>
 #include <audio/orchestra/api/Jack.hpp>
 
diff --git a/audio/orchestra/api/Pulse.cpp b/audio/orchestra/api/Pulse.cpp
index c70411b..5ac03c7 100644
--- a/audio/orchestra/api/Pulse.cpp
+++ b/audio/orchestra/api/Pulse.cpp
@@ -9,7 +9,7 @@
 #if defined(ORCHESTRA_BUILD_PULSE)
 
 #include <unistd.h>
-#include <limits.h>
+#include <climits>
 #include <audio/orchestra/Interface.hpp>
 #include <audio/orchestra/debug.hpp>
 #include <pulse/error.h>
diff --git a/audio/orchestra/api/PulseDeviceList.cpp b/audio/orchestra/api/PulseDeviceList.cpp
index 070943d..1f4b5d3 100644
--- a/audio/orchestra/api/PulseDeviceList.cpp
+++ b/audio/orchestra/api/PulseDeviceList.cpp
@@ -7,8 +7,8 @@
 
 #if defined(ORCHESTRA_BUILD_PULSE)
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <pulse/pulseaudio.hpp>
 #include <audio/orchestra/api/PulseDeviceList.hpp>
 #include <audio/orchestra/debug.hpp>
diff --git a/lutin_audio-orchestra.py b/lutin_audio-orchestra.py
index af5140a..86ed709 100644
--- a/lutin_audio-orchestra.py
+++ b/lutin_audio-orchestra.py
@@ -43,20 +43,20 @@ def create(target, module_name):
 		'audio/orchestra/api/Dummy.cpp'
 		])
 	my_module.add_header_file([
-		'audio/orchestra/debug.h',
-		'audio/orchestra/status.h',
-		'audio/orchestra/type.h',
-		'audio/orchestra/mode.h',
-		'audio/orchestra/state.h',
-		'audio/orchestra/error.h',
-		'audio/orchestra/base.h',
-		'audio/orchestra/Interface.h',
-		'audio/orchestra/Flags.h',
-		'audio/orchestra/Api.h',
-		'audio/orchestra/DeviceInfo.h',
-		'audio/orchestra/StreamOptions.h',
-		'audio/orchestra/CallbackInfo.h',
-		'audio/orchestra/StreamParameters.h'
+		'audio/orchestra/debug.hpp',
+		'audio/orchestra/status.hpp',
+		'audio/orchestra/type.hpp',
+		'audio/orchestra/mode.hpp',
+		'audio/orchestra/state.hpp',
+		'audio/orchestra/error.hpp',
+		'audio/orchestra/base.hpp',
+		'audio/orchestra/Interface.hpp',
+		'audio/orchestra/Flags.hpp',
+		'audio/orchestra/Api.hpp',
+		'audio/orchestra/DeviceInfo.hpp',
+		'audio/orchestra/StreamOptions.hpp',
+		'audio/orchestra/CallbackInfo.hpp',
+		'audio/orchestra/StreamParameters.hpp'
 		])
 	my_module.add_depend([
 	    'audio',