6 files changed, 14 insertions, 6 deletions
diff --git a/src/gallium/state_trackers/dri/dri1.h b/src/gallium/state_trackers/dri/dri1.h
index cced505ea97..f7441f98abc 100644
--- a/src/gallium/state_trackers/dri/dri1.h
+++ b/src/gallium/state_trackers/dri/dri1.h
@@ -36,7 +36,7 @@
 #include "dri_drawable.h"
 
 #include "state_tracker/st_api.h"
-#include "dri_util.h"
+#include "dri_wrapper.h"
 
 extern struct dri1_api *__dri1_api_hooks;
 
diff --git a/src/gallium/state_trackers/dri/dri2.h b/src/gallium/state_trackers/dri/dri2.h
index 06abccc405f..e1afcf8ca8d 100644
--- a/src/gallium/state_trackers/dri/dri2.h
+++ b/src/gallium/state_trackers/dri/dri2.h
@@ -29,7 +29,7 @@
 #define DRI2_H
 
 #include "dri_drawable.h"
-#include "dri_util.h"
+#include "dri_wrapper.h"
 
 const __DRIconfig **
 dri_init_screen2(__DRIscreen * sPriv);
diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c
index 54568a8b220..34d9a932ead 100644
--- a/src/gallium/state_trackers/dri/dri_context.c
+++ b/src/gallium/state_trackers/dri/dri_context.c
@@ -33,7 +33,6 @@
 #include "dri_drawable.h"
 #include "dri_context.h"
 #include "dri_st_api.h"
-#include "dri1.h"
 
 #include "pipe/p_context.h"
 #include "util/u_memory.h"
diff --git a/src/gallium/state_trackers/dri/dri_context.h b/src/gallium/state_trackers/dri/dri_context.h
index 845b420cf89..24d3d0368a4 100644
--- a/src/gallium/state_trackers/dri/dri_context.h
+++ b/src/gallium/state_trackers/dri/dri_context.h
@@ -33,8 +33,7 @@
 #define DRI_CONTEXT_H
 
 #include "pipe/p_compiler.h"
-#include "drm.h"
-#include "dri_util.h"
+#include "dri_wrapper.h"
 
 struct pipe_context;
 struct pipe_fence;
diff --git a/src/gallium/state_trackers/dri/dri_screen.h b/src/gallium/state_trackers/dri/dri_screen.h
index 2b0444603a0..639d48661e2 100644
--- a/src/gallium/state_trackers/dri/dri_screen.h
+++ b/src/gallium/state_trackers/dri/dri_screen.h
@@ -32,7 +32,7 @@
 #ifndef DRI_SCREEN_H
 #define DRI_SCREEN_H
 
-#include "dri_util.h"
+#include "dri_wrapper.h"
 #include "xmlconfig.h"
 
 #include "pipe/p_compiler.h"
diff --git a/src/gallium/state_trackers/dri/dri_wrapper.h b/src/gallium/state_trackers/dri/dri_wrapper.h
new file mode 100644
index 00000000000..141ba02706a
--- /dev/null
+++ b/src/gallium/state_trackers/dri/dri_wrapper.h
@@ -0,0 +1,10 @@
+#ifndef DRI_WRAPPER_H
+#define DRI_WRAPPER_H
+
+#ifndef __NOT_HAVE_DRM_H
+#include "dri_util.h"
+#else
+#include "drisw_util.h"
+#endif
+
+#endif