diff --git a/gale/context/Android/Context.cpp b/gale/context/Android/Context.cpp
index dc67d82..06ada80 100644
--- a/gale/context/Android/Context.cpp
+++ b/gale/context/Android/Context.cpp
@@ -7,7 +7,7 @@
 #include <jni.h>
 #include <sys/time.h>
 #include <time.h>
-#include <stdint.h>
+#include <cstdint>
 #include <pthread.h>
 #include <mutex>
 #include <gale/debug.hpp>
diff --git a/gale/context/IOs/AppDelegate.mm b/gale/context/IOs/AppDelegate.mm
index 54dfa9f..2638776 100644
--- a/gale/context/IOs/AppDelegate.mm
+++ b/gale/context/IOs/AppDelegate.mm
@@ -5,12 +5,12 @@
  */
 
 #import <UIKit/UIKit.h>
-#include "gale/context/IOs/Interface.h"
+#include "gale/context/IOs/Interface.hpp"
 
-#import <gale/context/IOs/OpenglView.h>
-#import <gale/context/IOs/AppDelegate.h>
-#include <gale/context/IOs/Context.h>
-#include <gale/debug.h>
+#import <gale/context/IOs/OpenglView.hpp>
+#import <gale/context/IOs/AppDelegate.hpp>
+#include <gale/context/IOs/Context.hpp>
+#include <gale/debug.hpp>
 
 @implementation AppDelegate
 
diff --git a/gale/context/IOs/Context.cpp b/gale/context/IOs/Context.cpp
index 7815de2..c224fdf 100644
--- a/gale/context/IOs/Context.cpp
+++ b/gale/context/IOs/Context.cpp
@@ -18,9 +18,9 @@
 #include <gale/context/IOs/Interface.h>
 #include <gale/context/IOs/Context.hpp>
 #include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 
 
 #include <sys/times.h>
diff --git a/gale/context/IOs/Interface.m b/gale/context/IOs/Interface.m
index 67e077b..f40f093 100644
--- a/gale/context/IOs/Interface.m
+++ b/gale/context/IOs/Interface.m
@@ -7,7 +7,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <gale/context/IOs/AppDelegate.h>
+#import <gale/context/IOs/AppDelegate.hpp>
 //#import "AppDelegate.h"
 
 
diff --git a/gale/context/IOs/OpenglView.mm b/gale/context/IOs/OpenglView.mm
index 2425fca..77c5fb1 100644
--- a/gale/context/IOs/OpenglView.mm
+++ b/gale/context/IOs/OpenglView.mm
@@ -7,15 +7,15 @@
 
 #import <QuartzCore/QuartzCore.h>
 #import <OpenGLES/EAGLDrawable.h>
-#include <gale/context/IOs/Context.h>
-#include <gale/Dimension.h>
+#include <gale/context/IOs/Context.hpp>
+#include <gale/Dimension.hpp>
 
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
 
-#import "OpenglView.h"
-#include <gale/debug.h>
+#import "OpenglView.hpp"
+#include <gale/debug.hpp>
 
 
 @interface OpenglView ()
diff --git a/gale/context/MacOs/AppDelegate.mm b/gale/context/MacOs/AppDelegate.mm
index 031c969..551141b 100644
--- a/gale/context/MacOs/AppDelegate.mm
+++ b/gale/context/MacOs/AppDelegate.mm
@@ -5,10 +5,10 @@
  */
 
 
-#import <gale/context/MacOs/AppDelegate.h>
-#import <gale/context/MacOs/OpenglView.h>
+#import <gale/context/MacOs/AppDelegate.hpp>
+#import <gale/context/MacOs/OpenglView.hpp>
 
-#include <gale/debug.h>
+#include <gale/debug.hpp>
 
 @implementation MacOsAppDelegate
 @synthesize window=_window;
diff --git a/gale/context/MacOs/Context.mm b/gale/context/MacOs/Context.mm
index d67f421..7fbd0ed 100644
--- a/gale/context/MacOs/Context.mm
+++ b/gale/context/MacOs/Context.mm
@@ -5,19 +5,19 @@
  */
 
 
-#include <gale/debug.h>
-#include <gale/gale.h>
-#include <gale/key/key.h>
-#include <gale/context/commandLine.h>
-#include <gale/context/clipBoard.h>
-#include <etk/types.h>
-#include <etk/os/FSNode.h>
+#include <gale/debug.hpp>
+#include <gale/gale.hpp>
+#include <gale/key/key.hpp>
+#include <gale/context/commandLine.hpp>
+#include <gale/context/clipBoard.hpp>
+#include <etk/types.hpp>
+#include <etk/os/FSNode.hpp>
 
