diff --git a/rocclr/compiler/lib/complibdefs b/rocclr/compiler/lib/complibdefs
index e9904bfa49..64e0a96a74 100644
--- a/rocclr/compiler/lib/complibdefs
+++ b/rocclr/compiler/lib/complibdefs
@@ -42,8 +42,7 @@ endif
 endif
 endif
 
-GCPPFLAGS += $(INCSWITCH) "$(DEPTH)/drivers"
-GCPPFLAGS += $(INCSWITCH) "$(DEPTH)/drivers/inc/asic_reg"
+GCPPFLAGS += $(INCSWITCH) "$(DEPTH)/drivers/inc"
 GCPPFLAGS += $(INCSWITCH) "$(COMPLIB_DEPTH)"
 GCPPFLAGS += $(INCSWITCH) "$(OPENCL_DEPTH)/runtime"
 GCPPFLAGS += $(INCSWITCH) "$(OPENCL_DEPTH)/runtime/utils"
diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h b/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h
index 29cd571a8b..be37ed9050 100644
--- a/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h
+++ b/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h
@@ -4,18 +4,18 @@
 #ifndef _CL_UTILS_TARGET_MAPPINGS_AMDIL_0_8_H_
 #define _CL_UTILS_TARGET_MAPPINGS_AMDIL_0_8_H_
 
-#include "inc/asic_reg/evergreen_id.h"
-#include "inc/asic_reg/r700id.h"
-#include "inc/asic_reg/tn_id.h"
-#include "inc/asic_reg/sumo_id.h"
-#include "inc/asic_reg/northernisland_id.h"
-#include "inc/asic_reg/si_id.h"
-#include "inc/asic_reg/kv_id.h"
-#include "inc/asic_reg/ci_id.h"
-#include "inc/asic_reg/vi_id.h"
-#include "inc/asic_reg/cz_id.h"
-#include "inc/asic_reg/ai_id.h"
-#include "inc/asic_reg/atiid.h"
+#include "asic_reg/evergreen_id.h"
+#include "asic_reg/r700id.h"
+#include "asic_reg/tn_id.h"
+#include "asic_reg/sumo_id.h"
+#include "asic_reg/northernisland_id.h"
+#include "asic_reg/si_id.h"
+#include "asic_reg/kv_id.h"
+#include "asic_reg/ci_id.h"
+#include "asic_reg/vi_id.h"
+#include "asic_reg/cz_id.h"
+#include "asic_reg/ai_id.h"
+#include "asic_reg/atiid.h"
 
 static const TargetMapping AMDILTargetMapping_0_8[] = {
   UnknownTarget,
diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h b/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h
index d85cafe89c..037d6527ae 100644
--- a/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h
+++ b/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h
@@ -4,12 +4,12 @@
 #ifndef _CL_UTILS_TARGET_MAPPINGS_AMDIL64_0_8_H_
 #define _CL_UTILS_TARGET_MAPPINGS_AMDIL64_0_8_H_
 
-#include "inc/asic_reg/si_id.h"
-#include "inc/asic_reg/kv_id.h"
-#include "inc/asic_reg/ci_id.h"
-#include "inc/asic_reg/vi_id.h"
-#include "inc/asic_reg/cz_id.h"
-#include "inc/asic_reg/atiid.h"
+#include "asic_reg/si_id.h"
+#include "asic_reg/kv_id.h"
+#include "asic_reg/ci_id.h"
+#include "asic_reg/vi_id.h"
+#include "asic_reg/cz_id.h"
+#include "asic_reg/atiid.h"
 
 static const TargetMapping AMDIL64TargetMapping_0_8[] = {
   UnknownTarget,
diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h b/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h
index 45e9c2cc68..bbea482e0d 100644
--- a/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h
+++ b/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h
@@ -4,13 +4,13 @@
 #ifndef _CL_UTILS_TARGET_MAPPINGS_HSAIL_0_8_H_
 #define _CL_UTILS_TARGET_MAPPINGS_HSAIL_0_8_H_
 
-#include "inc/asic_reg/si_id.h"
-#include "inc/asic_reg/kv_id.h"
-#include "inc/asic_reg/ci_id.h"
-#include "inc/asic_reg/cz_id.h"
-#include "inc/asic_reg/ai_id.h"
-#include "inc/asic_reg/rv_id.h"
-#include "inc/asic_reg/atiid.h"
+#include "asic_reg/si_id.h"
+#include "asic_reg/kv_id.h"
+#include "asic_reg/ci_id.h"
+#include "asic_reg/cz_id.h"
+#include "asic_reg/ai_id.h"
+#include "asic_reg/rv_id.h"
+#include "asic_reg/atiid.h"
 
 static const TargetMapping HSAILTargetMapping_0_8[] = {
   UnknownTarget,
diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h b/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h
index cef5f2bc4a..2080140a28 100644
--- a/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h
+++ b/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h
@@ -4,12 +4,12 @@
 #ifndef _CL_UTILS_TARGET_MAPPINGS_HSAIL64_0_8_H_
 #define _CL_UTILS_TARGET_MAPPINGS_HSAIL64_0_8_H_
 
-#include "inc/asic_reg/si_id.h"
-#include "inc/asic_reg/kv_id.h"
-#include "inc/asic_reg/ci_id.h"
-#include "inc/asic_reg/ai_id.h"
-#include "inc/asic_reg/rv_id.h"
-#include "inc/asic_reg/atiid.h"
+#include "asic_reg/si_id.h"
+#include "asic_reg/kv_id.h"
+#include "asic_reg/ci_id.h"
+#include "asic_reg/ai_id.h"
+#include "asic_reg/rv_id.h"
+#include "asic_reg/atiid.h"
 
 static const TargetMapping HSAIL64TargetMapping_0_8[] = {
   UnknownTarget,