diff -rupN xf86-video-amdgpu-19.1.0.old/src/amdgpu_probe.c xf86-video-amdgpu-19.1.0/src/amdgpu_probe.c
--- xf86-video-amdgpu-19.1.0.old/src/amdgpu_probe.c	2019-10-11 11:20:30.000000000 -0400
+++ xf86-video-amdgpu-19.1.0/src/amdgpu_probe.c	2021-04-19 20:52:58.420316884 -0400
@@ -48,7 +48,7 @@
 #include "xf86.h"
 
 #include "xf86drmMode.h"
-#include "dri.h"
+#include "xf86drm.h"
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <xf86_OSproc.h>
diff -rupN xf86-video-amdgpu-19.1.0.old/src/drmmode_display.c xf86-video-amdgpu-19.1.0/src/drmmode_display.c
--- xf86-video-amdgpu-19.1.0.old/src/drmmode_display.c	2019-10-11 11:20:30.000000000 -0400
+++ xf86-video-amdgpu-19.1.0/src/drmmode_display.c	2021-04-19 20:53:12.124587744 -0400
@@ -40,15 +40,13 @@
 #include "mipointrst.h"
 #include "xf86cmap.h"
 #include "xf86Priv.h"
-#include "sarea.h"
+#include "xf86drm.h"
 
 #include "drmmode_display.h"
 #include "amdgpu_bo_helper.h"
 #include "amdgpu_glamor.h"
 #include "amdgpu_pixmap.h"
 
-#include <dri.h>
-
 /* DPMS */
 #ifdef HAVE_XEXTPROTO_71
 #include <X11/extensions/dpmsconst.h>