Add hxx extension for headers and libstud prefix for library dir

83 files changed, 243 insertions, 239 deletions

diff --git a/build/export.build b/build/export.build
index ae96337..2319168 100644
--- a/build/export.build
+++ b/build/export.build
@@ -4,7 +4,7 @@
 
 $out_root/:
 {
-  include xml/
+  include libstudxml/
 }
 
-export $out_root/xml/lib{studxml}
+export $out_root/libstudxml/lib{studxml}
diff --git a/build/root.build b/build/root.build
index 4f266d1..a1c28e5 100644
--- a/build/root.build
+++ b/build/root.build
@@ -6,7 +6,7 @@ cxx.std = 11
 
 using cxx
 
-hxx{*}: extension =
+hxx{*}: extension = hxx
 cxx{*}: extension = cxx
 ixx{*}: extension = ixx
 txx{*}: extension = txx
diff --git a/buildfile b/buildfile
index c0df1b9..6d248f7 100644
--- a/buildfile
+++ b/buildfile
@@ -2,8 +2,8 @@
 # copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 # license   : MIT; see accompanying LICENSE file
 
-./: xml/ examples/ tests/ doc/ doc{INSTALL LICENSE NEWS README version} \
- file{manifest}
+./: libstudxml/ examples/ tests/ doc/ \
+ doc{INSTALL LICENSE NEWS README version} file{manifest}
 
 doc{version}: file{manifest} # Generated by the version module.
 doc{version}: dist = true
diff --git a/examples/hybrid/dom.cxx b/examples/hybrid/dom.cxx
index c2ae6fd..5bdefc9 100644
--- a/examples/hybrid/dom.cxx
+++ b/examples/hybrid/dom.cxx
@@ -1,8 +1,8 @@
 // file      : examples/hybrid/dom.cxx
 // copyright : not copyrighted - public domain
 
-#include <xml/parser>
-#include <xml/serializer>
+#include <libstudxml/parser.hxx>
+#include <libstudxml/serializer.hxx>
 
 #include "dom.hxx"
 
diff --git a/examples/hybrid/dom.hxx b/examples/hybrid/dom.hxx
index 4d99feb..7897ab3 100644
--- a/examples/hybrid/dom.hxx
+++ b/examples/hybrid/dom.hxx
@@ -8,8 +8,8 @@
 #include <string>
 #include <vector>
 
-#include <xml/qname>
-#include <xml/forward>
+#include <libstudxml/qname.hxx>
+#include <libstudxml/forward.hxx>
 
 // A simple, DOM-like in-memory representation of raw XML. It only supports
 // empty, simple, and complex content (no mixed content) and is not
diff --git a/examples/hybrid/driver.cxx b/examples/hybrid/driver.cxx
index c1f5a0e..d2789a7 100644
--- a/examples/hybrid/driver.cxx
+++ b/examples/hybrid/driver.cxx
@@ -4,8 +4,8 @@
 #include <fstream>
 #include <iostream>
 
-#include <xml/parser>
-#include <xml/serializer>
+#include <libstudxml/parser.hxx>
+#include <libstudxml/serializer.hxx>
 
 #include "dom.hxx"
 
diff --git a/examples/inheritance/driver.cxx b/examples/inheritance/driver.cxx
index c07a0ea..8fc23b1 100644
--- a/examples/inheritance/driver.cxx
+++ b/examples/inheritance/driver.cxx
@@ -4,8 +4,8 @@
 #include <fstream>
 #include <iostream>
 
-#include <xml/parser>
-#include <xml/serializer>
+#include <libstudxml/parser.hxx>
+#include <libstudxml/serializer.hxx>
 
 #include "position.hxx"
 
diff --git a/examples/inheritance/position.cxx b/examples/inheritance/position.cxx
index 1123efa..cb16675 100644
--- a/examples/inheritance/position.cxx
+++ b/examples/inheritance/position.cxx
@@ -3,8 +3,8 @@
 
 #include <iostream>
 
-#include <xml/parser>
-#include <xml/serializer>
+#include <libstudxml/parser.hxx>
+#include <libstudxml/serializer.hxx>
 
 #include "position.hxx"
 
diff --git a/examples/inheritance/position.hxx b/examples/inheritance/position.hxx
index d6f3a3f..37b9f1a 100644
--- a/examples/inheritance/position.hxx
+++ b/examples/inheritance/position.hxx
@@ -8,7 +8,7 @@
 #include <vector>
 #include <iosfwd>
 
