136 files changed, 415 insertions, 413 deletions

diff --git a/build/export.build b/build/export.build
index fd8e587..d3f607a 100644
--- a/build/export.build
+++ b/build/export.build
@@ -4,7 +4,7 @@
 
 $out_root/:
 {
-  include butl/
+  include libbutl/
 }
 
-export $out_root/butl/lib{butl}
+export $out_root/libbutl/lib{butl}
diff --git a/build/root.build b/build/root.build
index af2c962..196d2a3 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/buildfile b/buildfile
index 05995b1..52756a3 100644
--- a/buildfile
+++ b/buildfile
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: butl/ tests/ doc{INSTALL LICENSE NEWS README version} file{manifest}
+./: libbutl/ tests/ doc{INSTALL LICENSE NEWS README version} file{manifest}
 
 doc{version}: file{manifest} # Generated by the version module.
 doc{version}: dist = true
diff --git a/butl/.gitignore b/butl/.gitignore
deleted file mode 100644
index 088eda4..0000000
--- a/butl/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-version
diff --git a/libbutl/.gitignore b/libbutl/.gitignore
new file mode 100644
index 0000000..426db9e
--- /dev/null
+++ b/libbutl/.gitignore
@@ -0,0 +1 @@
+version.hxx
diff --git a/butl/base64.cxx b/libbutl/base64.cxx
index ee44700..580090c 100644
--- a/butl/base64.cxx
+++ b/libbutl/base64.cxx
@@ -1,8 +1,8 @@
-// file      : butl/base64.cxx -*- C++ -*-
+// file      : libbutl/base64.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/base64>
+#include <libbutl/base64.hxx>
 
 #include <cstddef>   // size_t
 #include <istream>
diff --git a/butl/base64 b/libbutl/base64.hxx
index 1ba2fa1..29c6198 100644
--- a/butl/base64
+++ b/libbutl/base64.hxx
@@ -1,15 +1,15 @@
-// file      : butl/base64 -*- C++ -*-
+// file      : libbutl/base64.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_BASE64
-#define BUTL_BASE64
+#ifndef LIBBUTL_BASE64_HXX
+#define LIBBUTL_BASE64_HXX
 
 #include <iosfwd>
 #include <string>
 #include <vector>
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
 namespace butl
 {
@@ -47,4 +47,4 @@ namespace butl
   base64_decode (const std::string&);
 }
 
-#endif // BUTL_BASE64
+#endif // LIBBUTL_BASE64_HXX
diff --git a/butl/buildfile b/libbutl/buildfile
index 53fa588..a55311c 100644
--- a/butl/buildfile
+++ b/libbutl/buildfile
@@ -1,4 +1,4 @@
-# file      : butl/buildfile
+# file      : libbutl/buildfile
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
@@ -46,7 +46,7 @@ ft/{hxx            }{ shared_mutex        }
 if ($cxx.target.class == "windows")
   lib{butl}: {hxx         cxx}{ win32-utility }
 else
-  lib{butl}: file{ win32-utility. win32-utility.cxx }
+  lib{butl}: file{ win32-utility.hxx win32-utility.cxx }
 
 # This one is included into sha256.cxx so treat it as file to exclude
 # from the compilation.
@@ -87,7 +87,7 @@ if ($cxx.target.class == "windows")
 else
   cxx.libs += -lpthread
 
-# Install into the butl/ subdirectory of, say, /usr/include/.
+# Install into the libbutl/ subdirectory of, say, /usr/include/.
 #
-install.include = $install.include/butl/
+install.include = $install.include/libbutl/
 install.include.subdirs = true # Recreate subdirectories.
diff --git a/butl/char-scanner.cxx b/libbutl/char-scanner.cxx
index 8be7520..cbc2503 100644
--- a/butl/char-scanner.cxx
+++ b/libbutl/char-scanner.cxx
@@ -1,8 +1,8 @@
-// file      : butl/char-scanner.cxx -*- C++ -*-
+// file      : libbutl/char-scanner.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/char-scanner>
+#include <libbutl/char-scanner.hxx>
 
 #include <istream>
 
diff --git a/butl/char-scanner b/libbutl/char-scanner.hxx
index cbeca96..71f8313 100644
--- a/butl/char-scanner
+++ b/libbutl/char-scanner.hxx
@@ -1,15 +1,15 @@
-// file      : butl/char-scanner -*- C++ -*-
+// file      : libbutl/char-scanner.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_CHAR_SCANNER
-#define BUTL_CHAR_SCANNER
+#ifndef LIBBUTL_CHAR_SCANNER_HXX
+#define LIBBUTL_CHAR_SCANNER_HXX
 
 #include <string>  // char_traits
 #include <iosfwd>
 #include <cstdint> // uint64_t
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
 namespace butl
 {
@@ -87,4 +87,4 @@ namespace butl
   };
 }
 
-#endif // BUTL_CHAR_SCANNER
+#endif // LIBBUTL_CHAR_SCANNER_HXX
diff --git a/butl/const-ptr b/libbutl/const-ptr.hxx
index 2790253..e50704d 100644
--- a/butl/const-ptr
+++ b/libbutl/const-ptr.hxx
@@ -1,9 +1,9 @@
-// file      : butl/const-ptr -*- C++ -*-
+// file      : libbutl/const-ptr.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_CONST_PTR
-#define BUTL_CONST_PTR
+#ifndef LIBBUTL_CONST_PTR_HXX
+#define LIBBUTL_CONST_PTR_HXX
 
 #include <cstddef> // nullptr_t
 
@@ -77,4 +77,4 @@ namespace butl
   };
 }
 
-#endif // BUTL_CONST_PTR
+#endif // LIBBUTL_CONST_PTR_HXX
diff --git a/butl/curl.cxx b/libbutl/curl.cxx
index 12a1d54..daa1fd3 100644
--- a/butl/curl.cxx
+++ b/libbutl/curl.cxx
@@ -1,13 +1,13 @@
-// file      : butl/curl.cxx -*- C++ -*-
+// file      : libbutl/curl.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/curl>
+#include <libbutl/curl.hxx>
 
 #include <utility>   // move(), forward()
 #include <exception> // invalid_argument
 
-#include <butl/utility> // casecmp()
+#include <libbutl/utility.hxx> // casecmp()
 
 using namespace std;
 
diff --git a/butl/curl b/libbutl/curl.hxx
index c8285ea..bc4eb0f 100644
--- a/butl/curl
+++ b/libbutl/curl.hxx
@@ -1,18 +1,18 @@
-// file      : butl/curl -*- C++ -*-
+// file      : libbutl/curl.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_CURL
-#define BUTL_CURL
+#ifndef LIBBUTL_CURL_HXX
+#define LIBBUTL_CURL_HXX
 
 #include <string>
 #include <type_traits>
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
-#include <butl/process>
-#include <butl/fdstream>
-#include <butl/small-vector>
+#include <libbutl/process.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/small-vector.hxx>
 
 namespace butl
 {
@@ -167,7 +167,7 @@ namespace butl
   };
 }
 
-#include <butl/curl.ixx>
-#include <butl/curl.txx>
+#include <libbutl/curl.ixx>
+#include <libbutl/curl.txx>
 
-#endif // BUTL_CURL
+#endif // LIBBUTL_CURL_HXX
diff --git a/butl/curl.ixx b/libbutl/curl.ixx
index 83b388b..fcc1bab 100644
--- a/butl/curl.ixx
+++ b/libbutl/curl.ixx
@@ -1,4 +1,4 @@
-// file      : butl/curl.ixx -*- C++ -*-
+// file      : libbutl/curl.ixx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/butl/curl.txx b/libbutl/curl.txx
index fe8a25f..5fd81dc 100644
--- a/butl/curl.txx
+++ b/libbutl/curl.txx
@@ -1,4 +1,4 @@
-// file      : butl/curl.txx -*- C++ -*-
+// file      : libbutl/curl.txx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/butl/diagnostics.cxx b/libbutl/diagnostics.cxx
index b692777..e73412b 100644
--- a/butl/diagnostics.cxx
+++ b/libbutl/diagnostics.cxx
@@ -1,8 +1,8 @@
-// file      : butl/diagnostics.cxx -*- C++ -*-
+// file      : libbutl/diagnostics.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/diagnostics>
+#include <libbutl/diagnostics.hxx>
 
 #include <mutex>
 #include <iostream> // cerr
diff --git a/butl/diagnostics b/libbutl/diagnostics.hxx
index 18008d5..cc83aef 100644
--- a/butl/diagnostics
+++ b/libbutl/diagnostics.hxx
@@ -1,19 +1,19 @@
-// file      : butl/diagnostics -*- C++ -*-
+// file      : libbutl/diagnostics.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_DIAGNOSTICS
-#define BUTL_DIAGNOSTICS
+#ifndef LIBBUTL_DIAGNOSTICS_HXX
+#define LIBBUTL_DIAGNOSTICS_HXX
 
 #include <cassert>
 #include <ostream>
 #include <sstream>
-#include <utility>           // move(), forward()
-#include <butl/ft/exception> // uncaught_exceptions
-#include <exception>         // uncaught_exception(s)()
+#include <utility>                  // move(), forward()
+#include <libbutl/ft/exception.hxx> // uncaught_exceptions
+#include <exception>                // uncaught_exception(s)()
 
