9 files changed, 37 insertions, 37 deletions
diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c
index 1278faea4c9..25f7d5fa1da 100644
--- a/src/gallium/auxiliary/vl/vl_compositor.c
+++ b/src/gallium/auxiliary/vl/vl_compositor.c
@@ -25,18 +25,18 @@
  *
  **************************************************************************/
 
-#include "vl_compositor.h"
-#include "util/u_draw.h"
 #include <assert.h>
+
 #include <pipe/p_context.h>
-#include <util/u_inlines.h>
+
 #include <util/u_memory.h>
-#include <util/u_keymap.h>
 #include <util/u_draw.h>
-#include <util/u_sampler.h>
+
 #include <tgsi/tgsi_ureg.h>
+
 #include "vl_csc.h"
 #include "vl_types.h"
+#include "vl_compositor.h"
 
 typedef float csc_matrix[16];
 
diff --git a/src/gallium/auxiliary/vl/vl_context.h b/src/gallium/auxiliary/vl/vl_context.h
index a4504871e65..9f12a0df925 100644
--- a/src/gallium/auxiliary/vl/vl_context.h
+++ b/src/gallium/auxiliary/vl/vl_context.h
@@ -26,8 +26,8 @@
  *
  **************************************************************************/
 
-#ifndef VL_CONTEXT_H
-#define VL_CONTEXT_H
+#ifndef vl_context_h
+#define vl_context_h
 
 #include <pipe/p_video_context.h>
 
@@ -46,4 +46,4 @@ struct vl_context
 struct pipe_video_context *
 vl_create_context(struct pipe_context *pipe, bool pot_buffers);
 
-#endif /* VL_CONTEXT_H */
+#endif /* vl_context_h */
diff --git a/src/gallium/auxiliary/vl/vl_csc.c b/src/gallium/auxiliary/vl/vl_csc.c
index 5ecc43a5fa3..75159be80df 100644
--- a/src/gallium/auxiliary/vl/vl_csc.c
+++ b/src/gallium/auxiliary/vl/vl_csc.c
@@ -1,8 +1,8 @@
 /**************************************************************************
- * 
+ *
  * Copyright 2009 Younes Manton.
  * All Rights Reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
@@ -10,11 +10,11 @@
  * distribute, sub license, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice (including the
  * next paragraph) shall be included in all copies or substantial portions
  * of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
@@ -22,13 +22,14 @@
  * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
+ *
  **************************************************************************/
 
-#include "vl_csc.h"
 #include <util/u_math.h>
 #include <util/u_debug.h>
 
+#include "vl_csc.h"
+
 /*
  * Color space conversion formulas
  *
diff --git a/src/gallium/auxiliary/vl/vl_idct.c b/src/gallium/auxiliary/vl/vl_idct.c
index 3502f4c1eaa..f8e0f02c4f4 100644
--- a/src/gallium/auxiliary/vl/vl_idct.c
+++ b/src/gallium/auxiliary/vl/vl_idct.c
@@ -25,18 +25,20 @@
  *
  **************************************************************************/
 
-#include "vl_idct.h"
-#include "vl_vertex_buffers.h"
-#include "vl_defines.h"
-#include "util/u_draw.h"
 #include <assert.h>
+
 #include <pipe/p_context.h>
 #include <pipe/p_screen.h>
-#include <util/u_inlines.h>
+
+#include <util/u_draw.h>
 #include <util/u_sampler.h>
-#include <util/u_format.h>
+
 #include <tgsi/tgsi_ureg.h>
+
+#include "vl_defines.h"
 #include "vl_types.h"
+#include "vl_vertex_buffers.h"
+#include "vl_idct.h"
 
 enum VS_OUTPUT
 {
diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.h b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.h
index c2eb7dd17de..8f8c84e365c 100644
--- a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.h
+++ b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.h
@@ -25,8 +25,8 @@
  *
  **************************************************************************/
 
-#ifndef VL_MPEG12_DECODER_H
-#define VL_MPEG12_DECODER_H
+#ifndef vl_mpeg12_decoder_h
+#define vl_mpeg12_decoder_h
 
 #include <pipe/p_video_context.h>
 
@@ -93,4 +93,4 @@ vl_create_mpeg12_decoder(struct pipe_video_context *context,
                          enum pipe_video_chroma_format chroma_format,
                          unsigned width, unsigned height);
 
-#endif /* VL_MPEG12_DECODER_H */
+#endif /* vl_mpeg12_decoder_h */
diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c b/src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
index 029c85137be..0f9df6b4d32 100644
--- a/src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
+++ b/src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
@@ -25,21 +25,19 @@
  *
  **************************************************************************/
 
-#include "vl_mpeg12_mc_renderer.h"
-#include "vl_vertex_buffers.h"
-#include "vl_defines.h"
-#include "util/u_draw.h"
 #include <assert.h>
+
 #include <pipe/p_context.h>
-#include <util/u_inlines.h>
-#include <util/u_format.h>
-#include <util/u_math.h>
-#include <util/u_memory.h>
-#include <util/u_keymap.h>
+
 #include <util/u_sampler.h>
 #include <util/u_draw.h>
+
 #include <tgsi/tgsi_ureg.h>
 
+#include "vl_defines.h"
+#include "vl_vertex_buffers.h"
+#include "vl_mpeg12_mc_renderer.h"
+
 enum VS_OUTPUT
 {
    VS_O_VPOS,
diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.h b/src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.h
index c3efda524a8..d4e49216229 100644
--- a/src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.h
+++ b/src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.h
@@ -28,14 +28,12 @@
 #ifndef vl_mpeg12_mc_renderer_h
 #define vl_mpeg12_mc_renderer_h
 
-#include <pipe/p_compiler.h>
 #include <pipe/p_state.h>
 #include <pipe/p_video_state.h>
+
 #include "vl_types.h"
 
 struct pipe_context;
-struct pipe_macroblock;
-struct keymap;
 
 struct vl_mpeg12_mc_renderer
 {
diff --git a/src/gallium/auxiliary/vl/vl_vertex_buffers.h b/src/gallium/auxiliary/vl/vl_vertex_buffers.h
index 837d8bd53f9..58b841836d0 100644
--- a/src/gallium/auxiliary/vl/vl_vertex_buffers.h
+++ b/src/gallium/auxiliary/vl/vl_vertex_buffers.h
@@ -29,6 +29,7 @@
 
 #include <pipe/p_state.h>
 #include <pipe/p_video_state.h>
+
 #include "vl_types.h"
 
 /* vertex buffers act as a todo list
@@ -84,4 +85,4 @@ void vl_vb_restart(struct vl_vertex_buffer *buffer,
 
 void vl_vb_cleanup(struct vl_vertex_buffer *buffer);
 
-#endif
+#endif /* vl_vertex_buffers_h */
diff --git a/src/gallium/auxiliary/vl/vl_video_buffer.h b/src/gallium/auxiliary/vl/vl_video_buffer.h
index 1acc9f49622..3f462acc510 100644
--- a/src/gallium/auxiliary/vl/vl_video_buffer.h
+++ b/src/gallium/auxiliary/vl/vl_video_buffer.h
@@ -59,4 +59,4 @@ vl_video_buffer_init(struct pipe_video_context *context,
                      unsigned num_planes,
                      const enum pipe_format resource_formats[VL_MAX_PLANES],
                      unsigned usage);
-#endif
+#endif /* vl_ycbcr_buffer_h */