-#include <xml/forward> // xml::{parser,serializer} forward declarations.
+#include <libstudxml/forward.hxx> // xml::{parser,serializer} forward declarations.
 
 class position
 {
diff --git a/examples/performance/driver.cxx b/examples/performance/driver.cxx
index 403e821..13295ad 100644
--- a/examples/performance/driver.cxx
+++ b/examples/performance/driver.cxx
@@ -5,7 +5,7 @@
 #include <fstream>
 #include <iostream>
 
-#include <xml/parser>
+#include <libstudxml/parser.hxx>
 
 #include "time.hxx"
 
diff --git a/examples/persistence/driver.cxx b/examples/persistence/driver.cxx
index 8792716..ab58982 100644
--- a/examples/persistence/driver.cxx
+++ b/examples/persistence/driver.cxx
@@ -4,8 +4,8 @@
 #include <fstream>
 #include <iostream>
 
-#include <xml/parser>
-#include <xml/serializer>
+#include <libstudxml/parser.hxx>
+#include <libstudxml/serializer.hxx>
 
 #include "position.hxx"
 
diff --git a/examples/persistence/position.cxx b/examples/persistence/position.cxx
index a0430b4..554cf7d 100644
--- a/examples/persistence/position.cxx
+++ b/examples/persistence/position.cxx
@@ -3,8 +3,8 @@
 
 #include <iostream>
 
-#include <xml/parser>
-#include <xml/serializer>
+#include <libstudxml/parser.hxx>
+#include <libstudxml/serializer.hxx>
 
 #include "position.hxx"
 
diff --git a/examples/persistence/position.hxx b/examples/persistence/position.hxx
index fb8c897..aee7e0c 100644
--- a/examples/persistence/position.hxx
+++ b/examples/persistence/position.hxx
@@ -8,7 +8,7 @@
 #include <vector>
 #include <iosfwd>
 
-#include <xml/forward> // xml::{parser,serializer} forward declarations.
+#include <libstudxml/forward.hxx> // xml::{parser,serializer} forward declarations.
 
 enum object_type {building, mountain};
 
diff --git a/examples/processing/driver.cxx b/examples/processing/driver.cxx
index 18950b2..f1f7461 100644
--- a/examples/processing/driver.cxx
+++ b/examples/processing/driver.cxx
@@ -5,9 +5,9 @@
 #include <fstream>
 #include <iostream>
 
-#include <xml/parser>
-#include <xml/serializer>
-#include <xml/value-traits>
+#include <libstudxml/parser.hxx>
+#include <libstudxml/serializer.hxx>
+#include <libstudxml/value-traits.hxx>
 
 using namespace std;
 using namespace xml;
diff --git a/examples/roundtrip/driver.cxx b/examples/roundtrip/driver.cxx
index 9b8d512..f2178eb 100644
--- a/examples/roundtrip/driver.cxx
+++ b/examples/roundtrip/driver.cxx
@@ -5,8 +5,8 @@
 #include <fstream>
 #include <iostream>
 
-#include <xml/parser>
-#include <xml/serializer>
+#include <libstudxml/parser.hxx>
+#include <libstudxml/serializer.hxx>
 
 using namespace std;
 using namespace xml;
diff --git a/examples/xhtml/driver.cxx b/examples/xhtml/driver.cxx
index d22defc..cb5bd17 100644
--- a/examples/xhtml/driver.cxx
+++ b/examples/xhtml/driver.cxx
@@ -3,7 +3,7 @@
 
 #include <iostream>
 
-#include <xml/serializer>
+#include <libstudxml/serializer.hxx>
 
 using namespace std;
 using namespace xml;
diff --git a/libstudxml/.gitignore b/libstudxml/.gitignore
new file mode 100644
index 0000000..426db9e
--- /dev/null
+++ b/libstudxml/.gitignore
@@ -0,0 +1 @@
+version.hxx
diff --git a/xml/Makefile.am b/libstudxml/Makefile.am
index 531d456..531d456 100644
--- a/xml/Makefile.am
+++ b/libstudxml/Makefile.am
diff --git a/xml/buildfile b/libstudxml/buildfile
index c082048..1cc0203 100644
--- a/xml/buildfile
+++ b/libstudxml/buildfile
@@ -1,4 +1,4 @@
-# file      : xml/buildfile
+# file      : libstudxml/buildfile
 # copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 # license   : MIT; see accompanying LICENSE file
 
@@ -68,9 +68,10 @@ lib{studxml}: cc.export.poptions = "-I$out_root" "-I$src_root" -DLIBSTUDXML_BUIL
 liba{studxml}: cc.export.poptions += -DLIBSTUDXML_STATIC
 libs{studxml}: cc.export.poptions += -DLIBSTUDXML_SHARED
 
-# Install into the xml/ subdirectory of, say, /usr/include/. Bold, I know.
+# Install into the libstudxml/ subdirectory of, say, /usr/include/. Bold, I
+# know.
 #
-install.include = $install.include/xml/
+install.include = $install.include/libstudxml/
 install.include.subdirs = true # Recreate subdirectories.
 
 # We want these to be picked up even when LIBSTUDXML_BUILD2 is not defined.
diff --git a/xml/content b/libstudxml/content.hxx
index 61e5625..b267128 100644
--- a/xml/content
+++ b/libstudxml/content.hxx
@@ -1,11 +1,11 @@
-// file      : xml/content -*- C++ -*-
+// file      : libstudxml/content.hxx -*- C++ -*-
 // copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef XML_CONTENT
-#define XML_CONTENT
+#ifndef LIBSTUDXML_CONTENT_HXX
+#define LIBSTUDXML_CONTENT_HXX
 
-#include <xml/details/pre.hxx>
+#include <libstudxml/details/pre.hxx>
 
 namespace xml
 {
@@ -30,6 +30,6 @@ namespace xml
   };
 }
 
-#include <xml/details/post.hxx>
+#include <libstudxml/details/post.hxx>
 
-#endif // XML_CONTENT
+#endif // LIBSTUDXML_CONTENT_HXX
diff --git a/xml/details/build2/config-vc.h b/libstudxml/details/build2/config-vc.h
index f928749..f54ad58 100644
--- a/xml/details/build2/config-vc.h
+++ b/libstudxml/details/build2/config-vc.h
@@ -1,12 +1,12 @@
-/* file      : xml/details/build2/config-vc.h
+/* file      : libstudxml/details/build2/config-vc.h
  * copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
  * license   : MIT; see accompanying LICENSE file
  */
 
 /* Configuration file for Windows/VC++ for the build2 build. */
 
-#ifndef XML_DETAILS_CONFIG_VC_H
-#define XML_DETAILS_CONFIG_VC_H
+#ifndef LIBSTUDXML_DETAILS_CONFIG_VC_H
+#define LIBSTUDXML_DETAILS_CONFIG_VC_H
 
 /* Define LIBSTUDXML_BUILD2 for the installed case. */
 #ifndef LIBSTUDXML_BUILD2
@@ -17,4 +17,4 @@
 //
 #define LIBSTUDXML_BYTEORDER 1234
 
-#endif /* XML_DETAILS_CONFIG_VC_H */
+#endif /* LIBSTUDXML_DETAILS_CONFIG_VC_H */
diff --git a/xml/details/build2/config.h b/libstudxml/details/build2/config.h
index e10b8ee..b47f252 100644
--- a/xml/details/build2/config.h
+++ b/libstudxml/details/build2/config.h
@@ -1,12 +1,12 @@
-/* file      : xml/details/build2/config.h
+/* file      : libstudxml/details/build2/config.h
  * copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
  * license   : MIT; see accompanying LICENSE file
  */
 
 /* Static configuration file for the build2 build. */
 
-#ifndef XML_DETAILS_CONFIG_H
-#define XML_DETAILS_CONFIG_H
+#ifndef LIBSTUDXML_DETAILS_CONFIG_H
+#define LIBSTUDXML_DETAILS_CONFIG_H
 
 /* Define LIBSTUDXML_BUILD2 for the installed case. */
 #ifndef LIBSTUDXML_BUILD2
@@ -42,4 +42,4 @@
 #  define LIBSTUDXML_BYTEORDER 1234
 #endif
 
-#endif /* XML_DETAILS_CONFIG_H */
+#endif /* LIBSTUDXML_DETAILS_CONFIG_H */
diff --git a/xml/details/config-vc.h b/libstudxml/details/config-vc.h
index 7734de0..7528b0e 100644
--- a/xml/details/config-vc.h
+++ b/libstudxml/details/config-vc.h
@@ -1,13 +1,13 @@
-/* file      : xml/details/config-vc.h
+/* file      : libstudxml/details/config-vc.h
  * copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
  * license   : MIT; see accompanying LICENSE file
  */
 
 /* Configuration file for Windows/VC++. */
 
-#ifndef XML_DETAILS_CONFIG_VC_H
-#define XML_DETAILS_CONFIG_VC_H
+#ifndef LIBSTUDXML_DETAILS_CONFIG_VC_H
+#define LIBSTUDXML_DETAILS_CONFIG_VC_H
 
 #define LIBSTUDXML_BYTEORDER 1234
 
-#endif /* XML_DETAILS_CONFIG_VC_H */
+#endif /* LIBSTUDXML_DETAILS_CONFIG_VC_H */
diff --git a/xml/details/config.h.in b/libstudxml/details/config.h.in
index c8cb44d..83b633c 100644
--- a/xml/details/config.h.in
+++ b/libstudxml/details/config.h.in
@@ -1,15 +1,15 @@
-/* file      : xml/details/config.h.in
+/* file      : libstudxml/details/config.h.in
  * copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
  * license   : MIT; see accompanying LICENSE file
  */
 
 /* This file is automatically processed by configure. */
 
