[Libreoffice-commits] libcdr.git: build/win32 configure.ac inc/libcdr inc/Makefile.am libcdr-0.0.pc.in libcdr.pc.in Makefile.am src/conv src/lib

Fridrich Å trba fridrich.strba at bluewin.ch
Fri May 10 06:28:53 PDT 2013 

 Makefile.am                     |    6 ++--
 build/win32/cdr2raw.dsp         |    8 ++---
 build/win32/cdr2raw.vcproj      |    4 +-
 build/win32/cdr2raw.vcxproj     |    6 ++--
 build/win32/cdr2text.dsp        |    8 ++---
 build/win32/cdr2text.vcproj     |    4 +-
 build/win32/cdr2text.vcxproj    |    4 +-
 build/win32/cdr2xhtml.dsp       |    8 ++---
 build/win32/cdr2xhtml.vcproj    |    4 +-
 build/win32/cdr2xhtml.vcxproj   |    6 ++--
 build/win32/cmx2raw.dsp         |    8 ++---
 build/win32/cmx2raw.vcproj      |    4 +-
 build/win32/cmx2raw.vcxproj     |    6 ++--
 build/win32/cmx2text.dsp        |    8 ++---
 build/win32/cmx2text.vcproj     |    4 +-
 build/win32/cmx2text.vcxproj    |    4 +-
 build/win32/cmx2xhtml.dsp       |    8 ++---
 build/win32/cmx2xhtml.vcproj    |    4 +-
 build/win32/cmx2xhtml.vcxproj   |    6 ++--
 build/win32/libcdr.dsp          |   40 +++++++++++++-------------
 build/win32/libcdr.vcproj       |   38 ++++++++++++-------------
 build/win32/libcdr.vcxproj      |   12 ++++----
 configure.ac                    |    4 ++
 inc/Makefile.am                 |    1 
 inc/libcdr/CDRDocument.h        |   56 +++++++++++++++++++++++++++++++++++++
 inc/libcdr/CDRStringVector.h    |   60 ++++++++++++++++++++++++++++++++++++++++
 inc/libcdr/CMXDocument.h        |   54 ++++++++++++++++++++++++++++++++++++
 inc/libcdr/Makefile.am          |    5 +++
 inc/libcdr/libcdr.h             |   40 ++++++++++++++++++++++++++
 libcdr-0.0.pc.in                |   11 -------
 libcdr.pc.in                    |   11 +++++++
 src/conv/raw/Makefile.am        |    2 -
 src/conv/raw/cdr2raw.cpp        |    2 -
 src/conv/raw/cmx2raw.cpp        |    2 -
 src/conv/svg/Makefile.am        |    2 -
 src/conv/svg/cdr2xhtml.cpp      |    2 -
 src/conv/svg/cmx2xhtml.cpp      |    2 -
 src/conv/text/Makefile.am       |    2 -
 src/conv/text/cdr2text.cpp      |    2 -
 src/conv/text/cmx2text.cpp      |    2 -
 src/lib/CDRContentCollector.cpp |    2 -
 src/lib/CDRDocument.cpp         |    2 -
 src/lib/CDRDocument.h           |   56 -------------------------------------
 src/lib/CDRSVGGenerator.cpp     |    2 -
 src/lib/CDRSVGGenerator.h       |    2 -
 src/lib/CDRStringVector.cpp     |    2 -
 src/lib/CDRStringVector.h       |   60 ----------------------------------------
 src/lib/CMXDocument.cpp         |    2 -
 src/lib/CMXDocument.h           |   54 ------------------------------------
 src/lib/Makefile.am             |   10 +++---
 src/lib/libcdr.h                |   40 --------------------------
 51 files changed, 350 insertions(+), 342 deletions(-)

New commits:
commit 96c7e1e9ff2f8ad8911858080533bfb8b2a9a80a
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri May 10 15:28:25 2013 +0200

    Making Michael Stahl happy (installement 3)

diff --git a/Makefile.am b/Makefile.am
index 6b5947d..8984a0a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ pkgconfdir = $(libdir)/pkgconfig
 
 pkgconf_DATA = libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.pc
 
-SUBDIRS = src build docs
+SUBDIRS = build inc src docs
 
 EXTRA_DIST = \
 	AUTHORS \
@@ -14,13 +14,13 @@ EXTRA_DIST = \
 	NEWS \
 	README \
 	autogen.sh \
-	libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.pc.in \
+	libcdr.pc.in \
 	libcdr-zip.in \
 	libcdr.spec \
 	libcdr.spec.in
 
 distclean-local:
