diff --git a/audio/orchestra/api/Alsa.cpp b/audio/orchestra/api/Alsa.cpp
index 007c95b..79cb395 100644
--- a/audio/orchestra/api/Alsa.cpp
+++ b/audio/orchestra/api/Alsa.cpp
@@ -9,7 +9,7 @@
 #if defined(ORCHESTRA_BUILD_ALSA)
 
 #include <alsa/asoundlib.h>
-#include <unistd.h>
+
 #include <audio/orchestra/Interface.hpp>
 #include <audio/orchestra/debug.hpp>
 #include <etk/stdTools.hpp>
@@ -1167,7 +1167,7 @@ void audio::orchestra::api::Alsa::callbackEventOneCycleRead() {
 			}
 		} else {
 			ATA_ERROR("audio read error, " << snd_strerror(result) << ".");
-			usleep(10000);
+			std::this_thread::sleep_for(std::chrono::milliseconds(10));
 		}
 		// TODO : Notify application ... audio::orchestra::error_warning;
 		goto noInput;
@@ -1521,7 +1521,7 @@ void audio::orchestra::api::Alsa::callbackEventOneCycleMMAPRead() {
 				}
 			} else {
 				ATA_ERROR("audio read error, " << snd_strerror(result) << ".");
-				usleep(10000);
+				std::this_thread::sleep_for(std::chrono::milliseconds(10));
 			}
 			// TODO : Notify application ... audio::orchestra::error_warning;
 			goto noInput;
diff --git a/audio/orchestra/api/Android.cpp b/audio/orchestra/api/Android.cpp
index 25e2f8c..b733114 100644
--- a/audio/orchestra/api/Android.cpp
+++ b/audio/orchestra/api/Android.cpp
@@ -8,7 +8,7 @@
 #ifdef ORCHESTRA_BUILD_JAVA
 
 //#include <ewol/context/Context.h>
-#include <unistd.h>
+
 #include <audio/orchestra/Interface.hpp>
 #include <audio/orchestra/debug.hpp>
 #include <audio/orchestra/api/AndroidNativeInterface.hpp>
diff --git a/audio/orchestra/api/Core.cpp b/audio/orchestra/api/Core.cpp
index 5933a8b..27b37f5 100644
--- a/audio/orchestra/api/Core.cpp
+++ b/audio/orchestra/api/Core.cpp
@@ -635,7 +635,7 @@ bool audio::orchestra::api::Core::open(uint32_t _device,
 			if (microCounter > 5000000) {
 				break;
 			}
-			usleep(5000);
+			std::this_thread::sleep_for(std::chrono::milliseconds(5));
 		}
 		// Remove the property listener.
 		AudioObjectRemovePropertyListener(id, &tmp, &rateListener, (void *) &reportedRate);
diff --git a/audio/orchestra/api/CoreIos.mm b/audio/orchestra/api/CoreIos.mm
index 9be51cf..fba2031 100644
--- a/audio/orchestra/api/CoreIos.mm
+++ b/audio/orchestra/api/CoreIos.mm
@@ -10,7 +10,7 @@
 #import <Foundation/Foundation.h>
 #import <AudioToolbox/AudioToolbox.h>
 
-#include <unistd.h>
+
 #include <audio/orchestra/Interface.hpp>
 #include <audio/orchestra/debug.hpp>
 #include <climits>
diff --git a/audio/orchestra/api/Jack.cpp b/audio/orchestra/api/Jack.cpp
index ddfa2fc..00bad7f 100644
--- a/audio/orchestra/api/Jack.cpp
+++ b/audio/orchestra/api/Jack.cpp
@@ -7,7 +7,7 @@
 
 // must run before :          
 #if defined(ORCHESTRA_BUILD_JACK)
-#include <unistd.h>
+
 #include <climits>
 #include <iostream>
 #include <audio/orchestra/Interface.hpp>
@@ -52,7 +52,7 @@ ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Jack::create()
 // stream cannot be opened.
 
 #include <jack/jack.h>
-#include <unistd.h>
+
 #include <cstdio>
 
 
diff --git a/audio/orchestra/api/Pulse.cpp b/audio/orchestra/api/Pulse.cpp
index 5ac03c7..c6e8d98 100644
--- a/audio/orchestra/api/Pulse.cpp
+++ b/audio/orchestra/api/Pulse.cpp
@@ -8,7 +8,7 @@
 
 #if defined(ORCHESTRA_BUILD_PULSE)
 
-#include <unistd.h>
+
 #include <climits>
 #include <audio/orchestra/Interface.hpp>
 #include <audio/orchestra/debug.hpp>
diff --git a/tools/orchestra-in.cpp b/tools/orchestra-in.cpp
index d88f669..c100438 100644
--- a/tools/orchestra-in.cpp
+++ b/tools/orchestra-in.cpp
@@ -6,7 +6,7 @@
 
 #include <etk/etk.hpp>
 #include <test-debug/debug.hpp>
-#include <unistd.h>
+
 #include <audio/orchestra/Interface.hpp>
 
 int main(int _argc, const char **_argv) {
diff --git a/tools/orchestra-list.cpp b/tools/orchestra-list.cpp
index 67315fa..0b75ced 100644
--- a/tools/orchestra-list.cpp
+++ b/tools/orchestra-list.cpp
@@ -6,7 +6,7 @@
 
 #include <etk/etk.hpp>
 #include <test-debug/debug.hpp>
-#include <unistd.h>
+
 #include <audio/orchestra/Interface.hpp>
 
 int main(int _argc, const char **_argv) {
diff --git a/tools/orchestra-out.cpp b/tools/orchestra-out.cpp
index 0671e4c..180a483 100644
--- a/tools/orchestra-out.cpp
+++ b/tools/orchestra-out.cpp
@@ -6,7 +6,7 @@
 
 #include <etk/etk.hpp>
 #include <test-debug/debug.hpp>
-#include <unistd.h>
+
 #include <audio/orchestra/Interface.hpp>
 
 int main(int _argc, const char **_argv) {