diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
index e96260ae06f..dda1050c330 100644
--- a/Compiler/Template/CodegenCpp.tpl
+++ b/Compiler/Template/CodegenCpp.tpl
@@ -5828,7 +5828,7 @@ case SIMCODE(modelInfo = MODELINFO(__),makefileParams = MAKEFILE_PARAMS(__))  th
    void <%lastIdentOfPath(modelInfo.name)%>Initialize::initialize()
    {
       initializeMemory();
-      IPropertyReader *reader = new XmlPropertyReader("<%makefileParams.compileDir%>OMCpp/<%fileNamePrefix%>Init.xml");
+      IPropertyReader *reader = new XmlPropertyReader("<%makefileParams.compileDir%>/OMCpp<%fileNamePrefix%>Init.xml");
       reader->readInitialValues(*this, _sim_vars);
       initializeFreeVariables();
       /*Start complex expressions */
diff --git a/SimulationRuntime/cpp/Include/Core/DataExchange/IPropertyReader.h b/SimulationRuntime/cpp/Include/Core/DataExchange/IPropertyReader.h
index ef61d8477c0..7705499d93d 100644
--- a/SimulationRuntime/cpp/Include/Core/DataExchange/IPropertyReader.h
+++ b/SimulationRuntime/cpp/Include/Core/DataExchange/IPropertyReader.h
@@ -1,9 +1,6 @@
 #pragma once
 
-#include <Core/Modelica.h>
-#include <Core/ModelicaDefine.h>
-#include <boost/shared_ptr.hpp>
-#include <Core/System/ISimVars.h>
+
 
 //#include "FactoryExport.h"
 //#include <Core/Utils/extension/logger.hpp>
diff --git a/SimulationRuntime/cpp/Include/Core/DataExchange/XmlPropertyReader.h b/SimulationRuntime/cpp/Include/Core/DataExchange/XmlPropertyReader.h
index e4e9c658aba..dc4cedcb9ec 100644
--- a/SimulationRuntime/cpp/Include/Core/DataExchange/XmlPropertyReader.h
+++ b/SimulationRuntime/cpp/Include/Core/DataExchange/XmlPropertyReader.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <Core/DataExchange/IPropertyReader.h>
-#include <string>
+
+
 
 class IContinuous;
 
diff --git a/SimulationRuntime/cpp/Include/Core/Modelica.h b/SimulationRuntime/cpp/Include/Core/Modelica.h
index 8bed9b13015..ee0a890f39a 100644
--- a/SimulationRuntime/cpp/Include/Core/Modelica.h
+++ b/SimulationRuntime/cpp/Include/Core/Modelica.h
@@ -6,7 +6,7 @@
 
 
 #include <string>
-//#include <vector>
+#include <vector>
 #include <algorithm>
 #include <map>
 #include <cmath>
@@ -95,6 +95,8 @@ typedef ublas::matrix<double,  ublas::column_major,adaptor_t> shared_matrix_t;
 //typedef boost::function<void (unordered_map<string,unsigned int>&,unordered_map<string,unsigned int>&)> init_prevars_type;
 typedef uBlas::compressed_matrix<double, uBlas::column_major, 0, uBlas::unbounded_array<int>, uBlas::unbounded_array<double> > sparsematrix_t;
 typedef ublas::matrix<double, ublas::column_major> matrix_t;
+#include <Core/SimulationSettings/IGlobalSettings.h>
+#include <Core/Solver/ISolverSettings.h>
 #include <Core/SimulationSettings/ISettingsFactory.h>
 #include <SimCoreFactory/Policies/FactoryConfig.h>
 #include <Core/Utils/Modelica/ModelicaSimulationError.h>
@@ -112,10 +114,7 @@ typedef ublas::matrix<double, ublas::column_major> matrix_t;
 #include <Core/Solver/ILinSolverSettings.h>
 #include <Core/DataExchange/IHistory.h>
 #include <Core/System/IMixedSystem.h>
-#include <Core/SimulationSettings/IGlobalSettings.h>
-#include <Core/System/IMixedSystem.h>
 #include <Core/System/IAlgLoop.h>
-#include <Core/Solver/ISolverSettings.h>
 #include <Core/Solver/ISolver.h>
 #include <Core/Solver/IAlgLoopSolver.h>
 #include <Core/System/IAlgLoopSolverFactory.h>
diff --git a/SimulationRuntime/cpp/Include/Core/SimulationSettings/ISettingsFactory.h b/SimulationRuntime/cpp/Include/Core/SimulationSettings/ISettingsFactory.h
index 4f4ad1a0932..7922f2569d2 100644
--- a/SimulationRuntime/cpp/Include/Core/SimulationSettings/ISettingsFactory.h
+++ b/SimulationRuntime/cpp/Include/Core/SimulationSettings/ISettingsFactory.h
@@ -3,8 +3,6 @@
  *
  *  @{
  */
-#include <Core/SimulationSettings/IGlobalSettings.h>
-#include <Core/Solver/ISolverSettings.h>
 
 class ISettingsFactory
 {
diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryPolicy.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryPolicy.h
index 7d091ad9b20..bdb161ef234 100644
--- a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryPolicy.h
+++ b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryPolicy.h
@@ -79,7 +79,7 @@
   #include <Core/Math/Array.h>
  #include <Core/Solver/FactoryExport.h>
   #include <Core/Solver/SolverSettings.h>
-  #include <Core/SimulationSettings/IGlobalSettings.h>
+
     /*Base Policy include*/
     #include <SimCoreFactory/Policies/SolverOMCFactory.h>
     #include <SimCoreFactory/Policies/SolverSettingsOMCFactory.h>