diff --git a/rocclr/compiler/lib/complibdefs b/rocclr/compiler/lib/complibdefs
index 500f266b35..600dc040c5 100644
--- a/rocclr/compiler/lib/complibdefs
+++ b/rocclr/compiler/lib/complibdefs
@@ -42,7 +42,7 @@ endif
 endif
 endif
 
-GCPPFLAGS += $(INCSWITCH) "$(DEPTH)/drivers/inc"
+GCPPFLAGS += $(ASIC_REG_INCS)
 GCPPFLAGS += $(INCSWITCH) "$(COMPLIB_DEPTH)"
 GCPPFLAGS += $(INCSWITCH) "$(OPENCL_DEPTH)/runtime"
 GCPPFLAGS += $(INCSWITCH) "$(OPENCL_DEPTH)/runtime/utils"
@@ -66,14 +66,8 @@ GCPPFLAGS += $(DEFSWITCH) "BREAK_ON_LOG_ERROR=0"
 GCPPFLAGS += $(DEFSWITCH) "LOG_LEVEL=2"
 
 GCPPFLAGS += $(INCSWITCH) "$(OPENCL_DEPTH)/runtime/device/gpu/gslbe/src/rt"
-
-ASIC_REG_DEPTH ?= $(DEPTH)/drivers/inc/asic_reg
-COMPILER_SRC_INC_ASICREG_3D_R600_DIR ?= $(ASIC_REG_DEPTH)/3D/r600
-COMPILER_SRC_INC_ASICREG_3D_R800_DIR ?= $(ASIC_REG_DEPTH)/3D/r800
-
-GCPPFLAGS += $(INCSWITCH) "$(COMPILER_SRC_INC_ASICREG_3D_R600_DIR)"
-GCPPFLAGS += $(INCSWITCH) "$(COMPILER_SRC_INC_ASICREG_3D_R800_DIR)"
 GCPPFLAGS += $(INCSWITCH) "$(UGL_DEPTH)/gl/gs/hwl/si/include/asic"
+
 export BRIG_ENABLE=1
 
 ifdef ATI_OS_WINDOWS
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 6e96c101d3..d4f923aaee 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 "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"
+#include "evergreen_id.h"
+#include "r700id.h"
+#include "tn_id.h"
+#include "sumo_id.h"
+#include "northernisland_id.h"
+#include "si_id.h"
+#include "kv_id.h"
+#include "ci_id.h"
+#include "vi_id.h"
+#include "cz_id.h"
+#include "ai_id.h"
+#include "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 696433868b..8851ffcd75 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 "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"
+#include "si_id.h"
+#include "kv_id.h"
+#include "ci_id.h"
+#include "vi_id.h"
+#include "cz_id.h"
+#include "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 71267c5e9b..95969dc8e6 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 "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"
+#include "si_id.h"
+#include "kv_id.h"
+#include "ci_id.h"
+#include "cz_id.h"
+#include "ai_id.h"
+#include "rv_id.h"
+#include "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 419274ef8c..25dcb75fc2 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 "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"
+#include "si_id.h"
+#include "kv_id.h"
+#include "ci_id.h"
+#include "ai_id.h"
+#include "rv_id.h"
+#include "atiid.h"
 
 static const TargetMapping HSAIL64TargetMapping_0_8[] = {
   UnknownTarget,
diff --git a/rocclr/runtime/device/rocm/rocprogram.cpp b/rocclr/runtime/device/rocm/rocprogram.cpp
index fa289c54be..3d3655203a 100644
--- a/rocclr/runtime/device/rocm/rocprogram.cpp
+++ b/rocclr/runtime/device/rocm/rocprogram.cpp
@@ -16,7 +16,6 @@
 #include <gelf.h>
 #else  // !defined(WITH_LIGHTNING_COMPILER)
 #include "roccompilerlib.hpp"
-#include "amd_hsa_code.hpp"
 #endif  // !defined(WITH_LIGHTNING_COMPILER)
 #include "utils/bif_section_labels.hpp"