101 files changed, 609 insertions, 606 deletions

diff --git a/bpkg/.gitignore b/bpkg/.gitignore
index dde5e32..f72601d 100644
--- a/bpkg/.gitignore
+++ b/bpkg/.gitignore
@@ -1,8 +1,6 @@
 bpkg
-*-options
 *-options.?xx
-*-odb
 *-odb.?xx
-repository-signing
+repository-signing.hxx
 repository-signing.cxx
-version-impl
+version.hxx
diff --git a/bpkg/archive.cxx b/bpkg/archive.cxx
index 54ab8ea..4ad996f 100644
--- a/bpkg/archive.cxx
+++ b/bpkg/archive.cxx
@@ -2,12 +2,12 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/archive>
+#include <bpkg/archive.hxx>
 
 #include <butl/process>
 #include <butl/fdstream>
 
-#include <bpkg/diagnostics>
+#include <bpkg/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/archive b/bpkg/archive.hxx
index 1f33538..44f7a7b 100644
--- a/bpkg/archive
+++ b/bpkg/archive.hxx
@@ -1,16 +1,16 @@
-// file      : bpkg/archive -*- C++ -*-
+// file      : bpkg/archive.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_ARCHIVE
-#define BPKG_ARCHIVE
+#ifndef BPKG_ARCHIVE_HXX
+#define BPKG_ARCHIVE_HXX
 
 #include <butl/process>
 
-#include <bpkg/types>
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
 
-#include <bpkg/common-options>
+#include <bpkg/common-options.hxx>
 
 namespace bpkg
 {
@@ -37,4 +37,4 @@ namespace bpkg
   extract (const common_options&, const path& archive, const path& file);
 }
 
-#endif // BPKG_ARCHIVE
+#endif // BPKG_ARCHIVE_HXX
diff --git a/bpkg/auth.cxx b/bpkg/auth.cxx
index bafc321..7cba934 100644
--- a/bpkg/auth.cxx
+++ b/bpkg/auth.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/auth>
+#include <bpkg/auth.hxx>
 
 #include <ratio>
 #include <limits>    // numeric_limits
@@ -15,11 +15,11 @@
 #include <butl/fdstream>
 #include <butl/filesystem>
 
-#include <bpkg/openssl>
-#include <bpkg/package>
-#include <bpkg/package-odb>
-#include <bpkg/database>
-#include <bpkg/diagnostics>
+#include <bpkg/openssl.hxx>
+#include <bpkg/package.hxx>
+#include <bpkg/package-odb.hxx>
+#include <bpkg/database.hxx>
+#include <bpkg/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/auth b/bpkg/auth.hxx
index 5c32824..90f60e4 100644
--- a/bpkg/auth
+++ b/bpkg/auth.hxx
@@ -1,17 +1,17 @@
-// file      : bpkg/auth -*- C++ -*-
+// file      : bpkg/auth.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_AUTH
-#define BPKG_AUTH
+#ifndef BPKG_AUTH_HXX
+#define BPKG_AUTH_HXX
 
-#include <bpkg/manifest>
+#include <libbpkg/manifest.hxx>
 
-#include <bpkg/types>
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
 
-#include <bpkg/package>
-#include <bpkg/common-options>
+#include <bpkg/package.hxx>
+#include <bpkg/common-options.hxx>
 
 namespace bpkg
 {
@@ -101,4 +101,4 @@ namespace bpkg
                      const repository_location&);
 }
 
-#endif // BPKG_AUTH
+#endif // BPKG_AUTH_HXX
diff --git a/bpkg/bpkg.cxx b/bpkg/bpkg.cxx
index e78e732..86f86db 100644
--- a/bpkg/bpkg.cxx
+++ b/bpkg/bpkg.cxx
@@ -11,37 +11,37 @@
 #include <cstring>   // strcmp()
 #include <iostream>
 
-#include <bpkg/types>
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
 
-#include <bpkg/diagnostics>
-#include <bpkg/bpkg-options>
+#include <bpkg/diagnostics.hxx>
+#include <bpkg/bpkg-options.hxx>
 
 // Commands.
 //
-#include <bpkg/help>
-
-#include <bpkg/cfg-create>
-
-#include <bpkg/pkg-build>
-#include <bpkg/pkg-clean>
-#include <bpkg/pkg-configure>
-#include <bpkg/pkg-disfigure>
-#include <bpkg/pkg-drop>
-#include <bpkg/pkg-fetch>
-#include <bpkg/pkg-install>
-#include <bpkg/pkg-purge>
-#include <bpkg/pkg-status>
-#include <bpkg/pkg-test>
-#include <bpkg/pkg-uninstall>
-#include <bpkg/pkg-unpack>
-#include <bpkg/pkg-update>
-#include <bpkg/pkg-verify>
-
-#include <bpkg/rep-add>
-#include <bpkg/rep-create>
-#include <bpkg/rep-fetch>
-#include <bpkg/rep-info>
+#include <bpkg/help.hxx>
+
+#include <bpkg/cfg-create.hxx>
+
+#include <bpkg/pkg-build.hxx>
+#include <bpkg/pkg-clean.hxx>
+#include <bpkg/pkg-configure.hxx>
+#include <bpkg/pkg-disfigure.hxx>
+#include <bpkg/pkg-drop.hxx>
+#include <bpkg/pkg-fetch.hxx>
+#include <bpkg/pkg-install.hxx>
+#include <bpkg/pkg-purge.hxx>
+#include <bpkg/pkg-status.hxx>
+#include <bpkg/pkg-test.hxx>
+#include <bpkg/pkg-uninstall.hxx>
+#include <bpkg/pkg-unpack.hxx>
+#include <bpkg/pkg-update.hxx>
+#include <bpkg/pkg-verify.hxx>
+
+#include <bpkg/rep-add.hxx>
+#include <bpkg/rep-create.hxx>
+#include <bpkg/rep-fetch.hxx>
+#include <bpkg/rep-info.hxx>
 
 using namespace std;
 using namespace bpkg;
diff --git a/bpkg/buildfile b/bpkg/buildfile
index 1ed635b..b7532f5 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -50,12 +50,12 @@ exe{bpkg}:                                                                    \
 {hxx            }{ types             }                                        \
 {hxx         cxx}{ types-parsers     }                                        \
 {hxx         cxx}{ utility           }                                        \
-{hxx            }{ version-impl      }                                        \
+{hxx            }{ version           }                                        \
 {hxx            }{ wrapper-traits    }                                        \
                    $libs
 
-hxx{version-impl}: in{version-impl} $src_root/file{manifest}
-hxx{version-impl}: dist = true
+hxx{version}: in{version} $src_root/file{manifest}
+hxx{version}: dist = true
 
 # Disable "unknown pragma" warnings.
 #
@@ -114,7 +114,7 @@ if $cli.configured
   # Option length must be the same to get commands/topics/options aligned.
   #
   cli.options += -I $src_root --include-with-brackets --include-prefix bpkg \
---guard-prefix BPKG --cxx-prologue "#include <bpkg/types-parsers>" \
+--guard-prefix BPKG --cxx-prologue "#include <bpkg/types-parsers.hxx>" \
 --cli-namespace bpkg::cli --generate-vector-scanner --generate-file-scanner \
 --generate-specifier --generate-parse --page-usage 'bpkg::print_$name$_' \
 --ansi-color --include-base-last --option-length 23
diff --git a/bpkg/cfg-create b/bpkg/cfg-create
deleted file mode 100644
index 88247f2..0000000
--- a/bpkg/cfg-create
+++ /dev/null
@@ -1,19 +0,0 @@
-// file      : bpkg/cfg-create -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BPKG_CFG_CREATE
-#define BPKG_CFG_CREATE
-
-#include <bpkg/types>
-#include <bpkg/utility>
-
-#include <bpkg/cfg-create-options>
-
-namespace bpkg
-{
-  int
-  cfg_create (const cfg_create_options&, cli::scanner& args);
-}
-
-#endif // BPKG_CFG_CREATE
diff --git a/bpkg/cfg-create.cxx b/bpkg/cfg-create.cxx
index 9112871..6f12d55 100644
--- a/bpkg/cfg-create.cxx
+++ b/bpkg/cfg-create.cxx
@@ -2,14 +2,14 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/cfg-create>
+#include <bpkg/cfg-create.hxx>
 
 #include <butl/fdstream>
 
-#include <bpkg/package>
-#include <bpkg/package-odb>
-#include <bpkg/database>
-#include <bpkg/diagnostics>
+#include <bpkg/package.hxx>
+#include <bpkg/package-odb.hxx>
+#include <bpkg/database.hxx>
+#include <bpkg/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/cfg-create.hxx b/bpkg/cfg-create.hxx
new file mode 100644
index 0000000..e008fd8
--- /dev/null
+++ b/bpkg/cfg-create.hxx
@@ -0,0 +1,19 @@
+// file      : bpkg/cfg-create.hxx -*- C++ -*-
+// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BPKG_CFG_CREATE_HXX
+#define BPKG_CFG_CREATE_HXX
+
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
+
+#include <bpkg/cfg-create-options.hxx>
+
+namespace bpkg
+{
+  int
+  cfg_create (const cfg_create_options&, cli::scanner& args);
+}
+
+#endif // BPKG_CFG_CREATE_HXX
diff --git a/bpkg/checksum.cxx b/bpkg/checksum.cxx
index a76ab55..d70446b 100644
--- a/bpkg/checksum.cxx
+++ b/bpkg/checksum.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/checksum>
+#include <bpkg/checksum.hxx>
 
 #include <streambuf>
 
@@ -10,7 +10,7 @@
 #include <butl/fdstream>
 #include <butl/filesystem>
 
