Switch to build2

25 files changed, 237 insertions, 1756 deletions

diff --git a/libcommon/.gitignore b/libcommon/.gitignore
new file mode 100644
index 0000000..a994ddc
--- /dev/null
+++ b/libcommon/.gitignore
@@ -0,0 +1,3 @@
+# Generated config header.
+#
+config.hxx
diff --git a/libcommon/Makefile.am b/libcommon/Makefile.am
deleted file mode 100644
index 18d287d..0000000
--- a/libcommon/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-# file      : libcommon/Makefile.am
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-SUBDIRS = __path__(dirs)
-EXTRA_DIST = __file__(extra_dist)
diff --git a/libcommon/common/buffer.hxx b/libcommon/buffer.hxx
index 3d82915..41b7e46 100644
--- a/libcommon/common/buffer.hxx
+++ b/libcommon/buffer.hxx
@@ -1,8 +1,8 @@
-// file      : libcommon/common/buffer.hxx
+// file      : libcommon/buffer.hxx
 // license   : GNU GPL v2; see accompanying LICENSE file
 
-#ifndef LIBCOMMON_COMMON_BUFFER_HXX
-#define LIBCOMMON_COMMON_BUFFER_HXX
+#ifndef LIBCOMMON_BUFFER_HXX
+#define LIBCOMMON_BUFFER_HXX
 
 #include <new>
 #include <cstddef> // std::size_t
@@ -101,4 +101,4 @@ struct basic_buffer: basic_buffer_base
 typedef basic_buffer<char> buffer;
 typedef basic_buffer<unsigned char> ubuffer;
 
-#endif // LIBCOMMON_COMMON_BUFFER_HXX
+#endif // LIBCOMMON_BUFFER_HXX
diff --git a/libcommon/buildfile b/libcommon/buildfile
new file mode 100644
index 0000000..eb61455
--- /dev/null
+++ b/libcommon/buildfile
@@ -0,0 +1,50 @@
+# file      : libcommon/buildfile
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+import intf_libs = libodb%lib{odb}
+
+for db: $databases
+  import intf_libs += libodb-$db%lib{odb-$db}
+
+lib{common}: {hxx ixx txx cxx}{** -config} hxx{config} $intf_libs
+
+# Generated config file.
+#
+using autoconf
+
+hxx{config}: in{config}
+{
+  DATABASE_MYSQL  = $mysql
+  DATABASE_SQLITE = $sqlite
+  DATABASE_PGSQL  = $pgsql
+  DATABASE_ORACLE = $oracle
+  DATABASE_MSSQL  = $mssql
+  MULTI_DATABASE  = $multi
+}
+
+# Build options.
+#
+cxx.poptions =+ "-I$out_root" "-I$src_root"
+
+{hbmia obja}{*}: cxx.poptions += -DLIBCOMMON_STATIC_BUILD
+{hbmis objs}{*}: cxx.poptions += -DLIBCOMMON_SHARED_BUILD
+
+# Export options.
+#
+lib{common}:
+{
+  cxx.export.poptions = "-I$out_root" "-I$src_root"
+  cxx.export.libs = $intf_libs
+}
+
+liba{common}: cxx.export.poptions += -DLIBCOMMON_STATIC
+libs{common}: cxx.export.poptions += -DLIBCOMMON_SHARED
+
+# For pre-releases use the complete version to make sure they cannot
+# be used in place of another pre-release or the final version. See
+# the version module for details on the version.* variable values.
+#
+if $version.pre_release
+  lib{common}: bin.lib.version = "-$version.project_id"
+else
+  lib{common}: bin.lib.version = "-$version.major.$version.minor"
diff --git a/libcommon/common/common.cxx b/libcommon/common.cxx
index 4b8afe1..b3e4cfd 100644
--- a/libcommon/common/common.cxx
+++ b/libcommon/common.cxx
@@ -1,4 +1,4 @@
-// file      : libcommon/common/common.cxx
+// file      : libcommon/common.cxx
 // license   : GNU GPL v2; see accompanying LICENSE file
 
 #include <cstdlib> // std::exit
@@ -7,8 +7,8 @@
 
 #include <odb/database.hxx>
 
-#include <common/config.hxx>
-#include <common/common.hxx>
+#include <libcommon/config.hxx>
+#include <libcommon/common.hxx>
 
 using namespace std;
 using namespace odb::core;
@@ -16,40 +16,30 @@ using namespace odb::core;
 
 // MySQL.
 //
-#if defined(DATABASE_MYSQL) || defined(DATABASE_COMMON)
+#if defined(DATABASE_MYSQL)
 
 #include <odb/mysql/database.hxx>
 #include <odb/mysql/connection-factory.hxx>
 
-static auto_ptr<database>
+static unique_ptr<database>
 create_mysql_database (int& argc, char* argv[], bool, size_t max_connections)
 {
   namespace mysql = odb::mysql;
 
-#ifdef HAVE_CXX11
   unique_ptr<mysql::connection_factory> f;
-#else
-  auto_ptr<mysql::connection_factory> f;
-#endif
 
   if (max_connections != 0)
     f.reset (new mysql::connection_pool_factory (max_connections));
 
-  return auto_ptr<database> (
-    new mysql::database (argc, argv, false, "", 0,
-#ifdef HAVE_CXX11
-                         move (f)
-#else
-                         f
-#endif
-    ));
+  return unique_ptr<database> (
+    new mysql::database (argc, argv, false, "", 0, move (f)));
 }
 #endif // MySQL
 
 
 // SQLite.
 //
-#if defined(DATABASE_SQLITE) || defined(DATABASE_COMMON)
+#if defined(DATABASE_SQLITE)
 
 #include <odb/connection.hxx>
 #include <odb/transaction.hxx>