-	rm -rf *.cache *~
+	rm -rf *.cache *~ *.out *.pc
 
 rpm: dist
 	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
diff --git a/build/win32/cdr2raw.dsp b/build/win32/cdr2raw.dsp
index fac6918..65fe8cb 100644
--- a/build/win32/cdr2raw.dsp
+++ b/build/win32/cdr2raw.dsp
@@ -44,8 +44,8 @@ RSC=rc.exe
 MTL=midl.exe
 # ADD BASE MTL /nologo /win32
 # ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
+# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -72,8 +72,8 @@ LINK32=link.exe
 MTL=midl.exe
 # ADD BASE MTL /nologo /win32
 # ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/build/win32/cdr2raw.vcproj b/build/win32/cdr2raw.vcproj
index 6a773a0..4b51c52 100755
--- a/build/win32/cdr2raw.vcproj
+++ b/build/win32/cdr2raw.vcproj
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
 				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -135,7 +135,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="false"
diff --git a/build/win32/cdr2raw.vcxproj b/build/win32/cdr2raw.vcxproj
index 26ea0c1..b4e650e 100755
--- a/build/win32/cdr2raw.vcxproj
+++ b/build/win32/cdr2raw.vcxproj
@@ -51,7 +51,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -95,7 +95,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeaderOutputFile>.\Release/cdr2raw.pch</PrecompiledHeaderOutputFile>
@@ -143,4 +143,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/cdr2text.dsp b/build/win32/cdr2text.dsp
index 6f38f3c..dfabe31 100644
--- a/build/win32/cdr2text.dsp
+++ b/build/win32/cdr2text.dsp
@@ -44,8 +44,8 @@ RSC=rc.exe
 MTL=midl.exe
 # ADD BASE MTL /nologo /win32
 # ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
+# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -72,8 +72,8 @@ LINK32=link.exe
 MTL=midl.exe
 # ADD BASE MTL /nologo /win32
 # ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/build/win32/cdr2text.vcproj b/build/win32/cdr2text.vcproj
index 0718fa3..1f498a2 100755
--- a/build/win32/cdr2text.vcproj
+++ b/build/win32/cdr2text.vcproj
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
 				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -135,7 +135,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="false"
diff --git a/build/win32/cdr2text.vcxproj b/build/win32/cdr2text.vcxproj
index 81ee004..11130cc 100755
--- a/build/win32/cdr2text.vcxproj
+++ b/build/win32/cdr2text.vcxproj
@@ -51,7 +51,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -95,7 +95,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeaderOutputFile>.\Release/cdr2text.pch</PrecompiledHeaderOutputFile>
diff --git a/build/win32/cdr2xhtml.dsp b/build/win32/cdr2xhtml.dsp
index 482e3a8..202594a 100644
--- a/build/win32/cdr2xhtml.dsp
+++ b/build/win32/cdr2xhtml.dsp
@@ -44,8 +44,8 @@ RSC=rc.exe
 MTL=midl.exe
 # ADD BASE MTL /nologo /win32
 # ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
+# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -72,8 +72,8 @@ LINK32=link.exe
 MTL=midl.exe
 # ADD BASE MTL /nologo /win32
 # ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/build/win32/cdr2xhtml.vcproj b/build/win32/cdr2xhtml.vcproj
index c0c5517..bbe2479 100755
--- a/build/win32/cdr2xhtml.vcproj
+++ b/build/win32/cdr2xhtml.vcproj
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="false"
@@ -132,7 +132,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_LIB_DIR),$(ICU_LIB_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_LIB_DIR),$(ICU_LIB_DIR)"
 				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
diff --git a/build/win32/cdr2xhtml.vcxproj b/build/win32/cdr2xhtml.vcxproj
index 6aad36e..96e2cd3 100755
--- a/build/win32/cdr2xhtml.vcxproj
+++ b/build/win32/cdr2xhtml.vcxproj
@@ -51,7 +51,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeaderOutputFile>.\Release/cdr2xhtml.pch</PrecompiledHeaderOutputFile>
@@ -92,7 +92,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -143,4 +143,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/cmx2raw.dsp b/build/win32/cmx2raw.dsp
index e563b0a..f5a777a 100644
--- a/build/win32/cmx2raw.dsp
+++ b/build/win32/cmx2raw.dsp
@@ -44,8 +44,8 @@ RSC=rc.exe
 MTL=midl.exe
 # ADD BASE MTL /nologo /win32
 # ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
+# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -72,8 +72,8 @@ LINK32=link.exe
 MTL=midl.exe
 # ADD BASE MTL /nologo /win32
 # ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/build/win32/cmx2raw.vcproj b/build/win32/cmx2raw.vcproj