-#include <bpkg/diagnostics>
+#include <bpkg/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/checksum b/bpkg/checksum.hxx
index 002162b..ec5a82e 100644
--- a/bpkg/checksum
+++ b/bpkg/checksum.hxx
@@ -1,14 +1,14 @@
-// file      : bpkg/checksum -*- C++ -*-
+// file      : bpkg/checksum.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_CHECKSUM
-#define BPKG_CHECKSUM
+#ifndef BPKG_CHECKSUM_HXX
+#define BPKG_CHECKSUM_HXX
 
-#include <bpkg/types>
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
 
-#include <bpkg/common-options>
+#include <bpkg/common-options.hxx>
 
 namespace bpkg
 {
@@ -29,4 +29,4 @@ namespace bpkg
   sha256 (const common_options&, const path& file);
 }
 
-#endif // BPKG_CHECKSUM
+#endif // BPKG_CHECKSUM_HXX
diff --git a/bpkg/common.cli b/bpkg/common.cli
index 8b99038..45d13d3 100644
--- a/bpkg/common.cli
+++ b/bpkg/common.cli
@@ -4,8 +4,8 @@
 
 include <set>;
 
-include <bpkg/types>;
-include <bpkg/options-types>;
+include <bpkg/types.hxx>;
+include <bpkg/options-types.hxx>;
 
 "\section=1"
 "\name=bpkg-common-options"
diff --git a/bpkg/database.cxx b/bpkg/database.cxx
index 4b5aad9..a590eca 100644
--- a/bpkg/database.cxx
+++ b/bpkg/database.cxx
@@ -2,15 +2,15 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/database>
+#include <bpkg/database.hxx>
 
 #include <odb/schema-catalog.hxx>
 #include <odb/sqlite/exceptions.hxx>
 
-#include <bpkg/package>
-#include <bpkg/package-odb>
-#include <bpkg/diagnostics>
-#include <bpkg/system-repository>
+#include <bpkg/package.hxx>
+#include <bpkg/package-odb.hxx>
+#include <bpkg/diagnostics.hxx>
+#include <bpkg/system-repository.hxx>
 
 using namespace std;
 
diff --git a/bpkg/database b/bpkg/database.hxx
index aa32d5c..f90aa6b 100644
--- a/bpkg/database
+++ b/bpkg/database.hxx
@@ -1,9 +1,9 @@
-// file      : bpkg/database -*- C++ -*-
+// file      : bpkg/database.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_DATABASE
-#define BPKG_DATABASE
+#ifndef BPKG_DATABASE_HXX
+#define BPKG_DATABASE_HXX
 
 #include <type_traits> // remove_reference
 
@@ -13,10 +13,10 @@
 
 #include <odb/sqlite/database.hxx>
 
-#include <bpkg/types>
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
 
-#include <bpkg/diagnostics>
+#include <bpkg/diagnostics.hxx>
 
 namespace bpkg
 {
@@ -79,4 +79,4 @@ namespace bpkg
   }
 }
 
-#endif // BPKG_DATABASE
+#endif // BPKG_DATABASE_HXX
diff --git a/bpkg/diagnostics.cxx b/bpkg/diagnostics.cxx
index c15d7d5..9eaf118 100644
--- a/bpkg/diagnostics.cxx
+++ b/bpkg/diagnostics.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/diagnostics>
+#include <bpkg/diagnostics.hxx>
 
 #include <cstring>  // strchr()
 #include <iostream>
diff --git a/bpkg/diagnostics b/bpkg/diagnostics.hxx
index a1a785f..64eecd9 100644
--- a/bpkg/diagnostics
+++ b/bpkg/diagnostics.hxx
@@ -1,16 +1,16 @@
-// file      : bpkg/diagnostics -*- C++ -*-
+// file      : bpkg/diagnostics.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_DIAGNOSTICS
-#define BPKG_DIAGNOSTICS
+#ifndef BPKG_DIAGNOSTICS_HXX
+#define BPKG_DIAGNOSTICS_HXX
 
 #include <odb/tracer.hxx>
 
 #include <butl/diagnostics>
 
-#include <bpkg/types>
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
 
 namespace bpkg
 {
@@ -237,4 +237,4 @@ namespace bpkg
   extern const fail_end  endf;
 }
 
-#endif // BPKG_DIAGNOSTICS
+#endif // BPKG_DIAGNOSTICS_HXX
diff --git a/bpkg/fetch.cxx b/bpkg/fetch.cxx
index 6fe851e..71be02b 100644
--- a/bpkg/fetch.cxx
+++ b/bpkg/fetch.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/fetch>
+#include <bpkg/fetch.hxx>
 
 #include <sstream>
 
@@ -11,8 +11,8 @@
 #include <butl/filesystem>
 #include <butl/manifest-parser>
 
-#include <bpkg/checksum>
-#include <bpkg/diagnostics>
+#include <bpkg/checksum.hxx>
+#include <bpkg/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/fetch b/bpkg/fetch.hxx
index d85bf9b..e047f29 100644
--- a/bpkg/fetch
+++ b/bpkg/fetch.hxx
@@ -1,16 +1,16 @@
-// file      : bpkg/fetch -*- C++ -*-
+// file      : bpkg/fetch.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_FETCH
-#define BPKG_FETCH
+#ifndef BPKG_FETCH_HXX
+#define BPKG_FETCH_HXX
 
-#include <bpkg/manifest>
+#include <libbpkg/manifest.hxx>
 
-#include <bpkg/types>
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
 
-#include <bpkg/common-options>
+#include <bpkg/common-options.hxx>
 
 namespace bpkg
 {
@@ -42,4 +42,4 @@ namespace bpkg
                  const dir_path& destdir);
 }
 
-#endif // BPKG_FETCH
+#endif // BPKG_FETCH_HXX
diff --git a/bpkg/forward b/bpkg/forward.hxx
index b91e282..cb49926 100644
--- a/bpkg/forward
+++ b/bpkg/forward.hxx
@@ -1,9 +1,9 @@
-// file      : bpkg/forward -*- C++ -*-
+// file      : bpkg/forward.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_FORWARD
-#define BPKG_FORWARD
+#ifndef BPKG_FORWARD_HXX
+#define BPKG_FORWARD_HXX
 
 #include <odb/sqlite/forward.hxx>
 
@@ -12,9 +12,9 @@ namespace bpkg
   using odb::sqlite::database;
   using odb::sqlite::transaction;
 
-  // <bpkg/package>
+  // <bpkg/package.hxx>
   //
   class selected_package;
 }
 
-#endif // BPKG_FORWARD
+#endif // BPKG_FORWARD_HXX
diff --git a/bpkg/help.cxx b/bpkg/help.cxx
index 133c08e..61152b3 100644
--- a/bpkg/help.cxx
+++ b/bpkg/help.cxx
@@ -2,16 +2,16 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/help>
+#include <bpkg/help.hxx>
 
 #include <butl/pager>
 
-#include <bpkg/diagnostics>
-#include <bpkg/bpkg-options>
+#include <bpkg/diagnostics.hxx>
+#include <bpkg/bpkg-options.hxx>
 
 // Help topics.
 //
-#include <bpkg/repository-signing>
+#include <bpkg/repository-signing.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/help b/bpkg/help.hxx
index 99c261b..b8096d5 100644
--- a/bpkg/help
+++ b/bpkg/help.hxx
@@ -1,14 +1,14 @@
-// file      : bpkg/help -*- C++ -*-
+// file      : bpkg/help.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_HELP
-#define BPKG_HELP
+#ifndef BPKG_HELP_HXX
+#define BPKG_HELP_HXX
 
-#include <bpkg/types>
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
 
-#include <bpkg/help-options>
+#include <bpkg/help-options.hxx>
 
 namespace bpkg
 {
@@ -18,4 +18,4 @@ namespace bpkg
   help (const help_options&, const string& topic, usage_function* usage);
 }
 
-#endif // BPKG_HELP
+#endif // BPKG_HELP_HXX
diff --git a/bpkg/manifest-utility.cxx b/bpkg/manifest-utility.cxx
index c8fb6e9..850ce59 100644
--- a/bpkg/manifest-utility.cxx
+++ b/bpkg/manifest-utility.cxx
@@ -2,9 +2,9 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/manifest-utility>
+#include <bpkg/manifest-utility.hxx>
 
-#include <bpkg/diagnostics>
+#include <bpkg/diagnostics.hxx>
 
 using namespace std;
 
diff --git a/bpkg/manifest-utility b/bpkg/manifest-utility.hxx
index c6d9ab8..afa93f5 100644
--- a/bpkg/manifest-utility
+++ b/bpkg/manifest-utility.hxx
@@ -1,14 +1,14 @@
-// file      : bpkg/manifest-utility -*- C++ -*-
+// file      : bpkg/manifest-utility.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_MANIFEST_UTILITY
-#define BPKG_MANIFEST_UTILITY
+#ifndef BPKG_MANIFEST_UTILITY_HXX
+#define BPKG_MANIFEST_UTILITY_HXX
 
-#include <bpkg/manifest>
+#include <libbpkg/manifest.hxx>
 
-#include <bpkg/types>
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
 
 namespace bpkg
 {
@@ -42,4 +42,4 @@ namespace bpkg
   parse_location (const char*);
 }
 
-#endif // BPKG_MANIFEST_UTILITY
+#endif // BPKG_MANIFEST_UTILITY_HXX
diff --git a/bpkg/odb.sh b/bpkg/odb.sh
index 1d8b66a..776cccb 100755
--- a/bpkg/odb.sh
+++ b/bpkg/odb.sh
@@ -9,9 +9,10 @@ lib="\
 -I$HOME/work/odb/libodb-default \
 -I$HOME/work/odb/libodb"
 