-#include <butl/export>
-#include <butl/utility>
+#include <libbutl/export.hxx>
+#include <libbutl/utility.hxx>
 
 namespace butl
 {
@@ -223,4 +223,4 @@ namespace butl
   };
 }
 
-#endif // BUTL_DIAGNOSTICS
+#endif // LIBBUTL_DIAGNOSTICS_HXX
diff --git a/butl/export b/libbutl/export.hxx
index 229e203..f0529de 100644
--- a/butl/export
+++ b/libbutl/export.hxx
@@ -1,9 +1,9 @@
-// file      : butl/export -*- C++ -*-
+// file      : libbutl/export.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_EXPORT
-#define BUTL_EXPORT
+#ifndef LIBBUTL_EXPORT_HXX
+#define LIBBUTL_EXPORT_HXX
 
 // Normally we don't export class templates (but do complete specializations),
 // inline functions, and classes with only inline member functions. Exporting
@@ -38,4 +38,4 @@
 #  define LIBBUTL_EXPORT            // Using static or shared.
 #endif
 
-#endif // BUTL_EXPORT
+#endif // LIBBUTL_EXPORT_HXX
diff --git a/butl/fdstream.cxx b/libbutl/fdstream.cxx
index 68168f3..77e48e0 100644
--- a/butl/fdstream.cxx
+++ b/libbutl/fdstream.cxx
@@ -1,8 +1,8 @@
-// file      : butl/fdstream.cxx -*- C++ -*-
+// file      : libbutl/fdstream.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/fdstream>
+#include <libbutl/fdstream.hxx>
 
 #ifndef _WIN32
 #  include <fcntl.h>     // open(), O_*, fcntl()
@@ -12,7 +12,7 @@
 #  include <sys/stat.h>  // S_I*
 #  include <sys/types.h> // off_t
 #else
-#  include <butl/win32-utility>
+#  include <libbutl/win32-utility.hxx>
 
 #  include <io.h>       // _close(), _read(), _write(), _setmode(), _sopen(),
                         // _lseek(), _dup(), _pipe(), _get_osfhandle()
@@ -34,7 +34,7 @@
 #include <type_traits>
 #include <system_error>
 
-#include <butl/process-details>
+#include <libbutl/process-details.hxx>
 
 using namespace std;
 
diff --git a/butl/fdstream b/libbutl/fdstream.hxx
index df39808..e1f5790 100644
--- a/butl/fdstream
+++ b/libbutl/fdstream.hxx
@@ -1,9 +1,9 @@
-// file      : butl/fdstream -*- C++ -*-
+// file      : libbutl/fdstream.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_FDSTREAM
-#define BUTL_FDSTREAM
+#ifndef LIBBUTL_FDSTREAM_HXX
+#define LIBBUTL_FDSTREAM_HXX
 
 #include <string>
 #include <istream>
@@ -11,10 +11,10 @@
 #include <utility> // move()
 #include <cstdint> // uint16_t
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
-#include <butl/path>
-#include <butl/filesystem> // permissions
+#include <libbutl/path.hxx>
+#include <libbutl/filesystem.hxx> // permissions
 
 namespace butl
 {
@@ -638,6 +638,6 @@ namespace butl
   fdopen_pipe (fdopen_mode = fdopen_mode::none);
 }
 
-#include <butl/fdstream.ixx>
+#include <libbutl/fdstream.ixx>
 
-#endif // BUTL_FDSTREAM
+#endif // LIBBUTL_FDSTREAM_HXX
diff --git a/butl/fdstream.ixx b/libbutl/fdstream.ixx
index 884d190..a877699 100644
--- a/butl/fdstream.ixx
+++ b/libbutl/fdstream.ixx
@@ -1,4 +1,4 @@
-// file      : butl/fdstream.ixx -*- C++ -*-
+// file      : libbutl/fdstream.ixx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/butl/filesystem.cxx b/libbutl/filesystem.cxx
index d6e1f63..6a64073 100644
--- a/butl/filesystem.cxx
+++ b/libbutl/filesystem.cxx
@@ -1,8 +1,8 @@
-// file      : butl/filesystem.cxx -*- C++ -*-
+// file      : libbutl/filesystem.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/filesystem>
+#include <libbutl/filesystem.hxx>
 
 #ifndef _WIN32
 #  include <stdio.h>     // rename()
@@ -12,7 +12,7 @@
 #  include <sys/types.h> // stat
 #  include <sys/stat.h>  // stat(), lstat(), S_I*, mkdir(), chmod()
 #else
-#  include <butl/win32-utility>
+#  include <libbutl/win32-utility.hxx>
 
 #  include <io.h>        // _find*(), _unlink(), _chmod()
 #  include <direct.h>    // _mkdir(), _rmdir()
@@ -24,7 +24,7 @@
 #    define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #  endif
 
-#  include <butl/utility> // lcase()
+#  include <libbutl/utility.hxx> // lcase()
 #endif
 
 #include <errno.h> // errno, E*
@@ -36,10 +36,10 @@
 #include <iterator>     // reverse_iterator
 #include <system_error>
 
-#include <butl/path>
-#include <butl/utility>      // throw_generic_error()
-#include <butl/fdstream>
-#include <butl/small-vector>
+#include <libbutl/path.hxx>
+#include <libbutl/utility.hxx>      // throw_generic_error()
+#include <libbutl/fdstream.hxx>
+#include <libbutl/small-vector.hxx>
 
 using namespace std;
 
diff --git a/butl/filesystem b/libbutl/filesystem.hxx
index 0f0c71c..bf1b3af 100644
--- a/butl/filesystem
+++ b/libbutl/filesystem.hxx
@@ -1,9 +1,9 @@
-// file      : butl/filesystem -*- C++ -*-
+// file      : libbutl/filesystem.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_FILESYSTEM
-#define BUTL_FILESYSTEM
+#ifndef LIBBUTL_FILESYSTEM_HXX
+#define LIBBUTL_FILESYSTEM_HXX
 
 #ifndef _WIN32
 #  include <dirent.h> // DIR
@@ -26,10 +26,10 @@
 #include <iterator>
 #include <functional>
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
-#include <butl/path>
-#include <butl/timestamp>
+#include <libbutl/path.hxx>
+#include <libbutl/timestamp.hxx>
 
 namespace butl
 {
@@ -562,6 +562,6 @@ namespace butl
                bool follow_symlinks = true);
 }
 
-#include <butl/filesystem.ixx>
+#include <libbutl/filesystem.ixx>
 
-#endif // BUTL_FILESYSTEM
+#endif // LIBBUTL_FILESYSTEM_HXX
diff --git a/butl/filesystem.ixx b/libbutl/filesystem.ixx
index 90f1715..43fef20 100644
--- a/butl/filesystem.ixx
+++ b/libbutl/filesystem.ixx
@@ -1,4 +1,4 @@
-// file      : butl/filesystem.ixx -*- C++ -*-
+// file      : libbutl/filesystem.ixx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/butl/ft/exception b/libbutl/ft/exception.hxx
index 2dd3a38..a5f6156 100644
--- a/butl/ft/exception
+++ b/libbutl/ft/exception.hxx
@@ -1,9 +1,9 @@
-// file      : butl/ft/exception -*- C++ -*-
+// file      : libbutl/ft/exception.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_FT_EXCEPTION
-#define BUTL_FT_EXCEPTION
+#ifndef LIBBUTL_FT_EXCEPTION_HXX
+#define LIBBUTL_FT_EXCEPTION_HXX
 
 #include <cstddef>   // _LIBCPP_VERSION
 #include <exception>
@@ -36,4 +36,4 @@
 #  endif
 #endif
 
-#endif // BUTL_FT_EXCEPTION
+#endif // LIBBUTL_FT_EXCEPTION_HXX
diff --git a/butl/ft/lang b/libbutl/ft/lang.hxx
index 8cfc441..5daf9c9 100644
--- a/butl/ft/lang
+++ b/libbutl/ft/lang.hxx
@@ -1,9 +1,9 @@
-// file      : butl/ft/lang -*- C++ -*-
+// file      : libbutl/ft/lang.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_FT_LANG
-#define BUTL_FT_LANG
+#ifndef LIBBUTL_FT_LANG_HXX
+#define LIBBUTL_FT_LANG_HXX
 
 // __cpp_thread_local (extension)
 //
@@ -26,4 +26,4 @@
 #  endif
 #endif
 
-#endif // BUTL_FT_LANG
+#endif // LIBBUTL_FT_LANG_HXX
diff --git a/butl/ft/shared_mutex b/libbutl/ft/shared_mutex.hxx
index 18692c8..6c6d415 100644
--- a/butl/ft/shared_mutex
+++ b/libbutl/ft/shared_mutex.hxx
@@ -1,9 +1,9 @@
-// file      : butl/ft/shared_mutex -*- C++ -*-
+// file      : libbutl/ft/shared_mutex.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_FT_SHARED_MUTEX
-#define BUTL_FT_SHARED_MUTEX
+#ifndef LIBBUTL_FT_SHARED_MUTEX_HXX
+#define LIBBUTL_FT_SHARED_MUTEX_HXX
 
 #include <cstddef>      // _LIBCPP_VERSION
 #include <shared_mutex>
@@ -55,4 +55,4 @@
 #  endif
 #endif
 
