diff --git a/OdfFile/Projects/Windows/cpodf.vcxproj b/OdfFile/Projects/Windows/cpodf.vcxproj
index 0a21068ba0..82c7690522 100644
--- a/OdfFile/Projects/Windows/cpodf.vcxproj
+++ b/OdfFile/Projects/Windows/cpodf.vcxproj
@@ -93,7 +93,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -114,7 +114,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\..\DesktopEditor\xml\libxml2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -285,6 +285,8 @@
     <ClCompile Include="..\..\Reader\Converter\SMCustomShape2OOXML\customshape.cpp" />
     <ClCompile Include="..\..\Reader\Converter\SMCustomShape2OOXML\smcustomshapepars.cpp" />
     <ClCompile Include="..\..\Reader\Converter\StarMath2OOXML\cconversionsmtoooxml.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\StarMath2OOXML\conversionmathformula.cpp" />
+    <ClCompile Include="..\..\Reader\Converter\StarMath2OOXML\cooxml2odf.cpp" />
     <ClCompile Include="..\..\Reader\Converter\StarMath2OOXML\cstarmathpars.cpp" />
     <ClCompile Include="..\..\Reader\Converter\xlsxconversioncontext.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/bigobj %(AdditionalOptions)</AdditionalOptions>
@@ -684,8 +686,12 @@
     <ClInclude Include="..\..\Reader\Converter\SMCustomShape2OOXML\customshape.h" />
     <ClInclude Include="..\..\Reader\Converter\SMCustomShape2OOXML\smcustomshapepars.h" />
     <ClInclude Include="..\..\Reader\Converter\StarMath2OOXML\cconversionsmtoooxml.h" />
+    <ClInclude Include="..\..\Reader\Converter\StarMath2OOXML\conversionmathformula.h" />
+    <ClInclude Include="..\..\Reader\Converter\StarMath2OOXML\cooxml2odf.h" />
     <ClInclude Include="..\..\Reader\Converter\StarMath2OOXML\cstarmathpars.h" />
     <ClInclude Include="..\..\Reader\Converter\StarMath2OOXML\fontType.h" />
+    <ClInclude Include="..\..\Reader\Converter\StarMath2OOXML\TextDirection.h" />
+    <ClInclude Include="..\..\Reader\Converter\StarMath2OOXML\TFormulaSize.h" />
     <ClInclude Include="..\..\Reader\Converter\StarMath2OOXML\typeConversion.h" />
     <ClInclude Include="..\..\Reader\Converter\StarMath2OOXML\typeselements.h" />
     <ClInclude Include="..\..\Reader\Converter\xlsxconversioncontext.h" />
diff --git a/OdfFile/Projects/Windows/cpodf.vcxproj.filters b/OdfFile/Projects/Windows/cpodf.vcxproj.filters
index 90f4ea38b7..62dfe40d54 100644
--- a/OdfFile/Projects/Windows/cpodf.vcxproj.filters
+++ b/OdfFile/Projects/Windows/cpodf.vcxproj.filters
@@ -166,6 +166,12 @@
     <ClCompile Include="..\..\Reader\Converter\SMCustomShape2OOXML\customshape.cpp">
       <Filter>custom shape</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Reader\Converter\StarMath2OOXML\conversionmathformula.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Reader\Converter\StarMath2OOXML\cooxml2odf.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Reader\Converter\conversionelement.h" />
@@ -341,6 +347,18 @@
     <ClInclude Include="..\..\Reader\Converter\SMCustomShape2OOXML\customshape.h">
       <Filter>custom shape</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Reader\Converter\StarMath2OOXML\conversionmathformula.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Converter\StarMath2OOXML\cooxml2odf.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Converter\StarMath2OOXML\TextDirection.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Reader\Converter\StarMath2OOXML\TFormulaSize.h">
+      <Filter>math</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="math">