From 1fb4d1d63d8b18b4819461179513295b29227608 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 4 Jan 2014 10:35:13 +0000
Subject: [PATCH] [MESA] * Create main headers for MESA components and move
 some inclusions to them. CORE-7716

svn path=/trunk/; revision=61521
---
 reactos/dll/opengl/mesa/main/accum.c          | 13 +--
 reactos/dll/opengl/mesa/main/api_arrayelt.c   | 10 +--
 reactos/dll/opengl/mesa/main/api_exec.c       | 54 +-----------
 reactos/dll/opengl/mesa/main/api_loopback.c   |  8 +-
 reactos/dll/opengl/mesa/main/api_validate.c   | 10 +--
 reactos/dll/opengl/mesa/main/arrayobj.c       | 15 +---
 reactos/dll/opengl/mesa/main/attrib.c         | 39 +--------
 reactos/dll/opengl/mesa/main/blend.c          | 11 +--
 reactos/dll/opengl/mesa/main/bufferobj.c      | 13 +--
 reactos/dll/opengl/mesa/main/buffers.c        | 12 +--
 reactos/dll/opengl/mesa/main/clear.c          | 14 +---
 reactos/dll/opengl/mesa/main/clip.c           | 10 +--
 reactos/dll/opengl/mesa/main/colortab.c       | 16 +---
 reactos/dll/opengl/mesa/main/context.c        | 49 +----------
 reactos/dll/opengl/mesa/main/convolve.c       | 12 +--
 reactos/dll/opengl/mesa/main/cpuinfo.c        |  5 +-
 reactos/dll/opengl/mesa/main/depth.c          | 10 +--
 reactos/dll/opengl/mesa/main/dlist.c          | 31 +------
 reactos/dll/opengl/mesa/main/dlopen.c         |  3 +-
 reactos/dll/opengl/mesa/main/drawpix.c        | 15 +---
 reactos/dll/opengl/mesa/main/enable.c         | 14 +---
 reactos/dll/opengl/mesa/main/enums.c          |  6 +-
 reactos/dll/opengl/mesa/main/eval.c           | 13 +--
 reactos/dll/opengl/mesa/main/execmem.c        |  6 +-
 reactos/dll/opengl/mesa/main/extensions.c     |  8 +-
 reactos/dll/opengl/mesa/main/feedback.c       | 12 +--
 reactos/dll/opengl/mesa/main/fog.c            | 10 +--
 reactos/dll/opengl/mesa/main/format_pack.c    |  6 +-
 reactos/dll/opengl/mesa/main/format_unpack.c  |  7 +-
 reactos/dll/opengl/mesa/main/formats.c        |  7 +-
 reactos/dll/opengl/mesa/main/framebuffer.c    | 16 +---
 reactos/dll/opengl/mesa/main/get.c            | 12 +--
 reactos/dll/opengl/mesa/main/getstring.c      | 11 +--
 reactos/dll/opengl/mesa/main/hash.c           |  6 +-
 reactos/dll/opengl/mesa/main/hint.c           | 10 +--
 reactos/dll/opengl/mesa/main/histogram.c      |  8 +-
 reactos/dll/opengl/mesa/main/image.c          | 12 +--
 reactos/dll/opengl/mesa/main/imports.c        |  7 +-
 reactos/dll/opengl/mesa/main/light.c          | 12 +--
 reactos/dll/opengl/mesa/main/lines.c          |  8 +-
 reactos/dll/opengl/mesa/main/matrix.c         | 12 +--
 reactos/dll/opengl/mesa/main/mm.c             |  6 +-
 reactos/dll/opengl/mesa/main/multisample.c    |  8 +-
 reactos/dll/opengl/mesa/main/pack.c           | 13 +--
 reactos/dll/opengl/mesa/main/pixel.c          | 12 +--
 reactos/dll/opengl/mesa/main/pixelstore.c     |  9 +-
 reactos/dll/opengl/mesa/main/pixeltransfer.c  |  9 +-
 reactos/dll/opengl/mesa/main/points.c         |  8 +-
 reactos/dll/opengl/mesa/main/polygon.c        | 11 +--
 reactos/dll/opengl/mesa/main/precomp.h        | 83 +++++++++++++++++++
 reactos/dll/opengl/mesa/main/rastpos.c        | 11 +--
 reactos/dll/opengl/mesa/main/readpix.c        | 15 +---
 reactos/dll/opengl/mesa/main/renderbuffer.c   |  9 +-
 reactos/dll/opengl/mesa/main/scissor.c        |  7 +-
 reactos/dll/opengl/mesa/main/shared.c         |  9 +-
 reactos/dll/opengl/mesa/main/state.c          | 16 +---
 reactos/dll/opengl/mesa/main/stencil.c        |  9 +-
 reactos/dll/opengl/mesa/main/texenv.c         | 11 +--
 reactos/dll/opengl/mesa/main/texformat.c      |  7 +-
 reactos/dll/opengl/mesa/main/texgen.c         | 12 +--
 reactos/dll/opengl/mesa/main/texgetimage.c    | 17 +---
 reactos/dll/opengl/mesa/main/teximage.c       | 18 +---
 reactos/dll/opengl/mesa/main/texobj.c         | 17 +---
 reactos/dll/opengl/mesa/main/texpal.c         | 10 +--
 reactos/dll/opengl/mesa/main/texparam.c       | 16 +---
 reactos/dll/opengl/mesa/main/texstate.c       | 15 +---
 reactos/dll/opengl/mesa/main/texstorage.c     | 14 +---
 reactos/dll/opengl/mesa/main/texstore.c       | 15 +---
 reactos/dll/opengl/mesa/main/texturebarrier.c |  4 +-
 reactos/dll/opengl/mesa/main/varray.c         | 17 +---
 reactos/dll/opengl/mesa/main/version.c        |  4 +-
 reactos/dll/opengl/mesa/main/viewport.c       |  7 +-
 reactos/dll/opengl/mesa/main/vtxfmt.c         | 12 +--
 reactos/dll/opengl/mesa/math/m_debug_clip.c   |  8 +-
 reactos/dll/opengl/mesa/math/m_debug_norm.c   |  8 +-
 reactos/dll/opengl/mesa/math/m_debug_xform.c  |  8 +-
 reactos/dll/opengl/mesa/math/m_eval.c         |  7 +-
 reactos/dll/opengl/mesa/math/m_matrix.c       |  8 +-
 reactos/dll/opengl/mesa/math/m_translate.c    |  8 +-
 reactos/dll/opengl/mesa/math/m_vector.c       |  7 +-
 reactos/dll/opengl/mesa/math/m_xform.c        |  9 +-
 reactos/dll/opengl/mesa/math/precomp.h        | 14 ++++
 reactos/dll/opengl/mesa/swrast/precomp.h      | 40 +++++++++
 reactos/dll/opengl/mesa/swrast/s_aaline.c     | 11 +--
 reactos/dll/opengl/mesa/swrast/s_aatriangle.c | 12 +--
 reactos/dll/opengl/mesa/swrast/s_alpha.c      |  9 +-
 reactos/dll/opengl/mesa/swrast/s_bitmap.c     | 10 +--
 reactos/dll/opengl/mesa/swrast/s_blend.c      | 14 +---
 reactos/dll/opengl/mesa/swrast/s_clear.c      | 13 +--
 reactos/dll/opengl/mesa/swrast/s_context.c    | 16 +---
 reactos/dll/opengl/mesa/swrast/s_copypix.c    | 16 +---
 reactos/dll/opengl/mesa/swrast/s_depth.c      | 15 +---
 reactos/dll/opengl/mesa/swrast/s_drawpix.c    | 19 +----
 reactos/dll/opengl/mesa/swrast/s_feedback.c   | 11 +--
 reactos/dll/opengl/mesa/swrast/s_fog.c        |  9 +-
 reactos/dll/opengl/mesa/swrast/s_lines.c      | 12 +--
 reactos/dll/opengl/mesa/swrast/s_logic.c      | 11 +--
 reactos/dll/opengl/mesa/swrast/s_masking.c    | 10 +--
 reactos/dll/opengl/mesa/swrast/s_points.c     | 10 +--
 .../dll/opengl/mesa/swrast/s_renderbuffer.c   | 12 +--
 reactos/dll/opengl/mesa/swrast/s_span.c       | 20 +----
 reactos/dll/opengl/mesa/swrast/s_stencil.c    | 14 +---
 reactos/dll/opengl/mesa/swrast/s_texcombine.c | 11 +--
 reactos/dll/opengl/mesa/swrast/s_texfetch.c   |  9 +-
 reactos/dll/opengl/mesa/swrast/s_texfilter.c  | 10 +--
 reactos/dll/opengl/mesa/swrast/s_texture.c    |  7 +-
 reactos/dll/opengl/mesa/swrast/s_triangle.c   | 16 +---
 reactos/dll/opengl/mesa/swrast/s_zoom.c       | 12 +--
 reactos/dll/opengl/mesa/tnl/precomp.h         | 28 +++++++
 reactos/dll/opengl/mesa/tnl/t_context.c       | 17 +---
 reactos/dll/opengl/mesa/tnl/t_draw.c          | 13 +--
 reactos/dll/opengl/mesa/tnl/t_pipeline.c      |  9 +-
 reactos/dll/opengl/mesa/tnl/t_rasterpos.c     | 14 +---
 reactos/dll/opengl/mesa/tnl/t_vb_fog.c        | 13 +--
 reactos/dll/opengl/mesa/tnl/t_vb_light.c      | 15 +---
 reactos/dll/opengl/mesa/tnl/t_vb_normals.c    | 13 +--
 reactos/dll/opengl/mesa/tnl/t_vb_points.c     |  8 +-
 reactos/dll/opengl/mesa/tnl/t_vb_render.c     | 13 +--
 reactos/dll/opengl/mesa/tnl/t_vb_texgen.c     | 12 +--
 reactos/dll/opengl/mesa/tnl/t_vb_texmat.c     | 12 +--
 reactos/dll/opengl/mesa/tnl/t_vb_vertex.c     | 14 +---
 reactos/dll/opengl/mesa/tnl/t_vertex.c        |  7 +-
 .../dll/opengl/mesa/tnl/t_vertex_generic.c    |  9 +-
 reactos/dll/opengl/mesa/tnl/t_vertex_sse.c    |  9 +-
 reactos/dll/opengl/mesa/vbo/precomp.h         | 32 +++++++
 reactos/dll/opengl/mesa/vbo/vbo_context.c     |  8 +-
 reactos/dll/opengl/mesa/vbo/vbo_exec.c        |  9 +-
 reactos/dll/opengl/mesa/vbo/vbo_exec_api.c    | 18 +---
 reactos/dll/opengl/mesa/vbo/vbo_exec_array.c  | 12 +--
 reactos/dll/opengl/mesa/vbo/vbo_exec_draw.c   | 13 +--
 reactos/dll/opengl/mesa/vbo/vbo_exec_eval.c   |  8 +-
 reactos/dll/opengl/mesa/vbo/vbo_noop.c        | 10 +--
 reactos/dll/opengl/mesa/vbo/vbo_rebase.c      |  8 +-
 reactos/dll/opengl/mesa/vbo/vbo_save.c        |  9 +-
 reactos/dll/opengl/mesa/vbo/vbo_save_api.c    | 18 +---
 reactos/dll/opengl/mesa/vbo/vbo_save_draw.c   | 13 +--
 .../dll/opengl/mesa/vbo/vbo_save_loopback.c   | 11 +--
 reactos/dll/opengl/mesa/vbo/vbo_split.c       |  8 +-
 reactos/dll/opengl/mesa/vbo/vbo_split_copy.c  | 12 +--
 .../dll/opengl/mesa/vbo/vbo_split_inplace.c   |  8 +-
 140 files changed, 342 insertions(+), 1471 deletions(-)
 create mode 100644 reactos/dll/opengl/mesa/main/precomp.h
 create mode 100644 reactos/dll/opengl/mesa/math/precomp.h
 create mode 100644 reactos/dll/opengl/mesa/swrast/precomp.h
 create mode 100644 reactos/dll/opengl/mesa/tnl/precomp.h
 create mode 100644 reactos/dll/opengl/mesa/vbo/precomp.h

diff --git a/reactos/dll/opengl/mesa/main/accum.c b/reactos/dll/opengl/mesa/main/accum.c
index 48d600616b7..fff26075372 100644
--- a/reactos/dll/opengl/mesa/main/accum.c
+++ b/reactos/dll/opengl/mesa/main/accum.c
@@ -22,18 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "glheader.h"
-#include "accum.h"
-#include "context.h"
-#include "format_unpack.h"
-#include "format_pack.h"
-#include "imports.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "state.h"
-#include "mtypes.h"
-#include "main/dispatch.h"
-
+#include <precomp.h>
 
 #if FEATURE_accum
 
diff --git a/reactos/dll/opengl/mesa/main/api_arrayelt.c b/reactos/dll/opengl/mesa/main/api_arrayelt.c
index 5ed52c4e54c..6cb6bd83a47 100644
--- a/reactos/dll/opengl/mesa/main/api_arrayelt.c
+++ b/reactos/dll/opengl/mesa/main/api_arrayelt.c
@@ -34,15 +34,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "glheader.h"
-#include "api_arrayelt.h"
-#include "bufferobj.h"
-#include "context.h"
-#include "imports.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "main/dispatch.h"
+#include <precomp.h>
 
 typedef void (GLAPIENTRY *array_func)( const void * );
 
diff --git a/reactos/dll/opengl/mesa/main/api_exec.c b/reactos/dll/opengl/mesa/main/api_exec.c
index cb673769063..2e8f24cdb3c 100644
--- a/reactos/dll/opengl/mesa/main/api_exec.c
+++ b/reactos/dll/opengl/mesa/main/api_exec.c
@@ -28,61 +28,9 @@
  * Initialize dispatch table with the immidiate mode functions.
  */
 
+#include <precomp.h>
 
-#include "mfeatures.h"
-#include "accum.h"
-#include "api_loopback.h"
-#include "api_exec.h"
-#include "attrib.h"
-#include "blend.h"
-#include "bufferobj.h"
-#include "arrayobj.h"
-#if FEATURE_draw_read_buffer
-#include "buffers.h"
-#endif
-#include "clear.h"
-#include "clip.h"
-#include "colortab.h"
-#include "context.h"
-#include "convolve.h"
-#include "depth.h"
-#include "dlist.h"
-#include "drawpix.h"
-#include "rastpos.h"
-#include "enable.h"
-#include "eval.h"
-#include "get.h"
-#include "feedback.h"
-#include "fog.h"
-#include "framebuffer.h"
-#include "hint.h"
 #include "histogram.h"