-#endif // BUTL_FT_SHARED_MUTEX
+#endif // LIBBUTL_FT_SHARED_MUTEX_HXX
diff --git a/butl/manifest-forward b/libbutl/manifest-forward.hxx
index eb8f130..68864a1 100644
--- a/butl/manifest-forward
+++ b/libbutl/manifest-forward.hxx
@@ -1,9 +1,9 @@
-// file      : butl/manifest-forward -*- C++ -*-
+// file      : libbutl/manifest-forward.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_MANIFEST_FORWARD
-#define BUTL_MANIFEST_FORWARD
+#ifndef LIBBUTL_MANIFEST_FORWARD_HXX
+#define LIBBUTL_MANIFEST_FORWARD_HXX
 
 namespace butl
 {
@@ -12,4 +12,4 @@ namespace butl
   class manifest_name_value;
 }
 
-#endif // BUTL_MANIFEST_FORWARD
+#endif // LIBBUTL_MANIFEST_FORWARD_HXX
diff --git a/butl/manifest-parser.cxx b/libbutl/manifest-parser.cxx
index 6b50d6b..ae92d79 100644
--- a/butl/manifest-parser.cxx
+++ b/libbutl/manifest-parser.cxx
@@ -1,8 +1,8 @@
-// file      : butl/manifest-parser.cxx -*- C++ -*-
+// file      : libbutl/manifest-parser.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/manifest-parser>
+#include <libbutl/manifest-parser.hxx>
 
 #include <cassert>
 #include <sstream>
diff --git a/butl/manifest-parser b/libbutl/manifest-parser.hxx
index 94ecb7e..840549f 100644
--- a/butl/manifest-parser
+++ b/libbutl/manifest-parser.hxx
@@ -1,18 +1,18 @@
-// file      : butl/manifest-parser -*- C++ -*-
+// file      : libbutl/manifest-parser.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_MANIFEST_PARSER
-#define BUTL_MANIFEST_PARSER
+#ifndef LIBBUTL_MANIFEST_PARSER_HXX
+#define LIBBUTL_MANIFEST_PARSER_HXX
 
 #include <string>
 #include <iosfwd>
 #include <cstdint>   // uint64_t
 #include <stdexcept> // runtime_error
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
-#include <butl/char-scanner>
+#include <libbutl/char-scanner.hxx>
 
 namespace butl
 {
@@ -91,4 +91,4 @@ namespace butl
   };
 }
 
-#endif // BUTL_MANIFEST_PARSER
+#endif // LIBBUTL_MANIFEST_PARSER_HXX
diff --git a/butl/manifest-serializer.cxx b/libbutl/manifest-serializer.cxx
index 4255ee1..b152882 100644
--- a/butl/manifest-serializer.cxx
+++ b/libbutl/manifest-serializer.cxx
@@ -1,8 +1,8 @@
-// file      : butl/manifest-serializer.cxx -*- C++ -*-
+// file      : libbutl/manifest-serializer.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/manifest-serializer>
+#include <libbutl/manifest-serializer.hxx>
 
 #include <ostream>
 #include <cassert>
diff --git a/butl/manifest-serializer b/libbutl/manifest-serializer.hxx
index a4ba0bc..863fef6 100644
--- a/butl/manifest-serializer
+++ b/libbutl/manifest-serializer.hxx
@@ -1,16 +1,16 @@
-// file      : butl/manifest-serializer -*- C++ -*-
+// file      : libbutl/manifest-serializer.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_MANIFEST_SERIALIZER
-#define BUTL_MANIFEST_SERIALIZER
+#ifndef LIBBUTL_MANIFEST_SERIALIZER_HXX
+#define LIBBUTL_MANIFEST_SERIALIZER_HXX
 
 #include <string>
 #include <iosfwd>
 #include <cstddef>   // size_t
 #include <stdexcept> // runtime_error
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
 namespace butl
 {
@@ -72,4 +72,4 @@ namespace butl
   };
 }
 
-#endif // BUTL_MANIFEST_SERIALIZER
+#endif // LIBBUTL_MANIFEST_SERIALIZER_HXX
diff --git a/butl/multi-index b/libbutl/multi-index.hxx
index 15d8c14..448e1f7 100644
--- a/butl/multi-index
+++ b/libbutl/multi-index.hxx
@@ -1,9 +1,9 @@
-// file      : butl/multi-index -*- C++ -*-
+// file      : libbutl/multi-index.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_MULTI_INDEX
-#define BUTL_MULTI_INDEX
+#ifndef LIBBUTL_MULTI_INDEX_HXX
+#define LIBBUTL_MULTI_INDEX_HXX
 
 #include <utility>    // declval()
 #include <functional> // hash
@@ -56,4 +56,4 @@ namespace std
   };
 }
 
-#endif // BUTL_MULTI_INDEX
+#endif // LIBBUTL_MULTI_INDEX_HXX
diff --git a/butl/optional b/libbutl/optional.hxx
index f6cc15e..c1bc582 100644
--- a/butl/optional
+++ b/libbutl/optional.hxx
@@ -1,9 +1,9 @@
-// file      : butl/optional -*- C++ -*-
+// file      : libbutl/optional.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_OPTIONAL
-#define BUTL_OPTIONAL
+#ifndef LIBBUTL_OPTIONAL_HXX
+#define LIBBUTL_OPTIONAL_HXX
 
 #include <utility>    // move()
 #include <functional> // hash
@@ -93,4 +93,4 @@ namespace std
   };
 }
 
-#endif // BUTL_OPTIONAL
+#endif // LIBBUTL_OPTIONAL_HXX
diff --git a/butl/pager.cxx b/libbutl/pager.cxx
index 003c65c..3910443 100644
--- a/butl/pager.cxx
+++ b/libbutl/pager.cxx
@@ -1,8 +1,8 @@
-// file      : butl/pager.cxx -*- C++ -*-
+// file      : libbutl/pager.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/pager>
+#include <libbutl/pager.hxx>
 
 #ifndef _WIN32
 #  include <unistd.h>    // STDOUT_FILENO
@@ -11,15 +11,15 @@
 #  include <chrono>
 #  include <thread> // this_thread::sleep_for()
 #else
-#  include <butl/win32-utility>
+#  include <libbutl/win32-utility.hxx>
 #endif
 
 #include <cstring>      // strchr()
 #include <utility>      // move()
 
-#include <butl/utility>  // operator<<(ostream, exception),
-                         // throw_generic_error()
-#include <butl/fdstream> // fdclose()
+#include <libbutl/utility.hxx>  // operator<<(ostream, exception),
+                                // throw_generic_error()
+#include <libbutl/fdstream.hxx> // fdclose()
 
 using namespace std;
 
diff --git a/butl/pager b/libbutl/pager.hxx
index 320fe48..deca922 100644
--- a/butl/pager
+++ b/libbutl/pager.hxx
@@ -1,18 +1,18 @@
-// file      : butl/pager -*- C++ -*-
+// file      : libbutl/pager.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_PAGER
-#define BUTL_PAGER
+#ifndef LIBBUTL_PAGER_HXX
+#define LIBBUTL_PAGER_HXX
 
 #include <string>
 #include <vector>
 #include <iostream>
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
-#include <butl/process>
-#include <butl/fdstream>
+#include <libbutl/process.hxx>
+#include <libbutl/fdstream.hxx>
 
 namespace butl
 {
@@ -85,4 +85,4 @@ namespace butl
   };
 }
 
-#endif // BUTL_PAGER
+#endif // LIBBUTL_PAGER_HXX
diff --git a/butl/path-io b/libbutl/path-io.hxx
index 1909dd9..719456d 100644
--- a/butl/path-io
+++ b/libbutl/path-io.hxx
@@ -1,13 +1,13 @@
-// file      : butl/path-io -*- C++ -*-
+// file      : libbutl/path-io.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_PATH_IO
-#define BUTL_PATH_IO
+#ifndef LIBBUTL_PATH_IO_HXX
+#define LIBBUTL_PATH_IO_HXX
 
 #include <ostream>
 
-#include <butl/path>
+#include <libbutl/path.hxx>
 
 namespace butl
 {
@@ -26,4 +26,4 @@ namespace butl
   }
 }
 
-#endif // BUTL_PATH_IO
+#endif // LIBBUTL_PATH_IO_HXX
diff --git a/butl/path-map b/libbutl/path-map.hxx
index 0b6fd6b..7a966ab 100644
--- a/butl/path-map
+++ b/libbutl/path-map.hxx
@@ -1,14 +1,14 @@
-// file      : butl/path-map -*- C++ -*-
+// file      : libbutl/path-map.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_PATH_MAP
-#define BUTL_PATH_MAP
+#ifndef LIBBUTL_PATH_MAP_HXX
+#define LIBBUTL_PATH_MAP_HXX
 
 #include <algorithm> // min()
 
-#include <butl/path>
-#include <butl/prefix-map>
+#include <libbutl/path.hxx>
+#include <libbutl/prefix-map.hxx>
 
 namespace butl
 {
@@ -117,4 +117,4 @@ namespace butl
     prefix_map<dir_path, T, dir_path::traits::directory_separator>;
 }
 
