Making Michael Stahl happy (libvisio part)

28 files changed, 65 insertions, 54 deletions

diff --git a/Makefile.am b/Makefile.am
index ed65ae4..7e1cc85 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ pkgconfdir = $(libdir)/pkgconfig
 
 pkgconf_DATA = libvisio-@VSD_MAJOR_VERSION@.@VSD_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 \
-	libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.pc.in \
+	libvisio.pc.in \
 	libvisio-zip.in \
 	libvisio.spec \
 	libvisio.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/libvisio.dsp b/build/win32/libvisio.dsp
index 27db35f..b7d3330 100644
--- a/build/win32/libvisio.dsp
+++ b/build/win32/libvisio.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" /I "libwpg-0.2" /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" /I "libwpg-0.2" /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" /I "libwpg-0.2" /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" /I "libwpg-0.2" /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" /I "libwpg-0.2" /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" /I "libwpg-0.2" /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" /I "libwpg-0.2" /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" /I "libwpg-0.2" /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"

@@ -191,7 +191,15 @@ SOURCE=..\..\src\lib\VSDZipStream.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=..\..\src\lib\libvisio.h

+SOURCE=..\..\inc\libvisio\libvisio.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\inc\libvisio\VisioDocument.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\inc\libvisio\VSDStringVector.h

 # End Source File

 # Begin Source File

 

@@ -211,10 +219,6 @@ SOURCE=..\..\src\lib\VDXParser.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\src\lib\VisioDocument.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\..\src\lib\VSD5Parser.h

 # End Source File

 # Begin Source File