-#include <gale/resource/Manager.h>
-#include <gale/context/Context.h>
+#include <gale/resource/Manager.hpp>
+#include <gale/context/Context.hpp>
 
-#include <gale/context/MacOs/Interface.h>
-#include <gale/context/MacOs/Context.h>
+#include <gale/context/MacOs/Interface.hpp>
+#include <gale/context/MacOs/Context.hpp>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/gale/context/MacOs/Interface.mm b/gale/context/MacOs/Interface.mm
index f226664..2a61b02 100644
--- a/gale/context/MacOs/Interface.mm
+++ b/gale/context/MacOs/Interface.mm
@@ -3,14 +3,14 @@
  * @copyright 2011, Edouard DUPIN, all right reserved
  * @license APACHE v2.0 (see license file)
  */
-#include "Context.h"
+#include "Context.hpp"
 #import <Cocoa/Cocoa.h>
-#include "gale/context/MacOs/Interface.h"
+#include "gale/context/MacOs/Interface.hpp"
 
-#import <gale/context/MacOs/OpenglView.h>
-#import <gale/context/MacOs/Windows.h>
-#import <gale/context/MacOs/AppDelegate.h>
-#import <gale/debug.h>
+#import <gale/context/MacOs/OpenglView.hpp>
+#import <gale/context/MacOs/Windows.hpp>
+#import <gale/context/MacOs/AppDelegate.hpp>
+#import <gale/debug.hpp>
 
 id window = nil;
 
diff --git a/gale/context/MacOs/OpenglView.mm b/gale/context/MacOs/OpenglView.mm
index c5f093a..83fa54d 100644
--- a/gale/context/MacOs/OpenglView.mm
+++ b/gale/context/MacOs/OpenglView.mm
@@ -5,11 +5,11 @@
  */
 
 
-#import <gale/context/MacOs/OpenglView.h>
+#import <gale/context/MacOs/OpenglView.hpp>
 #include <OpenGL/gl.h>
-#include <gale/context/MacOS/Context.h>
-#include <gale/debug.h>
-#include <gale/Dimension.h>
+#include <gale/context/MacOS/Context.hpp>
+#include <gale/debug.hpp>
+#include <gale/Dimension.hpp>
 
 
 @implementation OpenGLView
diff --git a/gale/context/MacOs/Windows.mm b/gale/context/MacOs/Windows.mm
index e3bd4fc..3b5b18d 100644
--- a/gale/context/MacOs/Windows.mm
+++ b/gale/context/MacOs/Windows.mm
@@ -5,12 +5,12 @@
  */
 
 
-#import <gale/context/MacOs/Windows.h>
-#include <gale/context/MacOS/Context.h>
-#include <gale/key/key.h>
+#import <gale/context/MacOs/Windows.hpp>
+#include <gale/context/MacOS/Context.hpp>
+#include <gale/key/key.hpp>
 
-#include <gale/debug.h>
-#include <etk/stdTools.h>
+#include <gale/debug.hpp>
+#include <etk/stdTools.hpp>
 
 @implementation GaleMainWindows
 
diff --git a/gale/context/X11/Context.cpp b/gale/context/X11/Context.cpp
index 031bc2d..922e6a4 100644
--- a/gale/context/X11/Context.cpp
+++ b/gale/context/X11/Context.cpp
@@ -5,9 +5,9 @@
  */
 
 #include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 
 #include <etk/types.hpp>
 #include <etk/os/FSNode.hpp>
@@ -93,7 +93,7 @@ extern "C" {
 }
 
 #ifdef GALE_BUILD_EGAMI
-	#include <egami/egami.h>
+	#include <egami/egami.hpp>
 #endif
 
 #include <X11/cursorfont.h>
diff --git a/gale/context/directFB/Context.cpp b/gale/context/directFB/Context.cpp
index 477e327..af87ada 100644
--- a/gale/context/directFB/Context.cpp
+++ b/gale/context/directFB/Context.cpp
@@ -37,9 +37,9 @@
 #include <gale/openGL/openGL.hpp>
 
 #include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 
 #include <directfb.h>
 #include <directfbgl.h>