-#endif // BUTL_PATH_MAP
+#endif // LIBBUTL_PATH_MAP_HXX
diff --git a/butl/path.cxx b/libbutl/path.cxx
index dfa812b..61088bf 100644
--- a/butl/path.cxx
+++ b/libbutl/path.cxx
@@ -1,11 +1,11 @@
-// file      : butl/path.cxx -*- C++ -*-
+// file      : libbutl/path.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/path>
+#include <libbutl/path.hxx>
 
 #ifdef _WIN32
-#  include <butl/win32-utility>
+#  include <libbutl/win32-utility.hxx>
 
 #  include <io.h>       // _find*()
 #  include <stdlib.h>   // _MAX_PATH, _wgetenv()
@@ -29,10 +29,10 @@
 #include <cassert>
 #include <cstring> // strcpy()
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
-#include <butl/utility> // throw_*_error()
-#include <butl/process>
+#include <libbutl/utility.hxx> // throw_*_error()
+#include <libbutl/process.hxx>
 
 #ifndef _WIN32
 #  ifndef PATH_MAX
diff --git a/butl/path b/libbutl/path.hxx
index 6d054d5..56e43cf 100644
--- a/butl/path
+++ b/libbutl/path.hxx
@@ -1,9 +1,9 @@
-// file      : butl/path -*- C++ -*-
+// file      : libbutl/path.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_PATH
-#define BUTL_PATH
+#ifndef LIBBUTL_PATH_HXX
+#define LIBBUTL_PATH_HXX
 
 #include <string>
 #include <cstddef>    // ptrdiff_t
@@ -12,9 +12,9 @@
 #include <exception>
 #include <functional> // hash
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
-#include <butl/utility>
+#include <libbutl/utility.hxx>
 
 namespace butl
 {
@@ -1130,7 +1130,7 @@ namespace std
   };
 }
 
-#include <butl/path.ixx>
-#include <butl/path.txx>
+#include <libbutl/path.ixx>
+#include <libbutl/path.txx>
 
-#endif // BUTL_PATH
+#endif // LIBBUTL_PATH_HXX
diff --git a/butl/path.ixx b/libbutl/path.ixx
index b60f206..c140d1e 100644
--- a/butl/path.ixx
+++ b/libbutl/path.ixx
@@ -1,4 +1,4 @@
-// file      : butl/path.ixx -*- C++ -*-
+// file      : libbutl/path.ixx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/butl/path.txx b/libbutl/path.txx
index 3edd076..17673f8 100644
--- a/butl/path.txx
+++ b/libbutl/path.txx
@@ -1,4 +1,4 @@
-// file      : butl/path.txx -*- C++ -*-
+// file      : libbutl/path.txx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/butl/prefix-map b/libbutl/prefix-map.hxx
index b350752..0404f72 100644
--- a/butl/prefix-map
+++ b/libbutl/prefix-map.hxx
@@ -1,9 +1,9 @@
-// file      : butl/prefix-map -*- C++ -*-
+// file      : libbutl/prefix-map.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_PREFIX_MAP
-#define BUTL_PREFIX_MAP
+#ifndef LIBBUTL_PREFIX_MAP_HXX
+#define LIBBUTL_PREFIX_MAP_HXX
 
 #include <map>
 #include <string>
@@ -133,6 +133,6 @@ namespace butl
     prefix_map_impl<std::multimap<K, T, compare_prefix<K>>, D>;
 }
 
-#include <butl/prefix-map.txx>
+#include <libbutl/prefix-map.txx>
 
-#endif // BUTL_PREFIX_MAP
+#endif // LIBBUTL_PREFIX_MAP_HXX
diff --git a/butl/prefix-map.txx b/libbutl/prefix-map.txx
index 76aba4d..f3cd29f 100644
--- a/butl/prefix-map.txx
+++ b/libbutl/prefix-map.txx
@@ -1,4 +1,4 @@
-// file      : butl/prefix-map.txx -*- C++ -*-
+// file      : libbutl/prefix-map.txx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/butl/process-details b/libbutl/process-details.hxx
index b07ceff..b078cbb 100644
--- a/butl/process-details
+++ b/libbutl/process-details.hxx
@@ -1,13 +1,13 @@
-// file      : butl/process-details -*- C++ -*-
+// file      : libbutl/process-details.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_PROCESS_DETAILS
-#define BUTL_PROCESS_DETAILS
+#ifndef LIBBUTL_PROCESS_DETAILS_HXX
+#define LIBBUTL_PROCESS_DETAILS_HXX
 
 #include <mutex>
 
-#include <butl/ft/shared_mutex>
+#include <libbutl/ft/shared_mutex.hxx>
 #if defined(__cpp_lib_shared_mutex) || defined(__cpp_lib_shared_timed_mutex)
 #  include <shared_mutex>
 #endif
@@ -46,4 +46,4 @@ namespace butl
   extern shared_mutex process_spawn_mutex;
 }
 
-#endif // BUTL_PROCESS_DETAILS
+#endif // LIBBUTL_PROCESS_DETAILS_HXX
diff --git a/butl/process-io b/libbutl/process-io.hxx
index 1212b22..b70080c 100644
--- a/butl/process-io
+++ b/libbutl/process-io.hxx
@@ -1,13 +1,13 @@
-// file      : butl/process-io -*- C++ -*-
+// file      : libbutl/process-io.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_PROCESS_IO
-#define BUTL_PROCESS_IO
+#ifndef LIBBUTL_PROCESS_IO_HXX
+#define LIBBUTL_PROCESS_IO_HXX
 
 #include <ostream>
 
-#include <butl/process>
+#include <libbutl/process.hxx>
 
 namespace butl
 {
@@ -25,4 +25,4 @@ namespace butl
   }
 }
 
-#endif // BUTL_PROCESS_IO
+#endif // LIBBUTL_PROCESS_IO_HXX
diff --git a/butl/process-run.cxx b/libbutl/process-run.cxx
index c3b2856..ce5ab20 100644
--- a/butl/process-run.cxx
+++ b/libbutl/process-run.cxx
@@ -1,8 +1,8 @@
-// file      : butl/process-run.cxx -*- C++ -*-
+// file      : libbutl/process-run.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/process>
+#include <libbutl/process.hxx>
 
 #include <cstdlib>  // exit()
 #include <iostream> // cerr
diff --git a/butl/process-run.txx b/libbutl/process-run.txx
index 1d25af1..28c44cf 100644
--- a/butl/process-run.txx
+++ b/libbutl/process-run.txx
@@ -1,4 +1,4 @@
-// file      : butl/process-run.txx -*- C++ -*-
+// file      : libbutl/process-run.txx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/butl/process.cxx b/libbutl/process.cxx
index 940560c..08abc22 100644
--- a/butl/process.cxx
+++ b/libbutl/process.cxx
@@ -1,8 +1,8 @@
-// file      : butl/process.cxx -*- C++ -*-
+// file      : libbutl/process.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/process>
+#include <libbutl/process.hxx>
 
 #ifndef _WIN32
 #  include <unistd.h>    // execvp, fork, dup2, pipe, chdir, *_FILENO, getpid
@@ -10,7 +10,7 @@
 #  include <sys/types.h> // _stat
 #  include <sys/stat.h>  // _stat(), S_IS*
 #else
-#  include <butl/win32-utility>
+#  include <libbutl/win32-utility.hxx>
 
 #  include <psapi.h>     // EnumProcessModules(), etc
 
@@ -29,7 +29,7 @@
 
 #  include <cstdlib> // getenv(), __argv[]
 
-#  include <butl/small-vector>
+#  include <libbutl/small-vector.hxx>
 #endif
 
 #include <errno.h>
@@ -41,9 +41,9 @@
 #include <utility>  // move()
 #include <ostream>
 
-#include <butl/utility>         // casecmp()
-#include <butl/fdstream>        // fdnull()
-#include <butl/process-details>
+#include <libbutl/utility.hxx>         // casecmp()
+#include <libbutl/fdstream.hxx>        // fdnull()
+#include <libbutl/process-details.hxx>
 
 #include <iostream>
 
diff --git a/butl/process b/libbutl/process.hxx
index 9c0d060..799313e 100644
--- a/butl/process
+++ b/libbutl/process.hxx
@@ -1,9 +1,9 @@
-// file      : butl/process -*- C++ -*-
+// file      : libbutl/process.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_PROCESS
-#define BUTL_PROCESS
+#ifndef LIBBUTL_PROCESS_HXX
+#define LIBBUTL_PROCESS_HXX
 
 #ifndef _WIN32
 #  include <sys/types.h> // pid_t
@@ -15,12 +15,12 @@
 #include <cstdint>      // uint32_t
 #include <system_error>
 
-#include <butl/path>
-#include <butl/export>
-#include <butl/optional>
-#include <butl/fdstream>     // auto_fd, fdpipe
-#include <butl/vector-view>
-#include <butl/small-vector>
+#include <libbutl/path.hxx>
+#include <libbutl/export.hxx>
+#include <libbutl/optional.hxx>
+#include <libbutl/fdstream.hxx>     // auto_fd, fdpipe
+#include <libbutl/vector-view.hxx>
+#include <libbutl/small-vector.hxx>
 
 namespace butl
 {
@@ -562,8 +562,8 @@ namespace butl
   }
 }
 
-#include <butl/process.ixx>
+#include <libbutl/process.ixx>
 
-#include <butl/process-run.txx>
+#include <libbutl/process-run.txx>
 