-#include "imports.h"
-#include "light.h"
-#include "lines.h"
-#include "matrix.h"
-#include "multisample.h"
-#include "pixel.h"
-#include "pixelstore.h"
-#include "points.h"
-#include "polygon.h"
-#include "readpix.h"
-#include "scissor.h"
-#include "stencil.h"
-#include "texenv.h"
-#include "texgetimage.h"
-#include "teximage.h"
-#include "texgen.h"
-#include "texobj.h"
-#include "texparam.h"
-#include "texstate.h"
-#include "texstorage.h"
-#include "texturebarrier.h"
-#include "mtypes.h"
-#include "varray.h"
-#include "viewport.h"
-#include "main/dispatch.h"
-
 
 #if FEATURE_GL
 
diff --git a/reactos/dll/opengl/mesa/main/api_loopback.c b/reactos/dll/opengl/mesa/main/api_loopback.c
index 1aa232a691f..a429f906947 100644
--- a/reactos/dll/opengl/mesa/main/api_loopback.c
+++ b/reactos/dll/opengl/mesa/main/api_loopback.c
@@ -28,13 +28,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "glheader.h"
-#include "macros.h"
-#include "api_loopback.h"
-#include "mtypes.h"
-#include "main/dispatch.h"
-#include "mfeatures.h"
+#include <precomp.h>
 
 /* KW: A set of functions to convert unusual Color/Normal/Vertex/etc
  * calls to a smaller set of driver-provided formats.  Currently just
diff --git a/reactos/dll/opengl/mesa/main/api_validate.c b/reactos/dll/opengl/mesa/main/api_validate.c
index d1ac93b647e..03f99f6ee5f 100644
--- a/reactos/dll/opengl/mesa/main/api_validate.c
+++ b/reactos/dll/opengl/mesa/main/api_validate.c
@@ -22,15 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "glheader.h"
-#include "api_validate.h"
-#include "bufferobj.h"
-#include "context.h"
-#include "imports.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "vbo/vbo.h"
-
+#include <precomp.h>
 
 /**
  * \return  number of bytes in array [count] of type.
diff --git a/reactos/dll/opengl/mesa/main/arrayobj.c b/reactos/dll/opengl/mesa/main/arrayobj.c
index 3bd63d8748b..258d58eae31 100644
--- a/reactos/dll/opengl/mesa/main/arrayobj.c
+++ b/reactos/dll/opengl/mesa/main/arrayobj.c
@@ -38,20 +38,7 @@
  * \author Brian Paul
  */
 
-
-#include "glheader.h"
-#include "hash.h"
-#include "image.h"
-#include "imports.h"
-#include "context.h"
-#include "mfeatures.h"
-#include "bufferobj.h"
-#include "arrayobj.h"
-#include "macros.h"
-#include "mtypes.h"
-#include "varray.h"
-#include "main/dispatch.h"
-
+#include <precomp.h>
 
 /**
  * Look up the array object for the given ID.
diff --git a/reactos/dll/opengl/mesa/main/attrib.c b/reactos/dll/opengl/mesa/main/attrib.c
index 23156bc7b9e..1a1dce79675 100644
--- a/reactos/dll/opengl/mesa/main/attrib.c
+++ b/reactos/dll/opengl/mesa/main/attrib.c
@@ -23,44 +23,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "glheader.h"
-#include "imports.h"
-#include "accum.h"
-#include "arrayobj.h"
-#include "attrib.h"
-#include "blend.h"
-#include "buffers.h"
-#include "bufferobj.h"
-#include "clear.h"
-#include "colormac.h"
-#include "context.h"
-#include "depth.h"
-#include "enable.h"
-#include "enums.h"
-#include "fog.h"
-#include "hint.h"
-#include "light.h"
-#include "lines.h"
-#include "macros.h"
-#include "matrix.h"
-#include "mfeatures.h"
-#include "multisample.h"
-#include "points.h"
-#include "polygon.h"
-#include "shared.h"
-#include "scissor.h"
-#include "stencil.h"
-#include "texenv.h"
-#include "texgen.h"
-#include "texobj.h"
-#include "texparam.h"
-#include "texstate.h"
-#include "varray.h"
-#include "viewport.h"
-#include "mtypes.h"
-#include "main/dispatch.h"
-#include "hash.h"
-
+#include <precomp.h>
 
 /**
  * glEnable()/glDisable() attribute group (GL_ENABLE_BIT).
diff --git a/reactos/dll/opengl/mesa/main/blend.c b/reactos/dll/opengl/mesa/main/blend.c
index 832fd37efae..93145d00c13 100644
--- a/reactos/dll/opengl/mesa/main/blend.c
+++ b/reactos/dll/opengl/mesa/main/blend.c
@@ -27,16 +27,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-
-#include "glheader.h"
-#include "blend.h"
-#include "context.h"
-#include "enums.h"
-#include "macros.h"
-#include "mtypes.h"
-
-
+#include <precomp.h>
 
 /**
  * Check if given blend source factor is legal.
diff --git a/reactos/dll/opengl/mesa/main/bufferobj.c b/reactos/dll/opengl/mesa/main/bufferobj.c
index ddbdcba9e7f..b237fa6a114 100644
--- a/reactos/dll/opengl/mesa/main/bufferobj.c
+++ b/reactos/dll/opengl/mesa/main/bufferobj.c
@@ -30,18 +30,7 @@
  * \author Brian Paul, Ian Romanick
  */
 
-
-#include "glheader.h"
-#include "enums.h"
-#include "hash.h"
-#include "imports.h"
-#include "image.h"
-#include "context.h"
-#include "bufferobj.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "texobj.h"
-
+#include <precomp.h>
 
 /* Debug flags */
 /*#define VBO_DEBUG*/
diff --git a/reactos/dll/opengl/mesa/main/buffers.c b/reactos/dll/opengl/mesa/main/buffers.c
index 36225c19e6f..a634a870d02 100644
--- a/reactos/dll/opengl/mesa/main/buffers.c
+++ b/reactos/dll/opengl/mesa/main/buffers.c
@@ -22,25 +22,15 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /**
  * \file buffers.c
  * glReadBuffer, DrawBuffer functions.
  */
 
-
-
-#include "glheader.h"
-#include "buffers.h"
-#include "colormac.h"
-#include "context.h"
-#include "enums.h"
-#include "mtypes.h"
-
+#include <precomp.h>
 
 #define BAD_MASK ~0u
 
-
 /**
  * Return bitmask of BUFFER_BIT_* flags indicating which color buffers are
  * available to the rendering context (for drawing or reading).
diff --git a/reactos/dll/opengl/mesa/main/clear.c b/reactos/dll/opengl/mesa/main/clear.c
index 73bee2ad8d9..0c8515650a6 100644
--- a/reactos/dll/opengl/mesa/main/clear.c
+++ b/reactos/dll/opengl/mesa/main/clear.c
@@ -22,24 +22,12 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /**
  * \file clear.c
  * glClearColor, glClearIndex, glClear() functions.
  */
 
-
-
-#include "glheader.h"
-#include "clear.h"
-#include "context.h"
-#include "colormac.h"
-#include "enums.h"
-#include "macros.h"
-#include "mtypes.h"
-#include "state.h"
-
-
+#include <precomp.h>
 
 #if _HAVE_FULL_GL
 void GLAPIENTRY
diff --git a/reactos/dll/opengl/mesa/main/clip.c b/reactos/dll/opengl/mesa/main/clip.c
index ba2028cf2e1..331856060f9 100644
--- a/reactos/dll/opengl/mesa/main/clip.c
+++ b/reactos/dll/opengl/mesa/main/clip.c
@@ -22,15 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "glheader.h"
-#include "clip.h"
-#include "context.h"
-#include "macros.h"
-#include "mtypes.h"
-
-#include "math/m_matrix.h"
-
+#include <precomp.h>
 
 /**
  * Update derived clip plane state.
diff --git a/reactos/dll/opengl/mesa/main/colortab.c b/reactos/dll/opengl/mesa/main/colortab.c
index 68553abfedb..17cc8b7325c 100644
--- a/reactos/dll/opengl/mesa/main/colortab.c
+++ b/reactos/dll/opengl/mesa/main/colortab.c
@@ -22,21 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "glheader.h"
-#include "bufferobj.h"
-#include "colortab.h"
-#include "context.h"
-#include "image.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "pack.h"
-#include "state.h"
-#include "teximage.h"
-#include "texstate.h"
-#include "main/dispatch.h"
-
+#include <precomp.h>
 
 #if FEATURE_colortable
 
diff --git a/reactos/dll/opengl/mesa/main/context.c b/reactos/dll/opengl/mesa/main/context.c
index c2d10b8ee3f..ac1e0c5b0c6 100644
--- a/reactos/dll/opengl/mesa/main/context.c
+++ b/reactos/dll/opengl/mesa/main/context.c
@@ -75,54 +75,7 @@
  *
  */
 
-
-#include "glheader.h"
-#include "mfeatures.h"
-#include "imports.h"
-#include "accum.h"
-#include "api_exec.h"
-#include "arrayobj.h"
-#include "attrib.h"
-#include "blend.h"
-#include "buffers.h"
-#include "bufferobj.h"
-#include "context.h"
-#include "cpuinfo.h"
-#include "depth.h"
-#include "dlist.h"
-#include "eval.h"
-#include "extensions.h"
-#include "feedback.h"
-#include "fog.h"
-#include "formats.h"
-#include "framebuffer.h"
-#include "hint.h"
-#include "hash.h"
-#include "light.h"
-#include "lines.h"
-#include "macros.h"
-#include "matrix.h"
-#include "multisample.h"
-#include "pixel.h"
-#include "pixelstore.h"
-#include "points.h"
-#include "polygon.h"
-#include "rastpos.h"
-#include "scissor.h"
-#include "shared.h"
-#include "simple_list.h"
-#include "state.h"
-#include "stencil.h"
-#include "texstate.h"
-#include "mtypes.h"
-#include "varray.h"
-#include "version.h"
-#include "viewport.h"
-#include "vtxfmt.h"
-#if _HAVE_FULL_GL
-#include "math/m_matrix.h"
-#endif
-#include "main/dispatch.h" /* for _gloffset_COUNT */
+#include <precomp.h>
 
 #ifdef USE_SPARC_ASM
 #include "sparc/sparc.h"
diff --git a/reactos/dll/opengl/mesa/main/convolve.c b/reactos/dll/opengl/mesa/main/convolve.c
index 96f5156728c..a20d411b22f 100644
--- a/reactos/dll/opengl/mesa/main/convolve.c
+++ b/reactos/dll/opengl/mesa/main/convolve.c
@@ -22,7 +22,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /*
  * Image convolution functions.
  *
@@ -30,16 +29,7 @@
  * the GL spec.
  */
 
-
-#include "glheader.h"
-#include "bufferobj.h"
-#include "colormac.h"
-#include "convolve.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "main/dispatch.h"
-
+#include <precomp.h>
 
 #if FEATURE_convolve
 
diff --git a/reactos/dll/opengl/mesa/main/cpuinfo.c b/reactos/dll/opengl/mesa/main/cpuinfo.c
index 6363512961a..f70905bedf1 100644
--- a/reactos/dll/opengl/mesa/main/cpuinfo.c
+++ b/reactos/dll/opengl/mesa/main/cpuinfo.c
@@ -22,10 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "main/compiler.h"
-#include "main/cpuinfo.h"
-
+#include <precomp.h>
 
 /**
  * This function should be called before the various "cpu_has_foo" macros
diff --git a/reactos/dll/opengl/mesa/main/depth.c b/reactos/dll/opengl/mesa/main/depth.c
index 9aa9f64ea6f..f25faa4cc48 100644
--- a/reactos/dll/opengl/mesa/main/depth.c
+++ b/reactos/dll/opengl/mesa/main/depth.c
@@ -22,15 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "depth.h"
-#include "enums.h"
-#include "macros.h"
-#include "mtypes.h"
-
+#include <precomp.h>
 
 /**********************************************************************/
 /*****                          API Functions                     *****/
diff --git a/reactos/dll/opengl/mesa/main/dlist.c b/reactos/dll/opengl/mesa/main/dlist.c
index ea19b9b26e3..b3d8f355057 100644
--- a/reactos/dll/opengl/mesa/main/dlist.c
+++ b/reactos/dll/opengl/mesa/main/dlist.c
@@ -29,36 +29,9 @@
  * Display lists management functions.
  */
 
-#include "glheader.h"
-#include "imports.h"
-#include "api_arrayelt.h"
-#include "api_exec.h"
-#include "api_loopback.h"
-#include "api_validate.h"
+#include <precomp.h>
+
 #include "config.h"
-#include "mfeatures.h"
-#include "bufferobj.h"
-#include "arrayobj.h"
-#include "context.h"
-#include "dlist.h"
-#include "enums.h"
-#include "eval.h"
-#include "framebuffer.h"
-#include "hash.h"
-#include "image.h"
-#include "light.h"
-#include "macros.h"
-#include "pack.h"
-#include "teximage.h"
-#include "texstorage.h"
-#include "mtypes.h"
-#include "varray.h"
-
-#include "math/m_matrix.h"
-
-#include "main/dispatch.h"
-
-
 
 /**
  * Other parts of Mesa (such as the VBO module) can plug into the display
diff --git a/reactos/dll/opengl/mesa/main/dlopen.c b/reactos/dll/opengl/mesa/main/dlopen.c
index a6f0f0a61a2..7d2f4214b35 100644
--- a/reactos/dll/opengl/mesa/main/dlopen.c
+++ b/reactos/dll/opengl/mesa/main/dlopen.c
@@ -21,14 +21,13 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /**
  * Wrapper functions for dlopen(), dlsym(), dlclose().
  * Note that the #ifdef tests for various environments should be expanded.
  */
 
+#include <precomp.h>
 
-#include "compiler.h"
 #include "dlopen.h"
 
 #if defined(_GNU_SOURCE) && !defined(__MINGW32__) && !defined(__blrts)
diff --git a/reactos/dll/opengl/mesa/main/drawpix.c b/reactos/dll/opengl/mesa/main/drawpix.c
index c18b9362294..a92a403f4a2 100644
--- a/reactos/dll/opengl/mesa/main/drawpix.c
+++ b/reactos/dll/opengl/mesa/main/drawpix.c
@@ -22,20 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "glheader.h"
-#include "imports.h"
-#include "bufferobj.h"
-#include "context.h"
-#include "drawpix.h"
-#include "enums.h"
-#include "feedback.h"
-#include "framebuffer.h"
-#include "image.h"
-#include "mfeatures.h"
-#include "readpix.h"
-#include "state.h"
-#include "dispatch.h"
-
+#include <precomp.h>
 
 #if FEATURE_drawpix
 
