diff --git a/tools/picture/appl/main.cpp b/tools/picture/appl/main.cpp
index c0f4bf0..bb4ba0c 100644
--- a/tools/picture/appl/main.cpp
+++ b/tools/picture/appl/main.cpp
@@ -8,13 +8,13 @@
 #include <zeus/Service.hpp>
 #include <zeus/File.hpp>
 #include <etk/etk.hpp>
-#include <unistd.hpp>
+#include <unistd.h>
 #include <mutex>
 #include <ejson/ejson.hpp>
 #include <etk/os/FSNode.hpp>
 #include <sstream>
 
-#include <etk/stdTools.h>
+#include <etk/stdTools.hpp>
 namespace appl {
 	class User {
 		private:
diff --git a/zeus/Client.hpp b/zeus/Client.hpp
index 20f63a8..38af368 100644
--- a/zeus/Client.hpp
+++ b/zeus/Client.hpp
@@ -9,7 +9,7 @@
 #include <eproperty/Value.hpp>
 #include <zeus/debug.hpp>
 #include <chrono>
-#include <unistd.hpp>
+#include <unistd.h>
 #include <zeus/Future.hpp>
 #include <zeus/ServiceRemote.hpp>
 
diff --git a/zeus/File.cpp b/zeus/File.cpp
index 40f908d..e7e919e 100644
--- a/zeus/File.cpp
+++ b/zeus/File.cpp
@@ -9,7 +9,7 @@
 #include <etk/stdTools.hpp>
 #include <zeus/mineType.hpp>
 #include <etk/os/FSNode.hpp>
-#include <string.h>
+#include <cstring>
 
 
 
diff --git a/zeus/WebServer.cpp b/zeus/WebServer.cpp
index 419a118..24422fb 100644
--- a/zeus/WebServer.cpp
+++ b/zeus/WebServer.cpp
@@ -6,7 +6,7 @@
 #include <zeus/WebServer.hpp>
 #include <zeus/debug.hpp>
 #include <ethread/tools.hpp>
-#include <unistd.hpp>
+#include <unistd.h>
 #include <zeus/BufferData.hpp>