diff --git a/src/mesa/drivers/dri/radeon/radeon_cs_drm.h b/src/mesa/drivers/dri/radeon/radeon_cs_drm.h
index 7cc75d47004..ffda17c11fe 100644
--- a/src/mesa/drivers/dri/radeon/radeon_cs_drm.h
+++ b/src/mesa/drivers/dri/radeon/radeon_cs_drm.h
@@ -35,7 +35,7 @@
 #include <stdint.h>
 #include "drm.h"
 #include "radeon_drm.h"
-#include "radeon_bo.h"
+#include "radeon_bocs_wrapper.h"
 
 struct radeon_cs_reloc {
     struct radeon_bo    *bo;
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 8b06fb4d3e9..133d0d75552 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -1016,6 +1016,10 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
    return screen;
 }
 
+#ifndef RADEON_PARAM_DEVICE_ID
+#define RADEON_PARAM_DEVICE_ID 17
+#endif
+
 static radeonScreenPtr
 radeonCreateScreen2(__DRIscreenPrivate *sPriv)
 {