diff --git a/samples/sample_util/SampleApplication.h b/samples/sample_util/SampleApplication.h
index 407510bf7..174848dee 100644
--- a/samples/sample_util/SampleApplication.h
+++ b/samples/sample_util/SampleApplication.h
@@ -7,17 +7,17 @@
 #ifndef SAMPLE_UTIL_SAMPLE_APPLICATION_H
 #define SAMPLE_UTIL_SAMPLE_APPLICATION_H
 
+#include <list>
+#include <memory>
+#include <stdint.h>
+#include <string>
+
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
 #include "OSWindow.h"
 #include "Timer.h"
 
-#include <string>
-#include <list>
-#include <cstdint>
-#include <memory>
-
 class EGLWindow;
 
 class SampleApplication
diff --git a/samples/sample_util/tga_utils.cpp b/samples/sample_util/tga_utils.cpp
index 85ecd9b65..41a6d244e 100644
--- a/samples/sample_util/tga_utils.cpp
+++ b/samples/sample_util/tga_utils.cpp
@@ -6,10 +6,10 @@
 
 #include "tga_utils.h"
 
-#include <limits.h>
-#include <cstdint>
 #include <fstream>
 #include <iostream>
+#include <limits.h>
+#include <stdint.h>
 #include <string>
 
 TGAImage::TGAImage()
diff --git a/src/tests/gl_tests/BufferDataTest.cpp b/src/tests/gl_tests/BufferDataTest.cpp
index c1200485d..b5d9231bd 100644
--- a/src/tests/gl_tests/BufferDataTest.cpp
+++ b/src/tests/gl_tests/BufferDataTest.cpp
@@ -6,7 +6,7 @@
 
 #include "test_utils/ANGLETest.h"
 
-#include <cstdint>
+#include <stdint.h>
 
 using namespace angle;
 
diff --git a/util/EGLWindow.h b/util/EGLWindow.h
index a4d16ff39..7e321b9f8 100644
--- a/util/EGLWindow.h
+++ b/util/EGLWindow.h
@@ -7,17 +7,17 @@
 #ifndef UTIL_EGLWINDOW_H_
 #define UTIL_EGLWINDOW_H_
 
-#include <GLES3/gl3.h>
+#include <list>
+#include <memory>
+#include <stdint.h>
+#include <string>
+
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
+#include <GLES3/gl3.h>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
-#include <string>
-#include <list>
-#include <cstdint>
-#include <memory>
-
 #include "common/angleutils.h"
 
 class OSWindow;
diff --git a/util/OSWindow.h b/util/OSWindow.h
index 741d70912..6aa9e0e99 100644
--- a/util/OSWindow.h
+++ b/util/OSWindow.h
@@ -7,13 +7,14 @@
 #ifndef SAMPLE_UTIL_WINDOW_H
 #define SAMPLE_UTIL_WINDOW_H
 
-#include "Event.h"
+#include <list>
+#include <stdint.h>
+#include <string>
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
-#include <cstdint>
-#include <list>
-#include <string>
+
+#include "Event.h"
 
 class OSWindow
 {
diff --git a/util/osx/OSXTimer.h b/util/osx/OSXTimer.h
index 4cf3e6043..af1c278ba 100644
--- a/util/osx/OSXTimer.h
+++ b/util/osx/OSXTimer.h
@@ -9,8 +9,8 @@
 #ifndef UTIL_OSX_TIMER_H_
 #define UTIL_OSX_TIMER_H_
 
+#include <stdint.h>
 #include <time.h>
-#include <cstdint>
 
 #include "Timer.h"