diff --git a/projects/clr/rocclr/compiler/lib/backends/common/compiler_stage.cpp b/projects/clr/rocclr/compiler/lib/backends/common/compiler_stage.cpp
index 36a855a7cb..321dae92ba 100644
--- a/projects/clr/rocclr/compiler/lib/backends/common/compiler_stage.cpp
+++ b/projects/clr/rocclr/compiler/lib/backends/common/compiler_stage.cpp
@@ -3,6 +3,8 @@
 //
 #include "compiler_stage.hpp"
 #include "utils/libUtils.h"
+#include "llvm/Assembly/Parser.h"
+#include "llvm/LLVMContext.h"
 
 using namespace amdcl;
 
diff --git a/projects/clr/rocclr/compiler/lib/backends/common/compiler_stage.hpp b/projects/clr/rocclr/compiler/lib/backends/common/compiler_stage.hpp
index 62603cc928..e249782f49 100644
--- a/projects/clr/rocclr/compiler/lib/backends/common/compiler_stage.hpp
+++ b/projects/clr/rocclr/compiler/lib/backends/common/compiler_stage.hpp
@@ -6,18 +6,21 @@
 #include "aclTypes.h"
 #include "utils/options.hpp"
 #include "llvm/AMDLLVMContextHook.h"
-#include "llvm/LLVMContext.h"
-#include "llvm/Module.h"
 #include "llvm/PassManager.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Bitcode/ReaderWriter.h"
-#include "llvm/Assembly/Parser.h"
 
 #include <cassert>
 #include <string>
 
+namespace llvm
+{
+  class LLVMContext;
+  class Module;
+}
+
 namespace amdcl
 {
   /*! \addtogroup CompilerLibrary
diff --git a/projects/clr/rocclr/compiler/lib/backends/common/linker.cpp b/projects/clr/rocclr/compiler/lib/backends/common/linker.cpp
index 99d15def97..9d10c42193 100644
--- a/projects/clr/rocclr/compiler/lib/backends/common/linker.cpp
+++ b/projects/clr/rocclr/compiler/lib/backends/common/linker.cpp
@@ -12,6 +12,7 @@
 #include "utils/libUtils.h"
 #include "utils/options.hpp"
 #include "utils/target_mappings.h"
+#include "llvm/LLVMContext.h"
 
 #include "acl.h"
 
diff --git a/projects/clr/rocclr/compiler/lib/backends/common/optimizer.hpp b/projects/clr/rocclr/compiler/lib/backends/common/optimizer.hpp
index 5528eaf6e1..0590d7f900 100644
--- a/projects/clr/rocclr/compiler/lib/backends/common/optimizer.hpp
+++ b/projects/clr/rocclr/compiler/lib/backends/common/optimizer.hpp
@@ -5,7 +5,11 @@
 #define _BE_OPTIMIZER_HPP_
 #include "aclTypes.h"
 #include "compiler_stage.hpp"
-#include "llvm/Module.h"
+
+namespace llvm
+{
+  class Module;
+}
 
 namespace amdcl
 {
diff --git a/projects/clr/rocclr/compiler/lib/utils/options.cpp b/projects/clr/rocclr/compiler/lib/utils/options.cpp
index 2dd39f62be..810baf7960 100644
--- a/projects/clr/rocclr/compiler/lib/utils/options.cpp
+++ b/projects/clr/rocclr/compiler/lib/utils/options.cpp
@@ -958,6 +958,7 @@ parseAllOptions(std::string& options, Options& Opts, bool linkOptsOnly)
             return false;
         }
     }
+    Opts.clangOptions.push_back("-cl-kernel-arg-info");
 
     // Parse options
     if (options.empty()) {