-#endif // BUTL_PROCESS
+#endif // LIBBUTL_PROCESS_HXX
diff --git a/butl/process.ixx b/libbutl/process.ixx
index 40f6361..9a09487 100644
--- a/butl/process.ixx
+++ b/libbutl/process.ixx
@@ -1,4 +1,4 @@
-// file      : butl/process.ixx -*- C++ -*-
+// file      : libbutl/process.ixx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/butl/sendmail.cxx b/libbutl/sendmail.cxx
index 103bab5..5b1c863 100644
--- a/butl/sendmail.cxx
+++ b/libbutl/sendmail.cxx
@@ -1,8 +1,8 @@
-// file      : butl/sendmail.cxx -*- C++ -*-
+// file      : libbutl/sendmail.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/sendmail>
+#include <libbutl/sendmail.hxx>
 
 using namespace std;
 
diff --git a/butl/sendmail b/libbutl/sendmail.hxx
index fe86285..8ff264d 100644
--- a/butl/sendmail
+++ b/libbutl/sendmail.hxx
@@ -1,17 +1,17 @@
-// file      : butl/sendmail -*- C++ -*-
+// file      : libbutl/sendmail.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_SENDMAIL
-#define BUTL_SENDMAIL
+#ifndef LIBBUTL_SENDMAIL_HXX
+#define LIBBUTL_SENDMAIL_HXX
 
 #include <string>
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
-#include <butl/process>
-#include <butl/fdstream>
-#include <butl/small-vector>
+#include <libbutl/process.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/small-vector.hxx>
 
 namespace butl
 {
@@ -86,6 +86,6 @@ namespace butl
   };
 }
 
-#include <butl/sendmail.ixx>
+#include <libbutl/sendmail.ixx>
 
-#endif // BUTL_SENDMAIL
+#endif // LIBBUTL_SENDMAIL_HXX
diff --git a/butl/sendmail.ixx b/libbutl/sendmail.ixx
index 2e982c1..067153c 100644
--- a/butl/sendmail.ixx
+++ b/libbutl/sendmail.ixx
@@ -1,4 +1,4 @@
-// file      : butl/sendmail.ixx -*- C++ -*-
+// file      : libbutl/sendmail.ixx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/butl/sha256.cxx b/libbutl/sha256.cxx
index fa14d0e..09f6844 100644
--- a/butl/sha256.cxx
+++ b/libbutl/sha256.cxx
@@ -1,8 +1,8 @@
-// file      : butl/sha256.cxx -*- C++ -*-
+// file      : libbutl/sha256.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/sha256>
+#include <libbutl/sha256.hxx>
 
 // C interface for sha256c.
 //
@@ -12,7 +12,7 @@
 #include <cctype>    // isxdigit()
 #include <stdexcept> // invalid_argument
 
-#include <butl/utility> // ucase(), lcase()
+#include <libbutl/utility.hxx> // ucase(), lcase()
 
 using SHA256_CTX = butl::sha256::context;
 
diff --git a/butl/sha256 b/libbutl/sha256.hxx
index 1c20a57..eea2b23 100644
--- a/butl/sha256
+++ b/libbutl/sha256.hxx
@@ -1,16 +1,16 @@
-// file      : butl/sha256 -*- C++ -*-
+// file      : libbutl/sha256.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_SHA256
-#define BUTL_SHA256
+#ifndef LIBBUTL_SHA256_HXX
+#define LIBBUTL_SHA256_HXX
 
 #include <string>
 #include <cstring> // strlen()
 #include <cstdint>
 #include <cstddef> // size_t
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
 namespace butl
 {
@@ -98,4 +98,4 @@ namespace butl
   fingerprint_to_sha256 (const std::string&);
 }
 
-#endif // BUTL_SHA256
+#endif // LIBBUTL_SHA256_HXX
diff --git a/butl/sha256c.c b/libbutl/sha256c.c
index 156751c..156751c 100644
--- a/butl/sha256c.c
+++ b/libbutl/sha256c.c
diff --git a/butl/sha256c.c.orig b/libbutl/sha256c.c.orig
index da9b02c..da9b02c 100644
--- a/butl/sha256c.c.orig
+++ b/libbutl/sha256c.c.orig
diff --git a/butl/small-vector b/libbutl/small-vector.hxx
index 3e50735..f910ad9 100644
--- a/butl/small-vector
+++ b/libbutl/small-vector.hxx
@@ -1,9 +1,9 @@
-// file      : butl/small-vector -*- C++ -*-
+// file      : libbutl/small-vector.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_SMALL_VECTOR
-#define BUTL_SMALL_VECTOR
+#ifndef LIBBUTL_SMALL_VECTOR_HXX
+#define LIBBUTL_SMALL_VECTOR_HXX
 
 #include <vector>
 #include <cassert>
@@ -280,4 +280,4 @@ namespace butl
   };
 }
 
-#endif // BUTL_SMALL_VECTOR
+#endif // LIBBUTL_SMALL_VECTOR_HXX
diff --git a/butl/standard-version.cxx b/libbutl/standard-version.cxx
index cc91f19..124f3de 100644
--- a/butl/standard-version.cxx
+++ b/libbutl/standard-version.cxx
@@ -1,8 +1,8 @@
-// file      : butl/standard-version.cxx -*- C++ -*-
+// file      : libbutl/standard-version.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/standard-version>
+#include <libbutl/standard-version.hxx>
 
 #include <cassert>
 #include <cstdlib>   // strtoull()
@@ -10,7 +10,7 @@
 #include <utility>   // move()
 #include <stdexcept> // invalid_argument
 
-#include <butl/utility> // alnum()
+#include <libbutl/utility.hxx> // alnum()
 
 using namespace std;
 
diff --git a/butl/standard-version b/libbutl/standard-version.hxx
index f609215..22078f5 100644
--- a/butl/standard-version
+++ b/libbutl/standard-version.hxx
@@ -1,18 +1,18 @@
-// file      : butl/standard-version -*- C++ -*-
+// file      : libbutl/standard-version.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_STANDARD_VERSION
-#define BUTL_STANDARD_VERSION
+#ifndef LIBBUTL_STANDARD_VERSION_HXX
+#define LIBBUTL_STANDARD_VERSION_HXX
 
 #include <string>
 #include <cstdint> // uint*_t
 #include <cstddef> // size_t
 #include <ostream>
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
-#include <butl/optional>
+#include <libbutl/optional.hxx>
 
 namespace butl
 {
@@ -252,6 +252,6 @@ namespace butl
   }
 }
 
-#include <butl/standard-version.ixx>
+#include <libbutl/standard-version.ixx>
 
-#endif // BUTL_STANDARD_VERSION
+#endif // LIBBUTL_STANDARD_VERSION_HXX
diff --git a/butl/standard-version.ixx b/libbutl/standard-version.ixx
index 6908ed5..5f656fa 100644
--- a/butl/standard-version.ixx
+++ b/libbutl/standard-version.ixx
@@ -1,4 +1,4 @@
-// file      : butl/standard-version.ixx -*- C++ -*-
+// file      : libbutl/standard-version.ixx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/butl/string-parser.cxx b/libbutl/string-parser.cxx
index 9228d66..c579db0 100644
--- a/butl/string-parser.cxx
+++ b/libbutl/string-parser.cxx
@@ -1,8 +1,8 @@
-// file      : butl/string-parser.cxx -*- C++ -*-
+// file      : libbutl/string-parser.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/string-parser>
+#include <libbutl/string-parser.hxx>
 
 #include <utility> // move()
 
diff --git a/butl/string-parser b/libbutl/string-parser.hxx
index 74391cd..56ba348 100644
--- a/butl/string-parser
+++ b/libbutl/string-parser.hxx
@@ -1,9 +1,9 @@
-// file      : butl/string-parser -*- C++ -*-
+// file      : libbutl/string-parser.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_STRING_PARSER
-#define BUTL_STRING_PARSER
+#ifndef LIBBUTL_STRING_PARSER_HXX
+#define LIBBUTL_STRING_PARSER_HXX
 
 #include <string>
 #include <vector>
@@ -11,7 +11,7 @@
 #include <utility>   // pair
 #include <stdexcept> // invalid_argument
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
 namespace butl
 {
@@ -53,4 +53,4 @@ namespace butl
   };
 }
 
-#endif // BUTL_STRING_PARSER
+#endif // LIBBUTL_STRING_PARSER_HXX
diff --git a/butl/string-table b/libbutl/string-table.hxx
index a1d60c3..6898a52 100644
--- a/butl/string-table
+++ b/libbutl/string-table.hxx
@@ -1,17 +1,17 @@
-// file      : butl/string-table -*- C++ -*-
+// file      : libbutl/string-table.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_STRING_TABLE
-#define BUTL_STRING_TABLE
+#ifndef LIBBUTL_STRING_TABLE_HXX
+#define LIBBUTL_STRING_TABLE_HXX
 
 #include <vector>
 #include <string>
 #include <unordered_map>
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
-#include <butl/multi-index>
+#include <libbutl/multi-index.hxx>
 
 namespace butl
 {
@@ -93,6 +93,6 @@ namespace butl
   };
 }
 
-#include <butl/string-table.txx>
+#include <libbutl/string-table.txx>
 