diff --git a/build/win32/libvisio.vcproj b/build/win32/libvisio.vcproj
index 4401712..f2d6b01 100644
--- a/build/win32/libvisio.vcproj
+++ b/build/win32/libvisio.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(LIBXML_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(LIBXML_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
 				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -116,7 +116,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(LIBXML_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(LIBXML_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -728,7 +728,15 @@
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
-				RelativePath="..\..\src\lib\libvisio.h"
+				RelativePath="..\..\inc\libvisio\libvisio.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\inc\libvisio\VisioDocument.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\inc\libvisio\VSDStringVector.h"
 				>
 			</File>
 			<File
@@ -748,10 +756,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\lib\VisioDocument.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\src\lib\VSD5Parser.h"
 				>
 			</File>
@@ -812,10 +816,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\lib\VSDStringVector.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\src\lib\VSDStyles.h"
 				>
 			</File>
diff --git a/build/win32/libvisio.vcxproj b/build/win32/libvisio.vcxproj
index 803e91a..665e890 100644
--- a/build/win32/libvisio.vcxproj
+++ b/build/win32/libvisio.vcxproj
@@ -43,7 +43,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_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);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -254,12 +254,13 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\lib\libvisio.h" />
+    <ClInclude Include="..\..\inc\libvisio\libvisio.h" />
+    <ClInclude Include="..\..\inc\libvisio\VisioDocument.h" />
+    <ClInclude Include="..\..\inc\libvisio\VSDStringVector.h" />
     <ClInclude Include="..\..\src\lib\libvisio_utils.h" />
     <ClInclude Include="..\..\src\lib\tokenhash.h" />
     <ClInclude Include="..\..\src\lib\tokens.h" />
     <ClInclude Include="..\..\src\lib\VDXParser.h" />
-    <ClInclude Include="..\..\src\lib\VisioDocument.h" />
     <ClInclude Include="..\..\src\lib\VSD5Parser.h" />
     <ClInclude Include="..\..\src\lib\VSD6Parser.h" />
     <ClInclude Include="..\..\src\lib\VSDCharacterList.h" />
@@ -275,7 +276,6 @@
     <ClInclude Include="..\..\src\lib\VSDParser.h" />
     <ClInclude Include="..\..\src\lib\VSDShapeList.h" />
     <ClInclude Include="..\..\src\lib\VSDStencils.h" />
-    <ClInclude Include="..\..\src\lib\VSDStringVector.h" />
     <ClInclude Include="..\..\src\lib\VSDStyles.h" />
     <ClInclude Include="..\..\src\lib\VSDStylesCollector.h" />
     <ClInclude Include="..\..\src\lib\VSDSVGGenerator.h" />
diff --git a/build/win32/vsd2raw.vcproj b/build/win32/vsd2raw.vcproj
index d6b9058..bdfbb7a 100644
--- a/build/win32/vsd2raw.vcproj
+++ b/build/win32/vsd2raw.vcproj
@@ -45,7 +45,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"
@@ -136,7 +136,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/vsd2raw.vcxproj b/build/win32/vsd2raw.vcxproj
index c774295..25a454c 100644
--- a/build/win32/vsd2raw.vcxproj
+++ b/build/win32/vsd2raw.vcxproj
@@ -52,7 +52,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>
@@ -96,7 +96,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ICU_LIB_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ICU_LIB_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
diff --git a/build/win32/vsd2xhtml.vcproj b/build/win32/vsd2xhtml.vcproj
index 37934c6..6d235fb 100644
--- a/build/win32/vsd2xhtml.vcproj
+++ b/build/win32/vsd2xhtml.vcproj
@@ -45,7 +45,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"
@@ -133,7 +133,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"
diff --git a/build/win32/vsd2xhtml.vcxproj b/build/win32/vsd2xhtml.vcxproj
index f00761e..c6f32cc 100644
--- a/build/win32/vsd2xhtml.vcxproj
+++ b/build/win32/vsd2xhtml.vcxproj
@@ -52,7 +52,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>
       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
@@ -93,7 +93,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>
diff --git a/configure.ac b/configure.ac
index 447b2ce..af92ee6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -318,11 +318,13 @@ src/conv/text/vsd2text.rc
 src/conv/text/vss2text.rc
 src/lib/Makefile
 src/lib/libvisio.rc
+inc/Makefile
+inc/libvisio/Makefile
 build/Makefile
 build/win32/Makefile
 docs/Makefile
 docs/doxygen/Makefile
-libvisio-0.0.pc
+libvisio-$VSD_MAJOR_VERSION.$VSD_MINOR_VERSION.pc:libvisio.pc.in
 libvisio.spec
 libvisio-zip
 ])
diff --git a/inc/Makefile.am b/inc/Makefile.am
new file mode 100644
index 0000000..cc668ef
--- /dev/null
+++ b/inc/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = libvisio
diff --git a/inc/libvisio/Makefile.am b/inc/libvisio/Makefile.am
new file mode 100644
index 0000000..e4c3d6a
--- /dev/null
+++ b/inc/libvisio/Makefile.am
@@ -0,0 +1,4 @@
+EXTRA_DIST = \
+	libvisio.h \
+	VSDStringVector.h \
+	VisioDocument.h
diff --git a/src/lib/VSDStringVector.h b/inc/libvisio/VSDStringVector.h
index 50c929f..50c929f 100644
--- a/src/lib/VSDStringVector.h
+++ b/inc/libvisio/VSDStringVector.h
diff --git a/src/lib/VisioDocument.h b/inc/libvisio/VisioDocument.h
index 75ed5ab..75ed5ab 100644
--- a/src/lib/VisioDocument.h
+++ b/inc/libvisio/VisioDocument.h
diff --git a/src/lib/libvisio.h b/inc/libvisio/libvisio.h
index ff454a9..ff454a9 100644
--- a/src/lib/libvisio.h
+++ b/inc/libvisio/libvisio.h
diff --git a/libvisio-0.0.pc.in b/libvisio.pc.in
index 8bd5cc6..8bd5cc6 100644
--- a/libvisio-0.0.pc.in
+++ b/libvisio.pc.in
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index 47a08be..52a7859 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = vsd2raw vss2raw
 
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(LIBVISIO_CXXFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc $(LIBVISIO_CXXFLAGS) $(DEBUG_CXXFLAGS)
 
 vsd2raw_DEPENDENCIES = @VSD2RAW_WIN32_RESOURCE@
 
diff --git a/src/conv/raw/vsd2raw.cpp b/src/conv/raw/vsd2raw.cpp
index dbc2ccc..f65ace5 100644
--- a/src/conv/raw/vsd2raw.cpp
+++ b/src/conv/raw/vsd2raw.cpp
@@ -33,9 +33,9 @@
 #include <string.h>
 #include <stack>
 
-#include "libvisio.h"
 #include <libwpd-stream/libwpd-stream.h>
 #include <libwpd/libwpd.h>
+#include <libvisio/libvisio.h>
 
 enum PainterCallback
 {
diff --git a/src/conv/raw/vss2raw.cpp b/src/conv/raw/vss2raw.cpp
index 58a7597..d04d376 100644
--- a/src/conv/raw/vss2raw.cpp
+++ b/src/conv/raw/vss2raw.cpp
@@ -33,9 +33,9 @@
 #include <string.h>
 #include <stack>
 
-#include "libvisio.h"
 #include <libwpd-stream/libwpd-stream.h>
 #include <libwpd/libwpd.h>
+#include <libvisio/libvisio.h>
 
 enum PainterCallback
 {
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index 27e3e48..bb0d208 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = vsd2xhtml vss2xhtml
 
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(LIBVISIO_CXXFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc $(LIBVISIO_CXXFLAGS) $(DEBUG_CXXFLAGS)
 
 vsd2xhtml_DEPENDENCIES = @VSD2XHTML_WIN32_RESOURCE@
 
diff --git a/src/conv/svg/vsd2xhtml.cpp b/src/conv/svg/vsd2xhtml.cpp
index ccabfc8..4865005 100644
--- a/src/conv/svg/vsd2xhtml.cpp
+++ b/src/conv/svg/vsd2xhtml.cpp
@@ -32,9 +32,9 @@
 #include <sstream>
 #include <stdio.h>
 #include <string.h>
-#include "libvisio.h"
 #include <libwpd-stream/libwpd-stream.h>
 #include <libwpd/libwpd.h>
+#include <libvisio/libvisio.h>
 
 namespace
 {
diff --git a/src/conv/svg/vss2xhtml.cpp b/src/conv/svg/vss2xhtml.cpp
index 02525c8..531d12c 100644
--- a/src/conv/svg/vss2xhtml.cpp
+++ b/src/conv/svg/vss2xhtml.cpp
@@ -32,9 +32,9 @@
 #include <sstream>
 #include <stdio.h>
 #include <string.h>
-#include "libvisio.h"
 #include <libwpd-stream/libwpd-stream.h>
 #include <libwpd/libwpd.h>
+#include <libvisio/libvisio.h>
 
 namespace
 {
diff --git a/src/conv/text/Makefile.am b/src/conv/text/Makefile.am
index 0d4d1a1..991d514 100644
--- a/src/conv/text/Makefile.am
+++ b/src/conv/text/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = vsd2text vss2text
 
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(LIBVISIO_CXXFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc $(LIBVISIO_CXXFLAGS) $(DEBUG_CXXFLAGS)
 
 vsd2text_DEPENDENCIES = @VSD2TEXT_WIN32_RESOURCE@
 
diff --git a/src/conv/text/vsd2text.cpp b/src/conv/text/vsd2text.cpp
index f0e17f9..6f33172 100644
--- a/src/conv/text/vsd2text.cpp
+++ b/src/conv/text/vsd2text.cpp
@@ -31,9 +31,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "libvisio.h"
 #include <libwpd-stream/libwpd-stream.h>
 #include <libwpd/libwpd.h>
+#include <libvisio/libvisio.h>
 
 class TextPainter : public libwpg::WPGPaintInterface
 {
diff --git a/src/conv/text/vss2text.cpp b/src/conv/text/vss2text.cpp
index e656077..e6e8c6f 100644
--- a/src/conv/text/vss2text.cpp
+++ b/src/conv/text/vss2text.cpp
@@ -31,9 +31,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "libvisio.h"
 #include <libwpd-stream/libwpd-stream.h>
 #include <libwpd/libwpd.h>
+#include <libvisio/libvisio.h>
 
 class TextPainter : public libwpg::WPGPaintInterface
 {
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index c689ce8..869beec 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -8,11 +8,11 @@ lib_LTLIBRARIES = libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.la
 noinst_LTLIBRARIES = libtokenmap.la
 libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_includedir = $(includedir)/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@/libvisio
 libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_include_HEADERS = \
-	libvisio.h \
-	VSDStringVector.h \
-	VisioDocument.h
+	$(top_srcdir)/inc/libvisio/libvisio.h \
+	$(top_srcdir)/inc/libvisio/VSDStringVector.h \
+	$(top_srcdir)/inc/libvisio/VisioDocument.h
 
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(LIBVISIO_CXXFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(LIBVISIO_CXXFLAGS) $(DEBUG_CXXFLAGS)
 
 generated_files = \
 	$(top_builddir)/src/lib/tokens.h \
diff --git a/src/lib/VSDSVGGenerator.h b/src/lib/VSDSVGGenerator.h
index 30fa404..1f35e4e 100644
--- a/src/lib/VSDSVGGenerator.h
+++ b/src/lib/VSDSVGGenerator.h
@@ -36,7 +36,7 @@
 #include <sstream>
 #include <libwpd/libwpd.h>
 #include <libwpg/libwpg.h>
-#include "VSDStringVector.h"
+#include <libvisio/libvisio.h>
 
 namespace libvisio
 {
diff --git a/src/lib/VSDStringVector.cpp b/src/lib/VSDStringVector.cpp
index b577896..6956007 100644
--- a/src/lib/VSDStringVector.cpp
+++ b/src/lib/VSDStringVector.cpp
@@ -28,7 +28,7 @@
  */
 
 #include <vector>
-#include "VSDStringVector.h"
+#include <libvisio/libvisio.h>
 
 namespace libvisio
 {
diff --git a/src/lib/VisioDocument.cpp b/src/lib/VisioDocument.cpp
index bbfe53f..15f6f75 100644
--- a/src/lib/VisioDocument.cpp
+++ b/src/lib/VisioDocument.cpp
@@ -28,9 +28,9 @@
  * instead of those above.
  */
 
-#include <libwpd-stream/libwpd-stream.h>
 #include <string>
-#include "libvisio.h"
+#include <libwpd-stream/libwpd-stream.h>
+#include <libvisio/libvisio.h>
 #include "libvisio_utils.h"
 #include "VDXParser.h"
 #include "VSDSVGGenerator.h"