diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca9cce11e1..29672a0f0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -561,5 +561,6 @@ endif(EXISTS ${IGDRCL_SOURCE_DIR}/../internal)
 include(package.cmake)
 
 configure_file(config.h.in ${IGDRCL_BUILD_DIR}/config.h)
+configure_file(compiler.config.h.in ${IGDRCL_BUILD_DIR}/compiler.config.h)
 configure_file(driver_version.h.in ${IGDRCL_BUILD_DIR}/driver_version.h) # Put Driver version into define
 configure_file(lib_names.h.in ${IGDRCL_BUILD_DIR}/lib_names.h)
diff --git a/runtime/dll/linux/options.cpp b/runtime/dll/linux/options.cpp
index dc78f11ff1..699f08c3f4 100644
--- a/runtime/dll/linux/options.cpp
+++ b/runtime/dll/linux/options.cpp
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "lib_names.h"
+#include "compiler.config.h"
 #include "runtime/os_interface/os_library.h"
 
 namespace Os {
diff --git a/runtime/source_level_debugger/source_level_debugger_stubs.cpp b/runtime/source_level_debugger/source_level_debugger_stubs.cpp
index a19f01a484..dacec86322 100644
--- a/runtime/source_level_debugger/source_level_debugger_stubs.cpp
+++ b/runtime/source_level_debugger/source_level_debugger_stubs.cpp
@@ -23,6 +23,7 @@
 #include "runtime/source_level_debugger/source_level_debugger.h"
 
 namespace OCLRT {
+const char *SourceLevelDebugger::dllName = "";
 
 SourceLevelDebugger::SourceLevelDebugger(OsLibrary *library) {
     debuggerLibrary.reset(library);