-$odb $lib -I.. -I../../libbpkg -I../../libbutl \
-  -d sqlite --std c++11 --hxx-suffix "" --generate-query --generate-schema \
-  --odb-epilogue '#include <bpkg/wrapper-traits>' \
-  --hxx-prologue '#include <bpkg/wrapper-traits>' \
-  --include-with-brackets --include-prefix bpkg --guard-prefix BPKG \
-  --sqlite-override-null package
+$odb $lib -I.. -I../../libbpkg -I../../libbutl                        \
+    -DLIBODB_BUILD2 -DLIBODB_SQLITE_BUILD2 --generate-schema          \
+    -d sqlite --std c++11 --hxx-suffix ".hxx" --generate-query        \
+    --odb-epilogue '#include <bpkg/wrapper-traits.hxx>'               \
+    --hxx-prologue '#include <bpkg/wrapper-traits.hxx>'               \
+    --include-with-brackets --include-prefix bpkg --guard-prefix BPKG \
+    --sqlite-override-null package.hxx
diff --git a/bpkg/openssl.cxx b/bpkg/openssl.cxx
index 01f07a0..e8de30b 100644
--- a/bpkg/openssl.cxx
+++ b/bpkg/openssl.cxx
@@ -2,11 +2,11 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/openssl>
+#include <bpkg/openssl.hxx>
 
 #include <butl/process>
 
-#include <bpkg/diagnostics>
+#include <bpkg/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/openssl b/bpkg/openssl.hxx
index c665521..30671ae 100644
--- a/bpkg/openssl
+++ b/bpkg/openssl.hxx
@@ -1,16 +1,16 @@
-// file      : bpkg/openssl -*- C++ -*-
+// file      : bpkg/openssl.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_OPENSSL
-#define BPKG_OPENSSL
+#ifndef BPKG_OPENSSL_HXX
+#define BPKG_OPENSSL_HXX
 
 #include <butl/process>
 
-#include <bpkg/types>
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
 
-#include <bpkg/common-options>
+#include <bpkg/common-options.hxx>
 
 namespace bpkg
 {
@@ -28,4 +28,4 @@ namespace bpkg
                  bool err = false);
 }
 
-#endif // BPKG_OPENSSL
+#endif // BPKG_OPENSSL_HXX
diff --git a/bpkg/options-types b/bpkg/options-types.hxx
index b252191..093f25d 100644
--- a/bpkg/options-types
+++ b/bpkg/options-types.hxx
@@ -1,9 +1,9 @@
-// file      : bpkg/options-types -*- C++ -*-
+// file      : bpkg/options-types.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_OPTIONS_TYPES
-#define BPKG_OPTIONS_TYPES
+#ifndef BPKG_OPTIONS_TYPES_HXX
+#define BPKG_OPTIONS_TYPES_HXX
 
 namespace bpkg
 {
@@ -15,4 +15,4 @@ namespace bpkg
   };
 }
 
-#endif // BPKG_OPTIONS_TYPES
+#endif // BPKG_OPTIONS_TYPES_HXX
diff --git a/bpkg/package.cxx b/bpkg/package.cxx
index 37ed214..1c98f42 100644
--- a/bpkg/package.cxx
+++ b/bpkg/package.cxx
@@ -2,10 +2,10 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/package>
-#include <bpkg/package-odb>
+#include <bpkg/package.hxx>
+#include <bpkg/package-odb.hxx>
 
-#include <bpkg/database>
+#include <bpkg/database.hxx>
 
 using namespace std;
 
diff --git a/bpkg/package b/bpkg/package.hxx
index 0bf0a41..bd45e9c 100644
--- a/bpkg/package
+++ b/bpkg/package.hxx
@@ -1,9 +1,9 @@
-// file      : bpkg/package -*- C++ -*-
+// file      : bpkg/package.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_PACKAGE
-#define BPKG_PACKAGE
+#ifndef BPKG_PACKAGE_HXX
+#define BPKG_PACKAGE_HXX
 
 #include <map>
 #include <set>
@@ -16,8 +16,8 @@
 
 #include <butl/timestamp>
 
-#include <bpkg/types>
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
 
 #pragma db model version(3, 3, closed)
 
@@ -80,7 +80,7 @@ namespace bpkg
 
   // An image type that is used to map version to the database since
   // there is no way to modify individual components directly. We have
-  // to define it before including <bpkg/manifest> since some value
+  // to define it before including <libbpkg/manifest.hxx> since some value
   // types that are defined there use version as their data members.
   //
   #pragma db value
@@ -95,14 +95,15 @@ namespace bpkg
   };
 }
 
-#include <bpkg/manifest>
-#include <bpkg/system-repository>
+#include <libbpkg/manifest.hxx>
+
+#include <bpkg/system-repository.hxx>
 
 // Prevent assert() macro expansion in get/set expressions. This should
 // appear after all #include directives since the assert() macro is
 // redefined in each <assert.h> inclusion.
 //
-#ifdef ODB_COMPILER
+#ifdef ODB_COMPILER_HXX
 #  undef assert
 #  define assert assert
 void assert (int);
@@ -913,4 +914,4 @@ namespace bpkg
 
 #include <bpkg/package.ixx>
 
-#endif // BPKG_PACKAGE
+#endif // BPKG_PACKAGE_HXX
diff --git a/bpkg/pkg-build b/bpkg/pkg-build
deleted file mode 100644
index 2566965..0000000
--- a/bpkg/pkg-build
+++ /dev/null
@@ -1,19 +0,0 @@
-// file      : bpkg/pkg-build -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BPKG_PKG_BUILD
-#define BPKG_PKG_BUILD
-
-#include <bpkg/types>
-#include <bpkg/utility>
-
-#include <bpkg/pkg-build-options>
-
-namespace bpkg
-{
-  int
-  pkg_build (const pkg_build_options&, cli::scanner& args);
-}
-
-#endif // BPKG_PKG_BUILD
diff --git a/bpkg/pkg-build.cxx b/bpkg/pkg-build.cxx
index 385ec81..de5c9c7 100644
--- a/bpkg/pkg-build.cxx
+++ b/bpkg/pkg-build.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/pkg-build>
+#include <bpkg/pkg-build.hxx>
 
 #include <map>
 #include <set>
@@ -11,24 +11,24 @@
 #include <iostream>   // cout
 #include <algorithm>  // find()
 
-#include <bpkg/package>
-#include <bpkg/package-odb>
-#include <bpkg/database>
-#include <bpkg/diagnostics>
-#include <bpkg/satisfaction>
-#include <bpkg/manifest-utility>
-
-#include <bpkg/common-options>
-
-#include <bpkg/pkg-drop>
-#include <bpkg/pkg-purge>
-#include <bpkg/pkg-fetch>
-#include <bpkg/pkg-unpack>
-#include <bpkg/pkg-update>
-#include <bpkg/pkg-verify>
-#include <bpkg/pkg-configure>
-#include <bpkg/pkg-disfigure>
-#include <bpkg/system-repository>
+#include <bpkg/package.hxx>
+#include <bpkg/package-odb.hxx>
+#include <bpkg/database.hxx>
+#include <bpkg/diagnostics.hxx>
+#include <bpkg/satisfaction.hxx>
+#include <bpkg/manifest-utility.hxx>
+
+#include <bpkg/common-options.hxx>
+
+#include <bpkg/pkg-drop.hxx>
+#include <bpkg/pkg-purge.hxx>
+#include <bpkg/pkg-fetch.hxx>
+#include <bpkg/pkg-unpack.hxx>
+#include <bpkg/pkg-update.hxx>
+#include <bpkg/pkg-verify.hxx>
+#include <bpkg/pkg-configure.hxx>
+#include <bpkg/pkg-disfigure.hxx>
+#include <bpkg/system-repository.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/pkg-build.hxx b/bpkg/pkg-build.hxx
new file mode 100644
index 0000000..429e613
--- /dev/null
+++ b/bpkg/pkg-build.hxx
@@ -0,0 +1,19 @@
+// file      : bpkg/pkg-build.hxx -*- C++ -*-
+// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BPKG_PKG_BUILD_HXX
+#define BPKG_PKG_BUILD_HXX
+
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
+
+#include <bpkg/pkg-build-options.hxx>
+
+namespace bpkg
+{
+  int
+  pkg_build (const pkg_build_options&, cli::scanner& args);
+}
+
+#endif // BPKG_PKG_BUILD_HXX
diff --git a/bpkg/pkg-clean b/bpkg/pkg-clean.hxx
index be8f4db..f1a983a 100644
--- a/bpkg/pkg-clean
+++ b/bpkg/pkg-clean.hxx
@@ -1,15 +1,15 @@
-// file      : bpkg/pkg-clean -*- C++ -*-
+// file      : bpkg/pkg-clean.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_PKG_CLEAN
-#define BPKG_PKG_CLEAN
+#ifndef BPKG_PKG_CLEAN_HXX
+#define BPKG_PKG_CLEAN_HXX
 
-#include <bpkg/types>
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
 
-#include <bpkg/pkg-command>
-#include <bpkg/pkg-clean-options>
+#include <bpkg/pkg-command.hxx>
+#include <bpkg/pkg-clean-options.hxx>
 
 namespace bpkg
 {
@@ -20,4 +20,4 @@ namespace bpkg
   }
 }
 
-#endif // BPKG_PKG_CLEAN
+#endif // BPKG_PKG_CLEAN_HXX
diff --git a/bpkg/pkg-command.cxx b/bpkg/pkg-command.cxx
index 6e6542f..980e593 100644
--- a/bpkg/pkg-command.cxx
+++ b/bpkg/pkg-command.cxx
@@ -2,12 +2,12 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/pkg-command>
+#include <bpkg/pkg-command.hxx>
 
