diff --git a/Compiler/susan_codegen/SimCode/CodegenCpp.tpl b/Compiler/susan_codegen/SimCode/CodegenCpp.tpl
index e261feb5a19..e5d82b7ee77 100644
--- a/Compiler/susan_codegen/SimCode/CodegenCpp.tpl
+++ b/Compiler/susan_codegen/SimCode/CodegenCpp.tpl
@@ -127,7 +127,7 @@ let extraCflags = match sopt case SOME(s as SIMULATION_SETTINGS(__)) then
        case "inline-rungekutta" then "-D_OMC_INLINE_RK"%>'
 <<
 # Makefile generated by OpenModelica
-include ModelicaConfic.inc
+include <%makefileParams.omhome%>/bin/ModelicaConfic.inc
 # Simulations use -O3 by default
 SIM_OR_DYNLOAD_OPT_LEVEL=-O3
 CC=<%makefileParams.ccompiler%>
diff --git a/SimulationRuntime/cpp/Source/CMakeLists.txt b/SimulationRuntime/cpp/Source/CMakeLists.txt
index 7608cb24a2e..dae547590d1 100644
--- a/SimulationRuntime/cpp/Source/CMakeLists.txt
+++ b/SimulationRuntime/cpp/Source/CMakeLists.txt
@@ -174,7 +174,7 @@ if(INSTALL_OMDEV_LIBS)
   #install (FILES "${Boost_LIBRARIES}"   DESTINATION bin)
 endif()
 
-install (FILES "${PROJECT_BINARY_DIR}/LibrariesConfig.h" DESTINATION bin)
+install (FILES "${PROJECT_BINARY_DIR}/LibrariesConfig.h" DESTINATION include/omc/cpp)
 install (FILES "DataExchange/Interfaces/IHistory.h" 
   DESTINATION include/omc/cpp/DataExchange/Interfaces)