diff -Naur Mesa-10.2.0-rc4-old/include/GL/internal/dri_interface.h Mesa-10.2.0-rc4-new/include/GL/internal/dri_interface.h --- Mesa-10.2.0-rc4-old/include/GL/internal/dri_interface.h 2014-04-30 01:31:39.000000000 +0200 +++ Mesa-10.2.0-rc4-new/include/GL/internal/dri_interface.h 2014-05-26 11:33:51.000000000 +0200 @@ -48,7 +48,7 @@ #endif #ifndef __NOT_HAVE_DRM_H -#include +#include #else typedef unsigned int drm_context_t; typedef unsigned int drm_drawable_t; diff -Naur Mesa-10.2.0-rc4-old/src/gallium/winsys/radeon/drm/radeon_drm_cs.h Mesa-10.2.0-rc4-new/src/gallium/winsys/radeon/drm/radeon_drm_cs.h --- Mesa-10.2.0-rc4-old/src/gallium/winsys/radeon/drm/radeon_drm_cs.h 2014-04-27 03:37:31.000000000 +0200 +++ Mesa-10.2.0-rc4-new/src/gallium/winsys/radeon/drm/radeon_drm_cs.h 2014-05-26 12:07:15.000000000 +0200 @@ -28,7 +28,7 @@ #define RADEON_DRM_CS_H #include "radeon_drm_bo.h" -#include +#include struct radeon_cs_context { uint32_t buf[RADEON_MAX_CMDBUF_DWORDS]; diff -Naur Mesa-10.2.0-rc4-old/src/gallium/winsys/radeon/drm/radeon_winsys.h Mesa-10.2.0-rc4-new/src/gallium/winsys/radeon/drm/radeon_winsys.h --- Mesa-10.2.0-rc4-old/src/gallium/winsys/radeon/drm/radeon_winsys.h 2014-05-03 02:17:23.000000000 +0200 +++ Mesa-10.2.0-rc4-new/src/gallium/winsys/radeon/drm/radeon_winsys.h 2014-05-26 12:12:31.000000000 +0200 @@ -41,7 +41,7 @@ */ #include "pipebuffer/pb_buffer.h" -#include "radeon_surface.h" +#include "libdrm/radeon_surface.h" #define RADEON_MAX_CMDBUF_DWORDS (16 * 1024) diff -Naur Mesa-10.2.0-rc4-old/src/mesa/drivers/dri/r200/r200_context.h Mesa-10.2.0-rc4-new/src/mesa/drivers/dri/r200/r200_context.h --- Mesa-10.2.0-rc4-old/src/mesa/drivers/dri/r200/r200_context.h 2014-04-27 01:28:09.000000000 +0200 +++ Mesa-10.2.0-rc4-new/src/mesa/drivers/dri/r200/r200_context.h 2014-05-26 11:50:07.000000000 +0200 @@ -36,8 +36,8 @@ #define __R200_CONTEXT_H__ #include "tnl/t_vertex.h" -#include "drm.h" -#include "radeon_drm.h" +#include "libdrm/drm.h" +#include "libdrm/radeon_drm.h" #include "dri_util.h" #include "main/macros.h" diff -Naur Mesa-10.2.0-rc4-old/src/mesa/drivers/dri/r200/r200_ioctl.h Mesa-10.2.0-rc4-new/src/mesa/drivers/dri/r200/r200_ioctl.h --- Mesa-10.2.0-rc4-old/src/mesa/drivers/dri/r200/r200_ioctl.h 2014-04-27 01:28:09.000000000 +0200 +++ Mesa-10.2.0-rc4-new/src/mesa/drivers/dri/r200/r200_ioctl.h 2014-05-26 11:51:12.000000000 +0200 @@ -38,12 +38,12 @@ #include "main/simple_list.h" #include "radeon_dri.h" -#include "radeon_bo_gem.h" -#include "radeon_cs_gem.h" +#include "libdrm/radeon_bo_gem.h" +#include "libdrm/radeon_cs_gem.h" #include "xf86drm.h" -#include "drm.h" -#include "radeon_drm.h" +#include "libdrm/drm.h" +#include "libdrm/radeon_drm.h" extern void r200EmitMaxVtxIndex(r200ContextPtr rmesa, int count); extern void r200EmitVertexAOS( r200ContextPtr rmesa, diff -Naur Mesa-10.2.0-rc4-old/src/mesa/drivers/dri/radeon/radeon_common.c Mesa-10.2.0-rc4-new/src/mesa/drivers/dri/radeon/radeon_common.c --- Mesa-10.2.0-rc4-old/src/mesa/drivers/dri/radeon/radeon_common.c 2014-04-27 01:28:09.000000000 +0200 +++ Mesa-10.2.0-rc4-new/src/mesa/drivers/dri/radeon/radeon_common.c 2014-05-26 11:48:23.000000000 +0200 @@ -52,7 +52,7 @@ #include "drivers/common/meta.h" #include "radeon_common.h" -#include "radeon_drm.h" +#include "libdrm/radeon_drm.h" #include "radeon_queryobj.h" /** diff -Naur Mesa-10.2.0-rc4-old/src/mesa/drivers/dri/radeon/radeon_common_context.h Mesa-10.2.0-rc4-new/src/mesa/drivers/dri/radeon/radeon_common_context.h --- Mesa-10.2.0-rc4-old/src/mesa/drivers/dri/radeon/radeon_common_context.h 2014-04-27 01:28:09.000000000 +0200 +++ Mesa-10.2.0-rc4-new/src/mesa/drivers/dri/radeon/radeon_common_context.h 2014-05-26 11:47:38.000000000 +0200 @@ -9,15 +9,15 @@ #include "radeon_screen.h" #include "radeon_debug.h" -#include "radeon_drm.h" +#include "libdrm/radeon_drm.h" #include "dri_util.h" #include "tnl/t_vertex.h" #include "swrast/s_context.h" struct radeon_context; -#include "radeon_bo_gem.h" -#include "radeon_cs_gem.h" +#include "libdrm/radeon_bo_gem.h" +#include "libdrm/radeon_cs_gem.h" /* This union is used to avoid warnings/miscompilation with float to uint32_t casts due to strict-aliasing */ diff -Naur Mesa-10.2.0-rc4-old/src/mesa/drivers/dri/radeon/radeon_screen.h Mesa-10.2.0-rc4-new/src/mesa/drivers/dri/radeon/radeon_screen.h --- Mesa-10.2.0-rc4-old/src/mesa/drivers/dri/radeon/radeon_screen.h 2014-04-30 01:31:40.000000000 +0200 +++ Mesa-10.2.0-rc4-new/src/mesa/drivers/dri/radeon/radeon_screen.h 2014-05-26 11:44:06.000000000 +0200 @@ -44,7 +44,7 @@ #include "radeon_dri.h" #include "radeon_chipset.h" #include "radeon_reg.h" -#include "drm_sarea.h" +#include "libdrm/drm_sarea.h" #include "xmlconfig.h" diff -Naur Mesa-10.2.0-rc4-old/src/mesa/drivers/dri/radeon/server/radeon_dri.h Mesa-10.2.0-rc4-new/src/mesa/drivers/dri/radeon/server/radeon_dri.h --- Mesa-10.2.0-rc4-old/src/mesa/drivers/dri/radeon/server/radeon_dri.h 2013-06-27 20:13:13.000000000 +0200 +++ Mesa-10.2.0-rc4-new/src/mesa/drivers/dri/radeon/server/radeon_dri.h 2014-05-26 11:39:16.000000000 +0200 @@ -40,7 +40,7 @@ #include "xf86drm.h" #include "drm.h" -#include "radeon_drm.h" +#include "libdrm/radeon_drm.h" /* DRI Driver defaults */ #define RADEON_DEFAULT_CP_PIO_MODE RADEON_CSQ_PRIPIO_INDPIO diff -Naur Mesa-10.2.0-rc4-old/src/mesa/drivers/dri/radeon/radeon_context.h Mesa-10.2.0-rc4-new/src/mesa/drivers/dri/radeon/radeon_context.h --- Mesa-10.2.0-rc4-old/src/mesa/drivers/dri/radeon/radeon_context.h 2014-05-02 18:40:46.000000000 +0200 +++ Mesa-10.2.0-rc4-new/src/mesa/drivers/dri/radeon/radeon_context.h 2014-05-26 11:52:08.000000000 +0200 @@ -45,8 +45,8 @@ #include "tnl/t_vertex.h" #include "dri_util.h" -#include "drm.h" -#include "radeon_drm.h" +#include "libdrm/drm.h" +#include "libdrm/radeon_drm.h" #include "main/macros.h" #include "main/mtypes.h" #include "main/colormac.h" diff -Naur Mesa-10.2.0-rc4-old/src/mesa/drivers/dri/radeon/radeon_ioctl.h Mesa-10.2.0-rc4-new/src/mesa/drivers/dri/radeon/radeon_ioctl.h --- Mesa-10.2.0-rc4-old/src/mesa/drivers/dri/radeon/radeon_ioctl.h 2014-04-08 18:23:18.000000000 +0200 +++ Mesa-10.2.0-rc4-new/src/mesa/drivers/dri/radeon/radeon_ioctl.h 2014-05-26 11:52:50.000000000 +0200 @@ -37,8 +37,8 @@ #define __RADEON_IOCTL_H__ #include "main/simple_list.h" -#include "radeon_bo_gem.h" -#include "radeon_cs_gem.h" +#include "libdrm/radeon_bo_gem.h" +#include "libdrm/radeon_cs_gem.h" extern void radeonEmitVertexAOS( r100ContextPtr rmesa, GLuint vertex_size,