diff --git a/reactos/dll/opengl/mesa/main/enable.c b/reactos/dll/opengl/mesa/main/enable.c
index 78d0f39435f..c42c40261d8 100644
--- a/reactos/dll/opengl/mesa/main/enable.c
+++ b/reactos/dll/opengl/mesa/main/enable.c
@@ -27,19 +27,7 @@
  */
 
 
-#include "glheader.h"
-#include "clip.h"
-#include "context.h"
-#include "enable.h"
-#include "light.h"
-#include "simple_list.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "enums.h"
-#include "api_arrayelt.h"
-#include "texstate.h"
-
-
+#include <precomp.h>
 
 #define CHECK_EXTENSION(EXTNAME, CAP)					\
    if (!ctx->Extensions.EXTNAME) {					\
diff --git a/reactos/dll/opengl/mesa/main/enums.c b/reactos/dll/opengl/mesa/main/enums.c
index b00a738bc9a..13587fe7064 100644
--- a/reactos/dll/opengl/mesa/main/enums.c
+++ b/reactos/dll/opengl/mesa/main/enums.c
@@ -25,11 +25,7 @@
  * SOFTWARE.
  */
 
-#include "main/glheader.h"
-#include "main/mfeatures.h"
-#include "main/enums.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
+#include <precomp.h>
 
 typedef struct {
    size_t offset;
diff --git a/reactos/dll/opengl/mesa/main/eval.c b/reactos/dll/opengl/mesa/main/eval.c
index a70897bcfcf..f15521d6465 100644
--- a/reactos/dll/opengl/mesa/main/eval.c
+++ b/reactos/dll/opengl/mesa/main/eval.c
@@ -23,7 +23,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /*
  * eval.c was written by
  * Bernd Barsuhn (bdbarsuh@cip.informatik.uni-erlangen.de) and
@@ -36,17 +35,7 @@
  * Thanks guys!
  */
 
-
-#include "glheader.h"
-#include "imports.h"
-#include "colormac.h"
-#include "context.h"
-#include "eval.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "main/dispatch.h"
-
+#include <precomp.h>
 
 #if FEATURE_evaluators
 
diff --git a/reactos/dll/opengl/mesa/main/execmem.c b/reactos/dll/opengl/mesa/main/execmem.c
index aef5494d583..4034bd27664 100644
--- a/reactos/dll/opengl/mesa/main/execmem.c
+++ b/reactos/dll/opengl/mesa/main/execmem.c
@@ -30,10 +30,7 @@
  * \author Keith Whitwell
  */
 
-
-#include "imports.h"
-
-
+#include <precomp.h>
 
 #if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun)
 
@@ -44,7 +41,6 @@
 
 #include <unistd.h>
 #include <sys/mman.h>
-#include "mm.h"
 
 #ifdef MESA_SELINUX
 #include <selinux/selinux.h>
diff --git a/reactos/dll/opengl/mesa/main/extensions.c b/reactos/dll/opengl/mesa/main/extensions.c
index 0b781e4009b..a90e7f426b9 100644
--- a/reactos/dll/opengl/mesa/main/extensions.c
+++ b/reactos/dll/opengl/mesa/main/extensions.c
@@ -29,13 +29,7 @@
  * \brief Extension handling
  */
 
-
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "extensions.h"
-#include "mfeatures.h"
-#include "mtypes.h"
+#include <precomp.h>
 
 #define ALIGN(value, alignment)  (((value) + alignment - 1) & ~(alignment - 1))
 
diff --git a/reactos/dll/opengl/mesa/main/feedback.c b/reactos/dll/opengl/mesa/main/feedback.c
index f95e3b5d459..55a43c02be2 100644
--- a/reactos/dll/opengl/mesa/main/feedback.c
+++ b/reactos/dll/opengl/mesa/main/feedback.c
@@ -28,17 +28,7 @@
  * Selection and feedback modes functions.
  */
 
-
-#include "glheader.h"
-#include "colormac.h"
-#include "context.h"
-#include "enums.h"
-#include "feedback.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "main/dispatch.h"
-
+#include <precomp.h>
 
 #if FEATURE_feedback
 
diff --git a/reactos/dll/opengl/mesa/main/fog.c b/reactos/dll/opengl/mesa/main/fog.c
index a8ed4d99722..4d80ff93b64 100644
--- a/reactos/dll/opengl/mesa/main/fog.c
+++ b/reactos/dll/opengl/mesa/main/fog.c
@@ -22,15 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "glheader.h"
-#include "colormac.h"
-#include "context.h"
-#include "fog.h"
-#include "macros.h"
-#include "mtypes.h"
-
-
+#include <precomp.h>
 
 void GLAPIENTRY
 _mesa_Fogf(GLenum pname, GLfloat param)
diff --git a/reactos/dll/opengl/mesa/main/format_pack.c b/reactos/dll/opengl/mesa/main/format_pack.c
index 67ae9cfb671..31b247650a2 100644
--- a/reactos/dll/opengl/mesa/main/format_pack.c
+++ b/reactos/dll/opengl/mesa/main/format_pack.c
@@ -34,11 +34,7 @@
  *   glAccum, and glTexImage.
  */
 
-
-#include "colormac.h"
-#include "format_pack.h"
-#include "macros.h"
-
+#include <precomp.h>
 
 typedef void (*pack_ubyte_rgba_row_func)(GLuint n,
                                          const GLubyte src[][4], void *dst);
diff --git a/reactos/dll/opengl/mesa/main/format_unpack.c b/reactos/dll/opengl/mesa/main/format_unpack.c
index efe33a80955..057ceab4533 100644
--- a/reactos/dll/opengl/mesa/main/format_unpack.c
+++ b/reactos/dll/opengl/mesa/main/format_unpack.c
@@ -21,12 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "colormac.h"
-#include "format_unpack.h"
-#include "macros.h"
-
-
+#include <precomp.h>
 
 /* Expand 1, 2, 3, 4, 5, 6-bit values to fill 8 bits */
 
diff --git a/reactos/dll/opengl/mesa/main/formats.c b/reactos/dll/opengl/mesa/main/formats.c
index c060b7f4726..e1e636f4389 100644
--- a/reactos/dll/opengl/mesa/main/formats.c
+++ b/reactos/dll/opengl/mesa/main/formats.c
@@ -23,12 +23,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "imports.h"
-#include "formats.h"
-#include "mfeatures.h"
-#include "macros.h"
-
+#include <precomp.h>
 
 /**
  * Information about texture formats.
diff --git a/reactos/dll/opengl/mesa/main/framebuffer.c b/reactos/dll/opengl/mesa/main/framebuffer.c
index b54cfcf73e9..4381d7e6f07 100644
--- a/reactos/dll/opengl/mesa/main/framebuffer.c
+++ b/reactos/dll/opengl/mesa/main/framebuffer.c
@@ -22,27 +22,13 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /**
  * Functions for allocating/managing framebuffers and renderbuffers.
  * Also, routines for reading/writing renderbuffer data as ubytes,
  * ushorts, uints, etc.
  */
 
-
-#include "glheader.h"
-#include "imports.h"
-#include "buffers.h"
-#include "context.h"
-#include "enums.h"
-#include "formats.h"
-#include "macros.h"
-#include "mtypes.h"
-#include "framebuffer.h"
-#include "renderbuffer.h"
-#include "texobj.h"
-
-
+#include <precomp.h>
 
 /**
  * Compute/set the _DepthMax field for the given framebuffer.
diff --git a/reactos/dll/opengl/mesa/main/get.c b/reactos/dll/opengl/mesa/main/get.c
index 79730d76e1d..3dcc7e800fb 100644
--- a/reactos/dll/opengl/mesa/main/get.c
+++ b/reactos/dll/opengl/mesa/main/get.c
@@ -22,17 +22,7 @@
  * Author: Kristian Høgsberg <krh@bitplanet.net>
  */
 
-#include "glheader.h"
-#include "context.h"
-#include "enable.h"
-#include "enums.h"
-#include "extensions.h"
-#include "get.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "state.h"
-#include "framebuffer.h"
+#include <precomp.h>
 
 /* This is a table driven implemetation of the glGet*v() functions.
  * The basic idea is that most getters just look up an int somewhere
diff --git a/reactos/dll/opengl/mesa/main/getstring.c b/reactos/dll/opengl/mesa/main/getstring.c
index 76f7361e23c..5697d7b8f4b 100644
--- a/reactos/dll/opengl/mesa/main/getstring.c
+++ b/reactos/dll/opengl/mesa/main/getstring.c
@@ -22,16 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-
-#include "glheader.h"
-#include "context.h"
-#include "get.h"
-#include "enums.h"
-#include "extensions.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-
+#include <precomp.h>
 
 /**
  * Query string-valued state.  The return value should _not_ be freed by
diff --git a/reactos/dll/opengl/mesa/main/hash.c b/reactos/dll/opengl/mesa/main/hash.c
index c7a750bfeb0..3d97fe24843 100644
--- a/reactos/dll/opengl/mesa/main/hash.c
+++ b/reactos/dll/opengl/mesa/main/hash.c
@@ -34,11 +34,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "glheader.h"
-#include "imports.h"
-#include "hash.h"
-
+#include <precomp.h>
 
 #define TABLE_SIZE 1023  /**< Size of lookup table/array */
 
diff --git a/reactos/dll/opengl/mesa/main/hint.c b/reactos/dll/opengl/mesa/main/hint.c
index 869c4125408..af204c94124 100644
--- a/reactos/dll/opengl/mesa/main/hint.c
+++ b/reactos/dll/opengl/mesa/main/hint.c
@@ -23,15 +23,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "glheader.h"
-#include "enums.h"
-#include "context.h"
-#include "hint.h"
-#include "imports.h"
-#include "mtypes.h"
-
-
+#include <precomp.h>
 
 void GLAPIENTRY
 _mesa_Hint( GLenum target, GLenum mode )
diff --git a/reactos/dll/opengl/mesa/main/histogram.c b/reactos/dll/opengl/mesa/main/histogram.c
index d603fdc3393..52cdc7e31fd 100644
--- a/reactos/dll/opengl/mesa/main/histogram.c
+++ b/reactos/dll/opengl/mesa/main/histogram.c
@@ -22,15 +22,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <precomp.h>
 
-#include "glheader.h"
-#include "bufferobj.h"
-#include "colormac.h"
 #include "histogram.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "main/dispatch.h"
-
 
 #if FEATURE_histogram
 
diff --git a/reactos/dll/opengl/mesa/main/image.c b/reactos/dll/opengl/mesa/main/image.c
index 48f0fb472b0..676ebf7ff8c 100644
--- a/reactos/dll/opengl/mesa/main/image.c
+++ b/reactos/dll/opengl/mesa/main/image.c
@@ -23,22 +23,12 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /**
  * \file image.c
  * Image handling.
  */
 
-
-#include "glheader.h"
-#include "colormac.h"
-#include "image.h"
-#include "imports.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-
-
+#include <precomp.h>
 
 /**
  * \return GL_TRUE if type is packed pixel type, GL_FALSE otherwise.
diff --git a/reactos/dll/opengl/mesa/main/imports.c b/reactos/dll/opengl/mesa/main/imports.c
index d3727efbc38..9652e39d07d 100644
--- a/reactos/dll/opengl/mesa/main/imports.c
+++ b/reactos/dll/opengl/mesa/main/imports.c
@@ -43,11 +43,7 @@
  */
 
 
-
-#include "imports.h"
-#include "context.h"
-#include "mtypes.h"
-#include "version.h"
+#include <precomp.h>
 
 #ifdef _GNU_SOURCE
 #include <locale.h>
@@ -56,7 +52,6 @@
 #endif
 #endif
 
-
 #define MAXSTRING 4000  /* for vsnprintf() */
 
 #ifdef WIN32
diff --git a/reactos/dll/opengl/mesa/main/light.c b/reactos/dll/opengl/mesa/main/light.c
index 60bdac74d96..26a9d5296a6 100644
--- a/reactos/dll/opengl/mesa/main/light.c
+++ b/reactos/dll/opengl/mesa/main/light.c
@@ -23,17 +23,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "enums.h"
-#include "light.h"
-#include "macros.h"
-#include "simple_list.h"
-#include "mtypes.h"
-#include "math/m_matrix.h"
-
+#include <precomp.h>
 
 void GLAPIENTRY
 _mesa_ShadeModel( GLenum mode )
diff --git a/reactos/dll/opengl/mesa/main/lines.c b/reactos/dll/opengl/mesa/main/lines.c
index 79bf5679d8a..cf8f0a32328 100644
--- a/reactos/dll/opengl/mesa/main/lines.c
+++ b/reactos/dll/opengl/mesa/main/lines.c
@@ -22,13 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "glheader.h"
-#include "context.h"
-#include "lines.h"
-#include "macros.h"
-#include "mtypes.h"
-
+#include <precomp.h>
 
 /**
  * Set the line width.
diff --git a/reactos/dll/opengl/mesa/main/matrix.c b/reactos/dll/opengl/mesa/main/matrix.c
index c614f0fa712..964172b3470 100644
--- a/reactos/dll/opengl/mesa/main/matrix.c
+++ b/reactos/dll/opengl/mesa/main/matrix.c
@@ -34,17 +34,7 @@
  * -# Transformation of a point p by a matrix M is: p' = M * p
  */
 
-
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "enums.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "matrix.h"
-#include "mtypes.h"
-#include "math/m_matrix.h"
-
+#include <precomp.h>
 
 /**
  * Apply a perspective projection matrix.
diff --git a/reactos/dll/opengl/mesa/main/mm.c b/reactos/dll/opengl/mesa/main/mm.c
index ab32123a403..36cae8aa0f1 100644
--- a/reactos/dll/opengl/mesa/main/mm.c
+++ b/reactos/dll/opengl/mesa/main/mm.c
@@ -22,14 +22,12 @@
  *
  */
 
+#include <precomp.h>
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "compiler.h"
-#include "mm.h"
-
-
 void
 mmDumpMemInfo(const struct mem_block *heap)
 {
diff --git a/reactos/dll/opengl/mesa/main/multisample.c b/reactos/dll/opengl/mesa/main/multisample.c
index 67fdb8c9db9..8a844b5ff4b 100644
--- a/reactos/dll/opengl/mesa/main/multisample.c
+++ b/reactos/dll/opengl/mesa/main/multisample.c
@@ -22,13 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "main/multisample.h"
-#include "main/mtypes.h"
-
+#include <precomp.h>
 
 /**
  * Called via glSampleCoverageARB
diff --git a/reactos/dll/opengl/mesa/main/pack.c b/reactos/dll/opengl/mesa/main/pack.c
index b6a99d97666..5a8f3a4c942 100644
--- a/reactos/dll/opengl/mesa/main/pack.c
+++ b/reactos/dll/opengl/mesa/main/pack.c
@@ -22,23 +22,12 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /**
  * \file pack.c
  * Image and pixel span packing and unpacking.
  */
 
-
-#include "glheader.h"
-#include "colormac.h"
-#include "enums.h"
-#include "image.h"
-#include "imports.h"
-#include "macros.h"
-#include "mtypes.h"
-#include "pack.h"
-#include "pixeltransfer.h"
-#include "imports.h"
+#include <precomp.h>
 
 /**
  * Flip the 8 bits in each byte of the given array.
diff --git a/reactos/dll/opengl/mesa/main/pixel.c b/reactos/dll/opengl/mesa/main/pixel.c
index c4c12da9e9b..4c389122941 100644
--- a/reactos/dll/opengl/mesa/main/pixel.c
+++ b/reactos/dll/opengl/mesa/main/pixel.c
@@ -22,22 +22,12 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /**
  * \file pixel.c
  * Pixel transfer functions (glPixelZoom, glPixelMap, glPixelTransfer)
  */
 
-#include "glheader.h"
-#include "bufferobj.h"
-#include "colormac.h"
-#include "context.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "pixel.h"
-#include "mtypes.h"
-#include "main/dispatch.h"
-
+#include <precomp.h>
 
 #if FEATURE_pixel_transfer
 
diff --git a/reactos/dll/opengl/mesa/main/pixelstore.c b/reactos/dll/opengl/mesa/main/pixelstore.c
index bbc4e5d6fb4..ce07e633b26 100644
--- a/reactos/dll/opengl/mesa/main/pixelstore.c
+++ b/reactos/dll/opengl/mesa/main/pixelstore.c
@@ -27,14 +27,7 @@
  * glPixelStore functions.
  */
 
-
-#include "glheader.h"
-#include "bufferobj.h"
-#include "context.h"
-#include "pixelstore.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-
+#include <precomp.h>
 
 void GLAPIENTRY
 _mesa_PixelStorei( GLenum pname, GLint param )
diff --git a/reactos/dll/opengl/mesa/main/pixeltransfer.c b/reactos/dll/opengl/mesa/main/pixeltransfer.c
index 5c167e0a90a..378f7a6993b 100644
--- a/reactos/dll/opengl/mesa/main/pixeltransfer.c
+++ b/reactos/dll/opengl/mesa/main/pixeltransfer.c
@@ -22,19 +22,12 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /**
  * \file pixeltransfer.c
  * Pixel transfer operations (scale, bias, table lookups, etc)
  */
 
-
-#include "glheader.h"
-#include "colormac.h"
-#include "pixeltransfer.h"
-#include "imports.h"
-#include "mtypes.h"
-
+#include <precomp.h>
 
 /*
  * Apply scale and bias factors to an array of RGBA pixels.
diff --git a/reactos/dll/opengl/mesa/main/points.c b/reactos/dll/opengl/mesa/main/points.c
index f9870c72e46..7006643605e 100644
--- a/reactos/dll/opengl/mesa/main/points.c
+++ b/reactos/dll/opengl/mesa/main/points.c
@@ -27,13 +27,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "glheader.h"
-#include "context.h"
-#include "macros.h"
-#include "points.h"
-#include "mtypes.h"
-
+#include <precomp.h>
 
 /**
  * Set current point size.
diff --git a/reactos/dll/opengl/mesa/main/polygon.c b/reactos/dll/opengl/mesa/main/polygon.c
index ab84ae318fd..6d2dfeee7ca 100644
--- a/reactos/dll/opengl/mesa/main/polygon.c
+++ b/reactos/dll/opengl/mesa/main/polygon.c
@@ -27,16 +27,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "image.h"
-#include "enums.h"
-#include "pack.h"
-#include "polygon.h"
-#include "mtypes.h"
-
+#include <precomp.h>
 
 /**
  * Specify whether to cull front- or back-facing facets.
diff --git a/reactos/dll/opengl/mesa/main/precomp.h b/reactos/dll/opengl/mesa/main/precomp.h
new file mode 100644
index 00000000000..e670fa37c6e
--- /dev/null
+++ b/reactos/dll/opengl/mesa/main/precomp.h
@@ -0,0 +1,83 @@
+#ifndef _MESA_MAIN_PCH_
+#define _MESA_MAIN_PCH_
+
+#include "accum.h"
+#include "api_arrayelt.h"
+#include "api_exec.h"
+#include "api_loopback.h"
+#include "api_validate.h"
+#include "arrayobj.h"
+#include "attrib.h"
+#include "blend.h"
+#include "bufferobj.h"
+#include "buffers.h"
+#include "clear.h"
+#include "clip.h"
+#include "colormac.h"
+#include "colortab.h"
+#include "compiler.h"
+#include "context.h"
+#include "convolve.h"
+#include "cpuinfo.h"
+#include "depth.h"
+#include "dispatch.h"
+#include "dlist.h"
+#include "drawpix.h"
+#include "enable.h"
+#include "enums.h"
+#include "eval.h"
+#include "extensions.h"
+#include "feedback.h"
+#include "fog.h"
+#include "format_pack.h"
+#include "format_unpack.h"
+#include "formats.h"
+#include "framebuffer.h"
+#include "get.h"
+#include "glheader.h"
+#include "hash.h"
+#include "hint.h"
+#include "image.h"
+#include "imports.h"
+#include "light.h"
+#include "lines.h"
+#include "macros.h"
+#include "matrix.h"
+#include "mfeatures.h"
+#include "mm.h"
+#include "mtypes.h"
+#include "multisample.h"
+#include "pack.h"
+#include "pixel.h"
+#include "pixelstore.h"
+#include "pixeltransfer.h"
+#include "points.h"
+#include "polygon.h"
+#include "rastpos.h"
+#include "readpix.h"
+#include "renderbuffer.h"
+#include "scissor.h"
+#include "shared.h"
+#include "simple_list.h"
+#include "state.h"
+#include "stencil.h"
+#include "texenv.h"
+#include "texformat.h"
+#include "texgen.h"
+#include "texgetimage.h"
+#include "teximage.h"
+#include "texobj.h"
+#include "texparam.h"
+#include "texstate.h"
+#include "texstorage.h"
+#include "texstore.h"
+#include "texturebarrier.h"
+#include "varray.h"
+#include "version.h"
+#include "viewport.h"
+#include "vtxfmt.h"
+
+#include <math/m_matrix.h>
+#include <vbo/vbo.h>
+
+#endif /* _MESA_MAIN_PCH_ */
diff --git a/reactos/dll/opengl/mesa/main/rastpos.c b/reactos/dll/opengl/mesa/main/rastpos.c
index 0cf4e4e95f7..3d47a6a45a6 100644
--- a/reactos/dll/opengl/mesa/main/rastpos.c
+++ b/reactos/dll/opengl/mesa/main/rastpos.c
@@ -28,16 +28,7 @@
  * Raster position operations.
  */
 
-#include "glheader.h"
-#include "context.h"
-#include "feedback.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "rastpos.h"
-#include "state.h"
-#include "main/dispatch.h"
-
+#include <precomp.h>
 
 #if FEATURE_rastpos
 
diff --git a/reactos/dll/opengl/mesa/main/readpix.c b/reactos/dll/opengl/mesa/main/readpix.c
index 819b22d59dc..2da1fd007a7 100644
--- a/reactos/dll/opengl/mesa/main/readpix.c
+++ b/reactos/dll/opengl/mesa/main/readpix.c
@@ -22,20 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "glheader.h"
-#include "imports.h"
-#include "bufferobj.h"
-#include "context.h"
-#include "enums.h"
-#include "readpix.h"
-#include "framebuffer.h"
-#include "formats.h"
-#include "format_unpack.h"
-#include "image.h"
-#include "mtypes.h"
-#include "pack.h"
-#include "state.h"
-
+#include <precomp.h>
 
 /**
  * Tries to implement glReadPixels() of GL_DEPTH_COMPONENT using memcpy of the
diff --git a/reactos/dll/opengl/mesa/main/renderbuffer.c b/reactos/dll/opengl/mesa/main/renderbuffer.c
index 8613db861cd..36a66d0ced3 100644
--- a/reactos/dll/opengl/mesa/main/renderbuffer.c
+++ b/reactos/dll/opengl/mesa/main/renderbuffer.c
@@ -22,14 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "formats.h"
-#include "mtypes.h"
-#include "renderbuffer.h"
-
+#include <precomp.h>
 
 /**
  * Initialize the fields of a gl_renderbuffer to default values.
diff --git a/reactos/dll/opengl/mesa/main/scissor.c b/reactos/dll/opengl/mesa/main/scissor.c
index df665994a95..6f5add5ceb8 100644
--- a/reactos/dll/opengl/mesa/main/scissor.c
+++ b/reactos/dll/opengl/mesa/main/scissor.c
@@ -22,12 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/mtypes.h"
-#include "main/scissor.h"
-
+#include <precomp.h>
 
 /**
  * Called via glScissor
diff --git a/reactos/dll/opengl/mesa/main/shared.c b/reactos/dll/opengl/mesa/main/shared.c
index bcf2c3a8d14..bc5807bb553 100644
--- a/reactos/dll/opengl/mesa/main/shared.c
+++ b/reactos/dll/opengl/mesa/main/shared.c
@@ -27,14 +27,7 @@
  * Shared-context state
  */
 
-#include "imports.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "hash.h"
-#include "bufferobj.h"
-#include "shared.h"
-#include "dlist.h"
-
+#include <precomp.h>
 
 /**
  * Allocate and initialize a shared context state structure.
diff --git a/reactos/dll/opengl/mesa/main/state.c b/reactos/dll/opengl/mesa/main/state.c
index 5810e434290..94689bdd383 100644
--- a/reactos/dll/opengl/mesa/main/state.c
+++ b/reactos/dll/opengl/mesa/main/state.c
@@ -30,21 +30,7 @@
  * This file manages recalculation of derived values in struct gl_context.
  */
 
-
-#include "glheader.h"
-#include "mtypes.h"
-#include "context.h"
-#include "macros.h"
-#include "framebuffer.h"
-#include "light.h"
-#include "matrix.h"
-#include "pixel.h"
-#include "state.h"
-#include "stencil.h"
-#include "texobj.h"
-#include "texstate.h"
-#include "varray.h"
-
+#include <precomp.h>
 
 static void
 update_separate_specular(struct gl_context *ctx)
diff --git a/reactos/dll/opengl/mesa/main/stencil.c b/reactos/dll/opengl/mesa/main/stencil.c
index 5b3d328ab62..1aae25334f8 100644
--- a/reactos/dll/opengl/mesa/main/stencil.c
+++ b/reactos/dll/opengl/mesa/main/stencil.c
@@ -29,14 +29,7 @@
  *
  */
 
-
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "macros.h"
-#include "stencil.h"
-#include "mtypes.h"
-
+#include <precomp.h>
 
 static GLboolean
 validate_stencil_op(struct gl_context *ctx, GLenum op)
diff --git a/reactos/dll/opengl/mesa/main/texenv.c b/reactos/dll/opengl/mesa/main/texenv.c
index 9b8c9bdd780..3e7004bcbf5 100644
--- a/reactos/dll/opengl/mesa/main/texenv.c
+++ b/reactos/dll/opengl/mesa/main/texenv.c
@@ -29,16 +29,7 @@
  * glTexEnv-related functions
  */
 
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/enums.h"
-#include "main/macros.h"
-#include "main/mtypes.h"
-#include "main/state.h"
-#include "main/texenv.h"
-#include "main/texstate.h"
-
+#include <precomp.h>
 
 #define TE_ERROR(errCode, msg, value)				\
    _mesa_error(ctx, errCode, msg, _mesa_lookup_enum_by_nr(value));
diff --git a/reactos/dll/opengl/mesa/main/texformat.c b/reactos/dll/opengl/mesa/main/texformat.c
index 2c75c570569..971ec030fd3 100644
--- a/reactos/dll/opengl/mesa/main/texformat.c
+++ b/reactos/dll/opengl/mesa/main/texformat.c
@@ -32,12 +32,7 @@
  * \author Brian Paul
  */
 
-
-#include "context.h"
-#include "enums.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "texformat.h"
+#include <precomp.h>
 
 #define RETURN_IF_SUPPORTED(f) do {		\
    if (ctx->TextureFormatSupported[f])		\
diff --git a/reactos/dll/opengl/mesa/main/texgen.c b/reactos/dll/opengl/mesa/main/texgen.c
index 5c4889da9eb..4056a259d27 100644
--- a/reactos/dll/opengl/mesa/main/texgen.c
+++ b/reactos/dll/opengl/mesa/main/texgen.c
@@ -29,17 +29,7 @@
  * glTexGen-related functions
  */
 
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/enums.h"
-#include "main/macros.h"
-#include "main/mfeatures.h"
-#include "main/texgen.h"
-#include "main/texstate.h"
-#include "math/m_matrix.h"
-#include "main/dispatch.h"
-
+#include <precomp.h>
 
 #if FEATURE_texgen
 
diff --git a/reactos/dll/opengl/mesa/main/texgetimage.c b/reactos/dll/opengl/mesa/main/texgetimage.c
index 64955d7046b..450b7984c1e 100644
--- a/reactos/dll/opengl/mesa/main/texgetimage.c
+++ b/reactos/dll/opengl/mesa/main/texgetimage.c
@@ -23,26 +23,11 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /**
  * Code for glGetTexImage() and glGetCompressedTexImage().
  */
 
-
-#include "glheader.h"
-#include "bufferobj.h"
-#include "enums.h"
-#include "context.h"
-#include "formats.h"
-#include "format_unpack.h"
-#include "image.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "pack.h"
-#include "texgetimage.h"
-#include "teximage.h"
-
-
+#include <precomp.h>
 
 /**
  * Can the given type represent negative values?
diff --git a/reactos/dll/opengl/mesa/main/teximage.c b/reactos/dll/opengl/mesa/main/teximage.c
index e9b83b538ea..ccf9d8111bb 100644
--- a/reactos/dll/opengl/mesa/main/teximage.c
+++ b/reactos/dll/opengl/mesa/main/teximage.c
@@ -28,23 +28,7 @@
  * Texture image-related functions.
  */
 
-
-#include "glheader.h"
-#include "bufferobj.h"
-#include "context.h"
-#include "enums.h"
-#include "framebuffer.h"
-#include "hash.h"
-#include "image.h"
-#include "imports.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "state.h"
-#include "teximage.h"
-#include "texstate.h"
-#include "texpal.h"
-#include "mtypes.h"
-
+#include <precomp.h>
 
 /**
  * State changes which we care about for glCopyTex[Sub]Image() calls.
diff --git a/reactos/dll/opengl/mesa/main/texobj.c b/reactos/dll/opengl/mesa/main/texobj.c
index ec0abacaf90..b2a062d3faf 100644
--- a/reactos/dll/opengl/mesa/main/texobj.c
+++ b/reactos/dll/opengl/mesa/main/texobj.c
@@ -27,22 +27,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "mfeatures.h"
-#include "bufferobj.h"
-#include "colortab.h"
-#include "context.h"
-#include "enums.h"
-#include "formats.h"
-#include "hash.h"
-#include "imports.h"
-#include "macros.h"
-#include "teximage.h"
-#include "texobj.h"
-#include "texstate.h"
-#include "mtypes.h"
-
-
+#include <precomp.h>
 
 /**********************************************************************/
 /** \name Internal functions */
diff --git a/reactos/dll/opengl/mesa/main/texpal.c b/reactos/dll/opengl/mesa/main/texpal.c
index ed2261b01cb..92387e417e3 100644
--- a/reactos/dll/opengl/mesa/main/texpal.c
+++ b/reactos/dll/opengl/mesa/main/texpal.c
@@ -15,14 +15,8 @@
  */
 
 
-#include "glheader.h"
-#include "compiler.h" /* for ASSERT */
-#include "context.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "imports.h"
-#include "pixelstore.h"
-#include "teximage.h"
+#include <precomp.h>
+
 #include "texpal.h"
 
 #if FEATURE_ES
diff --git a/reactos/dll/opengl/mesa/main/texparam.c b/reactos/dll/opengl/mesa/main/texparam.c
index d403db1756a..539bc189d57 100644
--- a/reactos/dll/opengl/mesa/main/texparam.c
+++ b/reactos/dll/opengl/mesa/main/texparam.c
@@ -29,21 +29,7 @@
  * glTexParameter-related functions
  */
 
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/context.h"
-#include "main/enums.h"
-#include "main/formats.h"
-#include "main/image.h"
-#include "main/macros.h"
-#include "main/mfeatures.h"
-#include "main/mtypes.h"
-#include "main/state.h"
-#include "main/texparam.h"
-#include "main/teximage.h"
-#include "main/texstate.h"
-
+#include <precomp.h>
 
 /**
  * Check if a coordinate wrap mode is supported for the texture target.
diff --git a/reactos/dll/opengl/mesa/main/texstate.c b/reactos/dll/opengl/mesa/main/texstate.c
index 7f0dc1b8493..48d32b82bc6 100644
--- a/reactos/dll/opengl/mesa/main/texstate.c
+++ b/reactos/dll/opengl/mesa/main/texstate.c
@@ -28,20 +28,7 @@
  * Texture state handling.
  */
 
-#include "glheader.h"
-#include "mfeatures.h"
-#include "bufferobj.h"
-#include "colormac.h"
-#include "colortab.h"
-#include "context.h"
-#include "enums.h"
-#include "macros.h"
-#include "texobj.h"
-#include "teximage.h"
-#include "texstate.h"
-#include "mtypes.h"
-
-
+#include <precomp.h>
 
 /**
  * Default texture combine environment state.  This is used to initialize
diff --git a/reactos/dll/opengl/mesa/main/texstorage.c b/reactos/dll/opengl/mesa/main/texstorage.c
index a70305db38d..1de2f71fa73 100644
--- a/reactos/dll/opengl/mesa/main/texstorage.c
+++ b/reactos/dll/opengl/mesa/main/texstorage.c
@@ -27,19 +27,7 @@
  * GL_ARB_texture_storage functions
  */
 
-
-
-#include "glheader.h"
-#include "context.h"
-#include "enums.h"
-#include "imports.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "teximage.h"
-#include "texstorage.h"
-#include "mtypes.h"
-
-
+#include <precomp.h>
 
 /**
  * Check if the given texture target is a legal texture object target
diff --git a/reactos/dll/opengl/mesa/main/texstore.c b/reactos/dll/opengl/mesa/main/texstore.c
index 1c30455d618..397c69775d5 100644
--- a/reactos/dll/opengl/mesa/main/texstore.c
+++ b/reactos/dll/opengl/mesa/main/texstore.c
@@ -51,20 +51,7 @@
  * images and sub-images.
  */
 
-
-#include "glheader.h"
-#include "bufferobj.h"
-#include "colormac.h"
-#include "image.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "pack.h"
-#include "imports.h"
-#include "teximage.h"
-#include "texstore.h"
-#include "enums.h"
-
+#include <precomp.h>
 
 enum {
    ZERO = 4, 
diff --git a/reactos/dll/opengl/mesa/main/texturebarrier.c b/reactos/dll/opengl/mesa/main/texturebarrier.c
index 56cc8718ca3..c9b77c3f465 100644
--- a/reactos/dll/opengl/mesa/main/texturebarrier.c
+++ b/reactos/dll/opengl/mesa/main/texturebarrier.c
@@ -28,9 +28,7 @@
  * \author Marek Olšák <maraeo@gmail.com>
  */
 
-#include "context.h"
-#include "texturebarrier.h"
-
+#include <precomp.h>
 
 static void
 _mesa_texture_barrier(struct gl_context *ctx)
diff --git a/reactos/dll/opengl/mesa/main/varray.c b/reactos/dll/opengl/mesa/main/varray.c
index 8d86a8250cc..a8b2b395c17 100644
--- a/reactos/dll/opengl/mesa/main/varray.c
+++ b/reactos/dll/opengl/mesa/main/varray.c
@@ -23,22 +23,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "glheader.h"
-#include "imports.h"
-#include "bufferobj.h"
-#include "context.h"
-#include "enable.h"
-#include "enums.h"
-#include "hash.h"
-#include "image.h"
-#include "macros.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "varray.h"
-#include "arrayobj.h"
-#include "main/dispatch.h"
-
+#include <precomp.h>
 
 /** Used to indicate which GL datatypes are accepted by each of the
  * glVertex/Color/Attrib/EtcPointer() functions.
diff --git a/reactos/dll/opengl/mesa/main/version.c b/reactos/dll/opengl/mesa/main/version.c
index 7d43d707505..55d3769c94c 100644
--- a/reactos/dll/opengl/mesa/main/version.c
+++ b/reactos/dll/opengl/mesa/main/version.c
@@ -21,10 +21,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <precomp.h>
 
-#include "imports.h"
-#include "mtypes.h"
-#include "version.h"
 #include "git_sha1.h"
 
 /**
diff --git a/reactos/dll/opengl/mesa/main/viewport.c b/reactos/dll/opengl/mesa/main/viewport.c
index 2f1cd3034eb..b51c55c5300 100644
--- a/reactos/dll/opengl/mesa/main/viewport.c
+++ b/reactos/dll/opengl/mesa/main/viewport.c
@@ -28,12 +28,7 @@
  * glViewport and glDepthRange functions.
  */
 
-
-#include "context.h"
-#include "macros.h"
-#include "mtypes.h"
-#include "viewport.h"
-
+#include <precomp.h>
 
 /**
  * Set the viewport.
diff --git a/reactos/dll/opengl/mesa/main/vtxfmt.c b/reactos/dll/opengl/mesa/main/vtxfmt.c
index ba3bf93d3c4..8839c6a4071 100644
--- a/reactos/dll/opengl/mesa/main/vtxfmt.c
+++ b/reactos/dll/opengl/mesa/main/vtxfmt.c
@@ -26,17 +26,7 @@
  *    Gareth Hughes
  */
 
-#include "glheader.h"
-#include "api_arrayelt.h"
-#include "context.h"
-#include "imports.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "vtxfmt.h"
-#include "eval.h"
-#include "dlist.h"
-#include "main/dispatch.h"
-
+#include <precomp.h>
 
 #if FEATURE_beginend
 
diff --git a/reactos/dll/opengl/mesa/math/m_debug_clip.c b/reactos/dll/opengl/mesa/math/m_debug_clip.c
index 13d893d7edf..4112713a308 100644
--- a/reactos/dll/opengl/mesa/math/m_debug_clip.c
+++ b/reactos/dll/opengl/mesa/math/m_debug_clip.c
@@ -25,13 +25,7 @@
  *    Gareth Hughes
  */
 
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "main/imports.h"
-
-#include "m_matrix.h"
-#include "m_xform.h"
+#include <precomp.h>
 
 #include "m_debug.h"
 #include "m_debug_util.h"
diff --git a/reactos/dll/opengl/mesa/math/m_debug_norm.c b/reactos/dll/opengl/mesa/math/m_debug_norm.c
index 02eb1f989f6..db11edbea83 100644
--- a/reactos/dll/opengl/mesa/math/m_debug_norm.c
+++ b/reactos/dll/opengl/mesa/math/m_debug_norm.c
@@ -26,13 +26,7 @@
  *    Gareth Hughes
  */
 
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "main/imports.h"
-
-#include "m_matrix.h"
-#include "m_xform.h"
+#include <precomp.h>
 
 #include "m_debug.h"
 #include "m_debug_util.h"
diff --git a/reactos/dll/opengl/mesa/math/m_debug_xform.c b/reactos/dll/opengl/mesa/math/m_debug_xform.c
index 7d815664a14..3dd530b33f2 100644
--- a/reactos/dll/opengl/mesa/math/m_debug_xform.c
+++ b/reactos/dll/opengl/mesa/math/m_debug_xform.c
@@ -26,13 +26,7 @@
  * Updated for P6 architecture by Gareth Hughes.
  */
 
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "main/imports.h"
-
-#include "m_matrix.h"
-#include "m_xform.h"
+#include <precomp.h>
 
 #include "m_debug.h"
 #include "m_debug_util.h"
diff --git a/reactos/dll/opengl/mesa/math/m_eval.c b/reactos/dll/opengl/mesa/math/m_eval.c
index d324673c5d7..8c60d960969 100644
--- a/reactos/dll/opengl/mesa/math/m_eval.c
+++ b/reactos/dll/opengl/mesa/math/m_eval.c
@@ -36,15 +36,12 @@
  * Thanks guys!
  */
 
+#include <precomp.h>
 
-#include "main/glheader.h"
-#include "main/config.h"
-#include "m_eval.h"
+#include <main/config.h>
 
 static GLfloat inv_tab[MAX_EVAL_ORDER];
 
-
-
 /*
  * Horner scheme for Bezier curves
  *
diff --git a/reactos/dll/opengl/mesa/math/m_matrix.c b/reactos/dll/opengl/mesa/math/m_matrix.c
index 02aedbad856..d6a956a0fe7 100644
--- a/reactos/dll/opengl/mesa/math/m_matrix.c
+++ b/reactos/dll/opengl/mesa/math/m_matrix.c
@@ -33,13 +33,7 @@
  * -# Transformation of a point p by a matrix M is: p' = M * p
  */
 
-
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/macros.h"
-
-#include "m_matrix.h"
-
+#include <precomp.h>
 
 /**
  * \defgroup MatFlags MAT_FLAG_XXX-flags
diff --git a/reactos/dll/opengl/mesa/math/m_translate.c b/reactos/dll/opengl/mesa/math/m_translate.c
index 51daf7bfd37..8bad65f2256 100644
--- a/reactos/dll/opengl/mesa/math/m_translate.c
+++ b/reactos/dll/opengl/mesa/math/m_translate.c
@@ -28,14 +28,10 @@
  */
 
 
-#include "main/glheader.h"
-#include "main/macros.h"
+#include <precomp.h>
+
 #include "main/mtypes.h"		/* GLchan hack */
 
-#include "m_translate.h"
-
-
-
 typedef void (*trans_1f_func)(GLfloat *to,
 			      CONST void *ptr,
 			      GLuint stride,
diff --git a/reactos/dll/opengl/mesa/math/m_vector.c b/reactos/dll/opengl/mesa/math/m_vector.c
index 4bded31e096..a3314883a4f 100644
--- a/reactos/dll/opengl/mesa/math/m_vector.c
+++ b/reactos/dll/opengl/mesa/math/m_vector.c
@@ -26,15 +26,10 @@
  * New (3.1) transformation code written by Keith Whitwell.
  */
 
-
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/macros.h"
+#include <precomp.h>
 
 #include "m_vector.h"
 
-
-
 /**
  * Given a vector [count][4] of floats, set all the [][elt] values
  * to 0 (if elt = 0, 1, 2) or 1.0 (if elt = 3).
diff --git a/reactos/dll/opengl/mesa/math/m_xform.c b/reactos/dll/opengl/mesa/math/m_xform.c
index 369f2c6e957..386117e2a93 100644
--- a/reactos/dll/opengl/mesa/math/m_xform.c
+++ b/reactos/dll/opengl/mesa/math/m_xform.c
@@ -33,14 +33,7 @@
  * 3. Transformation of a point p by a matrix M is: p' = M * p
  */
 
-#include "main/glheader.h"
-#include "main/macros.h"
-
-#include "m_eval.h"
-#include "m_matrix.h"
-#include "m_translate.h"
-#include "m_xform.h"
-
+#include <precomp.h>
 
 #ifdef DEBUG_MATH
 #include "m_debug.h"
diff --git a/reactos/dll/opengl/mesa/math/precomp.h b/reactos/dll/opengl/mesa/math/precomp.h
new file mode 100644
index 00000000000..8ceb43f0484
--- /dev/null
+++ b/reactos/dll/opengl/mesa/math/precomp.h
@@ -0,0 +1,14 @@
+#ifndef _MESA_MATH_PCH_
+#define _MESA_MATH_PCH_
+
+#include <main/context.h>
+#include <main/glheader.h>
+#include <main/imports.h>
+#include <main/macros.h>
+
+#include "m_eval.h"
+#include "m_matrix.h"
+#include "m_translate.h"
+#include "m_xform.h"
+
+#endif /* _MESA_MATH_PCH_ */
diff --git a/reactos/dll/opengl/mesa/swrast/precomp.h b/reactos/dll/opengl/mesa/swrast/precomp.h
new file mode 100644
index 00000000000..d619e86ee53
--- /dev/null
+++ b/reactos/dll/opengl/mesa/swrast/precomp.h
@@ -0,0 +1,40 @@
+#ifndef _MESA_SWRAST_PCH_
+#define _MESA_SWRAST_PCH_
+
+#include <main/bufferobj.h>
+#include <main/colormac.h>
+#include <main/context.h>
+#include <main/format_pack.h>
+#include <main/format_unpack.h>
+#include <main/formats.h>
+#include <main/glheader.h>
+#include <main/image.h>
+#include <main/imports.h>
+#include <main/macros.h>
+#include <main/mtypes.h>
+#include <main/pixeltransfer.h>
+#include <main/state.h>
+#include <main/teximage.h>
+
+#include "s_aaline.h"
+#include "s_aatriangle.h"
+#include "s_alpha.h"
+#include "s_blend.h"
+#include "s_context.h"
+#include "s_depth.h"
+#include "s_feedback.h"
+#include "s_fog.h"
+#include "s_lines.h"
+#include "s_logic.h"
+#include "s_masking.h"
+#include "s_points.h"
+#include "s_span.h"
+#include "s_stencil.h"
+#include "s_texcombine.h"
+#include "s_texfetch.h"
+#include "s_texfilter.h"
+#include "s_triangle.h"
+#include "s_zoom.h"
+#include "swrast.h"
+
+#endif /* _MESA_SWRAST_PCH_ */
diff --git a/reactos/dll/opengl/mesa/swrast/s_aaline.c b/reactos/dll/opengl/mesa/swrast/s_aaline.c
index ba21990a59a..233fa78af29 100644
--- a/reactos/dll/opengl/mesa/swrast/s_aaline.c
+++ b/reactos/dll/opengl/mesa/swrast/s_aaline.c
@@ -22,16 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "main/mtypes.h"
-#include "swrast/s_aaline.h"
-#include "swrast/s_context.h"
-#include "swrast/s_span.h"
-#include "swrast/swrast.h"
-
+#include <precomp.h>
 
 #define SUB_PIXEL 4
 
diff --git a/reactos/dll/opengl/mesa/swrast/s_aatriangle.c b/reactos/dll/opengl/mesa/swrast/s_aatriangle.c
index d19d6781c8f..269531ac4e9 100644
--- a/reactos/dll/opengl/mesa/swrast/s_aatriangle.c
+++ b/reactos/dll/opengl/mesa/swrast/s_aatriangle.c
@@ -27,17 +27,7 @@
  * Antialiased Triangle rasterizers
  */
 
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/state.h"
-#include "s_aatriangle.h"
-#include "s_context.h"
-#include "s_span.h"
-
+#include <precomp.h>
 
 /*
  * Compute coefficients of a plane using the X,Y coords of the v0, v1, v2
diff --git a/reactos/dll/opengl/mesa/swrast/s_alpha.c b/reactos/dll/opengl/mesa/swrast/s_alpha.c
index df2181ba968..f3f882e92b5 100644
--- a/reactos/dll/opengl/mesa/swrast/s_alpha.c
+++ b/reactos/dll/opengl/mesa/swrast/s_alpha.c
@@ -27,14 +27,7 @@
  * \brief Functions to apply alpha test.
  */
 
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-
-#include "s_alpha.h"
-#include "s_context.h"
-
+#include <precomp.h>
 
 #define ALPHA_TEST(ALPHA, LOOP_CODE)		\
 do {						\
diff --git a/reactos/dll/opengl/mesa/swrast/s_bitmap.c b/reactos/dll/opengl/mesa/swrast/s_bitmap.c
index e25d507c144..2cd6ae57e50 100644
--- a/reactos/dll/opengl/mesa/swrast/s_bitmap.c
+++ b/reactos/dll/opengl/mesa/swrast/s_bitmap.c
@@ -28,15 +28,7 @@
  * \author Brian Paul
  */
 
-#include "main/glheader.h"
-#include "main/bufferobj.h"
-#include "main/image.h"
-#include "main/macros.h"
-
-#include "s_context.h"
-#include "s_span.h"
-
-
+#include <precomp.h>
 
 /**
  * Render a bitmap.
diff --git a/reactos/dll/opengl/mesa/swrast/s_blend.c b/reactos/dll/opengl/mesa/swrast/s_blend.c
index 92cfc6b3e1d..2f5e319cb71 100644
--- a/reactos/dll/opengl/mesa/swrast/s_blend.c
+++ b/reactos/dll/opengl/mesa/swrast/s_blend.c
@@ -22,7 +22,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /**
  * \file swrast/s_blend.c
  * \brief software blending.
@@ -33,17 +32,7 @@
  * Celestia uses glBlendFunc(GL_SRC_ALPHA, GL_ONE), for example.
  */
 
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-
-#include "s_blend.h"
-#include "s_context.h"
-#include "s_span.h"
-
+#include <precomp.h>
 
 #if defined(USE_MMX_ASM)
 #include "x86/mmx.h"
@@ -53,7 +42,6 @@
 #define _BLENDAPI
 #endif
 
-
 /**
  * Integer divide by 255
  * Declare "int divtemp" before using.
diff --git a/reactos/dll/opengl/mesa/swrast/s_clear.c b/reactos/dll/opengl/mesa/swrast/s_clear.c
index 008c1c2aefc..50addd79bd3 100644
--- a/reactos/dll/opengl/mesa/swrast/s_clear.c
+++ b/reactos/dll/opengl/mesa/swrast/s_clear.c
@@ -22,18 +22,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "main/glheader.h"
-#include "main/accum.h"
-#include "main/format_pack.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-
-#include "s_context.h"
-#include "s_depth.h"
-#include "s_stencil.h"
-
+#include <precomp.h>
 
+#include <main/accum.h>
 
 /**
  * Clear an rgba color buffer with masking if needed.
diff --git a/reactos/dll/opengl/mesa/swrast/s_context.c b/reactos/dll/opengl/mesa/swrast/s_context.c
index f91deffc5b6..93fe5b18966 100644
--- a/reactos/dll/opengl/mesa/swrast/s_context.c
+++ b/reactos/dll/opengl/mesa/swrast/s_context.c
@@ -26,21 +26,7 @@
  *    Brian Paul
  */
 
-#include "main/imports.h"
-#include "main/bufferobj.h"
-#include "main/colormac.h"
-#include "main/mtypes.h"
-#include "main/teximage.h"
-#include "swrast.h"
-#include "s_blend.h"
-#include "s_context.h"
-#include "s_lines.h"
-#include "s_points.h"
-#include "s_span.h"
-#include "s_texfetch.h"
-#include "s_triangle.h"
-#include "s_texfilter.h"
-
+#include <precomp.h>
 
 /**
  * Recompute the value of swrast->_RasterMask, etc. according to
diff --git a/reactos/dll/opengl/mesa/swrast/s_copypix.c b/reactos/dll/opengl/mesa/swrast/s_copypix.c
index eb369f10ad7..e63e10245ac 100644
--- a/reactos/dll/opengl/mesa/swrast/s_copypix.c
+++ b/reactos/dll/opengl/mesa/swrast/s_copypix.c
@@ -22,21 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "main/pixeltransfer.h"
-#include "main/imports.h"
-
-#include "s_context.h"
-#include "s_depth.h"
-#include "s_span.h"
-#include "s_stencil.h"
-#include "s_zoom.h"
-
-
+#include <precomp.h>
 
 /**
  * Determine if there's overlap in an image copy.
diff --git a/reactos/dll/opengl/mesa/swrast/s_depth.c b/reactos/dll/opengl/mesa/swrast/s_depth.c
index 1e841b1e713..a8b73a4004f 100644
--- a/reactos/dll/opengl/mesa/swrast/s_depth.c
+++ b/reactos/dll/opengl/mesa/swrast/s_depth.c
@@ -22,20 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/formats.h"
-#include "main/format_unpack.h"
-#include "main/format_pack.h"
-#include "main/macros.h"
-#include "main/imports.h"
-
-#include "s_context.h"
-#include "s_depth.h"
-#include "s_span.h"
-
-
+#include <precomp.h>
 
 #define Z_TEST(COMPARE)                      \
    do {                                      \
diff --git a/reactos/dll/opengl/mesa/swrast/s_drawpix.c b/reactos/dll/opengl/mesa/swrast/s_drawpix.c
index 3a5e29958c0..6c313b60391 100644
--- a/reactos/dll/opengl/mesa/swrast/s_drawpix.c
+++ b/reactos/dll/opengl/mesa/swrast/s_drawpix.c
@@ -22,24 +22,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <precomp.h>
 
-#include "main/glheader.h"
-#include "main/bufferobj.h"
-#include "main/colormac.h"
-#include "main/context.h"
-#include "main/format_pack.h"
-#include "main/image.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "main/pack.h"
-#include "main/pixeltransfer.h"
-#include "main/state.h"
-
-#include "s_context.h"
-#include "s_span.h"
-#include "s_stencil.h"
-#include "s_zoom.h"
-
+#include <main/pack.h>
 
 /**
  * Handle a common case of drawing GL_RGB/GL_UNSIGNED_BYTE into a
diff --git a/reactos/dll/opengl/mesa/swrast/s_feedback.c b/reactos/dll/opengl/mesa/swrast/s_feedback.c
index 59269b4dce3..df322e99142 100644
--- a/reactos/dll/opengl/mesa/swrast/s_feedback.c
+++ b/reactos/dll/opengl/mesa/swrast/s_feedback.c
@@ -22,16 +22,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/feedback.h"
-#include "main/macros.h"
-
-#include "s_context.h"
-#include "s_feedback.h"
-#include "s_triangle.h"
-
+#include <precomp.h>
 
+#include <main/feedback.h>
 
 static void
 feedback_vertex(struct gl_context * ctx, const SWvertex * v, const SWvertex * pv)
diff --git a/reactos/dll/opengl/mesa/swrast/s_fog.c b/reactos/dll/opengl/mesa/swrast/s_fog.c
index ea59de16020..8aa52824057 100644
--- a/reactos/dll/opengl/mesa/swrast/s_fog.c
+++ b/reactos/dll/opengl/mesa/swrast/s_fog.c
@@ -22,14 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-
-#include "s_context.h"
-#include "s_fog.h"
-
+#include <precomp.h>
 
 /**
  * Used to convert current raster distance to a fog factor in [0,1].
diff --git a/reactos/dll/opengl/mesa/swrast/s_lines.c b/reactos/dll/opengl/mesa/swrast/s_lines.c
index 9f4237adc8d..b98ad3fde81 100644
--- a/reactos/dll/opengl/mesa/swrast/s_lines.c
+++ b/reactos/dll/opengl/mesa/swrast/s_lines.c
@@ -22,17 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "s_aaline.h"
-#include "s_context.h"
-#include "s_feedback.h"
-#include "s_lines.h"
-#include "s_span.h"
-
+#include <precomp.h>
 
 /*
  * Init the mask[] array to implement a line stipple.
diff --git a/reactos/dll/opengl/mesa/swrast/s_logic.c b/reactos/dll/opengl/mesa/swrast/s_logic.c
index e908a0efeb0..959a92b3abb 100644
--- a/reactos/dll/opengl/mesa/swrast/s_logic.c
+++ b/reactos/dll/opengl/mesa/swrast/s_logic.c
@@ -22,16 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/imports.h"
-#include "main/macros.h"
-
-#include "s_context.h"
-#include "s_logic.h"
-#include "s_span.h"
-
+#include <precomp.h>
 
 /**
  * We do all logic ops on 4-byte GLuints.
diff --git a/reactos/dll/opengl/mesa/swrast/s_masking.c b/reactos/dll/opengl/mesa/swrast/s_masking.c
index e5994c75c2d..6e848cca269 100644
--- a/reactos/dll/opengl/mesa/swrast/s_masking.c
+++ b/reactos/dll/opengl/mesa/swrast/s_masking.c
@@ -22,19 +22,11 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /*
  * Implement the effect of glColorMask and glIndexMask in software.
  */
 
-
-#include "main/glheader.h"
-#include "main/macros.h"
-
-#include "s_context.h"
-#include "s_masking.h"
-#include "s_span.h"
-
+#include <precomp.h>
 
 /**
  * Apply the color mask to a span of rgba values.
diff --git a/reactos/dll/opengl/mesa/swrast/s_points.c b/reactos/dll/opengl/mesa/swrast/s_points.c
index 36174e4007a..53932eb7d14 100644
--- a/reactos/dll/opengl/mesa/swrast/s_points.c
+++ b/reactos/dll/opengl/mesa/swrast/s_points.c
@@ -22,15 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "s_context.h"
-#include "s_feedback.h"
-#include "s_points.h"
-#include "s_span.h"
-
+#include <precomp.h>
 
 /**
  * Used to cull points with invalid coords
diff --git a/reactos/dll/opengl/mesa/swrast/s_renderbuffer.c b/reactos/dll/opengl/mesa/swrast/s_renderbuffer.c
index 4cbcb3af80d..9c64eb50514 100644
--- a/reactos/dll/opengl/mesa/swrast/s_renderbuffer.c
+++ b/reactos/dll/opengl/mesa/swrast/s_renderbuffer.c
@@ -22,22 +22,16 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /**
  * Functions for allocating/managing software-based renderbuffers.
  * Also, routines for reading/writing software-based renderbuffer data as
  * ubytes, ushorts, uints, etc.
  */
 
+#include <precomp.h>
 
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/context.h"
-#include "main/formats.h"
-#include "main/mtypes.h"
-#include "main/renderbuffer.h"
-#include "swrast/s_context.h"
-#include "swrast/s_renderbuffer.h"
+#include <main/renderbuffer.h>
+#include "s_renderbuffer.h"
 
 static
 GLenum
diff --git a/reactos/dll/opengl/mesa/swrast/s_span.c b/reactos/dll/opengl/mesa/swrast/s_span.c
index 5f1239cb0b7..c1973d868b4 100644
--- a/reactos/dll/opengl/mesa/swrast/s_span.c
+++ b/reactos/dll/opengl/mesa/swrast/s_span.c
@@ -23,7 +23,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /**
  * \file swrast/s_span.c
  * \brief Span processing functions used by all rasterization functions.
@@ -31,24 +30,7 @@
  * \author Brian Paul
  */
 
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/format_pack.h"
-#include "main/format_unpack.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/image.h"
-
-#include "s_alpha.h"
-#include "s_blend.h"
-#include "s_context.h"
-#include "s_depth.h"
-#include "s_fog.h"
-#include "s_logic.h"
-#include "s_masking.h"
-#include "s_span.h"
-#include "s_stencil.h"
-#include "s_texcombine.h"
+#include <precomp.h>
 
 /**
  * Set default fragment attributes for the span using the
diff --git a/reactos/dll/opengl/mesa/swrast/s_stencil.c b/reactos/dll/opengl/mesa/swrast/s_stencil.c
index 2aa81b92457..16ca4f725d7 100644
--- a/reactos/dll/opengl/mesa/swrast/s_stencil.c
+++ b/reactos/dll/opengl/mesa/swrast/s_stencil.c
@@ -22,19 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/imports.h"
-#include "main/format_pack.h"
-#include "main/format_unpack.h"
-
-#include "s_context.h"
-#include "s_depth.h"
-#include "s_stencil.h"
-#include "s_span.h"
-
-
+#include <precomp.h>
 
 /* Stencil Logic:
 
diff --git a/reactos/dll/opengl/mesa/swrast/s_texcombine.c b/reactos/dll/opengl/mesa/swrast/s_texcombine.c
index 66536378f26..acdacf43ccc 100644
--- a/reactos/dll/opengl/mesa/swrast/s_texcombine.c
+++ b/reactos/dll/opengl/mesa/swrast/s_texcombine.c
@@ -23,16 +23,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "main/imports.h"
-#include "main/pixeltransfer.h"
-
-#include "s_context.h"
-#include "s_texcombine.h"
-
+#include <precomp.h>
 
 /**
  * Pointer to array of float[4]
diff --git a/reactos/dll/opengl/mesa/swrast/s_texfetch.c b/reactos/dll/opengl/mesa/swrast/s_texfetch.c
index 3c5cb325d29..d3207425d53 100644
--- a/reactos/dll/opengl/mesa/swrast/s_texfetch.c
+++ b/reactos/dll/opengl/mesa/swrast/s_texfetch.c
@@ -23,7 +23,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /**
  * \file s_texfetch.c
  *
@@ -32,13 +31,7 @@
  * \author Gareth Hughes
  */
 
-
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "main/teximage.h"
-#include "s_context.h"
-#include "s_texfetch.h"
-
+#include <precomp.h>
 
 /**
  * Convert an 8-bit sRGB value from non-linear space to a
diff --git a/reactos/dll/opengl/mesa/swrast/s_texfilter.c b/reactos/dll/opengl/mesa/swrast/s_texfilter.c
index bb5db592f6a..191fe4d98bc 100644
--- a/reactos/dll/opengl/mesa/swrast/s_texfilter.c
+++ b/reactos/dll/opengl/mesa/swrast/s_texfilter.c
@@ -22,15 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "main/imports.h"
-
-#include "s_context.h"
-#include "s_texfilter.h"
-
+#include <precomp.h>
 
 /*
  * Note, the FRAC macro has to work perfectly.  Otherwise you'll sometimes
diff --git a/reactos/dll/opengl/mesa/swrast/s_texture.c b/reactos/dll/opengl/mesa/swrast/s_texture.c
index acb5cb66baf..dae83419f95 100644
--- a/reactos/dll/opengl/mesa/swrast/s_texture.c
+++ b/reactos/dll/opengl/mesa/swrast/s_texture.c
@@ -25,12 +25,7 @@
  * Functions for mapping/unmapping texture images.
  */
 
-
-#include "main/context.h"
-#include "main/teximage.h"
-#include "swrast/swrast.h"
-#include "swrast/s_context.h"
-
+#include <precomp.h>
 
 /**
  * Allocate a new swrast_texture_image (a subclass of gl_texture_image).
diff --git a/reactos/dll/opengl/mesa/swrast/s_triangle.c b/reactos/dll/opengl/mesa/swrast/s_triangle.c
index cdfaf36daf5..e967e9b4290 100644
--- a/reactos/dll/opengl/mesa/swrast/s_triangle.c
+++ b/reactos/dll/opengl/mesa/swrast/s_triangle.c
@@ -22,27 +22,13 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /*
  * When the device driver doesn't implement triangle rasterization it
  * can hook in _swrast_Triangle, which eventually calls one of these
  * functions to draw triangles.
  */
 
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "main/mtypes.h"
-#include "main/state.h"
-
-#include "s_aatriangle.h"
-#include "s_context.h"
-#include "s_feedback.h"
-#include "s_span.h"
-#include "s_triangle.h"
-
+#include <precomp.h>
 
 /**
  * Test if a triangle should be culled.  Used for feedback and selection mode.
diff --git a/reactos/dll/opengl/mesa/swrast/s_zoom.c b/reactos/dll/opengl/mesa/swrast/s_zoom.c
index 73bff482b9a..b02a344c6b2 100644
--- a/reactos/dll/opengl/mesa/swrast/s_zoom.c
+++ b/reactos/dll/opengl/mesa/swrast/s_zoom.c
@@ -22,17 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "main/glheader.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/format_pack.h"
-#include "main/colormac.h"
-
-#include "s_context.h"
-#include "s_span.h"
-#include "s_stencil.h"
-#include "s_zoom.h"
-
+#include <precomp.h>
 
 /**
  * Compute the bounds of the region resulting from zooming a pixel span.
diff --git a/reactos/dll/opengl/mesa/tnl/precomp.h b/reactos/dll/opengl/mesa/tnl/precomp.h
new file mode 100644
index 00000000000..d94a8196c74
--- /dev/null
+++ b/reactos/dll/opengl/mesa/tnl/precomp.h
@@ -0,0 +1,28 @@
+#ifndef _MESA_TNL_PCH_
+#define _MESA_TNL_PCH_
+
+#include <main/bufferobj.h>
+#include <main/colormac.h>
+#include <main/context.h>
+#include <main/dd.h>
+#include <main/enums.h>
+#include <main/feedback.h>
+#include <main/glheader.h>
+#include <main/imports.h>
+#include <main/light.h>
+#include <main/macros.h>
+#include <main/mtypes.h>
+#include <main/simple_list.h>
+#include <main/state.h>
+#include <math/m_matrix.h>
+#include <math/m_translate.h>
+#include <math/m_xform.h>
+#include <swrast/s_chan.h>
+#include <vbo/vbo.h>
+
+#include "t_context.h"
+#include "t_pipeline.h"
+#include "t_vertex.h"
+#include "tnl.h"
+
+#endif /* _MESA_TNL_PCH_ */
diff --git a/reactos/dll/opengl/mesa/tnl/t_context.c b/reactos/dll/opengl/mesa/tnl/t_context.c
index 890998f784e..e4bc08b08c5 100644
--- a/reactos/dll/opengl/mesa/tnl/t_context.c
+++ b/reactos/dll/opengl/mesa/tnl/t_context.c
@@ -25,22 +25,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "main/mtypes.h"
-#include "main/light.h"
-#include "math/m_translate.h"
-#include "math/m_xform.h"
-#include "main/state.h"
-
-#include "tnl.h"
-#include "t_context.h"
-#include "t_pipeline.h"
-
-#include "vbo/vbo.h"
+#include <precomp.h>
 
 GLboolean
 _tnl_CreateContext( struct gl_context *ctx )
diff --git a/reactos/dll/opengl/mesa/tnl/t_draw.c b/reactos/dll/opengl/mesa/tnl/t_draw.c
index 0eba6ee70d1..afcebc9d434 100644
--- a/reactos/dll/opengl/mesa/tnl/t_draw.c
+++ b/reactos/dll/opengl/mesa/tnl/t_draw.c
@@ -25,18 +25,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "main/glheader.h"
-#include "main/bufferobj.h"
-#include "main/context.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-#include "main/macros.h"
-#include "main/enums.h"
-
-#include "t_context.h"
-#include "tnl.h"
-
-
+#include <precomp.h>
 
 static GLubyte *get_space(struct gl_context *ctx, GLuint bytes)
 {
diff --git a/reactos/dll/opengl/mesa/tnl/t_pipeline.c b/reactos/dll/opengl/mesa/tnl/t_pipeline.c
index 2788d11afc1..02e891bf2c5 100644
--- a/reactos/dll/opengl/mesa/tnl/t_pipeline.c
+++ b/reactos/dll/opengl/mesa/tnl/t_pipeline.c
@@ -25,14 +25,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-
-#include "t_context.h"
-#include "t_pipeline.h"
-#include "t_vertex.h"
+#include <precomp.h>
 
 void _tnl_install_pipeline( struct gl_context *ctx,
 			    const struct tnl_pipeline_stage **stages )
diff --git a/reactos/dll/opengl/mesa/tnl/t_rasterpos.c b/reactos/dll/opengl/mesa/tnl/t_rasterpos.c
index f3bf35a4a67..ada9117144a 100644
--- a/reactos/dll/opengl/mesa/tnl/t_rasterpos.c
+++ b/reactos/dll/opengl/mesa/tnl/t_rasterpos.c
@@ -22,19 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/feedback.h"
-#include "main/light.h"
-#include "main/macros.h"
-#include "main/simple_list.h"
-#include "main/mtypes.h"
-
-#include "math/m_matrix.h"
-#include "tnl/tnl.h"
-
-
+#include <precomp.h>
 
 /**
  * Clip a point against the view volume.
diff --git a/reactos/dll/opengl/mesa/tnl/t_vb_fog.c b/reactos/dll/opengl/mesa/tnl/t_vb_fog.c
index 75294e349ce..ac773634ed4 100644
--- a/reactos/dll/opengl/mesa/tnl/t_vb_fog.c
+++ b/reactos/dll/opengl/mesa/tnl/t_vb_fog.c
@@ -25,18 +25,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-
-#include "math/m_xform.h"
-
-#include "t_context.h"
-#include "t_pipeline.h"
-
+#include <precomp.h>
 
 struct fog_stage_data {
    GLvector4f fogcoord;		/* has actual storage allocated */
diff --git a/reactos/dll/opengl/mesa/tnl/t_vb_light.c b/reactos/dll/opengl/mesa/tnl/t_vb_light.c
index a79bc41052e..19ba0f40332 100644
--- a/reactos/dll/opengl/mesa/tnl/t_vb_light.c
+++ b/reactos/dll/opengl/mesa/tnl/t_vb_light.c
@@ -22,20 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/light.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/simple_list.h"
-#include "main/mtypes.h"
-
-#include "math/m_translate.h"
-
-#include "t_context.h"
-#include "t_pipeline.h"
+#include <precomp.h>
 
 #define LIGHT_TWOSIDE       0x1
 #define LIGHT_MATERIAL      0x2
diff --git a/reactos/dll/opengl/mesa/tnl/t_vb_normals.c b/reactos/dll/opengl/mesa/tnl/t_vb_normals.c
index fb7bb58223d..518e2ffbcec 100644
--- a/reactos/dll/opengl/mesa/tnl/t_vb_normals.c
+++ b/reactos/dll/opengl/mesa/tnl/t_vb_normals.c
@@ -25,18 +25,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-
-#include "math/m_xform.h"
-
-#include "t_context.h"
-#include "t_pipeline.h"
-
+#include <precomp.h>
 
 struct normal_stage_data {
    normal_func NormalTransform;
diff --git a/reactos/dll/opengl/mesa/tnl/t_vb_points.c b/reactos/dll/opengl/mesa/tnl/t_vb_points.c
index b0110289976..e924e5a20e2 100644
--- a/reactos/dll/opengl/mesa/tnl/t_vb_points.c
+++ b/reactos/dll/opengl/mesa/tnl/t_vb_points.c
@@ -25,13 +25,7 @@
  *    Brian Paul
  */
 
-#include "main/glheader.h"
-#include "main/mtypes.h"
-#include "main/dd.h"
-#include "main/imports.h"
-#include "t_context.h"
-#include "t_pipeline.h"
-
+#include <precomp.h>
 
 struct point_stage_data {
    GLvector4f PointSize;
diff --git a/reactos/dll/opengl/mesa/tnl/t_vb_render.c b/reactos/dll/opengl/mesa/tnl/t_vb_render.c
index cb319213249..d89b2be2a31 100644
--- a/reactos/dll/opengl/mesa/tnl/t_vb_render.c
+++ b/reactos/dll/opengl/mesa/tnl/t_vb_render.c
@@ -37,18 +37,7 @@
  *
  */
 
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/enums.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-#include "math/m_xform.h"
-
-#include "t_pipeline.h"
-
-
+#include <precomp.h>
 
 /**********************************************************************/
 /*                        Clip single primitives                      */
diff --git a/reactos/dll/opengl/mesa/tnl/t_vb_texgen.c b/reactos/dll/opengl/mesa/tnl/t_vb_texgen.c
index d8c2008eeac..35c321bf6d2 100644
--- a/reactos/dll/opengl/mesa/tnl/t_vb_texgen.c
+++ b/reactos/dll/opengl/mesa/tnl/t_vb_texgen.c
@@ -35,17 +35,7 @@
  * including any use thereof or modifications thereto.
  */
 
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-
-#include "math/m_xform.h"
-
-#include "t_context.h"
-#include "t_pipeline.h"
-
+#include <precomp.h>
 
 /***********************************************************************
  * Automatic texture coordinate generation (texgen) code.
diff --git a/reactos/dll/opengl/mesa/tnl/t_vb_texmat.c b/reactos/dll/opengl/mesa/tnl/t_vb_texmat.c
index b3ddc660835..c6f15c6eafa 100644
--- a/reactos/dll/opengl/mesa/tnl/t_vb_texmat.c
+++ b/reactos/dll/opengl/mesa/tnl/t_vb_texmat.c
@@ -25,17 +25,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-
-#include "math/m_xform.h"
-
-#include "t_context.h"
-#include "t_pipeline.h"
+#include <precomp.h>
 
 /* Is there any real benefit seperating texmat from texgen?  It means
  * we need two lots of intermediate storage.  Any changes to
diff --git a/reactos/dll/opengl/mesa/tnl/t_vb_vertex.c b/reactos/dll/opengl/mesa/tnl/t_vb_vertex.c
index c3de3a503b5..14763c2bf17 100644
--- a/reactos/dll/opengl/mesa/tnl/t_vb_vertex.c
+++ b/reactos/dll/opengl/mesa/tnl/t_vb_vertex.c
@@ -25,19 +25,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-
-#include "math/m_xform.h"
-
-#include "t_context.h"
-#include "t_pipeline.h"
-
-
+#include <precomp.h>
 
 struct vertex_stage_data {
    GLvector4f eye;
diff --git a/reactos/dll/opengl/mesa/tnl/t_vertex.c b/reactos/dll/opengl/mesa/tnl/t_vertex.c
index 6582949a096..6d5aca3bf7c 100644
--- a/reactos/dll/opengl/mesa/tnl/t_vertex.c
+++ b/reactos/dll/opengl/mesa/tnl/t_vertex.c
@@ -25,12 +25,7 @@
  *    Keith Whitwell <keithw@tungstengraphics.com>
  */
 
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "swrast/s_chan.h"
-#include "t_context.h"
-#include "t_vertex.h"
+#include <precomp.h>
 
 #define DBG 0
 
diff --git a/reactos/dll/opengl/mesa/tnl/t_vertex_generic.c b/reactos/dll/opengl/mesa/tnl/t_vertex_generic.c
index 7b7f511ce50..f9a3129fa14 100644
--- a/reactos/dll/opengl/mesa/tnl/t_vertex_generic.c
+++ b/reactos/dll/opengl/mesa/tnl/t_vertex_generic.c
@@ -26,14 +26,7 @@
  *    Keith Whitwell <keithw@tungstengraphics.com>
  */
 
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "main/simple_list.h"
-#include "swrast/s_chan.h"
-#include "t_context.h"
-#include "t_vertex.h"
-
+#include <precomp.h>
 
 #if 0
 #define DEBUG_INSERT printf("%s\n", __FUNCTION__)
diff --git a/reactos/dll/opengl/mesa/tnl/t_vertex_sse.c b/reactos/dll/opengl/mesa/tnl/t_vertex_sse.c
index e0141c36fac..8bcdce372fc 100644
--- a/reactos/dll/opengl/mesa/tnl/t_vertex_sse.c
+++ b/reactos/dll/opengl/mesa/tnl/t_vertex_sse.c
@@ -25,14 +25,7 @@
  *    Keith Whitwell <keithw@tungstengraphics.com>
  */
 
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "main/simple_list.h"
-#include "main/enums.h"
-#include "swrast/s_chan.h"
-#include "t_context.h"
-#include "t_vertex.h"
+#include <precomp.h>
 
 #if defined(USE_SSE_ASM)
 
diff --git a/reactos/dll/opengl/mesa/vbo/precomp.h b/reactos/dll/opengl/mesa/vbo/precomp.h
new file mode 100644
index 00000000000..6f2df251b59
--- /dev/null
+++ b/reactos/dll/opengl/mesa/vbo/precomp.h
@@ -0,0 +1,32 @@
+#ifndef _MESA_VBO_PCH_
+#define _MESA_VBO_PCH_
+
+#include <main/api_arrayelt.h>
+#include <main/api_validate.h>
+#include <main/bufferobj.h>
+#include <main/compiler.h>
+#include <main/context.h>
+#include <main/dispatch.h>
+#include <main/dlist.h>
+#include <main/enums.h>
+#include <main/eval.h>
+#include <main/glheader.h>
+#include <main/image.h>
+#include <main/imports.h>
+#include <main/light.h>
+#include <main/macros.h>
+#include <main/mfeatures.h>
+#include <main/mtypes.h>
+#include <main/state.h>
+#include <main/varray.h>
+#include <main/vtxfmt.h>
+#include <math/m_eval.h>
+
+#include "vbo.h"
+#include "vbo_attrib.h"
+#include "vbo_context.h"
+#include "vbo_exec.h"
+#include "vbo_noop.h"
+#include "vbo_split.h"
+
+#endif /* _MESA_VBO_PCH_ */
diff --git a/reactos/dll/opengl/mesa/vbo/vbo_context.c b/reactos/dll/opengl/mesa/vbo/vbo_context.c
index 7724b00ee85..68982969ba8 100644
--- a/reactos/dll/opengl/mesa/vbo/vbo_context.c
+++ b/reactos/dll/opengl/mesa/vbo/vbo_context.c
@@ -25,13 +25,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "main/imports.h"
-#include "main/mtypes.h"
-#include "main/api_arrayelt.h"
-#include "main/bufferobj.h"
-#include "math/m_eval.h"
-#include "vbo.h"
-#include "vbo_context.h"
+#include <precomp.h>
 
 #define NR_MAT_ATTRIBS 12
 
diff --git a/reactos/dll/opengl/mesa/vbo/vbo_exec.c b/reactos/dll/opengl/mesa/vbo/vbo_exec.c
index 472cf88688e..655a8ed2c3f 100644
--- a/reactos/dll/opengl/mesa/vbo/vbo_exec.c
+++ b/reactos/dll/opengl/mesa/vbo/vbo_exec.c
@@ -25,14 +25,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-
-#include "main/api_arrayelt.h"
-#include "main/glheader.h"
-#include "main/mtypes.h"
-#include "main/vtxfmt.h"
-#include "vbo_context.h"
-
-
+#include <precomp.h>
 
 void vbo_exec_init( struct gl_context *ctx )
 {
diff --git a/reactos/dll/opengl/mesa/vbo/vbo_exec_api.c b/reactos/dll/opengl/mesa/vbo/vbo_exec_api.c
index b4db10f91a8..fc443f76a7e 100644
--- a/reactos/dll/opengl/mesa/vbo/vbo_exec_api.c
+++ b/reactos/dll/opengl/mesa/vbo/vbo_exec_api.c
@@ -30,23 +30,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
  *   Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "main/glheader.h"
-#include "main/bufferobj.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "main/mfeatures.h"
-#include "main/vtxfmt.h"
-#include "main/dlist.h"
-#include "main/eval.h"
-#include "main/state.h"
-#include "main/light.h"
-#include "main/api_arrayelt.h"
-#include "main/api_validate.h"
-#include "main/dispatch.h"
-
-#include "vbo_context.h"
-#include "vbo_noop.h"
-
+#include <precomp.h>
 
 #ifdef ERROR
 #undef ERROR
diff --git a/reactos/dll/opengl/mesa/vbo/vbo_exec_array.c b/reactos/dll/opengl/mesa/vbo/vbo_exec_array.c
index e10b74f999e..29f97208e69 100644
--- a/reactos/dll/opengl/mesa/vbo/vbo_exec_array.c
+++ b/reactos/dll/opengl/mesa/vbo/vbo_exec_array.c
@@ -26,17 +26,7 @@
  * 
  **************************************************************************/
 
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/state.h"
-#include "main/api_validate.h"
-#include "main/varray.h"
-#include "main/bufferobj.h"
-#include "main/enums.h"
-#include "main/macros.h"
-
-#include "vbo_context.h"
-
+#include <precomp.h>
 
 /**
  * All vertex buffers should be in an unmapped state when we're about
diff --git a/reactos/dll/opengl/mesa/vbo/vbo_exec_draw.c b/reactos/dll/opengl/mesa/vbo/vbo_exec_draw.c
index dd80cf5a44b..75f605e97d1 100644
--- a/reactos/dll/opengl/mesa/vbo/vbo_exec_draw.c
+++ b/reactos/dll/opengl/mesa/vbo/vbo_exec_draw.c
@@ -25,18 +25,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "main/glheader.h"
-#include "main/bufferobj.h"
-#include "main/compiler.h"
-#include "main/context.h"
-#include "main/enums.h"
-#include "main/mfeatures.h"
-#include "main/state.h"
-#include "main/vtxfmt.h"
-
-#include "vbo_context.h"
-#include "vbo_noop.h"
-
+#include <precomp.h>
 
 #if FEATURE_beginend
 
diff --git a/reactos/dll/opengl/mesa/vbo/vbo_exec_eval.c b/reactos/dll/opengl/mesa/vbo/vbo_exec_eval.c
index fc7f1a761b1..fd1f6792674 100644
--- a/reactos/dll/opengl/mesa/vbo/vbo_exec_eval.c
+++ b/reactos/dll/opengl/mesa/vbo/vbo_exec_eval.c
@@ -25,13 +25,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "math/m_eval.h"
-#include "main/dispatch.h"
-#include "vbo_exec.h"
-
+#include <precomp.h>
 
 static void clear_active_eval1( struct vbo_exec_context *exec, GLuint attr ) 
 {
diff --git a/reactos/dll/opengl/mesa/vbo/vbo_noop.c b/reactos/dll/opengl/mesa/vbo/vbo_noop.c
index 36892e433a1..edef84e327e 100644
--- a/reactos/dll/opengl/mesa/vbo/vbo_noop.c
+++ b/reactos/dll/opengl/mesa/vbo/vbo_noop.c
@@ -27,15 +27,7 @@
  * GLvertexformat no-op functions.  Used in out-of-memory situations.
  */
 
-
-#include "main/glheader.h"
-#include "main/api_arrayelt.h"
-#include "main/context.h"
-#include "main/dispatch.h"
-#include "main/dlist.h"
-#include "main/eval.h"
-#include "main/mfeatures.h"
-#include "vbo/vbo_noop.h"
+#include <precomp.h>
 
 #if FEATURE_beginend
 
diff --git a/reactos/dll/opengl/mesa/vbo/vbo_rebase.c b/reactos/dll/opengl/mesa/vbo/vbo_rebase.c
index dc2c58d3b19..5bc27c515a8 100644
--- a/reactos/dll/opengl/mesa/vbo/vbo_rebase.c
+++ b/reactos/dll/opengl/mesa/vbo/vbo_rebase.c
@@ -46,13 +46,7 @@
  * of zero.
  */
 
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-
-#include "vbo.h"
-#include "vbo_attrib.h"
-
+#include <precomp.h>
 
 #define REBASE(TYPE) 						\
 static void *rebase_##TYPE( const void *ptr,			\
diff --git a/reactos/dll/opengl/mesa/vbo/vbo_save.c b/reactos/dll/opengl/mesa/vbo/vbo_save.c
index 4ee99940aa7..68c84634984 100644
--- a/reactos/dll/opengl/mesa/vbo/vbo_save.c
+++ b/reactos/dll/opengl/mesa/vbo/vbo_save.c
@@ -25,14 +25,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-
-#include "main/mtypes.h"
-#include "main/bufferobj.h"
-#include "main/imports.h"
-#include "main/mfeatures.h"
-
-#include "vbo_context.h"
-
+#include <precomp.h>
 
 #if FEATURE_dlist
 
diff --git a/reactos/dll/opengl/mesa/vbo/vbo_save_api.c b/reactos/dll/opengl/mesa/vbo/vbo_save_api.c
index c803411a053..280b73cf412 100644
--- a/reactos/dll/opengl/mesa/vbo/vbo_save_api.c
+++ b/reactos/dll/opengl/mesa/vbo/vbo_save_api.c
@@ -66,23 +66,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
  * Vertex commands are issued within a single primitive.
  */
 
-
-#include "main/glheader.h"
-#include "main/bufferobj.h"
-#include "main/context.h"
-#include "main/dlist.h"
-#include "main/enums.h"
-#include "main/eval.h"
-#include "main/macros.h"
-#include "main/mfeatures.h"
-#include "main/api_validate.h"
-#include "main/api_arrayelt.h"
-#include "main/vtxfmt.h"
-#include "main/dispatch.h"
-
-#include "vbo_context.h"
-#include "vbo_noop.h"
-
+#include <precomp.h>
 
 #if FEATURE_dlist
 
diff --git a/reactos/dll/opengl/mesa/vbo/vbo_save_draw.c b/reactos/dll/opengl/mesa/vbo/vbo_save_draw.c
index 0a6ab4e05ea..71f66bbd0f4 100644
--- a/reactos/dll/opengl/mesa/vbo/vbo_save_draw.c
+++ b/reactos/dll/opengl/mesa/vbo/vbo_save_draw.c
@@ -26,18 +26,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "main/glheader.h"
-#include "main/bufferobj.h"
-#include "main/context.h"
-#include "main/imports.h"
-#include "main/mfeatures.h"
-#include "main/mtypes.h"
-#include "main/macros.h"
-#include "main/light.h"
-#include "main/state.h"
-
-#include "vbo_context.h"
-
+#include <precomp.h>
 
 #if FEATURE_dlist
 
diff --git a/reactos/dll/opengl/mesa/vbo/vbo_save_loopback.c b/reactos/dll/opengl/mesa/vbo/vbo_save_loopback.c
index 107dfdea6a4..614e5ebabee 100644
--- a/reactos/dll/opengl/mesa/vbo/vbo_save_loopback.c
+++ b/reactos/dll/opengl/mesa/vbo/vbo_save_loopback.c
@@ -25,16 +25,7 @@
  * 
  **************************************************************************/
 
-#include "main/context.h"
-#include "main/glheader.h"
-#include "main/enums.h"
-#include "main/imports.h"
-#include "main/mfeatures.h"
-#include "main/mtypes.h"
-#include "main/dispatch.h"
-
-#include "vbo_context.h"
-
+#include <precomp.h>
 
 #if FEATURE_dlist
 
diff --git a/reactos/dll/opengl/mesa/vbo/vbo_split.c b/reactos/dll/opengl/mesa/vbo/vbo_split.c
index 49bdb0a6b46..382169ef0fe 100644
--- a/reactos/dll/opengl/mesa/vbo/vbo_split.c
+++ b/reactos/dll/opengl/mesa/vbo/vbo_split.c
@@ -47,13 +47,7 @@
  * limitations on drivers which want to use it as a fallback path.
  */
 
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-#include "main/macros.h"
-
-#include "vbo_split.h"
-#include "vbo.h"
+#include <precomp.h>
 
 /* True if a primitive can be split without copying of vertices, false
  * otherwise.
diff --git a/reactos/dll/opengl/mesa/vbo/vbo_split_copy.c b/reactos/dll/opengl/mesa/vbo/vbo_split_copy.c
index 20f4560d2e9..b5436f19a3b 100644
--- a/reactos/dll/opengl/mesa/vbo/vbo_split_copy.c
+++ b/reactos/dll/opengl/mesa/vbo/vbo_split_copy.c
@@ -29,17 +29,7 @@
 /* Split indexed primitives with per-vertex copying.
  */
 
-#include "main/glheader.h"
-#include "main/bufferobj.h"
-#include "main/imports.h"
-#include "main/image.h"
-#include "main/macros.h"
-#include "main/mtypes.h"
-
-#include "vbo_attrib.h"
-#include "vbo_split.h"
-#include "vbo.h"
-
+#include <precomp.h>
 
 #define ELT_TABLE_SIZE 16
 
diff --git a/reactos/dll/opengl/mesa/vbo/vbo_split_inplace.c b/reactos/dll/opengl/mesa/vbo/vbo_split_inplace.c
index f6aa576b6c8..21fe041b37e 100644
--- a/reactos/dll/opengl/mesa/vbo/vbo_split_inplace.c
+++ b/reactos/dll/opengl/mesa/vbo/vbo_split_inplace.c
@@ -26,13 +26,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-
-#include "main/mtypes.h"
-#include "main/macros.h"
-#include "main/enums.h"
-#include "main/image.h"
-#include "vbo_split.h"
-
+#include <precomp.h>
 
 #define MAX_PRIM 32