-#include <bpkg/package>
-#include <bpkg/package-odb>
-#include <bpkg/database>
-#include <bpkg/diagnostics>
+#include <bpkg/package.hxx>
+#include <bpkg/package-odb.hxx>
+#include <bpkg/database.hxx>
+#include <bpkg/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/pkg-command b/bpkg/pkg-command.hxx
index 4706c59..de6ccf9 100644
--- a/bpkg/pkg-command
+++ b/bpkg/pkg-command.hxx
@@ -1,15 +1,15 @@
-// file      : bpkg/pkg-command -*- C++ -*-
+// file      : bpkg/pkg-command.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_PKG_COMMAND
-#define BPKG_PKG_COMMAND
+#ifndef BPKG_PKG_COMMAND_HXX
+#define BPKG_PKG_COMMAND_HXX
 
-#include <bpkg/types>
-#include <bpkg/forward> // selected_package
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/forward.hxx> // selected_package
+#include <bpkg/utility.hxx>
 
-#include <bpkg/configuration-options>
+#include <bpkg/configuration-options.hxx>
 
 namespace bpkg
 {
@@ -34,4 +34,4 @@ namespace bpkg
                const vector<pkg_command_vars>&);
 }
 
-#endif // BPKG_PKG_COMMAND
+#endif // BPKG_PKG_COMMAND_HXX
diff --git a/bpkg/pkg-configure.cxx b/bpkg/pkg-configure.cxx
index bc55be3..2ed51e5 100644
--- a/bpkg/pkg-configure.cxx
+++ b/bpkg/pkg-configure.cxx
@@ -2,17 +2,17 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/pkg-configure>
+#include <bpkg/pkg-configure.hxx>
 
-#include <bpkg/package>
-#include <bpkg/package-odb>
-#include <bpkg/database>
-#include <bpkg/diagnostics>
-#include <bpkg/satisfaction>
-#include <bpkg/manifest-utility>
+#include <bpkg/package.hxx>
+#include <bpkg/package-odb.hxx>
+#include <bpkg/database.hxx>
+#include <bpkg/diagnostics.hxx>
+#include <bpkg/satisfaction.hxx>
+#include <bpkg/manifest-utility.hxx>
 
-#include <bpkg/pkg-verify>
-#include <bpkg/pkg-disfigure>
+#include <bpkg/pkg-verify.hxx>
+#include <bpkg/pkg-disfigure.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/pkg-configure b/bpkg/pkg-configure.hxx
index 5867428..651daba 100644
--- a/bpkg/pkg-configure
+++ b/bpkg/pkg-configure.hxx
@@ -1,16 +1,16 @@
-// file      : bpkg/pkg-configure -*- C++ -*-
+// file      : bpkg/pkg-configure.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_PKG_CONFIGURE
-#define BPKG_PKG_CONFIGURE
+#ifndef BPKG_PKG_CONFIGURE_HXX
+#define BPKG_PKG_CONFIGURE_HXX
 
-#include <bpkg/types>
-#include <bpkg/forward> // transaction, selected_package
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/forward.hxx> // transaction, selected_package
+#include <bpkg/utility.hxx>
 
-#include <bpkg/package>
-#include <bpkg/pkg-configure-options>
+#include <bpkg/package.hxx>
+#include <bpkg/pkg-configure-options.hxx>
 
 namespace bpkg
 {
@@ -32,4 +32,4 @@ namespace bpkg
   pkg_configure_system (const string& name, const version&, transaction&);
 }
 
-#endif // BPKG_PKG_CONFIGURE
+#endif // BPKG_PKG_CONFIGURE_HXX
diff --git a/bpkg/pkg-disfigure.cxx b/bpkg/pkg-disfigure.cxx
index 09b3056..4c32d53 100644
--- a/bpkg/pkg-disfigure.cxx
+++ b/bpkg/pkg-disfigure.cxx
@@ -2,12 +2,12 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/pkg-disfigure>
+#include <bpkg/pkg-disfigure.hxx>
 
-#include <bpkg/package>
-#include <bpkg/package-odb>
-#include <bpkg/database>
-#include <bpkg/diagnostics>
+#include <bpkg/package.hxx>
+#include <bpkg/package-odb.hxx>
+#include <bpkg/database.hxx>
+#include <bpkg/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/pkg-disfigure b/bpkg/pkg-disfigure.hxx
index 6dfe60b..920fc7c 100644
--- a/bpkg/pkg-disfigure
+++ b/bpkg/pkg-disfigure.hxx
@@ -1,15 +1,15 @@
-// file      : bpkg/pkg-disfigure -*- C++ -*-
+// file      : bpkg/pkg-disfigure.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_PKG_DISFIGURE
-#define BPKG_PKG_DISFIGURE
+#ifndef BPKG_PKG_DISFIGURE_HXX
+#define BPKG_PKG_DISFIGURE_HXX
 
-#include <bpkg/types>
-#include <bpkg/forward> // transaction, selected_package
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/forward.hxx> // transaction, selected_package
+#include <bpkg/utility.hxx>
 
-#include <bpkg/pkg-disfigure-options>
+#include <bpkg/pkg-disfigure-options.hxx>
 
 namespace bpkg
 {
@@ -29,4 +29,4 @@ namespace bpkg
                  const shared_ptr<selected_package>&);
 }
 
-#endif // BPKG_PKG_DISFIGURE
+#endif // BPKG_PKG_DISFIGURE_HXX
diff --git a/bpkg/pkg-drop.cxx b/bpkg/pkg-drop.cxx
index 85ad897..4309b2e 100644
--- a/bpkg/pkg-drop.cxx
+++ b/bpkg/pkg-drop.cxx
@@ -2,23 +2,23 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/pkg-drop>
+#include <bpkg/pkg-drop.hxx>
 
 #include <map>
 #include <list>
 #include <iostream>   // cout
 
-#include <bpkg/package>
-#include <bpkg/package-odb>
-#include <bpkg/database>
-#include <bpkg/diagnostics>
-#include <bpkg/satisfaction>
-#include <bpkg/manifest-utility>
+#include <bpkg/package.hxx>
+#include <bpkg/package-odb.hxx>
+#include <bpkg/database.hxx>
+#include <bpkg/diagnostics.hxx>
+#include <bpkg/satisfaction.hxx>
+#include <bpkg/manifest-utility.hxx>
 
-#include <bpkg/common-options>
+#include <bpkg/common-options.hxx>
 
-#include <bpkg/pkg-purge>
-#include <bpkg/pkg-disfigure>
+#include <bpkg/pkg-purge.hxx>
+#include <bpkg/pkg-disfigure.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/pkg-drop b/bpkg/pkg-drop.hxx
index ffb7b35..b7e0be1 100644
--- a/bpkg/pkg-drop
+++ b/bpkg/pkg-drop.hxx
@@ -1,17 +1,17 @@
-// file      : bpkg/pkg-drop -*- C++ -*-
+// file      : bpkg/pkg-drop.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_PKG_DROP
-#define BPKG_PKG_DROP
+#ifndef BPKG_PKG_DROP_HXX
+#define BPKG_PKG_DROP_HXX
 
 #include <set>
 
-#include <bpkg/types>
-#include <bpkg/forward> // database, selected_package
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/forward.hxx> // database, selected_package
+#include <bpkg/utility.hxx>
 
-#include <bpkg/pkg-drop-options>
+#include <bpkg/pkg-drop-options.hxx>
 
 namespace bpkg
 {
@@ -30,4 +30,4 @@ namespace bpkg
             bool prompt);
 }
 
-#endif // BPKG_PKG_DROP
+#endif // BPKG_PKG_DROP_HXX
diff --git a/bpkg/pkg-fetch.cxx b/bpkg/pkg-fetch.cxx
index 9995db3..114a55d 100644
--- a/bpkg/pkg-fetch.cxx
+++ b/bpkg/pkg-fetch.cxx
@@ -2,20 +2,20 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/pkg-fetch>
+#include <bpkg/pkg-fetch.hxx>
 
-#include <bpkg/manifest>
+#include <libbpkg/manifest.hxx>
 
-#include <bpkg/fetch>
-#include <bpkg/package>
-#include <bpkg/package-odb>
-#include <bpkg/checksum>
-#include <bpkg/database>
-#include <bpkg/diagnostics>
-#include <bpkg/manifest-utility>
+#include <bpkg/fetch.hxx>
+#include <bpkg/package.hxx>
+#include <bpkg/package-odb.hxx>
+#include <bpkg/checksum.hxx>
+#include <bpkg/database.hxx>
+#include <bpkg/diagnostics.hxx>
+#include <bpkg/manifest-utility.hxx>
 
-#include <bpkg/pkg-purge>
-#include <bpkg/pkg-verify>
+#include <bpkg/pkg-purge.hxx>
+#include <bpkg/pkg-verify.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/pkg-fetch b/bpkg/pkg-fetch.hxx
index 2ce0cb5..d17dbdf 100644
--- a/bpkg/pkg-fetch
+++ b/bpkg/pkg-fetch.hxx
@@ -1,17 +1,17 @@
-// file      : bpkg/pkg-fetch -*- C++ -*-
+// file      : bpkg/pkg-fetch.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_PKG_FETCH
-#define BPKG_PKG_FETCH
+#ifndef BPKG_PKG_FETCH_HXX
+#define BPKG_PKG_FETCH_HXX
 
-#include <bpkg/manifest> // version
+#include <libbpkg/manifest.hxx> // version
 
