Include windows.h from one place to ensure that min and max macros are not defined.

src/common/debug.cpp

@@ -10,8 +10,9 @@
 
 #include <stdio.h>
 #include <stdarg.h>
+
+#include "common/system.h"
 #include <d3d9.h>
-#include <windows.h>
 
 namespace gl
 {

src/libEGL/Display.h

@@ -11,10 +11,7 @@
 #ifndef LIBEGL_DISPLAY_H_
 #define LIBEGL_DISPLAY_H_
 
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
+#include "common/system.h"
 #include <d3d9.h>
 #include <D3Dcompiler.h>
 

src/libGLESv2/D3DConstantTable.cpp

@@ -11,9 +11,9 @@
 
 #include "libGLESv2/D3DConstantTable.h"
 
+#include "common/system.h"
 #include <d3d9.h>
 #include <d3d9types.h>
-#include <windows.h>
 #include <mmsystem.h>
 
 #include "libGLESv2/BinaryStream.h"

src/libGLESv2/mathutil.h

@@ -11,7 +11,8 @@
 
 #include <intrin.h>
 #include <math.h>
-#include <windows.h>
+
+#include "common/system.h"
 
 namespace gl
 {

src/libGLESv2/utilities.cpp

@@ -10,10 +10,9 @@
 
 #include <limits>
 #include <stdio.h>
-#include <windows.h>
 
 #include "common/debug.h"
-
+#include "common/system.h"
 #include "libGLESv2/mathutil.h"
 #include "libGLESv2/Context.h"