Turn libodb repository into package for muti-package repositorylibodb

243 files changed, 32 insertions, 2735 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 3004ad1..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,37 +0,0 @@
-.bdep/
-
-# Compiler/linker output.
-#
-*.d
-*.t
-*.i
-*.ii
-*.o
-*.obj
-*.so
-*.dll
-*.a
-*.lib
-*.exp
-*.pdb
-*.ilk
-*.exe
-*.exe.dlls/
-*.exe.manifest
-*.pc
-
-*.l
-*.l.cpp-options
-
-# Generated documentation.
-#
-*.pdf
-*.ps
-
-# Generated build system files.
-#
-*-dynamic.make
-
-# Generated .gitignore files.
-#
-.gitignore
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 0e6dcc6..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,81 +0,0 @@
-Building on UNIX
-================
-
-The following build instructions are for the Linux/UNIX/Mac OS X
-operating systems as well as for Cygwin and MinGW on Windows.
-
-The standard autotools-based build system is used on these platforms. After
-unpacking the source code archive, change to the libodb package directory
-(referred to as libodb/ from now on) and run the configure script:
-
-./configure
-
-To see the available configuration options run configure with --help:
-
-./configure --help
-
-As an example, the following configure command only builds shared libraries,
-uses the specified C++ compiler, and compiles with optimization and without
-debug information:
-
-./configure --disable-static CXX=g++-4.5 CXXFLAGS=-O3
-
-Once configuration is complete, run make to build libodb:
-
-make
-
-Once the build is completed successfully, you can install the libodb headers
-and libraries using the install target (you may need to do this step as root
-depending on the installation directory):
-
-make install
-
-
-Building on Windows
-===================
-
-The following build instructions are for Windows using Microsoft Visual
-Studio. If you would like to build libodb with GCC either using Cygwin
-or MinGW, refer to the "Building on UNIX" section above.
-
-The standard Visual Studio project and solution files are used on this
-platform. To build libodb, unpack the source code archive and open the
-libodb-vc<N>.sln file located in the libodb package directory (referred
-to as libodb\ from now on). Here <N> is the version of Visual Studio that
-you are using. Once the solution is open, select the desired build
-configuration (Debug or Release) and platform (Win32 or x64) and build
-the solution.
-
-The resulting 32-bit DLLs and import libraries are placed into the
-libodb\bin\ and libodb\lib\ directories, respectively. Similarly, the
-64-bit DLLs and import libraries are placed into libodb\bin64\ and
-libodb\lib64\. The Release versions of the import libraries are named
-odb.lib and the Debug versions are named odb-d.lib.
-
-To configure Visual Studio to automatically locate the libodb headers,
-DLLs, and import libraries, add the following paths to your VC++
-Directories:
-
-Win32:
-
-  Include:    ...\libodb
-  Library:    ...\libodb\lib
-  Executable: ...\libodb\bin
-
-x64:
-
-  Include:    ...\libodb
-  Library:    ...\libodb\lib64
-  Executable: ...\libodb\bin64
-
-Note also that by default libodb uses the __declspec(thread) storage-class
-modifier for TLS support. This mechanism is known not to work correctly on
-Windows XP/Server 2003 and earlier versions of Windows if a DLL that uses
-this modifier is loaded dynamically. If you are planning to link libodb to a
-DLL that will be loaded dynamically (e.g., delay loading, COM DLL, explicit
-LoadLibrary() call, etc), then you will need to comment out the definition
-of the ODB_THREADS_TLS_DECLSPEC macro in the odb\details\config-vc.h file
-prior to building libodb. On the other hand, if you plan to link libodb
-directly to an executable or another DLL that will be linked directly to
-an executable or if you only need to support Windows Vista/Server 2008,
-then you don't need to make this change.
diff --git a/INSTALL-GIT b/INSTALL-GIT
deleted file mode 100644
index f917af5..0000000
--- a/INSTALL-GIT
+++ /dev/null
@@ -1,78 +0,0 @@
-The following instructions describe how to work with the source code that was
-checked out from the git repository.
-
-The major difference between using a released source code package and source
-code from the repository is that the former does not contain autotools-based
-makefiles or Visual Studio project files. Instead, it contains templates for
-these files as well as its own, custom build system. This build system is
-used for development as well as to automatically generate the autotools and
-Visual Studio files.
-
-This file describes how to use this build system to build the package as well
-as to create a release-ready source distribution which contains the autotools
-build system and Visual Studio project files.
-
-
-Prerequisites
-=============
-
-Besides the prerequisites listed in the INSTALL file, you will need the
-following additional packages:
-
-  - GNU bash >= 2.0.0   http://www.gnu.org/software/bash/
-  - GNU make >= 3.81    http://www.gnu.org/software/make/
-  - build    >= latest  http://www.codesynthesis.com/projects/build/
-
-If you are planning to create the source code distributions, then you will
-also need the following packages:
-
-  - GNU m4   >= 1.4.0   http://www.gnu.org/software/m4/
-  - GNU sed  >= 4.0.0   http://www.gnu.org/software/sed/
-  - tofrodos >= 1.7.0   http://www.thefreecountry.com/tofrodos/
-
-As we as the GNU autotools:
-
-  - GNU libtool  >= 2.2.6b  http://www.gnu.org/software/libtool/
-  - GNU autoconf >= 2.67    http://www.gnu.org/software/autoconf/
-  - GNU automake >= 1.11.1  http://www.gnu.org/software/automake/
-
-Any reasonably up to date GNU/Linux installation would normally have all of
-the above packages already present, except for build and maybe tofrodos.
-
-
-Configuring and Building
-========================
-
-To build the source code simply run make in the root directory of the package.
-The first time you run make, the build process will also configure the
-package by asking you several questions. On the subsequent runs, make will
-only rebuild what has changed.
-
-To run the automated test suite (if any), run 'make test'. To clean the object
-files, executables, etc., run 'make clean'. To de-configure the package (that
-is, to remove configuration files in addition to objects, executables, etc.),
-run 'make disfigure'.
-
-
-Creating Distribution
-=====================
-
-To create the source code distribution, use the dist make target as well as
-the dist_prefix variable to specify the directory where the distribution files
-should be placed. For example:
-
-make dist dist_prefix=/tmp/package-1.1.0
-
-Once the distribution files are ready, change to the distribution directory
-and run the bootstrap script to bootstrap the autotools build system, for
-example:
-
-cd /tmp/package-1.1.0
-./bootsrap
-
-To create the source code archives, use the autotools build system. First
-configuring the package (see the INSTALL file for more information on this
-step) and then use the dist target to make the archives, for example:
-
-./configure
-make dist
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index e44eb5c..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-# file      : Makefile.am
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-SUBDIRS = __path__(dirs)
-dist_doc_DATA = __file__(docs)
-EXTRA_DIST = __file__(extra_dist)
-ACLOCAL_AMFLAGS = -I m4
-
-pkgconfigdir = @pkgconfigdir@
-pkgconfig_DATA= libodb.pc
diff --git a/NEWS b/NEWS
deleted file mode 100644
index 72d0f8b..0000000
--- a/NEWS
+++ /dev/null
@@ -1 +0,0 @@
-See the common NEWS file in the ODB compiler package.
diff --git a/README-GIT b/README-GIT
deleted file mode 100644
index 5375489..0000000
--- a/README-GIT
+++ /dev/null
@@ -1,4 +0,0 @@
-The checked out odb/version-build2.hxx will be overwritten during the build
-process but these changes should be ignored. To do this automatically, run:
-
-git update-index --assume-unchanged odb/version-build2.hxx
diff --git a/bootstrap b/bootstrap
deleted file mode 100755
index 85d1399..0000000
--- a/bootstrap
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-
-# file      : bootstrap
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-#
-# Bootstrap the automake build system.
-#
-
-rm -f config.cache
-
-if test ! -d m4; then
-  mkdir m4
-fi
-
-autoreconf --install
diff --git a/build/bootstrap.make b/build/bootstrap.make
deleted file mode 100644
index f26a5dc..0000000
--- a/build/bootstrap.make
+++ /dev/null
@@ -1,73 +0,0 @@
-# file      : build/bootstrap.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-project_name := libodb
-
-# First try to include the bundled bootstrap.make if it exist. If that
-# fails, let make search for the external bootstrap.make.
-#
-build := build-0.3
-
--include $(dir $(lastword $(MAKEFILE_LIST)))../../$(build)/bootstrap.make
-
-ifeq ($(patsubst %build/bootstrap.make,,$(lastword $(MAKEFILE_LIST))),)
-include $(build)/bootstrap.make
-endif
-
-# Configuration
-#
-$(call include,$(scf_root)/configuration.make)
-
-# Aliases
-#
-.PHONY: $(out_base)/       \
-        $(out_base)/.test  \
-        $(out_base)/.dist  \
-        $(out_base)/.clean
-
-ifdef %interactive%
-
-.PHONY: test dist clean
-
-test:  $(out_base)/.test
-dist:  $(out_base)/.dist
-clean: $(out_base)/.clean
-
-ifneq ($(filter $(.DEFAULT_GOAL),test dist clean),)
-.DEFAULT_GOAL :=
-endif
-
-endif
-
-# Make sure the distribution prefix is set if the goal is dist.
-#
-ifneq ($(filter $(MAKECMDGOALS),dist),)
-ifeq ($(dist_prefix),)
-$(error dist_prefix is not set)
-endif
-endif
-
-# If we don't have dependency auto-generation then we need to manually
-# make sure that generated files are generated before C++ file are
-# compiler. To do this we make the object files ($2) depend in order-
-# only on generated files ($3).
-#
-ifeq ($(cxx_id),generic)
-
-define include-dep
-$(if $2,$(eval $2: | $3))
-endef
-
-else
-
-define include-dep
-$(call -include,$1)
-endef
-
-endif
-
-# Don't include dependency info for certain targets.
-#
-ifneq ($(filter $(MAKECMDGOALS),clean disfigure dist),)
-include-dep =
-endif
diff --git a/build/configuration-rules.make b/build/configuration-rules.make
deleted file mode 100644
index adfaf3c..0000000
--- a/build/configuration-rules.make
+++ /dev/null
@@ -1,16 +0,0 @@
-# file      : build/configuration-rules.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(dcf_root)/configuration-dynamic.make: | $(dcf_root)/.
-	$(call message,,$(scf_root)/configure $@)
-
-ifndef %foreign%
-
-disfigure::
-	$(call message,rm $$1,rm -f $$1,$(dcf_root)/configuration-dynamic.make)
-
-endif
-
-ifeq ($(.DEFAULT_GOAL),$(dcf_root)/configuration-dynamic.make)
-.DEFAULT_GOAL :=
-endif
diff --git a/build/configuration.make b/build/configuration.make
deleted file mode 100644
index 7a00b14..0000000
--- a/build/configuration.make
+++ /dev/null
@@ -1,20 +0,0 @@
-# file      : build/configuration.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(call include-once,$(scf_root)/configuration-rules.make,$(dcf_root))
-
-# Dynamic configuration.
-#
-libodb_threads :=
-
-$(call -include,$(dcf_root)/configuration-dynamic.make)
-
-ifdef libodb_threads
-
-$(out_root)/%: libodb_threads := $(libodb_threads)
-
-else
-
-.NOTPARALLEL:
-
-endif
diff --git a/build/configure b/build/configure
deleted file mode 100755
index 0109cb2..0000000
--- a/build/configure
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env bash
-
-# file      : build/configure
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-# $1  out file
-#
-# bld_root     - build root
-# project_name - project name
-#
-
-source $bld_root/dialog.bash
-
-$echo
-$echo "Please select the threading implementation:"
-$echo
-$echo "(1) POSIX"
-$echo "(2) Win32"
-$echo "(3) None"
-$echo
-
-threads=`read_option "posix win32 none" "posix"`
-
-echo "libodb_threads := $threads" >$1
diff --git a/build/export/libodb/stub.make b/build/export/libodb/stub.make
deleted file mode 100644
index 10eeb22..0000000
--- a/build/export/libodb/stub.make
+++ /dev/null
@@ -1,8 +0,0 @@
-# file      : build/export/libodb/stub.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(call include-once,$(src_root)/odb/makefile,$(out_root))
-
-$(call export,\
-  l: $(out_root)/odb/odb.l,\
-  cpp-options: $(out_root)/odb/odb.l.cpp-options)
diff --git a/build/import/libodb/configuration-rules.make b/build/import/libodb/configuration-rules.make
deleted file mode 100644
index 340c418..0000000
--- a/build/import/libodb/configuration-rules.make
+++ /dev/null
@@ -1,13 +0,0 @@
-# file      : build/import/libodb/configuration-rules.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(dcf_root)/import/libodb/configuration-dynamic.make: | $(dcf_root)/import/libodb/.
-	$(call message,,$(scf_root)/import/libodb/configure $@)
-
-ifndef %foreign%
-
-$(dcf_root)/.disfigure::
-	$(call message,rm $(dcf_root)/import/libodb/configuration-dynamic.make,\
-rm -f $(dcf_root)/import/libodb/configuration-dynamic.make)
-
-endif
diff --git a/build/import/libodb/configure b/build/import/libodb/configure
deleted file mode 100755
index 261a202..0000000
--- a/build/import/libodb/configure
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /usr/bin/env bash
-
-# file      : build/import/libodb/configure
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-
-# $1           - out file
-#
-# bld_root     - build root
-# project_name - project name
-#
-
-source $bld_root/dialog.bash
-
-
-$echo
-$echo "Configuring external dependency on 'libodb' for '$project_name'."
-$echo
-
-$echo
-$echo "Would you like to configure dependency on the installed "
-$echo "version of 'libodb' as opposed to the development build?"
-$echo
-
-installed=`read_y_n y`
-
-path=
-
-if [ "$installed" = "n" ]; then
-
-$echo
-$echo "Please enter the src_root for 'libodb'."
-$echo
-
-src_root=`read_path --directory --exist`
-
-$echo
-$echo "Please enter the out_root for 'libodb'."
-$echo
-
-out_root=`read_path --directory $src_root`
-
-fi
-
-echo libodb_installed := $installed   >$1
-
-if [ "$installed" = "n" ]; then
-
-echo src_root := $src_root            >>$1
-echo scf_root := \$\(src_root\)/build >>$1
-echo out_root := $out_root            >>$1
-
-fi
diff --git a/build/import/libodb/stub.make b/build/import/libodb/stub.make
deleted file mode 100644
index 04dc786..0000000
--- a/build/import/libodb/stub.make
+++ /dev/null
@@ -1,28 +0,0 @@
-# file      : build/import/libodb/stub.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(call include-once,$(scf_root)/import/libodb/configuration-rules.make,$(dcf_root))
-
-libodb_installed :=
-
-$(call -include,$(dcf_root)/import/libodb/configuration-dynamic.make)
-
-ifdef libodb_installed
-
-ifeq ($(libodb_installed),y)
-
-$(call export,l: -lodb,cpp-options: )
-
-else
-
-# Include export stub.
-#
-$(call include,$(scf_root)/export/libodb/stub.make)
-
-endif
-
-else
-
-.NOTPARALLEL:
-
-endif
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index e368d3b..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,67 +0,0 @@
-# file      : configure.ac
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-AC_PREREQ(2.60)
-AC_INIT([libodb], [__value__(version)], [odb-users@codesynthesis.com])
-AC_CONFIG_AUX_DIR([config])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR([odb/version.hxx])
-
-AM_INIT_AUTOMAKE([-Wall -Werror foreign nostdinc subdir-objects dist-bzip2 dist-zip tar-ustar])
-m4_equote()[m4_ifdef]m4_dquote()([AM_PROG_AR], [AM_PROG_AR]) # Required by automake 1.12.
-
-LT_INIT([win32-dll])
-
-AC_CANONICAL_HOST
-
-# Check for C++ compiler and use it to compile the tests.
-#
-AC_PROG_CXX
-AC_LANG(C++)
-
-# Create the libtool executable so that we can use it in further tests.
-#
-LT_OUTPUT
-
-# Check for Windows.
-#
-win32=no
-case $host_os in
-  windows* | mingw*)
-    win32=yes
-    ;;
-esac
-
-AM_CONDITIONAL([ODB_WIN32], [test x$win32 = xyes])
-
-# Check for threads.
-#
-THREADS
-
-AM_CONDITIONAL([ODB_THREADS_NONE], [test x$threads = xnone])
-AM_CONDITIONAL([ODB_THREADS_WIN32], [test x$threads = xwin32])
-AM_CONDITIONAL([ODB_THREADS_POSIX], [test x$threads = xposix])
-
-AS_IF([test x$threads = xnone], AC_DEFINE([ODB_THREADS_NONE], [1], [Have no threads.]))
-AS_IF([test x$threads = xwin32], AC_DEFINE([ODB_THREADS_WIN32], [1], [Have Win32 threads.]))
-AS_IF([test x$threads = xposix], AC_DEFINE([ODB_THREADS_POSIX], [1], [Have POSIX threads.]))
-
-AS_IF([test x$threads_thread_keyword = xyes], AC_DEFINE([ODB_THREADS_TLS_KEYWORD], [1], [Have __thread keyword.]))
-
-# Define LIBODB_STATIC_LIB if we are build static library on certain platforms.
-#
-STATIC_LIB([LIBODB_STATIC_LIB], [Static library interface.])
-
-# Allow the user to specify the pkgconfig directory.
-#
-PKGCONFIG
-
-# Check if we should disable rpath.
-#
-DISABLE_RPATH
-
-# Output.
-#
-AC_CONFIG_HEADERS([odb/config.h odb/details/config.h])
-AC_CONFIG_FILES([__path__(config_files)])
-AC_OUTPUT
diff --git a/libodb-vc10.sln b/libodb-vc10.sln
deleted file mode 100644
index 0a9c5dd..0000000
--- a/libodb-vc10.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual Studio 2010

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libodb", "odb\libodb-vc10.vcxproj", "{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|Win32.ActiveCfg = Debug|Win32

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|Win32.Build.0 = Debug|Win32

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|x64.ActiveCfg = Debug|x64

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|x64.Build.0 = Debug|x64

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|Win32.ActiveCfg = Release|Win32

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|Win32.Build.0 = Release|Win32

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|x64.ActiveCfg = Release|x64

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/libodb-vc11.sln b/libodb-vc11.sln
deleted file mode 100644
index 6368225..0000000
--- a/libodb-vc11.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 12.00

-# Visual Studio 2012

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libodb", "odb\libodb-vc11.vcxproj", "{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|Win32.ActiveCfg = Debug|Win32

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|Win32.Build.0 = Debug|Win32

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|x64.ActiveCfg = Debug|x64

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|x64.Build.0 = Debug|x64

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|Win32.ActiveCfg = Release|Win32

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|Win32.Build.0 = Release|Win32

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|x64.ActiveCfg = Release|x64

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/libodb-vc12.sln b/libodb-vc12.sln
deleted file mode 100644
index 862f9c9..0000000
--- a/libodb-vc12.sln
+++ /dev/null
@@ -1,28 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 12.00

-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libodb", "odb\libodb-vc12.vcxproj", "{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|Win32.ActiveCfg = Debug|Win32

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|Win32.Build.0 = Debug|Win32

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|x64.ActiveCfg = Debug|x64

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Debug|x64.Build.0 = Debug|x64

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|Win32.ActiveCfg = Release|Win32

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|Win32.Build.0 = Release|Win32

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|x64.ActiveCfg = Release|x64

-		{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}.Release|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/libodb-vc8.sln b/libodb-vc8.sln
deleted file mode 100644
index d6e2b1c..0000000
--- a/libodb-vc8.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libodb", "odb\libodb-vc8.vcproj", "{513E5721-D318-46B0-8CFB-054042DF87A7}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{513E5721-D318-46B0-8CFB-054042DF87A7}.Debug|Win32.ActiveCfg = Debug|Win32

-		{513E5721-D318-46B0-8CFB-054042DF87A7}.Debug|Win32.Build.0 = Debug|Win32

-		{513E5721-D318-46B0-8CFB-054042DF87A7}.Debug|x64.ActiveCfg = Debug|x64

-		{513E5721-D318-46B0-8CFB-054042DF87A7}.Debug|x64.Build.0 = Debug|x64

-		{513E5721-D318-46B0-8CFB-054042DF87A7}.Release|Win32.ActiveCfg = Release|Win32

-		{513E5721-D318-46B0-8CFB-054042DF87A7}.Release|Win32.Build.0 = Release|Win32

-		{513E5721-D318-46B0-8CFB-054042DF87A7}.Release|x64.ActiveCfg = Release|x64

-		{513E5721-D318-46B0-8CFB-054042DF87A7}.Release|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/libodb-vc9.sln b/libodb-vc9.sln
deleted file mode 100644
index 2ca5e34..0000000
--- a/libodb-vc9.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 10.00

-# Visual Studio 2008

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libodb", "odb\libodb-vc9.vcproj", "{513E5721-D318-46B0-8CFB-054042DF87A7}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{513E5721-D318-46B0-8CFB-054042DF87A7}.Debug|Win32.ActiveCfg = Debug|Win32

-		{513E5721-D318-46B0-8CFB-054042DF87A7}.Debug|Win32.Build.0 = Debug|Win32

-		{513E5721-D318-46B0-8CFB-054042DF87A7}.Debug|x64.ActiveCfg = Debug|x64

-		{513E5721-D318-46B0-8CFB-054042DF87A7}.Debug|x64.Build.0 = Debug|x64

-		{513E5721-D318-46B0-8CFB-054042DF87A7}.Release|Win32.ActiveCfg = Release|Win32

-		{513E5721-D318-46B0-8CFB-054042DF87A7}.Release|Win32.Build.0 = Release|Win32

-		{513E5721-D318-46B0-8CFB-054042DF87A7}.Release|x64.ActiveCfg = Release|x64

-		{513E5721-D318-46B0-8CFB-054042DF87A7}.Release|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/libodb.pc.in b/libodb.pc.in
deleted file mode 100644
index 05978d6..0000000
--- a/libodb.pc.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# file      : libodb.pc.in
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libodb
-Description: Object-relational mapping (ORM) system for C++, common runtime library
-URL: http://www.codesynthesis.com/products/odb/
-Version: @VERSION@
-Libs: -L${libdir} -lodb
-Cflags: -I${includedir}
diff --git a/libodb/.gitignore b/libodb/.gitignore
new file mode 100644
index 0000000..1c363a0
--- /dev/null
+++ b/libodb/.gitignore
@@ -0,0 +1,25 @@
+# Compiler/linker output.
+#
+*.d
+*.t
+*.i
+*.i.*
+*.ii
+*.ii.*
+*.o
+*.obj
+*.gcm
+*.pcm
+*.ifc
+*.so
+*.dylib
+*.dll
+*.a
+*.lib
+*.exp
+*.pdb
+*.ilk
+*.exe
+*.exe.dlls/
+*.exe.manifest
+*.pc
diff --git a/GPLv2 b/libodb/GPLv2
index 3912109..3912109 100644
--- a/GPLv2
+++ b/libodb/GPLv2
diff --git a/libodb/INSTALL b/libodb/INSTALL
new file mode 100644
index 0000000..46b79ad
--- /dev/null
+++ b/libodb/INSTALL
@@ -0,0 +1,6 @@
+The easiest way to build this package is with the bpkg package manager:
+
+$ bpkg build libodb
+
+But if you don't want to use the package manager, then you can also build it
+manually using the standard build2 build system.
diff --git a/LICENSE b/libodb/LICENSE
index 9d92da1..9d92da1 100644
--- a/LICENSE
+++ b/libodb/LICENSE
diff --git a/README b/libodb/README
index 902e20b..902e20b 100644
--- a/README
+++ b/libodb/README
diff --git a/build/.gitignore b/libodb/build/.gitignore
index 4a730a3..4a730a3 100644
--- a/build/.gitignore
+++ b/libodb/build/.gitignore
diff --git a/build/bootstrap.build b/libodb/build/bootstrap.build
index 9c8d1a9..9c8d1a9 100644
--- a/build/bootstrap.build
+++ b/libodb/build/bootstrap.build
diff --git a/build/export.build b/libodb/build/export.build
index 56312c8..56312c8 100644
--- a/build/export.build
+++ b/libodb/build/export.build
diff --git a/build/root.build b/libodb/build/root.build
index 882047d..882047d 100644
--- a/build/root.build
+++ b/libodb/build/root.build
diff --git a/buildfile b/libodb/buildfile
index 406853f..a04e206 100644
--- a/buildfile
+++ b/libodb/buildfile
@@ -1,7 +1,7 @@
 # file      : buildfile
 # license   : GNU GPL v2; see accompanying LICENSE file
 
-./: {*/ -build/ -m4/} doc{INSTALL NEWS README} legal{GPLv2 LICENSE} manifest
+./: {*/ -build/} doc{INSTALL NEWS README} legal{GPLv2 LICENSE} manifest
 
 # Don't install tests or the INSTALL file.
 #
diff --git a/manifest b/libodb/manifest
index d728912..d728912 100644
--- a/manifest
+++ b/libodb/manifest
diff --git a/odb/buildfile b/libodb/odb/buildfile
index ec95e94..ec95e94 100644
--- a/odb/buildfile
+++ b/libodb/odb/buildfile
diff --git a/odb/c-array-traits.hxx b/libodb/odb/c-array-traits.hxx
index fff7880..fff7880 100644
--- a/odb/c-array-traits.hxx
+++ b/libodb/odb/c-array-traits.hxx
diff --git a/odb/cache-traits.hxx b/libodb/odb/cache-traits.hxx
index a8cf750..a8cf750 100644
--- a/odb/cache-traits.hxx
+++ b/libodb/odb/cache-traits.hxx
diff --git a/odb/callback.hxx b/libodb/odb/callback.hxx
index aaa066f..aaa066f 100644
--- a/odb/callback.hxx
+++ b/libodb/odb/callback.hxx
diff --git a/odb/connection.cxx b/libodb/odb/connection.cxx
index 29743a2..29743a2 100644
--- a/odb/connection.cxx
+++ b/libodb/odb/connection.cxx
diff --git a/odb/connection.hxx b/libodb/odb/connection.hxx
index 8ce4544..8ce4544 100644
--- a/odb/connection.hxx
+++ b/libodb/odb/connection.hxx
diff --git a/odb/connection.ixx b/libodb/odb/connection.ixx
index d19390a..d19390a 100644
--- a/odb/connection.ixx
+++ b/libodb/odb/connection.ixx
diff --git a/odb/connection.txx b/libodb/odb/connection.txx
index a082f14..a082f14 100644
--- a/odb/connection.txx
+++ b/libodb/odb/connection.txx
diff --git a/odb/container-traits.hxx b/libodb/odb/container-traits.hxx
index e2f44ce..e2f44ce 100644
--- a/odb/container-traits.hxx
+++ b/libodb/odb/container-traits.hxx
diff --git a/odb/core.hxx b/libodb/odb/core.hxx
index bca295d..bca295d 100644
--- a/odb/core.hxx
+++ b/libodb/odb/core.hxx
diff --git a/odb/database.cxx b/libodb/odb/database.cxx
index 9e098c7..9e098c7 100644
--- a/odb/database.cxx
+++ b/libodb/odb/database.cxx
diff --git a/odb/database.hxx b/libodb/odb/database.hxx
index e18e8ee..e18e8ee 100644
--- a/odb/database.hxx
+++ b/libodb/odb/database.hxx
diff --git a/odb/database.ixx b/libodb/odb/database.ixx
index c3cf2e2..c3cf2e2 100644
--- a/odb/database.ixx
+++ b/libodb/odb/database.ixx
diff --git a/odb/database.txx b/libodb/odb/database.txx
index 5659b6f..5659b6f 100644
--- a/odb/database.txx
+++ b/libodb/odb/database.txx
diff --git a/odb/details/buffer.cxx b/libodb/odb/details/buffer.cxx
index 595329e..595329e 100644
--- a/odb/details/buffer.cxx
+++ b/libodb/odb/details/buffer.cxx
diff --git a/odb/details/buffer.hxx b/libodb/odb/details/buffer.hxx
index 558be9b..558be9b 100644
--- a/odb/details/buffer.hxx
+++ b/libodb/odb/details/buffer.hxx
diff --git a/odb/details/build2/config-stub.h b/libodb/odb/details/build2/config-stub.h
index 83ea927..83ea927 100644
--- a/odb/details/build2/config-stub.h
+++ b/libodb/odb/details/build2/config-stub.h
diff --git a/odb/details/build2/config-vc-stub.h b/libodb/odb/details/build2/config-vc-stub.h
index e440e70..e440e70 100644
--- a/odb/details/build2/config-vc-stub.h
+++ b/libodb/odb/details/build2/config-vc-stub.h
diff --git a/odb/details/build2/config-vc.h b/libodb/odb/details/build2/config-vc.h
index 77ce106..77ce106 100644
--- a/odb/details/build2/config-vc.h
+++ b/libodb/odb/details/build2/config-vc.h
diff --git a/odb/details/build2/config.h b/libodb/odb/details/build2/config.h
index ba434f4..ba434f4 100644
--- a/odb/details/build2/config.h
+++ b/libodb/odb/details/build2/config.h
diff --git a/odb/details/c-string.hxx b/libodb/odb/details/c-string.hxx
index 6ab1adc..6ab1adc 100644
--- a/odb/details/c-string.hxx
+++ b/libodb/odb/details/c-string.hxx
diff --git a/odb/details/condition.cxx b/libodb/odb/details/condition.cxx
index 2c4cbdb..2c4cbdb 100644
--- a/odb/details/condition.cxx
+++ b/libodb/odb/details/condition.cxx
diff --git a/odb/details/condition.hxx b/libodb/odb/details/condition.hxx
index 10b6b4a..10b6b4a 100644
--- a/odb/details/condition.hxx
+++ b/libodb/odb/details/condition.hxx
diff --git a/odb/details/config-vc.h b/libodb/odb/details/config-vc.h
index b1e38b2..b1e38b2 100644
--- a/odb/details/config-vc.h
+++ b/libodb/odb/details/config-vc.h
diff --git a/odb/details/config.h.in b/libodb/odb/details/config.h.in
index 2396606..2396606 100644
--- a/odb/details/config.h.in
+++ b/libodb/odb/details/config.h.in
diff --git a/odb/details/config.hxx b/libodb/odb/details/config.hxx
index a42dd69..a42dd69 100644
--- a/odb/details/config.hxx
+++ b/libodb/odb/details/config.hxx
diff --git a/odb/details/exception.hxx b/libodb/odb/details/exception.hxx
index ab838e1..ab838e1 100644
--- a/odb/details/exception.hxx
+++ b/libodb/odb/details/exception.hxx
diff --git a/odb/details/export.hxx b/libodb/odb/details/export.hxx
index 80fe342..80fe342 100644
--- a/odb/details/export.hxx
+++ b/libodb/odb/details/export.hxx
diff --git a/odb/details/function-wrapper.hxx b/libodb/odb/details/function-wrapper.hxx
index 418a625..418a625 100644
--- a/odb/details/function-wrapper.hxx
+++ b/libodb/odb/details/function-wrapper.hxx
diff --git a/odb/details/function-wrapper.ixx b/libodb/odb/details/function-wrapper.ixx
index 5b83b96..5b83b96 100644
--- a/odb/details/function-wrapper.ixx
+++ b/libodb/odb/details/function-wrapper.ixx
diff --git a/odb/details/function-wrapper.txx b/libodb/odb/details/function-wrapper.txx
index db73e8d..db73e8d 100644
--- a/odb/details/function-wrapper.txx
+++ b/libodb/odb/details/function-wrapper.txx
diff --git a/odb/details/lock.cxx b/libodb/odb/details/lock.cxx
index f474bf5..f474bf5 100644
--- a/odb/details/lock.cxx
+++ b/libodb/odb/details/lock.cxx
diff --git a/odb/details/lock.hxx b/libodb/odb/details/lock.hxx
index 0c54f03..0c54f03 100644
--- a/odb/details/lock.hxx
+++ b/libodb/odb/details/lock.hxx
diff --git a/odb/details/meta/answer.hxx b/libodb/odb/details/meta/answer.hxx
index f15dc43..f15dc43 100644
--- a/odb/details/meta/answer.hxx
+++ b/libodb/odb/details/meta/answer.hxx
diff --git a/odb/details/meta/class-p.hxx b/libodb/odb/details/meta/class-p.hxx
index bddb452..bddb452 100644
--- a/odb/details/meta/class-p.hxx
+++ b/libodb/odb/details/meta/class-p.hxx
diff --git a/odb/details/meta/polymorphic-p.hxx b/libodb/odb/details/meta/polymorphic-p.hxx
index 10fef6a..10fef6a 100644
--- a/odb/details/meta/polymorphic-p.hxx
+++ b/libodb/odb/details/meta/polymorphic-p.hxx
diff --git a/odb/details/meta/remove-const-volatile.hxx b/libodb/odb/details/meta/remove-const-volatile.hxx
index 910ec35..910ec35 100644
--- a/odb/details/meta/remove-const-volatile.hxx
+++ b/libodb/odb/details/meta/remove-const-volatile.hxx
diff --git a/odb/details/meta/remove-const.hxx b/libodb/odb/details/meta/remove-const.hxx
index 4a92ed3..4a92ed3 100644
--- a/odb/details/meta/remove-const.hxx
+++ b/libodb/odb/details/meta/remove-const.hxx
diff --git a/odb/details/meta/remove-pointer.hxx b/libodb/odb/details/meta/remove-pointer.hxx
index 9963fd7..9963fd7 100644
--- a/odb/details/meta/remove-pointer.hxx
+++ b/libodb/odb/details/meta/remove-pointer.hxx
diff --git a/odb/details/meta/remove-volatile.hxx b/libodb/odb/details/meta/remove-volatile.hxx
index 877e532..877e532 100644
--- a/odb/details/meta/remove-volatile.hxx
+++ b/libodb/odb/details/meta/remove-volatile.hxx
diff --git a/odb/details/meta/static-assert.hxx b/libodb/odb/details/meta/static-assert.hxx
index a2cc81b..a2cc81b 100644
--- a/odb/details/meta/static-assert.hxx
+++ b/libodb/odb/details/meta/static-assert.hxx
diff --git a/odb/details/mutex.cxx b/libodb/odb/details/mutex.cxx
index df367d8..df367d8 100644
--- a/odb/details/mutex.cxx
+++ b/libodb/odb/details/mutex.cxx
diff --git a/odb/details/mutex.hxx b/libodb/odb/details/mutex.hxx
index df12013..df12013 100644
--- a/odb/details/mutex.hxx
+++ b/libodb/odb/details/mutex.hxx
diff --git a/odb/details/posix/condition.hxx b/libodb/odb/details/posix/condition.hxx
index 4f7c42a..4f7c42a 100644
--- a/odb/details/posix/condition.hxx
+++ b/libodb/odb/details/posix/condition.hxx
diff --git a/odb/details/posix/condition.ixx b/libodb/odb/details/posix/condition.ixx
index 9b68d9f..9b68d9f 100644
--- a/odb/details/posix/condition.ixx
+++ b/libodb/odb/details/posix/condition.ixx
diff --git a/odb/details/posix/exceptions.cxx b/libodb/odb/details/posix/exceptions.cxx
index c346655..c346655 100644
--- a/odb/details/posix/exceptions.cxx
+++ b/libodb/odb/details/posix/exceptions.cxx
diff --git a/odb/details/posix/exceptions.hxx b/libodb/odb/details/posix/exceptions.hxx
index aff33b6..aff33b6 100644
--- a/odb/details/posix/exceptions.hxx
+++ b/libodb/odb/details/posix/exceptions.hxx
diff --git a/odb/details/posix/mutex.hxx b/libodb/odb/details/posix/mutex.hxx
index 0cb94db..0cb94db 100644
--- a/odb/details/posix/mutex.hxx
+++ b/libodb/odb/details/posix/mutex.hxx
diff --git a/odb/details/posix/mutex.ixx b/libodb/odb/details/posix/mutex.ixx
index ee73d09..ee73d09 100644
--- a/odb/details/posix/mutex.ixx
+++ b/libodb/odb/details/posix/mutex.ixx
diff --git a/odb/details/posix/thread.cxx b/libodb/odb/details/posix/thread.cxx
index 045f32a..045f32a 100644
--- a/odb/details/posix/thread.cxx
+++ b/libodb/odb/details/posix/thread.cxx
diff --git a/odb/details/posix/thread.hxx b/libodb/odb/details/posix/thread.hxx
index f0d29a7..f0d29a7 100644
--- a/odb/details/posix/thread.hxx
+++ b/libodb/odb/details/posix/thread.hxx
diff --git a/odb/details/posix/thread.ixx b/libodb/odb/details/posix/thread.ixx
index 6576101..6576101 100644
--- a/odb/details/posix/thread.ixx
+++ b/libodb/odb/details/posix/thread.ixx
diff --git a/odb/details/posix/tls.hxx b/libodb/odb/details/posix/tls.hxx
index e868819..e868819 100644
--- a/odb/details/posix/tls.hxx
+++ b/libodb/odb/details/posix/tls.hxx
diff --git a/odb/details/posix/tls.ixx b/libodb/odb/details/posix/tls.ixx
index 7acc173..7acc173 100644
--- a/odb/details/posix/tls.ixx
+++ b/libodb/odb/details/posix/tls.ixx
diff --git a/odb/details/posix/tls.txx b/libodb/odb/details/posix/tls.txx
index e4c5b8f..e4c5b8f 100644
--- a/odb/details/posix/tls.txx
+++ b/libodb/odb/details/posix/tls.txx
diff --git a/odb/details/shared-ptr-fwd.hxx b/libodb/odb/details/shared-ptr-fwd.hxx
index 73377b9..73377b9 100644
--- a/odb/details/shared-ptr-fwd.hxx
+++ b/libodb/odb/details/shared-ptr-fwd.hxx
diff --git a/odb/details/shared-ptr.hxx b/libodb/odb/details/shared-ptr.hxx
index 5a1e842..5a1e842 100644
--- a/odb/details/shared-ptr.hxx
+++ b/libodb/odb/details/shared-ptr.hxx
diff --git a/odb/details/shared-ptr/base.cxx b/libodb/odb/details/shared-ptr/base.cxx
index d937400..d937400 100644
--- a/odb/details/shared-ptr/base.cxx
+++ b/libodb/odb/details/shared-ptr/base.cxx
diff --git a/odb/details/shared-ptr/base.hxx b/libodb/odb/details/shared-ptr/base.hxx
index 8cd4c86..8cd4c86 100644
--- a/odb/details/shared-ptr/base.hxx
+++ b/libodb/odb/details/shared-ptr/base.hxx
diff --git a/odb/details/shared-ptr/base.ixx b/libodb/odb/details/shared-ptr/base.ixx
index 1e2fd4b..1e2fd4b 100644
--- a/odb/details/shared-ptr/base.ixx
+++ b/libodb/odb/details/shared-ptr/base.ixx
diff --git a/odb/details/shared-ptr/base.txx b/libodb/odb/details/shared-ptr/base.txx
index 77a957d..77a957d 100644
--- a/odb/details/shared-ptr/base.txx
+++ b/libodb/odb/details/shared-ptr/base.txx
diff --git a/odb/details/shared-ptr/counter-type.hxx b/libodb/odb/details/shared-ptr/counter-type.hxx
index 2b6caad..2b6caad 100644
--- a/odb/details/shared-ptr/counter-type.hxx
+++ b/libodb/odb/details/shared-ptr/counter-type.hxx
diff --git a/odb/details/shared-ptr/exception.hxx b/libodb/odb/details/shared-ptr/exception.hxx
index 0ed50be..0ed50be 100644
--- a/odb/details/shared-ptr/exception.hxx
+++ b/libodb/odb/details/shared-ptr/exception.hxx
diff --git a/odb/details/thread.cxx b/libodb/odb/details/thread.cxx
index b1fbe42..b1fbe42 100644
--- a/odb/details/thread.cxx
+++ b/libodb/odb/details/thread.cxx
diff --git a/odb/details/thread.hxx b/libodb/odb/details/thread.hxx
index 9095f68..9095f68 100644
--- a/odb/details/thread.hxx
+++ b/libodb/odb/details/thread.hxx
diff --git a/odb/details/tls.hxx b/libodb/odb/details/tls.hxx
index de6c344..de6c344 100644
--- a/odb/details/tls.hxx
+++ b/libodb/odb/details/tls.hxx
diff --git a/odb/details/transfer-ptr.hxx b/libodb/odb/details/transfer-ptr.hxx
index 4b63df6..4b63df6 100644
--- a/odb/details/transfer-ptr.hxx
+++ b/libodb/odb/details/transfer-ptr.hxx
diff --git a/odb/details/type-info.hxx b/libodb/odb/details/type-info.hxx
index fe01699..fe01699 100644
--- a/odb/details/type-info.hxx
+++ b/libodb/odb/details/type-info.hxx
diff --git a/odb/details/unique-ptr.hxx b/libodb/odb/details/unique-ptr.hxx
index 06b2c76..06b2c76 100644
--- a/odb/details/unique-ptr.hxx
+++ b/libodb/odb/details/unique-ptr.hxx
diff --git a/odb/details/unused.hxx b/libodb/odb/details/unused.hxx
index 8364c44..8364c44 100644
--- a/odb/details/unused.hxx
+++ b/libodb/odb/details/unused.hxx
diff --git a/odb/details/win32/condition.cxx b/libodb/odb/details/win32/condition.cxx
index 3a4b605..3a4b605 100644
--- a/odb/details/win32/condition.cxx
+++ b/libodb/odb/details/win32/condition.cxx
diff --git a/odb/details/win32/condition.hxx b/libodb/odb/details/win32/condition.hxx
index 69972a0..69972a0 100644
--- a/odb/details/win32/condition.hxx
+++ b/libodb/odb/details/win32/condition.hxx
diff --git a/odb/details/win32/condition.ixx b/libodb/odb/details/win32/condition.ixx
index 37a2bac..37a2bac 100644
--- a/odb/details/win32/condition.ixx
+++ b/libodb/odb/details/win32/condition.ixx
diff --git a/odb/details/win32/dll.cxx b/libodb/odb/details/win32/dll.cxx
index 49b660c..49b660c 100644
--- a/odb/details/win32/dll.cxx
+++ b/libodb/odb/details/win32/dll.cxx
diff --git a/odb/details/win32/exceptions.cxx b/libodb/odb/details/win32/exceptions.cxx
index 3cf11c2..3cf11c2 100644
--- a/odb/details/win32/exceptions.cxx
+++ b/libodb/odb/details/win32/exceptions.cxx
diff --git a/odb/details/win32/exceptions.hxx b/libodb/odb/details/win32/exceptions.hxx
index b61a447..b61a447 100644
--- a/odb/details/win32/exceptions.hxx
+++ b/libodb/odb/details/win32/exceptions.hxx
diff --git a/odb/details/win32/init.cxx b/libodb/odb/details/win32/init.cxx
index f6e0f9a..f6e0f9a 100644
--- a/odb/details/win32/init.cxx
+++ b/libodb/odb/details/win32/init.cxx
diff --git a/odb/details/win32/init.hxx b/libodb/odb/details/win32/init.hxx
index 1c15ffd..1c15ffd 100644
--- a/odb/details/win32/init.hxx
+++ b/libodb/odb/details/win32/init.hxx
diff --git a/odb/details/win32/lock.hxx b/libodb/odb/details/win32/lock.hxx
index 2e81ac6..2e81ac6 100644
--- a/odb/details/win32/lock.hxx
+++ b/libodb/odb/details/win32/lock.hxx
diff --git a/odb/details/win32/mutex.hxx b/libodb/odb/details/win32/mutex.hxx
index b2cd997..b2cd997 100644
--- a/odb/details/win32/mutex.hxx
+++ b/libodb/odb/details/win32/mutex.hxx
diff --git a/odb/details/win32/mutex.ixx b/libodb/odb/details/win32/mutex.ixx
index bb06415..bb06415 100644
--- a/odb/details/win32/mutex.ixx
+++ b/libodb/odb/details/win32/mutex.ixx
diff --git a/odb/details/win32/once-init.hxx b/libodb/odb/details/win32/once-init.hxx
index a465c90..a465c90 100644
--- a/odb/details/win32/once-init.hxx
+++ b/libodb/odb/details/win32/once-init.hxx
diff --git a/odb/details/win32/once.cxx b/libodb/odb/details/win32/once.cxx
index 7b98d80..7b98d80 100644
--- a/odb/details/win32/once.cxx
+++ b/libodb/odb/details/win32/once.cxx
diff --git a/odb/details/win32/once.hxx b/libodb/odb/details/win32/once.hxx
index 45748b8..45748b8 100644
--- a/odb/details/win32/once.hxx
+++ b/libodb/odb/details/win32/once.hxx
diff --git a/odb/details/win32/once.ixx b/libodb/odb/details/win32/once.ixx
index 1638706..1638706 100644
--- a/odb/details/win32/once.ixx
+++ b/libodb/odb/details/win32/once.ixx
diff --git a/odb/details/win32/thread.cxx b/libodb/odb/details/win32/thread.cxx
index 46720d4..46720d4 100644
--- a/odb/details/win32/thread.cxx
+++ b/libodb/odb/details/win32/thread.cxx
diff --git a/odb/details/win32/thread.hxx b/libodb/odb/details/win32/thread.hxx
index a4e1a15..a4e1a15 100644
--- a/odb/details/win32/thread.hxx
+++ b/libodb/odb/details/win32/thread.hxx
diff --git a/odb/details/win32/tls-init.hxx b/libodb/odb/details/win32/tls-init.hxx
index 0a44a10..0a44a10 100644
--- a/odb/details/win32/tls-init.hxx
+++ b/libodb/odb/details/win32/tls-init.hxx
diff --git a/odb/details/win32/tls.cxx b/libodb/odb/details/win32/tls.cxx
index 2edc364..2edc364 100644
--- a/odb/details/win32/tls.cxx
+++ b/libodb/odb/details/win32/tls.cxx
diff --git a/odb/details/win32/tls.hxx b/libodb/odb/details/win32/tls.hxx
index 2a75cc8..2a75cc8 100644
--- a/odb/details/win32/tls.hxx
+++ b/libodb/odb/details/win32/tls.hxx
diff --git a/odb/details/win32/tls.ixx b/libodb/odb/details/win32/tls.ixx
index fbcc3dd..fbcc3dd 100644
--- a/odb/details/win32/tls.ixx
+++ b/libodb/odb/details/win32/tls.ixx
diff --git a/odb/details/win32/tls.txx b/libodb/odb/details/win32/tls.txx
index 96bed4c..96bed4c 100644
--- a/odb/details/win32/tls.txx
+++ b/libodb/odb/details/win32/tls.txx
diff --git a/odb/details/win32/windows.hxx b/libodb/odb/details/win32/windows.hxx
index 9ff4cb4..9ff4cb4 100644
--- a/odb/details/win32/windows.hxx
+++ b/libodb/odb/details/win32/windows.hxx
diff --git a/odb/details/wrapper-p.hxx b/libodb/odb/details/wrapper-p.hxx
index 8f72b5d..8f72b5d 100644
--- a/odb/details/wrapper-p.hxx
+++ b/libodb/odb/details/wrapper-p.hxx
diff --git a/odb/exception.hxx b/libodb/odb/exception.hxx
index 39daf92..39daf92 100644
--- a/odb/exception.hxx
+++ b/libodb/odb/exception.hxx
diff --git a/odb/exceptions.cxx b/libodb/odb/exceptions.cxx
index bb13b6c..bb13b6c 100644
--- a/odb/exceptions.cxx
+++ b/libodb/odb/exceptions.cxx
diff --git a/odb/exceptions.hxx b/libodb/odb/exceptions.hxx
index d283010..d283010 100644
--- a/odb/exceptions.hxx
+++ b/libodb/odb/exceptions.hxx
diff --git a/odb/forward.hxx b/libodb/odb/forward.hxx
index 6f1176d..6f1176d 100644
--- a/odb/forward.hxx
+++ b/libodb/odb/forward.hxx
diff --git a/odb/function-table.hxx b/libodb/odb/function-table.hxx
index b1a5a94..b1a5a94 100644
--- a/odb/function-table.hxx
+++ b/libodb/odb/function-table.hxx
diff --git a/odb/lazy-pointer-traits.hxx b/libodb/odb/lazy-pointer-traits.hxx
index 2a6c8eb..2a6c8eb 100644
--- a/odb/lazy-pointer-traits.hxx
+++ b/libodb/odb/lazy-pointer-traits.hxx
diff --git a/odb/lazy-ptr-impl.hxx b/libodb/odb/lazy-ptr-impl.hxx
index 89fe798..89fe798 100644
--- a/odb/lazy-ptr-impl.hxx
+++ b/libodb/odb/lazy-ptr-impl.hxx
diff --git a/odb/lazy-ptr-impl.ixx b/libodb/odb/lazy-ptr-impl.ixx
index 9ab0471..9ab0471 100644
--- a/odb/lazy-ptr-impl.ixx
+++ b/libodb/odb/lazy-ptr-impl.ixx
diff --git a/odb/lazy-ptr-impl.txx b/libodb/odb/lazy-ptr-impl.txx
index 7aea9c3..7aea9c3 100644
--- a/odb/lazy-ptr-impl.txx
+++ b/libodb/odb/lazy-ptr-impl.txx
diff --git a/odb/lazy-ptr.hxx b/libodb/odb/lazy-ptr.hxx
index ab31dfc..ab31dfc 100644
--- a/odb/lazy-ptr.hxx
+++ b/libodb/odb/lazy-ptr.hxx
diff --git a/odb/lazy-ptr.ixx b/libodb/odb/lazy-ptr.ixx
index a2d72f5..a2d72f5 100644
--- a/odb/lazy-ptr.ixx
+++ b/libodb/odb/lazy-ptr.ixx
diff --git a/odb/lazy-ptr.txx b/libodb/odb/lazy-ptr.txx
index 17a7405..17a7405 100644
--- a/odb/lazy-ptr.txx
+++ b/libodb/odb/lazy-ptr.txx
diff --git a/odb/nested-container.hxx b/libodb/odb/nested-container.hxx
index d7e4ec1..d7e4ec1 100644
--- a/odb/nested-container.hxx
+++ b/libodb/odb/nested-container.hxx
diff --git a/odb/no-id-object-result.hxx b/libodb/odb/no-id-object-result.hxx
index 556065b..556065b 100644
--- a/odb/no-id-object-result.hxx
+++ b/libodb/odb/no-id-object-result.hxx
diff --git a/odb/no-id-object-result.txx b/libodb/odb/no-id-object-result.txx
index 886fe4b..886fe4b 100644
--- a/odb/no-id-object-result.txx
+++ b/libodb/odb/no-id-object-result.txx
diff --git a/odb/no-op-cache-traits.hxx b/libodb/odb/no-op-cache-traits.hxx
index b6d0518..b6d0518 100644
--- a/odb/no-op-cache-traits.hxx
+++ b/libodb/odb/no-op-cache-traits.hxx
diff --git a/odb/nullable.hxx b/libodb/odb/nullable.hxx
index d13f0c9..d13f0c9 100644
--- a/odb/nullable.hxx
+++ b/libodb/odb/nullable.hxx
diff --git a/odb/object-result.hxx b/libodb/odb/object-result.hxx
index 056d518..056d518 100644
--- a/odb/object-result.hxx
+++ b/libodb/odb/object-result.hxx
diff --git a/odb/pointer-traits.hxx b/libodb/odb/pointer-traits.hxx
index a0baa21..a0baa21 100644
--- a/odb/pointer-traits.hxx
+++ b/libodb/odb/pointer-traits.hxx
diff --git a/odb/polymorphic-info.hxx b/libodb/odb/polymorphic-info.hxx
index 0f410d5..0f410d5 100644
--- a/odb/polymorphic-info.hxx
+++ b/libodb/odb/polymorphic-info.hxx
diff --git a/odb/polymorphic-map.hxx b/libodb/odb/polymorphic-map.hxx
index 2e61314..2e61314 100644
--- a/odb/polymorphic-map.hxx
+++ b/libodb/odb/polymorphic-map.hxx
diff --git a/odb/polymorphic-map.ixx b/libodb/odb/polymorphic-map.ixx
index 4e00c46..4e00c46 100644
--- a/odb/polymorphic-map.ixx
+++ b/libodb/odb/polymorphic-map.ixx
diff --git a/odb/polymorphic-map.txx b/libodb/odb/polymorphic-map.txx
index 9e0c0f0..9e0c0f0 100644
--- a/odb/polymorphic-map.txx
+++ b/libodb/odb/polymorphic-map.txx
diff --git a/odb/polymorphic-object-result.hxx b/libodb/odb/polymorphic-object-result.hxx
index 5498856..5498856 100644
--- a/odb/polymorphic-object-result.hxx
+++ b/libodb/odb/polymorphic-object-result.hxx
diff --git a/odb/polymorphic-object-result.txx b/libodb/odb/polymorphic-object-result.txx
index d9252e9..d9252e9 100644
--- a/odb/polymorphic-object-result.txx
+++ b/libodb/odb/polymorphic-object-result.txx
diff --git a/odb/post.hxx b/libodb/odb/post.hxx
index 3cdfd94..3cdfd94 100644
--- a/odb/post.hxx
+++ b/libodb/odb/post.hxx
diff --git a/odb/pre.hxx b/libodb/odb/pre.hxx
index 088f172..088f172 100644
--- a/odb/pre.hxx
+++ b/libodb/odb/pre.hxx
diff --git a/odb/prepared-query.cxx b/libodb/odb/prepared-query.cxx
index 70bcaa1..70bcaa1 100644
--- a/odb/prepared-query.cxx
+++ b/libodb/odb/prepared-query.cxx
diff --git a/odb/prepared-query.hxx b/libodb/odb/prepared-query.hxx
index 7cac6da..7cac6da 100644
--- a/odb/prepared-query.hxx
+++ b/libodb/odb/prepared-query.hxx
diff --git a/odb/query-dynamic.cxx b/libodb/odb/query-dynamic.cxx
index bf9fd9c..bf9fd9c 100644
--- a/odb/query-dynamic.cxx
+++ b/libodb/odb/query-dynamic.cxx
diff --git a/odb/query-dynamic.hxx b/libodb/odb/query-dynamic.hxx
index cd0ce05..cd0ce05 100644
--- a/odb/query-dynamic.hxx
+++ b/libodb/odb/query-dynamic.hxx
diff --git a/odb/query-dynamic.ixx b/libodb/odb/query-dynamic.ixx
index 8de7b8e..8de7b8e 100644
--- a/odb/query-dynamic.ixx
+++ b/libodb/odb/query-dynamic.ixx
diff --git a/odb/query-dynamic.txx b/libodb/odb/query-dynamic.txx
index 9ea16d2..9ea16d2 100644
--- a/odb/query-dynamic.txx
+++ b/libodb/odb/query-dynamic.txx
diff --git a/odb/query.hxx b/libodb/odb/query.hxx
index 9375738..9375738 100644
--- a/odb/query.hxx
+++ b/libodb/odb/query.hxx
diff --git a/odb/result.cxx b/libodb/odb/result.cxx
index e9393ca..e9393ca 100644
--- a/odb/result.cxx
+++ b/libodb/odb/result.cxx
diff --git a/odb/result.hxx b/libodb/odb/result.hxx
index 87a6869..87a6869 100644
--- a/odb/result.hxx
+++ b/libodb/odb/result.hxx
diff --git a/odb/result.txx b/libodb/odb/result.txx
index b69d92a..b69d92a 100644
--- a/odb/result.txx
+++ b/libodb/odb/result.txx
diff --git a/odb/schema-catalog-impl.hxx b/libodb/odb/schema-catalog-impl.hxx
index dd729db..dd729db 100644
--- a/odb/schema-catalog-impl.hxx
+++ b/libodb/odb/schema-catalog-impl.hxx
diff --git a/odb/schema-catalog.cxx b/libodb/odb/schema-catalog.cxx
index 1bdc112..1bdc112 100644
--- a/odb/schema-catalog.cxx
+++ b/libodb/odb/schema-catalog.cxx
diff --git a/odb/schema-catalog.hxx b/libodb/odb/schema-catalog.hxx
index c38cd4f..c38cd4f 100644
--- a/odb/schema-catalog.hxx
+++ b/libodb/odb/schema-catalog.hxx
diff --git a/odb/schema-version.hxx b/libodb/odb/schema-version.hxx
index 1f047a4..1f047a4 100644
--- a/odb/schema-version.hxx
+++ b/libodb/odb/schema-version.hxx
diff --git a/odb/section.cxx b/libodb/odb/section.cxx
index 0fe5211..0fe5211 100644
--- a/odb/section.cxx
+++ b/libodb/odb/section.cxx
diff --git a/odb/section.hxx b/libodb/odb/section.hxx
index 98b98cf..98b98cf 100644
--- a/odb/section.hxx
+++ b/libodb/odb/section.hxx
diff --git a/odb/session.cxx b/libodb/odb/session.cxx
index bc0e854..bc0e854 100644
--- a/odb/session.cxx
+++ b/libodb/odb/session.cxx
diff --git a/odb/session.hxx b/libodb/odb/session.hxx
index a14c42f..a14c42f 100644
--- a/odb/session.hxx
+++ b/libodb/odb/session.hxx
diff --git a/odb/session.ixx b/libodb/odb/session.ixx
index 4acdc1b..4acdc1b 100644
--- a/odb/session.ixx
+++ b/libodb/odb/session.ixx
diff --git a/odb/session.txx b/libodb/odb/session.txx
index d74fe0f..d74fe0f 100644
--- a/odb/session.txx
+++ b/libodb/odb/session.txx
diff --git a/odb/simple-object-result.hxx b/libodb/odb/simple-object-result.hxx
index 53c0cb2..53c0cb2 100644
--- a/odb/simple-object-result.hxx
+++ b/libodb/odb/simple-object-result.hxx
diff --git a/odb/simple-object-result.txx b/libodb/odb/simple-object-result.txx
index 00521f8..00521f8 100644
--- a/odb/simple-object-result.txx
+++ b/libodb/odb/simple-object-result.txx
diff --git a/odb/statement-processing-common.hxx b/libodb/odb/statement-processing-common.hxx
index 23661fc..23661fc 100644
--- a/odb/statement-processing-common.hxx
+++ b/libodb/odb/statement-processing-common.hxx
diff --git a/odb/statement-processing.cxx b/libodb/odb/statement-processing.cxx
index 708c9ab..708c9ab 100644
--- a/odb/statement-processing.cxx
+++ b/libodb/odb/statement-processing.cxx
diff --git a/odb/statement.cxx b/libodb/odb/statement.cxx
index 35e7b77..35e7b77 100644
--- a/odb/statement.cxx
+++ b/libodb/odb/statement.cxx
diff --git a/odb/statement.hxx b/libodb/odb/statement.hxx
index 83513c0..83513c0 100644
--- a/odb/statement.hxx
+++ b/libodb/odb/statement.hxx
diff --git a/odb/std-array-traits.hxx b/libodb/odb/std-array-traits.hxx
index 1d0f1a1..1d0f1a1 100644
--- a/odb/std-array-traits.hxx
+++ b/libodb/odb/std-array-traits.hxx
diff --git a/odb/std-deque-traits.hxx b/libodb/odb/std-deque-traits.hxx
index 351c6db..351c6db 100644
--- a/odb/std-deque-traits.hxx
+++ b/libodb/odb/std-deque-traits.hxx
diff --git a/odb/std-forward-list-traits.hxx b/libodb/odb/std-forward-list-traits.hxx
index 7978b1c..7978b1c 100644
--- a/odb/std-forward-list-traits.hxx
+++ b/libodb/odb/std-forward-list-traits.hxx
diff --git a/odb/std-list-traits.hxx b/libodb/odb/std-list-traits.hxx
index f349079..f349079 100644
--- a/odb/std-list-traits.hxx
+++ b/libodb/odb/std-list-traits.hxx
diff --git a/odb/std-map-traits.hxx b/libodb/odb/std-map-traits.hxx
index 2b9bf7d..2b9bf7d 100644
--- a/odb/std-map-traits.hxx
+++ b/libodb/odb/std-map-traits.hxx
diff --git a/odb/std-set-traits.hxx b/libodb/odb/std-set-traits.hxx
index 45a5dcc..45a5dcc 100644
--- a/odb/std-set-traits.hxx
+++ b/libodb/odb/std-set-traits.hxx
diff --git a/odb/std-unordered-map-traits.hxx b/libodb/odb/std-unordered-map-traits.hxx
index 461eb06..461eb06 100644
--- a/odb/std-unordered-map-traits.hxx
+++ b/libodb/odb/std-unordered-map-traits.hxx
diff --git a/odb/std-unordered-set-traits.hxx b/libodb/odb/std-unordered-set-traits.hxx
index f590665..f590665 100644
--- a/odb/std-unordered-set-traits.hxx
+++ b/libodb/odb/std-unordered-set-traits.hxx
diff --git a/odb/std-vector-traits.hxx b/libodb/odb/std-vector-traits.hxx
index c6bb39e..c6bb39e 100644
--- a/odb/std-vector-traits.hxx
+++ b/libodb/odb/std-vector-traits.hxx
diff --git a/odb/tr1/lazy-pointer-traits.hxx b/libodb/odb/tr1/lazy-pointer-traits.hxx
index 7adf957..7adf957 100644
--- a/odb/tr1/lazy-pointer-traits.hxx
+++ b/libodb/odb/tr1/lazy-pointer-traits.hxx
diff --git a/odb/tr1/lazy-ptr.hxx b/libodb/odb/tr1/lazy-ptr.hxx
index b4946ec..b4946ec 100644
--- a/odb/tr1/lazy-ptr.hxx
+++ b/libodb/odb/tr1/lazy-ptr.hxx
diff --git a/odb/tr1/lazy-ptr.ixx b/libodb/odb/tr1/lazy-ptr.ixx
index dc5000f..dc5000f 100644
--- a/odb/tr1/lazy-ptr.ixx
+++ b/libodb/odb/tr1/lazy-ptr.ixx
diff --git a/odb/tr1/lazy-ptr.txx b/libodb/odb/tr1/lazy-ptr.txx
index 7e36cd9..7e36cd9 100644
--- a/odb/tr1/lazy-ptr.txx
+++ b/libodb/odb/tr1/lazy-ptr.txx
diff --git a/odb/tr1/memory.hxx b/libodb/odb/tr1/memory.hxx
index b9e9f45..b9e9f45 100644
--- a/odb/tr1/memory.hxx
+++ b/libodb/odb/tr1/memory.hxx
diff --git a/odb/tr1/pointer-traits.hxx b/libodb/odb/tr1/pointer-traits.hxx
index df4f25f..df4f25f 100644
--- a/odb/tr1/pointer-traits.hxx
+++ b/libodb/odb/tr1/pointer-traits.hxx
diff --git a/odb/tr1/wrapper-traits.hxx b/libodb/odb/tr1/wrapper-traits.hxx
index f878ef6..f878ef6 100644
--- a/odb/tr1/wrapper-traits.hxx
+++ b/libodb/odb/tr1/wrapper-traits.hxx
diff --git a/odb/tracer.cxx b/libodb/odb/tracer.cxx
index 1e636a7..1e636a7 100644
--- a/odb/tracer.cxx
+++ b/libodb/odb/tracer.cxx
diff --git a/odb/tracer.hxx b/libodb/odb/tracer.hxx
index 11e4e76..11e4e76 100644
--- a/odb/tracer.hxx
+++ b/libodb/odb/tracer.hxx
diff --git a/odb/traits.hxx b/libodb/odb/traits.hxx
index 2c6f5d6..2c6f5d6 100644
--- a/odb/traits.hxx
+++ b/libodb/odb/traits.hxx
diff --git a/odb/transaction.cxx b/libodb/odb/transaction.cxx
index f75cf32..f75cf32 100644
--- a/odb/transaction.cxx
+++ b/libodb/odb/transaction.cxx
diff --git a/odb/transaction.hxx b/libodb/odb/transaction.hxx
index 1958df3..1958df3 100644
--- a/odb/transaction.hxx
+++ b/libodb/odb/transaction.hxx
diff --git a/odb/transaction.ixx b/libodb/odb/transaction.ixx
index cc1ce5e..cc1ce5e 100644
--- a/odb/transaction.ixx
+++ b/libodb/odb/transaction.ixx
diff --git a/odb/vector-impl.cxx b/libodb/odb/vector-impl.cxx
index ca30f8d..ca30f8d 100644
--- a/odb/vector-impl.cxx
+++ b/libodb/odb/vector-impl.cxx
diff --git a/odb/vector-impl.hxx b/libodb/odb/vector-impl.hxx
index 9f2ea7c..9f2ea7c 100644
--- a/odb/vector-impl.hxx
+++ b/libodb/odb/vector-impl.hxx
diff --git a/odb/vector-impl.ixx b/libodb/odb/vector-impl.ixx
index 21999d5..21999d5 100644
--- a/odb/vector-impl.ixx
+++ b/libodb/odb/vector-impl.ixx
diff --git a/odb/vector-traits.hxx b/libodb/odb/vector-traits.hxx
index 5e6cf14..5e6cf14 100644
--- a/odb/vector-traits.hxx
+++ b/libodb/odb/vector-traits.hxx
diff --git a/odb/vector-traits.txx b/libodb/odb/vector-traits.txx
index 6c33876..6c33876 100644
--- a/odb/vector-traits.txx
+++ b/libodb/odb/vector-traits.txx
diff --git a/odb/vector.hxx b/libodb/odb/vector.hxx
index 3fe7d8a..3fe7d8a 100644
--- a/odb/vector.hxx
+++ b/libodb/odb/vector.hxx
diff --git a/odb/vector.ixx b/libodb/odb/vector.ixx
index 230b187..230b187 100644
--- a/odb/vector.ixx
+++ b/libodb/odb/vector.ixx
diff --git a/odb/version-build2-stub.hxx b/libodb/odb/version-build2-stub.hxx
index f4c7937..f4c7937 100644
--- a/odb/version-build2-stub.hxx
+++ b/libodb/odb/version-build2-stub.hxx
diff --git a/odb/version-build2.hxx b/libodb/odb/version-build2.hxx
index e69de29..e69de29 100644
--- a/odb/version-build2.hxx
+++ b/libodb/odb/version-build2.hxx
diff --git a/odb/version-build2.hxx.in b/libodb/odb/version-build2.hxx.in
index 3672585..3672585 100644
--- a/odb/version-build2.hxx.in
+++ b/libodb/odb/version-build2.hxx.in
diff --git a/odb/version.hxx b/libodb/odb/version.hxx
index 4961e1a..4961e1a 100644
--- a/odb/version.hxx
+++ b/libodb/odb/version.hxx
diff --git a/odb/view-image.hxx b/libodb/odb/view-image.hxx
index 51f7cc0..51f7cc0 100644
--- a/odb/view-image.hxx
+++ b/libodb/odb/view-image.hxx
diff --git a/odb/view-result.hxx b/libodb/odb/view-result.hxx
index 601c3b4..601c3b4 100644
--- a/odb/view-result.hxx
+++ b/libodb/odb/view-result.hxx
diff --git a/odb/view-result.txx b/libodb/odb/view-result.txx
index 5c62253..5c62253 100644
--- a/odb/view-result.txx
+++ b/libodb/odb/view-result.txx
diff --git a/odb/wrapper-traits.hxx b/libodb/odb/wrapper-traits.hxx
index d31425d..d31425d 100644
--- a/odb/wrapper-traits.hxx
+++ b/libodb/odb/wrapper-traits.hxx
diff --git a/tests/.gitignore b/libodb/tests/.gitignore
index e54525b..e54525b 100644
--- a/tests/.gitignore
+++ b/libodb/tests/.gitignore
diff --git a/tests/basics/buildfile b/libodb/tests/basics/buildfile
index d568216..d568216 100644
--- a/tests/basics/buildfile
+++ b/libodb/tests/basics/buildfile
diff --git a/tests/basics/driver.cxx b/libodb/tests/basics/driver.cxx
index 57cec1c..57cec1c 100644
--- a/tests/basics/driver.cxx
+++ b/libodb/tests/basics/driver.cxx
diff --git a/tests/build/.gitignore b/libodb/tests/build/.gitignore
index 4a730a3..4a730a3 100644
--- a/tests/build/.gitignore
+++ b/libodb/tests/build/.gitignore
diff --git a/tests/build/bootstrap.build b/libodb/tests/build/bootstrap.build
index 6ee38db..6ee38db 100644
--- a/tests/build/bootstrap.build
+++ b/libodb/tests/build/bootstrap.build
diff --git a/tests/build/root.build b/libodb/tests/build/root.build
index 6c5a90b..6c5a90b 100644
--- a/tests/build/root.build
+++ b/libodb/tests/build/root.build
diff --git a/tests/buildfile b/libodb/tests/buildfile
index 57588a4..57588a4 100644
--- a/tests/buildfile
+++ b/libodb/tests/buildfile
diff --git a/m4/acx-pthread.m4 b/m4/acx-pthread.m4
deleted file mode 100644
index 204b32d..0000000
--- a/m4/acx-pthread.m4
+++ /dev/null
@@ -1,259 +0,0 @@
-dnl
-dnl NOTE: This file was modified. See the comments starting with 'CS:'
-dnl for more information. In particular, it was changed to use C++
-dnl instead of C.
-dnl
-dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-dnl
-dnl @summary figure out how to build C++ programs using POSIX threads
-dnl
-dnl This macro figures out how to build C++ programs using POSIX threads.
-dnl It sets the PTHREAD_LIBS output variable to the threads library and
-dnl linker flags, and the PTHREAD_CXXFLAGS output variable to any special
-dnl C++ compiler flags that are needed. (The user can also force certain
-dnl compiler flags/libs to be tested by setting these environment
-dnl variables.)
-dnl
-dnl Also sets PTHREAD_CXX to any special C++ compiler that is needed for
-dnl multi-threaded programs (defaults to the value of CXX otherwise).
-dnl (This is necessary on AIX to use the special xlC_r compiler alias.)
-dnl
-dnl NOTE: You are assumed to not only compile your program with these
-dnl flags, but also link it with them as well. e.g. you should link
-dnl with $PTHREAD_CXX $CXXFLAGS $PTHREAD_CXXFLAGS $LDFLAGS ... $PTHREAD_LIBS
-dnl $LIBS
-dnl
-dnl If you are only building threads programs, you may wish to use
-dnl these variables in your default LIBS, CXXFLAGS, and CXX:
-dnl
-dnl        LIBS="$PTHREAD_LIBS $LIBS"
-dnl        CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
-dnl        CXX="$PTHREAD_CXX"
-dnl
-dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute
-dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to
-dnl that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-dnl
-dnl ACTION-IF-FOUND is a list of shell commands to run if a threads
-dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to
-dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the
-dnl default action will define HAVE_PTHREAD.
-dnl
-dnl Please let the authors know if this macro fails on any platform, or
-dnl if you have any other suggestions or comments. This macro was based
-dnl on work by SGJ on autoconf scripts for FFTW (www.fftw.org) (with
-dnl help from M. Frigo), as well as ac_pthread and hb_pthread macros
-dnl posted by Alejandro Forero Cuervo to the autoconf macro repository.
-dnl We are also grateful for the helpful feedback of numerous users.
-dnl
-dnl @category InstalledPackages
-dnl @author Steven G. Johnson <stevenj@alum.mit.edu>
-dnl @version 2006-05-29
-dnl @license GPLWithACException
-
-AC_DEFUN([ACX_PTHREAD], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-AC_LANG_SAVE
-AC_LANG(C++)
-acx_pthread_ok=no
-
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on True64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test x"$PTHREAD_LIBS$PTHREAD_CXXFLAGS" != x; then
-        save_CXXFLAGS="$CXXFLAGS"
-        CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CXXFLAGS=$PTHREAD_CXXFLAGS])
-        AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
-        AC_MSG_RESULT($acx_pthread_ok)
-        if test x"$acx_pthread_ok" = xno; then
-                PTHREAD_LIBS=""
-                PTHREAD_CXXFLAGS=""
-        fi
-        LIBS="$save_LIBS"
-        CXXFLAGS="$save_CXXFLAGS"
-fi
-
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try.  Items starting with a "-" are
-# C compiler flags, and other items are library names, except for "none"
-# which indicates that we try without any flags at all, and "pthread-config"
-# which is a program returning the flags for the Pth emulation library.
-
-# CS: On GNU/Linux with gcc both -pthread and -lpthread are valid.
-# However, libtool links libraries with -nostdlib which results in
-# -pthread being stripped from the linker command line. To resolve
-# this we move pthread from after -mthreads to after pthreads.
-#
-acx_pthread_flags="pthreads pthread none -Kthread -kthread lthread -pthread -pthreads -mthreads --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important.  Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-#       other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-# -pthreads: Solaris/gcc
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-#      doesn't hurt to check since this sometimes defines pthreads too;
-#      also defines -D_REENTRANT)
-#      ... -mt is also the pthreads flag for HP/aCC
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case "${host_cpu}-${host_os}" in
-        *solaris*)
-
-        # On Solaris (at least, for some versions), libc contains stubbed
-        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
-        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
-        # a function called by this macro, so we could check for that, but
-        # who knows whether they'll stub that too in a future libc.)  So,
-        # we'll just look for -pthreads and -lpthread first:
-
-        # CS: Move -mt to the front of the list; Sun CC will use -mt,
-        # gcc will use -pthreads.
-        #
-        acx_pthread_flags="-mt -pthreads pthread -pthread $acx_pthread_flags"
-        ;;
-esac
-
-if test x"$acx_pthread_ok" = xno; then
-for flag in $acx_pthread_flags; do
-
-        case $flag in
-                none)
-                AC_MSG_CHECKING([whether pthreads work without any flags])
-                ;;
-
-                -*)
-                AC_MSG_CHECKING([whether pthreads work with $flag])
-                PTHREAD_CXXFLAGS="$flag"
-                ;;
-
-		pthread-config)
-		AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no)
-		if test x"$acx_pthread_config" = xno; then continue; fi
-		PTHREAD_CXXFLAGS="`pthread-config --cflags`"
-		PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-		;;
-
-                *)
-                AC_MSG_CHECKING([for the pthreads library -l$flag])
-                PTHREAD_LIBS="-l$flag"
-                ;;
-        esac
-
-        save_LIBS="$LIBS"
-        save_CXXFLAGS="$CXXFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-        #
-        AC_TRY_LINK([#include <pthread.h>],
-                    [pthread_t th; pthread_join(th, 0);
-                     pthread_attr_init(0); pthread_cleanup_push(0, 0);
-                     pthread_create(0,0,0,0); pthread_cleanup_pop(0);],
-                    [acx_pthread_ok=yes])
-
-        LIBS="$save_LIBS"
-        CXXFLAGS="$save_CXXFLAGS"
-
-        AC_MSG_RESULT($acx_pthread_ok)
-        if test "x$acx_pthread_ok" = xyes; then
-                break;
-        fi
-
-        PTHREAD_LIBS=""
-        PTHREAD_CXXFLAGS=""
-done
-fi
-
-# Various other checks:
-if test "x$acx_pthread_ok" = xyes; then
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        save_CXXFLAGS="$CXXFLAGS"
-        CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
-
-dnl     # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-dnl	AC_MSG_CHECKING([for joinable pthread attribute])
-dnl	attr_name=unknown
-dnl	for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-dnl	    AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;],
-dnl                        [attr_name=$attr; break])
-dnl	done
-dnl     AC_MSG_RESULT($attr_name)
-dnl     if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
-dnl         AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
-dnl                            [Define to necessary symbol if this constant
-dnl                             uses a non-standard name on your system.])
-dnl     fi
-
-        AC_MSG_CHECKING([if more special flags are required for pthreads])
-        flag=no
-        case "${host_cpu}-${host_os}" in
-            *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
-            # CS: Add _REENTRANT in Linux to emulate -pthread.
-            #
-            *-linux* | *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
-        esac
-        AC_MSG_RESULT(${flag})
-        if test "x$flag" != xno; then
-            PTHREAD_CXXFLAGS="$flag $PTHREAD_CXXFLAGS"
-        fi
-
-        LIBS="$save_LIBS"
-        CXXFLAGS="$save_CXXFLAGS"
-
-dnl     # More AIX lossage: must compile with xlC_r
-dnl	if test x"$GXX" != xyes; then
-dnl          AC_CHECK_PROGS(PTHREAD_CXX, xlC_r, ${CXX})
-dnl        else
-dnl          PTHREAD_CXX=$CXX
-dnl	fi
-
-else
-        PTHREAD_CXX="$CXX"
-fi
-
-AC_SUBST(PTHREAD_LIBS)
-AC_SUBST(PTHREAD_CXXFLAGS)
-AC_SUBST(PTHREAD_CXX)
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test x"$acx_pthread_ok" = xyes; then
-        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
-        :
-else
-        acx_pthread_ok=no
-        $2
-fi
-AC_LANG_RESTORE
-])dnl ACX_PTHREAD
diff --git a/m4/disable-rpath.m4 b/m4/disable-rpath.m4
deleted file mode 100644
index 0864209..0000000
--- a/m4/disable-rpath.m4
+++ /dev/null
@@ -1,24 +0,0 @@
-dnl file      : m4/disable-rpath.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-AC_DEFUN([DISABLE_RPATH],[
-
-AC_MSG_CHECKING([whether to use rpath])
-AC_ARG_ENABLE(
-  [rpath],
-  [AC_HELP_STRING([--disable-rpath], [patch libtool to not use rpath])],
-  [libtool_rpath="$enable_rpath"],
-  [libtool_rpath="yes"])
-AC_MSG_RESULT($libtool_rpath)
-
-# Patch libtool to not use rpath if requested.
-#
-AC_CONFIG_COMMANDS(
-  [libtool-rpath-patch],
-  [if test "$libtool_use_rpath" = "no"; then
-     sed < libtool > libtool-2 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_NO_RPATH__ "/'
-     mv libtool-2 libtool
-     chmod 755 libtool
-  fi],
-  [libtool_use_rpath=$libtool_rpath])
-])dnl
diff --git a/m4/libodb.m4 b/m4/libodb.m4
deleted file mode 100644
index 0dba7c4..0000000
--- a/m4/libodb.m4
+++ /dev/null
@@ -1,81 +0,0 @@
-dnl file      : m4/libodb.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl LIBODB([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-dnl
-dnl
-AC_DEFUN([LIBODB], [
-libodb_found=no
-
-AC_ARG_WITH(
-  [libodb],
-  [AC_HELP_STRING([--with-libodb=DIR],[location of libodb build directory])],
-  [libodb_dir=${withval}],
-  [libodb_dir=])
-
-AC_MSG_CHECKING([for libodb])
-
-# If libodb_dir was given, add the necessary preprocessor and linker flags.
-#
-if test x"$libodb_dir" != x; then
-  save_CPPFLAGS="$CPPFLAGS"
-  save_LDFLAGS="$LDFLAGS"
-
-  AS_SET_CATFILE([abs_libodb_dir], [$ac_pwd], [$libodb_dir])
-
-  CPPFLAGS="$CPPFLAGS -I$abs_libodb_dir"
-  LDFLAGS="$LDFLAGS -L$abs_libodb_dir/odb"
-fi
-
-save_LIBS="$LIBS"
-LIBS="-lodb $LIBS"
-
-CXX_LIBTOOL_LINK_IFELSE([
-AC_LANG_SOURCE([
-#include <odb/exception.hxx>
-
-void
-f ()
-{
-}
-
-const char*
-g ()
-{
-  try
-  {
-    f ();
-  }
-  catch (const odb::exception& e)
-  {
-    return e.what ();
-  }
-  return 0;
-}
-
-int
-main ()
-{
-  const char* m (g ());
-  return m != 0;
-}
-])],
-[libodb_found=yes])
-
-if test x"$libodb_found" = xno; then
-  LIBS="$save_LIBS"
-
-  if test x"$libodb_dir" != x; then
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-  fi
-fi
-
-if test x"$libodb_found" = xyes; then
-  AC_MSG_RESULT([yes])
-  $1
-else
-  AC_MSG_RESULT([no])
-  $2
-fi
-])dnl
diff --git a/m4/libtool-link.m4 b/m4/libtool-link.m4
deleted file mode 100644
index 302639f..0000000
--- a/m4/libtool-link.m4
+++ /dev/null
@@ -1,45 +0,0 @@
-dnl file      : m4/libtool-link.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl
-dnl CXX_LIBTOOL_LINK_IFELSE (input, [action-if-true], [action-if-false])
-dnl
-dnl Similar to AC_LINK_IFELSE except it uses libtool to perform the
-dnl linking and it does this using the C++ compiler.
-dnl
-AC_DEFUN([CXX_LIBTOOL_LINK_IFELSE],[
-AC_LANG_SAVE
-AC_LANG(C++)
-
-if test -d .libs; then
-  delete_libs_dir=no
-else
-  delete_libs_dir=yes
-fi
-
-AC_COMPILE_IFELSE([$1],
-[
-  ac_try='./libtool --tag=CXX --mode=link $CXX -no-install $CXXFLAGS $LDFLAGS -o conftest conftest.$OBJEXT $LIBS >&AS_MESSAGE_LOG_FD'
-  if _AC_DO_VAR(ac_try); then
-    libtool_link_ok=yes
-  else
-    libtool_link_ok=no
-  fi
-],
-[
-  libtool_link_ok=no
-])
-
-if test x"$delete_libs_dir" = xyes; then
-  rm -rf .libs
-fi
-
-if test x"$libtool_link_ok" = xyes; then
-[$2]
-:
-else
-[$3]
-:
-fi
-
-AC_LANG_RESTORE])dnl
diff --git a/m4/pkgconfig.m4 b/m4/pkgconfig.m4
deleted file mode 100644
index c48ea56..0000000
--- a/m4/pkgconfig.m4
+++ /dev/null
@@ -1,11 +0,0 @@
-dnl file      : m4/pkgconfig.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-AC_DEFUN([PKGCONFIG],[
-AC_ARG_WITH(
-  [pkgconfigdir],
-  [AC_HELP_STRING([--with-pkgconfigdir=DIR],[location of pkgconfig dir (default is libdir/pkgconfig)])],
-  [pkgconfigdir=${withval}],
-  [pkgconfigdir='${libdir}/pkgconfig'])
-AC_SUBST([pkgconfigdir])
-])dnl
diff --git a/m4/static-lib.m4 b/m4/static-lib.m4
deleted file mode 100644
index 5fb1c11..0000000
--- a/m4/static-lib.m4
+++ /dev/null
@@ -1,17 +0,0 @@
-dnl file      : m4/static-lib.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl STATIC_LIB(MACRO, DESCRIPTION)
-dnl
-dnl Define MACRO if we are on MinGW and are only building static library.
-dnl
-AC_DEFUN([STATIC_LIB],
-[
-if test x$enable_shared = xno; then
-  case $host_os in
-    mingw*)
-      AC_DEFINE([$1], [1], [$2])
-      ;;
-  esac
-fi
-])dnl
diff --git a/m4/threads.m4 b/m4/threads.m4
deleted file mode 100644
index 6f2e25f..0000000
--- a/m4/threads.m4
+++ /dev/null
@@ -1,68 +0,0 @@
-dnl file      : m4/threads.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-AC_DEFUN([THREADS],[
-
-threads_thread_keyword=no
-
-AC_ARG_ENABLE(
-  [threads],
-  AS_HELP_STRING([--disable-threads], [disable threads (enabled by default)]),
-  [AS_IF([test x"$enableval" = xno], [threads=none], [threads=check])],
-  [threads=check])
-
-# If thread support is not disabled by the user, figure out what we can use.
-#
-if test x$threads = xcheck; then
-  case $host_os in
-    windows* | mingw*)
-      case $host_os in
-        mingw*)
-          CXXFLAGS="$CXXFLAGS -mthreads"
-          ;;
-      esac
-
-      # Newer versions of GCC can be configured to use either Win32 or POSIX
-      # threads. It appears that -mthreads should be used in both cases but
-      # if the model is POSIX then GCC will also link -lpthread by default.
-      # Use that fact to test which model we have.
-      #
-      AC_TRY_LINK([#include <pthread.h>],
-                  [pthread_create(0,0,0,0);],
-		  [threads=posix],
-                  [threads=win32])
-      ;;
-    *)
-      ACX_PTHREAD
-
-      if test x$acx_pthread_ok = xyes; then
-        threads=posix
-        LIBS="$LIBS $PTHREAD_LIBS"
-        CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
-
-        # Check if we can use the __thread keyword.
-        #
-        AC_MSG_CHECKING([for __thread keyword])
-
-        CXX_LIBTOOL_LINK_IFELSE([
-          AC_LANG_SOURCE([
-            __thread int tls_var;
-
-            int
-            main ()
-            {
-              tls_var = 0;
-            }
-          ])],
-          [threads_thread_keyword=yes])
-
-        AC_MSG_RESULT([$threads_thread_keyword])
-      fi
-      ;;
-  esac
-fi
-
-if test x$threads = xcheck; then
-  AC_MSG_ERROR([thread support not available; use --disable-threads to force single-threaded mode])
-fi
-])dnl
diff --git a/makefile b/makefile
deleted file mode 100644
index 74e1b6e..0000000
--- a/makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# file      : makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))build/bootstrap.make
-
-dirs := odb
-
-default  := $(out_base)/
-dist     := $(out_base)/.dist
-clean    := $(out_base)/.clean
-
-$(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs)))
-
-$(dist): export dirs := $(dirs)
-$(dist): export docs := GPLv2 LICENSE README NEWS version.txt
-$(dist): data_dist := INSTALL libodb-vc8.sln libodb-vc9.sln libodb-vc10.sln \
-libodb-vc11.sln libodb-vc12.sln
-$(dist): exec_dist := bootstrap
-$(dist): export extra_dist := $(data_dist) $(exec_dist)
-$(dist): export version = $(shell cat $(src_root)/version.txt)
-
-$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(dirs)))
-	$(call dist-data,$(docs) $(data_dist) libodb.pc.in)
-	$(call dist-exec,$(exec_dist))
-	$(call dist-dir,m4)
-	$(call meta-automake)
-	$(call meta-autoconf)
-
-$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(dirs)))
-
-$(call include,$(bld_root)/dist.make)
-$(call include,$(bld_root)/meta/automake.make)
-$(call include,$(bld_root)/meta/autoconf.make)
-
-$(foreach d,$(dirs),$(call import,$(src_base)/$d/makefile))
diff --git a/odb/Makefile.am b/odb/Makefile.am
deleted file mode 100644
index af5141c..0000000
--- a/odb/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# file      : odb/Makefile.am
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-lib_LTLIBRARIES = libodb.la
-libodb_la_SOURCES = __path__(sources)
-
-odbincludedir = $(includedir)/odb
-nobase_odbinclude_HEADERS = __path__(headers)
-nobase_nodist_odbinclude_HEADERS = details/config.h
-
-EXTRA_DIST = __file__(extra_dist)
-
-# At the moment, DllMain() is only necessary if we are using Win32
-# threads. So keep win32_dll_sources in ODB_THREADS_WIN32.
-#
-if ODB_WIN32
-nobase_odbinclude_HEADERS += __path__(win32_headers)
-endif
-
-if ODB_THREADS_POSIX
-libodb_la_SOURCES += __path__(posix_threads_sources)
-nobase_odbinclude_HEADERS += __path__(posix_threads_headers)
-endif
-
-if ODB_THREADS_WIN32
-libodb_la_SOURCES += __path__(win32_threads_sources) __path__(win32_dll_sources)
-nobase_odbinclude_HEADERS += __path__(win32_threads_headers)
-endif
-
-AM_CPPFLAGS= -I'$(top_builddir)' -I'$(top_srcdir)' -DLIBODB_DYNAMIC_LIB
-AM_LDFLAGS = -release __value__(interface_version) -no-undefined
diff --git a/odb/libodb-vc10.vcxproj b/odb/libodb-vc10.vcxproj
deleted file mode 100644
index d3e2889..0000000
--- a/odb/libodb-vc10.vcxproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libodb</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\bin\</OutDir>
-    <TargetName>odb-d-__value__(interface_version)-vc10</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\bin64\</OutDir>
-    <TargetName>odb-d-__value__(interface_version)-vc10</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\bin\</OutDir>
-    <TargetName>odb-__value__(interface_version)-vc10</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\bin64\</OutDir>
-    <TargetName>odb-__value__(interface_version)-vc10</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib\odb-d.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib64\odb-d.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib\odb.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib64\odb.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-__header_entries__(headers)
-__header_entry__(details\config-vc.h)
-  </ItemGroup>
-  <ItemGroup>
-__source_entries__(sources)
-__source_entries__(win32_threads_sources)
-__source_entries__(win32_dll_sources)
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/odb/libodb-vc10.vcxproj.filters b/odb/libodb-vc10.vcxproj.filters
deleted file mode 100644
index da1d6b2..0000000
--- a/odb/libodb-vc10.vcxproj.filters
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cxx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hxx;ixx;txx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-__header_filter_entries__(headers)
-__header_filter_entry__(details\config-vc.h)
-  </ItemGroup>
-  <ItemGroup>
-__source_filter_entries__(sources)
-__source_filter_entries__(win32_threads_sources)
-  </ItemGroup>
-</Project>
diff --git a/odb/libodb-vc11.vcxproj b/odb/libodb-vc11.vcxproj
deleted file mode 100644
index 7da5af7..0000000
--- a/odb/libodb-vc11.vcxproj
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libodb</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\bin\</OutDir>
-    <TargetName>odb-d-__value__(interface_version)-vc11</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\bin64\</OutDir>
-    <TargetName>odb-d-__value__(interface_version)-vc11</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\bin\</OutDir>
-    <TargetName>odb-__value__(interface_version)-vc11</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\bin64\</OutDir>
-    <TargetName>odb-__value__(interface_version)-vc11</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib\odb-d.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib64\odb-d.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib\odb.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib64\odb.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-__header_entries__(headers)
-__header_entry__(details\config-vc.h)
-  </ItemGroup>
-  <ItemGroup>
-__source_entries__(sources)
-__source_entries__(win32_threads_sources)
-__source_entries__(win32_dll_sources)
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/odb/libodb-vc11.vcxproj.filters b/odb/libodb-vc11.vcxproj.filters
deleted file mode 100644
index da1d6b2..0000000
--- a/odb/libodb-vc11.vcxproj.filters
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cxx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hxx;ixx;txx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-__header_filter_entries__(headers)
-__header_filter_entry__(details\config-vc.h)
-  </ItemGroup>
-  <ItemGroup>
-__source_filter_entries__(sources)
-__source_filter_entries__(win32_threads_sources)
-  </ItemGroup>
-</Project>
diff --git a/odb/libodb-vc12.vcxproj b/odb/libodb-vc12.vcxproj
deleted file mode 100644
index e9e2698..0000000
--- a/odb/libodb-vc12.vcxproj
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1C53C543-8038-4C8A-8AB1-65E74FD7DE2E}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libodb</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\bin\</OutDir>
-    <TargetName>odb-d-__value__(interface_version)-vc12</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\bin64\</OutDir>
-    <TargetName>odb-d-__value__(interface_version)-vc12</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\bin\</OutDir>
-    <TargetName>odb-__value__(interface_version)-vc12</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\bin64\</OutDir>
-    <TargetName>odb-__value__(interface_version)-vc12</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib\odb-d.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib64\odb-d.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib\odb.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib64\odb.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-__header_entries__(headers)
-__header_entry__(details\config-vc.h)
-  </ItemGroup>
-  <ItemGroup>
-__source_entries__(sources)
-__source_entries__(win32_threads_sources)
-__source_entries__(win32_dll_sources)
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/odb/libodb-vc12.vcxproj.filters b/odb/libodb-vc12.vcxproj.filters
deleted file mode 100644
index da1d6b2..0000000
--- a/odb/libodb-vc12.vcxproj.filters
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cxx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hxx;ixx;txx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-__header_filter_entries__(headers)
-__header_filter_entry__(details\config-vc.h)
-  </ItemGroup>
-  <ItemGroup>
-__source_filter_entries__(sources)
-__source_filter_entries__(win32_threads_sources)
-  </ItemGroup>
-</Project>
diff --git a/odb/libodb-vc8.vcproj b/odb/libodb-vc8.vcproj
deleted file mode 100644
index 00a668e..0000000
--- a/odb/libodb-vc8.vcproj
+++ /dev/null
@@ -1,351 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="libodb"
-	ProjectGUID="{513E5721-D318-46B0-8CFB-054042DF87A7}"
-	RootNamespace="libodb"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".."
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4251"
-				Optimization="0"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="if not exist ..\lib mkdir ..\lib"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\bin\odb-d-__value__(interface_version)-vc8.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\lib\odb-d.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".."
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4251"
-				Optimization="0"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="if not exist ..\lib64 mkdir ..\lib64"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\bin64\odb-d-__value__(interface_version)-vc8.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\lib64\odb-d.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".."
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4251"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="if not exist ..\lib mkdir ..\lib"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\bin\odb-__value__(interface_version)-vc8.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\lib\odb.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".."
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4251"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="if not exist ..\lib64 mkdir ..\lib64"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\bin64\odb-__value__(interface_version)-vc8.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\lib64\odb.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cxx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-__source_entries__(sources)
-__source_entries__(win32_threads_sources)
-__source_entries__(win32_dll_sources)
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hxx;ixx;txx"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-__file_entries__(headers)
-__file_entry__(details\config-vc.h)
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/odb/libodb-vc9.vcproj b/odb/libodb-vc9.vcproj
deleted file mode 100644
index 011e4f0..0000000
--- a/odb/libodb-vc9.vcproj
+++ /dev/null
@@ -1,358 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="libodb"
-	ProjectGUID="{513E5721-D318-46B0-8CFB-054042DF87A7}"
-	RootNamespace="libodb"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".."
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4251"
-				Optimization="0"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="if not exist ..\lib mkdir ..\lib"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\bin\odb-d-__value__(interface_version)-vc9.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\lib\odb-d.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".."
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4251"
-				Optimization="0"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="if not exist ..\lib64 mkdir ..\lib64"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\bin64\odb-d-__value__(interface_version)-vc9.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\lib64\odb-d.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".."
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4251"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="if not exist ..\lib mkdir ..\lib"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\bin\odb-__value__(interface_version)-vc9.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\lib\odb.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".."
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4251"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="if not exist ..\lib64 mkdir ..\lib64"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\bin64\odb-__value__(interface_version)-vc9.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\lib64\odb.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cxx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-__source_entries__(sources)
-__source_entries__(win32_threads_sources)
-__source_entries__(win32_dll_sources)
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hxx;ixx;txx"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-__file_entries__(headers)
-__file_entry__(details\config-vc.h)
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/odb/makefile b/odb/makefile
deleted file mode 100644
index 01b395e..0000000
--- a/odb/makefile
+++ /dev/null
@@ -1,184 +0,0 @@
-# file      : odb/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make
-
-cxx :=                   \
-exceptions.cxx           \
-database.cxx             \
-vector-impl.cxx          \
-connection.cxx           \
-prepared-query.cxx       \
-query-dynamic.cxx        \
-result.cxx               \
-schema-catalog.cxx       \
-section.cxx              \
-session.cxx              \
-statement.cxx            \
-statement-processing.cxx \
-tracer.cxx               \
-transaction.cxx
-
-# Implementation details.
-#
-cxx +=                      \
-details/buffer.cxx          \
-details/condition.cxx       \
-details/lock.cxx            \
-details/mutex.cxx           \
-details/shared-ptr/base.cxx
-
-# POSIX-based implementation details.
-#
-posix_thr_cxx :=             \
-details/posix/exceptions.cxx \
-details/posix/thread.cxx
-
-# Win32-based implementation details.
-#
-win32_thr_cxx :=             \
-details/win32/init.cxx       \
-details/win32/once.cxx       \
-details/win32/tls.cxx        \
-details/win32/condition.cxx  \
-details/win32/thread.cxx     \
-details/win32/exceptions.cxx
-
-win32_dll_cxx := details/win32/dll.cxx
-
-cxx_tun := $(cxx)
-
-ifeq ($(libodb_threads),posix)
-cxx_tun += $(posix_thr_cxx)
-endif
-
-ifeq ($(libodb_threads),win32)
-cxx_tun += $(win32_thr_cxx)
-
-$(call include,$(bld_root)/ld/configuration-lib.make) # ld_lib_type
-
-ifeq ($(ld_lib_type),shared)
-cxx_tun += $(win32_dll_cxx)
-endif
-endif
-
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-odb.l             := $(out_base)/odb.l
-odb.l.cpp-options := $(out_base)/odb.l.cpp-options
-
-default := $(out_base)/
-dist    := $(out_base)/.dist
-clean   := $(out_base)/.clean
-
-# Build.
-#
-$(odb.l): $(cxx_obj)
-
-ifeq ($(libodb_threads),posix)
-$(odb.l): -lpthread
-endif
-
-$(cxx_obj) $(cxx_od): $(odb.l.cpp-options) $(out_base)/details/config.h
-$(odb.l.cpp-options): value := -I$(out_root) -I$(src_root)
-
-ifdef libodb_threads
-$(out_base)/details/config.h: | $(out_base)/details/.
-	@echo '/* file      : odb/details/config.h'                      >$@
-	@echo ' * note      : automatically generated'                  >>$@
-	@echo ' */'                                                     >>$@
-	@echo ''                                                        >>$@
-	@echo '#ifndef ODB_DETAILS_CONFIG_H'                            >>$@
-	@echo '#define ODB_DETAILS_CONFIG_H'                            >>$@
-	@echo ''                                                        >>$@
-ifeq ($(libodb_threads),posix)
-	@echo '#define ODB_THREADS_POSIX 1'                             >>$@
-endif
-ifeq ($(libodb_threads),win32)
-	@echo '#define ODB_THREADS_WIN32 1'                             >>$@
-endif
-ifeq ($(libodb_threads),none)
-	@echo '#define ODB_THREADS_NONE 1'                              >>$@
-endif
-	@echo ''                                                        >>$@
-	@echo '#endif /* ODB_DETAILS_CONFIG_H */'                       >>$@
-endif
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(out_base)/details/config.h)
-
-# Convenience alias for default target.
-#
-$(out_base)/: $(odb.l)
-
-# Dist.
-#
-$(dist): export sources := $(cxx)
-$(dist): export posix_threads_sources := $(posix_thr_cxx)
-$(dist): export win32_threads_sources := $(win32_thr_cxx)
-$(dist): export win32_dll_sources := $(win32_dll_cxx)
-
-$(dist): export headers := $(subst $(src_base)/,,$(shell find $(src_base) \
--path $(src_base)/details/posix -a -prune -a -false -o \
--path $(src_base)/details/win32 -a -prune -a -false -o \
--name '*.hxx' -o -name '*.ixx' -o -name '*.txx'))
-$(dist): export posix_threads_headers := $(subst $(src_base)/,,$(shell find \
-$(src_base)/details/posix -name '*.hxx' -o -name '*.ixx' -o -name '*.txx'))
-$(dist): export win32_headers := details/win32/windows.hxx
-$(dist): export win32_threads_headers := $(foreach \
-h,$(win32_headers),$(filter-out $h,$(subst $(src_base)/,,$(shell find \
-$(src_base)/details/win32 -name '*.hxx' -o -name '*.ixx' -o -name '*.txx'))))
-
-$(dist): data_dist := details/config.h.in details/config-vc.h
-$(dist): export extra_dist := $(data_dist) \
-libodb-vc8.vcproj libodb-vc9.vcproj \
-libodb-vc10.vcxproj libodb-vc10.vcxproj.filters \
-libodb-vc11.vcxproj libodb-vc11.vcxproj.filters \
-libodb-vc12.vcxproj libodb-vc12.vcxproj.filters
-$(dist): export interface_version = $(shell sed -e \
-'s/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version.txt)
-
-$(dist):
-	$(call dist-data,$(sources) $(posix_threads_sources) \
-$(win32_threads_sources) $(win32_dll_sources) $(headers) \
-$(posix_threads_headers) $(win32_headers) $(win32_threads_headers) \
-$(data_dist))
-	$(call meta-vc8proj,$(src_base)/libodb-vc8.vcproj)
-	$(call meta-vc9proj,$(src_base)/libodb-vc9.vcproj)
-	$(call meta-vc10proj,$(src_base)/libodb-vc10.vcxproj)
-	$(call meta-vc11proj,$(src_base)/libodb-vc11.vcxproj)
-	$(call meta-vc12proj,$(src_base)/libodb-vc12.vcxproj)
-	$(call meta-automake)
-
-# Clean.
-#
-$(clean): $(odb.l).o.clean           \
-  $(odb.l.cpp-options).clean         \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))
-	$(call message,rm $$1,rm -f $$1,$(out_base)/details/config.h)
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(odb.l): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := details/config.h
-$(clean): $(out_base)/.gitignore.clean
-
-$(call include,$(bld_root)/git/gitignore.make)
-endif
-
-# How to.
-#
-$(call include,$(bld_root)/dist.make)
-$(call include,$(bld_root)/meta/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/o-l.make)
-$(call include,$(bld_root)/cxx/cxx-o.make)
-$(call include,$(bld_root)/cxx/cxx-d.make)
diff --git a/version.txt b/version.txt
deleted file mode 100644
index 6bc2f39..0000000
--- a/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-2.5.0-b.26