-#include <bpkg/types>
-#include <bpkg/forward> // transaction, selected_package
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/forward.hxx> // transaction, selected_package
+#include <bpkg/utility.hxx>
 
-#include <bpkg/pkg-fetch-options>
+#include <bpkg/pkg-fetch-options.hxx>
 
 namespace bpkg
 {
@@ -39,4 +39,4 @@ namespace bpkg
              bool replace);
 }
 
-#endif // BPKG_PKG_FETCH
+#endif // BPKG_PKG_FETCH_HXX
diff --git a/bpkg/pkg-install b/bpkg/pkg-install
deleted file mode 100644
index eaaef09..0000000
--- a/bpkg/pkg-install
+++ /dev/null
@@ -1,24 +0,0 @@
-// file      : bpkg/pkg-install -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BPKG_PKG_INSTALL
-#define BPKG_PKG_INSTALL
-
-#include <bpkg/types>
-#include <bpkg/forward> // selected_package
-#include <bpkg/utility>
-
-#include <bpkg/pkg-command>
-#include <bpkg/pkg-install-options>
-
-namespace bpkg
-{
-  inline int
-  pkg_install (const pkg_install_options& o, cli::scanner& args)
-  {
-    return pkg_command ("install", o, args);
-  }
-}
-
-#endif // BPKG_PKG_INSTALL
diff --git a/bpkg/pkg-install.hxx b/bpkg/pkg-install.hxx
new file mode 100644
index 0000000..83ad4de
--- /dev/null
+++ b/bpkg/pkg-install.hxx
@@ -0,0 +1,24 @@
+// file      : bpkg/pkg-install.hxx -*- C++ -*-
+// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BPKG_PKG_INSTALL_HXX
+#define BPKG_PKG_INSTALL_HXX
+
+#include <bpkg/types.hxx>
+#include <bpkg/forward.hxx> // selected_package
+#include <bpkg/utility.hxx>
+
+#include <bpkg/pkg-command.hxx>
+#include <bpkg/pkg-install-options.hxx>
+
+namespace bpkg
+{
+  inline int
+  pkg_install (const pkg_install_options& o, cli::scanner& args)
+  {
+    return pkg_command ("install", o, args);
+  }
+}
+
+#endif // BPKG_PKG_INSTALL_HXX
diff --git a/bpkg/pkg-purge.cxx b/bpkg/pkg-purge.cxx
index 1b61c5c..7b58461 100644
--- a/bpkg/pkg-purge.cxx
+++ b/bpkg/pkg-purge.cxx
@@ -2,12 +2,12 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/pkg-purge>
+#include <bpkg/pkg-purge.hxx>
 
-#include <bpkg/package>
-#include <bpkg/package-odb>
-#include <bpkg/database>
-#include <bpkg/diagnostics>
+#include <bpkg/package.hxx>
+#include <bpkg/package-odb.hxx>
+#include <bpkg/database.hxx>
+#include <bpkg/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/pkg-purge b/bpkg/pkg-purge.hxx
index 4e6f0c2..9468a02 100644
--- a/bpkg/pkg-purge
+++ b/bpkg/pkg-purge.hxx
@@ -1,15 +1,15 @@
-// file      : bpkg/pkg-purge -*- C++ -*-
+// file      : bpkg/pkg-purge.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_PKG_PURGE
-#define BPKG_PKG_PURGE
+#ifndef BPKG_PKG_PURGE_HXX
+#define BPKG_PKG_PURGE_HXX
 
-#include <bpkg/types>
-#include <bpkg/forward> // transaction, selected_package
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/forward.hxx> // transaction, selected_package
+#include <bpkg/utility.hxx>
 
-#include <bpkg/pkg-purge-options>
+#include <bpkg/pkg-purge-options.hxx>
 
 namespace bpkg
 {
@@ -35,4 +35,4 @@ namespace bpkg
                 bool archive = true);
 }
 
-#endif // BPKG_PKG_PURGE
+#endif // BPKG_PKG_PURGE_HXX
diff --git a/bpkg/pkg-status b/bpkg/pkg-status
deleted file mode 100644
index f2d5493..0000000
--- a/bpkg/pkg-status
+++ /dev/null
@@ -1,19 +0,0 @@
-// file      : bpkg/pkg-status -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BPKG_PKG_STATUS
-#define BPKG_PKG_STATUS
-
-#include <bpkg/types>
-#include <bpkg/utility>
-
-#include <bpkg/pkg-status-options>
-
-namespace bpkg
-{
-  int
-  pkg_status (const pkg_status_options&, cli::scanner& args);
-}
-
-#endif // BPKG_PKG_STATUS
diff --git a/bpkg/pkg-status.cxx b/bpkg/pkg-status.cxx
index 56d4c6a..84f7ce8 100644
--- a/bpkg/pkg-status.cxx
+++ b/bpkg/pkg-status.cxx
@@ -2,15 +2,15 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/pkg-status>
+#include <bpkg/pkg-status.hxx>
 
 #include <iostream>   // cout
 
-#include <bpkg/package>
-#include <bpkg/package-odb>
-#include <bpkg/database>
-#include <bpkg/diagnostics>
-#include <bpkg/manifest-utility>
+#include <bpkg/package.hxx>
+#include <bpkg/package-odb.hxx>
+#include <bpkg/database.hxx>
+#include <bpkg/diagnostics.hxx>
+#include <bpkg/manifest-utility.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/pkg-status.hxx b/bpkg/pkg-status.hxx
new file mode 100644
index 0000000..b2afd0f
--- /dev/null
+++ b/bpkg/pkg-status.hxx
@@ -0,0 +1,19 @@
+// file      : bpkg/pkg-status.hxx -*- C++ -*-
+// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BPKG_PKG_STATUS_HXX
+#define BPKG_PKG_STATUS_HXX
+
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
+
+#include <bpkg/pkg-status-options.hxx>
+
+namespace bpkg
+{
+  int
+  pkg_status (const pkg_status_options&, cli::scanner& args);
+}
+
+#endif // BPKG_PKG_STATUS_HXX
diff --git a/bpkg/pkg-test b/bpkg/pkg-test.hxx
index dffcdd7..dd27c9c 100644
--- a/bpkg/pkg-test
+++ b/bpkg/pkg-test.hxx
@@ -1,15 +1,15 @@
-// file      : bpkg/pkg-test -*- C++ -*-
+// file      : bpkg/pkg-test.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_PKG_TEST
-#define BPKG_PKG_TEST
+#ifndef BPKG_PKG_TEST_HXX
+#define BPKG_PKG_TEST_HXX
 
-#include <bpkg/types>
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
 
-#include <bpkg/pkg-command>
-#include <bpkg/pkg-test-options>
+#include <bpkg/pkg-command.hxx>
+#include <bpkg/pkg-test-options.hxx>
 
 namespace bpkg
 {
@@ -20,4 +20,4 @@ namespace bpkg
   }
 }
 
-#endif // BPKG_PKG_TEST
+#endif // BPKG_PKG_TEST_HXX
diff --git a/bpkg/pkg-uninstall b/bpkg/pkg-uninstall
deleted file mode 100644
index 9033ce4..0000000
--- a/bpkg/pkg-uninstall
+++ /dev/null
@@ -1,24 +0,0 @@
-// file      : bpkg/pkg-uninstall -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BPKG_PKG_UNINSTALL
-#define BPKG_PKG_UNINSTALL
-
-#include <bpkg/types>
-#include <bpkg/forward> // selected_package
-#include <bpkg/utility>
-
-#include <bpkg/pkg-command>
-#include <bpkg/pkg-uninstall-options>
-
-namespace bpkg
-{
-  inline int
-  pkg_uninstall (const pkg_uninstall_options& o, cli::scanner& args)
-  {
-    return pkg_command ("uninstall", o, args);
-  }
-}
-
-#endif // BPKG_PKG_UNINSTALL
diff --git a/bpkg/pkg-uninstall.hxx b/bpkg/pkg-uninstall.hxx
new file mode 100644
index 0000000..2464d62
--- /dev/null
+++ b/bpkg/pkg-uninstall.hxx
@@ -0,0 +1,24 @@
+// file      : bpkg/pkg-uninstall.hxx -*- C++ -*-
+// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BPKG_PKG_UNINSTALL_HXX
+#define BPKG_PKG_UNINSTALL_HXX
+
+#include <bpkg/types.hxx>
+#include <bpkg/forward.hxx> // selected_package
+#include <bpkg/utility.hxx>
+
+#include <bpkg/pkg-command.hxx>
+#include <bpkg/pkg-uninstall-options.hxx>
+
+namespace bpkg
+{
+  inline int
+  pkg_uninstall (const pkg_uninstall_options& o, cli::scanner& args)
+  {
+    return pkg_command ("uninstall", o, args);
+  }
+}
+
+#endif // BPKG_PKG_UNINSTALL_HXX
diff --git a/bpkg/pkg-unpack.cxx b/bpkg/pkg-unpack.cxx
index 9aead38..21883d9 100644
--- a/bpkg/pkg-unpack.cxx
+++ b/bpkg/pkg-unpack.cxx
@@ -2,19 +2,19 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/pkg-unpack>
+#include <bpkg/pkg-unpack.hxx>
 
 #include <butl/process>
 
-#include <bpkg/manifest>
+#include <libbpkg/manifest.hxx>
 
-#include <bpkg/package>
-#include <bpkg/package-odb>
-#include <bpkg/database>
-#include <bpkg/diagnostics>
+#include <bpkg/package.hxx>
+#include <bpkg/package-odb.hxx>
+#include <bpkg/database.hxx>
+#include <bpkg/diagnostics.hxx>
 