@@ -57,7 +47,7 @@ create_mysql_database (int& argc, char* argv[], bool, size_t max_connections)
 #include <odb/sqlite/database.hxx>
 #include <odb/sqlite/connection-factory.hxx>
 
-static auto_ptr<database>
+static unique_ptr<database>
 create_sqlite_database (int& argc,
                         char* argv[],
                         bool schema,
@@ -65,16 +55,12 @@ create_sqlite_database (int& argc,
 {
   namespace sqlite = odb::sqlite;
 
-#ifdef HAVE_CXX11
   unique_ptr<sqlite::connection_factory> f;
-#else
-  auto_ptr<sqlite::connection_factory> f;
-#endif
 
   if (max_connections != 0)
     f.reset (new sqlite::connection_pool_factory (max_connections));
 
-  auto_ptr<database> db (
+  unique_ptr<database> db (
     new sqlite::database (
       argc, argv, false,
       SQLITE_OPEN_READWRITE
@@ -85,12 +71,7 @@ create_sqlite_database (int& argc,
       ,
       true,
       "",
-#ifdef HAVE_CXX11
-      move (f)
-#else
-      f
-#endif
-    ));
+      move (f)));
 
   // Create the database schema. Due to bugs in SQLite foreign key
   // support for DDL statements, we need to temporarily disable
@@ -116,54 +97,40 @@ create_sqlite_database (int& argc,
 
 // PostgreSQL.
 //
-#if defined(DATABASE_PGSQL) || defined(DATABASE_COMMON)
+#if defined(DATABASE_PGSQL)
 
 #include <odb/pgsql/database.hxx>
 #include <odb/pgsql/connection-factory.hxx>
 
-static auto_ptr<database>
+static unique_ptr<database>
 create_pgsql_database (int& argc, char* argv[], bool, size_t max_connections)
 {
   namespace pgsql = odb::pgsql;
 
-#ifdef HAVE_CXX11
   unique_ptr<pgsql::connection_factory> f;
-#else
-  auto_ptr<pgsql::connection_factory> f;
-#endif
 
   if (max_connections != 0)
     f.reset (new pgsql::connection_pool_factory (max_connections));
 
-  return auto_ptr<database> (
-    new pgsql::database (argc, argv, false, "",
-#ifdef HAVE_CXX11
-                         move (f)
-#else
-                         f
-#endif
-    ));
+  return unique_ptr<database> (
+    new pgsql::database (argc, argv, false, "", move (f)));
 }
 #endif // PostgreSQL
 
 
 // Oracle.
 //
-#if defined(DATABASE_ORACLE) || defined(DATABASE_COMMON)
+#if defined(DATABASE_ORACLE)
 
 #include <odb/oracle/database.hxx>
 #include <odb/oracle/connection-factory.hxx>
 
-static auto_ptr<database>
+static unique_ptr<database>
 create_oracle_database (int& argc, char* argv[], bool, size_t max_connections)
 {
   namespace oracle = odb::oracle;
 
-#ifdef HAVE_CXX11
   unique_ptr<oracle::connection_factory> f;
-#else
-  auto_ptr<oracle::connection_factory> f;
-#endif
 
   if (max_connections != 0)
     f.reset (new oracle::connection_pool_factory (max_connections));
@@ -171,59 +138,42 @@ create_oracle_database (int& argc, char* argv[], bool, size_t max_connections)
   // Set client database character set and client national character set
   // to UTF-8.
   //
-  return auto_ptr<database> (
-    new oracle::database (argc, argv, false, 873, 873, 0,
-#ifdef HAVE_CXX11
-                          move (f)
-#else
-                          f
-#endif
-    ));
+  return unique_ptr<database> (
+    new oracle::database (argc, argv, false, 873, 873, 0, move (f)));
 }
 #endif // Oracle
 
 // SQL Server.
 //
-#if defined(DATABASE_MSSQL) || defined(DATABASE_COMMON)
+#if defined(DATABASE_MSSQL)
 
 #include <odb/mssql/database.hxx>
 #include <odb/mssql/connection-factory.hxx>
 
-static auto_ptr<database>
+static unique_ptr<database>
 create_mssql_database (int& argc, char* argv[], bool, size_t max_connections)
 {
   namespace mssql = odb::mssql;
 
-#ifdef HAVE_CXX11
   unique_ptr<mssql::connection_factory> f;
-#else
-  auto_ptr<mssql::connection_factory> f;
-#endif
 
   if (max_connections != 0)
     f.reset (new mssql::connection_pool_factory (max_connections));
 
-  return auto_ptr<database> (
+  return unique_ptr<database> (
     new mssql::database (argc, argv, false, "",
-                         mssql::isolation_read_committed, 0,
-
-#ifdef HAVE_CXX11
-                         move (f)
-#else
-                         f
-#endif
-    ));
+                         mssql::isolation_read_committed, 0, move (f)));
 }
 #endif // SQL Server
 
 //
 //
-auto_ptr<database>
+unique_ptr<database>
 create_database (int argc,
                  char* argv[],
                  bool schema,
                  size_t max_connections,
-#if defined(DATABASE_COMMON)
+#if defined(MULTI_DATABASE)
                  odb::database_id db
 #else
                  odb::database_id
@@ -233,7 +183,7 @@ create_database (int argc,
   char** argp = argv + 1; // Position of the next argument. Assignment for VC8.
   int argn (argc - 1);    // Number of arguments left.
 
-#if defined(DATABASE_COMMON)
+#if defined(MULTI_DATABASE)
   // Figure out which database we are creating. We may be given the
   // database name as a program argument or as an id.
   //
@@ -268,7 +218,7 @@ create_database (int argc,
 
   if (argn != 0 && *argp == string ("--help"))
   {
-#if defined(DATABASE_COMMON)
+#if defined(MULTI_DATABASE)
     cout << "Usage: " << argv[0] << " <db> [options]" << endl;
 #else
     cout << "Usage: " << argv[0] << " [options]" << endl;
@@ -276,37 +226,57 @@ create_database (int argc,
 
     cout << "Options:" << endl;
 
-#if defined(DATABASE_MYSQL)
-    odb::mysql::database::print_usage (cout);
-#elif defined(DATABASE_SQLITE)
-    odb::sqlite::database::print_usage (cout);
-#elif defined(DATABASE_PGSQL)
-    odb::pgsql::database::print_usage (cout);
-#elif defined(DATABASE_ORACLE)
-    odb::oracle::database::print_usage (cout);
-#elif defined(DATABASE_MSSQL)
-    odb::mssql::database::print_usage (cout);
-#elif defined(DATABASE_COMMON)
+#if defined(MULTI_DATABASE)
     switch (db)
     {
     case odb::id_mysql:
+#if defined(DATABASE_MYSQL)
       odb::mysql::database::print_usage (cout);
+#else
+    assert (false);
+#endif
       break;
     case odb::id_sqlite:
+#if defined(DATABASE_SQLITE)
       odb::sqlite::database::print_usage (cout);
+#else
+    assert (false);
+#endif
       break;
     case odb::id_pgsql:
+#if defined(DATABASE_PGSQL)
       odb::pgsql::database::print_usage (cout);
+#else
+    assert (false);
+#endif
       break;
     case odb::id_oracle:
+#if defined(DATABASE_ORACLE)
       odb::oracle::database::print_usage (cout);
+#else
+    assert (false);
+#endif
       break;
     case odb::id_mssql:
+#if defined(DATABASE_MSSQL)
       odb::mssql::database::print_usage (cout);
+#else
+    assert (false);
+#endif
       break;
     case odb::id_common:
       assert (false);
     }
+#elif defined(DATABASE_MYSQL)
+    odb::mysql::database::print_usage (cout);
+#elif defined(DATABASE_SQLITE)
+    odb::sqlite::database::print_usage (cout);
+#elif defined(DATABASE_PGSQL)
+    odb::pgsql::database::print_usage (cout);
+#elif defined(DATABASE_ORACLE)
+    odb::oracle::database::print_usage (cout);
+#elif defined(DATABASE_MSSQL)
+    odb::mssql::database::print_usage (cout);
 #else
 #  error unknown database
 #endif
@@ -314,33 +284,58 @@ create_database (int argc,
     exit (0);
   }
 
-#if defined(DATABASE_MYSQL)
-  return create_mysql_database (argc, argv, schema, max_connections);
-#elif defined(DATABASE_SQLITE)
-  return create_sqlite_database (argc, argv, schema, max_connections);
-#elif defined(DATABASE_PGSQL)
-  return create_pgsql_database (argc, argv, schema, max_connections);
-#elif defined(DATABASE_ORACLE)
-  return create_oracle_database (argc, argv, schema, max_connections);
-#elif defined(DATABASE_MSSQL)
-  return create_mssql_database (argc, argv, schema, max_connections);
-#elif defined(DATABASE_COMMON)
+#if defined(MULTI_DATABASE)
   switch (db)
   {
   case odb::id_mysql:
+#if defined(DATABASE_MYSQL)
     return create_mysql_database (argc, argv, schema, max_connections);
+#else
+    assert (false);
+    break;
+#endif
   case odb::id_sqlite:
+#if defined(DATABASE_SQLITE)
     return create_sqlite_database (argc, argv, schema, max_connections);
+#else
+    assert (false);
+    break;
+#endif
   case odb::id_pgsql:
+#if defined(DATABASE_PGSQL)
     return create_pgsql_database (argc, argv, schema, max_connections);
+#else
+    assert (false);
+    break;
+#endif
   case odb::id_oracle:
+#if defined(DATABASE_ORACLE)
     return create_oracle_database (argc, argv, schema, max_connections);
+#else
+    assert (false);
+    break;
+#endif
   case odb::id_mssql:
+#if defined(DATABASE_MSSQL)
     return create_mssql_database (argc, argv, schema, max_connections);
+#else
+    assert (false);
+    break;
+#endif
   case odb::id_common:
     assert (false);
   }
-  return auto_ptr<database> ();
+  return unique_ptr<database> ();
+#elif defined(DATABASE_MYSQL)
+  return create_mysql_database (argc, argv, schema, max_connections);
+#elif defined(DATABASE_SQLITE)
+  return create_sqlite_database (argc, argv, schema, max_connections);
+#elif defined(DATABASE_PGSQL)
+  return create_pgsql_database (argc, argv, schema, max_connections);
+#elif defined(DATABASE_ORACLE)
+  return create_oracle_database (argc, argv, schema, max_connections);
+#elif defined(DATABASE_MSSQL)
+  return create_mssql_database (argc, argv, schema, max_connections);
 #else
 #  error unknown database
 #endif
@@ -349,10 +344,10 @@ create_database (int argc,
 bool
 size_available ()
 {
-#if defined(DATABASE_SQLITE) || \
+#if defined(MULTI_DATABASE)  || \
+    defined(DATABASE_SQLITE) || \
     defined(DATABASE_ORACLE) || \
-    defined(DATABASE_MSSQL)  || \
-    defined(DATABASE_COMMON)
+    defined(DATABASE_MSSQL)
   return false;
 #else
   return true;
diff --git a/libcommon/common/common.hxx b/libcommon/common.hxx
index 21672b1..9ab978d 100644
--- a/libcommon/common/common.hxx
+++ b/libcommon/common.hxx
@@ -1,24 +1,18 @@
-// file      : libcommon/common/common.hxx
+// file      : libcommon/common.hxx
 // license   : GNU GPL v2; see accompanying LICENSE file
 
-#ifndef LIBCOMMON_COMMON_COMMON_HXX
-#define LIBCOMMON_COMMON_COMMON_HXX
+#ifndef LIBCOMMON_COMMON_HXX
+#define LIBCOMMON_COMMON_HXX
 
-#include <memory>  // std::auto_ptr
+#include <memory>  // std::unique_ptr
 #include <cstddef> // std::size_t
 
-#include <odb/forward.hxx> // odb::database
 #include <odb/result.hxx>
+#include <odb/database.hxx>
 
-#include <common/export.hxx>
+#include <libcommon/export.hxx>
 
-// Make sure assert() is not disabled.
-//
-#ifdef NDEBUG
-#  error ODB tests require enabled assert(); un-define the NDEBUG macro
-#endif
-
-LIBCOMMON_EXPORT std::auto_ptr<odb::database>
+LIBCOMMON_SYMEXPORT std::unique_ptr<odb::database>
 create_database (int argc,
                  char* argv[],
                  bool create_schema = true,
@@ -26,19 +20,19 @@ create_database (int argc,
                  odb::database_id db = odb::id_common);
 
 template <typename T>
-std::auto_ptr<T>
+std::unique_ptr<T>
 create_specific_database (int argc,
                           char* argv[],
                           bool create_schema = true,
                           std::size_t max_connections = 0)
 {
-  std::auto_ptr<odb::database> r (
+  std::unique_ptr<odb::database> r (
     create_database (argc, argv,
                      create_schema,
                      max_connections,
                      T::database_id));
 
-  return std::auto_ptr<T> (&dynamic_cast<T&> (*r.release ()));
+  return std::unique_ptr<T> (&dynamic_cast<T&> (*r.release ()));
 }
 
 // This function returns an accurate result only if the result iterator
@@ -48,6 +42,6 @@ template <typename T>
 std::size_t
 size (odb::result<T>);
 
-#include <common/common.txx>
+#include <libcommon/common.txx>
 
-#endif // LIBCOMMON_COMMON_COMMON_HXX
+#endif // LIBCOMMON_COMMON_HXX
diff --git a/libcommon/common/common.txx b/libcommon/common.txx
index 9dd2a35..caa7481 100644
--- a/libcommon/common/common.txx
+++ b/libcommon/common.txx
@@ -1,11 +1,11 @@
-// file      : libcommon/common/common.txx
+// file      : libcommon/common.txx
 // license   : GNU GPL v2; see accompanying LICENSE file
 
 // We have to use this helper function instead of just checking which
 // database is used because the DATABASE_* macro may not be defined
 // in a project that includes this header.
 //
-LIBCOMMON_EXPORT bool
+LIBCOMMON_SYMEXPORT bool
 size_available ();
 
 template <typename T>
diff --git a/libcommon/common/Makefile.am b/libcommon/common/Makefile.am
deleted file mode 100644
index 3ff50d5..0000000
--- a/libcommon/common/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-# file      : libcommon/common/Makefile.am
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-noinst_LTLIBRARIES = libcommon.la
-libcommon_la_SOURCES = __path__(sources) __path__(headers)
-
-EXTRA_DIST = __file__(extra_dist)
-
-AM_CPPFLAGS = -I'$(top_builddir)/libcommon' -I'$(top_srcdir)/libcommon'
-AM_CPPFLAGS += -DLIBCOMMON_DYNAMIC_LIB
-AM_LDFLAGS = -no-undefined -rpath '$(libdir)'
diff --git a/libcommon/common/config-vc.h b/libcommon/common/config-vc.h
deleted file mode 100644
index 16d89a0..0000000
--- a/libcommon/common/config-vc.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* file      : libcommon/common/config-vc.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* Configuration file for Windows/VC++. */
-
-#ifndef LIBCOMMON_COMMON_CONFIG_VC_H
-#define LIBCOMMON_COMMON_CONFIG_VC_H
-
-#define HAVE_TR1_MEMORY
-
-/* VC++10 and later has C++11 always enabled.
- */
-#if (defined(_MSC_VER) && _MSC_VER >= 1600) || \
-    (defined(ODB_MSC_VER) && ODB_MSC_VER >= 1600)
-#  define HAVE_CXX11
-// Strongly typed enums are supported starting from VC++11.
-//
-#  if (defined(_MSC_VER) && _MSC_VER >= 1700) || \
-      (defined(ODB_MSC_VER) && ODB_MSC_VER >= 1700)
-#    define HAVE_CXX11_ENUM
-#  endif
-#endif
-
-#endif /* LIBCOMMON_COMMON_CONFIG_VC_H */
diff --git a/libcommon/common/config.h.in b/libcommon/common/config.h.in
deleted file mode 100644
index 9d3e0fc..0000000
--- a/libcommon/common/config.h.in
+++ /dev/null
@@ -1,19 +0,0 @@
-/* file      : libcommon/common/config.h.in
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* This file is automatically processed by configure. */
-
-#ifndef LIBCOMMON_COMMON_CONFIG_H
-#define LIBCOMMON_COMMON_CONFIG_H
-
-#undef DATABASE_MYSQL
-#undef DATABASE_SQLITE
-#undef DATABASE_PGSQL
-#undef DATABASE_ORACLE
-#undef DATABASE_MSSQL
-#undef HAVE_TR1_MEMORY
-#undef HAVE_CXX11
-#undef LIBCOMMON_STATIC_LIB
-
-#endif /* LIBCOMMON_COMMON_CONFIG_H */
diff --git a/libcommon/common/config.hxx b/libcommon/common/config.hxx
deleted file mode 100644
index 5c6d938..0000000
--- a/libcommon/common/config.hxx
+++ /dev/null
@@ -1,20 +0,0 @@
-// file      : libcommon/common/config.hxx
-// license   : GNU GPL v2; see accompanying LICENSE file
-
-#ifndef LIBCOMMON_COMMON_CONFIG_HXX
-#define LIBCOMMON_COMMON_CONFIG_HXX
-
-#ifdef HAVE_CONFIG_VC_H
-#  include <common/config-vc.h>
-#else
-#  include <common/config.h>
-
-// GCC supports strongly typed enums from 4.4 (forward -- 4.6),
-// Clang -- 2.9 (3.1).
-//
-#  ifdef HAVE_CXX11
-#    define HAVE_CXX11_ENUM
-#  endif
-#endif
-
-#endif // LIBCOMMON_COMMON_CONFIG_HXX
diff --git a/libcommon/common/export.hxx b/libcommon/common/export.hxx
deleted file mode 100644
index 926d7a5..0000000
--- a/libcommon/common/export.hxx
+++ /dev/null
@@ -1,35 +0,0 @@
-// file      : libcommon/common/export.hxx
-// license   : GNU GPL v2; see accompanying LICENSE file
-
-#ifndef LIBCOMMON_COMMON_EXPORT_HXX
-#define LIBCOMMON_COMMON_EXPORT_HXX
-
-#include <common/config.hxx>
-
-#ifdef LIBCOMMON_STATIC_LIB
-#  define LIBCOMMON_EXPORT
-#else
-#  ifdef _WIN32
-#    ifdef _MSC_VER
-#      ifdef LIBCOMMON_DYNAMIC_LIB
-#        define LIBCOMMON_EXPORT __declspec(dllexport)
-#      else
-#        define LIBCOMMON_EXPORT __declspec(dllimport)
-#      endif
-#    else
-#      ifdef LIBCOMMON_DYNAMIC_LIB
-#        ifdef DLL_EXPORT
-#          define LIBCOMMON_EXPORT __declspec(dllexport)
-#        else
-#          define LIBCOMMON_EXPORT
-#        endif
-#      else
-#        define LIBCOMMON_EXPORT __declspec(dllimport)
-#      endif
-#    endif
-#  else
-#    define LIBCOMMON_EXPORT
-#  endif
-#endif
-
-#endif // LIBCOMMON_COMMON_EXPORT_HXX
diff --git a/libcommon/common/libcommon-vc10.vcxproj b/libcommon/common/libcommon-vc10.vcxproj
deleted file mode 100644
index a07a9a6..0000000
--- a/libcommon/common/libcommon-vc10.vcxproj
+++ /dev/null
@@ -1,174 +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>{019C2E51-BF41-4490-AB96-4156741B8CC9}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libcommon</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>common-d</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\bin64\</OutDir>
-    <TargetName>common-d</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\bin\</OutDir>
-    <TargetName>common</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\bin64\</OutDir>
-    <TargetName>common</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb-__value__(database)-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib\common-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;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb-__value__(database)-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib64\common-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;_WINDOWS;_USRDLL;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb-__value__(database).lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib\common.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;_WINDOWS;_USRDLL;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb-__value__(database).lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib64\common.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-__header_entries__(headers)
-  </ItemGroup>
-  <ItemGroup>
-__source_entries__(sources)
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/libcommon/common/libcommon-vc10.vcxproj.filters b/libcommon/common/libcommon-vc10.vcxproj.filters
deleted file mode 100644
index ecc3613..0000000
--- a/libcommon/common/libcommon-vc10.vcxproj.filters
+++ /dev/null
@@ -1,19 +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>{6B7BDACA-0BDC-48B2-B5BD-BEFC5826ABC9}</UniqueIdentifier>
-      <Extensions>cxx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{F2B8743C-E39C-4FE0-AA8F-FF7FA2DA7191}</UniqueIdentifier>
-      <Extensions>h;hxx;ixx;txx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-__header_filter_entries__(headers)
-  </ItemGroup>
-  <ItemGroup>
-__source_filter_entries__(sources)
-  </ItemGroup>
-</Project>
diff --git a/libcommon/common/libcommon-vc11.vcxproj b/libcommon/common/libcommon-vc11.vcxproj
deleted file mode 100644
index c5a6758..0000000
--- a/libcommon/common/libcommon-vc11.vcxproj
+++ /dev/null
@@ -1,178 +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>{019C2E51-BF41-4490-AB96-4156741B8CC9}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libcommon</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>common-d</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\bin64\</OutDir>
-    <TargetName>common-d</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\bin\</OutDir>
-    <TargetName>common</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\bin64\</OutDir>
-    <TargetName>common</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb-__value__(database)-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib\common-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;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb-__value__(database)-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib64\common-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;_WINDOWS;_USRDLL;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb-__value__(database).lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib\common.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;_WINDOWS;_USRDLL;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb-__value__(database).lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib64\common.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-__header_entries__(headers)
-  </ItemGroup>
-  <ItemGroup>
-__source_entries__(sources)
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/libcommon/common/libcommon-vc11.vcxproj.filters b/libcommon/common/libcommon-vc11.vcxproj.filters
deleted file mode 100644
index ecc3613..0000000
--- a/libcommon/common/libcommon-vc11.vcxproj.filters
+++ /dev/null
@@ -1,19 +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>{6B7BDACA-0BDC-48B2-B5BD-BEFC5826ABC9}</UniqueIdentifier>
-      <Extensions>cxx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{F2B8743C-E39C-4FE0-AA8F-FF7FA2DA7191}</UniqueIdentifier>
-      <Extensions>h;hxx;ixx;txx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-__header_filter_entries__(headers)
-  </ItemGroup>
-  <ItemGroup>
-__source_filter_entries__(sources)
-  </ItemGroup>
-</Project>
diff --git a/libcommon/common/libcommon-vc12.vcxproj b/libcommon/common/libcommon-vc12.vcxproj
deleted file mode 100644
index e577c79..0000000
--- a/libcommon/common/libcommon-vc12.vcxproj
+++ /dev/null
@@ -1,182 +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>{019C2E51-BF41-4490-AB96-4156741B8CC9}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libcommon</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>common-d</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\bin64\</OutDir>
-    <TargetName>common-d</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\bin\</OutDir>
-    <TargetName>common</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\bin64\</OutDir>
-    <TargetName>common</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb-__value__(database)-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib\common-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;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb-__value__(database)-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib64\common-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;_WINDOWS;_USRDLL;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb-__value__(database).lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib\common.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;_WINDOWS;_USRDLL;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb-__value__(database).lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib64\common.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-__header_entries__(headers)
-  </ItemGroup>
-  <ItemGroup>
-__source_entries__(sources)
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/libcommon/common/libcommon-vc12.vcxproj.filters b/libcommon/common/libcommon-vc12.vcxproj.filters
deleted file mode 100644
index ecc3613..0000000
--- a/libcommon/common/libcommon-vc12.vcxproj.filters
+++ /dev/null
@@ -1,19 +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>{6B7BDACA-0BDC-48B2-B5BD-BEFC5826ABC9}</UniqueIdentifier>
-      <Extensions>cxx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{F2B8743C-E39C-4FE0-AA8F-FF7FA2DA7191}</UniqueIdentifier>
-      <Extensions>h;hxx;ixx;txx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-__header_filter_entries__(headers)
-  </ItemGroup>
-  <ItemGroup>
-__source_filter_entries__(sources)
-  </ItemGroup>
-</Project>
diff --git a/libcommon/common/libcommon-vc8.vcproj b/libcommon/common/libcommon-vc8.vcproj
deleted file mode 100644
index ab5656a..0000000
--- a/libcommon/common/libcommon-vc8.vcproj
+++ /dev/null
@@ -1,352 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="libcommon"
-	ProjectGUID="{8575F058-1BD6-4F97-8901-83D0110C2B6B}"
-	RootNamespace="libcommon"
-	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"
-				Optimization="0"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_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"
-				AdditionalDependencies="odb-__value__(database)-d.lib odb-d.lib"
-				OutputFile="$(OutDir)\bin\common-d.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\lib\common-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"
-				Optimization="0"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));__upcase__(database_)__upcase__(__value__(database));__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_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"
-				AdditionalDependencies="odb-__value__(database)-d.lib odb-d.lib"
-				OutputFile="$(OutDir)\bin64\common-d.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\lib64\common-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"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_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"
-				AdditionalDependencies="odb-__value__(database).lib odb.lib"
-				OutputFile="$(OutDir)\bin\common.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\lib\common.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"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_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"
-				AdditionalDependencies="odb-__value__(database).lib odb.lib"
-				OutputFile="$(OutDir)\bin64\common.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\lib64\common.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="{AC9C925E-DBC7-4706-85E4-BD38199359F7}"
-			>
-__source_entries__(sources)
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hxx;ixx;txx"
-			UniqueIdentifier="{D30085A2-1A37-43F8-9B2E-D82BD026A113}"
-			>
-__file_entries__(headers)
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/libcommon/common/libcommon-vc9.vcproj b/libcommon/common/libcommon-vc9.vcproj
deleted file mode 100644
index 49bfe21..0000000
--- a/libcommon/common/libcommon-vc9.vcproj
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="libcommon"
-	ProjectGUID="{8575F058-1BD6-4F97-8901-83D0110C2B6B}"
-	RootNamespace="libcommon"
-	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"
-				Optimization="0"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_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"
-				AdditionalDependencies="odb-__value__(database)-d.lib odb-d.lib"
-				OutputFile="$(OutDir)\bin\common-d.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\lib\common-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"
-				Optimization="0"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));__upcase__(database_)__upcase__(__value__(database));__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_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"
-				AdditionalDependencies="odb-__value__(database)-d.lib odb-d.lib"
-				OutputFile="$(OutDir)\bin64\common-d.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\lib64\common-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"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_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"
-				AdditionalDependencies="odb-__value__(database).lib odb.lib"
-				OutputFile="$(OutDir)\bin\common.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\lib\common.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"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;HAVE_CONFIG_VC_H;__upcase__(database_)__upcase__(__value__(database));LIBCOMMON_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"
-				AdditionalDependencies="odb-__value__(database).lib odb.lib"
-				OutputFile="$(OutDir)\bin64\common.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\lib64\common.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="{AC9C925E-DBC7-4706-85E4-BD38199359F7}"
-			>
-__source_entries__(sources)
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hxx;ixx;txx"
-			UniqueIdentifier="{D30085A2-1A37-43F8-9B2E-D82BD026A113}"
-			>
-__file_entries__(headers)
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/libcommon/common/makefile b/libcommon/common/makefile
deleted file mode 100644
index 2f6537f..0000000
--- a/libcommon/common/makefile
+++ /dev/null
@@ -1,166 +0,0 @@
-# file      : libcommon/common/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := common.cxx
-
-cxx_obj   := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o))
-cxx_od    := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_base)/common.l
-common.l.cpp-options := $(out_base)/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/libodb/stub.make,\
-  l: odb.l,cpp-options: odb.l.cpp-options)
-
-ifdef db_id
-ifneq ($(db_id),common)
-$(call import,\
-  $(scf_root)/import/libodb-$(db_id)/stub.make,\
-  l: odb_db.l,cpp-options: odb_db.l.cpp-options)
-else
-# Import all database runtimes.
-#
-$(call import,\
-  $(scf_root)/import/libodb-mysql/stub.make,\
-  l: odb_mysql.l,cpp-options: odb_mysql.l.cpp-options)
-
-$(call import,\
-  $(scf_root)/import/libodb-sqlite/stub.make,\
-  l: odb_sqlite.l,cpp-options: odb_sqlite.l.cpp-options)
-
-$(call import,\
-  $(scf_root)/import/libodb-pgsql/stub.make,\
-  l: odb_pgsql.l,cpp-options: odb_pgsql.l.cpp-options)
-
-$(call import,\
-  $(scf_root)/import/libodb-oracle/stub.make,\
-  l: odb_oracle.l,cpp-options: odb_oracle.l.cpp-options)
-
-$(call import,\
-  $(scf_root)/import/libodb-mssql/stub.make,\
-  l: odb_mssql.l,cpp-options: odb_mssql.l.cpp-options)
-
-odb_db.l :=     \
-$(odb_mysql.l)  \
-$(odb_sqlite.l) \
-$(odb_pgsql.l)  \
-$(odb_oracle.l) \
-$(odb_mssql.l)
-
-odb_db.l.cpp-options :=     \
-$(odb_mysql.l.cpp-options)  \
-$(odb_sqlite.l.cpp-options) \
-$(odb_pgsql.l.cpp-options)  \
-$(odb_oracle.l.cpp-options) \
-$(odb_mssql.l.cpp-options)
-endif
-endif
-
-ifeq ($(odb_db.l.cpp-options),)
-odb_db.l.cpp-options := $(out_base)/.unbuildable
-endif
-
-# Build.
-#
-$(common.l): $(cxx_obj) $(odb.l) $(odb_db.l)
-
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options) $(out_base)/config.h
-$(common.l.cpp-options): value := -I$(out_root)/libcommon -I$(src_root)/libcommon
-$(common.l.cpp-options): $(odb_db.l.cpp-options) $(odb.l.cpp-options)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-
-ifdef db_id
-ifdef cxx_standard
-$(out_base)/config.h: | $(out_base)/.
-	@echo '/* file      : libcommon/common/config.h'                 >$@
-	@echo ' * note      : automatically generated'                  >>$@
-	@echo ' */'                                                     >>$@
-	@echo ''                                                        >>$@
-	@echo '#ifndef LIBCOMMON_COMMON_CONFIG_H'                       >>$@
-	@echo '#define LIBCOMMON_COMMON_CONFIG_H'                       >>$@
-	@echo ''                                                        >>$@
-ifeq ($(db_id),mysql)
-	@echo '#define DATABASE_MYSQL 1'                                >>$@
-else ifeq ($(db_id),sqlite)
-	@echo '#define DATABASE_SQLITE 1'                               >>$@
-else ifeq ($(db_id),pgsql)
-	@echo '#define DATABASE_PGSQL 1'                                >>$@
-else ifeq ($(db_id),oracle)
-	@echo '#define DATABASE_ORACLE 1'                               >>$@
-else ifeq ($(db_id),mssql)
-	@echo '#define DATABASE_MSSQL 1'                                >>$@
-else ifeq ($(db_id),common)
-	@echo '#define DATABASE_COMMON 1'                               >>$@
-endif
-ifeq ($(cxx_standard),c++11)
-	@echo '#define HAVE_CXX11 1'                                    >>$@
-endif
-	@echo '#define HAVE_TR1_MEMORY 1'                               >>$@
-	@echo ''                                                        >>$@
-	@echo '#endif /* LIBCOMMON_COMMON_CONFIG_H */'                  >>$@
-endif
-endif
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(out_base)/config.h)
-
-# Convenience alias for default target.
-#
-$(out_base)/: $(common.l)
-
-# Dist.
-#
-$(dist): export sources := $(cxx_tun)
-$(dist): export headers = $(subst $(src_base)/,,$(shell find $(src_base) \
--name '*.hxx' -o -name '*.ixx' -o -name '*.txx'))
-$(dist): data_dist := config.h.in config-vc.h
-$(dist): export extra_dist := $(data_dist) $(call vc8projs,libcommon) \
-$(call vc9projs,libcommon) $(call vc10projs,libcommon) \
-$(call vc11projs,libcommon) $(call vc12projs,libcommon)
-
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(data_dist))
-	$(call meta-automake)
-	$(call meta-vc8projs,libcommon)
-	$(call meta-vc9projs,libcommon)
-	$(call meta-vc10projs,libcommon)
-	$(call meta-vc11projs,libcommon)
-	$(call meta-vc12projs,libcommon)
-
-# Clean.
-#
-$(clean): $(common.l).o.clean        \
-  $(common.l.cpp-options).clean      \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))
-	$(call message,rm $$1,rm -f $$1,$(out_base)/config.h)
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(common.l): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := 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/cxx-d.make)
-$(call include,$(bld_root)/cxx/cxx-o.make)
-$(call include,$(bld_root)/cxx/o-l.make)
diff --git a/libcommon/common/concrete.hxx b/libcommon/concrete.hxx
index 2014b24..e0f64a5 100644
--- a/libcommon/common/concrete.hxx
+++ b/libcommon/concrete.hxx
@@ -1,14 +1,23 @@
-// file      : libcommon/common/concrete.hxx
+// file      : libcommon/concrete.hxx
 // license   : GNU GPL v2; see accompanying LICENSE file
 