index 5efd7aa..2b0a8af 100755
--- a/build/win32/cmx2raw.vcproj
+++ b/build/win32/cmx2raw.vcproj
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
 				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -135,7 +135,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_LIB_DIR),$(ICU_LIB_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_LIB_DIR),$(ICU_LIB_DIR)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="false"
diff --git a/build/win32/cmx2raw.vcxproj b/build/win32/cmx2raw.vcxproj
index c97afa6..93fe66d 100755
--- a/build/win32/cmx2raw.vcxproj
+++ b/build/win32/cmx2raw.vcxproj
@@ -51,7 +51,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -95,7 +95,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeaderOutputFile>.\Release/cmx2raw.pch</PrecompiledHeaderOutputFile>
@@ -143,4 +143,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/cmx2text.dsp b/build/win32/cmx2text.dsp
index ca7afe9..b14ced3 100644
--- a/build/win32/cmx2text.dsp
+++ b/build/win32/cmx2text.dsp
@@ -44,8 +44,8 @@ RSC=rc.exe
 MTL=midl.exe
 # ADD BASE MTL /nologo /win32
 # ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
+# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -72,8 +72,8 @@ LINK32=link.exe
 MTL=midl.exe
 # ADD BASE MTL /nologo /win32
 # ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/build/win32/cmx2text.vcproj b/build/win32/cmx2text.vcproj
index 1c3d3bc..2fd75fa 100755
--- a/build/win32/cmx2text.vcproj
+++ b/build/win32/cmx2text.vcproj
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
 				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -135,7 +135,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_LIB_DIR),$(ICU_LIB_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_LIB_DIR),$(ICU_LIB_DIR)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="false"
diff --git a/build/win32/cmx2text.vcxproj b/build/win32/cmx2text.vcxproj
index 1c07c9d..1550c60 100755
--- a/build/win32/cmx2text.vcxproj
+++ b/build/win32/cmx2text.vcxproj
@@ -51,7 +51,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -95,7 +95,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeaderOutputFile>.\Release/cmx2text.pch</PrecompiledHeaderOutputFile>
diff --git a/build/win32/cmx2xhtml.dsp b/build/win32/cmx2xhtml.dsp
index b3a678b..3e824ae 100644
--- a/build/win32/cmx2xhtml.dsp
+++ b/build/win32/cmx2xhtml.dsp
@@ -44,8 +44,8 @@ RSC=rc.exe
 MTL=midl.exe
 # ADD BASE MTL /nologo /win32
 # ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
+# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -72,8 +72,8 @@ LINK32=link.exe
 MTL=midl.exe
 # ADD BASE MTL /nologo /win32
 # ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/build/win32/cmx2xhtml.vcproj b/build/win32/cmx2xhtml.vcproj
index 5e0f1fa..d64f5f5 100755
--- a/build/win32/cmx2xhtml.vcproj
+++ b/build/win32/cmx2xhtml.vcproj
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
 				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -135,7 +135,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\src\lib,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="false"
diff --git a/build/win32/cmx2xhtml.vcxproj b/build/win32/cmx2xhtml.vcxproj
index af82d0f..de4301a 100755
--- a/build/win32/cmx2xhtml.vcxproj
+++ b/build/win32/cmx2xhtml.vcxproj
@@ -51,7 +51,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -95,7 +95,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeaderOutputFile>.\Release/cmx2xhtml.pch</PrecompiledHeaderOutputFile>
@@ -143,4 +143,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/libcdr.dsp b/build/win32/libcdr.dsp
index 39ff657..a3d032b 100644
--- a/build/win32/libcdr.dsp
+++ b/build/win32/libcdr.dsp
@@ -40,8 +40,8 @@ RSC=rc.exe
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -64,8 +64,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /GR /GX /ZI /Od /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /GR /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -159,6 +159,22 @@ SOURCE=..\..\src\lib\libcdr_utils.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
+SOURCE=..\..\inc\libcdr\CDRDocument.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\inc\libcdr\CDRStringVector.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\inc\libcdr\CMXDocument.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\inc\libcdr\libcdr.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\lib\CDRCollector.h
 # End Source File
 # Begin Source File
@@ -175,10 +191,6 @@ SOURCE=..\..\src\lib\CDRContentCollector.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\lib\CDRDocument.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\lib\CDRDocumentStructure.h
 # End Source File
 # Begin Source File
@@ -199,10 +211,6 @@ SOURCE=..\..\src\lib\CDRPath.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\lib\CDRStringVector.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\lib\CDRStylesCollector.h
 # End Source File
 # Begin Source File
