diff --git a/doc/makefile.am b/doc/makefile.am
index 96204bc..a84fa13 100644
--- a/doc/makefile.am
+++ b/doc/makefile.am
@@ -35,13 +35,13 @@ MAINTAINERCLEANFILES = makefile.in
 distclean-local:
 	- rm -r html latex
 
-dist-hook:
-	cp html/* ${develdir}
+dist-hook: html
+	cp -r html ${distdir}/
 
 install-data-hook:
 	chmod -R u+w ${develdir}
 	cp html/* ${develdir}
 
-uninstall-hook:
-	chmod -R u+w ${develdir}
-	rm -rf ${develdir}
+#uninstall-hook:
+#	chmod -R u+w ${develdir}
+#	rm -rf ${develdir}
diff --git a/src/makefile.am b/src/makefile.am
index 107ea10..cdfd8dc 100644
--- a/src/makefile.am
+++ b/src/makefile.am
@@ -5,8 +5,9 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
+AM_CXXFLAGS += -I ${top_srcdir}/src
 lib_LTLIBRARIES = libxml-cxx.la
-include_HEADERS = xml.hxx
+nobase_include_HEADERS = xml-cxx/xml.hxx
 
 libxml_cxx_la_SOURCES = xml.cxx
 
diff --git a/src/xml.cxx b/src/xml.cxx
index 31002f3..ee8b471 100644
--- a/src/xml.cxx
+++ b/src/xml.cxx
@@ -5,7 +5,7 @@
 //       1         2         3         4         5         6         7         8
 // 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
-#include <xml.hxx>
+#include <xml-cxx/xml.hxx>
 #include <iostream>
 #include <sstream>
 #include <cstdlib>
diff --git a/test/xml_test.cxx b/test/xml_test.cxx
index 298c779..027f8fe 100644
--- a/test/xml_test.cxx
+++ b/test/xml_test.cxx
@@ -1,4 +1,11 @@
-#include <xml.hxx>
+/*! @file
+
+    @id $Id$
+*/
+//       1         2         3         4         5         6         7         8
+// 45678901234567890123456789012345678901234567890123456789012345678901234567890
+
+#include <xml-cxx/xml.hxx>
 #include <cppunit/TestFixture.h>
 #include <cppunit/ui/text/TestRunner.h>
 #include <cppunit/extensions/HelperMacros.h>