-#ifndef LIBCOMMON_COMMON_CONCRETE_HXX
-#define LIBCOMMON_COMMON_CONCRETE_HXX
+#ifndef LIBCOMMON_CONCRETE_HXX
+#define LIBCOMMON_CONCRETE_HXX
 
-#include <common/config.hxx>
+#include <libcommon/config.hxx>
 
 // Namespace alias for the concrete database namespace.
 //
-#if defined(DATABASE_MYSQL)
+#if defined(MULTI_DATABASE)
+
+// Fallback to common interface.
+//
+#include <odb/database.hxx>
+#include <odb/transaction.hxx>
+
+namespace odb_db = odb;
+
+#elif defined(DATABASE_MYSQL)
 
 #include <odb/mysql/database.hxx>
 #include <odb/mysql/transaction.hxx>
@@ -43,15 +52,6 @@ namespace odb_db = odb::oracle;
 
 namespace odb_db = odb::mssql;
 
-#elif defined(DATABASE_COMMON)
-
-// Fallback to common interface.
-//
-#include <odb/database.hxx>
-#include <odb/transaction.hxx>
-
-namespace odb_db = odb;
-
 #endif
 
-#endif // LIBCOMMON_COMMON_CONCRETE_HXX
+#endif // LIBCOMMON_CONCRETE_HXX
diff --git a/libcommon/config.hxx.in b/libcommon/config.hxx.in
new file mode 100644
index 0000000..ff90e61
--- /dev/null
+++ b/libcommon/config.hxx.in
@@ -0,0 +1,14 @@
+// file      : libcommon/config.hxx.in
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef LIBCOMMON_CONFIG_HXX
+#define LIBCOMMON_CONFIG_HXX
+
+#undef DATABASE_MYSQL
+#undef DATABASE_SQLITE
+#undef DATABASE_PGSQL
+#undef DATABASE_ORACLE
+#undef DATABASE_MSSQL
+#undef MULTI_DATABASE
+
+#endif // LIBCOMMON_CONFIG_HXX
diff --git a/libcommon/export.hxx b/libcommon/export.hxx
new file mode 100644
index 0000000..0de4565
--- /dev/null
+++ b/libcommon/export.hxx
@@ -0,0 +1,39 @@
+#pragma once
+
+// Normally we don't export class templates (but do complete specializations),
+// inline functions, and classes with only inline member functions. Exporting
+// classes that inherit from non-exported/imported bases (e.g., std::string)
+// will end up badly. The only known workarounds are to not inherit or to not
+// export. Also, MinGW GCC doesn't like seeing non-exported functions being
+// used before their inline definition. The workaround is to reorder code. In
+// the end it's all trial and error.
+
+#if defined(LIBCOMMON_STATIC)         // Using static.
+#  define LIBCOMMON_SYMEXPORT
+#elif defined(LIBCOMMON_STATIC_BUILD) // Building static.
+#  define LIBCOMMON_SYMEXPORT
+#elif defined(LIBCOMMON_SHARED)       // Using shared.
+#  ifdef _WIN32
+#    define LIBCOMMON_SYMEXPORT __declspec(dllimport)
+#  else
+#    define LIBCOMMON_SYMEXPORT
+#  endif
+#elif defined(LIBCOMMON_SHARED_BUILD) // Building shared.
+#  ifdef _WIN32
+#    define LIBCOMMON_SYMEXPORT __declspec(dllexport)
+#  else
+#    define LIBCOMMON_SYMEXPORT
+#  endif
+#else
+// If none of the above macros are defined, then we assume we are being used
+// by some third-party build system that cannot/doesn't signal the library
+// type. Note that this fallback works for both static and shared libraries
+// provided the library only exports functions (in other words, no global
+// exported data) and for the shared case the result will be sub-optimal
+// compared to having dllimport. If, however, your library does export data,
+// then you will probably want to replace the fallback with the (commented
+// out) error since it won't work for the shared case.
+//
+#  define LIBCOMMON_SYMEXPORT         // Using static or shared.
+//#  error define LIBCOMMON_STATIC or LIBCOMMON_SHARED preprocessor macro to signal libcommon library type being linked
+#endif
diff --git a/libcommon/makefile b/libcommon/makefile
deleted file mode 100644
index ac0bb3c..0000000
--- a/libcommon/makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# file      : libcommon/makefile
-# license   : GNU GPL; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make
-
-dirs := common
-
-$(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs)))
-
-$(dist): export dirs := $(dirs)
-$(dist): export extra_dist := $(call vc8slns,libcommon) \
-$(call vc9slns,libcommon) $(call vc10slns,libcommon) \
-$(call vc11slns,libcommon) $(call vc12slns,libcommon)
-$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(dirs)))
-	$(call meta-automake)
-	$(call meta-vc8slns,libcommon)
-	$(call meta-vc9slns,libcommon)
-	$(call meta-vc10slns,libcommon)
-	$(call meta-vc11slns,libcommon)
-	$(call meta-vc12slns,libcommon)
-
-$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(dirs)))
-
-$(call include,$(bld_root)/meta/vc8sln.make)
-$(call include,$(bld_root)/meta/vc9sln.make)
-$(call include,$(bld_root)/meta/vc10sln.make)
-$(call include,$(bld_root)/meta/vc11sln.make)
-$(call include,$(bld_root)/meta/vc12sln.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(foreach d,$(dirs),$(call import,$(src_base)/$d/makefile))