-#ifndef XML_DETAILS_CONFIG_H
-#define XML_DETAILS_CONFIG_H
+#ifndef LIBSTUDXML_DETAILS_CONFIG_H
+#define LIBSTUDXML_DETAILS_CONFIG_H
 
 #undef LIBSTUDXML_STATIC_LIB
 #undef LIBSTUDXML_EXTERNAL_EXPAT
 #undef LIBSTUDXML_BYTEORDER
 
-#endif /* XML_DETAILS_CONFIG_H */
+#endif /* LIBSTUDXML_DETAILS_CONFIG_H */
diff --git a/xml/details/config.hxx b/libstudxml/details/config.hxx
index 5c46121..68b9dbd 100644
--- a/xml/details/config.hxx
+++ b/libstudxml/details/config.hxx
@@ -1,9 +1,9 @@
-// file      : xml/details/config.hxx
+// file      : libstudxml/details/config.hxx
 // copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef XML_DETAILS_CONFIG_HXX
-#define XML_DETAILS_CONFIG_HXX
+#ifndef LIBSTUDXML_DETAILS_CONFIG_HXX
+#define LIBSTUDXML_DETAILS_CONFIG_HXX
 
 // C++11 support.
 //
@@ -35,16 +35,16 @@
 //
 #ifdef LIBSTUDXML_BUILD2
 #  ifdef _MSC_VER
-#    include <xml/details/build2/config-vc.h>
+#    include <libstudxml/details/build2/config-vc.h>
 #  else
-#    include <xml/details/build2/config.h>
+#    include <libstudxml/details/build2/config.h>
 #  endif
 #else
 #  ifdef _MSC_VER
-#    include <xml/details/config-vc.h>
+#    include <libstudxml/details/config-vc.h>
 #  else
-#    include <xml/details/config.h>
+#    include <libstudxml/details/config.h>
 #  endif
 #endif
 
-#endif // XML_DETAILS_CONFIG_HXX
+#endif // LIBSTUDXML_DETAILS_CONFIG_HXX
diff --git a/xml/details/expat/LICENSE b/libstudxml/details/expat/LICENSE
index dcb4506..dcb4506 100644
--- a/xml/details/expat/LICENSE
+++ b/libstudxml/details/expat/LICENSE
diff --git a/xml/details/expat/README b/libstudxml/details/expat/README
index 3b1ced2..3b1ced2 100644
--- a/xml/details/expat/README
+++ b/libstudxml/details/expat/README
diff --git a/xml/details/expat/ascii.h b/libstudxml/details/expat/ascii.h
index d10530b..d10530b 100644
--- a/xml/details/expat/ascii.h
+++ b/libstudxml/details/expat/ascii.h
diff --git a/xml/details/expat/asciitab.h b/libstudxml/details/expat/asciitab.h
index 79a15c2..79a15c2 100644
--- a/xml/details/expat/asciitab.h
+++ b/libstudxml/details/expat/asciitab.h
diff --git a/xml/details/expat/config.h b/libstudxml/details/expat/config.h
index a335147..f76e6d8 100644
--- a/xml/details/expat/config.h
+++ b/libstudxml/details/expat/config.h
@@ -3,15 +3,15 @@
 
 #ifdef LIBSTUDXML_BUILD2
 #  ifdef _MSC_VER
-#    include <xml/details/build2/config-vc.h>
+#    include <libstudxml/details/build2/config-vc.h>
 #  else
-#    include <xml/details/build2/config.h>
+#    include <libstudxml/details/build2/config.h>
 #  endif
 #else
 #  ifdef _MSC_VER
-#    include <xml/details/config-vc.h>
+#    include <libstudxml/details/config-vc.h>
 #  else
-#    include <xml/details/config.h>
+#    include <libstudxml/details/config.h>
 #  endif
 #endif
 
diff --git a/xml/details/expat/expat.h b/libstudxml/details/expat/expat.h
index 77baa3a..9671b73 100644
--- a/xml/details/expat/expat.h
+++ b/libstudxml/details/expat/expat.h
@@ -15,7 +15,7 @@
 #endif
 
 #include <stdlib.h>
-#include <xml/details/expat/expat_external.h>
+#include <libstudxml/details/expat/expat_external.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/xml/details/expat/expat_external.h b/libstudxml/details/expat/expat_external.h
index 926e32c..926e32c 100644
--- a/xml/details/expat/expat_external.h
+++ b/libstudxml/details/expat/expat_external.h
diff --git a/xml/details/expat/iasciitab.h b/libstudxml/details/expat/iasciitab.h
index 24a1d5c..24a1d5c 100644
--- a/xml/details/expat/iasciitab.h
+++ b/libstudxml/details/expat/iasciitab.h
diff --git a/xml/details/expat/internal.h b/libstudxml/details/expat/internal.h
index dd54548..dd54548 100644
--- a/xml/details/expat/internal.h
+++ b/libstudxml/details/expat/internal.h
diff --git a/xml/details/expat/latin1tab.h b/libstudxml/details/expat/latin1tab.h
index 53c25d7..53c25d7 100644
--- a/xml/details/expat/latin1tab.h
+++ b/libstudxml/details/expat/latin1tab.h
diff --git a/xml/details/expat/nametab.h b/libstudxml/details/expat/nametab.h
index b05e62c..b05e62c 100644
--- a/xml/details/expat/nametab.h
+++ b/libstudxml/details/expat/nametab.h
diff --git a/xml/details/expat/utf8tab.h b/libstudxml/details/expat/utf8tab.h
index 7bb3e77..7bb3e77 100644
--- a/xml/details/expat/utf8tab.h
+++ b/libstudxml/details/expat/utf8tab.h
diff --git a/xml/details/expat/xmlparse.c b/libstudxml/details/expat/xmlparse.c
index d3c7873..5bc6373 100644
--- a/xml/details/expat/xmlparse.c
+++ b/libstudxml/details/expat/xmlparse.c
@@ -10,10 +10,10 @@
 
 #define XML_BUILDING_EXPAT 1
 
-#include <xml/details/expat/config.h>
+#include <libstudxml/details/expat/config.h>
 
-#include <xml/details/expat/ascii.h>
-#include <xml/details/expat/expat.h>
+#include <libstudxml/details/expat/ascii.h>
+#include <libstudxml/details/expat/expat.h>
 
 #ifdef XML_UNICODE
 #define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX
@@ -74,9 +74,9 @@ typedef char ICHAR;
 #endif /* HAVE_BCOPY */
 #endif /* HAVE_MEMMOVE */
 
-#include <xml/details/expat/internal.h>
-#include <xml/details/expat/xmltok.h>
-#include <xml/details/expat/xmlrole.h>
+#include <libstudxml/details/expat/internal.h>
+#include <libstudxml/details/expat/xmltok.h>
+#include <libstudxml/details/expat/xmlrole.h>
 
 typedef const XML_Char *KEY;
 