-#include <bpkg/pkg-purge>
-#include <bpkg/pkg-verify>
+#include <bpkg/pkg-purge.hxx>
+#include <bpkg/pkg-verify.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/pkg-unpack b/bpkg/pkg-unpack.hxx
index a7eaab7..39b4e83 100644
--- a/bpkg/pkg-unpack
+++ b/bpkg/pkg-unpack.hxx
@@ -1,15 +1,15 @@
-// file      : bpkg/pkg-unpack -*- C++ -*-
+// file      : bpkg/pkg-unpack.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_PKG_UNPACK
-#define BPKG_PKG_UNPACK
+#ifndef BPKG_PKG_UNPACK_HXX
+#define BPKG_PKG_UNPACK_HXX
 
-#include <bpkg/types>
-#include <bpkg/forward> // transaction, selected_package
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/forward.hxx> // transaction, selected_package
+#include <bpkg/utility.hxx>
 
-#include <bpkg/pkg-unpack-options>
+#include <bpkg/pkg-unpack-options.hxx>
 
 namespace bpkg
 {
@@ -34,4 +34,4 @@ namespace bpkg
               const string& name);
 }
 
-#endif // BPKG_PKG_UNPACK
+#endif // BPKG_PKG_UNPACK_HXX
diff --git a/bpkg/pkg-update b/bpkg/pkg-update.hxx
index 7c6fe02..5f62bd9 100644
--- a/bpkg/pkg-update
+++ b/bpkg/pkg-update.hxx
@@ -1,16 +1,16 @@
-// file      : bpkg/pkg-update -*- C++ -*-
+// file      : bpkg/pkg-update.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_PKG_UPDATE
-#define BPKG_PKG_UPDATE
+#ifndef BPKG_PKG_UPDATE_HXX
+#define BPKG_PKG_UPDATE_HXX
 
-#include <bpkg/types>
-#include <bpkg/forward> // selected_package
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/forward.hxx> // selected_package
+#include <bpkg/utility.hxx>
 
-#include <bpkg/pkg-command>
-#include <bpkg/pkg-update-options>
+#include <bpkg/pkg-command.hxx>
+#include <bpkg/pkg-update-options.hxx>
 
 namespace bpkg
 {
@@ -30,4 +30,4 @@ namespace bpkg
   }
 }
 
-#endif // BPKG_PKG_UPDATE
+#endif // BPKG_PKG_UPDATE_HXX
diff --git a/bpkg/pkg-verify.cxx b/bpkg/pkg-verify.cxx
index 275c710..e4535f3 100644
--- a/bpkg/pkg-verify.cxx
+++ b/bpkg/pkg-verify.cxx
@@ -2,14 +2,14 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/pkg-verify>
+#include <bpkg/pkg-verify.hxx>
 
 #include <butl/process>
 #include <butl/fdstream>
 #include <butl/manifest-parser>
 
-#include <bpkg/archive>
-#include <bpkg/diagnostics>
+#include <bpkg/archive.hxx>
+#include <bpkg/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/pkg-verify b/bpkg/pkg-verify.hxx
index ac43bf1..a96442c 100644
--- a/bpkg/pkg-verify
+++ b/bpkg/pkg-verify.hxx
@@ -1,16 +1,16 @@
-// file      : bpkg/pkg-verify -*- C++ -*-
+// file      : bpkg/pkg-verify.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_PKG_VERIFY
-#define BPKG_PKG_VERIFY
+#ifndef BPKG_PKG_VERIFY_HXX
+#define BPKG_PKG_VERIFY_HXX
 
-#include <bpkg/manifest>
+#include <libbpkg/manifest.hxx>
 
-#include <bpkg/types>
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
 
-#include <bpkg/pkg-verify-options>
+#include <bpkg/pkg-verify-options.hxx>
 
 namespace bpkg
 {
@@ -36,4 +36,4 @@ namespace bpkg
   pkg_verify (const dir_path& source, bool ignore_unknown, bool diag = true);
 }
 
-#endif // BPKG_PKG_VERIFY
+#endif // BPKG_PKG_VERIFY_HXX
diff --git a/bpkg/rep-add b/bpkg/rep-add
deleted file mode 100644
index e687dea..0000000
--- a/bpkg/rep-add
+++ /dev/null
@@ -1,19 +0,0 @@
-// file      : bpkg/rep-add -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BPKG_REP_ADD
-#define BPKG_REP_ADD
-
-#include <bpkg/types>
-#include <bpkg/utility>
-
-#include <bpkg/rep-add-options>
-
-namespace bpkg
-{
-  int
-  rep_add (const rep_add_options&, cli::scanner& args);
-}
-
-#endif // BPKG_REP_ADD
diff --git a/bpkg/rep-add.cxx b/bpkg/rep-add.cxx
index 93d9925..6de0738 100644
--- a/bpkg/rep-add.cxx
+++ b/bpkg/rep-add.cxx
@@ -2,13 +2,13 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/rep-add>
+#include <bpkg/rep-add.hxx>
 
-#include <bpkg/package>
-#include <bpkg/package-odb>
-#include <bpkg/database>
-#include <bpkg/diagnostics>
-#include <bpkg/manifest-utility>
+#include <bpkg/package.hxx>
+#include <bpkg/package-odb.hxx>
+#include <bpkg/database.hxx>
+#include <bpkg/diagnostics.hxx>
+#include <bpkg/manifest-utility.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/rep-add.hxx b/bpkg/rep-add.hxx
new file mode 100644
index 0000000..9f91713
--- /dev/null
+++ b/bpkg/rep-add.hxx
@@ -0,0 +1,19 @@
+// file      : bpkg/rep-add.hxx -*- C++ -*-
+// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BPKG_REP_ADD_HXX
+#define BPKG_REP_ADD_HXX
+
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
+
+#include <bpkg/rep-add-options.hxx>
+
+namespace bpkg
+{
+  int
+  rep_add (const rep_add_options&, cli::scanner& args);
+}
+
+#endif // BPKG_REP_ADD_HXX
diff --git a/bpkg/rep-create b/bpkg/rep-create
deleted file mode 100644
index 8f1d906..0000000
--- a/bpkg/rep-create
+++ /dev/null
@@ -1,19 +0,0 @@
-// file      : bpkg/rep-create -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BPKG_REP_CREATE
-#define BPKG_REP_CREATE
-
-#include <bpkg/types>
-#include <bpkg/utility>
-
-#include <bpkg/rep-create-options>
-
-namespace bpkg
-{
-  int
-  rep_create (const rep_create_options&, cli::scanner& args);
-}
-
-#endif // BPKG_REP_CREATE
diff --git a/bpkg/rep-create.cxx b/bpkg/rep-create.cxx
index 1762c31..b38d418 100644
--- a/bpkg/rep-create.cxx
+++ b/bpkg/rep-create.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/rep-create>
+#include <bpkg/rep-create.hxx>
 
 #include <map>
 
@@ -10,15 +10,15 @@
 #include <butl/filesystem> // dir_iterator
 #include <butl/manifest-serializer>
 
-#include <bpkg/manifest>
+#include <libbpkg/manifest.hxx>
 
-#include <bpkg/auth>
-#include <bpkg/fetch>
-#include <bpkg/archive>
-#include <bpkg/checksum>
-#include <bpkg/diagnostics>
+#include <bpkg/auth.hxx>
+#include <bpkg/fetch.hxx>
+#include <bpkg/archive.hxx>
+#include <bpkg/checksum.hxx>
+#include <bpkg/diagnostics.hxx>
 
-#include <bpkg/pkg-verify>
+#include <bpkg/pkg-verify.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/rep-create.hxx b/bpkg/rep-create.hxx
new file mode 100644
index 0000000..b177267
--- /dev/null
+++ b/bpkg/rep-create.hxx
@@ -0,0 +1,19 @@
+// file      : bpkg/rep-create.hxx -*- C++ -*-
+// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BPKG_REP_CREATE_HXX
+#define BPKG_REP_CREATE_HXX
+
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
+
+#include <bpkg/rep-create-options.hxx>
+
+namespace bpkg
+{
+  int
+  rep_create (const rep_create_options&, cli::scanner& args);
+}
+
+#endif // BPKG_REP_CREATE_HXX
diff --git a/bpkg/rep-fetch b/bpkg/rep-fetch
deleted file mode 100644
index 4569e93..0000000
--- a/bpkg/rep-fetch
+++ /dev/null
@@ -1,19 +0,0 @@
-// file      : bpkg/rep-fetch -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BPKG_REP_FETCH
-#define BPKG_REP_FETCH
-
-#include <bpkg/types>
-#include <bpkg/utility>
-
-#include <bpkg/rep-fetch-options>
-
-namespace bpkg
-{
-  int
-  rep_fetch (const rep_fetch_options&, cli::scanner& args);
-}
-
-#endif // BPKG_REP_FETCH
diff --git a/bpkg/rep-fetch.cxx b/bpkg/rep-fetch.cxx
index 35bfb1a..2a298b8 100644
--- a/bpkg/rep-fetch.cxx
+++ b/bpkg/rep-fetch.cxx
@@ -2,16 +2,16 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/rep-fetch>
+#include <bpkg/rep-fetch.hxx>
 
-#include <bpkg/manifest>
+#include <libbpkg/manifest.hxx>
 