-#endif // BUTL_STRING_TABLE
+#endif // LIBBUTL_STRING_TABLE_HXX
diff --git a/butl/string-table.txx b/libbutl/string-table.txx
index 8c18f71..b248ef3 100644
--- a/butl/string-table.txx
+++ b/libbutl/string-table.txx
@@ -1,4 +1,4 @@
-// file      : butl/string-table.txx -*- C++ -*-
+// file      : libbutl/string-table.txx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/butl/strptime.c b/libbutl/strptime.c
index 8bbfac5..8bbfac5 100644
--- a/butl/strptime.c
+++ b/libbutl/strptime.c
diff --git a/butl/strptime.c.orig b/libbutl/strptime.c.orig
index 2be6358..2be6358 100644
--- a/butl/strptime.c.orig
+++ b/libbutl/strptime.c.orig
diff --git a/butl/tab-parser.cxx b/libbutl/tab-parser.cxx
index 4743e69..bf0a7dd 100644
--- a/butl/tab-parser.cxx
+++ b/libbutl/tab-parser.cxx
@@ -1,13 +1,13 @@
-// file      : butl/tab-parser.cxx -*- C++ -*-
+// file      : libbutl/tab-parser.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/tab-parser>
+#include <libbutl/tab-parser.hxx>
 
 #include <cassert>
 #include <sstream>
 
-#include <butl/string-parser>
+#include <libbutl/string-parser.hxx>
 
 using namespace std;
 
diff --git a/butl/tab-parser b/libbutl/tab-parser.hxx
index f140b71..311c54b 100644
--- a/butl/tab-parser
+++ b/libbutl/tab-parser.hxx
@@ -1,9 +1,9 @@
-// file      : butl/tab-parser -*- C++ -*-
+// file      : libbutl/tab-parser.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_TAB_PARSER
-#define BUTL_TAB_PARSER
+#ifndef LIBBUTL_TAB_PARSER_HXX
+#define LIBBUTL_TAB_PARSER_HXX
 
 #include <string>
 #include <vector>
@@ -11,7 +11,7 @@
 #include <cstdint>   // uint64_t
 #include <stdexcept> // runtime_error
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
 namespace butl
 {
@@ -69,4 +69,4 @@ namespace butl
   };
 }
 
-#endif // BUTL_TAB_PARSER
+#endif // LIBBUTL_TAB_PARSER_HXX
diff --git a/butl/target-triplet.cxx b/libbutl/target-triplet.cxx
index 7ebe9ec..fc805a4 100644
--- a/butl/target-triplet.cxx
+++ b/libbutl/target-triplet.cxx
@@ -1,8 +1,8 @@
-// file      : butl/target-triplet.cxx -*- C++ -*-
+// file      : libbutl/target-triplet.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/target-triplet>
+#include <libbutl/target-triplet.hxx>
 
 #include <stdexcept> // invalid_argument
 
diff --git a/butl/target-triplet b/libbutl/target-triplet.hxx
index 284b47f..214a781 100644
--- a/butl/target-triplet
+++ b/libbutl/target-triplet.hxx
@@ -1,14 +1,14 @@
-// file      : butl/target-triplet -*- C++ -*-
+// file      : libbutl/target-triplet.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_TARGET_TRIPLET
-#define BUTL_TARGET_TRIPLET
+#ifndef LIBBUTL_TARGET_TRIPLET_HXX
+#define LIBBUTL_TARGET_TRIPLET_HXX
 
 #include <string>
 #include <ostream>
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
 namespace butl
 {
@@ -152,4 +152,4 @@ namespace butl
   }
 }
 
-#endif // BUTL_TARGET_TRIPLET
+#endif // LIBBUTL_TARGET_TRIPLET_HXX
diff --git a/butl/timelocal.c b/libbutl/timelocal.c
index 7194341..7194341 100644
--- a/butl/timelocal.c
+++ b/libbutl/timelocal.c
diff --git a/butl/timelocal.c.orig b/libbutl/timelocal.c.orig
index 48c3509..48c3509 100644
--- a/butl/timelocal.c.orig
+++ b/libbutl/timelocal.c.orig
diff --git a/butl/timelocal.h b/libbutl/timelocal.h
index d9b77b9..d9b77b9 100644
--- a/butl/timelocal.h
+++ b/libbutl/timelocal.h
diff --git a/butl/timelocal.h.orig b/libbutl/timelocal.h.orig
index 2e44415..2e44415 100644
--- a/butl/timelocal.h.orig
+++ b/libbutl/timelocal.h.orig
diff --git a/butl/timestamp.cxx b/libbutl/timestamp.cxx
index 971f1ef..1f12f41 100644
--- a/butl/timestamp.cxx
+++ b/libbutl/timestamp.cxx
@@ -1,8 +1,8 @@
-// file      : butl/timestamp.cxx -*- C++ -*-
+// file      : libbutl/timestamp.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/timestamp>
+#include <libbutl/timestamp.hxx>
 
 #include <time.h>  // localtime_{r,s}(), gmtime_{r,s}(), strptime(), timegm()
 #include <errno.h> // EINVAL
@@ -16,7 +16,7 @@
 #include <utility>      // pair, make_pair()
 #include <stdexcept>    // runtime_error
 
-#include <butl/utility> // throw_generic_error()
+#include <libbutl/utility.hxx> // throw_generic_error()
 
 using namespace std;
 
diff --git a/butl/timestamp b/libbutl/timestamp.hxx
index fde789f..1a960b7 100644
--- a/butl/timestamp
+++ b/libbutl/timestamp.hxx
@@ -1,16 +1,16 @@
-// file      : butl/timestamp -*- C++ -*-
+// file      : libbutl/timestamp.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_TIMESTAMP
-#define BUTL_TIMESTAMP
+#ifndef LIBBUTL_TIMESTAMP_HXX
+#define LIBBUTL_TIMESTAMP_HXX
 
 #include <chrono>
 #include <iosfwd>
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
-#include <butl/path>
+#include <libbutl/path.hxx>
 
 namespace butl
 {
@@ -143,4 +143,4 @@ namespace butl
                const char** end = nullptr);
 }
 
-#endif // BUTL_TIMESTAMP
+#endif // LIBBUTL_TIMESTAMP_HXX
diff --git a/butl/utility.cxx b/libbutl/utility.cxx
index 03045da..8ce2cbc 100644
--- a/butl/utility.cxx
+++ b/libbutl/utility.cxx
@@ -1,11 +1,11 @@
-// file      : butl/utility.cxx -*- C++ -*-
+// file      : libbutl/utility.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/utility>
+#include <libbutl/utility.hxx>
 
 #ifdef _WIN32
-#  include <butl/win32-utility>
+#  include <libbutl/win32-utility.hxx>
 #endif
 
 #include <string>
diff --git a/butl/utility b/libbutl/utility.hxx
index 673b715..448f386 100644
--- a/butl/utility
+++ b/libbutl/utility.hxx
@@ -1,22 +1,22 @@
-// file      : butl/utility -*- C++ -*-
+// file      : libbutl/utility.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_UTILITY
-#define BUTL_UTILITY
+#ifndef LIBBUTL_UTILITY_HXX
+#define LIBBUTL_UTILITY_HXX
 
 #include <string>
-#include <iosfwd>            // ostream
-#include <cstddef>           // size_t
-#include <utility>           // move(), forward()
-#include <cstring>           // strcmp(), strlen()
-#include <butl/ft/exception> // uncaught_exceptions
-#include <exception>         // exception, uncaught_exception(s)()
-#include <butl/ft/lang>      // thread_local
+#include <iosfwd>                   // ostream
+#include <cstddef>                  // size_t
+#include <utility>                  // move(), forward()
+#include <cstring>                  // strcmp(), strlen()
+#include <libbutl/ft/exception.hxx> // uncaught_exceptions
+#include <exception>                // exception, uncaught_exception(s)()
+#include <libbutl/ft/lang.hxx>      // thread_local
 
 //#include <functional> // hash
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
 namespace butl
 {
@@ -259,6 +259,6 @@ namespace std
   operator<< (ostream&, const exception&);
 }
 
-#include <butl/utility.ixx>
+#include <libbutl/utility.ixx>
 
-#endif // BUTL_UTILITY
+#endif // LIBBUTL_UTILITY_HXX
diff --git a/butl/utility.ixx b/libbutl/utility.ixx
index 88d57b3..e45a729 100644
--- a/butl/utility.ixx
+++ b/libbutl/utility.ixx
@@ -1,4 +1,4 @@
-// file      : butl/utility.ixx -*- C++ -*-
+// file      : libbutl/utility.ixx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/butl/vector-view b/libbutl/vector-view.hxx
index e8a24b5..98b314c 100644
--- a/butl/vector-view
+++ b/libbutl/vector-view.hxx
@@ -1,9 +1,9 @@
-// file      : butl/vector-view -*- C++ -*-
+// file      : libbutl/vector-view.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_VECTOR_VIEW
-#define BUTL_VECTOR_VIEW
+#ifndef LIBBUTL_VECTOR_VIEW_HXX
+#define LIBBUTL_VECTOR_VIEW_HXX
 
 #include <vector>
 #include <cstddef>   // size_t, ptrdiff_t
@@ -117,4 +117,4 @@ namespace butl
   template<typename T> bool operator>= (vector_view<T> l, vector_view<T> r);
 }
 