diff --git a/xml/details/expat/xmlrole.c b/libstudxml/details/expat/xmlrole.c
index c36db3a..b0586e6 100644
--- a/xml/details/expat/xmlrole.c
+++ b/libstudxml/details/expat/xmlrole.c
@@ -4,12 +4,12 @@
 
 #include <stddef.h>
 
-#include <xml/details/expat/config.h>
+#include <libstudxml/details/expat/config.h>
 
-#include <xml/details/expat/expat_external.h>
-#include <xml/details/expat/internal.h>
-#include <xml/details/expat/xmlrole.h>
-#include <xml/details/expat/ascii.h>
+#include <libstudxml/details/expat/expat_external.h>
+#include <libstudxml/details/expat/internal.h>
+#include <libstudxml/details/expat/xmlrole.h>
+#include <libstudxml/details/expat/ascii.h>
 
 /* Doesn't check:
 
diff --git a/xml/details/expat/xmlrole.h b/libstudxml/details/expat/xmlrole.h
index 0a0d6b8..4eeb5b2 100644
--- a/xml/details/expat/xmlrole.h
+++ b/libstudxml/details/expat/xmlrole.h
@@ -11,7 +11,7 @@
 #define XmlPrologStateInitExternalEntity    XmlPrologStateInitExternalEnt
 #endif
 
-#include <xml/details/expat/xmltok.h>
+#include <libstudxml/details/expat/xmltok.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/xml/details/expat/xmltok.c b/libstudxml/details/expat/xmltok.c
index b15fcc8..5a8f36f 100644
--- a/xml/details/expat/xmltok.c
+++ b/libstudxml/details/expat/xmltok.c
@@ -4,12 +4,12 @@
 
 #include <stddef.h>
 
-#include <xml/details/expat/config.h>
+#include <libstudxml/details/expat/config.h>
 
-#include <xml/details/expat/expat_external.h>
-#include <xml/details/expat/internal.h>
-#include <xml/details/expat/xmltok.h>
-#include <xml/details/expat/nametab.h>
+#include <libstudxml/details/expat/expat_external.h>
+#include <libstudxml/details/expat/internal.h>
+#include <libstudxml/details/expat/xmltok.h>
+#include <libstudxml/details/expat/nametab.h>
 
 #ifdef XML_DTD
 #define IGNORE_SECTION_TOK_VTABLE , PREFIX(ignoreSectionTok)
@@ -242,8 +242,8 @@ struct normal_encoding {
 
 static int FASTCALL checkCharRefNumber(int);
 
-#include <xml/details/expat/xmltok_impl.h>
-#include <xml/details/expat/ascii.h>
+#include <libstudxml/details/expat/xmltok_impl.h>
+#include <libstudxml/details/expat/ascii.h>
 
 #ifdef XML_MIN_SIZE
 #define sb_isNameMin isNever
@@ -316,7 +316,7 @@ sb_charMatches(const ENCODING *enc, const char *p, int c)
 
 #define PREFIX(ident) normal_ ## ident
 #define XML_TOK_IMPL_C
-#include <xml/details/expat/xmltok_impl.c>
+#include <libstudxml/details/expat/xmltok_impl.c>
 #undef XML_TOK_IMPL_C
 
 #undef MINBPC
@@ -404,8 +404,8 @@ after:
 static const struct normal_encoding utf8_encoding_ns = {
   { VTABLE1, utf8_toUtf8, utf8_toUtf16, 1, 1, 0 },
   {
-#include <xml/details/expat/asciitab.h>
-#include <xml/details/expat/utf8tab.h>
+#include <libstudxml/details/expat/asciitab.h>
+#include <libstudxml/details/expat/utf8tab.h>
   },
   STANDARD_VTABLE(sb_) NORMAL_VTABLE(utf8_)
 };
@@ -415,9 +415,9 @@ static const struct normal_encoding utf8_encoding = {
   { VTABLE1, utf8_toUtf8, utf8_toUtf16, 1, 1, 0 },
   {
 #define BT_COLON BT_NMSTRT
-#include <xml/details/expat/asciitab.h>
+#include <libstudxml/details/expat/asciitab.h>
 #undef BT_COLON
-#include <xml/details/expat/utf8tab.h>
+#include <libstudxml/details/expat/utf8tab.h>
   },
   STANDARD_VTABLE(sb_) NORMAL_VTABLE(utf8_)
 };
@@ -427,8 +427,8 @@ static const struct normal_encoding utf8_encoding = {
 static const struct normal_encoding internal_utf8_encoding_ns = {
   { VTABLE1, utf8_toUtf8, utf8_toUtf16, 1, 1, 0 },
   {
-#include <xml/details/expat/iasciitab.h>
-#include <xml/details/expat/utf8tab.h>
+#include <libstudxml/details/expat/iasciitab.h>
+#include <libstudxml/details/expat/utf8tab.h>
   },
   STANDARD_VTABLE(sb_) NORMAL_VTABLE(utf8_)
 };
@@ -439,9 +439,9 @@ static const struct normal_encoding internal_utf8_encoding = {
   { VTABLE1, utf8_toUtf8, utf8_toUtf16, 1, 1, 0 },
   {
 #define BT_COLON BT_NMSTRT
-#include <xml/details/expat/iasciitab.h>
+#include <libstudxml/details/expat/iasciitab.h>
 #undef BT_COLON
-#include <xml/details/expat/utf8tab.h>
+#include <libstudxml/details/expat/utf8tab.h>
   },
   STANDARD_VTABLE(sb_) NORMAL_VTABLE(utf8_)
 };
@@ -489,8 +489,8 @@ latin1_toUtf16(const ENCODING *enc,
 static const struct normal_encoding latin1_encoding_ns = {
   { VTABLE1, latin1_toUtf8, latin1_toUtf16, 1, 0, 0 },
   {
-#include <xml/details/expat/asciitab.h>
-#include <xml/details/expat/latin1tab.h>
+#include <libstudxml/details/expat/asciitab.h>
+#include <libstudxml/details/expat/latin1tab.h>
   },
   STANDARD_VTABLE(sb_) ZERO_VTABLE
 };
@@ -501,9 +501,9 @@ static const struct normal_encoding latin1_encoding = {
   { VTABLE1, latin1_toUtf8, latin1_toUtf16, 1, 0, 0 },
   {
 #define BT_COLON BT_NMSTRT
-#include <xml/details/expat/asciitab.h>
+#include <libstudxml/details/expat/asciitab.h>
 #undef BT_COLON
-#include <xml/details/expat/latin1tab.h>
+#include <libstudxml/details/expat/latin1tab.h>
   },
   STANDARD_VTABLE(sb_) ZERO_VTABLE
 };
@@ -524,7 +524,7 @@ ascii_toUtf8(const ENCODING *enc,
 static const struct normal_encoding ascii_encoding_ns = {
   { VTABLE1, ascii_toUtf8, latin1_toUtf16, 1, 1, 0 },
   {
-#include <xml/details/expat/asciitab.h>
+#include <libstudxml/details/expat/asciitab.h>
 /* BT_NONXML == 0 */
   },
   STANDARD_VTABLE(sb_) ZERO_VTABLE