@@ -223,10 +231,6 @@ SOURCE=..\..\src\lib\CDRZipStream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\lib\CMXDocument.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\lib\CMXDocumentStructure.h
 # End Source File
 # Begin Source File
@@ -239,10 +243,6 @@ SOURCE=..\..\src\lib\CommonParser.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\lib\libcdr.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\lib\libcdr_utils.h
 # End Source File
 # End Group
diff --git a/build/win32/libcdr.vcproj b/build/win32/libcdr.vcproj
index 1f3c94f..f8213ca 100755
--- a/build/win32/libcdr.vcproj
+++ b/build/win32/libcdr.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(LCMS2_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR),$(BOOST_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(LCMS2_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR),$(BOOST_INCLUDE_DIR)"
 				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -116,7 +116,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(LCMS2_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR),$(BOOST_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(LCMS2_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR),$(BOOST_INCLUDE_DIR)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -217,7 +217,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\lib\CDRDocument.cpp"
+				RelativePath="..\..\inc\libcdr\CDRDocument.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -552,6 +552,22 @@
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
+				RelativePath="..\..\inc\libcdr\CDRDocument.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\inc\libcdr\CDRStringVector.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\inc\libcdr\CMXDocument.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\inc\libcdr\libcdr.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\lib\CDRCollector.h"
 				>
 			</File>
@@ -568,10 +584,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\lib\CDRDocument.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\src\lib\CDRDocumentStructure.h"
 				>
 			</File>
@@ -592,10 +604,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\lib\CDRStringVector.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\src\lib\CDRStylesCollector.h"
 				>
 			</File>
@@ -616,10 +624,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\lib\CMXDocument.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\src\lib\CMXDocumentStructure.h"
 				>
 			</File>
@@ -632,10 +636,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\lib\libcdr.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\src\lib\libcdr_utils.h"
 				>
 			</File>
diff --git a/build/win32/libcdr.vcxproj b/build/win32/libcdr.vcxproj
index 9985185..1390228 100755
--- a/build/win32/libcdr.vcxproj
+++ b/build/win32/libcdr.vcxproj
@@ -43,7 +43,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(LCMS2_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(LCMS2_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -74,7 +74,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(LCMS2_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(LCMS2_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -206,27 +206,27 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\inc\libcdr\CDRDocument.h" />
+    <ClInclude Include="..\..\inc\libcdr\CDRStringVector.h" />
+    <ClInclude Include="..\..\inc\libcdr\CMXDocument.h" />
+    <ClInclude Include="..\..\inc\libcdr\libcdr.h" />
     <ClInclude Include="..\..\src\lib\CDRCollector.h" />
     <ClInclude Include="..\..\src\lib\CDRColorPalettes.h" />
     <ClInclude Include="..\..\src\lib\CDRColorProfiles.h" />
     <ClInclude Include="..\..\src\lib\CDRContentCollector.h" />
-    <ClInclude Include="..\..\src\lib\CDRDocument.h" />
     <ClInclude Include="..\..\src\lib\CDRDocumentStructure.h" />
     <ClInclude Include="..\..\src\lib\CDRInternalStream.h" />
     <ClInclude Include="..\..\src\lib\CDROutputElementList.h" />
     <ClInclude Include="..\..\src\lib\CDRParser.h" />
     <ClInclude Include="..\..\src\lib\CDRPath.h" />
-    <ClInclude Include="..\..\src\lib\CDRStringVector.h" />
     <ClInclude Include="..\..\src\lib\CDRStylesCollector.h" />
     <ClInclude Include="..\..\src\lib\CDRSVGGenerator.h" />
     <ClInclude Include="..\..\src\lib\CDRTransforms.h" />
     <ClInclude Include="..\..\src\lib\CDRTypes.h" />
     <ClInclude Include="..\..\src\lib\CDRZipStream.h" />
-    <ClInclude Include="..\..\src\lib\CMXDocument.h" />
     <ClInclude Include="..\..\src\lib\CMXDocumentStructure.h" />
     <ClInclude Include="..\..\src\lib\CMXParser.h" />
     <ClInclude Include="..\..\src\lib\CommonParser.h" />
-    <ClInclude Include="..\..\src\lib\libcdr.h" />
     <ClInclude Include="..\..\src\lib\libcdr_utils.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/configure.ac b/configure.ac
index 68594ab..40c6da0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,6 +293,8 @@ AM_CONDITIONAL([WITH_LIBCDR_DOCS], [test "x$build_docs" != "xno"])
 # =====================
 AC_CONFIG_FILES([
 Makefile
+inc/Makefile
+inc/libcdr/Makefile
 src/Makefile
 src/conv/Makefile
 src/conv/raw/Makefile
@@ -310,7 +312,7 @@ build/Makefile
 build/win32/Makefile
 docs/Makefile
 docs/doxygen/Makefile
-libcdr-0.0.pc
+libcdr-$CDR_MAJOR_VERSION.$CDR_MINOR_VERSION.pc:libcdr.pc.in
 libcdr.spec
 libcdr-zip
 ])
diff --git a/inc/Makefile.am b/inc/Makefile.am
new file mode 100644
index 0000000..74c5fed
--- /dev/null
+++ b/inc/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = libcdr
diff --git a/inc/libcdr/CDRDocument.h b/inc/libcdr/CDRDocument.h
new file mode 100644
index 0000000..e8cce46
--- /dev/null
+++ b/inc/libcdr/CDRDocument.h
@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* libcdr
+ * Version: MPL 1.1 / GPLv2+ / LGPLv2+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Fridrich Strba <fridrich.strba at bluewin.ch>
+ *
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
+ * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
+ * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __CDRDOCUMENT_H__
+#define __CDRDOCUMENT_H__
+
+#include <libwpd/libwpd.h>
+#include <libwpg/libwpg.h>
+#include "CDRStringVector.h"
+
+class WPXInputStream;
+
+namespace libcdr
+{
+class CDRDocument
+{
+public:
+
+  static bool isSupported(WPXInputStream *input);
+
+  static bool parse(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
+
+  static bool generateSVG(WPXInputStream *input, CDRStringVector &output);
+};
+
+} // namespace libcdr
+
+#endif //  __CDRDOCUMENT_H__
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/inc/libcdr/CDRStringVector.h b/inc/libcdr/CDRStringVector.h
new file mode 100644
index 0000000..8b3ba90
--- /dev/null
+++ b/inc/libcdr/CDRStringVector.h
@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* libcdr
+ * Version: MPL 1.1 / GPLv2+ / LGPLv2+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Fridrich Strba <fridrich.strba at bluewin.ch>
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
+ * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
+ * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __CDRSTRINGVECTOR_H__
+#define __CDRSTRINGVECTOR_H__
+
+#include <libwpd/libwpd.h>
+
+namespace libcdr
+{
+class CDRStringVectorImpl;
+
+class CDRStringVector
+{
+public:
+  CDRStringVector();
+  CDRStringVector(const CDRStringVector &vec);
+  ~CDRStringVector();
+
+  CDRStringVector &operator=(const CDRStringVector &vec);
+
+  unsigned size() const;
+  bool empty() const;
+  const WPXString &operator[](unsigned idx) const;
+  void append(const WPXString &str);
+  void clear();
+
+private:
+  CDRStringVectorImpl *m_pImpl;
+};
+
+} // namespace libcdr
+
+#endif /* __CDRSTRINGVECTOR_H__ */
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/inc/libcdr/CMXDocument.h b/inc/libcdr/CMXDocument.h
new file mode 100644
index 0000000..11e7eef
--- /dev/null
+++ b/inc/libcdr/CMXDocument.h
@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* libcdr
+ * Version: MPL 1.1 / GPLv2+ / LGPLv2+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Fridrich Strba <fridrich.strba at bluewin.ch>
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
+ * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
+ * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __CMXDOCUMENT_H__
+#define __CMXDOCUMENT_H__
+
+#include <libwpd/libwpd.h>
+#include <libwpg/libwpg.h>
+#include "CDRStringVector.h"
+
+class WPXInputStream;
+
+namespace libcdr
+{
+class CMXDocument
+{
+public:
+
+  static bool isSupported(WPXInputStream *input);
+
+  static bool parse(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
+
+  static bool generateSVG(WPXInputStream *input, CDRStringVector &output);
+};
+
+} // namespace libcdr
+
+#endif //  __CMXDOCUMENT_H__
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/inc/libcdr/Makefile.am b/inc/libcdr/Makefile.am
new file mode 100644
index 0000000..fe5cef7
--- /dev/null
+++ b/inc/libcdr/Makefile.am
@@ -0,0 +1,5 @@
+EXTRA_DIST = \
+	libcdr.h \
+	CDRDocument.h \
+	CDRStringVector.h \
+	CMXDocument.h
diff --git a/inc/libcdr/libcdr.h b/inc/libcdr/libcdr.h
new file mode 100644
index 0000000..bd8548c
--- /dev/null
+++ b/inc/libcdr/libcdr.h
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* libcdr
+ * Version: MPL 1.1 / GPLv2+ / LGPLv2+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Fridrich Strba <fridrich.strba at bluewin.ch>
+ *
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
+ * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
+ * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __LIBCDR_H__
+#define __LIBCDR_H__
+
+#include "CDRDocument.h"
+#include "CMXDocument.h"
+#include <libwpd/libwpd.h>
+#include <libwpg/libwpg.h>
+
+#endif
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/libcdr-0.0.pc.in b/libcdr-0.0.pc.in
deleted file mode 100644
index 644469c..0000000
--- a/libcdr-0.0.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-                                                                       
-Name: libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@
-Description: Library for parsing the Corel Draw file format structure
-Version: @VERSION@
-Requires: libwpd-0.9 libwpd-stream-0.9 libwpg-0.2 lcms2
-Libs: -L${libdir} -lcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@ -lz
-Cflags: -I${includedir}/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@
diff --git a/libcdr.pc.in b/libcdr.pc.in
new file mode 100644
index 0000000..644469c
--- /dev/null
+++ b/libcdr.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+                                                                       
+Name: libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@
+Description: Library for parsing the Corel Draw file format structure
+Version: @VERSION@
+Requires: libwpd-0.9 libwpd-stream-0.9 libwpg-0.2 lcms2
+Libs: -L${libdir} -lcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@ -lz
+Cflags: -I${includedir}/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index 9a9cffc..e3352e5 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = cdr2raw cmx2raw
 
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
 
 cdr2raw_DEPENDENCIES = @CDR2RAW_WIN32_RESOURCE@
 
diff --git a/src/conv/raw/cdr2raw.cpp b/src/conv/raw/cdr2raw.cpp
index 82ec9e2..0742783 100644
--- a/src/conv/raw/cdr2raw.cpp
+++ b/src/conv/raw/cdr2raw.cpp
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "libcdr.h"
+#include <libcdr/libcdr.h>
 #include <libwpd-stream/libwpd-stream.h>
 #include <libwpd/libwpd.h>
 #include <libwpg/libwpg.h>
diff --git a/src/conv/raw/cmx2raw.cpp b/src/conv/raw/cmx2raw.cpp
index f9a18c1..42c4eff 100644
--- a/src/conv/raw/cmx2raw.cpp
+++ b/src/conv/raw/cmx2raw.cpp
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "libcdr.h"
+#include <libcdr/libcdr.h>
 #include <libwpd-stream/libwpd-stream.h>
 #include <libwpd/libwpd.h>
 #include <libwpg/libwpg.h>
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index 6f0c65e..0644819 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = cdr2xhtml cmx2xhtml
 
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
 
 cdr2xhtml_DEPENDENCIES = @CDR2XHTML_WIN32_RESOURCE@
 
diff --git a/src/conv/svg/cdr2xhtml.cpp b/src/conv/svg/cdr2xhtml.cpp
index 0276a77..154c9f7 100644
--- a/src/conv/svg/cdr2xhtml.cpp
+++ b/src/conv/svg/cdr2xhtml.cpp
@@ -32,7 +32,7 @@
 #include <sstream>
 #include <stdio.h>
 #include <string.h>
-#include "libcdr.h"
+#include <libcdr/libcdr.h>
 #include <libwpd-stream/libwpd-stream.h>
 #include <libwpd/libwpd.h>
 
diff --git a/src/conv/svg/cmx2xhtml.cpp b/src/conv/svg/cmx2xhtml.cpp
index 4b64bd3..568eb19 100644
--- a/src/conv/svg/cmx2xhtml.cpp
+++ b/src/conv/svg/cmx2xhtml.cpp
@@ -32,7 +32,7 @@
 #include <sstream>
 #include <stdio.h>
 #include <string.h>
-#include "libcdr.h"
+#include <libcdr/libcdr.h>
 #include <libwpd-stream/libwpd-stream.h>
 #include <libwpd/libwpd.h>
 
diff --git a/src/conv/text/Makefile.am b/src/conv/text/Makefile.am
index e663a7d..b20d158 100644
--- a/src/conv/text/Makefile.am
+++ b/src/conv/text/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = cdr2text cmx2text
 
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
 
 cdr2text_DEPENDENCIES = @CDR2TEXT_WIN32_RESOURCE@
 
diff --git a/src/conv/text/cdr2text.cpp b/src/conv/text/cdr2text.cpp
index 0c5de24..92a2b31 100644
--- a/src/conv/text/cdr2text.cpp
+++ b/src/conv/text/cdr2text.cpp
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "libcdr.h"
+#include <libcdr/libcdr.h>
 #include <libwpd-stream/libwpd-stream.h>
 #include <libwpd/libwpd.h>
 
diff --git a/src/conv/text/cmx2text.cpp b/src/conv/text/cmx2text.cpp
index 622f233..ebfd40c 100644
--- a/src/conv/text/cmx2text.cpp
+++ b/src/conv/text/cmx2text.cpp
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "libcdr.h"
+#include <libcdr/libcdr.h>
 #include <libwpd-stream/libwpd-stream.h>
 #include <libwpd/libwpd.h>
 
diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index b6ed4a8..4076f56 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -29,10 +29,10 @@
 
 #include <math.h>
 #include <string.h>
+#include <libcdr/libcdr.h>
 #include "CDRSVGGenerator.h"
 #include "CDRContentCollector.h"
 #include "CDRInternalStream.h"
-#include "CMXDocument.h"
 #include "libcdr_utils.h"
 
 #ifndef M_PI
diff --git a/src/lib/CDRDocument.cpp b/src/lib/CDRDocument.cpp
index 952bf5b..eeadfaf 100644
--- a/src/lib/CDRDocument.cpp
+++ b/src/lib/CDRDocument.cpp
@@ -29,7 +29,7 @@
 
 #include <string>
 #include <string.h>
-#include "CDRDocument.h"
+#include <libcdr/libcdr.h>
 #include "CDRParser.h"
 #include "CDRSVGGenerator.h"
 #include "CDRContentCollector.h"
diff --git a/src/lib/CDRDocument.h b/src/lib/CDRDocument.h
deleted file mode 100644
index e8cce46..0000000
--- a/src/lib/CDRDocument.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* libcdr
- * Version: MPL 1.1 / GPLv2+ / LGPLv2+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- *
- * Major Contributor(s):
- * Copyright (C) 2012 Fridrich Strba <fridrich.strba at bluewin.ch>
- *
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
- * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
- * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
- * instead of those above.
- */
-
-#ifndef __CDRDOCUMENT_H__
-#define __CDRDOCUMENT_H__
-
-#include <libwpd/libwpd.h>
-#include <libwpg/libwpg.h>
-#include "CDRStringVector.h"
-
-class WPXInputStream;
-
-namespace libcdr
-{
-class CDRDocument
-{
-public:
-
-  static bool isSupported(WPXInputStream *input);
-
-  static bool parse(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
-
-  static bool generateSVG(WPXInputStream *input, CDRStringVector &output);
-};
-
-} // namespace libcdr
-
-#endif //  __CDRDOCUMENT_H__
-/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/CDRSVGGenerator.cpp b/src/lib/CDRSVGGenerator.cpp
index 91fa2e5..779d57a 100644
--- a/src/lib/CDRSVGGenerator.cpp
+++ b/src/lib/CDRSVGGenerator.cpp
@@ -29,7 +29,7 @@
  */
 
 #include "CDRSVGGenerator.h"
-#include "libcdr.h"
+#include <libcdr/libcdr.h>
 #include <locale.h>
 #include <sstream>
 #include <string>
diff --git a/src/lib/CDRSVGGenerator.h b/src/lib/CDRSVGGenerator.h
index 44bec11..df39ea6 100644
--- a/src/lib/CDRSVGGenerator.h
+++ b/src/lib/CDRSVGGenerator.h
@@ -35,7 +35,7 @@
 #include <sstream>
 #include <libwpd/libwpd.h>
 #include <libwpg/libwpg.h>
-#include "CDRStringVector.h"
+#include <libcdr/libcdr.h>
 
 namespace libcdr
 {
diff --git a/src/lib/CDRStringVector.cpp b/src/lib/CDRStringVector.cpp
index 06c02cb..8a233b0 100644
--- a/src/lib/CDRStringVector.cpp
+++ b/src/lib/CDRStringVector.cpp
@@ -28,7 +28,7 @@
  */
 
 #include <vector>
-#include "CDRStringVector.h"
+#include <libcdr/libcdr.h>
 
 namespace libcdr
 {
diff --git a/src/lib/CDRStringVector.h b/src/lib/CDRStringVector.h
deleted file mode 100644
index 8b3ba90..0000000
--- a/src/lib/CDRStringVector.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* libcdr
- * Version: MPL 1.1 / GPLv2+ / LGPLv2+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2012 Fridrich Strba <fridrich.strba at bluewin.ch>
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
- * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
- * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
- * instead of those above.
- */
-
-#ifndef __CDRSTRINGVECTOR_H__
-#define __CDRSTRINGVECTOR_H__
-
-#include <libwpd/libwpd.h>
-
-namespace libcdr
-{
-class CDRStringVectorImpl;
-
-class CDRStringVector
-{
-public:
-  CDRStringVector();
-  CDRStringVector(const CDRStringVector &vec);
-  ~CDRStringVector();
-
-  CDRStringVector &operator=(const CDRStringVector &vec);
-
-  unsigned size() const;
-  bool empty() const;
-  const WPXString &operator[](unsigned idx) const;
-  void append(const WPXString &str);
-  void clear();
-
-private:
-  CDRStringVectorImpl *m_pImpl;
-};
-
-} // namespace libcdr
-
-#endif /* __CDRSTRINGVECTOR_H__ */
-/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/CMXDocument.cpp b/src/lib/CMXDocument.cpp
index b6becce..02cafba 100644
--- a/src/lib/CMXDocument.cpp
+++ b/src/lib/CMXDocument.cpp
@@ -29,7 +29,7 @@
 
 #include <string>
 #include <string.h>
-#include "CMXDocument.h"
+#include <libcdr/libcdr.h>
 #include "CDRDocumentStructure.h"
 #include "CMXParser.h"
 #include "CDRSVGGenerator.h"
diff --git a/src/lib/CMXDocument.h b/src/lib/CMXDocument.h
deleted file mode 100644
index 11e7eef..0000000
--- a/src/lib/CMXDocument.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* libcdr
- * Version: MPL 1.1 / GPLv2+ / LGPLv2+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2012 Fridrich Strba <fridrich.strba at bluewin.ch>
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
- * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
- * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
- * instead of those above.
- */
-
-#ifndef __CMXDOCUMENT_H__
-#define __CMXDOCUMENT_H__
-
-#include <libwpd/libwpd.h>
-#include <libwpg/libwpg.h>
-#include "CDRStringVector.h"
-
-class WPXInputStream;
-
-namespace libcdr
-{
-class CMXDocument
-{
-public:
-
-  static bool isSupported(WPXInputStream *input);
-
-  static bool parse(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
-
-  static bool generateSVG(WPXInputStream *input, CDRStringVector &output);
-};
-
-} // namespace libcdr
-
-#endif //  __CMXDOCUMENT_H__
-/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 5c776e2..87bae0b 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -7,12 +7,12 @@ endif
 lib_LTLIBRARIES = libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la
 libcdr_ at CDR_MAJOR_VERSION@_ at CDR_MINOR_VERSION@_includedir = $(includedir)/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@/libcdr
 libcdr_ at CDR_MAJOR_VERSION@_ at CDR_MINOR_VERSION@_include_HEADERS = \
-	libcdr.h \
-	CDRDocument.h \
-	CDRStringVector.h \
-	CMXDocument.h
+	$(top_srcdir)/inc/libcdr/libcdr.h \
+	$(top_srcdir)/inc/libcdr/CDRDocument.h \
+	$(top_srcdir)/inc/libcdr/CDRStringVector.h \
+	$(top_srcdir)/inc/libcdr/CMXDocument.h
 
-AM_CXXFLAGS = $(WPD_CFLAGS) $(WPG_CFLAGS) $(LCMS2_CFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc $(WPD_CFLAGS) $(WPG_CFLAGS) $(LCMS2_CFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS)
 
 libcdr_ at CDR_MAJOR_VERSION@_ at CDR_MINOR_VERSION@_la_LIBADD  = $(WPD_LIBS) $(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBCDR_WIN32_RESOURCE@
 libcdr_ at CDR_MAJOR_VERSION@_ at CDR_MINOR_VERSION@_la_DEPENDENCIES = @LIBCDR_WIN32_RESOURCE@
diff --git a/src/lib/libcdr.h b/src/lib/libcdr.h
deleted file mode 100644
index bd8548c..0000000
--- a/src/lib/libcdr.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* libcdr
- * Version: MPL 1.1 / GPLv2+ / LGPLv2+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- *
- * Major Contributor(s):
- * Copyright (C) 2012 Fridrich Strba <fridrich.strba at bluewin.ch>
- *
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
- * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
- * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
- * instead of those above.
- */
-
-#ifndef __LIBCDR_H__
-#define __LIBCDR_H__
-
-#include "CDRDocument.h"
-#include "CMXDocument.h"
-#include <libwpd/libwpd.h>
-#include <libwpg/libwpg.h>
-
-#endif
-/* vim:set shiftwidth=2 softtabstop=2 expandtab: */

More information about the Libreoffice-commits mailing list