diff --git a/projects/clr/rocclr/compiler/lib/backends/common/linker.cpp b/projects/clr/rocclr/compiler/lib/backends/common/linker.cpp
index 545d4721e8..399f3b17aa 100644
--- a/projects/clr/rocclr/compiler/lib/backends/common/linker.cpp
+++ b/projects/clr/rocclr/compiler/lib/backends/common/linker.cpp
@@ -44,9 +44,16 @@
 #include "llvm/Linker/Linker.h"
 #endif
 
+#ifndef LEGACY_COMPLIB
+#include "AMDFixupKernelModule.h"
+#include "AMDResolveLinker.h"
+#include "AMDPrelink.h"
+#else
 #include "llvm/AMDFixupKernelModule.h"
 #include "llvm/AMDResolveLinker.h"
 #include "llvm/AMDPrelink.h"
+#endif
+
 #include "llvm/ADT/Triple.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/Analysis/AMDLocalArrayUsage.h"
@@ -56,10 +63,6 @@
 
 #include "llvm/CodeGen/LinkAllAsmWriterComponents.h"
 #include "llvm/CodeGen/LinkAllCodegenComponents.h"
-#if 1 || LLVM_TRUNK_INTEGRATION_CL >= 2270
-#else
-#include "llvm/CodeGen/ObjectCodeEmitter.h"
-#endif
 #include "llvm/Config/config.h"
 
 #include "llvm/MC/SubtargetFeature.h"
diff --git a/projects/clr/rocclr/compiler/lib/compliblinkerlibs b/projects/clr/rocclr/compiler/lib/compliblinkerlibs
new file mode 100644
index 0000000000..eb4ae9be99
--- /dev/null
+++ b/projects/clr/rocclr/compiler/lib/compliblinkerlibs
@@ -0,0 +1,4 @@
+COMPLIB_DEPTH = $(OPENCL_DEPTH)/compiler/lib
+
+#AMDOpenCLLLVMLinkerLIBS = $(COMPLIB_DEPTH)/linker/lib/$(FULL_BUILD_DIR)/AMDLLVMOpenCLLinker$(LIB_EXT)
+AMDOpenCLLLVMLinkerLIBS = $(OPENCL_DEPTH)/compiler/lib/linker/lib/$(FULL_BUILD_DIR)/AMDOpenCLLLVMLinker$(LIB_EXT)