@@ -536,7 +536,7 @@ static const struct normal_encoding ascii_encoding = {
   { VTABLE1, ascii_toUtf8, latin1_toUtf16, 1, 1, 0 },
   {
 #define BT_COLON BT_NMSTRT
-#include <xml/details/expat/asciitab.h>
+#include <libstudxml/details/expat/asciitab.h>
 #undef BT_COLON
 /* BT_NONXML == 0 */
   },
@@ -726,7 +726,7 @@ little2_isNmstrtMin(const ENCODING *enc, const char *p)
 #define IS_NMSTRT_CHAR_MINBPC(enc, p) LITTLE2_IS_NMSTRT_CHAR_MINBPC(enc, p)
 
 #define XML_TOK_IMPL_C
-#include <xml/details/expat/xmltok_impl.c>
+#include <libstudxml/details/expat/xmltok_impl.c>
 #undef XML_TOK_IMPL_C
 
 #undef MINBPC
@@ -752,8 +752,8 @@ static const struct normal_encoding little2_encoding_ns = {
 #endif
   },
   {
-#include <xml/details/expat/asciitab.h>
-#include <xml/details/expat/latin1tab.h>
+#include <libstudxml/details/expat/asciitab.h>
+#include <libstudxml/details/expat/latin1tab.h>
   },
   STANDARD_VTABLE(little2_) ZERO_VTABLE
 };
@@ -770,9 +770,9 @@ static const struct normal_encoding little2_encoding = {
   },
   {
 #define BT_COLON BT_NMSTRT
-#include <xml/details/expat/asciitab.h>
+#include <libstudxml/details/expat/asciitab.h>
 #undef BT_COLON
-#include <xml/details/expat/latin1tab.h>
+#include <libstudxml/details/expat/latin1tab.h>
   },
   STANDARD_VTABLE(little2_) ZERO_VTABLE
 };
@@ -784,8 +784,8 @@ static const struct normal_encoding little2_encoding = {
 static const struct normal_encoding internal_little2_encoding_ns = {
   { VTABLE, 2, 0, 1 },
   {
-#include <xml/details/expat/iasciitab.h>
-#include <xml/details/expat/latin1tab.h>
+#include <libstudxml/details/expat/iasciitab.h>
+#include <libstudxml/details/expat/latin1tab.h>
   },
   STANDARD_VTABLE(little2_) ZERO_VTABLE
 };
@@ -796,9 +796,9 @@ static const struct normal_encoding internal_little2_encoding = {
   { VTABLE, 2, 0, 1 },
   {
 #define BT_COLON BT_NMSTRT
-#include <xml/details/expat/iasciitab.h>
+#include <libstudxml/details/expat/iasciitab.h>
 #undef BT_COLON
-#include <xml/details/expat/latin1tab.h>
+#include <libstudxml/details/expat/latin1tab.h>
   },
   STANDARD_VTABLE(little2_) ZERO_VTABLE
 };
@@ -867,7 +867,7 @@ big2_isNmstrtMin(const ENCODING *enc, const char *p)
 #define IS_NMSTRT_CHAR_MINBPC(enc, p) BIG2_IS_NMSTRT_CHAR_MINBPC(enc, p)
 
 #define XML_TOK_IMPL_C
-#include <xml/details/expat/xmltok_impl.c>
+#include <libstudxml/details/expat/xmltok_impl.c>
 #undef XML_TOK_IMPL_C
 
 #undef MINBPC
@@ -893,8 +893,8 @@ static const struct normal_encoding big2_encoding_ns = {
 #endif
   },
   {
-#include <xml/details/expat/asciitab.h>
-#include <xml/details/expat/latin1tab.h>
+#include <libstudxml/details/expat/asciitab.h>
+#include <libstudxml/details/expat/latin1tab.h>
   },
   STANDARD_VTABLE(big2_) ZERO_VTABLE
 };
@@ -911,9 +911,9 @@ static const struct normal_encoding big2_encoding = {
   },
   {
 #define BT_COLON BT_NMSTRT
-#include <xml/details/expat/asciitab.h>
+#include <libstudxml/details/expat/asciitab.h>
 #undef BT_COLON
-#include <xml/details/expat/latin1tab.h>
+#include <libstudxml/details/expat/latin1tab.h>
   },
   STANDARD_VTABLE(big2_) ZERO_VTABLE
 };