-#endif // BUTL_VECTOR_VIEW
+#endif // LIBBUTL_VECTOR_VIEW_HXX
diff --git a/butl/version.in b/libbutl/version.hxx.in
index ef6b7f7..780d21a 100644
--- a/butl/version.in
+++ b/libbutl/version.hxx.in
@@ -1,4 +1,4 @@
-// file      : butl/version.in -*- C++ -*-
+// file      : libbutl/version.hxx.in -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/butl/win32-utility.cxx b/libbutl/win32-utility.cxx
index 10b1947..c16f8cc 100644
--- a/butl/win32-utility.cxx
+++ b/libbutl/win32-utility.cxx
@@ -1,8 +1,8 @@
-// file      : butl/win32-utility.cxx -*- C++ -*-
+// file      : libbutl/win32-utility.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/win32-utility>
+#include <libbutl/win32-utility.hxx>
 
 // Note that while we exclude it from the buildfile-based builds, we still
 // need these guards for build2 bootstrap.
diff --git a/butl/win32-utility b/libbutl/win32-utility.hxx
index fb0146f..cdaf846 100644
--- a/butl/win32-utility
+++ b/libbutl/win32-utility.hxx
@@ -1,9 +1,9 @@
-// file      : butl/win32-utility -*- C++ -*-
+// file      : libbutl/win32-utility.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUTL_WIN32_UTILITY
-#define BUTL_WIN32_UTILITY
+#ifndef LIBBUTL_WIN32_UTILITY_HXX
+#define LIBBUTL_WIN32_UTILITY_HXX
 
 // Use this header to include <windows.h> and a couple of Win32-specific
 // utilities.
@@ -35,7 +35,7 @@
 
 #include <string>
 
-#include <butl/export>
+#include <libbutl/export.hxx>
 
 namespace butl
 {
@@ -51,4 +51,4 @@ namespace butl
 
 #endif // _WIN32
 
-#endif // BUTL_WIN32_UTILITY
+#endif // LIBBUTL_WIN32_UTILITY_HXX
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/base64/buildfile b/tests/base64/buildfile
index 223ccff..bfa9c0e 100644
--- a/tests/base64/buildfile
+++ b/tests/base64/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/base64/driver.cxx b/tests/base64/driver.cxx
index 64103ed..bbcdc11 100644
--- a/tests/base64/driver.cxx
+++ b/tests/base64/driver.cxx
@@ -6,7 +6,7 @@
 #include <sstream>
 #include <cassert>
 
-#include <butl/base64>
+#include <libbutl/base64.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/cpfile/buildfile b/tests/cpfile/buildfile
index 1075026..30c237d 100644
--- a/tests/cpfile/buildfile
+++ b/tests/cpfile/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/cpfile/driver.cxx b/tests/cpfile/driver.cxx
index 5b8f366..6fa1567 100644
--- a/tests/cpfile/driver.cxx
+++ b/tests/cpfile/driver.cxx
@@ -7,9 +7,9 @@
 #include <cassert>
 #include <system_error>
 
-#include <butl/path>
-#include <butl/fdstream>
-#include <butl/filesystem>
+#include <libbutl/path.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/filesystem.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/curl/buildfile b/tests/curl/buildfile
index 6b19bea..698ff81 100644
--- a/tests/curl/buildfile
+++ b/tests/curl/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl} test{testscript}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/curl/driver.cxx b/tests/curl/driver.cxx
index 3711e71..b5fc400 100644
--- a/tests/curl/driver.cxx
+++ b/tests/curl/driver.cxx
@@ -5,9 +5,9 @@
 #include <iostream>
 #include <system_error>
 
-#include <butl/path>
-#include <butl/utility>    // operator<<(ostream, exception)
-#include <butl/curl>
+#include <libbutl/path.hxx>
+#include <libbutl/utility.hxx> // operator<<(ostream, exception)
+#include <libbutl/curl.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/dir-iterator/buildfile b/tests/dir-iterator/buildfile
index 8952e47..fcc1441 100644
--- a/tests/dir-iterator/buildfile
+++ b/tests/dir-iterator/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl} test{testscript}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/dir-iterator/driver.cxx b/tests/dir-iterator/driver.cxx
index d3d25b8..f584c68 100644
--- a/tests/dir-iterator/driver.cxx
+++ b/tests/dir-iterator/driver.cxx
@@ -6,10 +6,10 @@
 #include <cassert>
 #include <iostream>
 
-#include <butl/path>
-#include <butl/path-io>
-#include <butl/utility>    // operator<<(ostream, exception)
-#include <butl/filesystem>
+#include <libbutl/path.hxx>
+#include <libbutl/path-io.hxx>
+#include <libbutl/utility.hxx>    // operator<<(ostream, exception)
+#include <libbutl/filesystem.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/fdstream/buildfile b/tests/fdstream/buildfile
index aea7247..de23023 100644
--- a/tests/fdstream/buildfile
+++ b/tests/fdstream/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/fdstream/driver.cxx b/tests/fdstream/driver.cxx
index f3729cb..c8748b1 100644
--- a/tests/fdstream/driver.cxx
+++ b/tests/fdstream/driver.cxx
@@ -18,11 +18,11 @@
 #include <iostream>
 #include <exception>
 
-#include <butl/path>
-#include <butl/process>
-#include <butl/fdstream>
-#include <butl/timestamp>
-#include <butl/filesystem>
+#include <libbutl/path.hxx>
+#include <libbutl/process.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/timestamp.hxx>
+#include <libbutl/filesystem.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/link/buildfile b/tests/link/buildfile
index b5d1bd3..ad04cb0 100644
--- a/tests/link/buildfile
+++ b/tests/link/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/link/driver.cxx b/tests/link/driver.cxx
index 3cade44..a5e94bb 100644
--- a/tests/link/driver.cxx
+++ b/tests/link/driver.cxx
@@ -7,9 +7,9 @@
 #include <utility>      // pair
 #include <system_error>
 
-#include <butl/path>
-#include <butl/fdstream>
-#include <butl/filesystem>
+#include <libbutl/path.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/filesystem.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/manifest-parser/buildfile b/tests/manifest-parser/buildfile
index 0997495..0599fc1 100644
--- a/tests/manifest-parser/buildfile
+++ b/tests/manifest-parser/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/manifest-parser/driver.cxx b/tests/manifest-parser/driver.cxx
index 76d1579..7642f4b 100644
--- a/tests/manifest-parser/driver.cxx
+++ b/tests/manifest-parser/driver.cxx
@@ -9,7 +9,7 @@
 #include <sstream>
 #include <iostream>
 
-#include <butl/manifest-parser>
+#include <libbutl/manifest-parser.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/manifest-roundtrip/buildfile b/tests/manifest-roundtrip/buildfile
index 0bf7eb6..71a3eb8 100644
--- a/tests/manifest-roundtrip/buildfile
+++ b/tests/manifest-roundtrip/buildfile
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl}
 exe{driver}: test.roundtrip = manifest
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/manifest-roundtrip/driver.cxx b/tests/manifest-roundtrip/driver.cxx
index 69fcf03..2068409 100644
--- a/tests/manifest-roundtrip/driver.cxx
+++ b/tests/manifest-roundtrip/driver.cxx
@@ -5,10 +5,10 @@
 #include <cassert>
 #include <iostream>
 
-#include <butl/utility>             // operator<<(ostream, exception)
-#include <butl/fdstream>
-#include <butl/manifest-parser>
-#include <butl/manifest-serializer>
+#include <libbutl/utility.hxx>             // operator<<(ostream, exception)
+#include <libbutl/fdstream.hxx>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/manifest-serializer/buildfile b/tests/manifest-serializer/buildfile
index 17a4fab..19edcf8 100644
--- a/tests/manifest-serializer/buildfile
+++ b/tests/manifest-serializer/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/manifest-serializer/driver.cxx b/tests/manifest-serializer/driver.cxx
index 64434c9..147ce48 100644
--- a/tests/manifest-serializer/driver.cxx
+++ b/tests/manifest-serializer/driver.cxx
@@ -9,7 +9,7 @@
 #include <sstream>
 #include <iostream>
 
-#include <butl/manifest-serializer>
+#include <libbutl/manifest-serializer.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/mventry/buildfile b/tests/mventry/buildfile
index 868a2f6..dfb4e15 100644
--- a/tests/mventry/buildfile
+++ b/tests/mventry/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl} test{testscript}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/mventry/driver.cxx b/tests/mventry/driver.cxx
index cf6099c..5639c2b 100644
--- a/tests/mventry/driver.cxx
+++ b/tests/mventry/driver.cxx
@@ -5,9 +5,9 @@
 #include <iostream>
 #include <system_error>
 
-#include <butl/path>
-#include <butl/utility>    // operator<<(ostream, exception)
-#include <butl/filesystem>
+#include <libbutl/path.hxx>
+#include <libbutl/utility.hxx>    // operator<<(ostream, exception)
+#include <libbutl/filesystem.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/pager/buildfile b/tests/pager/buildfile
index 5043121..7da0aa0 100644
--- a/tests/pager/buildfile
+++ b/tests/pager/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/pager/driver.cxx b/tests/pager/driver.cxx
index 89affd1..87c811d 100644
--- a/tests/pager/driver.cxx
+++ b/tests/pager/driver.cxx
@@ -10,7 +10,7 @@
 #include <sstream>
 #include <iostream>
 
