diff --git a/lib/libZRCola/build/libZRCola.vcxproj b/lib/libZRCola/build/libZRCola.vcxproj
index 7069b1d..6ccf04b 100644
--- a/lib/libZRCola/build/libZRCola.vcxproj
+++ b/lib/libZRCola/build/libZRCola.vcxproj
@@ -20,8 +20,8 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\compose.cpp" />
-    <ClCompile Include="..\src\data.cpp" />
     <ClCompile Include="..\src\decompose.cpp" />
+    <ClCompile Include="..\src\decompositions.cpp" />
     <ClCompile Include="..\src\mapping.cpp" />
     <ClCompile Include="..\src\stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
diff --git a/lib/libZRCola/build/libZRCola.vcxproj.filters b/lib/libZRCola/build/libZRCola.vcxproj.filters
index 176259b..2615a32 100644
--- a/lib/libZRCola/build/libZRCola.vcxproj.filters
+++ b/lib/libZRCola/build/libZRCola.vcxproj.filters
@@ -24,10 +24,10 @@
     <ClCompile Include="..\src\compose.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\data.cpp">
+    <ClCompile Include="..\src\mapping.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\mapping.cpp">
+    <ClCompile Include="..\src\decompositions.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/lib/libZRCola/include/zrcola/common.h b/lib/libZRCola/include/zrcola/common.h
index 7d74ac6..756339d 100644
--- a/lib/libZRCola/include/zrcola/common.h
+++ b/lib/libZRCola/include/zrcola/common.h
@@ -39,7 +39,7 @@ namespace ZRCola {
     ///
     /// Composed-decomposed index transformation mapping
     ///
-    class ZRCOLA_NOVTABLE mapping {
+    class ZRCOLA_NOVTABLE ZRCOLA_API mapping {
     public:
         size_t cmp;     ///< Character index in composed string
         size_t decmp;   ///< Character index in decomposed string
diff --git a/lib/libZRCola/src/data.cpp b/lib/libZRCola/src/decompositions.cpp
similarity index 100%
rename from lib/libZRCola/src/data.cpp
rename to lib/libZRCola/src/decompositions.cpp