@@ -925,8 +925,8 @@ static const struct normal_encoding big2_encoding = {
 static const struct normal_encoding internal_big2_encoding_ns = {
   { VTABLE, 2, 0, 1 },
   {
-#include <xml/details/expat/iasciitab.h>
-#include <xml/details/expat/latin1tab.h>
+#include <libstudxml/details/expat/iasciitab.h>
+#include <libstudxml/details/expat/latin1tab.h>
   },
   STANDARD_VTABLE(big2_) ZERO_VTABLE
 };
@@ -937,9 +937,9 @@ static const struct normal_encoding internal_big2_encoding = {
   { VTABLE, 2, 0, 1 },
   {
 #define BT_COLON BT_NMSTRT
-#include <xml/details/expat/iasciitab.h>
+#include <libstudxml/details/expat/iasciitab.h>
 #undef BT_COLON
-#include <xml/details/expat/latin1tab.h>
+#include <libstudxml/details/expat/latin1tab.h>
   },
   STANDARD_VTABLE(big2_) ZERO_VTABLE
 };
@@ -1649,7 +1649,7 @@ initScan(const ENCODING * const *encodingTable,
 #define NS(x) x
 #define ns(x) x
 #define XML_TOK_NS_C
-#include <xml/details/expat/xmltok_ns.c>
+#include <libstudxml/details/expat/xmltok_ns.c>
 #undef XML_TOK_NS_C
 #undef NS
 #undef ns
@@ -1660,7 +1660,7 @@ initScan(const ENCODING * const *encodingTable,
 #define ns(x) x ## _ns
 
 #define XML_TOK_NS_C
-#include <xml/details/expat/xmltok_ns.c>
+#include <libstudxml/details/expat/xmltok_ns.c>
 #undef XML_TOK_NS_C
 
 #undef NS
diff --git a/xml/details/expat/xmltok.h b/libstudxml/details/expat/xmltok.h
index ca867aa..ca867aa 100644
--- a/xml/details/expat/xmltok.h
+++ b/libstudxml/details/expat/xmltok.h
diff --git a/xml/details/expat/xmltok_impl.c b/libstudxml/details/expat/xmltok_impl.c
index de4d21a..de4d21a 100644
--- a/xml/details/expat/xmltok_impl.c
+++ b/libstudxml/details/expat/xmltok_impl.c
diff --git a/xml/details/expat/xmltok_impl.h b/libstudxml/details/expat/xmltok_impl.h
index da0ea60..da0ea60 100644
--- a/xml/details/expat/xmltok_impl.h
+++ b/libstudxml/details/expat/xmltok_impl.h
diff --git a/xml/details/expat/xmltok_ns.c b/libstudxml/details/expat/xmltok_ns.c
index c3b88fd..c3b88fd 100644
--- a/xml/details/expat/xmltok_ns.c
+++ b/libstudxml/details/expat/xmltok_ns.c
diff --git a/xml/details/export.hxx b/libstudxml/details/export.hxx
index 3202872..9c8ced7 100644
--- a/xml/details/export.hxx
+++ b/libstudxml/details/export.hxx
@@ -1,11 +1,11 @@
-// file      : xml/details/export.hxx
+// file      : libstudxml/details/export.hxx
 // copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef XML_DETAILS_EXPORT_HXX
-#define XML_DETAILS_EXPORT_HXX
+#ifndef LIBSTUDXML_DETAILS_EXPORT_HXX
+#define LIBSTUDXML_DETAILS_EXPORT_HXX
 
-#include <xml/details/config.hxx>
+#include <libstudxml/details/config.hxx>
 
 // Normally we don't export class templates (but do complete specializations),
 // inline functions, and classes with only inline member functions. Exporting
@@ -72,4 +72,4 @@
 
 #endif // LIBSTUDXML_BUILD2
 
-#endif // XML_DETAILS_EXPORT_HXX
+#endif // LIBSTUDXML_DETAILS_EXPORT_HXX
diff --git a/xml/details/genx/LICENSE b/libstudxml/details/genx/LICENSE
index 6fc3fa7..6fc3fa7 100644
--- a/xml/details/genx/LICENSE
+++ b/libstudxml/details/genx/LICENSE
diff --git a/xml/details/genx/README b/libstudxml/details/genx/README
index 10a7238..10a7238 100644
--- a/xml/details/genx/README
+++ b/libstudxml/details/genx/README
diff --git a/xml/details/genx/char-props.c b/libstudxml/details/genx/char-props.c
index f58a3a2..528ab05 100644
--- a/xml/details/genx/char-props.c
+++ b/libstudxml/details/genx/char-props.c
@@ -11,7 +11,7 @@
  * This version is generated semi-automatically from the source code of the
  *  XML specification via emacs global replace and keyboard macros
  */
-#include <xml/details/genx/genx.h>
+#include <libstudxml/details/genx/genx.h>
 
 static void charProp(char * p, int c, int prop)
 {
diff --git a/xml/details/genx/genx.c b/libstudxml/details/genx/genx.c
index b8492f2..d7bd175 100644
--- a/xml/details/genx/genx.c
+++ b/libstudxml/details/genx/genx.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <xml/details/genx/genx.h>
+#include <libstudxml/details/genx/genx.h>
 
 #define Boolean int
 #define True 1
diff --git a/xml/details/genx/genx.h b/libstudxml/details/genx/genx.h
index 166ee89..166ee89 100644
--- a/xml/details/genx/genx.h
+++ b/libstudxml/details/genx/genx.h
diff --git a/xml/details/post.hxx b/libstudxml/details/post.hxx
index b4513f4..748a9b5 100644
--- a/xml/details/post.hxx
+++ b/libstudxml/details/post.hxx
@@ -1,4 +1,4 @@
-// file      : xml/details/post.hxx
+// file      : libstudxml/details/post.hxx
 // copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/xml/details/pre.hxx b/libstudxml/details/pre.hxx
index a3370de..492eb6e 100644
--- a/xml/details/pre.hxx
+++ b/libstudxml/details/pre.hxx
@@ -1,4 +1,4 @@
-// file      : xml/details/pre.hxx
+// file      : libstudxml/details/pre.hxx
 // copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/libstudxml/exception.hxx b/libstudxml/exception.hxx
new file mode 100644
index 0000000..c649fba
--- /dev/null
+++ b/libstudxml/exception.hxx
@@ -0,0 +1,19 @@
+// file      : libstudxml/exception.hxx -*- C++ -*-
+// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef LIBSTUDXML_EXCEPTION_HXX
+#define LIBSTUDXML_EXCEPTION_HXX
+
+#include <libstudxml/details/pre.hxx>
+
+#include <exception>
+
+namespace xml
+{
+  class exception: public std::exception {};
+}
+
+#include <libstudxml/details/post.hxx>
+
+#endif // LIBSTUDXML_EXCEPTION_HXX
diff --git a/libstudxml/forward.hxx b/libstudxml/forward.hxx
new file mode 100644
index 0000000..c5ae94d
--- /dev/null
+++ b/libstudxml/forward.hxx
@@ -0,0 +1,22 @@
+// file      : libstudxml/forward.hxx -*- C++ -*-
+// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef LIBSTUDXML_FORWARD_HXX
+#define LIBSTUDXML_FORWARD_HXX
+
+#include <libstudxml/details/pre.hxx>
+
+#include <libstudxml/version.hxx>
+
+namespace xml
+{
+  class qname;
+  class parser;
+  class serializer;
+  class exception;
+}
+
+#include <libstudxml/details/post.hxx>
+
+#endif // LIBSTUDXML_FORWARD_HXX
diff --git a/xml/libstudxml-vc10.vcxproj b/libstudxml/libstudxml-vc10.vcxproj
index 5a49c39..5a49c39 100644
--- a/xml/libstudxml-vc10.vcxproj
+++ b/libstudxml/libstudxml-vc10.vcxproj
diff --git a/xml/libstudxml-vc10.vcxproj.filters b/libstudxml/libstudxml-vc10.vcxproj.filters
index 8f90e39..8f90e39 100644
--- a/xml/libstudxml-vc10.vcxproj.filters
+++ b/libstudxml/libstudxml-vc10.vcxproj.filters
diff --git a/xml/libstudxml-vc11.vcxproj b/libstudxml/libstudxml-vc11.vcxproj
index 54b59a2..54b59a2 100644
--- a/xml/libstudxml-vc11.vcxproj
+++ b/libstudxml/libstudxml-vc11.vcxproj
diff --git a/xml/libstudxml-vc11.vcxproj.filters b/libstudxml/libstudxml-vc11.vcxproj.filters
index 9b77026..9b77026 100644
--- a/xml/libstudxml-vc11.vcxproj.filters
+++ b/libstudxml/libstudxml-vc11.vcxproj.filters
diff --git a/xml/libstudxml-vc12.vcxproj b/libstudxml/libstudxml-vc12.vcxproj
index 664bb19..664bb19 100644
--- a/xml/libstudxml-vc12.vcxproj
+++ b/libstudxml/libstudxml-vc12.vcxproj
diff --git a/xml/libstudxml-vc12.vcxproj.filters b/libstudxml/libstudxml-vc12.vcxproj.filters
index b6093d3..b6093d3 100644
--- a/xml/libstudxml-vc12.vcxproj.filters
+++ b/libstudxml/libstudxml-vc12.vcxproj.filters
diff --git a/xml/libstudxml-vc9.vcproj b/libstudxml/libstudxml-vc9.vcproj
index 5502ab7..5502ab7 100644
--- a/xml/libstudxml-vc9.vcproj
+++ b/libstudxml/libstudxml-vc9.vcproj
diff --git a/xml/makefile b/libstudxml/makefile
index ca9d63c..ca9d63c 100644
--- a/xml/makefile
+++ b/libstudxml/makefile
diff --git a/xml/parser.cxx b/libstudxml/parser.cxx
index 2091939..343d492 100644
--- a/xml/parser.cxx
+++ b/libstudxml/parser.cxx
@@ -1,4 +1,4 @@
-// file      : xml/parser.cxx
+// file      : libstudxml/parser.cxx
 // copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
@@ -9,7 +9,7 @@
 #include <ostream>
 #include <sstream>
 
-#include <xml/parser>
+#include <libstudxml/parser.hxx>
 
 using namespace std;
 
diff --git a/xml/parser b/libstudxml/parser.hxx
index 32c49bc..57a8cdb 100644
--- a/xml/parser
+++ b/libstudxml/parser.hxx
@@ -1,11 +1,11 @@
-// file      : xml/parser -*- C++ -*-
+// file      : libstudxml/parser.hxx -*- C++ -*-
 // copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef XML_PARSER
-#define XML_PARSER
+#ifndef LIBSTUDXML_PARSER_HXX
+#define LIBSTUDXML_PARSER_HXX
 
-#include <xml/details/pre.hxx>
+#include <libstudxml/details/pre.hxx>
 
 #include <map>
 #include <vector>
@@ -13,11 +13,11 @@
 #include <iosfwd>
 #include <cstddef> // std::size_t
 
-#include <xml/details/config.hxx> // STUDXML_NOTHROW_NOEXCEPT,
-                                  // LIBSTUDXML_EXTERNAL_EXPAT
+#include <libstudxml/details/config.hxx> // STUDXML_NOTHROW_NOEXCEPT,
+                                         // LIBSTUDXML_EXTERNAL_EXPAT
 
 #ifndef LIBSTUDXML_EXTERNAL_EXPAT
-#  include <xml/details/expat/expat.h>
+#  include <libstudxml/details/expat/expat.h>
 #else
 #  include <expat.h>
 #endif
@@ -28,12 +28,12 @@
 #  error UTF-16 expat (XML_UNICODE defined) is not supported
 #endif
 
-#include <xml/forward>
-#include <xml/qname>
-#include <xml/content>
-#include <xml/exception>
+#include <libstudxml/forward.hxx>
+#include <libstudxml/qname.hxx>
+#include <libstudxml/content.hxx>
+#include <libstudxml/exception.hxx>
 
-#include <xml/details/export.hxx>
+#include <libstudxml/details/export.hxx>
 
 namespace xml
 {
@@ -464,9 +464,9 @@ namespace xml
   operator<< (std::ostream&, parser::event_type);
 }
 
-#include <xml/parser.ixx>
-#include <xml/parser.txx>
+#include <libstudxml/parser.ixx>
+#include <libstudxml/parser.txx>
 
-#include <xml/details/post.hxx>
+#include <libstudxml/details/post.hxx>
 
-#endif // XML_PARSER
+#endif // LIBSTUDXML_PARSER_HXX
diff --git a/xml/parser.ixx b/libstudxml/parser.ixx
index 093f90f..bda82e5 100644
--- a/xml/parser.ixx
+++ b/libstudxml/parser.ixx
@@ -1,10 +1,10 @@
-// file      : xml/parser.ixx
+// file      : libstudxml/parser.ixx
 // copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
 #include <cassert>
 
-#include <xml/value-traits>
+#include <libstudxml/value-traits.hxx>
 
 namespace xml
 {
diff --git a/xml/parser.txx b/libstudxml/parser.txx
index 2212876..11f9e7d 100644
--- a/xml/parser.txx
+++ b/libstudxml/parser.txx
@@ -1,8 +1,8 @@
-// file      : xml/parser.txx
+// file      : libstudxml/parser.txx
 // copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#include <xml/value-traits>
+#include <libstudxml/value-traits.hxx>
 
 namespace xml
 {
diff --git a/xml/qname.cxx b/libstudxml/qname.cxx
index 8bbc1ea..3049344 100644
--- a/xml/qname.cxx
+++ b/libstudxml/qname.cxx
@@ -1,10 +1,10 @@
-// file      : xml/qname.cxx
+// file      : libstudxml/qname.cxx
 // copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
 #include <ostream>
 
-#include <xml/qname>
+#include <libstudxml/qname.hxx>
 
 using namespace std;
 
diff --git a/xml/qname b/libstudxml/qname.hxx
index e49eb29..9014409 100644
--- a/xml/qname
+++ b/libstudxml/qname.hxx
@@ -1,18 +1,18 @@
-// file      : xml/qname -*- C++ -*-
+// file      : libstudxml/qname.hxx -*- C++ -*-
 // copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef XML_QNAME
-#define XML_QNAME
+#ifndef LIBSTUDXML_QNAME_HXX
+#define LIBSTUDXML_QNAME_HXX
 
-#include <xml/details/pre.hxx>
+#include <libstudxml/details/pre.hxx>
 
 #include <string>
 #include <iosfwd>
 
-#include <xml/forward>
+#include <libstudxml/forward.hxx>
 
-#include <xml/details/export.hxx>
+#include <libstudxml/details/export.hxx>
 
 namespace xml
 {
@@ -81,6 +81,6 @@ namespace xml
   operator<< (std::ostream&, const qname&);
 }
 
-#include <xml/details/post.hxx>
+#include <libstudxml/details/post.hxx>
 
-#endif // XML_QNAME
+#endif // LIBSTUDXML_QNAME_HXX
diff --git a/xml/serializer.cxx b/libstudxml/serializer.cxx
index 33062b0..1a01d86 100644
--- a/xml/serializer.cxx
+++ b/libstudxml/serializer.cxx
@@ -1,11 +1,11 @@
-// file      : xml/serializer.cxx
+// file      : libstudxml/serializer.cxx
 // copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
 #include <new>     // std::bad_alloc
 #include <cstring> // std::strlen
 
-#include <xml/serializer>
+#include <libstudxml/serializer.hxx>
 
 using namespace std;
 
diff --git a/xml/serializer b/libstudxml/serializer.hxx
index 22ab3a2..cbf5b72 100644
--- a/xml/serializer
+++ b/libstudxml/serializer.hxx
@@ -1,24 +1,24 @@
-// file      : xml/serializer -*- C++ -*-
+// file      : libstudxml/serializer.hxx -*- C++ -*-
 // copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef XML_SERIALIZER
-#define XML_SERIALIZER
+#ifndef LIBSTUDXML_SERIALIZER_HXX
+#define LIBSTUDXML_SERIALIZER_HXX
 
-#include <xml/details/pre.hxx>
+#include <libstudxml/details/pre.hxx>
 
 #include <string>
 #include <ostream>
 #include <cstddef> // std::size_t
 
-#include <xml/details/genx/genx.h>
+#include <libstudxml/details/genx/genx.h>
 
-#include <xml/forward>
-#include <xml/qname>
-#include <xml/exception>
+#include <libstudxml/forward.hxx>
+#include <libstudxml/qname.hxx>
+#include <libstudxml/exception.hxx>
 
-#include <xml/details/config.hxx> // STUDXML_NOTHROW_NOEXCEPT
-#include <xml/details/export.hxx>
+#include <libstudxml/details/config.hxx> // STUDXML_NOTHROW_NOEXCEPT
+#include <libstudxml/details/export.hxx>
 
 namespace xml
 {
@@ -300,8 +300,8 @@ namespace xml
   operator<< (serializer&, const T& value);
 }
 
-#include <xml/serializer.ixx>
+#include <libstudxml/serializer.ixx>
 
-#include <xml/details/post.hxx>
+#include <libstudxml/details/post.hxx>
 
-#endif // XML_SERIALIZER
+#endif // LIBSTUDXML_SERIALIZER_HXX
diff --git a/xml/serializer.ixx b/libstudxml/serializer.ixx
index a94dc4c..805ccb3 100644
--- a/xml/serializer.ixx
+++ b/libstudxml/serializer.ixx
@@ -1,8 +1,8 @@
-// file      : xml/serializer.ixx
+// file      : libstudxml/serializer.ixx
 // copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#include <xml/value-traits>
+#include <libstudxml/value-traits.hxx>
 
 namespace xml
 {
diff --git a/xml/value-traits.cxx b/libstudxml/value-traits.cxx
index a6ba89c..ab2f49d 100644
--- a/xml/value-traits.cxx
+++ b/libstudxml/value-traits.cxx
@@ -1,8 +1,8 @@
-// file      : xml/value-traits.cxx
+// file      : libstudxml/value-traits.cxx
 // copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#include <xml/parser>
+#include <libstudxml/parser.hxx>
 
 using namespace std;
 
diff --git a/xml/value-traits b/libstudxml/value-traits.hxx
index eda91bf..08590e2 100644
--- a/xml/value-traits
+++ b/libstudxml/value-traits.hxx
@@ -1,18 +1,18 @@
-// file      : xml/value-traits -*- C++ -*-
+// file      : libstudxml/value-traits.hxx -*- C++ -*-
 // copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef XML_VALUE_TRAITS
-#define XML_VALUE_TRAITS
+#ifndef LIBSTUDXML_VALUE_TRAITS_HXX
+#define LIBSTUDXML_VALUE_TRAITS_HXX
 
-#include <xml/details/pre.hxx>
+#include <libstudxml/details/pre.hxx>
 
 #include <string>
 #include <cstddef> // std::size_t
 
-#include <xml/forward>
+#include <libstudxml/forward.hxx>
 
-#include <xml/details/export.hxx>
+#include <libstudxml/details/export.hxx>
 
 namespace xml
 {
@@ -62,8 +62,8 @@ namespace xml
   struct value_traits<T[N]>: default_value_traits<const T*> {};
 }
 
-#include <xml/value-traits.txx>
+#include <libstudxml/value-traits.txx>
 
-#include <xml/details/post.hxx>
+#include <libstudxml/details/post.hxx>
 
-#endif // XML_VALUE_TRAITS
+#endif // LIBSTUDXML_VALUE_TRAITS_HXX
diff --git a/xml/value-traits.txx b/libstudxml/value-traits.txx
index 5bf5678..0e4d4df 100644
--- a/xml/value-traits.txx
+++ b/libstudxml/value-traits.txx
@@ -1,11 +1,11 @@
-// file      : xml/value-traits.txx
+// file      : libstudxml/value-traits.txx
 // copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
 #include <sstream>
 
-#include <xml/parser>
-#include <xml/serializer>
+#include <libstudxml/parser.hxx>
+#include <libstudxml/serializer.hxx>
 
 namespace xml
 {
diff --git a/xml/version.in b/libstudxml/version.hxx.in
index eec5513..3ff0286 100644
--- a/xml/version.in
+++ b/libstudxml/version.hxx.in
@@ -1,4 +1,4 @@
-// file      : xml/version.in -*- C++ -*-
+// file      : libstudxml/version.hxx.in -*- C++ -*-
 // copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/tests/.gitignore b/tests/.gitignore
index e54525b..2e508a9 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1 +1,3 @@
 driver
+test/
+test-*/
diff --git a/tests/build/root.build b/tests/build/root.build
index c9293bf..c93bac1 100644
--- a/tests/build/root.build
+++ b/tests/build/root.build
@@ -6,7 +6,7 @@ cxx.std = 11
 
 using cxx
 
-hxx{*}: extension =
+hxx{*}: extension = hxx
 cxx{*}: extension = cxx
 
 # Every exe{} in this subproject is by default a test.
diff --git a/tests/parser/driver.cxx b/tests/parser/driver.cxx
index 85f8e5a..c144f22 100644
--- a/tests/parser/driver.cxx
+++ b/tests/parser/driver.cxx
@@ -12,7 +12,7 @@
 #include <iostream>
 #include <sstream>
 
-#include <xml/parser>
+#include <libstudxml/parser.hxx>
 
 using namespace std;
 using namespace xml;
diff --git a/tests/roundtrip/driver.cxx b/tests/roundtrip/driver.cxx
index b056eeb..856b956 100644
--- a/tests/roundtrip/driver.cxx
+++ b/tests/roundtrip/driver.cxx
@@ -7,8 +7,8 @@
 #include <cassert>
 #include <iostream>
 
-#include <xml/parser>
-#include <xml/serializer>
+#include <libstudxml/parser.hxx>
+#include <libstudxml/serializer.hxx>
 
 using namespace std;
 using namespace xml;
diff --git a/tests/serializer/driver.cxx b/tests/serializer/driver.cxx
index 78040ca..554a721 100644
--- a/tests/serializer/driver.cxx
+++ b/tests/serializer/driver.cxx
@@ -11,7 +11,7 @@
 #include <iostream>
 #include <sstream>
 
-#include <xml/serializer>
+#include <libstudxml/serializer.hxx>
 
 using namespace std;
 using namespace xml;
diff --git a/xml/exception b/xml/exception
deleted file mode 100644
index 557a475..0000000
--- a/xml/exception
+++ /dev/null
@@ -1,19 +0,0 @@
-// file      : xml/exception -*- C++ -*-
-// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef XML_EXCEPTION
-#define XML_EXCEPTION
-
-#include <xml/details/pre.hxx>
-
-#include <exception>
-
-namespace xml
-{
-  class exception: public std::exception {};
-}
-
-#include <xml/details/post.hxx>
-
-#endif // XML_EXCEPTION
diff --git a/xml/forward b/xml/forward
deleted file mode 100644
index 6b4fef5..0000000
--- a/xml/forward
+++ /dev/null
@@ -1,22 +0,0 @@
-// file      : xml/forward -*- C++ -*-
-// copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef XML_FORWARD
-#define XML_FORWARD
-
-#include <xml/details/pre.hxx>
-
-#include <xml/version>
-
-namespace xml
-{
-  class qname;
-  class parser;
-  class serializer;
-  class exception;
-}
-
-#include <xml/details/post.hxx>
-
-#endif // XML_FORWARD