-#include <bpkg/auth>
-#include <bpkg/fetch>
-#include <bpkg/package>
-#include <bpkg/package-odb>
-#include <bpkg/database>
-#include <bpkg/diagnostics>
+#include <bpkg/auth.hxx>
+#include <bpkg/fetch.hxx>
+#include <bpkg/package.hxx>
+#include <bpkg/package-odb.hxx>
+#include <bpkg/database.hxx>
+#include <bpkg/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/rep-fetch.hxx b/bpkg/rep-fetch.hxx
new file mode 100644
index 0000000..ccc9e11
--- /dev/null
+++ b/bpkg/rep-fetch.hxx
@@ -0,0 +1,19 @@
+// file      : bpkg/rep-fetch.hxx -*- C++ -*-
+// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BPKG_REP_FETCH_HXX
+#define BPKG_REP_FETCH_HXX
+
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
+
+#include <bpkg/rep-fetch-options.hxx>
+
+namespace bpkg
+{
+  int
+  rep_fetch (const rep_fetch_options&, cli::scanner& args);
+}
+
+#endif // BPKG_REP_FETCH_HXX
diff --git a/bpkg/rep-info b/bpkg/rep-info
deleted file mode 100644
index fffea10..0000000
--- a/bpkg/rep-info
+++ /dev/null
@@ -1,19 +0,0 @@
-// file      : bpkg/rep-info -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BPKG_REP_INFO
-#define BPKG_REP_INFO
-
-#include <bpkg/types>
-#include <bpkg/utility>
-
-#include <bpkg/rep-info-options>
-
-namespace bpkg
-{
-  int
-  rep_info (const rep_info_options&, cli::scanner& args);
-}
-
-#endif // BPKG_REP_INFO
diff --git a/bpkg/rep-info.cxx b/bpkg/rep-info.cxx
index 9acbdcc..7dbb0f9 100644
--- a/bpkg/rep-info.cxx
+++ b/bpkg/rep-info.cxx
@@ -2,20 +2,20 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/rep-info>
+#include <bpkg/rep-info.hxx>
 
 #include <iostream>  // cout
 
 #include <butl/sha256>              // sha256_to_fingerprint()
 #include <butl/manifest-serializer>
 
-#include <bpkg/manifest>
+#include <libbpkg/manifest.hxx>
 
-#include <bpkg/auth>
-#include <bpkg/fetch>
-#include <bpkg/package>
-#include <bpkg/diagnostics>
-#include <bpkg/manifest-utility>
+#include <bpkg/auth.hxx>
+#include <bpkg/fetch.hxx>
+#include <bpkg/package.hxx>
+#include <bpkg/diagnostics.hxx>
+#include <bpkg/manifest-utility.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/rep-info.hxx b/bpkg/rep-info.hxx
new file mode 100644
index 0000000..6bd5279
--- /dev/null
+++ b/bpkg/rep-info.hxx
@@ -0,0 +1,19 @@
+// file      : bpkg/rep-info.hxx -*- C++ -*-
+// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BPKG_REP_INFO_HXX
+#define BPKG_REP_INFO_HXX
+
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
+
+#include <bpkg/rep-info-options.hxx>
+
+namespace bpkg
+{
+  int
+  rep_info (const rep_info_options&, cli::scanner& args);
+}
+
+#endif // BPKG_REP_INFO_HXX
diff --git a/bpkg/repository-signing.cli b/bpkg/repository-signing.cli
index a702fd8..1b73fc2 100644
--- a/bpkg/repository-signing.cli
+++ b/bpkg/repository-signing.cli
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <bpkg/common-options>;
+include <bpkg/common-options.hxx>;
 
 "\section=1"
 "\name=bpkg-repository-signing"
diff --git a/bpkg/satisfaction.cxx b/bpkg/satisfaction.cxx
index bf033e9..7bcf1fd 100644
--- a/bpkg/satisfaction.cxx
+++ b/bpkg/satisfaction.cxx
@@ -2,14 +2,14 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/satisfaction>
+#include <bpkg/satisfaction.hxx>
 
 #include <butl/process>
 #include <butl/fdstream>
 
-#include <bpkg/utility>
-#include <bpkg/package-odb>
-#include <bpkg/diagnostics>
+#include <bpkg/utility.hxx>
+#include <bpkg/package-odb.hxx>
+#include <bpkg/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/satisfaction b/bpkg/satisfaction.hxx
index 6f8ce45..8def6a1 100644
--- a/bpkg/satisfaction
+++ b/bpkg/satisfaction.hxx
@@ -1,15 +1,15 @@
-// file      : bpkg/satisfaction -*- C++ -*-
+// file      : bpkg/satisfaction.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_SATISFACTION
-#define BPKG_SATISFACTION
+#ifndef BPKG_SATISFACTION_HXX
+#define BPKG_SATISFACTION_HXX
 
-#include <bpkg/types>
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
 
-#include <bpkg/package>
-#include <bpkg/common-options>
+#include <bpkg/package.hxx>
+#include <bpkg/common-options.hxx>
 
 namespace bpkg
 {
@@ -47,4 +47,4 @@ namespace bpkg
   satisfy_bpkg (const common_options&, const string& pkg, const dependency&);
 }
 
-#endif // BPKG_SATISFACTION
+#endif // BPKG_SATISFACTION_HXX
diff --git a/bpkg/system-repository.cxx b/bpkg/system-repository.cxx
index 3d0a0c0..3c329d6 100644
--- a/bpkg/system-repository.cxx
+++ b/bpkg/system-repository.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/system-repository>
+#include <bpkg/system-repository.hxx>
 
 namespace bpkg
 {
diff --git a/bpkg/system-repository b/bpkg/system-repository.hxx
index 44b8c4e..b28e758 100644
--- a/bpkg/system-repository
+++ b/bpkg/system-repository.hxx
@@ -1,16 +1,16 @@
-// file      : bpkg/system-repository -*- C++ -*-
+// file      : bpkg/system-repository.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_SYSTEM_REPOSITORY
-#define BPKG_SYSTEM_REPOSITORY
+#ifndef BPKG_SYSTEM_REPOSITORY_HXX
+#define BPKG_SYSTEM_REPOSITORY_HXX
 
 #include <map>
 
-#include <bpkg/manifest>
+#include <libbpkg/manifest.hxx>
 
-#include <bpkg/types>
-#include <bpkg/utility>
+#include <bpkg/types.hxx>
+#include <bpkg/utility.hxx>
 
 namespace bpkg
 {
@@ -52,4 +52,4 @@ namespace bpkg
   extern system_repository_type system_repository;
 }
 
-#endif // BPKG_SYSTEM_REPOSITORY
+#endif // BPKG_SYSTEM_REPOSITORY_HXX
diff --git a/bpkg/types-parsers.cxx b/bpkg/types-parsers.cxx
index 7067a9e..6da395c 100644
--- a/bpkg/types-parsers.cxx
+++ b/bpkg/types-parsers.cxx
@@ -2,9 +2,9 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/types-parsers>
+#include <bpkg/types-parsers.hxx>
 
-#include <bpkg/common-options> // bpkg::cli namespace
+#include <bpkg/common-options.hxx> // bpkg::cli namespace
 
 namespace bpkg
 {
diff --git a/bpkg/types-parsers b/bpkg/types-parsers.hxx
index d32a6cf..bddb425 100644
--- a/bpkg/types-parsers
+++ b/bpkg/types-parsers.hxx
@@ -1,15 +1,15 @@
-// file      : bpkg/types-parsers -*- C++ -*-
+// file      : bpkg/types-parsers.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
 // CLI parsers, included into the generated source files.
 //
 
-#ifndef BPKG_TYPES_PARSERS
-#define BPKG_TYPES_PARSERS
+#ifndef BPKG_TYPES_PARSERS_HXX
+#define BPKG_TYPES_PARSERS_HXX
 
-#include <bpkg/types>
-#include <bpkg/options-types>
+#include <bpkg/types.hxx>
+#include <bpkg/options-types.hxx>
 
 namespace bpkg
 {
@@ -43,4 +43,4 @@ namespace bpkg
   }
 }
 
-#endif // BPKG_TYPES_PARSERS
+#endif // BPKG_TYPES_PARSERS_HXX
diff --git a/bpkg/types b/bpkg/types.hxx
index cfe2add..37c38e5 100644
--- a/bpkg/types
+++ b/bpkg/types.hxx
@@ -1,9 +1,9 @@
-// file      : bpkg/types -*- C++ -*-
+// file      : bpkg/types.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_TYPES
-#define BPKG_TYPES
+#ifndef BPKG_TYPES_HXX
+#define BPKG_TYPES_HXX
 
 #include <vector>
 #include <string>
@@ -101,4 +101,4 @@ namespace std
   }
 }
 
-#endif // BPKG_TYPES
+#endif // BPKG_TYPES_HXX
diff --git a/bpkg/utility.cxx b/bpkg/utility.cxx
index 95e47ba..c538035 100644
--- a/bpkg/utility.cxx
+++ b/bpkg/utility.cxx
@@ -2,15 +2,15 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <bpkg/utility>
+#include <bpkg/utility.hxx>
 
 #include <iostream>     // cout, cin
 
 #include <butl/process>
 #include <butl/fdstream>
 
-#include <bpkg/diagnostics>
-#include <bpkg/common-options>
+#include <bpkg/diagnostics.hxx>
+#include <bpkg/common-options.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/utility b/bpkg/utility.hxx
index 6f4c3ca..c84b466 100644
--- a/bpkg/utility
+++ b/bpkg/utility.hxx
@@ -1,9 +1,9 @@
-// file      : bpkg/utility -*- C++ -*-
+// file      : bpkg/utility.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_UTILITY
-#define BPKG_UTILITY
+#ifndef BPKG_UTILITY_HXX
+#define BPKG_UTILITY_HXX
 
 #include <memory>   // make_shared()
 #include <string>   // to_string()
@@ -17,8 +17,8 @@
 
 #include <butl/filesystem>
 
