diff --git a/libdrm.cpp b/libdrm.cpp
index a3964c8768..878318ae80 100644
--- a/libdrm.cpp
+++ b/libdrm.cpp
@@ -40,9 +40,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <cstdint>
-#include <xf86drm.h>
-#include <amdgpu.h>
-#include <amdgpu_drm.h>
 
 #include "inc/wddm/types.h"
 #include "inc/wddm/device.h"
@@ -106,7 +103,7 @@ HSAKMTAPI int amdgpu_bo_import(amdgpu_device_handle dev,
   HSAKMT_STATUS ret = hsaKmtImportDMABufHandle(shared_handle, &MemoryAddress);
   if (ret == HSAKMT_STATUS_SUCCESS) {
     //use GpuMemory object's address as drm buf handle
-    output->buf_handle = reinterpret_cast<amdgpu_bo*>(MemoryAddress);
+    output->buf_handle = reinterpret_cast<amdgpu_bo_handle>(MemoryAddress);
     return 0;
   } else {
     return -1;
diff --git a/libhsakmt.h b/libhsakmt.h
index 1a3e3a2b6c..fb8e8b0a37 100644
--- a/libhsakmt.h
+++ b/libhsakmt.h
@@ -30,6 +30,7 @@
 #include <stdint.h>
 #include <limits.h>
 #include "hsakmt/hsakmt.h"
+#include "hsakmt/hsakmt_drm.h"
 
 #include "inc/wddm/types.h"
 #include "inc/wddm/device.h"
diff --git a/openclose.cpp b/openclose.cpp
index 0783f401ea..2aa917f97b 100644
--- a/openclose.cpp
+++ b/openclose.cpp
@@ -31,7 +31,6 @@
 #include <cstdio>
 #include <strings.h>
 #include <cassert>
-#include <amdgpu.h>
 #include "libhsakmt.h"
 
 static const char dxg_device_name[] = "/dev/dxg";
diff --git a/topology.cpp b/topology.cpp
index 55838075fb..3d3a9e4c93 100644
--- a/topology.cpp
+++ b/topology.cpp
@@ -37,10 +37,6 @@
 #include <unistd.h>
 #include <sys/sysinfo.h>
 
-#include <xf86drm.h>
-#include <amdgpu.h>
-#include <amdgpu_drm.h>
-
 #include "libhsakmt.h"
 #include "inc/wddm/types.h"
 #include "inc/wddm/device.h"