diff --git a/debug.cpp b/debug.cpp
index 01979c3b73..2b4425599a 100644
--- a/debug.cpp
+++ b/debug.cpp
@@ -26,7 +26,6 @@
 #include <cassert>
 #include <cstring>
 
-#include "libhsakmt.h"
 
 static uint32_t runtime_capabilities_mask = 0;
 
diff --git a/events.cpp b/events.cpp
index e32db760b1..1a360832de 100644
--- a/events.cpp
+++ b/events.cpp
@@ -27,7 +27,6 @@
 #include <cassert>
 #include <thread>
 #include <chrono>
-#include "libhsakmt.h"
 
 HSAKMT_STATUS HSAKMTAPI hsaKmtCreateEvent(HsaEventDescriptor *EventDesc,
                                           bool ManualReset, bool IsSignaled,
diff --git a/hsa.cpp b/hsa.cpp
index a596217598..28b915af52 100755
--- a/hsa.cpp
+++ b/hsa.cpp
@@ -1,5 +1,4 @@
 #include <dlfcn.h>
-#include "libhsakmt.h"
 #include "hsa-runtime/inc/hsa.h"
 #include "hsa-runtime/inc/hsa_ven_amd_loader.h"
 
diff --git a/hsakmtmodel.cpp b/hsakmtmodel.cpp
index 0f27ef291b..6799f5d891 100644
--- a/hsakmtmodel.cpp
+++ b/hsakmtmodel.cpp
@@ -22,7 +22,6 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 * DEALINGS IN THE SOFTWARE.
 */
-#include "libhsakmt.h"
 
 HSAKMT_STATUS HSAKMTAPI hsaKmtModelEnabled(bool* enable)
 {
diff --git a/libdrm.cpp b/libdrm.cpp
index 07aa90447c..869fdc49c9 100644
--- a/libdrm.cpp
+++ b/libdrm.cpp
@@ -43,7 +43,6 @@
 
 #include "impl/wddm/types.h"
 #include "impl/wddm/device.h"
-#include "libhsakmt.h"
 
 HSAKMT_STATUS HSAKMTAPI hsaKmtGetAMDGPUDeviceHandle(
     HSAuint32 NodeId, HsaAMDGPUDeviceHandle *DeviceHandle) {
diff --git a/memory.cpp b/memory.cpp
index 1be5592d0c..1d66ba91a1 100644
--- a/memory.cpp
+++ b/memory.cpp
@@ -23,7 +23,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "libhsakmt.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/openclose.cpp b/openclose.cpp
index 3cf3430bac..71a9977e31 100644
--- a/openclose.cpp
+++ b/openclose.cpp
@@ -34,7 +34,6 @@
 #include <cstdio>
 #include <strings.h>
 #include <cassert>
-#include "libhsakmt.h"
 
 
 hsakmtRuntime *dxg_runtime = new hsakmtRuntime();
diff --git a/pc_sampling.cpp b/pc_sampling.cpp
index e8b49c0f88..6c6a9e2a04 100644
--- a/pc_sampling.cpp
+++ b/pc_sampling.cpp
@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "libhsakmt.h"
 
 HSAKMT_STATUS HSAKMTAPI hsaKmtPcSamplingSupport(void) {
   CHECK_DXG_OPEN();
diff --git a/perfctr.cpp b/perfctr.cpp
index 07cd515669..9189d2dafa 100644
--- a/perfctr.cpp
+++ b/perfctr.cpp
@@ -22,7 +22,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "libhsakmt.h"
 
 HSAKMT_STATUS HSAKMTAPI hsaKmtPmcGetCounterProperties(
     HSAuint32 NodeId, HsaCounterProperties **CounterProperties) {
diff --git a/queues.cpp b/queues.cpp
index d8fefacff8..115328b3d6 100644
--- a/queues.cpp
+++ b/queues.cpp
@@ -23,7 +23,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 #include <cinttypes>
-#include "libhsakmt.h"
 #include "impl/wddm/device.h"
 #include "impl/wddm/queue.h"
 #include "hsa-runtime/inc/amd_hsa_signal.h"
diff --git a/spm.cpp b/spm.cpp
index 9efb91262e..14b0faf1f8 100644
--- a/spm.cpp
+++ b/spm.cpp
@@ -25,7 +25,6 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "libhsakmt.h"
 
 HSAKMT_STATUS HSAKMTAPI hsaKmtSPMAcquire(HSAuint32 PreferredNode) {
   CHECK_DXG_OPEN();
diff --git a/svm.cpp b/svm.cpp
index 0bc1f84f8e..f2f8a10f68 100644
--- a/svm.cpp
+++ b/svm.cpp
@@ -22,7 +22,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "libhsakmt.h"
 
 /* Helper functions for calling KFD SVM ioctl */
 
diff --git a/time.cpp b/time.cpp
index 02f225d6f4..a28bb29215 100644
--- a/time.cpp
+++ b/time.cpp
@@ -26,7 +26,6 @@
 #include <ctime>
 #include <cstring>
 #include <cassert>
-#include "libhsakmt.h"
 #include "impl/wddm/device.h"
 
 HSAKMT_STATUS HSAKMTAPI hsaKmtGetClockCounters(HSAuint32 NodeId,
diff --git a/topology.cpp b/topology.cpp
index b38611469a..777dc55949 100644
--- a/topology.cpp
+++ b/topology.cpp
@@ -38,7 +38,6 @@
 #include <unistd.h>
 #include <sys/sysinfo.h>
 
-#include "libhsakmt.h"
 #include "impl/wddm/types.h"
 #include "impl/wddm/device.h"
 #include "util/utils.h"
diff --git a/version.cpp b/version.cpp
index 121c687f3e..783595e73b 100644
--- a/version.cpp
+++ b/version.cpp
@@ -23,7 +23,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "libhsakmt.h"
 
 const char rocr4wslbuildid[] __attribute__((used)) = "ROCR4WSL BUILD ID: " STRING(ROCR4WSL_VERSION);
 
diff --git a/wddm/queue.cpp b/wddm/queue.cpp
index 915f36d4f3..8225a19c2a 100644
--- a/wddm/queue.cpp
+++ b/wddm/queue.cpp
@@ -46,7 +46,6 @@
 
 #include "impl/wddm/queue.h"
 #include "impl/registers.h"
-#include "libhsakmt.h"
 
 #include "hsa-runtime/inc/hsa.h"
 #include "hsa-runtime/inc/hsa_ven_amd_loader.h"
diff --git a/wddm/va_mgr.cpp b/wddm/va_mgr.cpp
index cc81727d87..4ea93c70f2 100644
--- a/wddm/va_mgr.cpp
+++ b/wddm/va_mgr.cpp
@@ -2,7 +2,6 @@
 #include <map>
 #include <algorithm>
 #include "impl/wddm/va_mgr.h"
-#include "libhsakmt.h"
 
 using namespace std;