-#include <bpkg/types>
-#include <bpkg/version-impl>
+#include <bpkg/types.hxx>
+#include <bpkg/version.hxx>
 
 namespace bpkg
 {
@@ -118,4 +118,4 @@ namespace bpkg
          const strings& cvars = strings ());
 }
 
-#endif // BPKG_UTILITY
+#endif // BPKG_UTILITY_HXX
diff --git a/bpkg/version-impl.in b/bpkg/version.hxx.in
index 8d15e68..b51b69e 100644
--- a/bpkg/version-impl.in
+++ b/bpkg/version.hxx.in
@@ -1,4 +1,4 @@
-// file      : bpkg/version-impl.in -*- C++ -*-
+// file      : bpkg/version.hxx.in -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
@@ -41,7 +41,7 @@
 
 $libbutl.check(LIBBUTL_VERSION, LIBBUTL_SNAPSHOT)$
 
-#include <bpkg/version>
+#include <libbpkg/version.hxx>
 
 $libbpkg.check(LIBBPKG_VERSION, LIBBPKG_SNAPSHOT)$
 
diff --git a/bpkg/wrapper-traits b/bpkg/wrapper-traits.hxx
index 0da2de4..bdd0861 100644
--- a/bpkg/wrapper-traits
+++ b/bpkg/wrapper-traits.hxx
@@ -1,9 +1,9 @@
-// file      : bpkg/wrapper-traits -*- C++ -*-
+// file      : bpkg/wrapper-traits.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BPKG_WRAPPER_TRAITS
-#define BPKG_WRAPPER_TRAITS
+#ifndef BPKG_WRAPPER_TRAITS_HXX
+#define BPKG_WRAPPER_TRAITS_HXX
 
 #include <butl/optional>
 
@@ -56,4 +56,4 @@ namespace odb
   };
 }
 
-#endif // BPKG_WRAPPER_TRAITS
+#endif // BPKG_WRAPPER_TRAITS_HXX
diff --git a/build/root.build b/build/root.build
index f19d700..053e2fb 100644
--- a/build/root.build
+++ b/build/root.build
@@ -6,7 +6,7 @@ cxx.std = latest
 
 using cxx
 
-hxx{*}: extension =
+hxx{*}: extension = hxx
 ixx{*}: extension = ixx
 txx{*}: extension = txx
 cxx{*}: extension = cxx
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 0000000..35ec43f
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1,2 @@
+test/
+test-*/
diff --git a/tests/common/bar/stable/libbar-1.0.0.tar.gz b/tests/common/bar/stable/libbar-1.0.0.tar.gz
index d77c1ba..7d4f9e8 100644
--- a/tests/common/bar/stable/libbar-1.0.0.tar.gz
+++ b/tests/common/bar/stable/libbar-1.0.0.tar.gz
diff --git a/tests/common/bar/testing/libbar-1.1.0.tar.gz b/tests/common/bar/testing/libbar-1.1.0.tar.gz
index f081804..1dc004e 100644
--- a/tests/common/bar/testing/libbar-1.1.0.tar.gz
+++ b/tests/common/bar/testing/libbar-1.1.0.tar.gz
diff --git a/tests/common/bar/unstable/libbar-1.1.1.tar.gz b/tests/common/bar/unstable/libbar-1.1.1.tar.gz
index a0fbdc3..bafd5e2 100644
--- a/tests/common/bar/unstable/libbar-1.1.1.tar.gz
+++ b/tests/common/bar/unstable/libbar-1.1.1.tar.gz
diff --git a/tests/common/foo/stable/libfoo-1.0.0.tar.gz b/tests/common/foo/stable/libfoo-1.0.0.tar.gz
index c29dd9d..0aba2aa 100644
--- a/tests/common/foo/stable/libfoo-1.0.0.tar.gz
+++ b/tests/common/foo/stable/libfoo-1.0.0.tar.gz
diff --git a/tests/common/foo/testing/libfoo-1.1.0.tar.gz b/tests/common/foo/testing/libfoo-1.1.0.tar.gz
index a6c0202..0e9bf9c 100644
--- a/tests/common/foo/testing/libfoo-1.1.0.tar.gz
+++ b/tests/common/foo/testing/libfoo-1.1.0.tar.gz
diff --git a/tests/common/hello/libhello-1.0.0.tar.gz b/tests/common/hello/libhello-1.0.0.tar.gz
index 29341c7..c9a25d9 100644
--- a/tests/common/hello/libhello-1.0.0.tar.gz
+++ b/tests/common/hello/libhello-1.0.0.tar.gz
diff --git a/tests/common/libhello-1.0.0/build/export.build b/tests/common/libhello-1.0.0/build/export.build
index 1eb73b7..0151425 100644
--- a/tests/common/libhello-1.0.0/build/export.build
+++ b/tests/common/libhello-1.0.0/build/export.build
@@ -1,6 +1,6 @@
 $out_root/:
 {
-  include hello/
+  include libhello/
 }
 
-export $out_root/hello/lib{hello}
+export $out_root/libhello/lib{hello}
diff --git a/tests/common/libhello-1.0.0/build/root.build b/tests/common/libhello-1.0.0/build/root.build
index 4f70114..8ceadfa 100644
--- a/tests/common/libhello-1.0.0/build/root.build
+++ b/tests/common/libhello-1.0.0/build/root.build
@@ -2,5 +2,5 @@ cxx.std = 11
 
 using cxx
 
-hxx{*}: extension =
+hxx{*}: extension = hxx
 cxx{*}: extension = cxx
diff --git a/tests/common/libhello-1.0.0/buildfile b/tests/common/libhello-1.0.0/buildfile
index 57e0f35..b3ad7e3 100644
--- a/tests/common/libhello-1.0.0/buildfile
+++ b/tests/common/libhello-1.0.0/buildfile
@@ -1,4 +1,4 @@
-./: hello/ tests/ doc{INSTALL version} file{manifest}
+./: libhello/ tests/ doc{INSTALL version} file{manifest}
 
 doc{version}: file{manifest} # Generated by the version module.
 doc{version}: dist = true
diff --git a/tests/common/libhello-1.0.0/hello/buildfile b/tests/common/libhello-1.0.0/libhello/buildfile
index 9af86cf..f79b9e7 100644
--- a/tests/common/libhello-1.0.0/hello/buildfile
+++ b/tests/common/libhello-1.0.0/libhello/buildfile
@@ -16,6 +16,6 @@ lib{hello}: cxx.export.poptions = "-I$src_root"
 liba{hello}: cxx.export.poptions += -DLIBHELLO_STATIC
 libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED
 
-# Install into the hello/ subdirectory of, say, /usr/include/.
+# Install into the libhello/ subdirectory of, say, /usr/include/.
 #
-install.include = $install.include/hello/
+install.include = $install.include/libhello/
diff --git a/tests/common/libhello-1.0.0/hello/export b/tests/common/libhello-1.0.0/libhello/export.hxx
index 18f4968..e6c723e 100644
--- a/tests/common/libhello-1.0.0/hello/export
+++ b/tests/common/libhello-1.0.0/libhello/export.hxx
@@ -1,4 +1,4 @@
-// file: hello/export -*- C++ -*-
+// file: libhello/export.hxx -*- C++ -*-
 
 #pragma once
 
diff --git a/tests/common/libhello-1.0.0/hello/hello.cxx b/tests/common/libhello-1.0.0/libhello/hello.cxx
index 65d0aa7..677815d 100644
--- a/tests/common/libhello-1.0.0/hello/hello.cxx
+++ b/tests/common/libhello-1.0.0/libhello/hello.cxx
@@ -1,6 +1,6 @@
-// file: hello/hello.cxx -*- C++ -*-
+// file: libhello/hello.cxx -*- C++ -*-
 
-#include <hello/hello>
+#include <libhello/hello.hxx>
 
 #include <iostream>
 
diff --git a/tests/common/libhello-1.0.0/hello/hello b/tests/common/libhello-1.0.0/libhello/hello.hxx
index 5fb7d9e..58bd7b2 100644
--- a/tests/common/libhello-1.0.0/hello/hello
+++ b/tests/common/libhello-1.0.0/libhello/hello.hxx
@@ -1,10 +1,10 @@
-// file: hello/hello -*- C++ -*-
+// file: libhello/hello.hxx -*- C++ -*-
 
 #pragma once
 
 #include <string>
 
-#include <hello/export>
+#include <libhello/export.hxx>
 
 namespace hello
 {
diff --git a/tests/common/libhello-1.0.0/tests/.gitignore b/tests/common/libhello-1.0.0/tests/.gitignore
new file mode 100644
index 0000000..93fe433
--- /dev/null
+++ b/tests/common/libhello-1.0.0/tests/.gitignore
@@ -0,0 +1 @@
+!test/
diff --git a/tests/common/libhello-1.0.0/tests/build/root.build b/tests/common/libhello-1.0.0/tests/build/root.build
index de723b8..a2ee38a 100644
--- a/tests/common/libhello-1.0.0/tests/build/root.build
+++ b/tests/common/libhello-1.0.0/tests/build/root.build
@@ -2,7 +2,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/common/libhello-1.0.0/tests/test/driver.cxx b/tests/common/libhello-1.0.0/tests/test/driver.cxx
index 59bfb2d..38937f0 100644
--- a/tests/common/libhello-1.0.0/tests/test/driver.cxx
+++ b/tests/common/libhello-1.0.0/tests/test/driver.cxx
@@ -1,6 +1,6 @@
 // file: tests/test/driver.cxx -*- C++ -*-
 
-#include <hello/hello>
+#include <libhello/hello.hxx>
 
 int
 main ()