diff --git a/src/gallium/winsys/r600/drm/r600_priv.h b/src/gallium/winsys/r600/drm/r600_priv.h
index 6ca8f7b..f1bbe38 100644
--- a/src/gallium/winsys/r600/drm/r600_priv.h
+++ b/src/gallium/winsys/r600/drm/r600_priv.h
@@ -26,19 +26,13 @@
 #ifndef R600_PRIV_H
 #define R600_PRIV_H
 
-#include "r600.h"
-#include "../../radeon/drm/radeon_winsys.h"
+#include "r600_pipe.h"
 #include "util/u_hash_table.h"
 #include "os/os_thread.h"
 
 #define PKT_COUNT_C                     0xC000FFFF
 #define PKT_COUNT_S(x)                  (((x) & 0x3FFF) << 16)
 
-struct radeon {
-	struct radeon_winsys		*ws;
-	struct radeon_info		info;
-};
-
 /* these flags are used in register flags and added into block flags */
 #define REG_FLAG_NEED_BO 1
 #define REG_FLAG_DIRTY_ALWAYS 2
@@ -86,7 +80,7 @@
 	assert(usage);
 
 	unsigned reloc_index =
-		ctx->radeon->ws->cs_add_reloc(ctx->cs, rbo->cs_buf,
+		ctx->screen->ws->cs_add_reloc(ctx->cs, rbo->cs_buf,
 					      rd, wd);
 
 	if (reloc_index >= ctx->creloc)