-#include <butl/pager>
+#include <libbutl/pager.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/path/buildfile b/tests/path/buildfile
index 3060d6b..4f41a75 100644
--- a/tests/path/buildfile
+++ b/tests/path/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/path/driver.cxx b/tests/path/driver.cxx
index ec38517..ee62d73 100644
--- a/tests/path/driver.cxx
+++ b/tests/path/driver.cxx
@@ -6,8 +6,8 @@
 #include <iostream>
 #include <type_traits>
 
-#include <butl/path>
-#include <butl/path-io>
+#include <libbutl/path.hxx>
+#include <libbutl/path-io.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/prefix-map/buildfile b/tests/prefix-map/buildfile
index 2750992..644b8eb 100644
--- a/tests/prefix-map/buildfile
+++ b/tests/prefix-map/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/prefix-map/driver.cxx b/tests/prefix-map/driver.cxx
index c26bfac..abf7e01 100644
--- a/tests/prefix-map/driver.cxx
+++ b/tests/prefix-map/driver.cxx
@@ -6,7 +6,7 @@
 #include <cassert>
 #include <iostream>
 
-#include <butl/prefix-map>
+#include <libbutl/prefix-map.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/process-run/buildfile b/tests/process-run/buildfile
index 5c55af9..ce642f3 100644
--- a/tests/process-run/buildfile
+++ b/tests/process-run/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl} test{testscript}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/process-run/driver.cxx b/tests/process-run/driver.cxx
index 15d5f61..ed35d1e 100644
--- a/tests/process-run/driver.cxx
+++ b/tests/process-run/driver.cxx
@@ -4,9 +4,9 @@
 
 #include <iostream>
 
-#include <butl/path>
-#include <butl/process>
-#include <butl/fdstream>
+#include <libbutl/path.hxx>
+#include <libbutl/process.hxx>
+#include <libbutl/fdstream.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/process/buildfile b/tests/process/buildfile
index 72cbec2..19f06a8 100644
--- a/tests/process/buildfile
+++ b/tests/process/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl} test{testscript}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/process/driver.cxx b/tests/process/driver.cxx
index ae5015c..bdc5f4a 100644
--- a/tests/process/driver.cxx
+++ b/tests/process/driver.cxx
@@ -12,9 +12,9 @@
 #include <iterator>  // istreambuf_iterator, ostream_iterator
 #include <algorithm> // copy()
 
-#include <butl/path>
-#include <butl/process>
-#include <butl/fdstream>
+#include <libbutl/path.hxx>
+#include <libbutl/process.hxx>
+#include <libbutl/fdstream.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/sendmail/buildfile b/tests/sendmail/buildfile
index ddc8bca..6ac2558 100644
--- a/tests/sendmail/buildfile
+++ b/tests/sendmail/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl} test{testscript}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/sendmail/driver.cxx b/tests/sendmail/driver.cxx
index 9e1af96..e48c6b4 100644
--- a/tests/sendmail/driver.cxx
+++ b/tests/sendmail/driver.cxx
@@ -5,9 +5,9 @@
 #include <iostream>
 #include <system_error>
 
-#include <butl/path>
-#include <butl/utility>    // operator<<(ostream, exception)
-#include <butl/sendmail>
+#include <libbutl/path.hxx>
+#include <libbutl/utility.hxx>  // operator<<(ostream, exception)
+#include <libbutl/sendmail.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/sha256/buildfile b/tests/sha256/buildfile
index e95e218..0df7668 100644
--- a/tests/sha256/buildfile
+++ b/tests/sha256/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/sha256/driver.cxx b/tests/sha256/driver.cxx
index 10d0335..5686898 100644
--- a/tests/sha256/driver.cxx
+++ b/tests/sha256/driver.cxx
@@ -6,7 +6,7 @@
 #include <cassert>
 #include <iostream>
 
-#include <butl/sha256>
+#include <libbutl/sha256.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/small-vector/buildfile b/tests/small-vector/buildfile
index 12f8603..52285d8 100644
--- a/tests/small-vector/buildfile
+++ b/tests/small-vector/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/small-vector/driver.cxx b/tests/small-vector/driver.cxx
index f4914de..c7cafd4 100644
--- a/tests/small-vector/driver.cxx
+++ b/tests/small-vector/driver.cxx
@@ -6,7 +6,7 @@
 #include <cassert>
 #include <iostream>
 
-#include <butl/small-vector>
+#include <libbutl/small-vector.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/standard-version/buildfile b/tests/standard-version/buildfile
index 4afb691..a56ed4d 100644
--- a/tests/standard-version/buildfile
+++ b/tests/standard-version/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl} test{testscript}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/standard-version/driver.cxx b/tests/standard-version/driver.cxx
index 943bd31..fa149ae 100644
--- a/tests/standard-version/driver.cxx
+++ b/tests/standard-version/driver.cxx
@@ -8,8 +8,8 @@
 #include <iostream>
 #include <stdexcept> // invalid_argument
 
-#include <butl/utility>          // operator<<(ostream,exception)
-#include <butl/standard-version>
+#include <libbutl/utility.hxx>          // operator<<(ostream,exception)
+#include <libbutl/standard-version.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/strcase/buildfile b/tests/strcase/buildfile
index 329cc2f..a9614f4 100644
--- a/tests/strcase/buildfile
+++ b/tests/strcase/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/strcase/driver.cxx b/tests/strcase/driver.cxx
index 5463811..f7f4bd1 100644
--- a/tests/strcase/driver.cxx
+++ b/tests/strcase/driver.cxx
@@ -5,7 +5,7 @@
 #include <string>
 #include <cassert>
 
-#include <butl/utility>
+#include <libbutl/utility.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/string-parser/buildfile b/tests/string-parser/buildfile
index 9ccf480..cc680cd 100644
--- a/tests/string-parser/buildfile
+++ b/tests/string-parser/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl} test{testscript}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/string-parser/driver.cxx b/tests/string-parser/driver.cxx
index 2aad3a7..09443f2 100644
--- a/tests/string-parser/driver.cxx
+++ b/tests/string-parser/driver.cxx
@@ -8,8 +8,8 @@
 #include <cassert>
 #include <iostream>
 
-#include <butl/utility>       // operator<<(ostream,exception)
-#include <butl/string-parser>
+#include <libbutl/utility.hxx>       // operator<<(ostream,exception)
+#include <libbutl/string-parser.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/tab-parser/buildfile b/tests/tab-parser/buildfile
index 4afb691..a56ed4d 100644
--- a/tests/tab-parser/buildfile
+++ b/tests/tab-parser/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl} test{testscript}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/tab-parser/driver.cxx b/tests/tab-parser/driver.cxx
index 8b0cc4d..238c12a 100644
--- a/tests/tab-parser/driver.cxx
+++ b/tests/tab-parser/driver.cxx
@@ -6,8 +6,8 @@
 #include <cassert>
 #include <iostream>
 
-#include <butl/utility>    // operator<<(ostream,exception)
-#include <butl/tab-parser>
+#include <libbutl/utility.hxx>    // operator<<(ostream,exception)
+#include <libbutl/tab-parser.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/target-triplet/buildfile b/tests/target-triplet/buildfile
index ca8365d..5796ca5 100644
--- a/tests/target-triplet/buildfile
+++ b/tests/target-triplet/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/target-triplet/driver.cxx b/tests/target-triplet/driver.cxx
index edc422c..8691bac 100644
--- a/tests/target-triplet/driver.cxx
+++ b/tests/target-triplet/driver.cxx
@@ -6,7 +6,7 @@
 #include <iostream>
 #include <stdexcept> // invalid_argument
 
-#include <butl/target-triplet>
+#include <libbutl/target-triplet.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/timestamp/buildfile b/tests/timestamp/buildfile
index 4bb2c18..d6d6865 100644
--- a/tests/timestamp/buildfile
+++ b/tests/timestamp/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/timestamp/driver.cxx b/tests/timestamp/driver.cxx
index 9161662..f1f33ca 100644
--- a/tests/timestamp/driver.cxx
+++ b/tests/timestamp/driver.cxx
@@ -12,7 +12,7 @@
 #include <iomanip>
 #include <system_error>
 
-#include <butl/timestamp>
+#include <libbutl/timestamp.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/tests/wildcard/buildfile b/tests/wildcard/buildfile
index 7de67f4..fcdd64b 100644
--- a/tests/wildcard/buildfile
+++ b/tests/wildcard/buildfile
@@ -2,6 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-exe{driver}: cxx{driver} ../../butl/lib{butl} test{testscript}
+exe{driver}: cxx{driver} ../../libbutl/lib{butl} test{testscript}
 
-include ../../butl/
+include ../../libbutl/
diff --git a/tests/wildcard/driver.cxx b/tests/wildcard/driver.cxx
index 5744969..2397fc8 100644
--- a/tests/wildcard/driver.cxx
+++ b/tests/wildcard/driver.cxx
@@ -9,9 +9,9 @@
 #include <algorithm> // sort()
 #include <exception>
 
-#include <butl/path>
-#include <butl/utility>    // operator<<(ostream, exception)
-#include <butl/filesystem>
+#include <libbutl/path.hxx>
+#include <libbutl/utility.hxx>    // operator<<(ostream, exception)
+#include <libbutl/filesystem.hxx>
 
 using namespace std;
 using namespace butl;