5 files changed, 5 insertions, 7 deletions
diff --git a/src/gallium/winsys/drm/amd/amd_buffer.c b/src/gallium/winsys/drm/amd/amd_buffer.c
index 3d400243a5..fb7c6f33ed 100644
--- a/src/gallium/winsys/drm/amd/amd_buffer.c
+++ b/src/gallium/winsys/drm/amd/amd_buffer.c
@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include "dri_util.h"
 #include "state_tracker/st_public.h"
-#include "pipe/p_winsys.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_inlines.h"
 #include "amd_buffer.h"
diff --git a/src/gallium/winsys/drm/amd/amd_buffer.h b/src/gallium/winsys/drm/amd/amd_buffer.h
index d67967ebea..238ca572ae 100644
--- a/src/gallium/winsys/drm/amd/amd_buffer.h
+++ b/src/gallium/winsys/drm/amd/amd_buffer.h
@@ -30,7 +30,7 @@
 #ifndef AMD_BUFFER_H
 #define AMD_BUFFER_H
 
-#include "pipe/p_winsys.h"
+#include "pipe/internal/p_winsys_screen.h"
 #include "amd_screen.h"
 #include "amd_context.h"
 #include "radeon_bo.h"
diff --git a/src/gallium/winsys/drm/amd/amd_context.c b/src/gallium/winsys/drm/amd/amd_context.c
index 86e6e0f5f7..e089cf6874 100644
--- a/src/gallium/winsys/drm/amd/amd_context.c
+++ b/src/gallium/winsys/drm/amd/amd_context.c
@@ -29,7 +29,6 @@
  */
 #include <stdio.h>
 #include "dri_util.h"
-#include "pipe/p_winsys.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_inlines.h"
 #include "state_tracker/st_public.h"
diff --git a/src/gallium/winsys/drm/amd/amd_screen.c b/src/gallium/winsys/drm/amd/amd_screen.c
index fcf8524525..d62b47f36d 100644
--- a/src/gallium/winsys/drm/amd/amd_screen.c
+++ b/src/gallium/winsys/drm/amd/amd_screen.c
@@ -247,14 +247,15 @@ static void amd_buffer_destroy(__DRIdrawablePrivate * dri_drawable)
 static void amd_swap_buffers(__DRIdrawablePrivate *dri_drawable)
 {
     struct amd_framebuffer *amd_fb;
-    struct pipe_surface *back_surf;
+    struct pipe_surface *back_surf = NULL;
 
     amd_fb = dri_drawable->driverPrivate;
     assert(amd_fb);
     assert(amd_fb->st_framebuffer);
 
-    back_surf = st_get_framebuffer_surface(amd_fb->st_framebuffer,
-                                           ST_SURFACE_BACK_LEFT);
+    st_get_framebuffer_surface(amd_fb->st_framebuffer,
+                               ST_SURFACE_BACK_LEFT,
+                               &back_surf);
     if (back_surf) {
         st_notify_swapbuffers(amd_fb->st_framebuffer);
         /* TODO: do we want to do anythings ? */
diff --git a/src/gallium/winsys/drm/amd/amd_screen.h b/src/gallium/winsys/drm/amd/amd_screen.h
index 7f21fa477c..2617393f2e 100644
--- a/src/gallium/winsys/drm/amd/amd_screen.h
+++ b/src/gallium/winsys/drm/amd/amd_screen.h
@@ -30,7 +30,6 @@
 #ifndef AMD_SCREEN_H
 #define AMD_SCREEN_H
 
-#include "pipe/p_winsys.h"
 #include "dri_util.h"
 #include "radeon_bo.h"