diff --git a/Makefile.am b/Makefile.am
index b0d3837c..487d7a2c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS=-I m4
 AUTOMAKE_OPTIONS=nostdinc subdir-objects
-AM_CPPFLAGS=$(OPENSSL_INCLUDES) $(BOOST_CPPFLAGS) $(POSTGRESQL_CFLAGS) $(INCICONV) $(VALGRIND_CPPFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS=$(OPENSSL_INCLUDES) $(BOOST_CPPFLAGS) $(POSTGRESQL_CFLAGS) $(INCICONV) $(VALGRIND_CPPFLAGS)
 AM_CXXFLAGS=-Wall -Werror -fno-strict-aliasing -std=c++11
 
 nobase_include_HEADERS=			\
@@ -193,7 +193,7 @@ mordor_libmordor_la_SOURCES=			\
 	mordor/platform/cxa_exception.cpp	\
 	mordor/platform/unix_fiber.cpp		
 
-mordor_libmordor_la_CPPFLAGS=-I$(top_srcdir) -include mordor/pch.h $(AM_CPPFLAGS)
+mordor_libmordor_la_CPPFLAGS=-include mordor/pch.h $(AM_CPPFLAGS)
 mordor_libmordor_la_LDFLAGS=			\
 	$(OPENSSL_LDFLAGS)			\
 	$(BOOST_LDFLAGS)			\
@@ -230,9 +230,11 @@ mordor_pq_libmordorpq_la_SOURCES=		\
 	mordor/pq/result.cpp			\
 	mordor/pq/transaction.cpp
 
-mordor_pq_libmordorpq_la_CPPFLAGS=-I$(top_srcdir) -include mordor/pch.h $(AM_CPPFLAGS)
+mordor_pq_libmordorpq_la_CPPFLAGS=-include mordor/pch.h $(AM_CPPFLAGS)
 mordor_pq_libmordorpq_la_LDFLAGS=$(POSTGRESQL_LDFLAGS)
-mordor_pq_libmordorpq_la_LIBADD=mordor/libmordor.la
+mordor_pq_libmordorpq_la_LIBADD=		\
+	mordor/libmordor.la		\
+	$(BOOST_SYSTEM_LIB)
 
 if HAVE_PROTOBUF
     lib_LTLIBRARIES+=mordor/libmordorprotobuf.la
@@ -240,7 +242,7 @@ endif
 
 mordor_libmordorprotobuf_la_SOURCES=mordor/protobuf.cpp
 mordor_libmordorprotobuf_la_LDFLAGS=$(PROTOBUF_LIBS)
-mordor_libmordorprotobuf_la_CPPFLAGS=-I$(top_srcdir) $(PROTOBUF_CFLAGS) $(AM_CPPFLAGS)
+mordor_libmordorprotobuf_la_CPPFLAGS=$(PROTOBUF_CFLAGS) $(AM_CPPFLAGS)
 mordor_libmordorprotobuf_la_LIBADD=mordor/libmordor.la
 
 if HAVE_LIBYAML
@@ -249,7 +251,7 @@ endif
 
 mordor_libmordoryaml_la_SOURCES=mordor/yaml.cpp
 mordor_libmordoryaml_la_LDFLAGS=$(LIBYAML)
-mordor_libmordoryaml_la_CPPFLAGS=-I$(top_srcdir) $(AM_CPPFLAGS)
+mordor_libmordoryaml_la_CPPFLAGS=$(AM_CPPFLAGS)
 mordor_libmordoryaml_la_LIBADD=mordor/libmordor.la
 
 if HAVE_LIBSSH2
@@ -261,7 +263,7 @@ mordor_libmordorssh_la_SOURCES=	\
 	mordor/ssh/channel.cpp	\
 	mordor/ssh/session.cpp
 mordor_libmordorssh_la_LDFLAGS=$(LIBSSH2)
-mordor_libmordorssh_la_CPPFLAGS=-I$(top_srcdir) $(AM_CPPFLAGS)
+mordor_libmordorssh_la_CPPFLAGS=$(AM_CPPFLAGS)
 mordor_libmordorssh_la_LIBADD=mordor/libmordor.la
 
 pkgconfigdir=$(libdir)/pkgconfig
@@ -314,7 +316,10 @@ mordor_test_libmordortest_la_SOURCES=		\
 	mordor/test/stdoutlistener.cpp		\
 	mordor/test/test.cpp
 
-mordor_test_libmordortest_la_LIBADD=mordor/libmordor.la
+mordor_test_libmordortest_la_LIBADD=		\
+	mordor/libmordor.la         \
+	$(BOOST_REGEX_LIB)			\
+	$(BOOST_SYSTEM_LIB)
 
 check_PROGRAMS=mordor/tests/run_tests
 mordor_tests_run_tests_SOURCES=				\
@@ -366,7 +371,7 @@ mordor_tests_run_tests_SOURCES=				\
 	mordor/tests/zlib.cpp				\
 	mordor/tests/crypto.cpp
 
-mordor_tests_run_tests_CPPFLAGS=-I$(top_builddir) -include mordor/pch.h $(AM_CPPFLAGS)
+mordor_tests_run_tests_CPPFLAGS=-include mordor/pch.h $(AM_CPPFLAGS)
 mordor_tests_run_tests_LDADD=mordor/libmordor.la mordor/test/libmordortest.la \
 	$(OPENSSL_LIBS)				\
 	$(BOOST_THREAD_LIB)			\
@@ -433,7 +438,6 @@ mordor_examples_echoserver_LDADD=mordor/libmordor.la \
 	$(SYSTEMCONFIGURATION_FRAMEWORK_LIBS)	\
 	$(BOOST_SYSTEM_LIB)			\
 	$(BOOST_THREAD_LIB)
-	
 
 mordor_examples_iombench_SOURCES=	\
 	mordor/examples/iombench.cpp	\
@@ -447,7 +451,6 @@ mordor_examples_iombench_LDADD=mordor/libmordor.la	\
 
 mordor_examples_simplehttpfileserver_SOURCES=mordor/examples/simplehttpfileserver.cpp
 mordor_examples_simplehttpfileserver_LDADD=mordor/libmordor.la       \
-	-ljemalloc				\
         $(BOOST_SYSTEM_LIB)                     \
         $(BOOST_THREAD_LIB)                     \
         $(CORESERVICES_FRAMEWORK_LIBS)          \
diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4
index ec23a0ab..f3279f2b 100644
--- a/m4/ax_boost_base.m4
+++ b/m4/ax_boost_base.m4
@@ -33,7 +33,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 18
+#serial 26
 
 AC_DEFUN([AX_BOOST_BASE],
 [
@@ -59,7 +59,7 @@ AC_ARG_WITH([boost],
 
 AC_ARG_WITH([boost-libdir],
         AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
-        [Force given directory for boost libraries. Note that this will overwrite library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),
+        [Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),
         [
         if test -d "$withval"
         then
@@ -84,15 +84,33 @@ if test "x$want_boost" = "xyes"; then
     AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
     succeeded=no
 
-    dnl On x86_64 systems check for system libraries in both lib64 and lib.
+    dnl On 64-bit systems check for system libraries in both lib64 and lib.
     dnl The former is specified by FHS, but e.g. Debian does not adhere to
     dnl this (as it rises problems for generic multi-arch support).
     dnl The last entry in the list is chosen by default when no libraries
     dnl are found, e.g. when only header-only libraries are installed!
     libsubdirs="lib"
-    if test `uname -m` = x86_64; then
-        libsubdirs="lib64 lib lib64"
-    fi
+    ax_arch=`uname -m`
+    case $ax_arch in
+      x86_64)
+        libsubdirs="lib64 libx32 lib lib64"
+        ;;
+      ppc64|s390x|sparc64|aarch64|ppc64le)
+        libsubdirs="lib64 lib lib64 ppc64le"
+        ;;
+    esac
+
+    dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
+    dnl them priority over the other paths since, if libs are found there, they
+    dnl are almost assuredly the ones desired.
+    AC_REQUIRE([AC_CANONICAL_HOST])
+    libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
+
+    case ${host_cpu} in
+      i?86)
+        libsubdirs="lib/i386-${host_os} $libsubdirs"
+        ;;
+    esac
 
     dnl first we check the system location for boost libraries
     dnl this location ist chosen if boost libraries are installed with the --layout=system option
@@ -155,6 +173,10 @@ if test "x$want_boost" = "xyes"; then
     dnl if we found no boost with system layout we search for boost libraries
     dnl built and installed without the --layout=system option or for a staged(not installed) version
     if test "x$succeeded" != "xyes"; then
+        CPPFLAGS="$CPPFLAGS_SAVED"
+        LDFLAGS="$LDFLAGS_SAVED"
+        BOOST_CPPFLAGS=
+        BOOST_LDFLAGS=
         _version=0
         if test "$ac_boost_path" != ""; then
             if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
@@ -167,6 +189,12 @@ if test "x$want_boost" = "xyes"; then
                     VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
                     BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
                 done
+                dnl if nothing found search for layout used in Windows distributions
+                if test -z "$BOOST_CPPFLAGS"; then
+                    if test -d "$ac_boost_path/boost" && test -r "$ac_boost_path/boost"; then
+                        BOOST_CPPFLAGS="-I$ac_boost_path"
+                    fi
+                fi
             fi
         else
             if test "$cross_compiling" != yes; then
diff --git a/mordor/examples/cat.cpp b/mordor/examples/cat.cpp
index 628ad29f..c1f5d83f 100644
--- a/mordor/examples/cat.cpp
+++ b/mordor/examples/cat.cpp
@@ -1,15 +1,15 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
 #include <iostream>
 
-#include "mordor/config.h"
-#include "mordor/main.h"
-#include "mordor/streams/file.h"
-#include "mordor/streams/std.h"
-#include "mordor/streams/transfer.h"
-#include "mordor/workerpool.h"
+#include "../config.h"
+#include "../main.h"
+#include "../streams/file.h"
+#include "../streams/std.h"
+#include "../streams/transfer.h"
+#include "../workerpool.h"
 
 using namespace Mordor;
 
diff --git a/mordor/examples/decodebacktrace.cpp b/mordor/examples/decodebacktrace.cpp
index d8361ff2..078e878d 100644
--- a/mordor/examples/decodebacktrace.cpp
+++ b/mordor/examples/decodebacktrace.cpp
@@ -1,15 +1,15 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
 #include <iostream>
 
 #include <DbgHelp.h>
 
-#include "mordor/config.h"
-#include "mordor/main.h"
-#include "mordor/streams/buffered.h"
-#include "mordor/streams/std.h"
+#include "../config.h"
+#include "../main.h"
+#include "../streams/buffered.h"
+#include "../streams/std.h"
 
 using namespace Mordor;
 
diff --git a/mordor/examples/echoserver.cpp b/mordor/examples/echoserver.cpp
index d679402e..9b784ac1 100644
--- a/mordor/examples/echoserver.cpp
+++ b/mordor/examples/echoserver.cpp
@@ -1,20 +1,20 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
 
-#include "mordor/config.h"
-#include "mordor/daemon.h"
-#include "mordor/http/multipart.h"
-#include "mordor/http/server.h"
-#include "mordor/iomanager.h"
-#include "mordor/main.h"
-#include "mordor/socket.h"
+#include "../config.h"
+#include "../daemon.h"
+#include "../http/multipart.h"
+#include "../http/server.h"
+#include "../iomanager.h"
+#include "../main.h"
+#include "../socket.h"
 #ifdef WINDOWS
-#include "mordor/streams/namedpipe.h"
+#include "../streams/namedpipe.h"
 #endif
-#include "mordor/streams/socket.h"
-#include "mordor/streams/transfer.h"
+#include "../streams/socket.h"
+#include "../streams/transfer.h"
 
 using namespace Mordor;
 
diff --git a/mordor/examples/iombench.cpp b/mordor/examples/iombench.cpp
index 7f5d52af..6ce90f91 100644
--- a/mordor/examples/iombench.cpp
+++ b/mordor/examples/iombench.cpp
@@ -4,7 +4,7 @@
 // Can act as both the client and the server.
 //
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
 #include "netbench.h"
 
@@ -12,12 +12,12 @@
 
 #include <boost/scoped_array.hpp>
 
-#include "mordor/config.h"
-#include "mordor/fibersynchronization.h"
-#include "mordor/iomanager.h"
-#include "mordor/log.h"
-#include "mordor/main.h"
-#include "mordor/socket.h"
+#include "../config.h"
+#include "../fibersynchronization.h"
+#include "../iomanager.h"
+#include "../log.h"
+#include "../main.h"
+#include "../socket.h"
 
 using namespace Mordor;
 
@@ -303,6 +303,8 @@ MORDOR_MAIN(int argc, char *argv[])
         NetBench bench(argc, argv);
 
         Config::loadFromEnvironment();
+
+	MORDOR_LOG_INFO(g_log) << "Running " << g_iomThreads->val() << " threads";
         IOManager iom(g_iomThreads->val());
 
         IOMBenchServer server(iom);
diff --git a/mordor/examples/netbench.cpp b/mordor/examples/netbench.cpp
index c9034737..3f9050a0 100644
--- a/mordor/examples/netbench.cpp
+++ b/mordor/examples/netbench.cpp
@@ -1,6 +1,6 @@
 #include "netbench.h"
 
-#include "mordor/version.h"
+#include "../version.h"
 
 #include <stdio.h>
 #ifndef WINDOWS
diff --git a/mordor/examples/netbench.h b/mordor/examples/netbench.h
index e183093a..9a79d520 100644
--- a/mordor/examples/netbench.h
+++ b/mordor/examples/netbench.h
@@ -6,7 +6,7 @@
 class NetBenchServer
 {
 public:
-    virtual ~NetBenchServer() {}
+    virtual ~NetBenchServer() noexcept(false) {}
 
     // start the implementation of the server to be benchmarked
     virtual void run(std::string& host,
@@ -21,7 +21,7 @@ class NetBenchServer
 class NetBenchClient
 {
 public:
-    virtual ~NetBenchClient () {}
+    virtual ~NetBenchClient () noexcept(false) {}
 
     // initialize the client to be benchmarked
     virtual void init(std::string& host,
diff --git a/mordor/examples/simpleappserver.cpp b/mordor/examples/simpleappserver.cpp
index 463aae38..7a0a3792 100644
--- a/mordor/examples/simpleappserver.cpp
+++ b/mordor/examples/simpleappserver.cpp
@@ -1,17 +1,17 @@
 // Copyright (c) 2010 - Mozy, Inc.
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
 #include <iostream>
 
-#include "mordor/config.h"
-#include "mordor/http/server.h"
-#include "mordor/iomanager.h"
-#include "mordor/main.h"
-#include "mordor/socket.h"
-#include "mordor/streams/memory.h"
-#include "mordor/streams/socket.h"
-#include "mordor/streams/transfer.h"
+#include "../config.h"
+#include "../http/server.h"
+#include "../iomanager.h"
+#include "../main.h"
+#include "../socket.h"
+#include "../streams/memory.h"
+#include "../streams/socket.h"
+#include "../streams/transfer.h"
 
 using namespace Mordor;
 
diff --git a/mordor/examples/simpleclient.cpp b/mordor/examples/simpleclient.cpp
index 6c195312..8b456da7 100644
--- a/mordor/examples/simpleclient.cpp
+++ b/mordor/examples/simpleclient.cpp
@@ -1,14 +1,14 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
 #include <iostream>
 
-#include "mordor/config.h"
-#include "mordor/fiber.h"
-#include "mordor/iomanager.h"
-#include "mordor/main.h"
-#include "mordor/socket.h"
+#include "../config.h"
+#include "../fiber.h"
+#include "../iomanager.h"
+#include "../main.h"
+#include "../socket.h"
 
 using namespace Mordor;
 
diff --git a/mordor/examples/simplehttpfileserver.cpp b/mordor/examples/simplehttpfileserver.cpp
index 0e53557b..22c70940 100644
--- a/mordor/examples/simplehttpfileserver.cpp
+++ b/mordor/examples/simplehttpfileserver.cpp
@@ -1,19 +1,19 @@
-#include "mordor/predef.h"
+#include "../predef.h"
 
 #include <memory>
 #include <iostream>
 
 #include <boost/thread.hpp>
 
-#include "mordor/config.h"
-#include "mordor/http/server.h"
-#include "mordor/iomanager.h"
-#include "mordor/main.h"
-#include "mordor/socket.h"
-#include "mordor/streams/file.h"
-#include "mordor/streams/socket.h"
-#include "mordor/streams/transfer.h"
-#include "mordor/streams/ssl.h"
+#include "../config.h"
+#include "../http/server.h"
+#include "../iomanager.h"
+#include "../main.h"
+#include "../socket.h"
+#include "../streams/file.h"
+#include "../streams/socket.h"
+#include "../streams/transfer.h"
+#include "../streams/ssl.h"
 
 using namespace Mordor;
 
diff --git a/mordor/examples/tunnel.cpp b/mordor/examples/tunnel.cpp
index 1b4802af..8862759e 100644
--- a/mordor/examples/tunnel.cpp
+++ b/mordor/examples/tunnel.cpp
@@ -1,23 +1,23 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
 #include <iostream>
 #include <functional>
 namespace barg = std::placeholders;
 
-#include "mordor/config.h"
-#include "mordor/http/auth.h"
-#include "mordor/http/client.h"
-#include "mordor/http/proxy.h"
-#include "mordor/iomanager.h"
-#include "mordor/main.h"
-#include "mordor/socket.h"
-#include "mordor/streams/duplex.h"
-#include "mordor/streams/socket.h"
-#include "mordor/streams/ssl.h"
-#include "mordor/streams/std.h"
-#include "mordor/streams/transfer.h"
+#include "../config.h"
+#include "../http/auth.h"
+#include "../http/client.h"
+#include "../http/proxy.h"
+#include "../iomanager.h"
+#include "../main.h"
+#include "../socket.h"
+#include "../streams/duplex.h"
+#include "../streams/socket.h"
+#include "../streams/ssl.h"
+#include "../streams/std.h"
+#include "../streams/transfer.h"
 
 using namespace Mordor;
 
diff --git a/mordor/examples/udpstats.cpp b/mordor/examples/udpstats.cpp
index 35dc59a6..b5f57812 100644
--- a/mordor/examples/udpstats.cpp
+++ b/mordor/examples/udpstats.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
 #include <iostream>
 
-#include "mordor/config.h"
-#include "mordor/iomanager.h"
-#include "mordor/socket.h"
-#include "mordor/statistics.h"
+#include "../config.h"
+#include "../iomanager.h"
+#include "../socket.h"
+#include "../statistics.h"
 
 using namespace Mordor;
 
diff --git a/mordor/examples/wget.cpp b/mordor/examples/wget.cpp
index 1b661cef..79607d9c 100644
--- a/mordor/examples/wget.cpp
+++ b/mordor/examples/wget.cpp
@@ -1,6 +1,6 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
 #include <iostream>
 #include <functional>
@@ -8,21 +8,21 @@ namespace barg = std::placeholders;
 
 #include <boost/program_options.hpp>
 
-#include "mordor/config.h"
-#include "mordor/exception.h"
-#include "mordor/http/auth.h"
-#include "mordor/http/broker.h"
-#include "mordor/http/client.h"
-#include "mordor/http/multipart.h"
-#include "mordor/http/proxy.h"
-#include "mordor/iomanager.h"
-#include "mordor/main.h"
-#include "mordor/sleep.h"
-#include "mordor/socket.h"
-#include "mordor/streams/socket.h"
-#include "mordor/streams/ssl.h"
-#include "mordor/streams/std.h"
-#include "mordor/streams/transfer.h"
+#include "../config.h"
+#include "../exception.h"
+#include "../http/auth.h"
+#include "../http/broker.h"
+#include "../http/client.h"
+#include "../http/multipart.h"
+#include "../http/proxy.h"
+#include "../iomanager.h"
+#include "../main.h"
+#include "../sleep.h"
+#include "../socket.h"
+#include "../streams/socket.h"
+#include "../streams/ssl.h"
+#include "../streams/std.h"
+#include "../streams/transfer.h"
 
 using namespace Mordor;
 namespace po = boost::program_options;
diff --git a/mordor/fiber.cpp b/mordor/fiber.cpp
index 0839e29e..f453c409 100644
--- a/mordor/fiber.cpp
+++ b/mordor/fiber.cpp
@@ -5,7 +5,7 @@
 #include "fiber.h"
 
 #ifdef HAVE_CONFIG_H
-#include "autoconfig.h"
+#include "../autoconfig.h"
 #endif
 
 #ifdef HAVE_VALGRIND_VALGRIND_H
@@ -29,12 +29,6 @@
 
 namespace Mordor {
 
-static AverageMinMaxStatistic<unsigned int> &g_statAlloc =
-    Statistics::registerStatistic("fiber.allocstack",
-    AverageMinMaxStatistic<unsigned int>("us"));
-static AverageMinMaxStatistic<unsigned int> &g_statFree=
-    Statistics::registerStatistic("fiber.freestack",
-    AverageMinMaxStatistic<unsigned int>("us"));
 static std::atomic<unsigned int> g_cntFibers(0); // Active fibers
 static MaxStatistic<unsigned int> &g_statMaxFibers=Statistics::registerStatistic("fiber.max",
     MaxStatistic<unsigned int>());
@@ -109,7 +103,7 @@ Fiber::Fiber(std::function<void ()> dg, size_t stacksize)
     g_statMaxFibers.update(++g_cntFibers);
 }
 
-Fiber::~Fiber()
+Fiber::~Fiber() noexcept(false)
 {
     --g_cntFibers;
     if (!stack_ptr() ) {
diff --git a/mordor/fiber.h b/mordor/fiber.h
index ef3c939d..9eb757b2 100644
--- a/mordor/fiber.h
+++ b/mordor/fiber.h
@@ -52,7 +52,7 @@ class Fiber final : public std::enable_shared_from_this<Fiber>, private internal
     /// are touched by the Fiber executing
     /// @post state() == INIT
     Fiber(std::function<void ()> dg, size_t stacksize = 0);
-    ~Fiber();
+    ~Fiber() noexcept(false);
 
     /// @brief Reset a Fiber to be used again, with a different initial function
     /// @param dg The new initial function
diff --git a/mordor/fibersynchronization.cpp b/mordor/fibersynchronization.cpp
index 2314ca05..bfd14764 100644
--- a/mordor/fibersynchronization.cpp
+++ b/mordor/fibersynchronization.cpp
@@ -8,7 +8,7 @@
 
 namespace Mordor {
 
-FiberMutex::~FiberMutex()
+FiberMutex::~FiberMutex() noexcept(false)
 {
 #ifndef NDEBUG
     boost::mutex::scoped_lock scopeLock(m_mutex);
@@ -80,7 +80,7 @@ FiberSemaphore::FiberSemaphore(size_t initialConcurrency)
     : m_concurrency(initialConcurrency)
 {}
 
-FiberSemaphore::~FiberSemaphore()
+FiberSemaphore::~FiberSemaphore() noexcept(false)
 {
 #ifndef NDEBUG
     boost::mutex::scoped_lock scopeLock(m_mutex);
@@ -126,7 +126,7 @@ FiberSemaphore::notify()
     }
 }
 
-FiberCondition::~FiberCondition()
+FiberCondition::~FiberCondition() noexcept(false)
 {
 #ifndef NDEBUG
     boost::mutex::scoped_lock lock(m_mutex);
@@ -205,7 +205,7 @@ FiberCondition::broadcast()
 }
 
 
-FiberEvent::~FiberEvent()
+FiberEvent::~FiberEvent() noexcept(false)
 {
 #ifndef NDEBUG
     boost::mutex::scoped_lock lock(m_mutex);
diff --git a/mordor/fibersynchronization.h b/mordor/fibersynchronization.h
index eccda6b8..d520aac6 100644
--- a/mordor/fibersynchronization.h
+++ b/mordor/fibersynchronization.h
@@ -87,7 +87,7 @@ struct FiberMutex
 
 public:
     FiberMutex() = default;
-    ~FiberMutex();
+    ~FiberMutex() noexcept(false);
 
     /// @brief Locks the mutex
     /// Note that it is possible for this Fiber to switch threads after this
@@ -128,7 +128,7 @@ struct FiberSemaphore
 {
 public:
     FiberSemaphore(size_t initialConcurrency = 0);
-    ~FiberSemaphore();
+    ~FiberSemaphore() noexcept(false);
 
     /// @brief Waits for the semaphore
     /// Decreases the amount of concurrency.  If concurrency is already at
@@ -162,7 +162,7 @@ struct FiberCondition
     FiberCondition(FiberMutex &mutex)
         : m_fiberMutex(mutex)
     {}
-    ~FiberCondition();
+    ~FiberCondition() noexcept(false);
 
     /// @brief Wait for the Condition to be signalled
     /// @details
@@ -201,7 +201,7 @@ struct FiberEvent
         : m_signalled(false),
           m_autoReset(autoReset)
     {}
-    ~FiberEvent();
+    ~FiberEvent() noexcept(false);
 
     /// @brief Wait for the Event to become set
     /// @pre Scheduler::getThis() != NULL
diff --git a/mordor/http/auth.cpp b/mordor/http/auth.cpp
index 2b15ba24..08787726 100644
--- a/mordor/http/auth.cpp
+++ b/mordor/http/auth.cpp
@@ -5,12 +5,12 @@
 #include "basic.h"
 #include "client.h"
 #include "digest.h"
-#include "mordor/socket.h"
+#include "../socket.h"
 
 #ifdef WINDOWS
 #include "negotiate.h"
 #elif defined (OSX)
-#include "mordor/util.h"
+#include "../util.h"
 
 #include <Security/SecItem.h>
 #include <Security/SecKeychain.h>
diff --git a/mordor/http/auth.h b/mordor/http/auth.h
index e0472888..d1724ac5 100644
--- a/mordor/http/auth.h
+++ b/mordor/http/auth.h
@@ -5,7 +5,7 @@
 #include <boost/scoped_ptr.hpp>
 
 #include "broker.h"
-#include "mordor/version.h"
+#include "../version.h"
 
 namespace Mordor {
 namespace HTTP {
diff --git a/mordor/http/basic.cpp b/mordor/http/basic.cpp
index fed79528..7d649de2 100644
--- a/mordor/http/basic.cpp
+++ b/mordor/http/basic.cpp
@@ -3,7 +3,7 @@
 #include "basic.h"
 
 #include "http.h"
-#include "mordor/string.h"
+#include "../string.h"
 
 namespace Mordor {
 namespace HTTP {
diff --git a/mordor/http/broker.cpp b/mordor/http/broker.cpp
index d9989f4b..2968c8f2 100644
--- a/mordor/http/broker.cpp
+++ b/mordor/http/broker.cpp
@@ -4,16 +4,16 @@
 
 #include "auth.h"
 #include "client.h"
-#include "mordor/fiber.h"
-#include "mordor/future.h"
-#include "mordor/iomanager.h"
-#include "mordor/log.h"
-#include "mordor/socks.h"
-#include "mordor/streams/buffered.h"
-#include "mordor/streams/pipe.h"
-#include "mordor/streams/socket.h"
-#include "mordor/streams/ssl.h"
-#include "mordor/streams/timeout.h"
+#include "../fiber.h"
+#include "../future.h"
+#include "../iomanager.h"
+#include "../log.h"
+#include "../socks.h"
+#include "../streams/buffered.h"
+#include "../streams/pipe.h"
+#include "../streams/socket.h"
+#include "../streams/ssl.h"
+#include "../streams/timeout.h"
 #include "proxy.h"
 #include "server.h"
 
diff --git a/mordor/http/broker.h b/mordor/http/broker.h
index 5cf238ef..6bfd71f6 100644
--- a/mordor/http/broker.h
+++ b/mordor/http/broker.h
@@ -5,7 +5,7 @@
 #include <openssl/ssl.h>
 
 #include "http.h"
-#include "mordor/fibersynchronization.h"
+#include "../fibersynchronization.h"
 
 #include <atomic>
 #include <memory>
@@ -115,7 +115,7 @@ class ConnectionBroker
           m_sslCtx(NULL),
           m_timerManager(NULL)
     {}
-    virtual ~ConnectionBroker() {}
+    virtual ~ConnectionBroker() noexcept(false) {}
 
     virtual std::pair<std::shared_ptr<ClientConnection>, bool>
         getConnection(const URI &uri, bool forceNewConnection = false) = 0;
diff --git a/mordor/http/chunked.cpp b/mordor/http/chunked.cpp
index 68e65406..145de0c0 100644
--- a/mordor/http/chunked.cpp
+++ b/mordor/http/chunked.cpp
@@ -5,9 +5,9 @@
 #include <sstream>
 #include <stdexcept>
 
-#include "mordor/assert.h"
-#include "mordor/streams/buffer.h"
-#include "mordor/version.h"
+#include "../assert.h"
+#include "../streams/buffer.h"
+#include "../version.h"
 
 namespace Mordor {
 namespace HTTP {
diff --git a/mordor/http/chunked.h b/mordor/http/chunked.h
index e9329490..f1b8933b 100644
--- a/mordor/http/chunked.h
+++ b/mordor/http/chunked.h
@@ -2,8 +2,8 @@
 #define __MORDOR_HTTP_CHUNKED_H__
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/exception.h"
-#include "mordor/streams/filter.h"
+#include "../exception.h"
+#include "../streams/filter.h"
 
 namespace Mordor {
 namespace HTTP {
diff --git a/mordor/http/client.cpp b/mordor/http/client.cpp
index 17a1e30d..429586d6 100644
--- a/mordor/http/client.cpp
+++ b/mordor/http/client.cpp
@@ -8,19 +8,19 @@
 
 #include "broker.h"
 #include "chunked.h"
-#include "mordor/assert.h"
-#include "mordor/fiber.h"
-#include "mordor/log.h"
-#include "mordor/scheduler.h"
-#include "mordor/streams/buffer.h"
-#include "mordor/streams/limited.h"
-#include "mordor/streams/notify.h"
-#include "mordor/streams/null.h"
-#include "mordor/streams/timeout.h"
-#include "mordor/streams/transfer.h"
-#include "mordor/timer.h"
-#include "mordor/util.h"
-#include "mordor/socket.h"
+#include "../assert.h"
+#include "../fiber.h"
+#include "../log.h"
+#include "../scheduler.h"
+#include "../streams/buffer.h"
+#include "../streams/limited.h"
+#include "../streams/notify.h"
+#include "../streams/null.h"
+#include "../streams/timeout.h"
+#include "../streams/transfer.h"
+#include "../timer.h"
+#include "../util.h"
+#include "../socket.h"
 #include "multipart.h"
 #include "parser.h"
 
@@ -499,7 +499,7 @@ ClientRequest::ClientRequest(ClientConnection::ptr conn, const Request &request)
     MORDOR_ASSERT(m_conn);
 }
 
-ClientRequest::~ClientRequest()
+ClientRequest::~ClientRequest() noexcept(false)
 {
     cancel(true);
 #ifndef NDEBUG
diff --git a/mordor/http/client.h b/mordor/http/client.h
index da447d9e..586234ed 100644
--- a/mordor/http/client.h
+++ b/mordor/http/client.h
@@ -58,7 +58,7 @@ class ClientRequest : public std::enable_shared_from_this<ClientRequest>
     ClientRequest(const ClientRequest& rhs) = delete;
 
 public:
-    ~ClientRequest();
+    ~ClientRequest() noexcept(false);
 
     std::shared_ptr<ClientConnection> connection() { return m_conn; }
     State requestState() const { return m_requestState; }
diff --git a/mordor/http/connection.cpp b/mordor/http/connection.cpp
index f27f447f..78e9f678 100644
--- a/mordor/http/connection.cpp
+++ b/mordor/http/connection.cpp
@@ -3,12 +3,12 @@
 #include "connection.h"
 
 #include "chunked.h"
-#include "mordor/streams/buffered.h"
-#include "mordor/streams/gzip.h"
-#include "mordor/streams/limited.h"
-#include "mordor/streams/notify.h"
-#include "mordor/streams/singleplex.h"
-#include "mordor/streams/zlib.h"
+#include "../streams/buffered.h"
+#include "../streams/gzip.h"
+#include "../streams/limited.h"
+#include "../streams/notify.h"
+#include "../streams/singleplex.h"
+#include "../streams/zlib.h"
 
 namespace Mordor {
 namespace HTTP {
diff --git a/mordor/http/connection.h b/mordor/http/connection.h
index e8c532e2..8f80597e 100644
--- a/mordor/http/connection.h
+++ b/mordor/http/connection.h
@@ -9,7 +9,7 @@
 #include <boost/thread/mutex.hpp>
 
 // Mordor
-#include "mordor/anymap.h"
+#include "../anymap.h"
 #include "http.h"
 
 namespace Mordor {
diff --git a/mordor/http/digest.cpp b/mordor/http/digest.cpp
index c95c45e1..355407ae 100644
--- a/mordor/http/digest.cpp
+++ b/mordor/http/digest.cpp
@@ -2,8 +2,8 @@
 
 #include "digest.h"
 
-#include "mordor/string.h"
-#include "mordor/timer.h"
+#include "../string.h"
+#include "../timer.h"
 #include "parser.h"
 
 namespace Mordor {
diff --git a/mordor/http/http.cpp b/mordor/http/http.cpp
index cc758f39..d0e65d3a 100644
--- a/mordor/http/http.cpp
+++ b/mordor/http/http.cpp
@@ -6,7 +6,7 @@
 #include <algorithm>
 #include <iostream>
 
-#include "mordor/assert.h"
+#include "../assert.h"
 
 namespace Mordor {
 namespace HTTP {
diff --git a/mordor/http/http.h b/mordor/http/http.h
index 6a350e90..5292bbb7 100644
--- a/mordor/http/http.h
+++ b/mordor/http/http.h
@@ -10,10 +10,10 @@
 #include <boost/variant.hpp>
 #include <boost/date_time.hpp>
 
-#include "mordor/predef.h"
-#include "mordor/string.h"
-#include "mordor/uri.h"
-#include "mordor/version.h"
+#include "../predef.h"
+#include "../string.h"
+#include "../uri.h"
+#include "../version.h"
 
 namespace Mordor {
 namespace HTTP {
@@ -160,21 +160,25 @@ struct Version
     }
     bool operator<(const Version& rhs) const
     {
-        if (major < rhs.major) return true; return minor < rhs.minor;
+        if (major < rhs.major) return true;
+	return minor < rhs.minor;
     }
     bool operator<=(const Version& rhs) const
     {
         if (major > rhs.major) return false;
-        if (major < rhs.major) return true; return minor <= rhs.minor;
+        if (major < rhs.major) return true;
+	return minor <= rhs.minor;
     }
     bool operator>(const Version& rhs) const
     {
-        if (major > rhs.major) return true; return minor > rhs.minor;
+        if (major > rhs.major) return true;
+	return minor > rhs.minor;
     }
     bool operator>=(const Version& rhs) const
     {
         if (major < rhs.major) return false;
-        if (major > rhs.major) return true; return minor >= rhs.minor;
+        if (major > rhs.major) return true;
+	return minor >= rhs.minor;
     }
 };
 
diff --git a/mordor/http/http_parser.rl b/mordor/http/http_parser.rl
index c6ab10d3..bfaa04ce 100644
--- a/mordor/http/http_parser.rl
+++ b/mordor/http/http_parser.rl
@@ -1,14 +1,14 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/pch.h"
+#include "../pch.h"
 
-#include "mordor/http/parser.h"
+#include "parser.h"
 
 #include <locale>
 #include <sstream>
 #include <string>
 
-#include "mordor/version.h"
+#include "../version.h"
 
 namespace Mordor {
 
diff --git a/mordor/http/multipart.cpp b/mordor/http/multipart.cpp
index 55fd616b..77f8f0a8 100644
--- a/mordor/http/multipart.cpp
+++ b/mordor/http/multipart.cpp
@@ -3,12 +3,12 @@
 #include "multipart.h"
 
 
-#include "mordor/assert.h"
-#include "mordor/streams/buffer.h"
-#include "mordor/streams/buffered.h"
-#include "mordor/streams/notify.h"
-#include "mordor/streams/null.h"
-#include "mordor/streams/transfer.h"
+#include "../assert.h"
+#include "../streams/buffer.h"
+#include "../streams/buffered.h"
+#include "../streams/notify.h"
+#include "../streams/null.h"
+#include "../streams/transfer.h"
 #include "parser.h"
 
 namespace Mordor {
diff --git a/mordor/http/negotiate.cpp b/mordor/http/negotiate.cpp
index 92c384d6..9a92d007 100644
--- a/mordor/http/negotiate.cpp
+++ b/mordor/http/negotiate.cpp
@@ -3,8 +3,8 @@
 #include "negotiate.h"
 
 #include "http.h"
-#include "mordor/log.h"
-#include "mordor/string.h"
+#include "../log.h"
+#include "../string.h"
 
 #pragma comment(lib, "secur32.lib")
 
diff --git a/mordor/http/oauth.cpp b/mordor/http/oauth.cpp
index 50c58b1c..d1eee773 100644
--- a/mordor/http/oauth.cpp
+++ b/mordor/http/oauth.cpp
@@ -3,8 +3,8 @@
 #include "oauth.h"
 
 #include "client.h"
-#include "mordor/date_time.h"
-#include "mordor/streams/stream.h"
+#include "../date_time.h"
+#include "../streams/stream.h"
 
 namespace Mordor {
 namespace HTTP {
diff --git a/mordor/http/parser.h b/mordor/http/parser.h
index c7b6c8f1..2279a8dc 100644
--- a/mordor/http/parser.h
+++ b/mordor/http/parser.h
@@ -3,7 +3,7 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
 #include "http.h"
-#include "mordor/ragel.h"
+#include "../ragel.h"
 
 namespace Mordor {
 namespace HTTP {
diff --git a/mordor/http/proxy.cpp b/mordor/http/proxy.cpp
index c4479694..f082d216 100644
--- a/mordor/http/proxy.cpp
+++ b/mordor/http/proxy.cpp
@@ -3,23 +3,23 @@
 #include "proxy.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
-#include "mordor/config.h"
-#include "mordor/http/broker.h"
-#include "mordor/http/client.h"
-#include "mordor/socket.h"
+#include "../config.h"
+#include "../http/broker.h"
+#include "../http/client.h"
+#include "../socket.h"
 
 #ifdef WINDOWS
-#include "mordor/runtime_linking.h"
+#include "../runtime_linking.h"
 #elif defined (OSX)
 #include <CoreServices/CoreServices.h>
 #include <SystemConfiguration/SystemConfiguration.h>
-#include "mordor/util.h"
-#include "mordor/streams/file.h"
-#include "mordor/streams/http.h"
-#include "mordor/streams/limited.h"
-#include "mordor/streams/memory.h"
-#include "mordor/streams/transfer.h"
-#include "mordor/sleep.h"
+#include "../util.h"
+#include "../streams/file.h"
+#include "../streams/http.h"
+#include "../streams/limited.h"
+#include "../streams/memory.h"
+#include "../streams/transfer.h"
+#include "../sleep.h"
 #endif
 
 namespace Mordor {
diff --git a/mordor/http/proxy.h b/mordor/http/proxy.h
index f5ad3cc4..cfb110ef 100644
--- a/mordor/http/proxy.h
+++ b/mordor/http/proxy.h
@@ -2,7 +2,7 @@
 #define __MORDOR_HTTP_PROXY_H__
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/uri.h"
+#include "../uri.h"
 
 #ifdef WINDOWS
 #include <winhttp.h>
@@ -10,8 +10,8 @@
 #include <queue>
 #include <boost/thread.hpp>
 #include <SystemConfiguration/SystemConfiguration.h>
-#include "mordor/util.h"
-#include "mordor/http/broker.h"
+#include "../util.h"
+#include "../http/broker.h"
 #endif
 
 namespace Mordor {
diff --git a/mordor/http/server.cpp b/mordor/http/server.cpp
index 9d22c82a..20b3fb59 100644
--- a/mordor/http/server.cpp
+++ b/mordor/http/server.cpp
@@ -3,12 +3,12 @@
 #include "server.h"
 
 
-#include "mordor/fiber.h"
-#include "mordor/scheduler.h"
-#include "mordor/socket.h"
-#include "mordor/streams/null.h"
-#include "mordor/streams/transfer.h"
-#include "mordor/timer.h"
+#include "../fiber.h"
+#include "../scheduler.h"
+#include "../socket.h"
+#include "../streams/null.h"
+#include "../streams/transfer.h"
+#include "../timer.h"
 #include "multipart.h"
 #include "parser.h"
 
diff --git a/mordor/http/servlet.cpp b/mordor/http/servlet.cpp
index bde37977..6e78c3fc 100644
--- a/mordor/http/servlet.cpp
+++ b/mordor/http/servlet.cpp
@@ -2,7 +2,7 @@
 
 #include "servlet.h"
 
-#include "mordor/assert.h"
+#include "../assert.h"
 #include "server.h"
 
 namespace Mordor {
diff --git a/mordor/http/servlet.h b/mordor/http/servlet.h
index 4f1a8b30..555005d1 100644
--- a/mordor/http/servlet.h
+++ b/mordor/http/servlet.h
@@ -4,8 +4,8 @@
 
 #include <boost/variant.hpp>
 
-#include "mordor/factory.h"
-#include "mordor/uri.h"
+#include "../factory.h"
+#include "../uri.h"
 
 namespace Mordor {
 namespace HTTP {
diff --git a/mordor/http/servlets/config.cpp b/mordor/http/servlets/config.cpp
index 4069a028..c97c1881 100644
--- a/mordor/http/servlets/config.cpp
+++ b/mordor/http/servlets/config.cpp
@@ -1,14 +1,14 @@
 // Copyright (c) 2010 - Mozy, Inc.
 
-#include "mordor/http/servlets/config.h"
+#include "config.h"
 
-#include "mordor/config.h"
-#include "mordor/http/server.h"
-#include "mordor/json.h"
-#include "mordor/streams/buffered.h"
-#include "mordor/streams/limited.h"
-#include "mordor/streams/memory.h"
-#include "mordor/streams/transfer.h"
+#include "../../config.h"
+#include "../server.h"
+#include "../../json.h"
+#include "../../streams/buffered.h"
+#include "../../streams/limited.h"
+#include "../../streams/memory.h"
+#include "../../streams/transfer.h"
 
 namespace Mordor {
 namespace HTTP {
diff --git a/mordor/http/servlets/config.h b/mordor/http/servlets/config.h
index 65765c72..c19eeda2 100644
--- a/mordor/http/servlets/config.h
+++ b/mordor/http/servlets/config.h
@@ -3,7 +3,7 @@
 // Copyright (c) 2010 - Mozy, Inc.
 
 
-#include "mordor/http/servlet.h"
+#include "../servlet.h"
 
 namespace Mordor {
 namespace HTTP {
diff --git a/mordor/iomanager_epoll.cpp b/mordor/iomanager_epoll.cpp
index 5e0dbebf..948e97fa 100644
--- a/mordor/iomanager_epoll.cpp
+++ b/mordor/iomanager_epoll.cpp
@@ -99,7 +99,7 @@ IOManager::AsyncState::AsyncState()
       m_events(NONE)
 {}
 
-IOManager::AsyncState::~AsyncState()
+IOManager::AsyncState::~AsyncState() noexcept(false)
 {
     boost::mutex::scoped_lock lock(m_mutex);
     MORDOR_ASSERT(!m_events);
@@ -218,7 +218,7 @@ IOManager::IOManager(size_t threads, bool useCaller, bool autoStart)
     }
 }
 
-IOManager::~IOManager()
+IOManager::~IOManager() noexcept(false)
 {
     stop();
     close(m_epfd);
diff --git a/mordor/iomanager_epoll.h b/mordor/iomanager_epoll.h
index 93bcdc71..a616346c 100644
--- a/mordor/iomanager_epoll.h
+++ b/mordor/iomanager_epoll.h
@@ -30,7 +30,7 @@ class IOManager : public Scheduler, public TimerManager
     struct AsyncState
     {
         AsyncState();
-        ~AsyncState();
+        ~AsyncState() noexcept(false);
 	AsyncState(const AsyncState& rhs) = delete;
 
         struct EventContext
@@ -59,7 +59,7 @@ class IOManager : public Scheduler, public TimerManager
     /// @note @p autoStart provides a more friendly behavior for derived class
     ///      that inherits from IOManager
     IOManager(size_t threads = 1, bool useCaller = true, bool autoStart = true);
-    ~IOManager();
+    ~IOManager() noexcept(false);
 
     bool stopping();
 
diff --git a/mordor/json.rl b/mordor/json.rl
index a8aab994..ab756b57 100644
--- a/mordor/json.rl
+++ b/mordor/json.rl
@@ -1,11 +1,11 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/pch.h"
+#include "pch.h"
 
-#include "mordor/json.h"
+#include "json.h"
 
-#include "mordor/assert.h"
-#include "mordor/string.h"
+#include "assert.h"
+#include "string.h"
 
 namespace Mordor {
 namespace JSON {
diff --git a/mordor/log.cpp b/mordor/log.cpp
index 4787786b..d1fd7533 100644
--- a/mordor/log.cpp
+++ b/mordor/log.cpp
@@ -16,8 +16,8 @@
 #include "assert.h"
 #include "config.h"
 #include "fiber.h"
-#include "mordor/streams/file.h"
-#include "mordor/string.h"
+#include "streams/file.h"
+#include "string.h"
 #include "timer.h"
 
 namespace Mordor {
diff --git a/mordor/pch.h b/mordor/pch.h
index 0d9c4f8e..5462b3e3 100644
--- a/mordor/pch.h
+++ b/mordor/pch.h
@@ -2,7 +2,7 @@
 #define __MORDOR_PCH_H__
 
 #ifdef HAVE_CONFIG_H
-#include "autoconfig.h"
+#include "../autoconfig.h"
 #endif
 
 #include "version.h"
diff --git a/mordor/pq/connection.cpp b/mordor/pq/connection.cpp
index 0a5792cf..07bb6f88 100644
--- a/mordor/pq/connection.cpp
+++ b/mordor/pq/connection.cpp
@@ -1,12 +1,12 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
 #include "connection.h"
 
-#include "mordor/assert.h"
-#include "mordor/iomanager.h"
-#include "mordor/log.h"
+#include "../assert.h"
+#include "../iomanager.h"
+#include "../log.h"
 
 #include "exception.h"
 
diff --git a/mordor/pq/connectionpool.cpp b/mordor/pq/connectionpool.cpp
index c0051390..2687ea7a 100644
--- a/mordor/pq/connectionpool.cpp
+++ b/mordor/pq/connectionpool.cpp
@@ -1,14 +1,14 @@
 // Copyright (c) 2010 Mozy, Inc.
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
 #include "connectionpool.h"
 
 
-#include "mordor/config.h"
-#include "mordor/iomanager.h"
-#include "mordor/log.h"
-#include "mordor/util.h"
+#include "../config.h"
+#include "../iomanager.h"
+#include "../log.h"
+#include "../util.h"
 
 #include "connection.h"
 
diff --git a/mordor/pq/connectionpool.h b/mordor/pq/connectionpool.h
index 331c3008..55bb5990 100644
--- a/mordor/pq/connectionpool.h
+++ b/mordor/pq/connectionpool.h
@@ -4,7 +4,7 @@
 #include <list>
 
 
-#include "mordor/fibersynchronization.h"
+#include "../fibersynchronization.h"
 
 namespace Mordor {
 
diff --git a/mordor/pq/copy.cpp b/mordor/pq/copy.cpp
index b7f1c51a..ab16fda6 100644
--- a/mordor/pq/copy.cpp
+++ b/mordor/pq/copy.cpp
@@ -1,12 +1,12 @@
 // Copyright (c) 2010 - Mozy, Inc.
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
-#include "mordor/assert.h"
-#include "mordor/iomanager.h"
-#include "mordor/log.h"
-#include "mordor/streams/buffer.h"
-#include "mordor/streams/stream.h"
+#include "../assert.h"
+#include "../iomanager.h"
+#include "../log.h"
+#include "../streams/buffer.h"
+#include "../streams/stream.h"
 
 #include "connection.h"
 #include "exception.h"
diff --git a/mordor/pq/exception.cpp b/mordor/pq/exception.cpp
index db90ebc7..ada05038 100644
--- a/mordor/pq/exception.cpp
+++ b/mordor/pq/exception.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) 2010 - Mozy, Inc.
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
 #include "exception.h"
 
-#include "mordor/log.h"
+#include "../log.h"
 
 namespace Mordor {
 namespace PQ {
diff --git a/mordor/pq/exception.h b/mordor/pq/exception.h
index da3116d4..90acd8a9 100644
--- a/mordor/pq/exception.h
+++ b/mordor/pq/exception.h
@@ -4,7 +4,7 @@
 
 #include <libpq-fe.h>
 
-#include "mordor/exception.h"
+#include "../exception.h"
 
 namespace Mordor {
 namespace PQ {
diff --git a/mordor/pq/preparedstatement.cpp b/mordor/pq/preparedstatement.cpp
index 3112d063..28d4c53b 100644
--- a/mordor/pq/preparedstatement.cpp
+++ b/mordor/pq/preparedstatement.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) 2010 - Mozy, Inc.
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
 #include "preparedstatement.h"
 
-#include "mordor/assert.h"
-#include "mordor/endian.h"
-#include "mordor/log.h"
-#include "mordor/iomanager.h"
+#include "../assert.h"
+#include "../endian.h"
+#include "../log.h"
+#include "../iomanager.h"
 
 #include "connection.h"
 #include "exception.h"
diff --git a/mordor/pq/result.cpp b/mordor/pq/result.cpp
index a377fe19..3f723567 100644
--- a/mordor/pq/result.cpp
+++ b/mordor/pq/result.cpp
@@ -1,14 +1,14 @@
 // Copyright (c) 2010 - Mozy, Inc.
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
 #include "result.h"
 
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 
-#include "mordor/assert.h"
-#include "mordor/endian.h"
-#include "mordor/socket.h"
+#include "../assert.h"
+#include "../endian.h"
+#include "../socket.h"
 
 #define BOOLOID 16
 #define CHAROID 18
diff --git a/mordor/pq/tests/pq.cpp b/mordor/pq/tests/pq.cpp
index 6ea4ca8c..6ffa84ef 100644
--- a/mordor/pq/tests/pq.cpp
+++ b/mordor/pq/tests/pq.cpp
@@ -1,25 +1,25 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/predef.h"
+#include "../../predef.h"
 
 #include <iostream>
 
 #include <boost/date_time/posix_time/posix_time_io.hpp>
 
-#include "mordor/config.h"
-#include "mordor/fibersynchronization.h"
-#include "mordor/iomanager.h"
-#include "mordor/main.h"
-#include "mordor/pq/connection.h"
-#include "mordor/pq/exception.h"
-#include "mordor/pq/transaction.h"
-#include "mordor/version.h"
-#include "mordor/statistics.h"
-#include "mordor/streams/memory.h"
-#include "mordor/streams/transfer.h"
-#include "mordor/test/antxmllistener.h"
-#include "mordor/test/test.h"
-#include "mordor/test/stdoutlistener.h"
+#include "../../config.h"
+#include "../../fibersynchronization.h"
+#include "../../iomanager.h"
+#include "../../main.h"
+#include "../../pq/connection.h"
+#include "../../pq/exception.h"
+#include "../../pq/transaction.h"
+#include "../../version.h"
+#include "../../statistics.h"
+#include "../../streams/memory.h"
+#include "../../streams/transfer.h"
+#include "../../test/antxmllistener.h"
+#include "../../test/test.h"
+#include "../../test/stdoutlistener.h"
 
 using namespace Mordor;
 using namespace Mordor::PQ;
diff --git a/mordor/pq/transaction.cpp b/mordor/pq/transaction.cpp
index 90ccd874..c2e35475 100644
--- a/mordor/pq/transaction.cpp
+++ b/mordor/pq/transaction.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) 2010 - Mozy, Inc.
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
 #include "transaction.h"
 
-#include "mordor/assert.h"
+#include "../assert.h"
 
 #include "connection.h"
 
diff --git a/mordor/protobuf.cpp b/mordor/protobuf.cpp
index 197c191e..d04ca792 100644
--- a/mordor/protobuf.cpp
+++ b/mordor/protobuf.cpp
@@ -2,8 +2,8 @@
 
 #include "protobuf.h"
 
-#include "mordor/assert.h"
-#include "mordor/streams/buffer.h"
+#include "assert.h"
+#include "streams/buffer.h"
 
 #ifdef MSVC
 // Disable some warnings, but only while
diff --git a/mordor/scheduler.cpp b/mordor/scheduler.cpp
index f892a59b..81d3bb56 100644
--- a/mordor/scheduler.cpp
+++ b/mordor/scheduler.cpp
@@ -34,7 +34,7 @@ Scheduler::Scheduler(size_t threads, bool useCaller, size_t batchSize)
     m_threadCount = threads;
 }
 
-Scheduler::~Scheduler()
+Scheduler::~Scheduler() noexcept(false)
 {
     MORDOR_ASSERT(m_stopping);
     if (getThis() == this) {
diff --git a/mordor/scheduler.h b/mordor/scheduler.h
index e125f3fb..2532edf4 100644
--- a/mordor/scheduler.h
+++ b/mordor/scheduler.h
@@ -43,7 +43,7 @@ class Scheduler
     /// @pre if (useCaller == true) Scheduler::getThis() == NULL
     Scheduler(size_t threads = 1, bool useCaller = true, size_t batchSize = 1);
     /// Destroys the scheduler, implicitly calling stop()
-    virtual ~Scheduler();
+    virtual ~Scheduler() noexcept(false);
 
     /// @return The Scheduler controlling the currently executing thread
     static Scheduler* getThis();
diff --git a/mordor/semaphore.cpp b/mordor/semaphore.cpp
index cfbeb49c..51c702cc 100644
--- a/mordor/semaphore.cpp
+++ b/mordor/semaphore.cpp
@@ -50,7 +50,7 @@ Semaphore::Semaphore(unsigned int count)
 #endif
 }
 
-Semaphore::~Semaphore()
+Semaphore::~Semaphore() noexcept(false)
 {
 #ifdef WINDOWS
     MORDOR_VERIFY(CloseHandle(m_semaphore));
diff --git a/mordor/semaphore.h b/mordor/semaphore.h
index 5d525e45..e3057733 100644
--- a/mordor/semaphore.h
+++ b/mordor/semaphore.h
@@ -21,7 +21,7 @@ class Semaphore
 public:
     Semaphore(unsigned int count = 0);
     Semaphore(const Semaphore& rhs) = delete;
-    ~Semaphore();
+    ~Semaphore() noexcept(false);
 
     void wait();
 
diff --git a/mordor/sleep.h b/mordor/sleep.h
index 0457cbc9..67a636b1 100644
--- a/mordor/sleep.h
+++ b/mordor/sleep.h
@@ -2,6 +2,8 @@
 #define __MORDOR_SLEEP_H__
 // Copyright (c) 2009 - Mozy, Inc.
 
+#include <chrono>
+
 namespace Mordor {
 
 class TimerManager;
@@ -11,6 +13,14 @@ class TimerManager;
 /// @param us How long to sleep, in microseconds
 void sleep(unsigned long long us);
 
+template <class Rep, class Period>
+inline void sleep(std::chrono::duration<Rep, Period> duration)
+{
+    auto rescaled = std::chrono::duration_cast<std::chrono::microseconds>(
+        duration);
+    sleep(rescaled.count());
+}
+
 /// Suspend execution of the current Fiber
 /// @note This will use the TimerManager to yield the current Fiber and allow
 /// other Fibers to run until this Fiber is ready to run again.
@@ -20,6 +30,15 @@ void sleep(unsigned long long us);
 /// @pre Scheduler::getThis() != NULL
 void sleep(TimerManager &timerManager, unsigned long long us);
 
+template <class Rep, class Period>
+inline void sleep(TimerManager & timerManager,
+                  std::chrono::duration<Rep, Period> duration)
+{
+    auto rescaled = std::chrono::duration_cast<std::chrono::microseconds>(
+        duration);
+    sleep(timerManager, rescaled.count());
+}
+
 }
 
 #endif
diff --git a/mordor/socks.cpp b/mordor/socks.cpp
index 2f282931..9c931f56 100644
--- a/mordor/socks.cpp
+++ b/mordor/socks.cpp
@@ -2,9 +2,9 @@
 
 #include "socks.h"
 
-#include "mordor/http/broker.h"
-#include "mordor/socket.h"
-#include "mordor/streams/stream.h"
+#include "http/broker.h"
+#include "socket.h"
+#include "streams/stream.h"
 
 namespace Mordor {
 namespace SOCKS {
diff --git a/mordor/socks.h b/mordor/socks.h
index 1a22dcae..f7c38be3 100644
--- a/mordor/socks.h
+++ b/mordor/socks.h
@@ -3,7 +3,7 @@
 // Copyright (c) 2010 - Mozy, Inc.
 
 
-#include "mordor/exception.h"
+#include "exception.h"
 
 namespace Mordor {
 
diff --git a/mordor/ssh/agent.cpp b/mordor/ssh/agent.cpp
index 842005ab..cade6054 100644
--- a/mordor/ssh/agent.cpp
+++ b/mordor/ssh/agent.cpp
@@ -4,7 +4,7 @@
 
 #include <libssh2.h>
 
-#include "mordor/exception.h"
+#include "../exception.h"
 
 namespace Mordor {
 namespace SSH {
diff --git a/mordor/ssh/agent.h b/mordor/ssh/agent.h
index 112bf1dc..100ab885 100644
--- a/mordor/ssh/agent.h
+++ b/mordor/ssh/agent.h
@@ -4,7 +4,7 @@
 
 #include <libssh2.h>
 
-#include "mordor/fibersynchronization.h"
+#include "../fibersynchronization.h"
 
 namespace Mordor {
 
diff --git a/mordor/ssh/channel.cpp b/mordor/ssh/channel.cpp
index 7dc56e60..7091c7a7 100644
--- a/mordor/ssh/channel.cpp
+++ b/mordor/ssh/channel.cpp
@@ -2,8 +2,8 @@
 
 #include "channel.h"
 
-#include "mordor/exception.h"
-#include "mordor/log.h"
+#include "../exception.h"
+#include "../log.h"
 #include "session.h"
 
 namespace Mordor {
diff --git a/mordor/ssh/channel.h b/mordor/ssh/channel.h
index b16a1ca7..9832bfb5 100644
--- a/mordor/ssh/channel.h
+++ b/mordor/ssh/channel.h
@@ -4,7 +4,7 @@
 
 #include <libssh2.h>
 
-#include "mordor/streams/stream.h"
+#include "../streams/stream.h"
 
 namespace Mordor {
 namespace SSH {
diff --git a/mordor/ssh/session.cpp b/mordor/ssh/session.cpp
index e98eec70..07cb861b 100644
--- a/mordor/ssh/session.cpp
+++ b/mordor/ssh/session.cpp
@@ -6,10 +6,10 @@
 
 #include "agent.h"
 #include "channel.h"
-#include "mordor/exception.h"
-#include "mordor/iomanager.h"
-#include "mordor/log.h"
-#include "mordor/socket.h"
+#include "../exception.h"
+#include "../iomanager.h"
+#include "../log.h"
+#include "../socket.h"
 
 namespace {
 
diff --git a/mordor/streams/buffer.cpp b/mordor/streams/buffer.cpp
index cbca1917..449a45c0 100644
--- a/mordor/streams/buffer.cpp
+++ b/mordor/streams/buffer.cpp
@@ -5,8 +5,8 @@
 #include <string.h>
 #include <algorithm>
 
-#include "mordor/assert.h"
-#include "mordor/util.h"
+#include "../assert.h"
+#include "../util.h"
 
 #ifdef WINDOWS
 static u_long iovLength(size_t length)
diff --git a/mordor/streams/buffer.h b/mordor/streams/buffer.h
index 029df7ea..f22c165f 100644
--- a/mordor/streams/buffer.h
+++ b/mordor/streams/buffer.h
@@ -6,7 +6,7 @@
 
 #include <boost/shared_array.hpp>
 
-#include "mordor/socket.h"
+#include "../socket.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/buffered.cpp b/mordor/streams/buffered.cpp
index 1583211e..211bbb8b 100644
--- a/mordor/streams/buffered.cpp
+++ b/mordor/streams/buffered.cpp
@@ -2,9 +2,9 @@
 
 #include "buffered.h"
 
-#include "mordor/config.h"
-#include "mordor/exception.h"
-#include "mordor/log.h"
+#include "../config.h"
+#include "../exception.h"
+#include "../log.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/cat.cpp b/mordor/streams/cat.cpp
index 4ce34388..e1a797d1 100644
--- a/mordor/streams/cat.cpp
+++ b/mordor/streams/cat.cpp
@@ -2,7 +2,7 @@
 
 #include "cat.h"
 
-#include "mordor/assert.h"
+#include "../assert.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/crypto.cpp b/mordor/streams/crypto.cpp
index 3e220f01..f70fb294 100755
--- a/mordor/streams/crypto.cpp
+++ b/mordor/streams/crypto.cpp
@@ -1,7 +1,7 @@
 #include "crypto.h"
 #include "ssl.h" // for OpenSSLException
-#include "mordor/assert.h"
-#include "mordor/streams/random.h"
+#include "../assert.h"
+#include "../streams/random.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/delay.h b/mordor/streams/delay.h
index 149b8f9f..781fb528 100644
--- a/mordor/streams/delay.h
+++ b/mordor/streams/delay.h
@@ -1,8 +1,8 @@
 #ifndef __MORDOR_DELAY_STREAM_H_
 #define __MORDOR_DELAY_STREAM_H_
 
-#include "mordor/sleep.h"
-#include "mordor/streams/filter.h"
+#include "../sleep.h"
+#include "../streams/filter.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/efs.cpp b/mordor/streams/efs.cpp
index c4a6ef5f..b55892e0 100644
--- a/mordor/streams/efs.cpp
+++ b/mordor/streams/efs.cpp
@@ -4,9 +4,9 @@
 #include "efs.h"
 
 #include "buffer.h"
-#include "mordor/assert.h"
-#include "mordor/fiber.h"
-#include "mordor/string.h"
+#include "../assert.h"
+#include "../fiber.h"
+#include "../string.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/fd.cpp b/mordor/streams/fd.cpp
index 75955657..3275ebfa 100644
--- a/mordor/streams/fd.cpp
+++ b/mordor/streams/fd.cpp
@@ -1,6 +1,6 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/pch.h"
+#include "../pch.h"
 
 #include "fd.h"
 
@@ -12,8 +12,8 @@
 #include <sys/uio.h>
 
 #include "buffer.h"
-#include "mordor/assert.h"
-#include "mordor/iomanager.h"
+#include "../assert.h"
+#include "../iomanager.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/file.cpp b/mordor/streams/file.cpp
index 93c63563..5324a1af 100644
--- a/mordor/streams/file.cpp
+++ b/mordor/streams/file.cpp
@@ -2,8 +2,8 @@
 
 #include "file.h"
 
-#include "mordor/assert.h"
-#include "mordor/string.h"
+#include "../assert.h"
+#include "../string.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/file.h b/mordor/streams/file.h
index 7f8767d1..bb87a308 100644
--- a/mordor/streams/file.h
+++ b/mordor/streams/file.h
@@ -2,7 +2,7 @@
 #define __MORDOR_FILE_STREAM_H__
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/version.h"
+#include "../version.h"
 
 #ifdef WINDOWS
 #include "handle.h"
diff --git a/mordor/streams/filter.cpp b/mordor/streams/filter.cpp
index 4676b186..ff309f2b 100644
--- a/mordor/streams/filter.cpp
+++ b/mordor/streams/filter.cpp
@@ -2,7 +2,7 @@
 
 #include "filter.h"
 
-#include "mordor/assert.h"
+#include "../assert.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/handle.cpp b/mordor/streams/handle.cpp
index ab83f0f0..4494fa77 100644
--- a/mordor/streams/handle.cpp
+++ b/mordor/streams/handle.cpp
@@ -2,9 +2,9 @@
 
 #include "handle.h"
 
-#include "mordor/assert.h"
-#include "mordor/log.h"
-#include "mordor/runtime_linking.h"
+#include "../assert.h"
+#include "../log.h"
+#include "../runtime_linking.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/handle.h b/mordor/streams/handle.h
index 6bf5abf1..e39e3471 100644
--- a/mordor/streams/handle.h
+++ b/mordor/streams/handle.h
@@ -4,7 +4,7 @@
 
 #include <windows.h>
 
-#include "mordor/iomanager.h"
+#include "../iomanager.h"
 #include "stream.h"
 
 namespace Mordor {
diff --git a/mordor/streams/hash.cpp b/mordor/streams/hash.cpp
index 79c58948..7c3639e5 100644
--- a/mordor/streams/hash.cpp
+++ b/mordor/streams/hash.cpp
@@ -3,8 +3,8 @@
 #include "hash.h"
 
 #include "buffer.h"
-#include "mordor/assert.h"
-#include "mordor/endian.h"
+#include "../assert.h"
+#include "../endian.h"
 
 namespace barg = std::placeholders;
 
diff --git a/mordor/streams/http.cpp b/mordor/streams/http.cpp
index 96924acc..ba2e6991 100644
--- a/mordor/streams/http.cpp
+++ b/mordor/streams/http.cpp
@@ -2,9 +2,9 @@
 
 #include "http.h"
 
-#include "mordor/fiber.h"
-#include "mordor/http/client.h"
-#include "mordor/socket.h"
+#include "../fiber.h"
+#include "../http/client.h"
+#include "../socket.h"
 #include "null.h"
 #include "transfer.h"
 
diff --git a/mordor/streams/http.h b/mordor/streams/http.h
index ee23981d..ea25e7d7 100644
--- a/mordor/streams/http.h
+++ b/mordor/streams/http.h
@@ -3,9 +3,9 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
 #include "filter.h"
-#include "mordor/exception.h"
-#include "mordor/future.h"
-#include "mordor/http/broker.h"
+#include "../exception.h"
+#include "../future.h"
+#include "../http/broker.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/limited.cpp b/mordor/streams/limited.cpp
index 335e582e..9fb82663 100644
--- a/mordor/streams/limited.cpp
+++ b/mordor/streams/limited.cpp
@@ -4,7 +4,7 @@
 
 #include <stdexcept>
 
-#include "mordor/assert.h"
+#include "../assert.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/lzma2.cpp b/mordor/streams/lzma2.cpp
index f7017a69..aed43e6a 100644
--- a/mordor/streams/lzma2.cpp
+++ b/mordor/streams/lzma2.cpp
@@ -1,8 +1,8 @@
 #include "lzma2.h"
 
-#include "mordor/assert.h"
-#include "mordor/exception.h"
-#include "mordor/log.h"
+#include "../assert.h"
+#include "../exception.h"
+#include "../log.h"
 
 #ifdef MSVC
 #pragma comment(lib, "liblzma")
diff --git a/mordor/streams/memory.cpp b/mordor/streams/memory.cpp
index 9035f433..3aa97c11 100644
--- a/mordor/streams/memory.cpp
+++ b/mordor/streams/memory.cpp
@@ -4,7 +4,7 @@
 
 #include <stdexcept>
 
-#include "mordor/assert.h"
+#include "../assert.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/namedpipe.cpp b/mordor/streams/namedpipe.cpp
index 66018ed8..00788767 100644
--- a/mordor/streams/namedpipe.cpp
+++ b/mordor/streams/namedpipe.cpp
@@ -2,11 +2,11 @@
 
 #include "namedpipe.h"
 
-#include "mordor/assert.h"
-#include "mordor/exception.h"
-#include "mordor/log.h"
-#include "mordor/runtime_linking.h"
-#include "mordor/string.h"
+#include "../assert.h"
+#include "../exception.h"
+#include "../log.h"
+#include "../runtime_linking.h"
+#include "../string.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/null.h b/mordor/streams/null.h
index 8b1104d4..1e44ef43 100644
--- a/mordor/streams/null.h
+++ b/mordor/streams/null.h
@@ -3,7 +3,7 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
 #include "stream.h"
-#include "mordor/util.h"
+#include "../util.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/pipe.cpp b/mordor/streams/pipe.cpp
index e91d0e1b..1148d445 100644
--- a/mordor/streams/pipe.cpp
+++ b/mordor/streams/pipe.cpp
@@ -6,9 +6,9 @@
 
 #include "buffer.h"
 #include "file.h"
-#include "mordor/assert.h"
-#include "mordor/fiber.h"
-#include "mordor/scheduler.h"
+#include "../assert.h"
+#include "../fiber.h"
+#include "../scheduler.h"
 #include "stream.h"
 
 #ifdef OSX
diff --git a/mordor/streams/random.cpp b/mordor/streams/random.cpp
index 61348989..6d273773 100644
--- a/mordor/streams/random.cpp
+++ b/mordor/streams/random.cpp
@@ -5,8 +5,8 @@
 #include "ssl.h"
 #endif
 
-#include "mordor/endian.h"
-#include "mordor/exception.h"
+#include "../endian.h"
+#include "../exception.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/scheduler.h b/mordor/streams/scheduler.h
index ecbbf0e0..daa993aa 100644
--- a/mordor/streams/scheduler.h
+++ b/mordor/streams/scheduler.h
@@ -3,7 +3,7 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
 #include "filter.h"
-#include "mordor/scheduler.h"
+#include "../scheduler.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/singleplex.cpp b/mordor/streams/singleplex.cpp
index 25888cd5..74a1d321 100644
--- a/mordor/streams/singleplex.cpp
+++ b/mordor/streams/singleplex.cpp
@@ -2,7 +2,7 @@
 
 #include "singleplex.h"
 
-#include "mordor/assert.h"
+#include "../assert.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/socket.cpp b/mordor/streams/socket.cpp
index 21e2e640..4d6f23da 100644
--- a/mordor/streams/socket.cpp
+++ b/mordor/streams/socket.cpp
@@ -3,8 +3,8 @@
 #include "socket.h"
 
 #include "buffer.h"
-#include "mordor/assert.h"
-#include "mordor/socket.h"
+#include "../assert.h"
+#include "../socket.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/ssl.cpp b/mordor/streams/ssl.cpp
index a3135b8d..d977e6ba 100644
--- a/mordor/streams/ssl.cpp
+++ b/mordor/streams/ssl.cpp
@@ -7,9 +7,9 @@
 #include <openssl/err.h>
 #include <openssl/x509v3.h>
 
-#include "mordor/assert.h"
-#include "mordor/log.h"
-#include "mordor/util.h"
+#include "../assert.h"
+#include "../log.h"
+#include "../util.h"
 
 #ifdef MSVC
 #pragma comment(lib, "libeay32")
diff --git a/mordor/streams/std.cpp b/mordor/streams/std.cpp
index 15267ade..184e47fd 100644
--- a/mordor/streams/std.cpp
+++ b/mordor/streams/std.cpp
@@ -2,7 +2,7 @@
 
 #include "std.h"
 
-#include "mordor/exception.h"
+#include "../exception.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/std.h b/mordor/streams/std.h
index bc5d0628..87d9b470 100644
--- a/mordor/streams/std.h
+++ b/mordor/streams/std.h
@@ -2,7 +2,7 @@
 #define __MORDOR_STD_STREAM_H__
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/version.h"
+#include "../version.h"
 
 #ifdef WINDOWS
 #include "handle.h"
diff --git a/mordor/streams/stream.cpp b/mordor/streams/stream.cpp
index a55fa616..19bb90da 100644
--- a/mordor/streams/stream.cpp
+++ b/mordor/streams/stream.cpp
@@ -7,7 +7,7 @@
 #include <string.h>
 
 #include "buffer.h"
-#include "mordor/assert.h"
+#include "../assert.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/stream.h b/mordor/streams/stream.h
index c84e71f7..ef47c194 100644
--- a/mordor/streams/stream.h
+++ b/mordor/streams/stream.h
@@ -6,7 +6,7 @@
 
 #include <boost/signals2/signal.hpp>
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
 namespace Mordor {
 
@@ -59,7 +59,7 @@ class Stream
 
     /// Cleans up the underlying implementation, possibly by ungracefully
     /// closing it.
-    virtual ~Stream() {}
+    virtual ~Stream() noexcept(false) {}
 
     /// @return If it is valid to call close() with READ or WRITE
     virtual bool supportsHalfClose() { return false; }
diff --git a/mordor/streams/tee.cpp b/mordor/streams/tee.cpp
index 0e2bf91a..4f4fa0bd 100644
--- a/mordor/streams/tee.cpp
+++ b/mordor/streams/tee.cpp
@@ -6,10 +6,10 @@ namespace barg = std::placeholders;
 
 #include "tee.h"
 
-#include "mordor/assert.h"
-#include "mordor/log.h"
-#include "mordor/parallel.h"
-#include "mordor/streams/buffer.h"
+#include "../assert.h"
+#include "../log.h"
+#include "../parallel.h"
+#include "../streams/buffer.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/temp.cpp b/mordor/streams/temp.cpp
index 1e649ffc..bc82604b 100644
--- a/mordor/streams/temp.cpp
+++ b/mordor/streams/temp.cpp
@@ -2,8 +2,8 @@
 
 #include "temp.h"
 
-#include "mordor/config.h"
-#include "mordor/string.h"
+#include "../config.h"
+#include "../string.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/throttle.cpp b/mordor/streams/throttle.cpp
index bcb33410..09f790fc 100644
--- a/mordor/streams/throttle.cpp
+++ b/mordor/streams/throttle.cpp
@@ -2,10 +2,10 @@
 
 #include "throttle.h"
 
-#include "mordor/assert.h"
-#include "mordor/log.h"
-#include "mordor/sleep.h"
-#include "mordor/timer.h"
+#include "../assert.h"
+#include "../log.h"
+#include "../sleep.h"
+#include "../timer.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/timeout.cpp b/mordor/streams/timeout.cpp
index 6af7841f..e160d81a 100644
--- a/mordor/streams/timeout.cpp
+++ b/mordor/streams/timeout.cpp
@@ -2,11 +2,11 @@
 
 #include "timeout.h"
 
-#include "mordor/assert.h"
-#include "mordor/exception.h"
-#include "mordor/log.h"
-#include "mordor/socket.h"
-#include "mordor/timer.h"
+#include "../assert.h"
+#include "../exception.h"
+#include "../log.h"
+#include "../socket.h"
+#include "../timer.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/timeout.h b/mordor/streams/timeout.h
index 7327ca44..39adcf9f 100644
--- a/mordor/streams/timeout.h
+++ b/mordor/streams/timeout.h
@@ -3,7 +3,7 @@
 // Copyright (c) 2010 - Mozy, Inc.
 
 #include "filter.h"
-#include "mordor/fibersynchronization.h"
+#include "../fibersynchronization.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/transfer.cpp b/mordor/streams/transfer.cpp
index c203c5e8..94bc9034 100644
--- a/mordor/streams/transfer.cpp
+++ b/mordor/streams/transfer.cpp
@@ -3,12 +3,12 @@
 #include "transfer.h"
 
 
-#include "mordor/assert.h"
-#include "mordor/config.h"
-#include "mordor/fiber.h"
-#include "mordor/parallel.h"
-#include "mordor/streams/buffer.h"
-#include "mordor/streams/null.h"
+#include "../assert.h"
+#include "../config.h"
+#include "../fiber.h"
+#include "../parallel.h"
+#include "../streams/buffer.h"
+#include "../streams/null.h"
 #include "stream.h"
 
 namespace Mordor {
diff --git a/mordor/streams/zero.h b/mordor/streams/zero.h
index c472bc42..8bb1039c 100644
--- a/mordor/streams/zero.h
+++ b/mordor/streams/zero.h
@@ -3,7 +3,7 @@
 // Copyright (c) 2012 - VMware, Inc.
 
 #include "stream.h"
-#include "mordor/util.h"
+#include "../util.h"
 
 namespace Mordor {
 
diff --git a/mordor/streams/zlib.cpp b/mordor/streams/zlib.cpp
index e0d23319..8e1e560b 100644
--- a/mordor/streams/zlib.cpp
+++ b/mordor/streams/zlib.cpp
@@ -2,9 +2,9 @@
 
 #include "zlib.h"
 
-#include "mordor/assert.h"
-#include "mordor/exception.h"
-#include "mordor/log.h"
+#include "../assert.h"
+#include "../exception.h"
+#include "../log.h"
 
 #ifdef MSVC
 #pragma comment(lib, "zdll")
diff --git a/mordor/streams/zlib.h b/mordor/streams/zlib.h
index 9cdca635..4d83c51a 100644
--- a/mordor/streams/zlib.h
+++ b/mordor/streams/zlib.h
@@ -6,7 +6,7 @@
 
 #include "buffer.h"
 #include "filter.h"
-#include "mordor/exception.h"
+#include "../exception.h"
 
 namespace Mordor {
 
diff --git a/mordor/string.cpp b/mordor/string.cpp
index b48067c8..6ac6b836 100644
--- a/mordor/string.cpp
+++ b/mordor/string.cpp
@@ -14,8 +14,8 @@
 #endif
 #endif
 
-#include "mordor/string.h"
-#include "mordor/util.h"
+#include "string.h"
+#include "util.h"
 
 #include "assert.h"
 #include "exception.h"
diff --git a/mordor/test/antxmllistener.cpp b/mordor/test/antxmllistener.cpp
index 0a0f7a7e..86f7dd6a 100644
--- a/mordor/test/antxmllistener.cpp
+++ b/mordor/test/antxmllistener.cpp
@@ -1,6 +1,6 @@
 // Copyright (c) 2010 - Mozy, Inc.
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
 #include "antxmllistener.h"
 
@@ -8,11 +8,11 @@
 
 #include <boost/date_time/posix_time/posix_time_io.hpp>
 
-#include "mordor/config.h"
-#include "mordor/log.h"
-#include "mordor/streams/file.h"
-#include "mordor/string.h"
-#include "mordor/timer.h"
+#include "../config.h"
+#include "../log.h"
+#include "../streams/file.h"
+#include "../string.h"
+#include "../timer.h"
 
 namespace Mordor {
 namespace Test {
diff --git a/mordor/test/stdoutlistener.cpp b/mordor/test/stdoutlistener.cpp
index 8abacb4f..53dec1d9 100644
--- a/mordor/test/stdoutlistener.cpp
+++ b/mordor/test/stdoutlistener.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/predef.h"
-#include "mordor/config.h"
+#include "../predef.h"
+#include "../config.h"
 #include "stdoutlistener.h"
 
 #include <iostream>
diff --git a/mordor/test/test.cpp b/mordor/test/test.cpp
index 6ce12b05..53e8fea0 100644
--- a/mordor/test/test.cpp
+++ b/mordor/test/test.cpp
@@ -1,6 +1,6 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/predef.h"
+#include "../predef.h"
 
 #include "test.h"
 
@@ -8,9 +8,9 @@
 
 #include <boost/regex.hpp>
 
-#include "mordor/config.h"
-#include "mordor/sleep.h"
-#include "mordor/timer.h"
+#include "../config.h"
+#include "../sleep.h"
+#include "../timer.h"
 
 #ifdef WINDOWS
 #include <windows.h>
diff --git a/mordor/test/test.h b/mordor/test/test.h
index f6d1fdaf..ea1d9afa 100644
--- a/mordor/test/test.h
+++ b/mordor/test/test.h
@@ -7,7 +7,7 @@
 #include <typeinfo>
 #include <vector>
 
-#include "mordor/assert.h"
+#include "../assert.h"
 
 namespace Mordor {
 namespace Test {
diff --git a/mordor/tests/buffer.cpp b/mordor/tests/buffer.cpp
index e5598709..345639b5 100644
--- a/mordor/tests/buffer.cpp
+++ b/mordor/tests/buffer.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
 
-#include "mordor/streams/buffer.h"
-#include "mordor/test/test.h"
+#include "../streams/buffer.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 using namespace Mordor::Test;
diff --git a/mordor/tests/file_stream.cpp b/mordor/tests/file_stream.cpp
index 2814cb75..8c644672 100644
--- a/mordor/tests/file_stream.cpp
+++ b/mordor/tests/file_stream.cpp
@@ -1,9 +1,9 @@
 // Copyright (c) 2010 - Mozy, Inc.
 
-#include "mordor/pch.h"
+#include "../pch.h"
 
-#include "mordor/streams/file.h"
-#include "mordor/test/test.h"
+#include "../streams/file.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 
diff --git a/mordor/tests/hmac.cpp b/mordor/tests/hmac.cpp
index 21ebaa3a..3f073ca2 100644
--- a/mordor/tests/hmac.cpp
+++ b/mordor/tests/hmac.cpp
@@ -1,7 +1,7 @@
-#include "mordor/pch.h"
+#include "../pch.h"
 
-#include "mordor/string.h"
-#include "mordor/test/test.h"
+#include "../string.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 using namespace Mordor::Test;
diff --git a/mordor/tests/http_client.cpp b/mordor/tests/http_client.cpp
index a0d6a583..090e08b2 100644
--- a/mordor/tests/http_client.cpp
+++ b/mordor/tests/http_client.cpp
@@ -6,31 +6,31 @@
 #endif
 
 
-#include "mordor/fiber.h"
-#include "mordor/http/broker.h"
-#include "mordor/http/client.h"
-#include "mordor/http/multipart.h"
-#include "mordor/http/parser.h"
-#include "mordor/http/server.h"
-#include "mordor/http/servlet.h"
-#include "mordor/iomanager.h"
-#include "mordor/scheduler.h"
-#include "mordor/sleep.h"
-#include "mordor/streams/buffered.h"
-#include "mordor/streams/cat.h"
-#include "mordor/streams/duplex.h"
-#include "mordor/streams/limited.h"
-#include "mordor/streams/memory.h"
-#include "mordor/streams/notify.h"
-#include "mordor/streams/null.h"
-#include "mordor/streams/pipe.h"
-#include "mordor/streams/random.h"
-#include "mordor/streams/ssl.h"
-#include "mordor/streams/test.h"
-#include "mordor/streams/transfer.h"
-#include "mordor/test/test.h"
-#include "mordor/util.h"
-#include "mordor/workerpool.h"
+#include "../fiber.h"
+#include "../http/broker.h"
+#include "../http/client.h"
+#include "../http/multipart.h"
+#include "../http/parser.h"
+#include "../http/server.h"
+#include "../http/servlet.h"
+#include "../iomanager.h"
+#include "../scheduler.h"
+#include "../sleep.h"
+#include "../streams/buffered.h"
+#include "../streams/cat.h"
+#include "../streams/duplex.h"
+#include "../streams/limited.h"
+#include "../streams/memory.h"
+#include "../streams/notify.h"
+#include "../streams/null.h"
+#include "../streams/pipe.h"
+#include "../streams/random.h"
+#include "../streams/ssl.h"
+#include "../streams/test.h"
+#include "../streams/transfer.h"
+#include "../test/test.h"
+#include "../util.h"
+#include "../workerpool.h"
 
 using namespace Mordor;
 using namespace Mordor::HTTP;
diff --git a/mordor/tests/http_parser.cpp b/mordor/tests/http_parser.cpp
index 66c49d13..867012b2 100644
--- a/mordor/tests/http_parser.cpp
+++ b/mordor/tests/http_parser.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
 
-#include "mordor/http/parser.h"
-#include "mordor/streams/buffered.h"
-#include "mordor/streams/duplex.h"
-#include "mordor/streams/memory.h"
-#include "mordor/streams/null.h"
-#include "mordor/test/test.h"
-#include "mordor/util.h"
+#include "../http/parser.h"
+#include "../streams/buffered.h"
+#include "../streams/duplex.h"
+#include "../streams/memory.h"
+#include "../streams/null.h"
+#include "../test/test.h"
+#include "../util.h"
 
 using namespace Mordor;
 using namespace Mordor::HTTP;
diff --git a/mordor/tests/iomanager.cpp b/mordor/tests/iomanager.cpp
index cad90bc3..f8d3e822 100644
--- a/mordor/tests/iomanager.cpp
+++ b/mordor/tests/iomanager.cpp
@@ -1,11 +1,11 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
 
-#include "mordor/future.h"
-#include "mordor/iomanager.h"
-#include "mordor/sleep.h"
-#include "mordor/streams/pipe.h"
-#include "mordor/test/test.h"
+#include "../future.h"
+#include "../iomanager.h"
+#include "../sleep.h"
+#include "../streams/pipe.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 using namespace Mordor::Test;
@@ -96,7 +96,7 @@ namespace {
 class TickleAccessibleIOManager : public IOManager
 {
 public:
-    void tickle() { IOManager::tickle(); }
+    virtual void tickle() { IOManager::tickle(); }
 };
 }
 
diff --git a/mordor/tests/iomanager_iocp.cpp b/mordor/tests/iomanager_iocp.cpp
index e10b4881..8802ca0a 100644
--- a/mordor/tests/iomanager_iocp.cpp
+++ b/mordor/tests/iomanager_iocp.cpp
@@ -3,8 +3,8 @@
 #ifdef WINDOWS
 
 
-#include "mordor/iomanager.h"
-#include "mordor/test/test.h"
+#include "../iomanager.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 using namespace Mordor::Test;
diff --git a/mordor/tests/pipe_stream.cpp b/mordor/tests/pipe_stream.cpp
index 33d9838c..d0d96a9f 100644
--- a/mordor/tests/pipe_stream.cpp
+++ b/mordor/tests/pipe_stream.cpp
@@ -1,14 +1,14 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
 
-#include "mordor/exception.h"
-#include "mordor/fiber.h"
-#include "mordor/scheduler.h"
-#include "mordor/streams/buffer.h"
-#include "mordor/streams/stream.h"
-#include "mordor/streams/pipe.h"
-#include "mordor/test/test.h"
-#include "mordor/workerpool.h"
+#include "../exception.h"
+#include "../fiber.h"
+#include "../scheduler.h"
+#include "../streams/buffer.h"
+#include "../streams/stream.h"
+#include "../streams/pipe.h"
+#include "../test/test.h"
+#include "../workerpool.h"
 
 using namespace Mordor;
 using namespace Mordor::Test;
diff --git a/mordor/tests/ragel.cpp b/mordor/tests/ragel.cpp
index 826cff74..6b64cd35 100644
--- a/mordor/tests/ragel.cpp
+++ b/mordor/tests/ragel.cpp
@@ -1,8 +1,8 @@
-#include "mordor/http/http.h"
-#include "mordor/http/parser.h"
-#include "mordor/streams/buffer.h"
-#include "mordor/streams/memory.h"
-#include "mordor/test/test.h"
+#include "../http/http.h"
+#include "../http/parser.h"
+#include "../streams/buffer.h"
+#include "../streams/memory.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 using namespace Mordor::Test;
diff --git a/mordor/tests/rate_limiter.cpp b/mordor/tests/rate_limiter.cpp
index bbfbe035..36492562 100644
--- a/mordor/tests/rate_limiter.cpp
+++ b/mordor/tests/rate_limiter.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) 2013 - Cody Cutrer
 
 
-#include "mordor/rate_limiter.h"
-#include "mordor/iomanager.h"
-#include "mordor/sleep.h"
-#include "mordor/test/test.h"
+#include "../rate_limiter.h"
+#include "../iomanager.h"
+#include "../sleep.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 using namespace Mordor::Test;
diff --git a/mordor/tests/run_tests.cpp b/mordor/tests/run_tests.cpp
index 2f837af4..7c182c6c 100644
--- a/mordor/tests/run_tests.cpp
+++ b/mordor/tests/run_tests.cpp
@@ -2,13 +2,13 @@
 
 #include <iostream>
 
-#include "mordor/config.h"
-#include "mordor/main.h"
-#include "mordor/version.h"
-#include "mordor/statistics.h"
-#include "mordor/test/antxmllistener.h"
-#include "mordor/test/compoundlistener.h"
-#include "mordor/test/stdoutlistener.h"
+#include "../config.h"
+#include "../main.h"
+#include "../version.h"
+#include "../statistics.h"
+#include "../test/antxmllistener.h"
+#include "../test/compoundlistener.h"
+#include "../test/stdoutlistener.h"
 
 using namespace Mordor;
 using namespace Mordor::Test;
diff --git a/mordor/tests/scheduler.cpp b/mordor/tests/scheduler.cpp
index c4bb74db..e8bed799 100644
--- a/mordor/tests/scheduler.cpp
+++ b/mordor/tests/scheduler.cpp
@@ -3,13 +3,13 @@
 #include <atomic>
 #include <boost/thread/mutex.hpp>
 
-#include "mordor/fiber.h"
-#include "mordor/iomanager.h"
-#include "mordor/parallel.h"
-#include "mordor/sleep.h"
-#include "mordor/test/test.h"
-#include "mordor/workerpool.h"
-#include "mordor/util.h"
+#include "../fiber.h"
+#include "../iomanager.h"
+#include "../parallel.h"
+#include "../sleep.h"
+#include "../test/test.h"
+#include "../workerpool.h"
+#include "../util.h"
 
 using namespace Mordor;
 using namespace Mordor::Test;
diff --git a/mordor/tests/socket.cpp b/mordor/tests/socket.cpp
index 86c2557b..f3106da0 100644
--- a/mordor/tests/socket.cpp
+++ b/mordor/tests/socket.cpp
@@ -6,11 +6,11 @@
 #include <boost/scoped_array.hpp>
 #include <boost/shared_array.hpp>
 
-#include "mordor/exception.h"
-#include "mordor/fiber.h"
-#include "mordor/iomanager.h"
-#include "mordor/socket.h"
-#include "mordor/test/test.h"
+#include "../exception.h"
+#include "../fiber.h"
+#include "../iomanager.h"
+#include "../socket.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 using namespace Mordor::Test;
diff --git a/mordor/tests/ssl_stream.cpp b/mordor/tests/ssl_stream.cpp
index e67e7140..3703fd61 100644
--- a/mordor/tests/ssl_stream.cpp
+++ b/mordor/tests/ssl_stream.cpp
@@ -1,16 +1,16 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/iomanager.h"
-#include "mordor/parallel.h"
-#include "mordor/streams/buffered.h"
-#include "mordor/streams/hash.h"
-#include "mordor/streams/null.h"
-#include "mordor/streams/pipe.h"
-#include "mordor/streams/random.h"
-#include "mordor/streams/ssl.h"
-#include "mordor/streams/transfer.h"
-#include "mordor/test/test.h"
-#include "mordor/workerpool.h"
+#include "../iomanager.h"
+#include "../parallel.h"
+#include "../streams/buffered.h"
+#include "../streams/hash.h"
+#include "../streams/null.h"
+#include "../streams/pipe.h"
+#include "../streams/random.h"
+#include "../streams/ssl.h"
+#include "../streams/transfer.h"
+#include "../test/test.h"
+#include "../workerpool.h"
 
 using namespace Mordor;
 
diff --git a/mordor/tests/statistics.cpp b/mordor/tests/statistics.cpp
index 3bd47e59..eddbd0b2 100644
--- a/mordor/tests/statistics.cpp
+++ b/mordor/tests/statistics.cpp
@@ -1,5 +1,5 @@
-#include "mordor/statistics.h"
-#include "mordor/test/test.h"
+#include "../statistics.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 
diff --git a/mordor/tests/stream.cpp b/mordor/tests/stream.cpp
index 2293209e..aaeb0879 100644
--- a/mordor/tests/stream.cpp
+++ b/mordor/tests/stream.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2010 - Mozy, Inc.
 
-#include "mordor/streams/stream.h"
-#include "mordor/test/test.h"
+#include "../streams/stream.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 
diff --git a/mordor/tests/string.cpp b/mordor/tests/string.cpp
index 1acbb08d..551350f8 100644
--- a/mordor/tests/string.cpp
+++ b/mordor/tests/string.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2010 - Mozy, Inc.
 
-#include "mordor/string.h"
-#include "mordor/test/test.h"
+#include "../string.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 
diff --git a/mordor/tests/temp_stream.cpp b/mordor/tests/temp_stream.cpp
index 6d31e654..42d90f14 100644
--- a/mordor/tests/temp_stream.cpp
+++ b/mordor/tests/temp_stream.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/streams/temp.h"
-#include "mordor/test/test.h"
+#include "../streams/temp.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 
diff --git a/mordor/tests/thread.cpp b/mordor/tests/thread.cpp
index 8fe8427c..9441539f 100644
--- a/mordor/tests/thread.cpp
+++ b/mordor/tests/thread.cpp
@@ -1,9 +1,9 @@
 // Copyright (c) 2010 - Mozy, Inc.
 
 
-#include "mordor/test/test.h"
-#include "mordor/thread.h"
-#include "mordor/workerpool.h"
+#include "../test/test.h"
+#include "../thread.h"
+#include "../workerpool.h"
 
 using namespace Mordor;
 
diff --git a/mordor/tests/timeout_stream.cpp b/mordor/tests/timeout_stream.cpp
index bf068cd3..3c1b46ad 100644
--- a/mordor/tests/timeout_stream.cpp
+++ b/mordor/tests/timeout_stream.cpp
@@ -2,12 +2,12 @@
 
 #include <functional>
 
-#include "mordor/iomanager.h"
-#include "mordor/streams/buffer.h"
-#include "mordor/streams/delay.h"
-#include "mordor/streams/pipe.h"
-#include "mordor/streams/timeout.h"
-#include "mordor/test/test.h"
+#include "../iomanager.h"
+#include "../streams/buffer.h"
+#include "../streams/delay.h"
+#include "../streams/pipe.h"
+#include "../streams/timeout.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 
diff --git a/mordor/tests/timer.cpp b/mordor/tests/timer.cpp
index a3d7fa0f..1f0d4f87 100644
--- a/mordor/tests/timer.cpp
+++ b/mordor/tests/timer.cpp
@@ -1,9 +1,9 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
 
-#include "mordor/timer.h"
-#include "mordor/workerpool.h"
-#include "mordor/test/test.h"
+#include "../timer.h"
+#include "../workerpool.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 using namespace Mordor::Test;
diff --git a/mordor/tests/transfer_stream.cpp b/mordor/tests/transfer_stream.cpp
index 70035cc2..c2d4ca9d 100644
--- a/mordor/tests/transfer_stream.cpp
+++ b/mordor/tests/transfer_stream.cpp
@@ -1,9 +1,9 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/streams/memory.h"
-#include "mordor/streams/test.h"
-#include "mordor/streams/transfer.h"
-#include "mordor/test/test.h"
+#include "../streams/memory.h"
+#include "../streams/test.h"
+#include "../streams/transfer.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 
diff --git a/mordor/tests/unicode.cpp b/mordor/tests/unicode.cpp
index a83f23ba..bea58643 100644
--- a/mordor/tests/unicode.cpp
+++ b/mordor/tests/unicode.cpp
@@ -1,7 +1,7 @@
-#include "mordor/pch.h"
+#include "../pch.h"
 
-#include "mordor/string.h"
-#include "mordor/test/test.h"
+#include "../string.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 using namespace Mordor::Test;
diff --git a/mordor/tests/uri.cpp b/mordor/tests/uri.cpp
index 75bd258e..d86e0671 100644
--- a/mordor/tests/uri.cpp
+++ b/mordor/tests/uri.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/uri.h"
-#include "mordor/streams/buffer.h"
-#include "mordor/test/test.h"
+#include "../uri.h"
+#include "../streams/buffer.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 using namespace Mordor::Test;
@@ -500,7 +500,7 @@ MORDOR_UNITTEST(URI, userinfoWithColon)
     MORDOR_TEST_ASSERT(uri.authority.hostDefined());
     MORDOR_TEST_ASSERT(uri.authority.host().empty());
     MORDOR_TEST_ASSERT(uri.authority.portDefined());
-    MORDOR_TEST_ASSERT_EQUAL(uri.authority.port(), 15432u);
+    MORDOR_TEST_ASSERT_EQUAL(uri.authority.port(), 15432);
 
     uri = "postgres://:password@/";
     MORDOR_TEST_ASSERT(uri.authority.userinfoDefined());
diff --git a/mordor/tests/util.cpp b/mordor/tests/util.cpp
index d6254101..e0e39f2f 100755
--- a/mordor/tests/util.cpp
+++ b/mordor/tests/util.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
 
-#include "mordor/util.h"
-#include "mordor/test/test.h"
+#include "../util.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 using namespace Mordor::Test;
diff --git a/mordor/tests/xml.cpp b/mordor/tests/xml.cpp
index b9fcff93..c7e0a9ee 100644
--- a/mordor/tests/xml.cpp
+++ b/mordor/tests/xml.cpp
@@ -1,9 +1,9 @@
 // Copyright (c) 2010 - Mozy, Inc.
 
 
-#include "mordor/xml/dom_parser.h"
-#include "mordor/test/test.h"
-#include "mordor/string.h"
+#include "../xml/dom_parser.h"
+#include "../test/test.h"
+#include "../string.h"
 
 using namespace Mordor;
 
diff --git a/mordor/tests/zlib.cpp b/mordor/tests/zlib.cpp
index a431868b..b037c188 100755
--- a/mordor/tests/zlib.cpp
+++ b/mordor/tests/zlib.cpp
@@ -1,18 +1,18 @@
-#include "mordor/pch.h"
+#include "../pch.h"
 
 #ifdef HAVE_CONFIG_H
-#include "autoconfig.h"
+#include "../../autoconfig.h"
 #endif
 
-#include "mordor/exception.h"
+#include "../exception.h"
 
-#include "mordor/streams/deflate.h"
-#include "mordor/streams/gzip.h"
-#include "mordor/streams/lzma2.h"
-#include "mordor/streams/memory.h"
-#include "mordor/streams/singleplex.h"
-#include "mordor/streams/zlib.h"
-#include "mordor/test/test.h"
+#include "../streams/deflate.h"
+#include "../streams/gzip.h"
+#include "../streams/lzma2.h"
+#include "../streams/memory.h"
+#include "../streams/singleplex.h"
+#include "../streams/zlib.h"
+#include "../test/test.h"
 
 using namespace Mordor;
 using namespace Mordor::Test;
diff --git a/mordor/timer.cpp b/mordor/timer.cpp
index b4608a00..20f77e02 100644
--- a/mordor/timer.cpp
+++ b/mordor/timer.cpp
@@ -169,7 +169,7 @@ TimerManager::TimerManager()
   m_previousTime(0ull)
 {}
 
-TimerManager::~TimerManager()
+TimerManager::~TimerManager() noexcept(false)
 {
 #ifndef NDEBUG
     boost::mutex::scoped_lock lock(m_mutex);
diff --git a/mordor/timer.h b/mordor/timer.h
index 3a671f1d..debb0c01 100644
--- a/mordor/timer.h
+++ b/mordor/timer.h
@@ -62,7 +62,7 @@ class TimerManager
 public:
     TimerManager();
     TimerManager(const TimerManager& rhs) = delete;
-    virtual ~TimerManager();
+    virtual ~TimerManager() noexcept(false);
 
     virtual Timer::ptr registerTimer(unsigned long long us,
         std::function<void ()> dg, bool recurring = false);
diff --git a/mordor/uri.h b/mordor/uri.h
index f23b9513..209859ba 100644
--- a/mordor/uri.h
+++ b/mordor/uri.h
@@ -7,7 +7,7 @@
 
 
 #include "assert.h"
-#include "mordor/string.h"
+#include "string.h"
 
 namespace Mordor {
 
diff --git a/mordor/uri.rl b/mordor/uri.rl
index 83d4aa7d..2df00175 100644
--- a/mordor/uri.rl
+++ b/mordor/uri.rl
@@ -3,9 +3,8 @@
    ragel uri.rl -G2 -o uri.cpp
 */
 
-#include "mordor/pch.h"
-
-#include "mordor/uri.h"
+#include "pch.h"
+#include "uri.h"
 
 #include <sstream>
 
diff --git a/mordor/xml/dom_parser.cpp b/mordor/xml/dom_parser.cpp
index 143136cd..d71147e4 100644
--- a/mordor/xml/dom_parser.cpp
+++ b/mordor/xml/dom_parser.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
 #include <boost/algorithm/string.hpp>
-#include "mordor/assert.h"
-#include "mordor/xml/dom_parser.h"
+#include "../assert.h"
+#include "../xml/dom_parser.h"
 
 namespace Mordor {
 namespace DOM {
diff --git a/mordor/xml/dom_parser.h b/mordor/xml/dom_parser.h
index 924b5e2a..8c4f39b1 100644
--- a/mordor/xml/dom_parser.h
+++ b/mordor/xml/dom_parser.h
@@ -2,8 +2,8 @@
 #define __MORDOR_DOM_DOM_PARSER_H__
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/exception.h"
-#include "mordor/xml/parser.h"
+#include "../exception.h"
+#include "../xml/parser.h"
 
 namespace Mordor {
     class Stream;
diff --git a/mordor/xml/parser.h b/mordor/xml/parser.h
index e3da95d0..0832a12b 100644
--- a/mordor/xml/parser.h
+++ b/mordor/xml/parser.h
@@ -3,7 +3,7 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
 
-#include "mordor/ragel.h"
+#include "../ragel.h"
 
 namespace Mordor {
 
diff --git a/mordor/xml/xml_parser.rl b/mordor/xml/xml_parser.rl
index fe616ffa..5149dc09 100644
--- a/mordor/xml/xml_parser.rl
+++ b/mordor/xml/xml_parser.rl
@@ -1,8 +1,8 @@
 // Copyright (c) 2009 - Mozy, Inc.
 
-#include "mordor/pch.h"
+#include "../pch.h"
 
-#include "mordor/xml/parser.h"
+#include "parser.h"
 
 using namespace Mordor;
 
diff --git a/mordor/zip.cpp b/mordor/zip.cpp
index a8cc3a29..e258030c 100644
--- a/mordor/zip.cpp
+++ b/mordor/zip.cpp
@@ -2,16 +2,16 @@
 
 #include "zip.h"
 
-#include "mordor/assert.h"
-#include "mordor/log.h"
-#include "mordor/streams/buffered.h"
-#include "mordor/streams/deflate.h"
-#include "mordor/streams/hash.h"
-#include "mordor/streams/limited.h"
-#include "mordor/streams/notify.h"
-#include "mordor/streams/null.h"
-#include "mordor/streams/singleplex.h"
-#include "mordor/streams/transfer.h"
+#include "assert.h"
+#include "log.h"
+#include "streams/buffered.h"
+#include "streams/deflate.h"
+#include "streams/hash.h"
+#include "streams/limited.h"
+#include "streams/notify.h"
+#include "streams/null.h"
+#include "streams/singleplex.h"
+#include "streams/transfer.h"
 
 namespace {
 #pragma pack(push)