211 files changed, 918 insertions, 8172 deletions

diff --git a/.gitignore b/.gitignore
index 6c800d0..8d35cb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,2 @@
-/.lock-waf*
-/.waf-[0-9]*/
-/build/
-
-.DS_Store
-.DS_Store?
-.Spotlight-V100
-.Trashes
-ehthumbs.db
-Thumbs.db
+__pycache__
+*.pyc
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 8617acd..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1,21 +0,0 @@
-David Robillard <d@drobilla.net>
-
-Contributors:
-
- * Devin Anderson <surfacepatterns@gmail.com>
-   * Fix reparenting of Gtk UIs in Qt
- * Peter Nelson <peter@fuzzle.org>
-   * Fix crash when a broken UI returns a NULL descriptor
- * Filipe Lopes <falktx@gmail.com>
-   * Idle interface fixes for X11 in Qt4
-   * Qt5 in Gtk2 support
- * Robin Gareus <robin@gareus.org>
-   * Support for resizing X11 UIs in Gtk
-   * Cocoa in Gtk wrapper
-   * Numerous Windows fixes
- * Rui Nuno Capela
-   * Fixes for X11 in Qt4
-   * Qt5 wrappers
- * Stefan Westerfeld
-   * Qt5 in Gtk2 support
-   * Initialization API
diff --git a/waflib/Build.py b/Build.py
index 1afcba6..8143dbc 100644
--- a/waflib/Build.py
+++ b/Build.py
@@ -104,7 +104,7 @@ class BuildContext(Context.Context):
 		"""Amount of jobs to run in parallel"""
 
 		self.targets = Options.options.targets
-		"""List of targets to build (default: \*)"""
+		"""List of targets to build (default: \\*)"""
 
 		self.keep = Options.options.keep
 		"""Whether the build should continue past errors"""
@@ -1055,12 +1055,16 @@ class inst(Task.Task):
 		"""
 		Returns the destination path where files will be installed, pre-pending `destdir`.
 
+		Relative paths will be interpreted relative to `PREFIX` if no `destdir` is given.
+
 		:rtype: string
 		"""
 		if isinstance(self.install_to, Node.Node):
 			dest = self.install_to.abspath()
 		else:
-			dest = Utils.subst_vars(self.install_to, self.env)
+			dest = os.path.normpath(Utils.subst_vars(self.install_to, self.env))
+		if not os.path.isabs(dest):
+		    dest = os.path.join(self.env.PREFIX, dest)
 		if destdir and Options.options.destdir:
 			dest = os.path.join(Options.options.destdir, os.path.splitdrive(dest)[1].lstrip(os.sep))
 		return dest
@@ -1314,7 +1318,8 @@ class CleanContext(BuildContext):
 			lst = []
 			for env in self.all_envs.values():
 				lst.extend(self.root.find_or_declare(f) for f in env[CFG_FILES])
-			for n in self.bldnode.ant_glob('**/*', excl='.lock* *conf_check_*/** config.log c4che/*', quiet=True):
+			excluded_dirs = '.lock* *conf_check_*/** config.log %s/*' % CACHE_DIR
+			for n in self.bldnode.ant_glob('**/*', excl=excluded_dirs, quiet=True):
 				if n in lst:
 					continue
 				n.delete()
diff --git a/COPYING b/COPYING
index cc6a925..a4147d2 100644
--- a/COPYING
+++ b/COPYING
@@ -1,13 +1,25 @@
-Copyright 2007-2016 David Robillard <http://drobilla.net>
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/waflib/ConfigSet.py b/ConfigSet.py
index b300bb5..901fba6 100644
--- a/waflib/ConfigSet.py
+++ b/ConfigSet.py
@@ -11,7 +11,7 @@ The values put in :py:class:`ConfigSet` must be serializable (dicts, lists, stri
 
 import copy, re, os
 from waflib import Logs, Utils
-re_imp = re.compile('^(#)*?([^#=]*?)\ =\ (.*?)$', re.M)
+re_imp = re.compile(r'^(#)*?([^#=]*?)\ =\ (.*?)$', re.M)
 
 class ConfigSet(object):
 	"""
@@ -312,7 +312,7 @@ class ConfigSet(object):
 		:type filename: string
 		"""
 		tbl = self.table
-		code = Utils.readf(filename, m='rU')
+		code = Utils.readf(filename, m='r')
 		for m in re_imp.finditer(code):
 			g = m.group
 			tbl[g(2)] = eval(g(3))
diff --git a/waflib/Configure.py b/Configure.py
index d0a4793..db09c0e 100644
--- a/waflib/Configure.py
+++ b/Configure.py
@@ -125,7 +125,7 @@ class ConfigurationContext(Context.Context):
 		self.bldnode.mkdir()
 
 		if not os.path.isdir(self.bldnode.abspath()):
-			conf.fatal('Could not create the build directory %s' % self.bldnode.abspath())
+			self.fatal('Could not create the build directory %s' % self.bldnode.abspath())
 
 	def execute(self):
 		"""
@@ -180,6 +180,7 @@ class ConfigurationContext(Context.Context):
 		env.hash = self.hash
 		env.files = self.files
 		env.environ = dict(self.environ)
+		env.launch_dir = Context.launch_dir
 
 		if not (self.env.NO_LOCK_IN_RUN or env.environ.get('NO_LOCK_IN_RUN') or getattr(Options.options, 'no_lock_in_run')):
 			env.store(os.path.join(Context.run_dir, Options.lockfile))
diff --git a/waflib/Context.py b/Context.py
index bb47c92..876ea46 100644
--- a/waflib/Context.py
+++ b/Context.py
@@ -11,13 +11,13 @@ from waflib import Utils, Errors, Logs
 import waflib.Node
 
 # the following 3 constants are updated on each new release (do not touch)
-HEXVERSION=0x2000b00
+HEXVERSION=0x2000f00
 """Constant updated on new releases"""
 
-WAFVERSION="2.0.11"
+WAFVERSION="2.0.15"
 """Constant updated on new releases"""
 
-WAFREVISION="a97f6fb0941091b4966b625f15ec32fa783a8bec"
+WAFREVISION="503db290b73ef738a495e0d116d6f8ee0b98dcc2"
 """Git revision when the waf version is updated"""
 
 ABI = 20
@@ -266,7 +266,7 @@ class Context(ctx):
 				cache[node] = True
 				self.pre_recurse(node)
 				try:
-					function_code = node.read('rU', encoding)
+					function_code = node.read('r', encoding)
 					exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict)
 				finally:
 					self.post_recurse(node)
@@ -613,7 +613,7 @@ class Context(ctx):
 		is typically called once for a programming language group, see for
 		example :py:mod:`waflib.Tools.compiler_c`
 
-		:param var: glob expression, for example 'cxx\_\*.py'
+		:param var: glob expression, for example 'cxx\\_\\*.py'
 		:type var: string
 		:param ban: list of exact file names to exclude
 		:type ban: list of string
@@ -662,7 +662,7 @@ def load_module(path, encoding=None):
 
 	module = imp.new_module(WSCRIPT_FILE)
 	try:
-		code = Utils.readf(path, m='rU', encoding=encoding)
+		code = Utils.readf(path, m='r', encoding=encoding)
 	except EnvironmentError:
 		raise Errors.WafError('Could not read the file %r' % path)
 
@@ -678,7 +678,7 @@ def load_module(path, encoding=None):
 
 def load_tool(tool, tooldir=None, ctx=None, with_sys_path=True):
 	"""
-	Importx a Waf tool as a python module, and stores it in the dict :py:const:`waflib.Context.Context.tools`
+	Imports a Waf tool as a python module, and stores it in the dict :py:const:`waflib.Context.Context.tools`
 
 	:type  tool: string
 	:param tool: Name of the tool
diff --git a/waflib/Errors.py b/Errors.py
index bf75c1b..bf75c1b 100644
--- a/waflib/Errors.py
+++ b/Errors.py
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 623cddd..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,59 +0,0 @@
-Installation Instructions
-=========================
-
-Basic Installation
-------------------
-
-Building this software requires only Python.  To install with default options:
-
-    ./waf configure
-    ./waf
-    ./waf install
-
-You may need to become root for the install stage, for example:
-
-    sudo ./waf install
-
-Configuration Options
----------------------
-
-All supported options can be viewed using the command:
-
-    ./waf --help
-
-Most options only need to be passed during the configure stage, for example:
-
-    ./waf configure --prefix=/usr
-    ./waf
-    ./waf install
-
-Compiler Configuration
-----------------------
-
-Several standard environment variables can be used to control how compilers are
-invoked:
-
- * CC:        Path to C compiler
- * CFLAGS:    C compiler options
- * CXX:       Path to C++ compiler
- * CXXFLAGS:  C++ compiler options
- * CPPFLAGS:  C preprocessor options
- * LINKFLAGS: Linker options
-
-Installation Directories
-------------------------
-
-The --prefix option (or the PREFIX environment variable) can be used to change
-the prefix which all files are installed under.  There are also several options
-allowing for more fine-tuned control, see the --help output for details.
-
-Packaging
----------
-
-Everything can be installed to a specific root directory by passing a --destdir
-option to the install stage (or setting the DESTDIR environment variable),
-which adds a prefix to all install paths.  For example:
-
-    ./waf configure --prefix=/usr
-    ./waf
-    ./waf install --destdir=/tmp/package
diff --git a/waflib/Logs.py b/Logs.py
index 2a47516..11dc34f 100644
--- a/waflib/Logs.py
+++ b/Logs.py
@@ -276,9 +276,9 @@ def error(*k, **kw):
 
 def warn(*k, **kw):
 	"""
-	Wraps logging.warn
+	Wraps logging.warning
 	"""
-	log.warn(*k, **kw)
+	log.warning(*k, **kw)
 
 def info(*k, **kw):
 	"""
diff --git a/NEWS b/NEWS
deleted file mode 100644
index cfecbe6..0000000
--- a/NEWS
+++ /dev/null
@@ -1,147 +0,0 @@
-suil (0.10.2) stable;
-
-  * Add support for Cocoa in Qt5
-  * Fix resizing and add idle and update rate support for Qt5 in Gtk2
-  * Fix various issues with Qt5 in Gtk2
-
- -- David Robillard <d@drobilla.net>  Thu, 20 Dec 2018 12:22:19 -0500
-
-suil (0.10.0) stable;
-
-  * Add support for X11 in Gtk3
-  * Add support for Qt5 in Gtk2
-  * Add suil_init() to support early initialization and passing any necessary
-    information that may be needed in the future (thanks Stefan Westerfeld)
-  * Fix minor memory errors
-  * Fix building with X11 against custom LV2 install path (thanks Robin Gareus)
-
- -- David Robillard <d@drobilla.net>  Tue, 03 Oct 2017 22:11:49 +0200
-
-suil (0.8.4) stable;
-
-  * Configure based on compiler target OS for cross-compilation
-  * Add Cocoa in Gtk wrapper (patch from Robin Gareus)
-  * Various Windows fixes (patches from Robin Gareus)
-  * Center X11 UIs in Gtk (patch from Robin Gareus)
-  * Fix initial size of resizable X11 UIs in Gtk (patch from Robin Gareus)
-  * Bubble X11 key events up to Gtk parent (patch from Filipe Coelho)
-  * Add Gtk2 and X11 in Qt5 wrappers (patch from Rui Nuno Capela)
-  * Fix compilation with -Wl,--no-undefined
-  * Fix a few minor/unlikely memory errors
-  * Gracefully handle failure to open wrapper
-  * Only report suil_ui_supported() if necessary wrapper is compiled in
-  * Upgrade to waf 1.8.14
-
- -- David Robillard <d@drobilla.net>  Mon, 19 Sep 2016 22:47:44 -0400
-
-suil (0.8.2) stable;
-
-  * Fix embedding several Qt UIs in Gtk
-  * Add configure options to disable all Gtk or Qt support
-  * Upgrade to waf 1.7.16
-
- -- David Robillard <d@drobilla.net>  Fri, 08 Aug 2014 18:18:00 -0400
-
-suil (0.8.0) stable;
-
-  * Add suil_instance_get_handle (patch from Rui Nuno Capela)
-  * Fix compilation errors on some systems
-  * Upgrade to waf 1.7.14
-
- -- David Robillard <d@drobilla.net>  Sat, 04 Jan 2014 16:06:56 -0500
-
-suil (0.6.16) stable;
-
-  * Fix suil_instance_extension_data() for UIs with NULL extension_data
-  * Fix crashes and resizing for X11 in Qt (patch from Rui Nuno Capela)
-
- -- David Robillard <d@drobilla.net>  Mon, 16 Sep 2013 23:48:57 -0400
-
-suil (0.6.14) stable;
-
-  * Print system error message if module fails to load
-  * Lower dependency from Gtk 2.24 introduced in 0.6.12
-  * Add support for new LV2 idle interface
-  * Support resizing for X11 in Gtk (patch from Robin Gareus)
-  * Upgrade to waf 1.7.11
-
- -- David Robillard <d@drobilla.net>  Fri, 09 Aug 2013 00:16:48 -0400
-
-suil (0.6.12) stable;
-
-  * Fix key events for X11 in Gtk without using a troublesome event filter
-  * Fix crash when a broken UI returns a NULL descriptor
-  * Fix compilation on BSD
-
- -- David Robillard <d@drobilla.net>  Fri, 22 Feb 2013 13:03:48 -0500
-
-suil (0.6.10) stable;
-
-  * Downgrade to waf 1.7.5, previous version does not build modules due to
-    package check breakage in waf 1.7.6
-
- -- David Robillard <d@drobilla.net>  Sat, 22 Dec 2012 23:08:06 -0500
-
-suil (0.6.8) stable;
-
-  * Fix crash in x11_in_gtk2 when event_filter fires before widget is realized
-  * Use libgtk-x11-2.0.so.0 (with .0 suffix) by default which is available on
-    systems without the dev package
-  * Update to waf 1.7.8 and autowaf r90 (install docs to versioned directory)
-
- -- David Robillard <d@drobilla.net>  Sat, 22 Dec 2012 21:11:23 -0500
-
-suil (0.6.6) stable;
-
-  * Fix embedding Gtk in Qt as a child widget (support reparenting)
-  * Support for wrapping native Windows UIs in Gtk2
-  * Gracefully handle UIs with no port_event method
-  * Replace host provided features that match Suil implemented features, rather
-    than passing UIs duplicate features
-  * Disable timestamps in HTML documentation for reproducible build
-
- -- David Robillard <d@drobilla.net>  Wed, 14 Nov 2012 11:17:03 -0500
-
-suil (0.6.4) stable;
-
-  * Correctly handle resizing for Gtk2 in Qt4
-  * Improve documentation
-
- -- David Robillard <d@drobilla.net>  Mon, 09 Jul 2012 15:11:06 -0400
-
-suil (0.6.2) stable;
-
-  * Fix crashes when wrapper widget is destroyed by toolkit before
-    suil cleanup function is called
-  * Link Gtk wrappers with 'nodelete' to avoid Glib type errors
-  * Allow run-time configuration of module directory via environment variable
-    SUIL_MODULE_DIR
-
- -- David Robillard <d@drobilla.net>  Thu, 24 May 2012 23:18:18 -0400
-
-suil (0.6.0) stable;
-
-  * Use path variables in pkgconfig files
-  * Add support for embedding X11 UIs (ui:X11UI)
-  * Support new LV2 UI features automatically if provided by host
-
- -- David Robillard <d@drobilla.net>  Wed, 18 Apr 2012 19:32:43 -0400
-
-suil (0.4.4) stable;
-
-  * Fix embedding Gtk2 Qt4 UIs in Qt4 hosts that do not link to Gtk2
-
- -- David Robillard <d@drobilla.net>  Sat, 11 Jun 2011 11:20:11 -0400
-
-suil (0.4.2) stable;
-
-  * Fix compilation issues on some systems
-  * Fix build system Python 3 compatibility
-
- -- David Robillard <d@drobilla.net>  Wed, 25 May 2011 19:00:00 -0400
-
-suil (0.4.0) stable;
-
-  * Initial release
-
- -- David Robillard <d@drobilla.net>  Tue, 24 May 2011 23:00:00 -0400
diff --git a/waflib/Node.py b/Node.py
index 4ac1ea8..4ac1ea8 100644
--- a/waflib/Node.py
+++ b/Node.py
diff --git a/waflib/Options.py b/Options.py
index ad802d4..ad802d4 100644
--- a/waflib/Options.py
+++ b/Options.py
diff --git a/PACKAGING b/PACKAGING
deleted file mode 100644
index 735a1c6..0000000
--- a/PACKAGING
+++ /dev/null
@@ -1,49 +0,0 @@
-These are generic guidelines, but please see below for important Suil specific
-information.
-
-This library is designed to allow parallel installation of different major
-versions.  To facilitate this, the shared library name, include directory, and
-pkg-config file are suffixed with the major version number of the library.
-
-For example, if this library was named "foo" and at version 1.x.y:
-
-/usr/include/foo-1/foo/foo.h
-/usr/lib/foo-1.so.1.x.y
-/usr/lib/pkgconfig/foo-1.pc
-
-Dependencies check for pkg-config name "foo-1" and will build
-against a compatible version 1, regardless any other installed versions.
-
-*** IMPORTANT GUIDELINES FOR PACKAGERS ***
-
-Packages should follow the same conventions as above, i.e. include the major
-version (and only the major version) in the name of the package.  Continuing the
-example above, the package(s) would be named foo-1 and foo-1-dev.  This way,
-if/when version 2 comes out, it may be installed at the same time as version 1
-without breaking anything.
-
-Please do not create packages of this library that do not follow these
-guidelines, you will break things and cause unnecessary headaches.  Please do
-not use any number as a suffix other than the actual major version number of the
-upstream source package.
-
-Because program and documentation names are not versioned, these should be
-included in separate packages which may replace previous versions, since
-there is little use in having parallel installations of them.
-
-*** IMPORTANT GUIDELINES FOR PACKAGING SUIL ***
-
-The purpose of Suil is to abstract plugin UI toolkits away from host code.  To
-achieve this, Suil performs its magic by dynamically loading modules for each
-toolkit.  The main Suil library does NOT depend on any toolkit libraries, and
-thus neither should your package.  Please package the individual modules
-(e.g. libsuil_gtk2_in_qt4.so) as separate packages, which themselves depend on
-the involved toolkits.  These packages should also be versioned as described
-above to support parallel installation.
-
-Please do not make the main Suil package depend on any toolkit package, this
-defeats the purpose of Suil and will severely irritate those who for whatever
-reason do not want a particular toolkit dependency.  The main Suil package may
-have a weak dependency (e.g. "recommends") on the individual wrapper modules,
-and it's fine if these are installed by default, but it must be possible to
-install Suil without installing them if the user explicitly wishes to do so.
diff --git a/README.md b/README.md
index bdfc668..c5361b9 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,24 @@
-Suil
-====
+Autowaf
+=======
 
-Suil is a library for loading and wrapping LV2 plugin UIs.
-For more information, see <http://drobilla.net/software/suil>.
+This is autowaf, a bundle of waf and a few extensions intended to be easy to
+use directly as source code in a project.  Using this as a submodule or subtree
+named `waflib` in a project allows waf to be used without including binary
+encoded data in the waf script.  This gets along with revision control and
+distributions better, among other advantages, without losing
+self-containedness.
 
-With Suil, a host written in one supported toolkit can embed a plugin UI
-written in a different supported toolkit.  Suil insulates hosts from toolkit
-libraries used by plugin UIs.  For example, a Gtk host can embed a Qt UI
-without linking against Qt at compile time.
+To use this in a project, add this repository as a directory named `waflib` in
+the top level of the project, and link or copy `waf` to the top level.
 
- -- David Robillard <d@drobilla.net>
+Two waf extras are also included: `autowaf.py` and `lv2.py`.
+
+The `autowaf.py` module is a kitchen sink of Python utilities for building
+consistent packages, and can be imported in a wcript as
+`waflib.extras.autowaf`.
 
+The `lv2.py` extra defines options for LV2 plugin installation paths.  It can
+be used by calling `opt.load('lv2')` and `conf.load('lv2')` in the appropriate
+locations in a wscript.
+
+ -- David Robillard <d@drobilla.net>
diff --git a/waflib/Runner.py b/Runner.py
index 261084d..5d27669 100644
--- a/waflib/Runner.py
+++ b/Runner.py
@@ -37,6 +37,8 @@ class PriorityTasks(object):
 		return len(self.lst)
 	def __iter__(self):
 		return iter(self.lst)
+	def __str__(self):
+		return 'PriorityTasks: [%s]' % '\n  '.join(str(x) for x in self.lst)
 	def clear(self):
 		self.lst = []
 	def append(self, task):
@@ -181,10 +183,12 @@ class Parallel(object):
 		The reverse dependency graph of dependencies obtained from Task.run_after
 		"""
 
-		self.spawner = Spawner(self)
+		self.spawner = None
 		"""
 		Coordinating daemon thread that spawns thread consumers
 		"""
+		if self.numjobs > 1:
+			self.spawner = Spawner(self)
 
 	def get_next_task(self):
 		"""
@@ -254,6 +258,8 @@ class Parallel(object):
 							self.outstanding.append(x)
 							break
 					else:
+						if self.stop or self.error:
+							break
 						raise Errors.WafError('Broken revdeps detected on %r' % self.incomplete)
 				else:
 					tasks = next(self.biter)
diff --git a/waflib/Scripting.py b/Scripting.py
index 749d4f2..ae17a8b 100644
--- a/waflib/Scripting.py
+++ b/Scripting.py
@@ -216,7 +216,10 @@ def parse_options():
 	ctx = Context.create_context('options')
 	ctx.execute()
 	if not Options.commands:
-		Options.commands.append(default_cmd)
+		if isinstance(default_cmd, list):
+			Options.commands.extend(default_cmd)
+		else:
+			Options.commands.append(default_cmd)
 	if Options.options.whelp:
 		ctx.parser.print_help()
 		sys.exit(0)
@@ -280,7 +283,7 @@ def distclean_dir(dirname):
 			pass
 
 	try:
-		shutil.rmtree('c4che')
+		shutil.rmtree(Build.CACHE_DIR)
 	except OSError:
 		pass
 
@@ -598,12 +601,15 @@ def autoconfigure(execute_method):
 			cmd = env.config_cmd or 'configure'
 			if Configure.autoconfig == 'clobber':
 				tmp = Options.options.__dict__
+				launch_dir_tmp = Context.launch_dir
 				if env.options:
 					Options.options.__dict__ = env.options
+				Context.launch_dir = env.launch_dir
 				try:
 					run_command(cmd)
 				finally:
 					Options.options.__dict__ = tmp
+					Context.launch_dir = launch_dir_tmp
 			else:
 				run_command(cmd)
 			run_command(self.cmd)
diff --git a/waflib/Task.py b/Task.py
index 0fc449d..cb49a73 100644
--- a/waflib/Task.py
+++ b/Task.py
@@ -50,6 +50,9 @@ def f(tsk):
 	bld = gen.bld
 	cwdx = tsk.get_cwd()
 	p = env.get_flat
+	def to_list(xx):
+		if isinstance(xx, str): return [xx]
+		return xx
 	tsk.last_cmd = cmd = \'\'\' %s \'\'\' % s
 	return tsk.exec_command(cmd, cwd=cwdx, env=env.env or None)
 '''
@@ -77,7 +80,8 @@ def f(tsk):
 
 COMPILE_TEMPLATE_SIG_VARS = '''
 def f(tsk):
-	super(tsk.__class__, tsk).sig_vars()
+	sig = tsk.generator.bld.hash_env_vars(tsk.env, tsk.vars)
+	tsk.m.update(sig)
 	env = tsk.env
 	gen = tsk.generator
 	bld = gen.bld
@@ -159,10 +163,10 @@ class Task(evil):
 	"""File extensions that objects of this task class may create"""
 
 	before = []
-	"""List of task class names to execute before instances of this class"""
+	"""The instances of this class are executed before the instances of classes whose names are in this list"""
 
 	after = []
-	"""List of task class names to execute after instances of this class"""
+	"""The instances of this class are executed after the instances of classes whose names are in this list"""
 
 	hcode = Utils.SIG_NIL
 	"""String representing an additional hash for the class representation"""
@@ -302,25 +306,31 @@ class Task(evil):
 		if hasattr(self, 'stderr'):
 			kw['stderr'] = self.stderr
 
-		# workaround for command line length limit:
-		# http://support.microsoft.com/kb/830473
-		if not isinstance(cmd, str) and (len(repr(cmd)) >= 8192 if Utils.is_win32 else len(cmd) > 200000):
-			cmd, args = self.split_argfile(cmd)
-			try:
-				(fd, tmp) = tempfile.mkstemp()
-				os.write(fd, '\r\n'.join(args).encode())
-				os.close(fd)
-				if Logs.verbose:
-					Logs.debug('argfile: @%r -> %r', tmp, args)
-				return self.generator.bld.exec_command(cmd + ['@' + tmp], **kw)
-			finally:
+		if not isinstance(cmd, str):
+			if Utils.is_win32:
+				# win32 compares the resulting length http://support.microsoft.com/kb/830473
+				too_long = sum([len(arg) for arg in cmd]) + len(cmd) > 8192
+			else:
+				# non-win32 counts the amount of arguments (200k)
+				too_long = len(cmd) > 200000
+
+			if too_long and getattr(self, 'allow_argsfile', True):
+				# Shunt arguments to a temporary file if the command is too long.
+				cmd, args = self.split_argfile(cmd)
 				try:
-					os.remove(tmp)
-				except OSError:
-					# anti-virus and indexers can keep files open -_-
-					pass
-		else:
-			return self.generator.bld.exec_command(cmd, **kw)
+					(fd, tmp) = tempfile.mkstemp()
+					os.write(fd, '\r\n'.join(args).encode())
+					os.close(fd)
+					if Logs.verbose:
+						Logs.debug('argfile: @%r -> %r', tmp, args)
+					return self.generator.bld.exec_command(cmd + ['@' + tmp], **kw)
+				finally:
+					try:
+						os.remove(tmp)
+					except OSError:
+						# anti-virus and indexers can keep files open -_-
+						pass
+		return self.generator.bld.exec_command(cmd, **kw)
 
 	def process(self):
 		"""
@@ -776,6 +786,8 @@ class Task(evil):
 		Used by :py:meth:`waflib.Task.Task.signature`; it hashes :py:attr:`waflib.Task.Task.env` variables/values
 		When overriding this method, and if scriptlet expressions are used, make sure to follow
 		the code in :py:meth:`waflib.Task.Task.compile_sig_vars` to enable dependencies on scriptlet results.
+
+		This method may be replaced on subclasses by the metaclass to force dependencies on scriptlet code.
 		"""
 		sig = self.generator.bld.hash_env_vars(self.env, self.vars)
 		self.m.update(sig)
@@ -1038,7 +1050,7 @@ def funex(c):
 	exec(c, dc)
 	return dc['f']
 
-re_cond = re.compile('(?P<var>\w+)|(?P<or>\|)|(?P<and>&)')
+re_cond = re.compile(r'(?P<var>\w+)|(?P<or>\|)|(?P<and>&)')
 re_novar = re.compile(r'^(SRC|TGT)\W+.*?$')
 reg_act = re.compile(r'(?P<backslash>\\)|(?P<dollar>\$\$)|(?P<subst>\$\{(?P<var>\w+)(?P<code>.*?)\})', re.M)
 def compile_fun_shell(line):
@@ -1193,7 +1205,7 @@ def compile_fun_noshell(line):
 					# plain code such as ${tsk.inputs[0].abspath()}
 					call = '%s%s' % (var, code)
 					add_dvar(call)
-					app('gen.to_list(%s)' % call)
+					app('to_list(%s)' % call)
 			else:
 				# a plain variable such as # a plain variable like ${AR}
 				app('to_list(env[%r])' % var)
diff --git a/waflib/TaskGen.py b/TaskGen.py
index a74e643..532b7d5 100644
--- a/waflib/TaskGen.py
+++ b/TaskGen.py
@@ -74,7 +74,7 @@ class task_gen(object):
 		else:
 			self.bld = kw['bld']
 			self.env = self.bld.env.derive()
-			self.path = self.bld.path # emulate chdir when reading scripts
+			self.path = kw.get('path', self.bld.path) # by default, emulate chdir when reading scripts
 
 			# Provide a unique index per folder
 			# This is part of a measure to prevent output file name collisions
@@ -727,7 +727,7 @@ def sequence_order(self):
 	self.bld.prev = self
 
 
-re_m4 = re.compile('@(\w+)@', re.M)
+re_m4 = re.compile(r'@(\w+)@', re.M)
 
 class subst_pc(Task.Task):
 	"""
diff --git a/waflib/Tools/__init__.py b/Tools/__init__.py
index 079df35..079df35 100644
--- a/waflib/Tools/__init__.py
+++ b/Tools/__init__.py
diff --git a/waflib/Tools/ar.py b/Tools/ar.py
index b39b645..b39b645 100644
--- a/waflib/Tools/ar.py
+++ b/Tools/ar.py
diff --git a/waflib/Tools/asm.py b/Tools/asm.py
index b6f26fb..b6f26fb 100644
--- a/waflib/Tools/asm.py
+++ b/Tools/asm.py
diff --git a/waflib/Tools/bison.py b/Tools/bison.py
index eef56dc..eef56dc 100644
--- a/waflib/Tools/bison.py
+++ b/Tools/bison.py
diff --git a/waflib/Tools/c.py b/Tools/c.py
index effd6b6..effd6b6 100644
--- a/waflib/Tools/c.py
+++ b/Tools/c.py
diff --git a/waflib/Tools/c_aliases.py b/Tools/c_aliases.py
index c9d5369..c9d5369 100644
--- a/waflib/Tools/c_aliases.py
+++ b/Tools/c_aliases.py
diff --git a/waflib/Tools/c_config.py b/Tools/c_config.py
index d2b3c0d..d546be9 100644
--- a/waflib/Tools/c_config.py
+++ b/Tools/c_config.py
@@ -250,9 +250,9 @@ def exec_cfg(self, kw):
 	:type atleast_pkgconfig_version: string
 	:param package: package name, for example *gtk+-2.0*
 	:type package: string
-	:param uselib_store: if the test is successful, define HAVE\_*name*. It is also used to define *conf.env.FLAGS_name* variables.
+	:param uselib_store: if the test is successful, define HAVE\\_*name*. It is also used to define *conf.env.FLAGS_name* variables.
 	:type uselib_store: string
-	:param modversion: if provided, return the version of the given module and define *name*\_VERSION
+	:param modversion: if provided, return the version of the given module and define *name*\\_VERSION
 	:type modversion: string
 	:param args: arguments to give to *package* when retrieving flags
 	:type args: list of string
diff --git a/waflib/Tools/c_osx.py b/Tools/c_osx.py
index f70b128..f70b128 100644
--- a/waflib/Tools/c_osx.py
+++ b/Tools/c_osx.py
diff --git a/waflib/Tools/c_preproc.py b/Tools/c_preproc.py
index 7e04b4a..68e5f5a 100644
--- a/waflib/Tools/c_preproc.py
+++ b/Tools/c_preproc.py
@@ -75,13 +75,13 @@ re_lines = re.compile(
 	re.IGNORECASE | re.MULTILINE)
 """Match #include lines"""
 
-re_mac = re.compile("^[a-zA-Z_]\w*")
+re_mac = re.compile(r"^[a-zA-Z_]\w*")
 """Match macro definitions"""
 
 re_fun = re.compile('^[a-zA-Z_][a-zA-Z0-9_]*[(]')
 """Match macro functions"""
 
-re_pragma_once = re.compile('^\s*once\s*', re.IGNORECASE)
+re_pragma_once = re.compile(r'^\s*once\s*', re.IGNORECASE)
 """Match #pragma once statements"""
 
 re_nl = re.compile('\\\\\r*\n', re.MULTILINE)
@@ -660,7 +660,7 @@ def extract_macro(txt):
 			# empty define, assign an empty token
 			return (v, [[], [('T','')]])
 
-re_include = re.compile('^\s*(<(?:.*)>|"(?:.*)")')
+re_include = re.compile(r'^\s*(<(?:.*)>|"(?:.*)")')
 def extract_include(txt, defs):
 	"""
 	Process a line in the form::
diff --git a/waflib/Tools/c_tests.py b/Tools/c_tests.py
index f858df5..f858df5 100644
--- a/waflib/Tools/c_tests.py
+++ b/Tools/c_tests.py
diff --git a/waflib/Tools/ccroot.py b/Tools/ccroot.py
index cfef8bf..579d5b2 100644
--- a/waflib/Tools/ccroot.py
+++ b/Tools/ccroot.py
@@ -111,7 +111,7 @@ def apply_incpaths(self):
 		tg = bld(features='includes', includes='.')
 
 	The folders only need to be relative to the current directory, the equivalent build directory is
-	added automatically (for headers created in the build directory). This enable using a build directory
+	added automatically (for headers created in the build directory). This enables using a build directory
 	or not (``top == out``).
 
 	This method will add a list of nodes read by :py:func:`waflib.Tools.ccroot.to_incnodes` in ``tg.env.INCPATHS``,
@@ -238,6 +238,17 @@ def rm_tgt(cls):
 	setattr(cls, 'run', wrap)
 rm_tgt(stlink_task)
 
+@feature('skip_stlib_link_deps')
+@before_method('process_use')
+def apply_skip_stlib_link_deps(self):
+	"""
+	This enables an optimization in the :py:func:wafilb.Tools.ccroot.processes_use: method that skips dependency and
+	link flag optimizations for targets that generate static libraries (via the :py:class:Tools.ccroot.stlink_task task).
+	The actual behavior is implemented in :py:func:wafilb.Tools.ccroot.processes_use: method so this feature only tells waf
+	to enable the new behavior.
+	"""
+	self.env.SKIP_STLIB_LINK_DEPS = True
+
 @feature('c', 'cxx', 'd', 'fc', 'asm')
 @after_method('process_source')
 def apply_link(self):
@@ -386,7 +397,11 @@ def process_use(self):
 		y = self.bld.get_tgen_by_name(x)
 		var = y.tmp_use_var
 		if var and link_task:
-			if var == 'LIB' or y.tmp_use_stlib or x in names:
+			if self.env.SKIP_STLIB_LINK_DEPS and isinstance(link_task, stlink_task):
+				# If the skip_stlib_link_deps feature is enabled then we should
+				# avoid adding lib deps to the stlink_task instance.
+				pass
+			elif var == 'LIB' or y.tmp_use_stlib or x in names:
 				self.env.append_value(var, [y.target[y.target.rfind(os.sep) + 1:]])
 				self.link_task.dep_nodes.extend(y.link_task.outputs)
 				tmp_path = y.link_task.outputs[0].parent.path_from(self.get_cwd())
diff --git a/waflib/Tools/clang.py b/Tools/clang.py
index 3828e39..3828e39 100644
--- a/waflib/Tools/clang.py
+++ b/Tools/clang.py
diff --git a/waflib/Tools/clangxx.py b/Tools/clangxx.py
index 152013c..152013c 100644
--- a/waflib/Tools/clangxx.py
+++ b/Tools/clangxx.py
diff --git a/waflib/Tools/compiler_c.py b/Tools/compiler_c.py
index 2dba3f8..2dba3f8 100644
--- a/waflib/Tools/compiler_c.py
+++ b/Tools/compiler_c.py
diff --git a/waflib/Tools/compiler_cxx.py b/Tools/compiler_cxx.py
index 1af65a2..1af65a2 100644
--- a/waflib/Tools/compiler_cxx.py
+++ b/Tools/compiler_cxx.py
diff --git a/waflib/Tools/compiler_d.py b/Tools/compiler_d.py
index 43bb1f6..43bb1f6 100644
--- a/waflib/Tools/compiler_d.py
+++ b/Tools/compiler_d.py
diff --git a/waflib/Tools/compiler_fc.py b/Tools/compiler_fc.py
index 96b58e7..96b58e7 100644
--- a/waflib/Tools/compiler_fc.py
+++ b/Tools/compiler_fc.py
diff --git a/waflib/Tools/cs.py b/Tools/cs.py
index aecca6d..aecca6d 100644
--- a/waflib/Tools/cs.py
+++ b/Tools/cs.py
diff --git a/waflib/Tools/cxx.py b/Tools/cxx.py
index 194fad7..194fad7 100644
--- a/waflib/Tools/cxx.py
+++ b/Tools/cxx.py
diff --git a/waflib/Tools/d.py b/Tools/d.py
index e4cf73b..e4cf73b 100644
--- a/waflib/Tools/d.py
+++ b/Tools/d.py
diff --git a/waflib/Tools/d_config.py b/Tools/d_config.py
index 6637556..6637556 100644
--- a/waflib/Tools/d_config.py
+++ b/Tools/d_config.py
diff --git a/waflib/Tools/d_scan.py b/Tools/d_scan.py
index 14c6c31..4e807a6 100644
--- a/waflib/Tools/d_scan.py
+++ b/Tools/d_scan.py
@@ -93,8 +93,8 @@ class d_parser(object):
 
 		self.allnames = []
 
-		self.re_module = re.compile("module\s+([^;]+)")
-		self.re_import = re.compile("import\s+([^;]+)")
+		self.re_module = re.compile(r"module\s+([^;]+)")
+		self.re_import = re.compile(r"import\s+([^;]+)")
 		self.re_import_bindings = re.compile("([^:]+):(.*)")
 		self.re_import_alias = re.compile("[^=]+=(.+)")
 
@@ -138,7 +138,7 @@ class d_parser(object):
 
 		mod_name = self.re_module.search(code)
 		if mod_name:
-			self.module = re.sub('\s+', '', mod_name.group(1)) # strip all whitespaces
+			self.module = re.sub(r'\s+', '', mod_name.group(1)) # strip all whitespaces
 
 		# go through the code, have a look at all import occurrences
 
@@ -146,7 +146,7 @@ class d_parser(object):
 		import_iterator = self.re_import.finditer(code)
 		if import_iterator:
 			for import_match in import_iterator:
-				import_match_str = re.sub('\s+', '', import_match.group(1)) # strip all whitespaces
+				import_match_str = re.sub(r'\s+', '', import_match.group(1)) # strip all whitespaces
 
 				# does this end with an import bindings declaration?
 				# (import bindings always terminate the list of imports)
diff --git a/waflib/Tools/dbus.py b/Tools/dbus.py
index d520f1c..d520f1c 100644
--- a/waflib/Tools/dbus.py
+++ b/Tools/dbus.py
diff --git a/waflib/Tools/dmd.py b/Tools/dmd.py
index 8917ca1..8917ca1 100644
--- a/waflib/Tools/dmd.py
+++ b/Tools/dmd.py
diff --git a/waflib/Tools/errcheck.py b/Tools/errcheck.py
index de8d75a..de8d75a 100644
--- a/waflib/Tools/errcheck.py
+++ b/Tools/errcheck.py
diff --git a/waflib/Tools/fc.py b/Tools/fc.py
index d9e8d8c..fd4d39c 100644
--- a/waflib/Tools/fc.py
+++ b/Tools/fc.py
@@ -28,10 +28,24 @@ def modfile(conf, name):
 	Turns a module name into the right module file name.
 	Defaults to all lower case.
 	"""
-	return {'lower'     :name.lower() + '.mod',
-		'lower.MOD' :name.lower() + '.MOD',
-		'UPPER.mod' :name.upper() + '.mod',
-		'UPPER'     :name.upper() + '.MOD'}[conf.env.FC_MOD_CAPITALIZATION or 'lower']
+	if name.find(':') >= 0:
+		# Depending on a submodule!
+		separator = conf.env.FC_SUBMOD_SEPARATOR or '@'
+		# Ancestors of the submodule will be prefixed to the
+		# submodule name, separated by a colon.
+		modpath = name.split(':')
+		# Only the ancestor (actual) module and the submodule name
+		# will be used for the filename.
+		modname = modpath[0] + separator + modpath[-1]
+		suffix = conf.env.FC_SUBMOD_SUFFIX or '.smod'
+	else:
+		modname = name
+		suffix = '.mod'
+
+	return {'lower'     :modname.lower() + suffix.lower(),
+		'lower.MOD' :modname.lower() + suffix.upper(),
+		'UPPER.mod' :modname.upper() + suffix.lower(),
+		'UPPER'     :modname.upper() + suffix.upper()}[conf.env.FC_MOD_CAPITALIZATION or 'lower']
 
 def get_fortran_tasks(tsk):
 	"""
diff --git a/waflib/Tools/fc_config.py b/Tools/fc_config.py
index 222f3a5..dc5e5c9 100644
--- a/waflib/Tools/fc_config.py
+++ b/Tools/fc_config.py
@@ -178,8 +178,8 @@ def check_fortran_dummy_main(self, *k, **kw):
 # ------------------------------------------------------------------------
 
 GCC_DRIVER_LINE = re.compile('^Driving:')
-POSIX_STATIC_EXT = re.compile('\S+\.a')
-POSIX_LIB_FLAGS = re.compile('-l\S+')
+POSIX_STATIC_EXT = re.compile(r'\S+\.a')
+POSIX_LIB_FLAGS = re.compile(r'-l\S+')
 
 @conf
 def is_link_verbose(self, txt):
diff --git a/waflib/Tools/fc_scan.py b/Tools/fc_scan.py
index 12cb0fc..0824c92 100644
--- a/waflib/Tools/fc_scan.py
+++ b/Tools/fc_scan.py
@@ -5,13 +5,15 @@
 
 import re
 
-INC_REGEX = """(?:^|['">]\s*;)\s*(?:|#\s*)INCLUDE\s+(?:\w+_)?[<"'](.+?)(?=["'>])"""
-USE_REGEX = """(?:^|;)\s*USE(?:\s+|(?:(?:\s*,\s*(?:NON_)?INTRINSIC)?\s*::))\s*(\w+)"""
-MOD_REGEX = """(?:^|;)\s*MODULE(?!\s*PROCEDURE)(?:\s+|(?:(?:\s*,\s*(?:NON_)?INTRINSIC)?\s*::))\s*(\w+)"""
+INC_REGEX = r"""(?:^|['">]\s*;)\s*(?:|#\s*)INCLUDE\s+(?:\w+_)?[<"'](.+?)(?=["'>])"""
+USE_REGEX = r"""(?:^|;)\s*USE(?:\s+|(?:(?:\s*,\s*(?:NON_)?INTRINSIC)?\s*::))\s*(\w+)"""
+MOD_REGEX = r"""(?:^|;)\s*MODULE(?!\s+(?:PROCEDURE|SUBROUTINE|FUNCTION))\s+(\w+)"""
+SMD_REGEX = r"""(?:^|;)\s*SUBMODULE\s*\(([\w:]+)\)\s*(\w+)"""
 
 re_inc = re.compile(INC_REGEX, re.I)
 re_use = re.compile(USE_REGEX, re.I)
 re_mod = re.compile(MOD_REGEX, re.I)
+re_smd = re.compile(SMD_REGEX, re.I)
 
 class fortran_parser(object):
 	"""
@@ -58,6 +60,10 @@ class fortran_parser(object):
 			m = re_mod.search(line)
 			if m:
 				mods.append(m.group(1))
+			m = re_smd.search(line)
+			if m:
+				uses.append(m.group(1))
+				mods.append('{0}:{1}'.format(m.group(1),m.group(2)))
 		return (incs, uses, mods)
 
 	def start(self, node):
diff --git a/waflib/Tools/flex.py b/Tools/flex.py
index 2256657..2256657 100644
--- a/waflib/Tools/flex.py
+++ b/Tools/flex.py
diff --git a/waflib/Tools/g95.py b/Tools/g95.py
index f69ba4f..f69ba4f 100644
--- a/waflib/Tools/g95.py
+++ b/Tools/g95.py
diff --git a/waflib/Tools/gas.py b/Tools/gas.py
index 77afed7..77afed7 100644
--- a/waflib/Tools/gas.py
+++ b/Tools/gas.py
diff --git a/waflib/Tools/gcc.py b/Tools/gcc.py
index acdd473..acdd473 100644
--- a/waflib/Tools/gcc.py
+++ b/Tools/gcc.py
diff --git a/waflib/Tools/gdc.py b/Tools/gdc.py
index d89a66d..d89a66d 100644
--- a/waflib/Tools/gdc.py
+++ b/Tools/gdc.py
diff --git a/waflib/Tools/gfortran.py b/Tools/gfortran.py
index 1050667..1050667 100644
--- a/waflib/Tools/gfortran.py
+++ b/Tools/gfortran.py
diff --git a/waflib/Tools/glib2.py b/Tools/glib2.py
index 949fe37..949fe37 100644
--- a/waflib/Tools/glib2.py
+++ b/Tools/glib2.py
diff --git a/waflib/Tools/gnu_dirs.py b/Tools/gnu_dirs.py
index 2847071..2847071 100644
--- a/waflib/Tools/gnu_dirs.py
+++ b/Tools/gnu_dirs.py
diff --git a/waflib/Tools/gxx.py b/Tools/gxx.py
index 22c5d26..22c5d26 100644
--- a/waflib/Tools/gxx.py
+++ b/Tools/gxx.py
diff --git a/waflib/Tools/icc.py b/Tools/icc.py
index b6492c8..b6492c8 100644
--- a/waflib/Tools/icc.py
+++ b/Tools/icc.py
diff --git a/waflib/Tools/icpc.py b/Tools/icpc.py
index 8a6cc6c..8a6cc6c 100644
--- a/waflib/Tools/icpc.py
+++ b/Tools/icpc.py
diff --git a/waflib/Tools/ifort.py b/Tools/ifort.py
index 74934f3..17d3052 100644
--- a/waflib/Tools/ifort.py
+++ b/Tools/ifort.py
@@ -107,7 +107,7 @@ def gather_ifort_versions(conf, versions):
 	"""
 	List compiler versions by looking up registry keys
 	"""
-	version_pattern = re.compile('^...?.?\....?.?')
+	version_pattern = re.compile(r'^...?.?\....?.?')
 	try:
 		all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Intel\\Compilers\\Fortran')
 	except OSError:
diff --git a/waflib/Tools/intltool.py b/Tools/intltool.py
index af95ba8..af95ba8 100644
--- a/waflib/Tools/intltool.py
+++ b/Tools/intltool.py
diff --git a/waflib/Tools/irixcc.py b/Tools/irixcc.py
index c3ae1ac..c3ae1ac 100644
--- a/waflib/Tools/irixcc.py
+++ b/Tools/irixcc.py
diff --git a/waflib/Tools/javaw.py b/Tools/javaw.py
index f6fd20c..9daed39 100644
--- a/waflib/Tools/javaw.py
+++ b/Tools/javaw.py
@@ -24,12 +24,95 @@ You would have to run::
    java -jar /path/to/jython.jar waf configure
 
 [1] http://www.jython.org/
+
+Usage
+=====
+
+Load the "java" tool.
+
+def configure(conf):
+	conf.load('java')
+
+Java tools will be autodetected and eventually, if present, the quite
+standard JAVA_HOME environment variable will be used. The also standard
+CLASSPATH variable is used for library searching.
+
+In configuration phase checks can be done on the system environment, for
+example to check if a class is known in the classpath::
+
+	conf.check_java_class('java.io.FileOutputStream')
+
+or if the system supports JNI applications building::
+
+	conf.check_jni_headers()
+
+
+The java tool supports compiling java code, creating jar files and
+creating javadoc documentation. This can be either done separately or
+together in a single definition. For example to manage them separately::
+
+	bld(features  = 'javac',
+		srcdir    = 'src',
+		compat    = '1.7',
+		use       = 'animals',
+		name      = 'cats-src',
+	)
+
+	bld(features  = 'jar',
+		basedir   = '.',
+		destfile  = '../cats.jar',
+		name      = 'cats',
+		use       = 'cats-src'
+	)
+
+
+Or together by defining all the needed attributes::
+
+	bld(features   = 'javac jar javadoc',
+		srcdir     = 'src/',  # folder containing the sources to compile
+		outdir     = 'src',   # folder where to output the classes (in the build directory)
+		compat     = '1.6',   # java compatibility version number
+		classpath  = ['.', '..'],
+
+		# jar
+		basedir    = 'src', # folder containing the classes and other files to package (must match outdir)
+		destfile   = 'foo.jar', # do not put the destfile in the folder of the java classes!
+		use        = 'NNN',
+		jaropts    = ['-C', 'default/src/', '.'], # can be used to give files
+		manifest   = 'src/Manifest.mf', # Manifest file to include
+
+		# javadoc
+		javadoc_package = ['com.meow' , 'com.meow.truc.bar', 'com.meow.truc.foo'],
+		javadoc_output  = 'javadoc',
+	)
+
+External jar dependencies can be mapped to a standard waf "use" dependency by
+setting an environment variable with a CLASSPATH prefix in the configuration,
+for example::
+
+	conf.env.CLASSPATH_NNN = ['aaaa.jar', 'bbbb.jar']
+
+and then NNN can be freely used in rules as::
+
+	use        = 'NNN',
+
+In the java tool the dependencies via use are not transitive by default, as
+this necessity depends on the code. To enable recursive dependency scanning
+use on a specific rule:
+
+		recurse_use = True
+
+Or build-wise by setting RECURSE_JAVA:
+
+		bld.env.RECURSE_JAVA = True
+
+Unit tests can be integrated in the waf unit test environment using the javatest extra.
 """
 
 import os, shutil
 from waflib import Task, Utils, Errors, Node
 from waflib.Configure import conf
-from waflib.TaskGen import feature, before_method, after_method
+from waflib.TaskGen import feature, before_method, after_method, taskgen_method
 
 from waflib.Tools import ccroot
 ccroot.USELIB_VARS['javac'] = set(['CLASSPATH', 'JAVACFLAGS'])
@@ -107,6 +190,32 @@ def apply_java(self):
 	if names:
 		tsk.env.append_value('JAVACFLAGS', ['-sourcepath', names])
 
+
+@taskgen_method
+def java_use_rec(self, name, **kw):
+	"""
+	Processes recursively the *use* attribute for each referred java compilation
+	"""
+	if name in self.tmp_use_seen:
+		return
+
+	self.tmp_use_seen.append(name)
+
+	try:
+		y = self.bld.get_tgen_by_name(name)
+	except Errors.WafError:
+		self.uselib.append(name)
+		return
+	else:
+		y.post()
+		# Add generated JAR name for CLASSPATH. Task ordering (set_run_after)
+		# is already guaranteed by ordering done between the single tasks
+		if hasattr(y, 'jar_task'):
+			self.use_lst.append(y.jar_task.outputs[0].abspath())
+
+	for x in self.to_list(getattr(y, 'use', [])):
+		self.java_use_rec(x)
+
 @feature('javac')
 @before_method('propagate_uselib_vars')
 @after_method('apply_java')
@@ -114,7 +223,8 @@ def use_javac_files(self):
 	"""
 	Processes the *use* attribute referring to other java compilations
 	"""
-	lst = []
+	self.use_lst = []
+	self.tmp_use_seen = []
 	self.uselib = self.to_list(getattr(self, 'uselib', []))
 	names = self.to_list(getattr(self, 'use', []))
 	get = self.bld.get_tgen_by_name
@@ -126,12 +236,17 @@ def use_javac_files(self):
 		else:
 			y.post()
 			if hasattr(y, 'jar_task'):
-				lst.append(y.jar_task.outputs[0].abspath())
+				self.use_lst.append(y.jar_task.outputs[0].abspath())
 				self.javac_task.set_run_after(y.jar_task)
 			else:
 				for tsk in y.tasks:
 					self.javac_task.set_run_after(tsk)
-	self.env.append_value('CLASSPATH', lst)
+
+		# If recurse use scan is enabled recursively add use attribute for each used one
+		if getattr(self, 'recurse_use', False) or self.bld.env.RECURSE_JAVA:
+			self.java_use_rec(x)
+
+	self.env.append_value('CLASSPATH', self.use_lst)
 
 @feature('javac')
 @after_method('apply_java', 'propagate_uselib_vars', 'use_javac_files')
@@ -245,7 +360,7 @@ class jar_create(JTask):
 				return Task.ASK_LATER
 		if not self.inputs:
 			try:
-				self.inputs = [x for x in self.basedir.ant_glob(JAR_RE, remove=False) if id(x) != id(self.outputs[0])]
+				self.inputs = [x for x in self.basedir.ant_glob(JAR_RE, remove=False, quiet=True) if id(x) != id(self.outputs[0])]
 			except Exception:
 				raise Errors.WafError('Could not find the basedir %r for %r' % (self.basedir, self))
 		return super(jar_create, self).runnable_status()
@@ -279,14 +394,14 @@ class javac(JTask):
 			self.inputs  = []
 			for x in self.srcdir:
 				if x.exists():
-					self.inputs.extend(x.ant_glob(SOURCE_RE, remove=False))
+					self.inputs.extend(x.ant_glob(SOURCE_RE, remove=False, quiet=True))
 		return super(javac, self).runnable_status()
 
 	def post_run(self):
 		"""
 		List class files created
 		"""
-		for node in self.generator.outdir.ant_glob('**/*.class'):
+		for node in self.generator.outdir.ant_glob('**/*.class', quiet=True):
 			self.generator.bld.node_sigs[node] = self.uid()
 		self.generator.bld.task_sigs[self.uid()] = self.cache_sig
 
@@ -338,7 +453,7 @@ class javadoc(Task.Task):
 		self.generator.bld.cmd_and_log(lst, cwd=wd, env=env.env or None, quiet=0)
 
 	def post_run(self):
-		nodes = self.generator.javadoc_output.ant_glob('**')
+		nodes = self.generator.javadoc_output.ant_glob('**', quiet=True)
 		for node in nodes:
 			self.generator.bld.node_sigs[node] = self.uid()
 		self.generator.bld.task_sigs[self.uid()] = self.cache_sig
diff --git a/waflib/Tools/ldc2.py b/Tools/ldc2.py
index a51c344..a51c344 100644
--- a/waflib/Tools/ldc2.py
+++ b/Tools/ldc2.py
diff --git a/waflib/Tools/lua.py b/Tools/lua.py
index 15a333a..15a333a 100644
--- a/waflib/Tools/lua.py
+++ b/Tools/lua.py
diff --git a/waflib/Tools/md5_tstamp.py b/Tools/md5_tstamp.py
index 6428e46..2a58792 100644
--- a/waflib/Tools/md5_tstamp.py
+++ b/Tools/md5_tstamp.py
@@ -2,8 +2,7 @@
 # encoding: utf-8
 
 """
-Re-calculate md5 hashes of files only when the file times or the file
-size have changed.
+Re-calculate md5 hashes of files only when the file time have changed.
 
 The hashes can also reflect either the file contents (STRONGEST=True) or the
 file time and file size.
diff --git a/waflib/Tools/msvc.py b/Tools/msvc.py
index 17b347d..ff58449 100644
--- a/waflib/Tools/msvc.py
+++ b/Tools/msvc.py
@@ -281,7 +281,7 @@ def gather_wince_supported_platforms():
 
 def gather_msvc_detected_versions():
 	#Detected MSVC versions!
-	version_pattern = re.compile('^(\d\d?\.\d\d?)(Exp)?$')
+	version_pattern = re.compile(r'^(\d\d?\.\d\d?)(Exp)?$')
 	detected_versions = []
 	for vcver,vcvar in (('VCExpress','Exp'), ('VisualStudio','')):
 		prefix = 'SOFTWARE\\Wow6432node\\Microsoft\\' + vcver
@@ -367,7 +367,7 @@ def gather_wsdk_versions(conf, versions):
 	:param versions: list to modify
 	:type versions: list
 	"""
-	version_pattern = re.compile('^v..?.?\...?.?')
+	version_pattern = re.compile(r'^v..?.?\...?.?')
 	try:
 		all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Microsoft\\Microsoft SDKs\\Windows')
 	except OSError:
@@ -525,7 +525,7 @@ def gather_icl_versions(conf, versions):
 	:param versions: list to modify
 	:type versions: list
 	"""
-	version_pattern = re.compile('^...?.?\....?.?')
+	version_pattern = re.compile(r'^...?.?\....?.?')
 	try:
 		all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Intel\\Compilers\\C++')
 	except OSError:
@@ -579,7 +579,7 @@ def gather_intel_composer_versions(conf, versions):
 	:param versions: list to modify
 	:type versions: list
 	"""
-	version_pattern = re.compile('^...?.?\...?.?.?')
+	version_pattern = re.compile(r'^...?.?\...?.?.?')
 	try:
 		all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Intel\\Suites')
 	except OSError:
@@ -683,7 +683,7 @@ def find_lt_names_msvc(self, libname, is_static=False):
 				if not is_static and ltdict.get('library_names', ''):
 					dllnames=ltdict['library_names'].split()
 					dll=dllnames[0].lower()
-					dll=re.sub('\.dll$', '', dll)
+					dll=re.sub(r'\.dll$', '', dll)
 					return (lt_libdir, dll, False)
 				elif ltdict.get('old_library', ''):
 					olib=ltdict['old_library']
@@ -700,7 +700,7 @@ def find_lt_names_msvc(self, libname, is_static=False):
 @conf
 def libname_msvc(self, libname, is_static=False):
 	lib = libname.lower()
-	lib = re.sub('\.lib$','',lib)
+	lib = re.sub(r'\.lib$','',lib)
 
 	if lib in g_msvc_systemlibs:
 		return lib
@@ -747,11 +747,11 @@ def libname_msvc(self, libname, is_static=False):
 		for libn in libnames:
 			if os.path.exists(os.path.join(path, libn)):
 				Logs.debug('msvc: lib found: %s', os.path.join(path,libn))
-				return re.sub('\.lib$', '',libn)
+				return re.sub(r'\.lib$', '',libn)
 
 	#if no lib can be found, just return the libname as msvc expects it
 	self.fatal('The library %r could not be found' % libname)
-	return re.sub('\.lib$', '', libname)
+	return re.sub(r'\.lib$', '', libname)
 
 @conf
 def check_lib_msvc(self, libname, is_static=False, uselib_store=None):
diff --git a/waflib/Tools/nasm.py b/Tools/nasm.py
index 411d582..411d582 100644
--- a/waflib/Tools/nasm.py
+++ b/Tools/nasm.py
diff --git a/waflib/Tools/nobuild.py b/Tools/nobuild.py
index 2e4b055..2e4b055 100644
--- a/waflib/Tools/nobuild.py
+++ b/Tools/nobuild.py
diff --git a/waflib/Tools/perl.py b/Tools/perl.py
index 32b03fb..32b03fb 100644
--- a/waflib/Tools/perl.py
+++ b/Tools/perl.py
diff --git a/waflib/Tools/python.py b/Tools/python.py
index 25841d0..01a2c9a 100644
--- a/waflib/Tools/python.py
+++ b/Tools/python.py
@@ -329,6 +329,10 @@ def check_python_headers(conf, features='pyembed pyext'):
 	conf.find_program([''.join(pybin) + '-config', 'python%s-config' % num, 'python-config-%s' % num, 'python%sm-config' % num], var='PYTHON_CONFIG', msg="python-config", mandatory=False)
 
 	if env.PYTHON_CONFIG:
+		# check python-config output only once
+		if conf.env.HAVE_PYTHON_H:
+			return
+
 		# python2.6-config requires 3 runs
 		all_flags = [['--cflags', '--libs', '--ldflags']]
 		if sys.hexversion < 0x2070000:
diff --git a/waflib/Tools/qt5.py b/Tools/qt5.py
index 4f9c690..9f43280 100644
--- a/waflib/Tools/qt5.py
+++ b/Tools/qt5.py
@@ -313,11 +313,11 @@ def apply_qt5(self):
 
 	The additional parameters are:
 
-	:param lang: list of translation files (\*.ts) to process
+	:param lang: list of translation files (\\*.ts) to process
 	:type lang: list of :py:class:`waflib.Node.Node` or string without the .ts extension
-	:param update: whether to process the C++ files to update the \*.ts files (use **waf --translate**)
+	:param update: whether to process the C++ files to update the \\*.ts files (use **waf --translate**)
 	:type update: bool
-	:param langname: if given, transform the \*.ts files into a .qrc files to include in the binary file
+	:param langname: if given, transform the \\*.ts files into a .qrc files to include in the binary file
 	:type langname: :py:class:`waflib.Node.Node` or string without the .qrc extension
 	"""
 	if getattr(self, 'lang', None):
@@ -762,7 +762,7 @@ def set_qt5_libs_to_check(self):
 		if self.environ.get('QT5_FORCE_STATIC'):
 			pat = self.env.cxxstlib_PATTERN
 		if Utils.unversioned_sys_platform() == 'darwin':
-			pat = "%s\.framework"
+			pat = r"%s\.framework"
 		re_qt = re.compile(pat%'Qt5?(?P<name>.*)'+'$')
 		for x in dirlst:
 			m = re_qt.match(x)
diff --git a/waflib/Tools/ruby.py b/Tools/ruby.py
index 8d92a79..8d92a79 100644
--- a/waflib/Tools/ruby.py
+++ b/Tools/ruby.py
diff --git a/waflib/Tools/suncc.py b/Tools/suncc.py
index 33d34fc..33d34fc 100644
--- a/waflib/Tools/suncc.py
+++ b/Tools/suncc.py
diff --git a/waflib/Tools/suncxx.py b/Tools/suncxx.py
index 3b384f6..3b384f6 100644
--- a/waflib/Tools/suncxx.py
+++ b/Tools/suncxx.py
diff --git a/waflib/Tools/tex.py b/Tools/tex.py
index eaf9fdb..eaf9fdb 100644
--- a/waflib/Tools/tex.py
+++ b/Tools/tex.py
diff --git a/waflib/Tools/vala.py b/Tools/vala.py
index 822ec50..822ec50 100644
--- a/waflib/Tools/vala.py
+++ b/Tools/vala.py
diff --git a/waflib/Tools/waf_unit_test.py b/Tools/waf_unit_test.py
index a71ed1c..74d6c05 100644
--- a/waflib/Tools/waf_unit_test.py
+++ b/Tools/waf_unit_test.py
@@ -205,7 +205,7 @@ class utest(Task.Task):
 		return self.exec_command(self.ut_exec)
 
 	def exec_command(self, cmd, **kw):
-		Logs.debug('runner: %r', cmd)
+		self.generator.bld.log_command(cmd, kw)
 		if getattr(Options.options, 'dump_test_scripts', False):
 			script_code = SCRIPT_TEMPLATE % {
 				'python': sys.executable,
diff --git a/waflib/Tools/winres.py b/Tools/winres.py
index 586c596..9be1ed6 100644
--- a/waflib/Tools/winres.py
+++ b/Tools/winres.py
@@ -24,8 +24,8 @@ def rc_file(self, node):
 		self.compiled_tasks = [rctask]
 
 re_lines = re.compile(
-	'(?:^[ \t]*(#|%:)[ \t]*(ifdef|ifndef|if|else|elif|endif|include|import|define|undef|pragma)[ \t]*(.*?)\s*$)|'\
-	'(?:^\w+[ \t]*(ICON|BITMAP|CURSOR|HTML|FONT|MESSAGETABLE|TYPELIB|REGISTRY|D3DFX)[ \t]*(.*?)\s*$)',
+	r'(?:^[ \t]*(#|%:)[ \t]*(ifdef|ifndef|if|else|elif|endif|include|import|define|undef|pragma)[ \t]*(.*?)\s*$)|'\
+	r'(?:^\w+[ \t]*(ICON|BITMAP|CURSOR|HTML|FONT|MESSAGETABLE|TYPELIB|REGISTRY|D3DFX)[ \t]*(.*?)\s*$)',
 	re.IGNORECASE | re.MULTILINE)
 
 class rc_parser(c_preproc.c_parser):
diff --git a/waflib/Tools/xlc.py b/Tools/xlc.py
index 134dd41..134dd41 100644
--- a/waflib/Tools/xlc.py
+++ b/Tools/xlc.py
diff --git a/waflib/Tools/xlcxx.py b/Tools/xlcxx.py
index 76aa59b..76aa59b 100644
--- a/waflib/Tools/xlcxx.py
+++ b/Tools/xlcxx.py
diff --git a/waflib/Utils.py b/Utils.py
index b4665c4..4b808a8 100644
--- a/waflib/Utils.py
+++ b/Utils.py
@@ -49,10 +49,16 @@ try:
 	from hashlib import md5
 except ImportError:
 	try:
-		from md5 import md5
+		from hashlib import sha1 as md5
 	except ImportError:
-		# never fail to enable fixes from another module
+		# never fail to enable potential fixes from another module
 		pass
+else:
+	try:
+		md5().digest()
+	except ValueError:
+		# Fips? #2213
+		from hashlib import sha1 as md5
 
 try:
 	import threading
@@ -202,7 +208,7 @@ class lazy_generator(object):
 
 	next = __next__
 
-is_win32 = os.sep == '\\' or sys.platform == 'win32' # msys2
+is_win32 = os.sep == '\\' or sys.platform == 'win32' or os.name == 'nt' # msys2
 """
 Whether this system is a Windows series
 """
@@ -484,7 +490,9 @@ def split_path_msys(path):
 if sys.platform == 'cygwin':
 	split_path = split_path_cygwin
 elif is_win32:
-	if os.environ.get('MSYSTEM'):
+	# Consider this an MSYSTEM environment if $MSYSTEM is set and python
+	# reports is executable from a unix like path on a windows host.
+	if os.environ.get('MSYSTEM') and sys.executable.startswith('/'):
 		split_path = split_path_msys
 	else:
 		split_path = split_path_win32
@@ -730,7 +738,7 @@ def unversioned_sys_platform():
 	if s == 'cli' and os.name == 'nt':
 		# ironpython is only on windows as far as we know
 		return 'win32'
-	return re.split('\d+$', s)[0]
+	return re.split(r'\d+$', s)[0]
 
 def nada(*k, **kw):
 	"""
diff --git a/waflib/__init__.py b/__init__.py
index 079df35..079df35 100644
--- a/waflib/__init__.py
+++ b/__init__.py
diff --git a/waflib/ansiterm.py b/ansiterm.py
index 0d20c63..027f0ad 100644
--- a/waflib/ansiterm.py
+++ b/ansiterm.py
@@ -264,7 +264,7 @@ else:
 			'u': pop_cursor,
 		}
 		# Match either the escape sequence or text not containing escape sequence
-		ansi_tokens = re.compile('(?:\x1b\[([0-9?;]*)([a-zA-Z])|([^\x1b]+))')
+		ansi_tokens = re.compile(r'(?:\x1b\[([0-9?;]*)([a-zA-Z])|([^\x1b]+))')
 		def write(self, text):
 			try:
 				wlock.acquire()
diff --git a/doc/layout.xml b/doc/layout.xml
deleted file mode 100644
index 74a109f..0000000
--- a/doc/layout.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<doxygenlayout version="1.0">
-  <!-- Navigation index tabs for HTML output -->
-  <navindex>
-    <tab type="mainpage" visible="yes" title=""/>
-    <tab type="pages" visible="yes" title="" intro=""/>
-    <tab type="modules" visible="yes" title="" intro=""/>
-    <tab type="namespaces" visible="yes" title="">
-      <tab type="namespacelist" visible="yes" title="" intro=""/>
-      <tab type="namespacemembers" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="classes" visible="yes" title="">
-      <tab type="classlist" visible="yes" title="" intro=""/>
-      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/> 
-      <tab type="hierarchy" visible="yes" title="" intro=""/>
-      <tab type="classmembers" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="files" visible="yes" title="">
-      <tab type="filelist" visible="yes" title="" intro=""/>
-      <tab type="globals" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="examples" visible="yes" title="" intro=""/>  
-  </navindex>
-
-  <!-- Layout definition for a class page -->
-  <class>
-    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_INCLUDE_FILES"/>
-    <inheritancegraph visible="$CLASS_GRAPH"/>
-    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
-    <allmemberslink visible="yes"/>
-    <memberdecl>
-      <nestedclasses visible="yes" title=""/>
-      <publictypes title=""/>
-      <publicslots title=""/>
-      <signals title=""/>
-      <publicmethods title=""/>
-      <publicstaticmethods title=""/>
-      <publicattributes title=""/>
-      <publicstaticattributes title=""/>
-      <protectedtypes title=""/>
-      <protectedslots title=""/>
-      <protectedmethods title=""/>
-      <protectedstaticmethods title=""/>
-      <protectedattributes title=""/>
-      <protectedstaticattributes title=""/>
-      <packagetypes title=""/>
-      <packagemethods title=""/>
-      <packagestaticmethods title=""/>
-      <packageattributes title=""/>
-      <packagestaticattributes title=""/>
-      <properties title=""/>
-      <events title=""/>
-      <privatetypes title=""/>
-      <privateslots title=""/>
-      <privatemethods title=""/>
-      <privatestaticmethods title=""/>
-      <privateattributes title=""/>
-      <privatestaticattributes title=""/>
-      <friends title=""/>
-      <related title="" subtitle=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <inlineclasses title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <constructors title=""/>
-      <functions title=""/>
-      <related title=""/>
-      <variables title=""/>
-      <properties title=""/>
-      <events title=""/>
-    </memberdef>
-    <usedfiles visible="$SHOW_USED_FILES"/>
-    <authorsection visible="yes"/>
-  </class>
-
-  <!-- Layout definition for a namespace page -->
-  <namespace>
-    <briefdescription visible="yes"/>
-    <memberdecl>
-      <nestednamespaces visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <inlineclasses title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-    </memberdef>
-    <authorsection visible="yes"/>
-  </namespace>
-
-  <!-- Layout definition for a file page -->
-  <file>
-    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_INCLUDE_FILES"/>
-    <includegraph visible="$INCLUDE_GRAPH"/>
-    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
-    <sourcelink visible="yes"/>
-    <memberdecl>
-      <classes visible="yes" title=""/>
-      <namespaces visible="yes" title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <inlineclasses title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-    </memberdef>
-    <authorsection/>
-  </file>
-
-  <!-- Layout definition for a group page -->
-  <group>
-    <briefdescription visible="no"/>
-    <groupgraph visible="$GROUP_GRAPHS"/>
-    <detaileddescription title=""/>
-    <memberdecl>
-      <nestedgroups visible="yes" title=""/>
-      <dirs visible="yes" title=""/>
-      <files visible="yes" title=""/>
-      <namespaces visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <enumvalues title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <signals title=""/>
-      <publicslots title=""/>
-      <protectedslots title=""/>
-      <privateslots title=""/>
-      <events title=""/>
-      <properties title=""/>
-      <friends title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <memberdef>
-      <pagedocs/>
-      <inlineclasses title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <enumvalues title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <signals title=""/>
-      <publicslots title=""/>
-      <protectedslots title=""/>
-      <privateslots title=""/>
-      <events title=""/>
-      <properties title=""/>
-      <friends title=""/>
-    </memberdef>
-    <authorsection visible="yes"/>
-  </group>
-
-  <!-- Layout definition for a directory page -->
-  <directory>
-    <briefdescription visible="yes"/>
-    <directorygraph visible="yes"/>
-    <memberdecl>
-      <dirs visible="yes"/>
-      <files visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-  </directory>
-</doxygenlayout>
diff --git a/doc/reference.doxygen.in b/doc/reference.doxygen.in
deleted file mode 100644
index 4ea36a3..0000000
--- a/doc/reference.doxygen.in
+++ /dev/null
@@ -1,2415 +0,0 @@
-# Doxyfile 1.8.12
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = Suil
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         = @SUIL_VERSION@
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          =
-
-# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
-# in the documentation. The maximum height of the logo should not exceed 55
-# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
-# the logo to the output directory.
-
-PROJECT_LOGO           =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = .
-
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = NO
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES    = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = NO
-
-# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = NO
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = YES
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
-# page for each member. If set to NO, the documentation of a member will be part
-# of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
-
-ALIASES                =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. For
-# instance to make doxygen treat .inc files as Fortran files (default is PHP),
-# and .f files as C (default is Fortran), use: inc=Fortran f=C.
-#
-# Note: For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
-# to that level are automatically included in the table of contents, even if
-# they do not have an id attribute.
-# Note: This feature currently applies only to Markdown headings.
-# Minimum value: 0, maximum value: 99, default value: 0.
-# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
-
-TOC_INCLUDE_HEADINGS   = 0
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# If one adds a struct or class to a group and this option is enabled, then also
-# any nested class or struct is added to the same group. By default this option
-# is disabled and one has to add nested compounds explicitly via \ingroup.
-# The default value is: NO.
-
-GROUP_NESTED_COMPOUNDS = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = YES
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = YES
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = YES
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO,
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = NO
-
-# This flag is only useful for Objective-C code. If set to YES, local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO, only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = YES
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = YES
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO, these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = YES
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES, upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES, the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
-# append additional text to a page's title, such as Class Reference. If set to
-# YES the compound reference will be hidden.
-# The default value is: NO.
-
-HIDE_COMPOUND_REFERENCE= NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = NO
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = YES
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
-# list. This list is created by putting \todo commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = NO
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
-# list. This list is created by putting \test commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = NO
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = NO
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES, the
-# list will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = NO
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = NO
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            = @SUIL_SRCDIR@/doc/layout.xml
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. See also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = YES
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = YES
-
-# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
-# a warning is encountered.
-# The default value is: NO.
-
-WARN_AS_ERROR          = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = @SUIL_SRCDIR@/suil/suil.h
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# read by doxygen.
-#
-# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
-# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
-
-FILE_PATTERNS          =
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = NO
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       = *.c
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE =
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = YES
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = NO
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        = @SUIL_SRCDIR@/doc/style.css
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# cascading style sheets that are included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefore more robust against future updates.
-# Doxygen will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 160
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = NO
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler (hhc.exe). If non-empty,
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated
-# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          =
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = YES
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = NO
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 1
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = NO
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. The package can be specified just
-# by its name or with the correct syntax as to be used with the LaTeX
-# \usepackage command. To get the times font for instance you can specify :
-# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
-# To use the option intlimits with the amsmath package you can specify:
-# EXTRA_PACKAGES=[intlimits]{amsmath}
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
-# LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# LaTeX style sheets that are included after the standard style sheets created
-# by doxygen. Using this option one can overrule certain style aspects. Doxygen
-# will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_STYLESHEET =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_TIMESTAMP        = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = YES
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR             =
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sf.net) file that captures the
-# structure of the code including all documentation. Note that this feature is
-# still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO, the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
-# in the source code. If set to NO, only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES, the include files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# the class index. If set to NO, only the inherited external classes will be
-# listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = NO
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
-# If set to YES the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: NO.
-
-HAVE_DOT               = NO
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           =
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = NO
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = NO
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = NO
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = NO
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command. Disabling a call graph can be
-# accomplished by means of the command \hidecallgraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command. Disabling a caller graph can be
-# accomplished by means of the command \hidecallergraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = NO
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = NO
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. For an explanation of the image formats see the section
-# output formats in the documentation of the dot tool (Graphviz (see:
-# http://www.graphviz.org/)).
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
-# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
-# png:gdiplus:gdiplus.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           =
-
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
-
-PLANTUML_JAR_PATH      =
-
-# When using plantuml, the specified paths are searched for files specified by
-# the !include statement in a plantuml block.
-
-PLANTUML_INCLUDE_PATH  =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = NO
-
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES
diff --git a/doc/style.css b/doc/style.css
deleted file mode 100644
index f6ff8bb..0000000
--- a/doc/style.css
+++ /dev/null
@@ -1,691 +0,0 @@
-body {
-	max-width: 80em;
-	margin: 0;
-	margin-left: auto;
-	margin-right: auto;
-	background: #FFF;
-	color: #000;
-}
-
-#titlearea {
-	display: none;
-}
-
-h1 {
-	font-size: 180%;
-	font-weight: 900;
-}
-
-h2 {
-	font-size: 140%;
-	font-weight: 700;
-}
-
-h3 {
-	font-size: 120%;
-	font-weight: 700;
-}
-
-h4 {
-	font-size: 110%;
-	font-weight: 700;
-}
-
-h5 {
-	font-size: 100%;
-	font-weight: 700;
-}
-
-h6 {
-	font-size: 100%;
-	font-weight: 600;
-}
-
-p {
-	margin: 0 0 1em 0;
-}
-
-dt {
-	font-weight: 700;
-}
-
-p.startli,p.startdd,p.starttd {
-	margin-top: 2px;
-}
-
-p.endli {
-	margin-bottom: 0;
-}
-
-p.enddd {
-	margin-bottom: 4px;
-}
-
-p.endtd {
-	margin-bottom: 2px;
-}
-
-caption {
-	font-weight: 700;
-}
-
-span.legend {
-	font-size: small;
-	text-align: center;
-}
-
-h3.version {
-	font-size: small;
-	text-align: center;
-}
-
-div.qindex,div.navtab {
-	background-color: #EBEFF6;
-	border: 1px solid #A3B4D7;
-	text-align: center;
-	margin: 2px;
-	padding: 2px;
-}
-
-div.navtab {
-	margin-right: 15px;
-}
-
-/* @group Link Styling */
-a {
-	color: #546E00;
-	text-decoration: none;
-}
-
-.contents a:visited {
-	color: #344E00;
-}
-
-a:hover {
-	text-decoration: underline;
-}
-
-a.qindexHL {
-	background-color: #9CAFD4;
-	color: #FFF;
-	border: 1px double #869DCA;
-}
-
-code {
-	color: #444;
-}
-
-a.code {
-	color: #4665A2;
-}
-
-a.codeRef {
-	color: #4665A2;
-}
-
-/* @end */
-dl.el {
-	margin-left: -1cm;
-}
-
-.fragment {
-	font-family: monospace, fixed;
-}
-
-pre.fragment {
-	border: 1px solid #C4C4C4;
-	background-color: #F9F9F9;
-	padding: 4px 6px;
-	margin: 4px 8px 4px 2px;
-	overflow: auto;
-	line-height: 125%;
-}
-
-div.ah {
-	background-color: #000;
-	font-weight: 700;
-	color: #FFF;
-	margin-bottom: 3px;
-	margin-top: 3px;
-	padding: .2em;
-	border: thin solid #333;
-}
-
-div.groupHeader {
-	margin-left: 16px;
-	margin-top: 12px;
-	margin-bottom: 6px;
-	font-weight: 700;
-}
-
-a + h2.groupheader {
-	display: none;
-}
-
-div.groupText {
-	margin-left: 16px;
-	font-style: italic;
-}
-
-div.contents {
-	margin-top: 10px;
-	margin-left: 10px;
-	margin-right: 10px;
-}
-
-td.indexkey {
-	background-color: #EBEFF6;
-	font-weight: 700;
-	border: 1px solid #C4CFE5;
-	margin: 2px 0;
-	padding: 2px 10px;
-}
-
-td.indexvalue {
-	background-color: #EBEFF6;
-	border: 1px solid #C4CFE5;
-	padding: 2px 10px;
-	margin: 2px 0;
-}
-
-tr.memlist {
-	background-color: #EEF1F7;
-}
-
-p.formulaDsp {
-	text-align: center;
-}
-
-img.formulaInl {
-	vertical-align: middle;
-}
-
-div.center {
-	text-align: center;
-	margin-top: 0;
-	margin-bottom: 0;
-	padding: 0;
-}
-
-div.center img {
-	border: 0;
-}
-
-address.footer {
-	text-align: right;
-	padding-right: 12px;
-}
-
-img.footer {
-	border: 0;
-	vertical-align: middle;
-}
-
-/* @group Code Colorization */
-span.keyword {
-	color: green;
-}
-
-span.keywordtype {
-	color: #3E873E;
-}
-
-span.keywordflow {
-	color: #e08000;
-}
-
-span.comment {
-	color: maroon;
-}
-
-span.preprocessor {
-	color: #806020;
-}
-
-span.stringliteral {
-	color: #002080;
-}
-
-span.charliteral {
-	color: teal;
-}
-
-span.vhdldigit {
-	color: #F0F;
-}
-
-span.vhdlkeyword {
-	color: #700070;
-}
-
-span.vhdllogic {
-	color: red;
-}
-
-/* @end */
-td.tiny {
-	font-size: x-small;
-}
-
-.dirtab {
-	padding: 4px;
-	border-collapse: collapse;
-	border: 1px solid #A3B4D7;
-}
-
-th.dirtab {
-	background: #EBEFF6;
-	font-weight: 700;
-}
-
-hr {
-	height: 0;
-	border: none;
-	border-top: 1px solid #DDD;
-	margin: 2em 0 1em;
-}
-
-hr.footer {
-	height: 1px;
-}
-
-/* @group Member Descriptions */
-table.memberdecls {
-	border-spacing: 0.125em;
-}
-
-h2.groupheader {
-	margin: 0.5em 0 0.25em 0;
-}
-
-.mdescLeft,.mdescRight,.memItemLeft,.memItemRight,.memTemplItemLeft,.memTemplItemRight,.memTemplParams {
-	margin: 0;
-	padding: 0;
-}
-
-.mdescLeft,.mdescRight {
-	color: #555;
-}
-
-.memItemLeft,.memItemRight,.memTemplParams {
-	border: 0;
-	font-family: monospace, fixed;
-}
-
-.memItemLeft,.memTemplItemLeft {
-	white-space: nowrap;
-	padding-left: 2em;
-	padding-right: 1em;
-}
-
-.memItemLeft a.el {
-	font-weight: bold;
-}
-
-.memTemplParams {
-	color: #464646;
-	white-space: nowrap;
-}
-
-td.memSeparator {
-	display: none;
-}
-
-td.mlabels-right {
-	vertical-align: top;
-	padding-top: 4px;
-	color: #AA6;
-}
-
-.memtitle {
-	display: none;
-}
-
-/* @end */
-/* @group Member Details */
-/* Styles for detailed member documentation */
-.memtemplate {
-	color: #4665A2;
-	font-weight: bold;
-}
-
-.memnav {
-	background-color: #EBEFF6;
-	border: 1px solid #A3B4D7;
-	text-align: center;
-	margin: 2px;
-	margin-right: 15px;
-	padding: 2px;
-}
-
-.memitem {
-	padding: 0;
-	margin: 1em 0 1em 0;
-}
-
-.memproto {
-	padding: 0;
-	font-weight: bold;
-	color: #000;
-}
-
-.memproto .paramname {
-	color: #444;
-	font-style: normal;
-}
-
-.memdoc {
-	padding: 0 0 0.5em 2em;
-}
-
-.paramkey {
-	text-align: right;
-}
-
-.paramtype {
-	color: #3E873E;
-	white-space: nowrap;
-}
-
-.paramname {
-	color: #444;
-	white-space: nowrap;
-	font-weight: bold;
-}
-
-td.paramname {
-	vertical-align: top;
-}
-
-.fieldname {
-	color: #000;
-}
-
-td.fieldname {
-	padding-right: 1em;
-	vertical-align: top;
-}
-
-td.fieldtype {
-	vertical-align: top;
-	color: #444;
-	padding-right: 0.5em;
-}
-
-td.fielddoc p {
-	margin: 0;
-}
-
-/* @end */
-/* @group Directory (tree) */
-/* for the tree view */
-.ftvtree {
-	font-family: sans-serif;
-	margin: 0;
-}
-
-/* these are for tree view when used as main index */
-.directory {
-	font-size: small;
-	margin: 0.5em;
-}
-
-.directory h3 {
-	margin: 0;
-	margin-top: 1em;
-	font-size: 11pt;
-}
-
-.directory > h3 {
-	margin-top: 0;
-}
-
-.directory p {
-	margin: 0;
-	white-space: nowrap;
-}
-
-.directory div {
-	display: none;
-	margin: 0;
-}
-
-.directory img {
-	vertical-align: -30%;
-}
-
-/* these are for tree view when not used as main index */
-.directory-alt {
-	font-size: 100%;
-	font-weight: bold;
-}
-
-.directory-alt h3 {
-	margin: 0;
-	margin-top: 1em;
-	font-size: 11pt;
-}
-
-.directory-alt > h3 {
-	margin-top: 0;
-}
-
-.directory-alt p {
-	margin: 0;
-	white-space: nowrap;
-}
-
-.directory-alt div {
-	display: none;
-	margin: 0;
-}
-
-.directory-alt img {
-	vertical-align: -30%;
-}
-
-/* @end */
-div.dynheader {
-	margin-top: 8px;
-}
-
-address {
-	font-style: normal;
-	color: #2A3D61;
-}
-
-table.doxtable {
-	border-collapse: collapse;
-	margin: 0.5em;
-}
-
-table.doxtable td,table.doxtable th {
-	border: 1px solid #DDD;
-	padding: 3px 7px 2px;
-}
-
-table.doxtable th {
-	background-color: #F3F3F3;
-	color: #000;
-	padding-bottom: 4px;
-	padding-top: 5px;
-	text-align: left;
-	font-weight: bold;
-}
-
-.tabsearch {
-	top: 0;
-	left: 10px;
-	height: 36px;
-	z-index: 101;
-	overflow: hidden;
-	font-size: 13px;
-}
-
-div.navpath {
-	padding: 0.25em;
-}
-
-.navpath ul {
-	font-size: x-small;
-	color: #8AA0CC;
-	overflow: hidden;
-	margin: 0;
-	padding: 0;
-}
-
-.navpath li {
-	list-style-type: none;
-	float: left;
-	padding-left: 10px;
-	padding-right: 15px;
-	color: #364D7C;
-}
-
-.navpath a {
-	display: block;
-	text-decoration: none;
-	outline: none;
-}
-
-.navpath a:hover {
-	color: #6884BD;
-}
-
-div.summary {
-	float: right;
-	font-size: x-small;
-	padding: 0.25em 0.5em 0 0;
-	width: 50%;
-	text-align: right;
-}
-
-div.summary a {
-	white-space: nowrap;
-}
-
-div.header {
-	background-color: #F3F3F3;
-	margin: 0;
-	border: 0;
-}
-
-div.headertitle {
-	font-size: 180%;
-	font-weight: bold;
-	color: #FFF;
-	padding: 0.125em 0.25em 0.125em 0.25em;
-	background-color: #333;
-	background: linear-gradient(to bottom, #333 0%, #111 100%);
-	border: solid 1px #444;
-	border-top: 0;
-	border-radius: 0 0 6px 6px;
-}
-
-div.line {
-	font-family: monospace, fixed;
-	font-size: 13px;
-	min-height: 13px;
-	line-height: 1.0;
-	text-wrap: avoid;
-	white-space: pre-wrap;
-	text-indent: -53px;
-	padding-left: 53px;
-	padding-bottom: 0;
-	margin: 0;
-}
-
-.glow {
-	background-color: cyan;
-	box-shadow: 0 0 10px cyan;
-}
-
-span.lineno {
-	padding-right: 4px;
-	text-align: right;
-	border-right: 2px solid #0F0;
-	background-color: #E8E8E8;
-	white-space: pre;
-}
-span.lineno a {
-	background-color: #D8D8D8;
-}
-
-span.lineno a:hover {
-	background-color: #C8C8C8;
-}
-
-.tabs, .tabs2, .navpath {
-	background-image: none;
-	background-color: #333;
-	background: linear-gradient(to bottom, #333 0%, #111 100%);
-	border: 0;
-	border-bottom: solid 2px #000;
-	padding: 0;
-	padding-top: 2px;
-	font-size: small;
-}
-
-#navrow1 {
-	border: 0;
-}
-
-th {
-	text-align: left;
-}
-
-.mlabel {
-	padding: 0.125em;
-}
-
-/* tabs*/
-
-.tablist {
-	margin: 0;
-	padding: 0;
-	display: table;
-}
-
-.tablist li {
-	display: table-cell;
-	line-height: 2em;
-	list-style: none;
-	background-color: #333;
-	background: linear-gradient(to bottom, #444 0%, #222 100%);
-	border: 1px solid #222;
-	border-bottom: 0;
-	border-radius: 6px 6px 0 0;
-	color: #DDD;
-}
-
-.tablist a {
-	display: block;
-	padding: 0 20px;
-	font-weight: bold;
-	color: #859900;
-	text-decoration: none;
-	outline: none;
-}
-
-.header a {
-	color: #859900;
-}
-
-.tabs3 .tablist a {
-	padding: 0 10px;
-}
-
-.tablist a:hover {
-	color: #fff;
-	text-shadow: 0 1px 1px rgba(0, 0, 0, 1.0);
-	text-decoration: none;
-}
-
-.tablist li.current a {
-	color: #fff;
-	text-shadow: 0 1px 1px rgba(0, 0, 0, 1.0);
-}
-
-span.icon {
-	display: none;
-}
diff --git a/waflib/extras/__init__.py b/extras/__init__.py
index c8a3c34..c8a3c34 100644
--- a/waflib/extras/__init__.py
+++ b/extras/__init__.py
diff --git a/waflib/extras/autowaf.py b/extras/autowaf.py
index 92d0e57..51077d1 100644
--- a/waflib/extras/autowaf.py
+++ b/extras/autowaf.py
@@ -4,40 +4,46 @@ import subprocess
 import sys
 import time
 
-from waflib import Build, Context, Logs, Options, Utils
+from waflib import Configure, ConfigSet, Build, Context, Logs, Options, Utils
 from waflib.TaskGen import feature, before, after
 
 global g_is_child
 g_is_child = False
 
-# Only run autowaf hooks once (even if sub projects call several times)
-global g_step
-g_step = 0
+NONEMPTY = -10
 
-global line_just
-line_just = 40
+if sys.platform == 'win32':
+    lib_path_name = 'PATH'
+elif sys.platform == 'darwin':
+    lib_path_name = 'DYLD_LIBRARY_PATH'
+else:
+    lib_path_name = 'LD_LIBRARY_PATH'
 
 # Compute dependencies globally
 # import preproc
 # preproc.go_absolute = True
 
-# Test context that inherits build context to make configuration available
-class TestContext(Build.BuildContext):
-    "Run tests"
-    cmd = 'test'
-    fun = 'test'
-
 @feature('c', 'cxx')
 @after('apply_incpaths')
 def include_config_h(self):
     self.env.append_value('INCPATHS', self.bld.bldnode.abspath())
 
-def set_options(opt, debug_by_default=False, test=False):
-    "Add standard autowaf options if they havn't been added yet"
-    global g_step
-    if g_step > 0:
-        return
+class OptionsContext(Options.OptionsContext):
+    def __init__(self, **kwargs):
+        super(OptionsContext, self).__init__(**kwargs)
+        set_options(self)
 
+    def configuration_options(self):
+        return self.get_option_group('Configuration options')
+
+    def add_flags(self, group, flags):
+        """Tersely add flags (a dictionary of longname:desc) to a group"""
+        for name, desc in flags.items():
+            group.add_option('--' + name, action='store_true',
+                             dest=name.replace('-', '_'), help=desc)
+
+def set_options(opt, debug_by_default=False):
+    "Add standard autowaf options"
     opts = opt.get_option_group('Configuration options')
 
     # Standard directory options
@@ -77,7 +83,7 @@ def set_options(opt, debug_by_default=False, test=False):
                     help="build documentation (requires doxygen)")
 
     # Test options
-    if test:
+    if hasattr(Context.g_module, 'test'):
         test_opts = opt.add_option_group('Test options', '')
         opts.add_option('-T', '--test', action='store_true', dest='build_tests',
                         help='build unit tests')
@@ -88,12 +94,41 @@ def set_options(opt, debug_by_default=False, test=False):
                              dest='test_wrapper',
                              help='command prefix for tests (e.g. valgrind)')
 
-    g_step = 1
+    # Run options
+    run_opts = opt.add_option_group('Run options')
+    run_opts.add_option('--cmd', type='string', dest='cmd',
+                        help='command to run from build directory')
+
+class ConfigureContext(Configure.ConfigurationContext):
+    """configures the project"""
 
-def add_flags(opt, flags):
-    for name, desc in flags.items():
-        opt.add_option('--' + name, action='store_true',
-                       dest=name.replace('-', '_'), help=desc)
+    def __init__(self, **kwargs):
+        self.line_just = 45
+        if hasattr(Context.g_module, 'line_just'):
+            self.line_just = Context.g_module.line_just
+
+        super(ConfigureContext, self).__init__(**kwargs)
+        self.run_env = ConfigSet.ConfigSet()
+        self.system_include_paths = set()
+
+    def pre_recurse(self, node):
+        if len(self.stack_path) == 1:
+            Logs.pprint('BOLD', 'Configuring %s' % node.parent.srcpath())
+        super(ConfigureContext, self).pre_recurse(node)
+
+    def store(self):
+        self.env.AUTOWAF_RUN_ENV = self.run_env.get_merged_dict()
+        for path in sorted(self.system_include_paths):
+            if 'COMPILER_CC' in self.env:
+                self.env.append_value('CFLAGS', ['-isystem', path])
+            if 'COMPILER_CXX' in self.env:
+                self.env.append_value('CXXFLAGS', ['-isystem', path])
+
+        super(ConfigureContext, self).store()
+
+    def build_path(self, path='.'):
+        """Return `path` within the build directory"""
+        return str(self.path.get_bld().find_node(path))
 
 def get_check_func(conf, lang):
     if lang == 'c':
@@ -179,14 +214,8 @@ def check_pkg(conf, name, **args):
         conf.env[var_name] = CheckType.OPTIONAL
 
     if not conf.env.MSVC_COMPILER and 'system' in args and args['system']:
-        includes = conf.env['INCLUDES_' + nameify(args['uselib_store'])]
-        for path in includes:
-            if 'COMPILER_CC' in conf.env:
-                conf.env.append_value('CFLAGS', ['-isystem', path])
-            if 'COMPILER_CXX' in conf.env:
-                conf.env.append_value('CXXFLAGS', ['-isystem', path])
-
-        conf.env.append_value('CXXFLAGS', ['-isystem', '/usr/local/include'])
+        conf.system_include_paths.update(
+            conf.env['INCLUDES_' + nameify(args['uselib_store'])])
 
 def normpath(path):
     if sys.platform == 'win32':
@@ -195,10 +224,6 @@ def normpath(path):
         return os.path.normpath(path)
 
 def configure(conf):
-    global g_step
-    if g_step > 1:
-        return
-
     def append_cxx_flags(flags):
         conf.env.append_value('CFLAGS', flags)
         conf.env.append_value('CXXFLAGS', flags)
@@ -344,11 +369,9 @@ def configure(conf):
 
     conf.env.prepend_value('CFLAGS', '-I' + os.path.abspath('.'))
     conf.env.prepend_value('CXXFLAGS', '-I' + os.path.abspath('.'))
-    g_step = 2
 
 def display_summary(conf, msgs=None):
-    global g_is_child
-    if not g_is_child:
+    if len(conf.stack_path) == 1:
         display_msg(conf, "Install prefix", conf.env['PREFIX'])
         if 'COMPILER_CC' in conf.env:
             display_msg(conf, "C Flags", ' '.join(conf.env['CFLAGS']))
@@ -463,25 +486,17 @@ def set_lib_env(conf, name, version):
     major_ver    = version.split('.')[0]
     pkg_var_name = 'PKG_' + name.replace('-', '_') + '_' + major_ver
     lib_name     = '%s-%s' % (name, major_ver)
+    lib_path     = [str(conf.path.get_bld())]
     if conf.env.PARDEBUG:
         lib_name += 'D'
     conf.env[pkg_var_name]       = lib_name
     conf.env['INCLUDES_' + NAME] = ['${INCLUDEDIR}/%s-%s' % (name, major_ver)]
-    conf.env['LIBPATH_' + NAME]  = [conf.env.LIBDIR]
+    conf.env['LIBPATH_' + NAME]  = lib_path
     conf.env['LIB_' + NAME]      = [lib_name]
 
+    conf.run_env.append_unique(lib_path_name, lib_path)
     conf.define(NAME + '_VERSION', version)
 
-def set_line_just(conf, width):
-    global line_just
-    line_just = max(line_just, width)
-    conf.line_just = line_just
-
-def display_header(title):
-    global g_is_child
-    if g_is_child:
-        Logs.pprint('BOLD', title)
-
 def display_msg(conf, msg, status=None, color=None):
     color = 'CYAN'
     if type(status) == bool and status:
@@ -613,7 +628,8 @@ def make_simple_dox(name):
         os.chdir(top)
     except Exception as e:
         Logs.error("Failed to fix up %s documentation: %s" % (name, e))
-
+    finally:
+        os.chdir(top)
 
 def build_dox(bld, name, version, srcdir, blddir, outdir='', versioned=True):
     """Build Doxygen API documentation"""
@@ -744,18 +760,76 @@ def build_i18n(bld, srcdir, dir, name, sources, copyright_holder=None):
     build_i18n_po(bld, srcdir, dir, name, sources, copyright_holder)
     build_i18n_mo(bld, srcdir, dir, name, sources, copyright_holder)
 
-def cd_to_build_dir(ctx, appname):
-    top_level = (len(ctx.stack_path) > 1)
-    if top_level:
-        os.chdir(os.path.join('build', appname))
-    else:
-        os.chdir('build')
+class ExecutionEnvironment:
+    """Context that sets system environment variables for program execution"""
+    def __init__(self, changes):
+        self.original_environ = os.environ.copy()
 
-def cd_to_orig_dir(ctx, child):
-    if child:
-        os.chdir(os.path.join('..', '..'))
-    else:
-        os.chdir('..')
+        self.diff = {}
+        for path_name, paths in changes.items():
+            value = os.pathsep.join(paths)
+            if path_name in os.environ:
+                value += os.pathsep + os.environ[path_name]
+
+            self.diff[path_name] = value
+
+        os.environ.update(self.diff)
+
+    def __str__(self):
+        return '\n'.join({'%s="%s"' % (k, v) for k, v in self.diff.items()})
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, value, traceback):
+        os.environ = self.original_environ
+
+class RunContext(Build.BuildContext):
+    "runs an executable from the build directory"
+    cmd = 'run'
+
+    def execute(self):
+        self.restore()
+        if not self.all_envs:
+            self.load_envs()
+
+        with ExecutionEnvironment(self.env.AUTOWAF_RUN_ENV) as env:
+            if Options.options.verbose:
+                Logs.pprint('GREEN', str(env) + '\n')
+
+            if Options.options.cmd:
+                Logs.pprint('GREEN', 'Running %s' % Options.options.cmd)
+                subprocess.call(Options.options.cmd, shell=True)
+            else:
+                Logs.error("error: Missing --cmd option for run command")
+
+def show_diff(from_lines, to_lines, from_filename, to_filename):
+    import difflib
+    import sys
+
+    for line in difflib.unified_diff(
+            from_lines, to_lines,
+            fromfile=os.path.abspath(from_filename),
+            tofile=os.path.abspath(to_filename)):
+        sys.stderr.write(line)
+
+def test_file_equals(patha, pathb):
+    import filecmp
+    import io
+
+    for path in (patha, pathb):
+        if not os.access(path, os.F_OK):
+            Logs.pprint('RED', 'error: missing file %s' % path)
+            return False
+
+    if filecmp.cmp(patha, pathb, shallow=False):
+        return True
+
+    with io.open(patha, 'rU', encoding='utf-8') as fa:
+        with io.open(pathb, 'rU', encoding='utf-8') as fb:
+            show_diff(fa.readlines(), fb.readlines(), patha, pathb)
+
+    return False
 
 def bench_time():
     if hasattr(time, 'perf_counter'): # Added in Python 3.3
@@ -763,207 +837,308 @@ def bench_time():
     else:
         return time.time()
 
-def pre_test(ctx, appname, dirs=['src']):
-    Logs.pprint('GREEN', '\n[==========] Running %s tests' % appname)
-
-    if not hasattr(ctx, 'autowaf_tests_total'):
-        ctx.autowaf_tests_start_time   = bench_time()
-        ctx.autowaf_tests_total        = 0
-        ctx.autowaf_tests_failed       = 0
-        ctx.autowaf_local_tests_total  = 0
-        ctx.autowaf_local_tests_failed = 0
-        ctx.autowaf_tests              = {}
-
-    ctx.autowaf_tests[appname] = {'total': 0, 'failed': 0}
-
-    cd_to_build_dir(ctx, appname)
-    if not ctx.env.NO_COVERAGE:
-        diropts  = ''
-        for i in dirs:
-            diropts += ' -d ' + i
-        clear_log = open('lcov-clear.log', 'w')
-        try:
-            try:
-                # Clear coverage data
-                subprocess.call(('lcov %s -z' % diropts).split(),
-                                stdout=clear_log, stderr=clear_log)
-            except Exception:
-                Logs.warn('Failed to run lcov, no coverage report generated')
-        finally:
-            clear_log.close()
-
-class TestFailed(Exception):
-    pass
-
-def post_test(ctx, appname, dirs=['src'], remove=['*boost*', 'c++*']):
-    if not ctx.env.NO_COVERAGE:
-        diropts  = ''
-        for i in dirs:
-            diropts += ' -d ' + i
-        coverage_log           = open('lcov-coverage.log', 'w')
-        coverage_lcov          = open('coverage.lcov', 'w')
-        coverage_stripped_lcov = open('coverage-stripped.lcov', 'w')
+class TestOutput:
+    """Test output that is truthy if result is as expected"""
+    def __init__(self, expected, result=None):
+        self.stdout = self.stderr = None
+        self.expected = expected
+        self.result = result
+
+    def __bool__(self):
+        return self.expected is None or self.result == self.expected
+
+    __nonzero__ = __bool__
+
+def is_string(s):
+    if sys.version_info[0] < 3:
+        return isinstance(s, basestring)
+    return isinstance(s, str)
+
+class TestScope:
+    """Scope for running tests that maintains pass/fail statistics"""
+    def __init__(self, tst, name, defaults):
+        self.tst = tst
+        self.name = name
+        self.defaults = defaults
+        self.n_failed = 0
+        self.n_total = 0
+
+    def run(self, test, **kwargs):
+        if callable(test):
+            output = self._run_callable(test, **kwargs)
+        elif type(test) == list:
+            if 'name' not in kwargs:
+                import pipes
+                kwargs['name'] = ' '.join(map(pipes.quote, test))
+
+            output = self._run_command(test, **kwargs)
+        else:
+            raise Exception("Unknown test type")
+
+        if not output:
+            self.tst.log_bad('FAILED', kwargs['name'])
+
+        return self.tst.test_result(output)
+
+    def _run_callable(self, test, **kwargs):
+        expected = kwargs['expected'] if 'expected' in kwargs else True
+        return TestOutput(expected, test())
+
+    def _run_command(self, test, **kwargs):
+        if 'stderr' in kwargs and kwargs['stderr'] == NONEMPTY:
+            # Run with a temp file for stderr and check that it is non-empty
+            import tempfile
+            with tempfile.TemporaryFile(mode='w') as stderr:
+                kwargs['stderr'] = stderr
+                output = self.run(test, **kwargs)
+                return (output if not output else
+                        self.run(
+                            lambda: stderr.tell() > 0,
+                            name=kwargs['name'] + ' error message'))
+
         try:
-            try:
-                base = '.'
-                if g_is_child:
-                    base = '..'
-
-                # Generate coverage data
-                lcov_cmd = 'lcov -c %s -b %s' % (diropts, base)
-                if ctx.env.LLVM_COV:
-                    lcov_cmd += ' --gcov-tool %s' % ctx.env.LLVM_COV[0]
-                subprocess.call(lcov_cmd.split(),
-                                stdout=coverage_lcov, stderr=coverage_log)
-
-                # Strip unwanted stuff
-                subprocess.call(
-                    ['lcov', '--remove', 'coverage.lcov'] + remove,
-                    stdout=coverage_stripped_lcov, stderr=coverage_log)
-
-                # Generate HTML coverage output
-                if not os.path.isdir('coverage'):
-                    os.makedirs('coverage')
-                subprocess.call(
-                    'genhtml -o coverage coverage-stripped.lcov'.split(),
-                    stdout=coverage_log, stderr=coverage_log)
-
-            except Exception:
-                Logs.warn('Failed to run lcov, no coverage report generated')
+            # Run with stdout and stderr set to the appropriate streams
+            out_stream = self._stream('stdout', kwargs)
+            err_stream = self._stream('stderr', kwargs)
+            return self._exec(test, **kwargs)
         finally:
-            coverage_stripped_lcov.close()
-            coverage_lcov.close()
-            coverage_log.close()
-
-    duration = (bench_time() - ctx.autowaf_tests_start_time) * 1000.0
-    total_tests = ctx.autowaf_tests[appname]['total']
-    failed_tests = ctx.autowaf_tests[appname]['failed']
-    passed_tests = total_tests - failed_tests
-    Logs.pprint('GREEN', '\n[==========] %d tests from %s ran (%d ms total)' % (
-        total_tests, appname, duration))
-    if not ctx.env.NO_COVERAGE:
-        Logs.pprint('GREEN', '[----------] Coverage: <file://%s>'
-                    % os.path.abspath('coverage/index.html'))
-
-    Logs.pprint('GREEN', '[  PASSED  ] %d tests' % passed_tests)
-    if failed_tests > 0:
-        Logs.pprint('RED', '[  FAILED  ] %d tests' % failed_tests)
-        raise TestFailed('Tests from %s failed' % appname)
-    Logs.pprint('', '')
-
-    top_level = (len(ctx.stack_path) > 1)
-    if top_level:
-        cd_to_orig_dir(ctx, top_level)
-
-def run_test(ctx,
-             appname,
-             test,
-             desired_status=0,
-             dirs=['src'],
-             name='',
-             header=False,
-             quiet=False):
-    """Run an individual test.
-
-    `test` is either a shell command string, or a list of [name, return status]
-    for displaying tests implemented in the calling Python code.
-    """
-
-    ctx.autowaf_tests_total += 1
-    ctx.autowaf_local_tests_total += 1
-    ctx.autowaf_tests[appname]['total'] += 1
+            out_stream = out_stream.close() if out_stream else None
+            err_stream = err_stream.close() if err_stream else None
+
+    def _stream(self, stream_name, kwargs):
+        s = kwargs[stream_name] if stream_name in kwargs else None
+        if is_string(s):
+            kwargs[stream_name] = open(s, 'wb')
+            return kwargs[stream_name]
+        return None
+
+    def _exec(self,
+              test,
+              expected=0,
+              name='',
+              stdin=None,
+              stdout=None,
+              stderr=None,
+              verbosity=1):
+        def stream(s):
+            return open(s, 'wb') if type(s) == str else s
+
+        if verbosity > 1:
+            self.tst.log_good('RUN     ', name)
 
-    out = (None, None)
-    if type(test) == list:
-        name       = test[0]
-        returncode = test[1]
-    elif callable(test):
-        returncode = test()
-    else:
-        s = test
-        if isinstance(test, type([])):
-            s = ' '.join(test)
-        if header and not quiet:
-            Logs.pprint('Green', '\n[ RUN      ] %s' % s)
-        cmd = test
         if Options.options.test_wrapper:
-            cmd = Options.options.test_wrapper + ' ' + test
-        if name == '':
-            name = test
-
-        proc = subprocess.Popen(cmd, shell=True,
-                                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        out = proc.communicate()
-        returncode = proc.returncode
-
-    success = desired_status is None or returncode == desired_status
-    if success:
-        if not quiet:
-            Logs.pprint('GREEN', '[       OK ] %s' % name)
-    else:
-        Logs.pprint('RED', '[  FAILED  ] %s' % name)
-        ctx.autowaf_tests_failed += 1
-        ctx.autowaf_local_tests_failed += 1
-        ctx.autowaf_tests[appname]['failed'] += 1
-        if type(test) != list and not callable(test):
-            Logs.pprint('RED', test)
-
-    if Options.options.verbose and type(test) != list and not callable(test):
-        sys.stdout.write(out[0].decode('utf-8'))
-        sys.stderr.write(out[1].decode('utf-8'))
-
-    return (success, out)
-
-def tests_name(ctx, appname, name='*'):
-    if name == '*':
-        return appname
-    else:
-        return '%s.%s' % (appname, name)
+            test = [Options.options.test_wrapper] + test
 
-def begin_tests(ctx, appname, name='*'):
-    ctx.autowaf_local_tests_failed = 0
-    ctx.autowaf_local_tests_total  = 0
-    ctx.autowaf_local_tests_start_time = bench_time()
-    Logs.pprint('GREEN', '\n[----------] %s' % (
-        tests_name(ctx, appname, name)))
+        output = TestOutput(expected)
+        with open(os.devnull, 'wb') as null:
+            out = null if verbosity < 3 and not stdout else stdout
+            err = null if verbosity < 2 and not stderr else stderr
+            proc = subprocess.Popen(test, stdin=stdin, stdout=out, stderr=err)
+            output.stdout, output.stderr = proc.communicate()
+            output.result = proc.returncode
 
-    class Handle:
-        def __enter__(self):
-            pass
+        if output and verbosity > 0:
+            self.tst.log_good('      OK', name)
 
-        def __exit__(self, type, value, traceback):
-            end_tests(ctx, appname, name)
+        return output
 
-    return Handle()
+class TestContext(Build.BuildContext):
+    "runs test suite"
+    fun = cmd = 'test'
 
-def end_tests(ctx, appname, name='*'):
-    duration = (bench_time() - ctx.autowaf_local_tests_start_time) * 1000.0
-    total = ctx.autowaf_local_tests_total
-    failures = ctx.autowaf_local_tests_failed
-    if failures == 0:
-        Logs.pprint('GREEN', '[----------] %d tests from %s (%d ms total)' % (
-            ctx.autowaf_local_tests_total, tests_name(ctx, appname, name), duration))
-    else:
-        Logs.pprint('RED', '[----------] %d/%d tests from %s (%d ms total)' % (
-            total - failures, total, tests_name(ctx, appname, name), duration))
-
-def run_tests(ctx,
-              appname,
-              tests,
-              desired_status=0,
-              dirs=['src'],
-              name='*',
-              headers=False):
-    begin_tests(ctx, appname, name)
-
-    diropts  = ''
-    for i in dirs:
-        diropts += ' -d ' + i
-
-    for i in tests:
-        run_test(ctx, appname, i, desired_status, dirs, i, headers)
-
-    end_tests(ctx, appname, name)
+    def __init__(self, **kwargs):
+        super(TestContext, self).__init__(**kwargs)
+        self.start_time = bench_time()
+        self.max_depth = 1
+
+        defaults = {'verbosity': Options.options.verbose}
+        self.stack = [TestScope(self, Context.g_module.APPNAME, defaults)]
+
+    def defaults(self):
+        return self.stack[-1].defaults
+
+    def finalize(self):
+        if self.stack[-1].n_failed > 0:
+            sys.exit(1)
+
+        super(TestContext, self).finalize()
+
+    def __call__(self, test, **kwargs):
+        return self.stack[-1].run(test, **self.args(**kwargs))
+
+    def file_equals(self, from_path, to_path, **kwargs):
+        kwargs.update({'expected': True,
+                       'name': '%s == %s' % (from_path, to_path)})
+        return self(lambda: test_file_equals(from_path, to_path), **kwargs)
+
+    def log_good(self, title, fmt, *args):
+        Logs.pprint('GREEN', '[%s] %s' % (title.center(10), fmt % args))
+
+    def log_bad(self, title, fmt, *args):
+        Logs.pprint('RED', '[%s] %s' % (title.center(10), fmt % args))
+
+    def pre_recurse(self, node):
+        wscript_module = Context.load_module(node.abspath())
+        group_name = wscript_module.APPNAME
+        self.stack.append(TestScope(self, group_name, self.defaults()))
+        self.max_depth = max(self.max_depth, len(self.stack) - 1)
+
+        bld_dir = node.get_bld().parent
+        if bld_dir != self.path.get_bld():
+            Logs.info('')
+
+        self.original_dir = os.getcwd()
+        Logs.info("Waf: Entering directory `%s'\n", bld_dir)
+        os.chdir(str(bld_dir))
+
+        if str(node.parent) == Context.top_dir:
+            self.clear_coverage()
+
+        self.log_good('=' * 10, 'Running %s tests', group_name)
+        super(TestContext, self).pre_recurse(node)
+
+    def test_result(self, success):
+        self.stack[-1].n_total += 1
+        self.stack[-1].n_failed += 1 if not success else 0
+        return success
+
+    def pop(self):
+        scope = self.stack.pop()
+        self.stack[-1].n_total += scope.n_total
+        self.stack[-1].n_failed += scope.n_failed
+        return scope
+
+    def post_recurse(self, node):
+        super(TestContext, self).post_recurse(node)
+
+        scope = self.pop()
+        duration = (bench_time() - self.start_time) * 1000.0
+        is_top = str(node.parent) == str(Context.top_dir)
+
+        if is_top and self.max_depth > 1:
+            Logs.info('')
+
+        self.log_good('=' * 10, '%d tests from %s ran (%d ms total)',
+                      scope.n_total, scope.name, duration)
+
+        if not self.env.NO_COVERAGE:
+            if is_top:
+                self.gen_coverage()
+
+            if os.path.exists('coverage/index.html'):
+                self.log_good('COVERAGE', '<file://%s>',
+                              os.path.abspath('coverage/index.html'))
+
+        successes = scope.n_total - scope.n_failed
+        Logs.pprint('GREEN', '[  PASSED  ] %d tests' % successes)
+        if scope.n_failed > 0:
+            Logs.pprint('RED', '[  FAILED  ] %d tests' % scope.n_failed)
+        if is_top:
+            Logs.info("\nWaf: Leaving directory `%s'" % os.getcwd())
+
+        os.chdir(self.original_dir)
+
+    def execute(self):
+        self.restore()
+        if not self.all_envs:
+            self.load_envs()
+
+        if not self.env.BUILD_TESTS:
+            self.fatal('Configuration does not include tests')
+
+        with ExecutionEnvironment(self.env.AUTOWAF_RUN_ENV) as env:
+            if self.defaults()['verbosity'] > 0:
+                Logs.pprint('GREEN', str(env) + '\n')
+            self.recurse([self.run_dir])
+
+    def src_path(self, path):
+        return os.path.relpath(os.path.join(str(self.path), path))
+
+    def args(self, **kwargs):
+        all_kwargs = self.defaults().copy()
+        all_kwargs.update(kwargs)
+        return all_kwargs
+
+    def group(self, name, **kwargs):
+        return TestGroup(
+            self, self.stack[-1].name, name, **self.args(**kwargs))
+
+    def set_test_defaults(self, **kwargs):
+        """Set default arguments to be passed to all tests"""
+        self.stack[-1].defaults.update(kwargs)
+
+    def clear_coverage(self):
+        """Zero old coverage data"""
+        try:
+            with open('cov-clear.log', 'w') as log:
+                subprocess.call(['lcov', '-z', '-d', str(self.path)],
+                                stdout=log, stderr=log)
+
+        except Exception:
+            Logs.warn('Failed to run lcov to clear old coverage data')
+
+    def gen_coverage(self):
+        """Generate coverage data and report"""
+        try:
+            with open('cov.lcov', 'w') as out:
+                with open('cov.log', 'w') as err:
+                    subprocess.call(['lcov', '-c', '--no-external',
+                                     '--rc', 'lcov_branch_coverage=1',
+                                     '-b', '.',
+                                     '-d', str(self.path)],
+                                    stdout=out, stderr=err)
+
+            if not os.path.isdir('coverage'):
+                os.makedirs('coverage')
+
+            with open('genhtml.log', 'w') as log:
+                subprocess.call(['genhtml',
+                                 '-o', 'coverage',
+                                 '--rc', 'genhtml_branch_coverage=1',
+                                 'cov.lcov'],
+                                stdout=log, stderr=log)
+
+        except Exception:
+            Logs.warn('Failed to run lcov to generate coverage report')
+
+class TestGroup:
+    def __init__(self, tst, suitename, name, **kwargs):
+        self.tst = tst
+        self.suitename = suitename
+        self.name = name
+        self.kwargs = kwargs
+        self.start_time = bench_time()
+        tst.stack.append(TestScope(tst, name, tst.defaults()))
+
+    def label(self):
+        return self.suitename + '.%s' % self.name if self.name else ''
+
+    def args(self, **kwargs):
+        all_kwargs = self.tst.args(**self.kwargs)
+        all_kwargs.update(kwargs)
+        return all_kwargs
+
+    def __enter__(self):
+        if 'verbosity' in self.kwargs and self.kwargs['verbosity'] > 0:
+            self.tst.log_good('-' * 10, self.label())
+        return self
+
+    def __call__(self, test, **kwargs):
+        return self.tst(test, **self.args(**kwargs))
+
+    def file_equals(self, from_path, to_path, **kwargs):
+        return self.tst.file_equals(from_path, to_path, **kwargs)
+
+    def __exit__(self, type, value, traceback):
+        duration = (bench_time() - self.start_time) * 1000.0
+        scope = self.tst.pop()
+        n_passed = scope.n_total - scope.n_failed
+        if scope.n_failed == 0:
+            self.tst.log_good('-' * 10, '%d tests from %s (%d ms total)',
+                              scope.n_total, self.label(), duration)
+        else:
+            self.tst.log_bad('-' * 10, '%d/%d tests from %s (%d ms total)',
+                             n_passed, scope.n_total, self.label(), duration)
 
 def run_ldconfig(ctx):
     should_run = (ctx.cmd == 'install' and
diff --git a/waflib/extras/batched_cc.py b/extras/batched_cc.py
index aad2872..aad2872 100644
--- a/waflib/extras/batched_cc.py
+++ b/extras/batched_cc.py
diff --git a/waflib/extras/biber.py b/extras/biber.py
index fd9db4e..fd9db4e 100644
--- a/waflib/extras/biber.py
+++ b/extras/biber.py
diff --git a/waflib/extras/bjam.py b/extras/bjam.py
index 8e04d3a..8e04d3a 100644
--- a/waflib/extras/bjam.py
+++ b/extras/bjam.py
diff --git a/waflib/extras/blender.py b/extras/blender.py
index e5efc28..e5efc28 100644
--- a/waflib/extras/blender.py
+++ b/extras/blender.py
diff --git a/waflib/extras/boo.py b/extras/boo.py
index 06623d4..06623d4 100644
--- a/waflib/extras/boo.py
+++ b/extras/boo.py
diff --git a/waflib/extras/boost.py b/extras/boost.py
index c2aaaa9..c2aaaa9 100644
--- a/waflib/extras/boost.py
+++ b/extras/boost.py
diff --git a/waflib/extras/build_file_tracker.py b/extras/build_file_tracker.py
index c4f26fd..c4f26fd 100644
--- a/waflib/extras/build_file_tracker.py
+++ b/extras/build_file_tracker.py
diff --git a/waflib/extras/build_logs.py b/extras/build_logs.py
index cdf8ed0..cdf8ed0 100644
--- a/waflib/extras/build_logs.py
+++ b/extras/build_logs.py
diff --git a/waflib/extras/buildcopy.py b/extras/buildcopy.py
index a6d9ac8..eaff7e6 100644
--- a/waflib/extras/buildcopy.py
+++ b/extras/buildcopy.py
@@ -22,7 +22,7 @@ Examples::
 
 """
 import os, shutil
-from waflib import Errors, Task, TaskGen, Utils, Node
+from waflib import Errors, Task, TaskGen, Utils, Node, Logs
 
 @TaskGen.before_method('process_source')
 @TaskGen.feature('buildcopy')
@@ -58,10 +58,13 @@ def make_buildcopy(self):
 		raise Errors.WafError('buildcopy: File not found in src: %s'%os.path.join(*lst))
 
 	nodes = [ to_src_nodes(n) for n in getattr(self, 'buildcopy_source', getattr(self, 'source', [])) ]
+	if not nodes:
+		Logs.warn('buildcopy: No source files provided to buildcopy in %s (set `buildcopy_source` or `source`)',
+			self)
+		return
 	node_pairs = [(n, n.get_bld()) for n in nodes]
 	self.create_task('buildcopy', [n[0] for n in node_pairs], [n[1] for n in node_pairs], node_pairs=node_pairs)
 
-
 class buildcopy(Task.Task):
 	"""
 	Copy for each pair `n` in `node_pairs`: n[0] -> n[1].
diff --git a/waflib/extras/c_bgxlc.py b/extras/c_bgxlc.py
index 6e3eaf7..6e3eaf7 100644
--- a/waflib/extras/c_bgxlc.py
+++ b/extras/c_bgxlc.py
diff --git a/waflib/extras/c_dumbpreproc.py b/extras/c_dumbpreproc.py
index ce9e1a4..ce9e1a4 100644
--- a/waflib/extras/c_dumbpreproc.py
+++ b/extras/c_dumbpreproc.py
diff --git a/waflib/extras/c_emscripten.py b/extras/c_emscripten.py
index e1ac494..e1ac494 100644
--- a/waflib/extras/c_emscripten.py
+++ b/extras/c_emscripten.py
diff --git a/waflib/extras/c_nec.py b/extras/c_nec.py
index 96bfae4..96bfae4 100644
--- a/waflib/extras/c_nec.py
+++ b/extras/c_nec.py
diff --git a/waflib/extras/cabal.py b/extras/cabal.py
index e10a0d1..e10a0d1 100644
--- a/waflib/extras/cabal.py
+++ b/extras/cabal.py
diff --git a/waflib/extras/cfg_altoptions.py b/extras/cfg_altoptions.py
index 47b1189..47b1189 100644
--- a/waflib/extras/cfg_altoptions.py
+++ b/extras/cfg_altoptions.py
diff --git a/waflib/extras/clang_compilation_database.py b/extras/clang_compilation_database.py
index 4d9b5e2..4d9b5e2 100644
--- a/waflib/extras/clang_compilation_database.py
+++ b/extras/clang_compilation_database.py
diff --git a/waflib/extras/codelite.py b/extras/codelite.py
index 523302c..523302c 100644
--- a/waflib/extras/codelite.py
+++ b/extras/codelite.py
diff --git a/waflib/extras/color_gcc.py b/extras/color_gcc.py
index b68c5eb..b68c5eb 100644
--- a/waflib/extras/color_gcc.py
+++ b/extras/color_gcc.py
diff --git a/waflib/extras/color_rvct.py b/extras/color_rvct.py
index f89ccbd..f89ccbd 100644
--- a/waflib/extras/color_rvct.py
+++ b/extras/color_rvct.py
diff --git a/waflib/extras/compat15.py b/extras/compat15.py
index 0e74df8..0e74df8 100644
--- a/waflib/extras/compat15.py
+++ b/extras/compat15.py
diff --git a/waflib/extras/cppcheck.py b/extras/cppcheck.py
index 13ff424..13ff424 100644
--- a/waflib/extras/cppcheck.py
+++ b/extras/cppcheck.py
diff --git a/waflib/extras/cpplint.py b/extras/cpplint.py
index e3302e5..8cdd6dd 100644
--- a/waflib/extras/cpplint.py
+++ b/extras/cpplint.py
@@ -43,12 +43,12 @@ from waflib import Errors, Task, TaskGen, Logs, Options, Node, Utils
 
 critical_errors = 0
 CPPLINT_FORMAT = '[CPPLINT] %(filename)s:\nline %(linenum)s, severity %(confidence)s, category: %(category)s\n%(message)s\n'
-RE_EMACS = re.compile('(?P<filename>.*):(?P<linenum>\d+):  (?P<message>.*)  \[(?P<category>.*)\] \[(?P<confidence>\d+)\]')
+RE_EMACS = re.compile(r'(?P<filename>.*):(?P<linenum>\d+):  (?P<message>.*)  \[(?P<category>.*)\] \[(?P<confidence>\d+)\]')
 CPPLINT_RE = {
     'waf': RE_EMACS,
     'emacs': RE_EMACS,
-    'vs7': re.compile('(?P<filename>.*)\((?P<linenum>\d+)\):  (?P<message>.*)  \[(?P<category>.*)\] \[(?P<confidence>\d+)\]'),
-    'eclipse': re.compile('(?P<filename>.*):(?P<linenum>\d+): warning: (?P<message>.*)  \[(?P<category>.*)\] \[(?P<confidence>\d+)\]'),
+    'vs7': re.compile(r'(?P<filename>.*)\((?P<linenum>\d+)\):  (?P<message>.*)  \[(?P<category>.*)\] \[(?P<confidence>\d+)\]'),
+    'eclipse': re.compile(r'(?P<filename>.*):(?P<linenum>\d+): warning: (?P<message>.*)  \[(?P<category>.*)\] \[(?P<confidence>\d+)\]'),
 }
 CPPLINT_STR = ('${CPPLINT} '
                '--verbose=${CPPLINT_LEVEL} '
diff --git a/waflib/extras/cross_gnu.py b/extras/cross_gnu.py
index 309f53b..309f53b 100644
--- a/waflib/extras/cross_gnu.py
+++ b/extras/cross_gnu.py
diff --git a/waflib/extras/cython.py b/extras/cython.py
index 481d6f4..591c274 100644
--- a/waflib/extras/cython.py
+++ b/extras/cython.py
@@ -8,8 +8,9 @@ from waflib.TaskGen import extension
 
 cy_api_pat = re.compile(r'\s*?cdef\s*?(public|api)\w*')
 re_cyt = re.compile(r"""
-	(?:from\s+(\w+)\s+)?   # optionally match "from foo" and capture foo
-	c?import\s(\w+|[*])    # require "import bar" and capture bar
+	^\s*                           # must begin with some whitespace characters
+	(?:from\s+(\w+)(?:\.\w+)*\s+)? # optionally match "from foo(.baz)" and capture foo
+	c?import\s(\w+|[*])            # require "import bar" and capture bar
 	""", re.M | re.VERBOSE)
 
 @extension('.pyx')
@@ -85,12 +86,12 @@ class cython(Task.Task):
 		node = self.inputs[0]
 		txt = node.read()
 
-		mods = []
+		mods = set()
 		for m in re_cyt.finditer(txt):
 			if m.group(1):  # matches "from foo import bar"
-				mods.append(m.group(1))
+				mods.add(m.group(1))
 			else:
-				mods.append(m.group(2))
+				mods.add(m.group(2))
 
 		Logs.debug('cython: mods %r', mods)
 		incs = getattr(self.generator, 'cython_includes', [])
@@ -99,7 +100,7 @@ class cython(Task.Task):
 
 		found = []
 		missing = []
-		for x in mods:
+		for x in sorted(mods):
 			for y in incs:
 				k = y.find_resource(x + '.pxd')
 				if k:
diff --git a/waflib/extras/dcc.py b/extras/dcc.py
index c1a57c0..c1a57c0 100644
--- a/waflib/extras/dcc.py
+++ b/extras/dcc.py
diff --git a/waflib/extras/distnet.py b/extras/distnet.py
index 09a31a6..ff3ed8e 100644
--- a/waflib/extras/distnet.py
+++ b/extras/distnet.py
@@ -44,7 +44,7 @@ TARFORMAT = 'w:bz2'
 TIMEOUT = 60
 REQUIRES = 'requires.txt'
 
-re_com = re.compile('\s*#.*', re.M)
+re_com = re.compile(r'\s*#.*', re.M)
 
 def total_version_order(num):
 	lst = num.split('.')
diff --git a/waflib/extras/doxygen.py b/extras/doxygen.py
index 28f56e9..28f56e9 100644
--- a/waflib/extras/doxygen.py
+++ b/extras/doxygen.py
diff --git a/waflib/extras/dpapi.py b/extras/dpapi.py
index b94d482..b94d482 100644
--- a/waflib/extras/dpapi.py
+++ b/extras/dpapi.py
diff --git a/waflib/extras/eclipse.py b/extras/eclipse.py
index bb78741..bb78741 100644
--- a/waflib/extras/eclipse.py
+++ b/extras/eclipse.py
diff --git a/waflib/extras/erlang.py b/extras/erlang.py
index 49f6d5b..0b93d9a 100644
--- a/waflib/extras/erlang.py
+++ b/extras/erlang.py
@@ -51,7 +51,7 @@ class erl(Task.Task):
 			if n.abspath() in scanned:
 				continue
 
-			for i in re.findall('-include\("(.*)"\)\.', n.read()):
+			for i in re.findall(r'-include\("(.*)"\)\.', n.read()):
 				for d in task.erlc_incnodes:
 					r = d.find_node(i)
 					if r:
diff --git a/waflib/extras/fast_partial.py b/extras/fast_partial.py
index b3af513..d5b6144 100644
--- a/waflib/extras/fast_partial.py
+++ b/extras/fast_partial.py
@@ -17,7 +17,7 @@ Usage::
 	def options(opt):
 		opt.load('fast_partial')
 
-Assuptions:
+Assumptions:
 * Mostly for C/C++/Fortran targets with link tasks (object-only targets are not handled)
 * For full project builds: no --targets and no pruning from subfolders
 * The installation phase is ignored
diff --git a/waflib/extras/fc_bgxlf.py b/extras/fc_bgxlf.py
index cca1810..cca1810 100644
--- a/waflib/extras/fc_bgxlf.py
+++ b/extras/fc_bgxlf.py
diff --git a/waflib/extras/fc_cray.py b/extras/fc_cray.py
index da733fa..da733fa 100644
--- a/waflib/extras/fc_cray.py
+++ b/extras/fc_cray.py
diff --git a/waflib/extras/fc_nag.py b/extras/fc_nag.py
index edcb218..edcb218 100644
--- a/waflib/extras/fc_nag.py
+++ b/extras/fc_nag.py
diff --git a/waflib/extras/fc_nec.py b/extras/fc_nec.py
index 67c8680..67c8680 100644
--- a/waflib/extras/fc_nec.py
+++ b/extras/fc_nec.py
diff --git a/extras/fc_nfort.py b/extras/fc_nfort.py
new file mode 100644
index 0000000..c25886b
--- /dev/null
+++ b/extras/fc_nfort.py
@@ -0,0 +1,52 @@
+#! /usr/bin/env python
+# encoding: utf-8
+# Detection of the NEC Fortran compiler for Aurora Tsubasa
+
+import re
+from waflib.Tools import fc,fc_config,fc_scan
+from waflib.Configure import conf
+from waflib.Tools.compiler_fc import fc_compiler
+fc_compiler['linux'].append('fc_nfort')
+
+@conf
+def find_nfort(conf):
+	fc=conf.find_program(['nfort'],var='FC')
+	conf.get_nfort_version(fc)
+	conf.env.FC_NAME='NFORT'
+	conf.env.FC_MOD_CAPITALIZATION='lower'
+
+@conf
+def nfort_flags(conf):
+	v=conf.env
+	v['_FCMODOUTFLAGS']=[]
+	v['FCFLAGS_DEBUG']=[]
+	v['FCFLAGS_fcshlib']=[]
+	v['LINKFLAGS_fcshlib']=[]
+	v['FCSTLIB_MARKER']=''
+	v['FCSHLIB_MARKER']=''
+
+@conf
+def get_nfort_version(conf,fc):
+	version_re=re.compile(r"nfort\s*\(NFORT\)\s*(?P<major>\d+)\.(?P<minor>\d+)\.",re.I).search
+	cmd=fc+['--version']
+	out,err=fc_config.getoutput(conf,cmd,stdin=False)
+	if out:
+		match=version_re(out)
+	else:
+		match=version_re(err)
+	if not match:
+		return(False)
+		conf.fatal('Could not determine the NEC NFORT Fortran compiler version.')
+	else:
+		k=match.groupdict()
+		conf.env['FC_VERSION']=(k['major'],k['minor'])
+
+def configure(conf):
+	conf.find_nfort()
+	conf.find_program('nar',var='AR')
+	conf.add_os_flags('ARFLAGS')
+	if not conf.env.ARFLAGS:
+		conf.env.ARFLAGS=['rcs']
+	conf.fc_flags()
+	conf.fc_add_flags()
+	conf.nfort_flags()
diff --git a/waflib/extras/fc_open64.py b/extras/fc_open64.py
index 413719f..413719f 100644
--- a/waflib/extras/fc_open64.py
+++ b/extras/fc_open64.py
diff --git a/waflib/extras/fc_pgfortran.py b/extras/fc_pgfortran.py
index afb2817..afb2817 100644
--- a/waflib/extras/fc_pgfortran.py
+++ b/extras/fc_pgfortran.py
diff --git a/waflib/extras/fc_solstudio.py b/extras/fc_solstudio.py
index 53766df..53766df 100644
--- a/waflib/extras/fc_solstudio.py
+++ b/extras/fc_solstudio.py
diff --git a/waflib/extras/fc_xlf.py b/extras/fc_xlf.py
index 5a3da03..5a3da03 100644
--- a/waflib/extras/fc_xlf.py
+++ b/extras/fc_xlf.py
diff --git a/waflib/extras/file_to_object.py b/extras/file_to_object.py
index 1393b51..1393b51 100644
--- a/waflib/extras/file_to_object.py
+++ b/extras/file_to_object.py
diff --git a/waflib/extras/fluid.py b/extras/fluid.py
index 4814a35..4814a35 100644
--- a/waflib/extras/fluid.py
+++ b/extras/fluid.py
diff --git a/waflib/extras/freeimage.py b/extras/freeimage.py
index f27e525..f27e525 100644
--- a/waflib/extras/freeimage.py
+++ b/extras/freeimage.py
diff --git a/waflib/extras/fsb.py b/extras/fsb.py
index 1b8f398..1b8f398 100644
--- a/waflib/extras/fsb.py
+++ b/extras/fsb.py
diff --git a/waflib/extras/fsc.py b/extras/fsc.py
index c67e70b..c67e70b 100644
--- a/waflib/extras/fsc.py
+++ b/extras/fsc.py
diff --git a/waflib/extras/gccdeps.py b/extras/gccdeps.py
index d9758ab..bfabe72 100644
--- a/waflib/extras/gccdeps.py
+++ b/extras/gccdeps.py
@@ -36,7 +36,7 @@ def scan(self):
 	names = []
 	return (nodes, names)
 
-re_o = re.compile("\.o$")
+re_o = re.compile(r"\.o$")
 re_splitter = re.compile(r'(?<!\\)\s+') # split by space, except when spaces are escaped
 
 def remove_makefile_rule_lhs(line):
@@ -197,7 +197,7 @@ def configure(conf):
 		except Errors.ConfigurationError:
 			pass
 		else:
-			conf.env.append_value('CFLAGS', gccdeps_flags)
+			conf.env.append_value('CFLAGS', flags)
 			conf.env.append_unique('ENABLE_GCCDEPS', 'c')
 
 	if conf.env.CXX_NAME in supported_compilers:
@@ -206,7 +206,7 @@ def configure(conf):
 		except Errors.ConfigurationError:
 			pass
 		else:
-			conf.env.append_value('CXXFLAGS', gccdeps_flags)
+			conf.env.append_value('CXXFLAGS', flags)
 			conf.env.append_unique('ENABLE_GCCDEPS', 'cxx')
 
 def options(opt):
diff --git a/waflib/extras/gdbus.py b/extras/gdbus.py
index 0e0476e..0e0476e 100644
--- a/waflib/extras/gdbus.py
+++ b/extras/gdbus.py
diff --git a/waflib/extras/gob2.py b/extras/gob2.py
index b4fa3b9..b4fa3b9 100644
--- a/waflib/extras/gob2.py
+++ b/extras/gob2.py
diff --git a/waflib/extras/halide.py b/extras/halide.py
index 6078e38..6078e38 100644
--- a/waflib/extras/halide.py
+++ b/extras/halide.py
diff --git a/waflib/extras/javatest.py b/extras/javatest.py
index 979b8d8..979b8d8 100755
--- a/waflib/extras/javatest.py
+++ b/extras/javatest.py
diff --git a/waflib/extras/kde4.py b/extras/kde4.py
index e49a9ec..aed9bfb 100644
--- a/waflib/extras/kde4.py
+++ b/extras/kde4.py
@@ -71,7 +71,7 @@ def configure(self):
 	fu = re.compile('#(.*)\n')
 	txt = fu.sub('', txt)
 
-	setregexp = re.compile('([sS][eE][tT]\s*\()\s*([^\s]+)\s+\"([^"]+)\"\)')
+	setregexp = re.compile(r'([sS][eE][tT]\s*\()\s*([^\s]+)\s+\"([^"]+)\"\)')
 	found = setregexp.findall(txt)
 
 	for (_, key, val) in found:
diff --git a/waflib/extras/local_rpath.py b/extras/local_rpath.py
index b2507e1..b2507e1 100644
--- a/waflib/extras/local_rpath.py
+++ b/extras/local_rpath.py
diff --git a/waflib/extras/lv2.py b/extras/lv2.py
index 815987f..ffcb2e7 100644
--- a/waflib/extras/lv2.py
+++ b/extras/lv2.py
@@ -10,6 +10,33 @@ def options(opt):
                          help='install LV2 bundles to user location')
     conf_opts.add_option('--lv2dir', type='string',
                          help='LV2 bundles [Default: LIBDIR/lv2]')
+
+def register_lv2_path(conf, path):
+    """Return the default LV2_PATH to use for this system"""
+    if 'LV2_PATH' not in conf.run_env and 'LV2_PATH' not in os.environ:
+        conf.run_env['LV2_PATH'] = [conf.env['LV2DIR']]
+
+    conf.run_env.append_unique('LV2_PATH', path)
+
+def default_lv2_path(conf):
+    """Return the default LV2_PATH for the build target as a list"""
+    if conf.env.DEST_OS == 'darwin':
+        return ['~/Library/Audio/Plug-Ins/LV2',
+                '~/.lv2',
+                '/usr/local/lib/lv2',
+                '/usr/lib/lv2',
+                '/Library/Audio/Plug-Ins/LV2']
+    elif conf.env.DEST_OS == 'haiku':
+        return ['~/.lv2',
+                '/boot/common/add-ons/lv2']
+    elif conf.env.DEST_OS == 'win32':
+        return ['%APPDATA%\\\\LV2',
+                '%COMMONPROGRAMFILES%\\\\LV2']
+    else:
+        libdirname = os.path.basename(conf.env.LIBDIR)
+        return ['~/.lv2',
+                '/usr/%s/lv2' % libdirname,
+                '/usr/local/%s/lv2' % libdirname]
     
 def configure(conf):
     def env_path(parent_dir_var, name):
@@ -43,5 +70,6 @@ def configure(conf):
         else:
             conf.env['LV2DIR'] = os.path.join(conf.env['LIBDIR'], 'lv2')
 
-    conf.env['LV2DIR'] = normpath(conf.env['LV2DIR'])
-
+    # Add default LV2_PATH to runtime environment for tests that use plugins
+    if 'LV2_PATH' not in os.environ:
+        conf.run_env['LV2_PATH'] = default_lv2_path(conf)
diff --git a/waflib/extras/make.py b/extras/make.py
index 933d9ca..933d9ca 100644
--- a/waflib/extras/make.py
+++ b/extras/make.py
diff --git a/waflib/extras/midl.py b/extras/midl.py
index 43e6cf9..43e6cf9 100644
--- a/waflib/extras/midl.py
+++ b/extras/midl.py
diff --git a/waflib/extras/msvcdeps.py b/extras/msvcdeps.py
index fc1ecd4..fc1ecd4 100644
--- a/waflib/extras/msvcdeps.py
+++ b/extras/msvcdeps.py
diff --git a/waflib/extras/msvs.py b/extras/msvs.py
index 8aa2db0..8aa2db0 100644
--- a/waflib/extras/msvs.py
+++ b/extras/msvs.py
diff --git a/waflib/extras/netcache_client.py b/extras/netcache_client.py
index dc49048..dc49048 100644
--- a/waflib/extras/netcache_client.py
+++ b/extras/netcache_client.py
diff --git a/waflib/extras/objcopy.py b/extras/objcopy.py
index 82d8359..82d8359 100644
--- a/waflib/extras/objcopy.py
+++ b/extras/objcopy.py
diff --git a/waflib/extras/ocaml.py b/extras/ocaml.py
index afe73c0..7d785c6 100644
--- a/waflib/extras/ocaml.py
+++ b/extras/ocaml.py
@@ -15,7 +15,7 @@ EXT_MLI = ['.mli']
 EXT_MLC = ['.c']
 EXT_ML  = ['.ml']
 
-open_re = re.compile('^\s*open\s+([a-zA-Z]+)(;;){0,1}$', re.M)
+open_re = re.compile(r'^\s*open\s+([a-zA-Z]+)(;;){0,1}$', re.M)
 foo = re.compile(r"""(\(\*)|(\*\))|("(\\.|[^"\\])*"|'(\\.|[^'\\])*'|.[^()*"'\\]*)""", re.M)
 def filter_comments(txt):
 	meh = [0]
diff --git a/waflib/extras/package.py b/extras/package.py
index c06498e..c06498e 100644
--- a/waflib/extras/package.py
+++ b/extras/package.py
diff --git a/waflib/extras/parallel_debug.py b/extras/parallel_debug.py
index 35883a3..4ffec5e 100644
--- a/waflib/extras/parallel_debug.py
+++ b/extras/parallel_debug.py
@@ -3,13 +3,16 @@
 # Thomas Nagy, 2007-2010 (ita)
 
 """
-Debugging helper for parallel compilation, outputs
-a file named pdebug.svg in the source directory::
+Debugging helper for parallel compilation.
+
+Copy it to your project and load it with::
 
 	def options(opt):
-		opt.load('parallel_debug')
+		opt.load('parallel_debug', tooldir='.')
 	def build(bld):
 		...
+
+The build will then output a file named pdebug.svg in the source directory.
 """
 
 import re, sys, threading, time, traceback
diff --git a/waflib/extras/pch.py b/extras/pch.py
index 103e752..103e752 100644
--- a/waflib/extras/pch.py
+++ b/extras/pch.py
diff --git a/waflib/extras/pep8.py b/extras/pep8.py
index 676beed..676beed 100644
--- a/waflib/extras/pep8.py
+++ b/extras/pep8.py
diff --git a/waflib/extras/pgicc.py b/extras/pgicc.py
index 9790b9c..f8068d5 100644
--- a/waflib/extras/pgicc.py
+++ b/extras/pgicc.py
@@ -60,7 +60,7 @@ def get_pgi_version(conf, cc):
 	except Errors.WafError:
 		conf.fatal('Could not find pgi compiler %r' % cmd)
 
-	version = re.findall('^COMPVER\s*=(.*)', out, re.M)
+	version = re.findall(r'^COMPVER\s*=(.*)', out, re.M)
 	if len(version) != 1:
 		conf.fatal('Could not determine the compiler version')
 	return version[0]
diff --git a/waflib/extras/pgicxx.py b/extras/pgicxx.py
index eae121c..eae121c 100644
--- a/waflib/extras/pgicxx.py
+++ b/extras/pgicxx.py
diff --git a/waflib/extras/proc.py b/extras/proc.py
index 764abec..764abec 100644
--- a/waflib/extras/proc.py
+++ b/extras/proc.py
diff --git a/waflib/extras/protoc.py b/extras/protoc.py
index f3cb4d8..839c510 100644
--- a/waflib/extras/protoc.py
+++ b/extras/protoc.py
@@ -6,7 +6,7 @@
 import re, os
 from waflib.Task import Task
 from waflib.TaskGen import extension
-from waflib import Errors, Context
+from waflib import Errors, Context, Logs
 
 """
 A simple tool to integrate protocol buffers into your build system.
@@ -67,6 +67,13 @@ Example for Java:
                 protoc_includes = ['inc']) # for protoc to search dependencies
 
 
+Protoc includes passed via protoc_includes are either relative to the taskgen
+or to the project and are searched in this order.
+
+Include directories external to the waf project can also be passed to the
+extra by using protoc_extincludes
+
+                protoc_extincludes = ['/usr/include/pblib']
 
 
 Notes when using this tool:
@@ -82,7 +89,7 @@ Notes when using this tool:
 """
 
 class protoc(Task):
-	run_str = '${PROTOC} ${PROTOC_FL:PROTOC_FLAGS} ${PROTOC_ST:INCPATHS} ${PROTOC_ST:PROTOC_INCPATHS} ${SRC[0].bldpath()}'
+	run_str = '${PROTOC} ${PROTOC_FL:PROTOC_FLAGS} ${PROTOC_ST:INCPATHS} ${PROTOC_ST:PROTOC_INCPATHS} ${PROTOC_ST:PROTOC_EXTINCPATHS} ${SRC[0].bldpath()}'
 	color   = 'BLUE'
 	ext_out = ['.h', 'pb.cc', '.py', '.java']
 	def scan(self):
@@ -104,7 +111,17 @@ class protoc(Task):
 
 		if 'py' in self.generator.features or 'javac' in self.generator.features:
 			for incpath in getattr(self.generator, 'protoc_includes', []):
-				search_nodes.append(self.generator.bld.path.find_node(incpath))
+				incpath_node = self.generator.path.find_node(incpath)
+				if incpath_node:
+					search_nodes.append(incpath_node)
+				else:
+					# Check if relative to top-level for extra tg dependencies
+					incpath_node = self.generator.bld.path.find_node(incpath)
+					if incpath_node:
+						search_nodes.append(incpath_node)
+					else:
+						raise Errors.WafError('protoc: include path %r does not exist' % incpath)
+
 
 		def parse_node(node):
 			if node in seen:
@@ -126,7 +143,7 @@ class protoc(Task):
 		parse_node(node)
 		# Add also dependencies path to INCPATHS so protoc will find the included file
 		for deppath in nodes:
-			self.env.append_value('INCPATHS', deppath.parent.bldpath())
+			self.env.append_unique('INCPATHS', deppath.parent.bldpath())
 		return (nodes, names)
 
 @extension('.proto')
@@ -153,61 +170,11 @@ def process_protoc(self, node):
 		protoc_flags.append('--python_out=%s' % node.parent.get_bld().bldpath())
 
 	if 'javac' in self.features:
-		pkgname, javapkg, javacn, nodename = None, None, None, None
-		messages = []
-
-		# .java file name is done with some rules depending on .proto file content:
-		#   -) package is either derived from option java_package if present
-		#      or from package directive
-		#   -) file name is either derived from option java_outer_classname if present
-		#      or the .proto file is converted to camelcase. If a message
-		#      is named the same then the behaviour depends on protoc version
-		#
-		# See also: https://developers.google.com/protocol-buffers/docs/reference/java-generated#invocation
-
-		code = node.read().splitlines()
-		for line in code:
-			m = re.search(r'^package\s+(.*);', line)
-			if m:
-				pkgname = m.groups()[0]
-			m = re.search(r'^option\s+(\S*)\s*=\s*"(\S*)";', line)
-			if m:
-				optname = m.groups()[0]
-				if optname == 'java_package':
-					javapkg = m.groups()[1]
-				elif optname == 'java_outer_classname':
-					javacn = m.groups()[1]
-			if self.env.PROTOC_MAJOR > '2':
-				m = re.search(r'^message\s+(\w*)\s*{*', line)
-				if m:
-					messages.append(m.groups()[0])
-
-		if javapkg:
-			nodename = javapkg
-		elif pkgname:
-			nodename = pkgname
-		else:
-			raise Errors.WafError('Cannot derive java name from protoc file')
-
-		nodename = nodename.replace('.',os.sep) + os.sep
-		if javacn:
-			nodename += javacn + '.java'
-		else:
-			if self.env.PROTOC_MAJOR > '2' and node.abspath()[node.abspath().rfind(os.sep)+1:node.abspath().rfind('.')].title() in messages:
-				nodename += node.abspath()[node.abspath().rfind(os.sep)+1:node.abspath().rfind('.')].title().replace('_','') + 'OuterClass.java'
-			else:
-				nodename += node.abspath()[node.abspath().rfind(os.sep)+1:node.abspath().rfind('.')].title().replace('_','') + '.java'
-
-		java_node = node.parent.find_or_declare(nodename)
-		out_nodes.append(java_node)
-		protoc_flags.append('--java_out=%s' % node.parent.get_bld().bldpath())
-
 		# Make javac get also pick java code generated in build
 		if not node.parent.get_bld() in self.javac_task.srcdir:
 			self.javac_task.srcdir.append(node.parent.get_bld())
 
-	if not out_nodes:
-		raise Errors.WafError('Feature %r not supported by protoc extra' % self.features)
+		protoc_flags.append('--java_out=%s' % node.parent.get_bld().bldpath())
 
 	tsk = self.create_task('protoc', node, out_nodes)
 	tsk.env.append_value('PROTOC_FLAGS', protoc_flags)
@@ -219,9 +186,22 @@ def process_protoc(self, node):
 	# For C++ standard include files dirs are used,
 	# but this doesn't apply to Python for example
 	for incpath in getattr(self, 'protoc_includes', []):
-		incdirs.append(self.path.find_node(incpath).bldpath())
+		incpath_node = self.path.find_node(incpath)
+		if incpath_node:
+			incdirs.append(incpath_node.bldpath())
+		else:
+			# Check if relative to top-level for extra tg dependencies
+			incpath_node = self.bld.path.find_node(incpath)
+			if incpath_node:
+				incdirs.append(incpath_node.bldpath())
+			else:
+				raise Errors.WafError('protoc: include path %r does not exist' % incpath)
+
 	tsk.env.PROTOC_INCPATHS = incdirs
 
+	# Include paths external to the waf project (ie. shared pb repositories)
+	tsk.env.PROTOC_EXTINCPATHS = getattr(self, 'protoc_extincludes', [])
+
 	# PR2115: protoc generates output of .proto files in nested
 	# directories  by canonicalizing paths. To avoid this we have to pass
 	# as first include the full directory file of the .proto file
diff --git a/waflib/extras/pyqt5.py b/extras/pyqt5.py
index c21dfa7..80f43b8 100644
--- a/waflib/extras/pyqt5.py
+++ b/extras/pyqt5.py
@@ -111,9 +111,9 @@ def apply_pyqt5(self):
 	"""
 	The additional parameters are:
 
-	:param lang: list of translation files (\*.ts) to process
+	:param lang: list of translation files (\\*.ts) to process
 	:type lang: list of :py:class:`waflib.Node.Node` or string without the .ts extension
-	:param langname: if given, transform the \*.ts files into a .qrc files to include in the binary file
+	:param langname: if given, transform the \\*.ts files into a .qrc files to include in the binary file
 	:type langname: :py:class:`waflib.Node.Node` or string without the .qrc extension
 	"""
 	if getattr(self, 'lang', None):
diff --git a/waflib/extras/pytest.py b/extras/pytest.py
index 7dd5a1a..7dd5a1a 100644
--- a/waflib/extras/pytest.py
+++ b/extras/pytest.py
diff --git a/waflib/extras/qnxnto.py b/extras/qnxnto.py
index 1158124..1158124 100644
--- a/waflib/extras/qnxnto.py
+++ b/extras/qnxnto.py
diff --git a/waflib/extras/qt4.py b/extras/qt4.py
index 90cae7e..d19a4dd 100644
--- a/waflib/extras/qt4.py
+++ b/extras/qt4.py
@@ -290,11 +290,11 @@ def apply_qt4(self):
 
 	The additional parameters are:
 
-	:param lang: list of translation files (\*.ts) to process
+	:param lang: list of translation files (\\*.ts) to process
 	:type lang: list of :py:class:`waflib.Node.Node` or string without the .ts extension
-	:param update: whether to process the C++ files to update the \*.ts files (use **waf --translate**)
+	:param update: whether to process the C++ files to update the \\*.ts files (use **waf --translate**)
 	:type update: bool
-	:param langname: if given, transform the \*.ts files into a .qrc files to include in the binary file
+	:param langname: if given, transform the \\*.ts files into a .qrc files to include in the binary file
 	:type langname: :py:class:`waflib.Node.Node` or string without the .qrc extension
 	"""
 	if getattr(self, 'lang', None):
diff --git a/waflib/extras/relocation.py b/extras/relocation.py
index 7e821f4..7e821f4 100644
--- a/waflib/extras/relocation.py
+++ b/extras/relocation.py
diff --git a/waflib/extras/remote.py b/extras/remote.py
index 3b038f7..f43b600 100644
--- a/waflib/extras/remote.py
+++ b/extras/remote.py
@@ -203,7 +203,7 @@ class remote(BuildContext):
 					Options.commands.remove(k)
 
 	def login_to_host(self, login):
-		return re.sub('(\w+@)', '', login)
+		return re.sub(r'(\w+@)', '', login)
 
 	def variant_to_login(self, variant):
 		"""linux_32_debug -> search env.LINUX_32 and then env.LINUX"""
diff --git a/waflib/extras/resx.py b/extras/resx.py
index caf4d31..caf4d31 100644
--- a/waflib/extras/resx.py
+++ b/extras/resx.py
diff --git a/waflib/extras/review.py b/extras/review.py
index 561e062..561e062 100644
--- a/waflib/extras/review.py
+++ b/extras/review.py
diff --git a/waflib/extras/rst.py b/extras/rst.py
index f3c3a5e..f3c3a5e 100644
--- a/waflib/extras/rst.py
+++ b/extras/rst.py
diff --git a/waflib/extras/run_do_script.py b/extras/run_do_script.py
index f3c5812..07e3aa2 100644
--- a/waflib/extras/run_do_script.py
+++ b/extras/run_do_script.py
@@ -101,7 +101,7 @@ class run_do_script(run_do_script_base):
 		with open(**kwargs) as log:
 			log_tail = log.readlines()[-10:]
 			for line in log_tail:
-				error_found = re.match("r\(([0-9]+)\)", line)
+				error_found = re.match(r"r\(([0-9]+)\)", line)
 				if error_found:
 					return error_found.group(1), ''.join(log_tail)
 				else:
diff --git a/waflib/extras/run_m_script.py b/extras/run_m_script.py
index b5f27eb..b5f27eb 100644
--- a/waflib/extras/run_m_script.py
+++ b/extras/run_m_script.py
diff --git a/waflib/extras/run_py_script.py b/extras/run_py_script.py
index 3670381..3670381 100644
--- a/waflib/extras/run_py_script.py
+++ b/extras/run_py_script.py
diff --git a/waflib/extras/run_r_script.py b/extras/run_r_script.py
index b0d8f2b..b0d8f2b 100644
--- a/waflib/extras/run_r_script.py
+++ b/extras/run_r_script.py
diff --git a/waflib/extras/sas.py b/extras/sas.py
index 754c614..754c614 100644
--- a/waflib/extras/sas.py
+++ b/extras/sas.py
diff --git a/waflib/extras/satellite_assembly.py b/extras/satellite_assembly.py
index 005eb07..005eb07 100644
--- a/waflib/extras/satellite_assembly.py
+++ b/extras/satellite_assembly.py
diff --git a/waflib/extras/scala.py b/extras/scala.py
index a9880f0..a9880f0 100644
--- a/waflib/extras/scala.py
+++ b/extras/scala.py
diff --git a/waflib/extras/slow_qt4.py b/extras/slow_qt4.py
index ec7880b..ec7880b 100644
--- a/waflib/extras/slow_qt4.py
+++ b/extras/slow_qt4.py
diff --git a/waflib/extras/softlink_libs.py b/extras/softlink_libs.py
index 50c777f..50c777f 100644
--- a/waflib/extras/softlink_libs.py
+++ b/extras/softlink_libs.py
diff --git a/waflib/extras/stale.py b/extras/stale.py
index cac3f46..cac3f46 100644
--- a/waflib/extras/stale.py
+++ b/extras/stale.py
diff --git a/waflib/extras/stracedeps.py b/extras/stracedeps.py
index 37d82cb..37d82cb 100644
--- a/waflib/extras/stracedeps.py
+++ b/extras/stracedeps.py
diff --git a/waflib/extras/swig.py b/extras/swig.py
index fd3d6d2..740ab46 100644
--- a/waflib/extras/swig.py
+++ b/extras/swig.py
@@ -17,10 +17,10 @@ tasks have to be added dynamically:
 
 SWIG_EXTS = ['.swig', '.i']
 
-re_module = re.compile('%module(?:\s*\(.*\))?\s+(.+)', re.M)
+re_module = re.compile(r'%module(?:\s*\(.*\))?\s+(.+)', re.M)
 
 re_1 = re.compile(r'^%module.*?\s+([\w]+)\s*?$', re.M)
-re_2 = re.compile('[#%]include [<"](.*)[">]', re.M)
+re_2 = re.compile(r'[#%](?:include|import(?:\(module=".*"\))+|python(?:begin|code)) [<"](.*)[">]', re.M)
 
 class swig(Task.Task):
 	color   = 'BLUE'
diff --git a/waflib/extras/syms.py b/extras/syms.py
index dfa0059..dfa0059 100644
--- a/waflib/extras/syms.py
+++ b/extras/syms.py
diff --git a/waflib/extras/ticgt.py b/extras/ticgt.py
index f43a7ea..f43a7ea 100644
--- a/waflib/extras/ticgt.py
+++ b/extras/ticgt.py
diff --git a/waflib/extras/unity.py b/extras/unity.py
index 78128ed..78128ed 100644
--- a/waflib/extras/unity.py
+++ b/extras/unity.py
diff --git a/waflib/extras/use_config.py b/extras/use_config.py
index ef5129f..ef5129f 100644
--- a/waflib/extras/use_config.py
+++ b/extras/use_config.py
diff --git a/waflib/extras/valadoc.py b/extras/valadoc.py
index c50f69e..c50f69e 100644
--- a/waflib/extras/valadoc.py
+++ b/extras/valadoc.py
diff --git a/waflib/extras/waf_xattr.py b/extras/waf_xattr.py
index 351dd63..351dd63 100644
--- a/waflib/extras/waf_xattr.py
+++ b/extras/waf_xattr.py
diff --git a/waflib/extras/why.py b/extras/why.py
index 1bb941f..1bb941f 100644
--- a/waflib/extras/why.py
+++ b/extras/why.py
diff --git a/waflib/extras/win32_opts.py b/extras/win32_opts.py
index 9f7443c..9f7443c 100644
--- a/waflib/extras/win32_opts.py
+++ b/extras/win32_opts.py
diff --git a/waflib/extras/wix.py b/extras/wix.py
index d87bfbb..d87bfbb 100644
--- a/waflib/extras/wix.py
+++ b/extras/wix.py
diff --git a/waflib/extras/xcode6.py b/extras/xcode6.py
index 91bbff1..91bbff1 100644
--- a/waflib/extras/xcode6.py
+++ b/extras/xcode6.py
diff --git a/waflib/fixpy2.py b/fixpy2.py
index 24176e0..24176e0 100644
--- a/waflib/fixpy2.py
+++ b/fixpy2.py
diff --git a/waflib/processor.py b/processor.py
index 2eecf3b..2eecf3b 100755
--- a/waflib/processor.py
+++ b/processor.py
diff --git a/src/cocoa_in_gtk2.mm b/src/cocoa_in_gtk2.mm
deleted file mode 100644
index 3ff87d0..0000000
--- a/src/cocoa_in_gtk2.mm
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
-  Copyright 2011-2017 David Robillard <http://drobilla.net>
-  Copyright 2014 Robin Gareus <robin@gareus.org>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#include <string.h>
-
-#include <gtk/gtk.h>
-#include <gdk/gdkquartz.h>
-
-#include "./suil_internal.h"
-
-#include "lv2/lv2plug.in/ns/ext/options/options.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
-#define NSEventTypeFlagsChanged     NSFlagsChanged
-#define NSEventTypeLeftMouseDown    NSLeftMouseDown
-#define NSEventTypeLeftMouseDragged NSLeftMouseDragged
-#define NSEventTypeLeftMouseUp      NSLeftMouseUp
-#define NSEventTypeMouseEntered     NSMouseEntered
-#define NSEventTypeMouseExited      NSMouseExited
-#define NSEventTypeMouseMoved       NSMouseMoved
-#define NSEventTypeRightMouseDown   NSRightMouseDown
-#define NSEventTypeRightMouseUp     NSRightMouseUp
-#define NSEventTypeScrollWheel      NSScrollWheel
-#endif
-
-extern "C" {
-
-#define SUIL_TYPE_COCOA_WRAPPER (suil_cocoa_wrapper_get_type())
-#define SUIL_COCOA_WRAPPER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SUIL_TYPE_COCOA_WRAPPER, SuilCocoaWrapper))
-
-typedef struct _SuilCocoaWrapper      SuilCocoaWrapper;
-typedef struct _SuilCocoaWrapperClass SuilCocoaWrapperClass;
-
-struct _SuilCocoaWrapper {
-	GtkWidget     widget;
-	SuilWrapper*  wrapper;
-	SuilInstance* instance;
-
-	GdkWindow* flt_win;
-	bool       custom_size;
-	bool       mapped;
-	int        req_width;
-	int        req_height;
-	int        alo_width;
-	int        alo_height;
-
-	const LV2UI_Idle_Interface* idle_iface;
-	guint                       idle_id;
-	guint                       idle_ms;
-};
-
-struct _SuilCocoaWrapperClass {
-	GtkWidgetClass parent_class;
-};
-
-GType suil_cocoa_wrapper_get_type(void);  // Accessor for SUIL_TYPE_COCOA_WRAPPER
-
-G_DEFINE_TYPE(SuilCocoaWrapper, suil_cocoa_wrapper, GTK_TYPE_WIDGET)
-
-static void
-suil_cocoa_wrapper_finalize(GObject* gobject)
-{
-	SuilCocoaWrapper* const self = SUIL_COCOA_WRAPPER(gobject);
-
-	self->wrapper->impl = NULL;
-
-	G_OBJECT_CLASS(suil_cocoa_wrapper_parent_class)->finalize(gobject);
-}
-
-static void
-suil_cocoa_realize(GtkWidget* widget)
-{
-	SuilCocoaWrapper* const self = SUIL_COCOA_WRAPPER(widget);
-	g_return_if_fail(self != NULL);
-
-	GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED);
-
-	GdkWindowAttr attrs;
-	attrs.x           = widget->allocation.x;
-	attrs.y           = widget->allocation.y;
-	attrs.width       = widget->allocation.width;
-	attrs.height      = widget->allocation.height;
-	attrs.wclass      = GDK_INPUT_OUTPUT;
-	attrs.window_type = GDK_WINDOW_CHILD;
-	attrs.visual      = gtk_widget_get_visual(widget);
-	attrs.colormap    = gtk_widget_get_colormap(widget);
-	attrs.event_mask  = gtk_widget_get_events(widget) |
-		GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK |
-		GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK |
-		GDK_POINTER_MOTION_HINT_MASK;
-
-	widget->window = gdk_window_new(
-		widget->parent->window,
-		&attrs,
-		GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP);
-
-	widget->style = gtk_style_attach(widget->style, widget->window);
-
-	gdk_window_set_user_data(widget->window, widget);
-	gtk_style_set_background(widget->style, widget->window, GTK_STATE_ACTIVE);
-	gtk_widget_queue_resize(widget);
-}
-
-static void
-suil_cocoa_size_request(GtkWidget* widget, GtkRequisition* requisition)
-{
-	SuilCocoaWrapper* const self = SUIL_COCOA_WRAPPER(widget);
-	if (self->custom_size) {
-		requisition->width  = self->req_width;
-		requisition->height = self->req_height;
-	} else {
-		NSView* view  = (NSView*)self->instance->ui_widget;
-		NSRect  frame = [view frame];
-		requisition->width  = CGRectGetWidth(NSRectToCGRect(frame));
-		requisition->height = CGRectGetHeight(NSRectToCGRect(frame));
-	}
-}
-
-static void
-suil_cocoa_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
-{
-	SuilCocoaWrapper* const self = SUIL_COCOA_WRAPPER(widget);
-	self->alo_width  = allocation->width;
-	self->alo_height = allocation->height;
-
-	if (!self->mapped) {
-		return;
-	}
-
-	gint xx, yy;
-	gtk_widget_translate_coordinates(
-		gtk_widget_get_parent(widget), widget, 0, 0, &xx, &yy);
-
-	NSView* view = (NSView*)self->instance->ui_widget;
-	[view setFrame:NSMakeRect(xx, yy, self->alo_width, self->alo_height)];
-}
-
-static void
-suil_cocoa_map(GtkWidget* widget)
-{
-	SuilCocoaWrapper* const self = SUIL_COCOA_WRAPPER(widget);
-	self->mapped = true;
-
-	if (self->alo_width == 0 || self->alo_height ==0) {
-		return;
-	}
-
-	gint xx, yy;
-	gtk_widget_translate_coordinates(
-		gtk_widget_get_parent(widget), widget, 0, 0, &xx, &yy);
-
-	NSView* view = (NSView*)self->instance->ui_widget;
-	[view setHidden:NO];
-	[view setFrame:NSMakeRect(xx, yy, self->alo_width, self->alo_height)];
-}
-
-static void
-suil_cocoa_unmap(GtkWidget* widget)
-{
-	SuilCocoaWrapper* const self = SUIL_COCOA_WRAPPER(widget);
-	NSView*                 view = (NSView*)self->instance->ui_widget;
-
-	self->mapped = false;
-	[view setHidden:YES];
-}
-
-static gboolean
-suil_cocoa_key_press(GtkWidget* widget, GdkEventKey* event)
-{
-	SuilCocoaWrapper* const self = SUIL_COCOA_WRAPPER(widget);
-	if (!self->instance || !self->wrapper || !self->wrapper->impl) {
-		return FALSE;
-	}
-	NSEvent* nsevent = gdk_quartz_event_get_nsevent((GdkEvent*)event);
-	NSView*  view    = (NSView*)self->instance->ui_widget;
-	[view keyDown:nsevent];
-	return TRUE;
-}
-
-static gboolean
-suil_cocoa_key_release(GtkWidget* widget, GdkEventKey* event)
-{
-	SuilCocoaWrapper* const self = SUIL_COCOA_WRAPPER(widget);
-	if (!self->instance || !self->wrapper || !self->wrapper->impl) {
-		return FALSE;
-	}
-	NSEvent* nsevent = gdk_quartz_event_get_nsevent((GdkEvent*)event);
-	NSView*  view    = (NSView*)self->instance->ui_widget;
-	[view keyUp:nsevent];
-	return TRUE;
-}
-
-static gboolean
-suil_cocoa_expose(GtkWidget* widget, GdkEventExpose* event)
-{
-	SuilCocoaWrapper* const self = SUIL_COCOA_WRAPPER(widget);
-	NSView*                 view = (NSView*)self->instance->ui_widget;
-	[view drawRect:NSMakeRect(event->area.x,
-	                          event->area.y,
-	                          event->area.width,
-	                          event->area.height)];
-	return TRUE;
-}
-
-static void
-suil_cocoa_wrapper_class_init(SuilCocoaWrapperClass* klass)
-{
-	GObjectClass* const   gobject_class = G_OBJECT_CLASS(klass);
-	GtkWidgetClass* const widget_class  = (GtkWidgetClass*)(klass);
-
-	gobject_class->finalize = suil_cocoa_wrapper_finalize;
-
-	widget_class->realize           = suil_cocoa_realize;
-	widget_class->expose_event      = suil_cocoa_expose;
-	widget_class->size_request      = suil_cocoa_size_request;
-	widget_class->size_allocate     = suil_cocoa_size_allocate;
-	widget_class->map               = suil_cocoa_map;
-	widget_class->unmap             = suil_cocoa_unmap;
-	widget_class->key_press_event   = suil_cocoa_key_press;
-	widget_class->key_release_event = suil_cocoa_key_release;
-}
-
-static void
-suil_cocoa_wrapper_init(SuilCocoaWrapper* self)
-{
-	self->wrapper     = NULL;
-	self->instance    = NULL;
-	self->flt_win     = NULL;
-	self->custom_size = false;
-	self->mapped      = false;
-	self->req_width   = self->req_height = 0;
-	self->alo_width   = self->alo_height = 0;
-	self->idle_iface  = NULL;
-	self->idle_ms     = 1000 / 30;  // 30 Hz default
-}
-
-static int
-wrapper_resize(LV2UI_Feature_Handle handle, int width, int height)
-{
-	SuilCocoaWrapper* const wrap = SUIL_COCOA_WRAPPER(handle);
-	wrap->req_width   = width;
-	wrap->req_height  = height;
-	wrap->custom_size = true;
-	gtk_widget_queue_resize(GTK_WIDGET(handle));
-	return 0;
-}
-
-static gboolean
-suil_cocoa_wrapper_idle(void* data)
-{
-	SuilCocoaWrapper* const wrap = SUIL_COCOA_WRAPPER(data);
-	wrap->idle_iface->idle(wrap->instance->handle);
-	return TRUE;  // Continue calling
-}
-
-static GdkFilterReturn
-event_filter(GdkXEvent* xevent, GdkEvent* event, gpointer data)
-{
-	SuilCocoaWrapper* wrap = (SuilCocoaWrapper*)data;
-	if (!wrap->instance || !wrap->wrapper || !wrap->wrapper->impl) {
-		return GDK_FILTER_CONTINUE;
-	}
-
-	NSEvent* nsevent = (NSEvent*)xevent;
-	NSView*  view    = (NSView*)wrap->instance->ui_widget;
-	if (view && nsevent) {
-		switch([nsevent type]) {
-		case NSEventTypeFlagsChanged:
-			[view flagsChanged:nsevent];
-			return GDK_FILTER_REMOVE;
-		case NSEventTypeMouseEntered:
-			[view mouseEntered:nsevent];
-			return GDK_FILTER_REMOVE;
-		case NSEventTypeMouseExited:
-			[view mouseExited:nsevent];
-			return GDK_FILTER_REMOVE;
-
-		/* Explicitly pass though mouse events.  Needed for mouse-drags leaving
-		   the window, and mouse-up after that. */
-		case NSEventTypeMouseMoved:
-			[view mouseMoved:nsevent];
-			break;
-		case NSEventTypeLeftMouseDragged:
-			[view mouseDragged:nsevent];
-			break;
-		case NSEventTypeLeftMouseDown:
-			[view mouseDown:nsevent];
-			break;
-		case NSEventTypeLeftMouseUp:
-			[view mouseUp:nsevent];
-			break;
-		case NSEventTypeRightMouseDown:
-			[view rightMouseDown:nsevent];
-			break;
-		case NSEventTypeRightMouseUp:
-			[view rightMouseUp:nsevent];
-			break;
-		case NSEventTypeScrollWheel:
-			[view scrollWheel:nsevent];
-			break;
-		default:
-			break;
-		}
-	}
-	return GDK_FILTER_CONTINUE;
-}
-
-static int
-wrapper_wrap(SuilWrapper* wrapper, SuilInstance* instance)
-{
-	SuilCocoaWrapper* const wrap = SUIL_COCOA_WRAPPER(wrapper->impl);
-
-	instance->host_widget = GTK_WIDGET(wrap);
-	wrap->wrapper         = wrapper;
-	wrap->instance        = instance;
-
-	const LV2UI_Idle_Interface* idle_iface = NULL;
-	if (instance->descriptor->extension_data) {
-		idle_iface = (const LV2UI_Idle_Interface*)
-			instance->descriptor->extension_data(LV2_UI__idleInterface);
-	}
-	if (idle_iface) {
-		wrap->idle_iface = idle_iface;
-		wrap->idle_id    = g_timeout_add(
-			wrap->idle_ms, suil_cocoa_wrapper_idle, wrap);
-	}
-
-	return 0;
-}
-
-static void
-wrapper_free(SuilWrapper* wrapper)
-{
-	if (wrapper->impl) {
-		SuilCocoaWrapper* const wrap = SUIL_COCOA_WRAPPER(wrapper->impl);
-		if (wrap->idle_id) {
-			g_source_remove(wrap->idle_id);
-			wrap->idle_id = 0;
-		}
-
-		gdk_window_remove_filter(wrap->flt_win, event_filter, wrapper->impl);
-		gtk_object_destroy(GTK_OBJECT(wrap));
-	}
-}
-
-
-SUIL_LIB_EXPORT
-SuilWrapper*
-suil_wrapper_new(SuilHost*      host,
-                 const char*    host_type_uri,
-                 const char*    ui_type_uri,
-                 LV2_Feature*** features,
-                 unsigned       n_features)
-{
-	GtkWidget* parent = NULL;
-	for (unsigned i = 0; i < n_features; ++i) {
-		if (!strcmp((*features)[i]->URI, LV2_UI__parent)) {
-			parent = (GtkWidget*)(*features)[i]->data;
-		}
-	}
-
-	if (!GTK_CONTAINER(parent)) {
-		SUIL_ERRORF("No GtkContainer parent given for %s UI\n",
-		            ui_type_uri);
-		return NULL;
-	}
-
-	SuilWrapper* wrapper = (SuilWrapper*)calloc(1, sizeof(SuilWrapper));
-	wrapper->wrap = wrapper_wrap;
-	wrapper->free = wrapper_free;
-
-	SuilCocoaWrapper* const wrap = SUIL_COCOA_WRAPPER(
-		g_object_new(SUIL_TYPE_COCOA_WRAPPER, NULL));
-
-	wrapper->impl             = wrap;
-	wrapper->resize.handle    = wrap;
-	wrapper->resize.ui_resize = wrapper_resize;
-
-	gtk_container_add(GTK_CONTAINER(parent), GTK_WIDGET(wrap));
-	gtk_widget_set_can_focus(GTK_WIDGET(wrap), TRUE);
-	gtk_widget_set_sensitive(GTK_WIDGET(wrap), TRUE);
-	gtk_widget_realize(GTK_WIDGET(wrap));
-
-	GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(wrap));
-	wrap->flt_win = gtk_widget_get_window(parent);
-	gdk_window_add_filter(wrap->flt_win, event_filter, wrap);
-
-	NSView* parent_view = gdk_quartz_window_get_nsview(window);
-	suil_add_feature(features, &n_features, LV2_UI__parent, parent_view);
-	suil_add_feature(features, &n_features, LV2_UI__resize, &wrapper->resize);
-	suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL);
-
-	// Scan for URID map and options
-	LV2_URID_Map*       map     = NULL;
-	LV2_Options_Option* options = NULL;
-	for (LV2_Feature** f = *features; *f && (!map || !options); ++f) {
-		if (!strcmp((*f)->URI, LV2_OPTIONS__options)) {
-			options = (LV2_Options_Option*)(*f)->data;
-		} else if (!strcmp((*f)->URI, LV2_URID__map)) {
-			map = (LV2_URID_Map*)(*f)->data;
-		}
-	}
-
-	if (map && options) {
-		// Set UI update rate if given
-		LV2_URID ui_updateRate = map->map(map->handle, LV2_UI__updateRate);
-		for (LV2_Options_Option* o = options; o->key; ++o) {
-			if (o->key == ui_updateRate) {
-				wrap->idle_ms = 1000.0f / *(const float*)o->value;
-				break;
-			}
-		}
-	}
-
-	return wrapper;
-}
-
-}  // extern "C"
diff --git a/src/cocoa_in_qt5.mm b/src/cocoa_in_qt5.mm
deleted file mode 100644
index 4259075..0000000
--- a/src/cocoa_in_qt5.mm
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-  Copyright 2017 David Robillard <http://drobilla.net>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#import <Cocoa/Cocoa.h>
-
-#include <QCloseEvent>
-#include <QMacCocoaViewContainer>
-#include <QTimerEvent>
-#include <QWidget>
-
-#undef signals
-
-#include "./suil_config.h"
-#include "./suil_internal.h"
-
-extern "C" {
-
-typedef struct {
-	QWidget* host_widget;
-	QWidget* parent;
-} SuilCocoaInQt5Wrapper;
-
-class SuilQCocoaWidget : public QMacCocoaViewContainer
-{
-public:
-	SuilQCocoaWidget(NSView* view, QWidget* parent)
-		: QMacCocoaViewContainer(view, parent)
-		, _instance(NULL)
-		, _idle_iface(NULL)
-		, _ui_timer(0)
-	{
-	}
-
-	void start_idle(SuilInstance*               instance,
-	                const LV2UI_Idle_Interface* idle_iface) {
-		_instance   = instance;
-		_idle_iface = idle_iface;
-		NSView* view = (NSView*)instance->ui_widget;
-		setCocoaView((NSView*)instance->ui_widget);
-		setMinimumWidth([view fittingSize].width);
-		setMinimumHeight([view fittingSize].height);
-		if (_idle_iface && _ui_timer == 0) {
-			_ui_timer = this->startTimer(30);
-		}
-	}
-
-protected:
-	void timerEvent(QTimerEvent* event) {
-		if (event->timerId() == _ui_timer && _idle_iface) {
-			_idle_iface->idle(_instance->handle);
-		}
-		QWidget::timerEvent(event);
-	}
-
-	void closeEvent(QCloseEvent* event) {
-		if (_ui_timer && _idle_iface) {
-			this->killTimer(_ui_timer);
-			_ui_timer = 0;
-		}
-		QWidget::closeEvent(event);
-	}
-
-private:
-	SuilInstance*               _instance;
-	const LV2UI_Idle_Interface* _idle_iface;
-	int                         _ui_timer;
-};
-
-static void
-wrapper_free(SuilWrapper* wrapper)
-{
-	SuilCocoaInQt5Wrapper* impl = (SuilCocoaInQt5Wrapper*)wrapper->impl;
-
-	if (impl->host_widget) {
-		delete impl->host_widget;
-	}
-
-	free(impl);
-}
-
-static int
-wrapper_wrap(SuilWrapper*  wrapper,
-             SuilInstance* instance)
-{
-	SuilCocoaInQt5Wrapper* const impl = (SuilCocoaInQt5Wrapper*)wrapper->impl;
-	SuilQCocoaWidget* const      ew   = (SuilQCocoaWidget*)impl->parent;
-
-	if (instance->descriptor->extension_data) {
-		const LV2UI_Idle_Interface* idle_iface
-			= (const LV2UI_Idle_Interface*)
-				instance->descriptor->extension_data(LV2_UI__idleInterface);
-		ew->start_idle(instance, idle_iface);
-	}
-
-	impl->host_widget = ew;
-
-	instance->host_widget = impl->host_widget;
-
-	return 0;
-}
-
-static int
-wrapper_resize(LV2UI_Feature_Handle handle, int width, int height)
-{
-	SuilQCocoaWidget* const ew = (SuilQCocoaWidget*)handle;
-	ew->resize(width, height);
-	return 0;
-}
-
-SUIL_LIB_EXPORT
-SuilWrapper*
-suil_wrapper_new(SuilHost*      host,
-                 const char*    host_type_uri,
-                 const char*    ui_type_uri,
-                 LV2_Feature*** features,
-                 unsigned       n_features)
-{
-	QWidget* parent = NULL;
-	for (unsigned i = 0; i < n_features; ++i) {
-		if (!strcmp((*features)[i]->URI, LV2_UI__parent)) {
-			parent = (QWidget*)(*features)[i]->data;
-		}
-	}
-
-	if (!parent) {
-		SUIL_ERRORF("No QWidget parent given for %s UI\n", ui_type_uri);
-		return NULL;
-	}
-
-	SuilCocoaInQt5Wrapper* const impl = (SuilCocoaInQt5Wrapper*)
-		calloc(1, sizeof(SuilCocoaInQt5Wrapper));
-
-	SuilWrapper* wrapper = (SuilWrapper*)malloc(sizeof(SuilWrapper));
-	wrapper->wrap = wrapper_wrap;
-	wrapper->free = wrapper_free;
-	NSView* view = [NSView new];
-
-	SuilQCocoaWidget* const ew = new SuilQCocoaWidget(view, parent);
-
-	impl->parent = ew;
-
-	wrapper->impl             = impl;
-	wrapper->resize.handle    = ew;
-	wrapper->resize.ui_resize = wrapper_resize;
-
-	suil_add_feature(features, &n_features, LV2_UI__parent, ew->cocoaView());
-	suil_add_feature(features, &n_features, LV2_UI__resize, &wrapper->resize);
-	suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL);
-
-	return wrapper;
-}
-
-}  // extern "C"
diff --git a/src/gtk2_in_qt4.cpp b/src/gtk2_in_qt4.cpp
deleted file mode 100644
index 546f7a9..0000000
--- a/src/gtk2_in_qt4.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-  Copyright 2011-2015 David Robillard <http://drobilla.net>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#include <QX11EmbedContainer>
-#undef signals
-
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-
-#include "./suil_config.h"
-#include "./suil_internal.h"
-
-extern "C" {
-
-typedef struct _SuilGtk2InQt4Wrapper SuilGtk2InQt4Wrapper;
-
-struct _SuilGtk2InQt4Wrapper {
-	QX11EmbedContainer* host_widget;
-	QWidget*            parent;
-	GtkWidget*          plug;
-};
-
-static void
-on_size_request(GtkWidget*      widget,
-                GtkRequisition* requisition,
-                gpointer        user_data)
-{
-	QX11EmbedContainer* const wrap = (QX11EmbedContainer*)user_data;
-	wrap->setMinimumSize(requisition->width, requisition->height);
-}
-
-static void
-on_size_allocate(GtkWidget*    widget,
-                 GdkRectangle* allocation,
-                 gpointer      user_data)
-{
-	QX11EmbedContainer* const wrap = (QX11EmbedContainer*)user_data;
-	wrap->resize(allocation->width, allocation->height);
-}
-
-static void
-wrapper_free(SuilWrapper* wrapper)
-{
-	SuilGtk2InQt4Wrapper* impl = (SuilGtk2InQt4Wrapper*)wrapper->impl;
-
-	if (impl->plug) {
-		gtk_widget_destroy(impl->plug);
-	}
-
-	if (impl->host_widget) {
-		delete impl->host_widget;
-	}
-
-	free(impl);
-}
-
-static int
-wrapper_wrap(SuilWrapper*  wrapper,
-             SuilInstance* instance)
-{
-	SuilGtk2InQt4Wrapper* const impl   = (SuilGtk2InQt4Wrapper*)wrapper->impl;
-	QWidget*                    root   = static_cast<QWidget*>(impl->parent);
-	QX11EmbedContainer* const   wrap   = new QX11EmbedContainer(root);
-	GtkWidget* const            plug   = gtk_plug_new(wrap->winId());
-	GtkWidget* const            widget = (GtkWidget*)instance->ui_widget;
-
-	gtk_container_add(GTK_CONTAINER(plug), widget);
-	gtk_widget_show_all(plug);
-
-#ifdef SUIL_OLD_GTK
-	wrap->resize(widget->allocation.width, widget->allocation.height);
-#else
-	GtkAllocation alloc;
-	gtk_widget_get_allocation(widget, &alloc);
-	wrap->resize(alloc.width, alloc.height);
-#endif
-
-	g_signal_connect(
-		G_OBJECT(plug), "size-request", G_CALLBACK(on_size_request), wrap);
-
-	g_signal_connect(
-		G_OBJECT(plug), "size-allocate", G_CALLBACK(on_size_allocate), wrap);
-
-	impl->host_widget     = wrap;
-	impl->plug            = plug;
-	instance->host_widget = wrap;
-
-	return 0;
-}
-
-SUIL_LIB_EXPORT
-SuilWrapper*
-suil_wrapper_new(SuilHost*      host,
-                 const char*    host_type_uri,
-                 const char*    ui_type_uri,
-                 LV2_Feature*** features,
-                 unsigned       n_features)
-{
-	/* We have to open libgtk here, so Gtk type symbols are present and will be
-	   found by the introspection stuff.  This is required at least to make
-	   GtkBuilder use in UIs work, otherwise they will cause "Invalid object
-	   type" errors.
-	*/
-	if (!host->gtk_lib) {
-		dlerror();
-		host->gtk_lib = dlopen(SUIL_GTK2_LIB_NAME, RTLD_LAZY|RTLD_GLOBAL);
-		if (!host->gtk_lib) {
-			SUIL_ERRORF("Failed to open %s (%s)\n",
-			            SUIL_GTK2_LIB_NAME, dlerror());
-			return NULL;
-		}
-		gtk_init(NULL, NULL);
-	}
-
-	/* Create wrapper implementation. */
-	SuilGtk2InQt4Wrapper* const impl = (SuilGtk2InQt4Wrapper*)
-		calloc(1, sizeof(SuilGtk2InQt4Wrapper));
-
-	/* Set parent widget if given. */
-	for (unsigned i = 0; i < n_features; ++i) {
-		if (!strcmp((*features)[i]->URI, LV2_UI__parent)) {
-			impl->parent = static_cast<QWidget*>((*features)[i]->data);
-		}
-	}
-
-	SuilWrapper* wrapper = (SuilWrapper*)calloc(1, sizeof(SuilWrapper));
-	wrapper->wrap = wrapper_wrap;
-	wrapper->free = wrapper_free;
-	wrapper->impl = impl;
-
-	return wrapper;
-}
-
-}  // extern "C"
diff --git a/src/gtk2_in_qt5.cpp b/src/gtk2_in_qt5.cpp
deleted file mode 100644
index 50b9012..0000000
--- a/src/gtk2_in_qt5.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-  Copyright 2011-2015 David Robillard <http://drobilla.net>
-  Copyright 2015 Rui Nuno Capela <rncbc@rncbc.org>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#include <QVBoxLayout>
-#include <QWidget>
-#include <QWindow>
-
-#undef signals
-
-#include <gtk/gtk.h>
-
-#include "./suil_config.h"
-#include "./suil_internal.h"
-
-extern "C" {
-
-typedef struct _SuilGtk2InQt5Wrapper SuilGtk2InQt5Wrapper;
-
-struct _SuilGtk2InQt5Wrapper {
-	QWidget*   host_widget;
-	QWindow*   window;
-	GtkWidget* plug;
-};
-
-static void
-on_size_request(GtkWidget*      widget,
-                GtkRequisition* requisition,
-                gpointer        user_data)
-{
-	QWidget* const wrap = (QWidget*)user_data;
-	wrap->setMinimumSize(requisition->width, requisition->height);
-}
-
-static void
-on_size_allocate(GtkWidget*    widget,
-                 GdkRectangle* allocation,
-                 gpointer      user_data)
-{
-	QWidget* const wrap = (QWidget*)user_data;
-	wrap->resize(allocation->width, allocation->height);
-}
-
-static void
-wrapper_free(SuilWrapper* wrapper)
-{
-	SuilGtk2InQt5Wrapper* impl = (SuilGtk2InQt5Wrapper*)wrapper->impl;
-
-	if (impl->window) {
-		impl->window->setParent(NULL);
-		delete impl->window;
-	}
-
-	if (impl->plug) {
-		gtk_widget_destroy(impl->plug);
-	}
-
-	if (impl->host_widget) {
-		delete impl->host_widget;
-	}
-
-	free(impl);
-}
-
-static int
-wrapper_wrap(SuilWrapper*  wrapper,
-             SuilInstance* instance)
-{
-	SuilGtk2InQt5Wrapper* const impl   = (SuilGtk2InQt5Wrapper*)wrapper->impl;
-	QWidget* const              wrap   = new QWidget(NULL, Qt::Window);
-	GtkWidget* const            plug   = gtk_plug_new(0);
-	GtkWidget* const            widget = (GtkWidget*)instance->ui_widget;
-
-	gtk_container_add(GTK_CONTAINER(plug), widget);
-	gtk_widget_show_all(plug);
-
-	const WId    wid       = (WId)gtk_plug_get_id((GtkPlug*)plug);
-	QWindow*     window    = QWindow::fromWinId(wid);
-	QWidget*     container = QWidget::createWindowContainer(window, wrap);
-	QVBoxLayout* layout    = new QVBoxLayout();
-	layout->setMargin(0);
-	layout->setSpacing(0);
-	layout->addWidget(container);
-	wrap->setLayout(layout);
-
-#ifdef SUIL_OLD_GTK
-	wrap->resize(widget->allocation.width, widget->allocation.height);
-#else
-	GtkAllocation alloc;
-	gtk_widget_get_allocation(widget, &alloc);
-	wrap->resize(alloc.width, alloc.height);
-#endif
-
-	g_signal_connect(
-		G_OBJECT(plug), "size-request", G_CALLBACK(on_size_request), wrap);
-
-	g_signal_connect(
-		G_OBJECT(plug), "size-allocate", G_CALLBACK(on_size_allocate), wrap);
-
-	impl->host_widget     = wrap;
-	impl->window          = window;
-	impl->plug            = plug;
-	instance->host_widget = wrap;
-
-	return 0;
-}
-
-SUIL_LIB_EXPORT
-SuilWrapper*
-suil_wrapper_new(SuilHost*      host,
-                 const char*    host_type_uri,
-                 const char*    ui_type_uri,
-                 LV2_Feature*** features,
-                 unsigned       n_features)
-{
-	/* We have to open libgtk here, so Gtk type symbols are present and will be
-	   found by the introspection stuff.  This is required at least to make
-	   GtkBuilder use in UIs work, otherwise they will cause "Invalid object
-	   type" errors.
-	*/
-	if (!host->gtk_lib) {
-		dlerror();
-		host->gtk_lib = dlopen(SUIL_GTK2_LIB_NAME, RTLD_LAZY|RTLD_GLOBAL);
-		if (!host->gtk_lib) {
-			SUIL_ERRORF("Failed to open %s (%s)\n",
-			            SUIL_GTK2_LIB_NAME, dlerror());
-			return NULL;
-		}
-		gtk_init(NULL, NULL);
-	}
-
-	/* Create wrapper implementation. */
-	SuilGtk2InQt5Wrapper* const impl = (SuilGtk2InQt5Wrapper*)
-		calloc(1, sizeof(SuilGtk2InQt5Wrapper));
-
-	SuilWrapper* wrapper = (SuilWrapper*)calloc(1, sizeof(SuilWrapper));
-	wrapper->wrap = wrapper_wrap;
-	wrapper->free = wrapper_free;
-	wrapper->impl = impl;
-
-	return wrapper;
-}
-
-}  // extern "C"
diff --git a/src/host.c b/src/host.c
deleted file mode 100644
index f64f9c5..0000000
--- a/src/host.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-  Copyright 2011-2017 David Robillard <http://drobilla.net>
-  Copyright 2017 Stefan Westerfeld <stefan@space.twc.de>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#include "./suil_internal.h"
-
-int    suil_argc = 0;
-char** suil_argv = NULL;
-
-SUIL_API
-SuilHost*
-suil_host_new(SuilPortWriteFunc       write_func,
-              SuilPortIndexFunc       index_func,
-              SuilPortSubscribeFunc   subscribe_func,
-              SuilPortUnsubscribeFunc unsubscribe_func)
-{
-	SuilHost* host = (SuilHost*)calloc(1, sizeof(struct SuilHostImpl));
-	host->write_func       = write_func;
-	host->index_func       = index_func;
-	host->subscribe_func   = subscribe_func;
-	host->unsubscribe_func = unsubscribe_func;
-	host->argc             = suil_argc;
-	host->argv             = suil_argv;
-	return host;
-}
-
-SUIL_API
-void
-suil_host_set_touch_func(SuilHost*     host,
-                         SuilTouchFunc touch_func)
-{
-	host->touch_func = touch_func;
-}
-
-SUIL_API
-void
-suil_host_free(SuilHost* host)
-{
-	if (host) {
-		if (host->gtk_lib) {
-			dlclose(host->gtk_lib);
-		}
-		free(host);
-	}
-}
-
-#ifdef SUIL_WITH_X11
-static void
-suil_load_init_module(const char* module_name)
-{
-	void* const lib = suil_open_module(module_name);
-	if (!lib) {
-		return;
-	}
-
-	SuilVoidFunc init_func = suil_dlfunc(lib, "suil_host_init");
-	if (init_func) {
-		(*init_func)();
-	} else {
-		SUIL_ERRORF("Corrupt init module %s\n", module_name);
-	}
-
-	dlclose(lib);
-}
-#endif
-
-SUIL_API
-void
-suil_init(int* argc, char*** argv, SuilArg key, ...)
-{
-	suil_argc = argc ? *argc : 0;
-	suil_argv = argv ? *argv : NULL;
-
-#ifdef SUIL_WITH_X11
-	suil_load_init_module("suil_x11");
-#endif
-}
diff --git a/src/instance.c b/src/instance.c
deleted file mode 100644
index d365ca2..0000000
--- a/src/instance.c
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
-  Copyright 2007-2017 David Robillard <http://drobilla.net>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "./suil_config.h"
-#include "./suil_internal.h"
-
-#define GTK2_UI_URI  LV2_UI__GtkUI
-#define GTK3_UI_URI  LV2_UI__Gtk3UI
-#define QT4_UI_URI   LV2_UI__Qt4UI
-#define QT5_UI_URI   LV2_UI__Qt5UI
-#define X11_UI_URI   LV2_UI__X11UI
-#define WIN_UI_URI   LV2_UI_PREFIX "WindowsUI"
-#define COCOA_UI_URI LV2_UI__CocoaUI
-
-SUIL_API
-unsigned
-suil_ui_supported(const char* host_type_uri,
-                  const char* ui_type_uri)
-{
-	enum {
-		SUIL_WRAPPING_UNSUPPORTED = 0,
-		SUIL_WRAPPING_NATIVE      = 1,
-		SUIL_WRAPPING_EMBEDDED    = 2
-	};
-	if (!strcmp(host_type_uri, ui_type_uri)) {
-		return SUIL_WRAPPING_NATIVE;
-	} else if ((!strcmp(host_type_uri, GTK2_UI_URI)
-	            && !strcmp(ui_type_uri, QT4_UI_URI))
-	           || (!strcmp(host_type_uri, GTK2_UI_URI)
-	               && !strcmp(ui_type_uri, QT5_UI_URI))
-	           || (!strcmp(host_type_uri, QT4_UI_URI)
-	               && !strcmp(ui_type_uri, GTK2_UI_URI))
-	           || (!strcmp(host_type_uri, QT5_UI_URI)
-	               && !strcmp(ui_type_uri, GTK2_UI_URI))
-	           || (!strcmp(host_type_uri, GTK2_UI_URI)
-	               && !strcmp(ui_type_uri, X11_UI_URI))
-	           || (!strcmp(host_type_uri, GTK3_UI_URI)
-	               && !strcmp(ui_type_uri, X11_UI_URI))
-	           || (!strcmp(host_type_uri, GTK2_UI_URI)
-	               && !strcmp(ui_type_uri, WIN_UI_URI))
-	           || (!strcmp(host_type_uri, GTK2_UI_URI)
-	               && !strcmp(ui_type_uri, COCOA_UI_URI))
-	           || (!strcmp(host_type_uri, QT4_UI_URI)
-	               && !strcmp(ui_type_uri, X11_UI_URI))
-	           || (!strcmp(host_type_uri, QT5_UI_URI)
-	               && !strcmp(ui_type_uri, X11_UI_URI))
-	           || (!strcmp(host_type_uri, QT5_UI_URI)
-	               && !strcmp(ui_type_uri, COCOA_UI_URI))) {
-		return SUIL_WRAPPING_EMBEDDED;
-	} else {
-		return SUIL_WRAPPING_UNSUPPORTED;
-	}
-}
-
-static SuilWrapper*
-open_wrapper(SuilHost*      host,
-             const char*    container_type_uri,
-             const char*    ui_type_uri,
-             LV2_Feature*** features,
-             unsigned       n_features)
-{
-	const char* module_name = NULL;
-#ifdef SUIL_WITH_GTK2_IN_QT4
-	if (!strcmp(container_type_uri, QT4_UI_URI)
-	    && !strcmp(ui_type_uri, GTK2_UI_URI)) {
-		module_name = "suil_gtk2_in_qt4";
-	}
-#endif
-#ifdef SUIL_WITH_GTK2_IN_QT5
-	if (!strcmp(container_type_uri, QT5_UI_URI)
-	    && !strcmp(ui_type_uri, GTK2_UI_URI)) {
-		module_name = "suil_gtk2_in_qt5";
-	}
-#endif
-#ifdef SUIL_WITH_QT4_IN_GTK2
-	if (!strcmp(container_type_uri, GTK2_UI_URI)
-	    && !strcmp(ui_type_uri, QT4_UI_URI)) {
-		module_name = "suil_qt4_in_gtk2";
-	}
-#endif
-#ifdef SUIL_WITH_QT5_IN_GTK2
-	if (!strcmp(container_type_uri, GTK2_UI_URI)
-	    && !strcmp(ui_type_uri, QT5_UI_URI)) {
-		module_name = "suil_qt5_in_gtk2";
-	}
-#endif
-#ifdef SUIL_WITH_X11_IN_GTK2
-	if (!strcmp(container_type_uri, GTK2_UI_URI)
-	    && !strcmp(ui_type_uri, X11_UI_URI)) {
-		module_name = "suil_x11_in_gtk2";
-	}
-#endif
-#ifdef SUIL_WITH_X11_IN_GTK3
-	if (!strcmp(container_type_uri, GTK3_UI_URI)
-	    && !strcmp(ui_type_uri, X11_UI_URI)) {
-		module_name = "suil_x11_in_gtk3";
-	}
-#endif
-#ifdef SUIL_WITH_WIN_IN_GTK2
-	if (!strcmp(container_type_uri, GTK2_UI_URI)
-	    && !strcmp(ui_type_uri, WIN_UI_URI)) {
-		module_name = "suil_win_in_gtk2";
-	}
-#endif
-#ifdef SUIL_WITH_COCOA_IN_GTK2
-	if (!strcmp(container_type_uri, GTK2_UI_URI)
-	    && !strcmp(ui_type_uri, COCOA_UI_URI)) {
-		module_name = "suil_cocoa_in_gtk2";
-	}
-#endif
-#ifdef SUIL_WITH_X11_IN_QT4
-	if (!strcmp(container_type_uri, QT4_UI_URI)
-	    && !strcmp(ui_type_uri, X11_UI_URI)) {
-		module_name = "suil_x11_in_qt4";
-	}
-#endif
-#ifdef SUIL_WITH_X11_IN_QT5
-	if (!strcmp(container_type_uri, QT5_UI_URI)
-	    && !strcmp(ui_type_uri, X11_UI_URI)) {
-		module_name = "suil_x11_in_qt5";
-	}
-#endif
-#ifdef SUIL_WITH_COCOA_IN_QT5
-	if (!strcmp(container_type_uri, QT5_UI_URI)
-	    && !strcmp(ui_type_uri, COCOA_UI_URI)) {
-		module_name = "suil_cocoa_in_qt5";
-	}
-#endif
-
-	if (!module_name) {
-		SUIL_ERRORF("Unable to wrap UI type <%s> as type <%s>\n",
-		            ui_type_uri, container_type_uri);
-		return NULL;
-	}
-
-	void* const lib = suil_open_module(module_name);
-	if (!lib) {
-		return NULL;
-	}
-
-	SuilWrapperNewFunc wrapper_new = (SuilWrapperNewFunc)suil_dlfunc(
-		lib, "suil_wrapper_new");
-
-	SuilWrapper* wrapper = wrapper_new
-		? wrapper_new(host,
-		              container_type_uri,
-		              ui_type_uri,
-		              features,
-		              n_features)
-		: NULL;
-
-	if (wrapper) {
-		wrapper->lib = lib;
-	} else {
-		SUIL_ERRORF("Corrupt wrap module %s\n", module_name);
-		dlclose(lib);
-	}
-
-	return wrapper;
-}
-
-SUIL_API
-SuilInstance*
-suil_instance_new(SuilHost*                 host,
-                  SuilController            controller,
-                  const char*               container_type_uri,
-                  const char*               plugin_uri,
-                  const char*               ui_uri,
-                  const char*               ui_type_uri,
-                  const char*               ui_bundle_path,
-                  const char*               ui_binary_path,
-                  const LV2_Feature* const* features)
-{
-	// Open UI library
-	dlerror();
-	void* lib = dlopen(ui_binary_path, RTLD_NOW);
-	if (!lib) {
-		SUIL_ERRORF("Unable to open UI library %s (%s)\n",
-		            ui_binary_path, dlerror());
-		return NULL;
-	}
-
-	// Get discovery function
-	LV2UI_DescriptorFunction df = (LV2UI_DescriptorFunction)
-		suil_dlfunc(lib, "lv2ui_descriptor");
-	if (!df) {
-		SUIL_ERRORF("Broken LV2 UI %s (no lv2ui_descriptor symbol found)\n",
-		            ui_binary_path);
-		dlclose(lib);
-		return NULL;
-	}
-
-	// Get UI descriptor
-	const LV2UI_Descriptor* descriptor = NULL;
-	for (uint32_t i = 0; true; ++i) {
-		const LV2UI_Descriptor* ld = df(i);
-		if (!ld) {
-			break;
-		} else if (!strcmp(ld->URI, ui_uri)) {
-			descriptor = ld;
-			break;
-		}
-	}
-	if (!descriptor) {
-		SUIL_ERRORF("Failed to find descriptor for <%s> in %s\n",
-		            ui_uri, ui_binary_path);
-		dlclose(lib);
-		return NULL;
-	}
-
-	// Create SuilInstance
-	SuilInstance* instance = (SuilInstance*)calloc(1, sizeof(SuilInstance));
-	if (!instance) {
-		SUIL_ERRORF("Failed to allocate memory for <%s> instance\n", ui_uri);
-		dlclose(lib);
-		return NULL;
-	}
-
-	instance->lib_handle = lib;
-	instance->descriptor = descriptor;
-
-	// Make UI features array
-	instance->features = (LV2_Feature**)malloc(sizeof(LV2_Feature*));
-	instance->features[0] = NULL;
-
-	// Copy user provided features
-	const LV2_Feature* const* fi         = features;
-	unsigned                  n_features = 0;
-	while (fi && *fi) {
-		const LV2_Feature* f = *fi++;
-		suil_add_feature(&instance->features, &n_features, f->URI, f->data);
-	}
-
-	// Add additional features implemented by SuilHost functions
-	if (host->index_func) {
-		instance->port_map.handle     = controller;
-		instance->port_map.port_index = host->index_func;
-		suil_add_feature(&instance->features, &n_features,
-		                 LV2_UI__portMap, &instance->port_map);
-	}
-	if (host->subscribe_func && host->unsubscribe_func) {
-		instance->port_subscribe.handle      = controller;
-		instance->port_subscribe.subscribe   = host->subscribe_func;
-		instance->port_subscribe.unsubscribe = host->unsubscribe_func;
-		suil_add_feature(&instance->features, &n_features,
-		                 LV2_UI__portSubscribe, &instance->port_subscribe);
-	}
-	if (host->touch_func) {
-		instance->touch.handle = controller;
-		instance->touch.touch  = host->touch_func;
-		suil_add_feature(&instance->features, &n_features,
-		                 LV2_UI__touch, &instance->touch);
-	}
-
-	// Open wrapper (this may add additional features)
-	if (container_type_uri && strcmp(container_type_uri, ui_type_uri)) {
-		instance->wrapper = open_wrapper(host,
-		                                 container_type_uri, ui_type_uri,
-		                                 &instance->features, n_features);
-		if (!instance->wrapper) {
-			suil_instance_free(instance);
-			return NULL;
-		}
-	}
-
-	// Instantiate UI
-	instance->handle = descriptor->instantiate(
-		descriptor,
-		plugin_uri,
-		ui_bundle_path,
-		host->write_func,
-		controller,
-		&instance->ui_widget,
-		(const LV2_Feature* const*)instance->features);
-
-	// Failed to instantiate UI
-	if (!instance->handle) {
-		SUIL_ERRORF("Failed to instantiate UI <%s> in %s\n",
-		            ui_uri, ui_binary_path);
-		suil_instance_free(instance);
-		return NULL;
-	}
-
-	if (instance->wrapper) {
-		if (instance->wrapper->wrap(instance->wrapper, instance)) {
-			SUIL_ERRORF("Failed to wrap UI <%s> in type <%s>\n",
-			            ui_uri, container_type_uri);
-			suil_instance_free(instance);
-			return NULL;
-		}
-	} else {
-		instance->host_widget = instance->ui_widget;
-	}
-
-	return instance;
-}
-
-SUIL_API
-void
-suil_instance_free(SuilInstance* instance)
-{
-	if (instance) {
-		for (unsigned i = 0; instance->features[i]; ++i) {
-			free(instance->features[i]);
-		}
-		free(instance->features);
-
-		// Call wrapper free function to destroy widgets and drop references
-		if (instance->wrapper && instance->wrapper->free) {
-			instance->wrapper->free(instance->wrapper);
-		}
-
-		// Call cleanup to destroy UI (if it still exists at this point)
-		if (instance->handle) {
-			instance->descriptor->cleanup(instance->handle);
-		}
-
-		dlclose(instance->lib_handle);
-
-		// Close libraries and free everything
-		if (instance->wrapper) {
-#ifndef _WIN32
-			// Never unload modules on windows, causes mysterious segfaults
-			dlclose(instance->wrapper->lib);
-#endif
-			free(instance->wrapper);
-		}
-		free(instance);
-	}
-}
-
-SUIL_API
-SuilHandle
-suil_instance_get_handle(SuilInstance* instance)
-{
-	return instance->handle;
-}
-
-SUIL_API
-LV2UI_Widget
-suil_instance_get_widget(SuilInstance* instance)
-{
-	return instance->host_widget;
-}
-
-SUIL_API
-void
-suil_instance_port_event(SuilInstance* instance,
-                         uint32_t      port_index,
-                         uint32_t      buffer_size,
-                         uint32_t      format,
-                         const void*   buffer)
-{
-	if (instance->descriptor->port_event) {
-		instance->descriptor->port_event(instance->handle,
-		                                 port_index,
-		                                 buffer_size,
-		                                 format,
-		                                 buffer);
-	}
-}
-
-SUIL_API
-const void*
-suil_instance_extension_data(SuilInstance* instance,
-                             const char*   uri)
-{
-	if (instance->descriptor->extension_data) {
-		return instance->descriptor->extension_data(uri);
-	}
-	return NULL;
-}
diff --git a/src/qt4_in_gtk2.cpp b/src/qt4_in_gtk2.cpp
deleted file mode 100644
index fbec381..0000000
--- a/src/qt4_in_gtk2.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-  Copyright 2011-2017 David Robillard <http://drobilla.net>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#include <gtk/gtk.h>
-
-#include <QApplication>
-#include <QVBoxLayout>
-#include <QX11EmbedWidget>
-
-#include "./suil_internal.h"
-
-extern "C" {
-
-#define SUIL_TYPE_QT_WRAPPER (suil_qt_wrapper_get_type())
-#define SUIL_QT_WRAPPER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SUIL_TYPE_QT_WRAPPER, SuilQtWrapper))
-
-typedef struct _SuilQtWrapper      SuilQtWrapper;
-typedef struct _SuilQtWrapperClass SuilQtWrapperClass;
-
-struct _SuilQtWrapper {
-	GtkSocket        socket;
-	QApplication*    app;
-	QX11EmbedWidget* qembed;
-	SuilWrapper*     wrapper;
-	SuilInstance*    instance;
-};
-
-struct _SuilQtWrapperClass {
-	GtkSocketClass parent_class;
-};
-
-GType suil_qt_wrapper_get_type(void);  // Accessor for SUIL_TYPE_QT_WRAPPER
-
-G_DEFINE_TYPE(SuilQtWrapper, suil_qt_wrapper, GTK_TYPE_SOCKET)
-
-static void
-suil_qt_wrapper_finalize(GObject* gobject)
-{
-	SuilQtWrapper* const self = SUIL_QT_WRAPPER(gobject);
-
-	if (self->instance->handle) {
-		self->instance->descriptor->cleanup(self->instance->handle);
-		self->instance->handle = NULL;
-	}
-
-	delete self->qembed;
-
-	self->qembed        = NULL;
-	self->app           = NULL;
-	self->wrapper->impl = NULL;
-
-	G_OBJECT_CLASS(suil_qt_wrapper_parent_class)->finalize(gobject);
-}
-
-static void
-suil_qt_wrapper_class_init(SuilQtWrapperClass* klass)
-{
-	GObjectClass* const gobject_class = G_OBJECT_CLASS(klass);
-
-	gobject_class->finalize = suil_qt_wrapper_finalize;
-}
-
-static void
-suil_qt_wrapper_init(SuilQtWrapper* self)
-{
-	self->app      = NULL;
-	self->qembed   = NULL;
-	self->instance = NULL;
-}
-
-static void
-suil_qt_wrapper_realize(GtkWidget* w, gpointer data)
-{
-	SuilQtWrapper* const wrap = SUIL_QT_WRAPPER(w);
-	GtkSocket* const     s    = GTK_SOCKET(w);
-
-	gtk_socket_add_id(s, wrap->qembed->winId());
-	wrap->qembed->show();
-}
-
-static int
-wrapper_wrap(SuilWrapper*  wrapper,
-             SuilInstance* instance)
-{
-	SuilQtWrapper* const wrap = SUIL_QT_WRAPPER(wrapper->impl);
-
-	wrap->qembed   = new QX11EmbedWidget();
-	wrap->wrapper  = wrapper;
-	wrap->instance = instance;
-
-	QWidget*     qwidget = (QWidget*)instance->ui_widget;
-	QVBoxLayout* layout  = new QVBoxLayout(wrap->qembed);
-	layout->addWidget(qwidget);
-
-	qwidget->setParent(wrap->qembed);
-
-	g_signal_connect_after(G_OBJECT(wrap), "realize",
-	                       G_CALLBACK(suil_qt_wrapper_realize), NULL);
-
-	instance->host_widget = GTK_WIDGET(wrap);
-
-	return 0;
-}
-
-static void
-wrapper_free(SuilWrapper* wrapper)
-{
-	if (wrapper->impl) {
-		SuilQtWrapper* const wrap = SUIL_QT_WRAPPER(wrapper->impl);
-		gtk_object_destroy(GTK_OBJECT(wrap));
-	}
-}
-
-SUIL_LIB_EXPORT
-SuilWrapper*
-suil_wrapper_new(SuilHost*      host,
-                 const char*    host_type_uri,
-                 const char*    ui_type_uri,
-                 LV2_Feature*** features,
-                 unsigned       n_features)
-{
-	SuilWrapper* wrapper = (SuilWrapper*)calloc(1, sizeof(SuilWrapper));
-	wrapper->wrap = wrapper_wrap;
-	wrapper->free = wrapper_free;
-
-	SuilQtWrapper* const wrap = SUIL_QT_WRAPPER(
-		g_object_new(SUIL_TYPE_QT_WRAPPER, NULL));
-
-	if (qApp) {
-		wrap->app = qApp;
-	} else {
-		wrap->app = new QApplication(host->argc, host->argv, true);
-	}
-
-	wrap->wrapper = NULL;
-	wrapper->impl = wrap;
-
-	return wrapper;
-}
-
-}  // extern "C"
diff --git a/src/qt5_in_gtk2.cpp b/src/qt5_in_gtk2.cpp
deleted file mode 100644
index 4c77c4d..0000000
--- a/src/qt5_in_gtk2.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-  Copyright 2011-2017 David Robillard <http://drobilla.net>
-  Copyright 2018 Rui Nuno Capela <rncbc@rncbc.org>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#include <gtk/gtk.h>
-
-#include <QVBoxLayout>
-#include <QWidget>
-#include <QWindow>
-
-#include "lv2/lv2plug.in/ns/ext/options/options.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-
-#include "./suil_internal.h"
-
-extern "C" {
-
-#define SUIL_TYPE_QT_WRAPPER (suil_qt_wrapper_get_type())
-#define SUIL_QT_WRAPPER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SUIL_TYPE_QT_WRAPPER, SuilQtWrapper))
-
-typedef struct _SuilQtWrapper      SuilQtWrapper;
-typedef struct _SuilQtWrapperClass SuilQtWrapperClass;
-
-struct _SuilQtWrapper {
-	GtkSocket                   socket;
-	QWidget*                    qembed;
-	SuilWrapper*                wrapper;
-	SuilInstance*               instance;
-	const LV2UI_Idle_Interface* idle_iface;
-	guint                       idle_id;
-	guint                       idle_ms;
-};
-
-struct _SuilQtWrapperClass {
-	GtkSocketClass parent_class;
-};
-
-GType suil_qt_wrapper_get_type(void);  // Accessor for SUIL_TYPE_QT_WRAPPER
-
-G_DEFINE_TYPE(SuilQtWrapper, suil_qt_wrapper, GTK_TYPE_SOCKET)
-
-static void
-suil_qt_wrapper_finalize(GObject* gobject)
-{
-	SuilQtWrapper* const self = SUIL_QT_WRAPPER(gobject);
-
-	if (self->idle_id) {
-		g_source_remove(self->idle_id);
-		self->idle_id = 0;
-	}
-
-	if (self->instance->handle) {
-		self->instance->descriptor->cleanup(self->instance->handle);
-		self->instance->handle = NULL;
-	}
-
-	if (self->qembed) {
-		self->qembed->deleteLater();
-	}
-
-	self->qembed        = NULL;
-	self->idle_iface    = NULL;
-	self->wrapper->impl = NULL;
-
-	G_OBJECT_CLASS(suil_qt_wrapper_parent_class)->finalize(gobject);
-}
-
-static void
-suil_qt_wrapper_class_init(SuilQtWrapperClass* klass)
-{
-	GObjectClass* const gobject_class = G_OBJECT_CLASS(klass);
-
-	gobject_class->finalize = suil_qt_wrapper_finalize;
-}
-
-static void
-suil_qt_wrapper_init(SuilQtWrapper* self)
-{
-	self->qembed     = NULL;
-	self->wrapper    = NULL;
-	self->instance   = NULL;
-	self->idle_iface = NULL;
-	self->idle_id    = 0;
-	self->idle_ms    = 1000 / 30;  // 30 Hz default
-}
-
-static void
-suil_qt_wrapper_realize(GtkWidget* w, gpointer data)
-{
-	SuilQtWrapper* const wrap = SUIL_QT_WRAPPER(w);
-	GtkSocket* const     s    = GTK_SOCKET(w);
-	const WId            id   = (WId)gtk_socket_get_id(s);
-
-	wrap->qembed->winId();
-	wrap->qembed->windowHandle()->setParent(QWindow::fromWinId(id));
-	wrap->qembed->show();
-}
-
-static int
-suil_qt_wrapper_resize(LV2UI_Feature_Handle handle, int width, int height)
-{
-	gtk_widget_set_size_request(GTK_WIDGET(handle), width, height);
-
-	return 0;
-}
-
-static gboolean
-suil_qt_wrapper_idle(void* data)
-{
-	SuilQtWrapper* const wrap = SUIL_QT_WRAPPER(data);
-
-	if (wrap->idle_iface) {
-		wrap->idle_iface->idle(wrap->instance->handle);
-		return TRUE;  // Continue calling
-	}
-
-	return FALSE;
-}
-
-static int
-wrapper_wrap(SuilWrapper*  wrapper,
-             SuilInstance* instance)
-{
-	SuilQtWrapper* const wrap = SUIL_QT_WRAPPER(wrapper->impl);
-
-	wrap->qembed   = new QWidget();
-	wrap->wrapper  = wrapper;
-	wrap->instance = instance;
-
-	QWidget*     qwidget = (QWidget*)instance->ui_widget;
-	QVBoxLayout* layout  = new QVBoxLayout();
-	layout->setMargin(0);
-	layout->setSpacing(0);
-	layout->addWidget(qwidget);
-
-	wrap->qembed->setLayout(layout);
-
-	g_signal_connect_after(G_OBJECT(wrap), "realize",
-	                       G_CALLBACK(suil_qt_wrapper_realize), NULL);
-
-	instance->host_widget = GTK_WIDGET(wrap);
-
-	const LV2UI_Idle_Interface* idle_iface = NULL;
-	if (instance->descriptor->extension_data) {
-		idle_iface = (const LV2UI_Idle_Interface*)
-			instance->descriptor->extension_data(LV2_UI__idleInterface);
-	}
-
-	if (idle_iface) {
-		wrap->idle_iface = idle_iface;
-		wrap->idle_id    = g_timeout_add(
-			wrap->idle_ms, suil_qt_wrapper_idle, wrap);
-	}
-
-	return 0;
-}
-
-static void
-wrapper_free(SuilWrapper* wrapper)
-{
-	if (wrapper->impl) {
-		SuilQtWrapper* const wrap = SUIL_QT_WRAPPER(wrapper->impl);
-		gtk_object_destroy(GTK_OBJECT(wrap));
-	}
-}
-
-SUIL_LIB_EXPORT
-SuilWrapper*
-suil_wrapper_new(SuilHost*      host,
-                 const char*    host_type_uri,
-                 const char*    ui_type_uri,
-                 LV2_Feature*** features,
-                 unsigned       n_features)
-{
-	SuilWrapper* wrapper = (SuilWrapper*)calloc(1, sizeof(SuilWrapper));
-	wrapper->wrap = wrapper_wrap;
-	wrapper->free = wrapper_free;
-
-	SuilQtWrapper* const wrap = SUIL_QT_WRAPPER(
-		g_object_new(SUIL_TYPE_QT_WRAPPER, NULL));
-
-	wrap->wrapper = NULL;
-	wrapper->impl = wrap;
-
-	wrapper->resize.handle    = wrap;
-	wrapper->resize.ui_resize = suil_qt_wrapper_resize;
-
-	suil_add_feature(features, &n_features, LV2_UI__resize, &wrapper->resize);
-	suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL);
-
-	// Scan for URID map and options
-	LV2_URID_Map*       map     = NULL;
-	LV2_Options_Option* options = NULL;
-	for (LV2_Feature** f = *features; *f && (!map || !options); ++f) {
-		if (!strcmp((*f)->URI, LV2_OPTIONS__options)) {
-			options = (LV2_Options_Option*)(*f)->data;
-		} else if (!strcmp((*f)->URI, LV2_URID__map)) {
-			map = (LV2_URID_Map*)(*f)->data;
-		}
-	}
-
-	if (map && options) {
-		// Set UI update rate if given
-		LV2_URID ui_updateRate = map->map(map->handle, LV2_UI__updateRate);
-		for (LV2_Options_Option* o = options; o->key; ++o) {
-			if (o->key == ui_updateRate) {
-				wrap->idle_ms = 1000.0f / *(const float*)o->value;
-				break;
-			}
-		}
-	}
-
-	return wrapper;
-}
-
-}  // extern "C"
diff --git a/src/suil_internal.h b/src/suil_internal.h
deleted file mode 100644
index ecafbcf..0000000
--- a/src/suil_internal.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
-  Copyright 2007-2017 David Robillard <http://drobilla.net>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#ifndef SUIL_INTERNAL_H
-#define SUIL_INTERNAL_H
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef _WIN32
-#include <windows.h>
-#define dlopen(path, flags) LoadLibrary(path)
-#define dlclose(lib) FreeLibrary((HMODULE)lib)
-#define inline __inline
-#define snprintf _snprintf
-static inline char* dlerror(void) { return "Unknown error"; }
-#else
-#include <dlfcn.h>
-#endif
-
-#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
-
-#include "suil/suil.h"
-#include "./suil_config.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SUIL_ERRORF(fmt, ...) fprintf(stderr, "suil error: " fmt, __VA_ARGS__)
-
-struct SuilHostImpl {
-	SuilPortWriteFunc       write_func;
-	SuilPortIndexFunc       index_func;
-	SuilPortSubscribeFunc   subscribe_func;
-	SuilPortUnsubscribeFunc unsubscribe_func;
-	SuilTouchFunc           touch_func;
-	void*                   gtk_lib;
-	int                     argc;
-	char**                  argv;
-};
-
-struct _SuilWrapper;
-
-typedef void (*SuilWrapperFreeFunc)(struct _SuilWrapper*);
-
-typedef int (*SuilWrapperWrapFunc)(struct _SuilWrapper* wrapper,
-                                   SuilInstance*        instance);
-
-typedef struct _SuilWrapper {
-	SuilWrapperWrapFunc wrap;
-	SuilWrapperFreeFunc free;
-	void*               lib;
-	void*               impl;
-	LV2UI_Resize        resize;
-} SuilWrapper;
-
-struct SuilInstanceImpl {
-	void*                   lib_handle;
-	const LV2UI_Descriptor* descriptor;
-	LV2UI_Handle            handle;
-	SuilWrapper*            wrapper;
-	LV2_Feature**           features;
-	LV2UI_Port_Map          port_map;
-	LV2UI_Port_Subscribe    port_subscribe;
-	LV2UI_Touch             touch;
-	SuilWidget              ui_widget;
-	SuilWidget              host_widget;
-};
-
-/**
-   The type of the suil_wrapper_new entry point in a wrapper module.
-
-   This constructs a SuilWrapper which contains everything necessary
-   to wrap a widget, including a possibly extended features array to
-   be used for instantiating the UI.
-*/
-typedef SuilWrapper* (*SuilWrapperNewFunc)(SuilHost*      host,
-                                           const char*    host_type_uri,
-                                           const char*    ui_type_uri,
-                                           LV2_Feature*** features,
-                                           unsigned       n_features);
-
-/** Prototype for suil_wrapper_new in each wrapper module. */
-SUIL_LIB_EXPORT
-SuilWrapper*
-suil_wrapper_new(SuilHost*      host,
-                 const char*    host_type_uri,
-                 const char*    ui_type_uri,
-                 LV2_Feature*** features,
-                 unsigned       n_features);
-
-/** Prototype for suil_host_init in each init module. */
-SUIL_LIB_EXPORT
-void
-suil_host_init(void);
-
-/** Dynamically load the suil module with the given name. */
-static inline void*
-suil_open_module(const char* module_name)
-{
-	const char* const env_dir  = getenv("SUIL_MODULE_DIR");
-	const char* const mod_dir  = env_dir ? env_dir : SUIL_MODULE_DIR;
-	const size_t      path_len = strlen(mod_dir)
-		+ strlen(SUIL_DIR_SEP SUIL_MODULE_PREFIX SUIL_MODULE_EXT)
-		+ strlen(module_name)
-		+ 2;
-
-	char* const path = (char*)calloc(path_len, 1);
-	snprintf(path, path_len, "%s%s%s%s%s",
-	         mod_dir, SUIL_DIR_SEP,
-	         SUIL_MODULE_PREFIX, module_name, SUIL_MODULE_EXT);
-
-	dlerror();
-	void* lib = dlopen(path, RTLD_NOW);
-	if (!lib) {
-		SUIL_ERRORF("Failed to open module %s (%s)\n", path, dlerror());
-	}
-
-	free(path);
-	return lib;
-}
-
-typedef void (*SuilVoidFunc)(void);
-
-/** dlsym wrapper to return a function pointer (without annoying warning) */
-static inline SuilVoidFunc
-suil_dlfunc(void* handle, const char* symbol)
-{
-#ifdef _WIN32
-	 return (SuilVoidFunc)GetProcAddress((HMODULE)handle, symbol);
-#else
-	typedef SuilVoidFunc (*VoidFuncGetter)(void*, const char*);
-	VoidFuncGetter dlfunc = (VoidFuncGetter)dlsym;
-	return dlfunc(handle, symbol);
-#endif
-}
-
-/** Add a feature to a (mutable) LV2 feature array. */
-static inline void
-suil_add_feature(LV2_Feature*** features,
-                 unsigned*      n,
-                 const char*    uri,
-                 void*          data)
-{
-	for (unsigned i = 0; i < *n && (*features)[i]; ++i) {
-		if (!strcmp((*features)[i]->URI, uri)) {
-			(*features)[i]->data = data;
-			return;
-		}
-	}
-
-	*features = (LV2_Feature**)realloc(*features,
-	                                   sizeof(LV2_Feature*) * (*n + 2));
-
-	(*features)[*n]       = (LV2_Feature*)malloc(sizeof(LV2_Feature));
-	(*features)[*n]->URI  = uri;
-	(*features)[*n]->data = data;
-	(*features)[*n + 1]   = NULL;
-	*n += 1;
-}
-
-extern int    suil_argc;
-extern char** suil_argv;
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif  // SUIL_INTERNAL_H
diff --git a/src/win_in_gtk2.cpp b/src/win_in_gtk2.cpp
deleted file mode 100644
index 70c7c1a..0000000
--- a/src/win_in_gtk2.cpp
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
-  Copyright 2011-2015 David Robillard <http://drobilla.net>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#include <string.h>
-
-#include <gtk/gtk.h>
-#include <gdk/gdkwin32.h>
-
-#ifndef WM_MOUSEWHEEL
-#    define WM_MOUSEWHEEL 0x020A
-#endif
-#ifndef WM_MOUSEHWHEEL
-#    define WM_MOUSEHWHEEL 0x020E
-#endif
-
-#include "./suil_internal.h"
-
-#include "lv2/lv2plug.in/ns/ext/options/options.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-
-extern "C" {
-
-#define SUIL_TYPE_WIN_WRAPPER (suil_win_wrapper_get_type())
-#define SUIL_WIN_WRAPPER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SUIL_TYPE_WIN_WRAPPER, SuilWinWrapper))
-
-typedef struct _SuilWinWrapper      SuilWinWrapper;
-typedef struct _SuilWinWrapperClass SuilWinWrapperClass;
-
-struct _SuilWinWrapper {
-	GtkDrawingArea              area;
-	SuilWrapper*                wrapper;
-	SuilInstance*               instance;
-	GdkWindow*                  flt_win;
-	const LV2UI_Idle_Interface* idle_iface;
-	guint                       idle_id;
-	guint                       idle_ms;
-};
-
-struct _SuilWinWrapperClass {
-	GtkDrawingAreaClass parent_class;
-};
-
-GType suil_win_wrapper_get_type(void);  // Accessor for SUIL_TYPE_WIN_WRAPPER
-
-G_DEFINE_TYPE(SuilWinWrapper, suil_win_wrapper, GTK_TYPE_DRAWING_AREA)
-
-static void
-suil_win_wrapper_finalize(GObject* gobject)
-{
-	SuilWinWrapper* const self = SUIL_WIN_WRAPPER(gobject);
-
-	self->wrapper->impl = NULL;
-	self->instance      = NULL;
-
-	G_OBJECT_CLASS(suil_win_wrapper_parent_class)->finalize(gobject);
-}
-
-static void
-suil_win_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
-{
-	SuilWinWrapper* const self = SUIL_WIN_WRAPPER(widget);
-	g_return_if_fail(self != NULL);
-
-	widget->allocation = *allocation;
-	if (gtk_widget_get_realized(widget)) {
-		gdk_window_move_resize(widget->window,
-		                       allocation->x, allocation->y,
-		                       allocation->width, allocation->height);
-
-		RECT wr = { 0, 0, (long)allocation->width, (long)allocation->height };
-		AdjustWindowRectEx(&wr, WS_CHILD, FALSE, WS_EX_TOPMOST);
-
-		SetWindowPos((HWND)self->instance->ui_widget, HWND_NOTOPMOST,
-		             0, 0, wr.right - wr.left, wr.bottom - wr.top,
-		             SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOOWNERZORDER|SWP_NOZORDER);
-		UpdateWindow((HWND)self->instance->ui_widget);
-		PostMessage((HWND)self->instance->ui_widget, WM_PAINT, 0, 0);
-	}
-}
-
-static void
-suil_win_wrapper_class_init(SuilWinWrapperClass* klass)
-{
-	GObjectClass* const   gobject_class = G_OBJECT_CLASS(klass);
-	GtkWidgetClass* const widget_class  = (GtkWidgetClass*)(klass);
-
-	widget_class->size_allocate = suil_win_size_allocate;
-	gobject_class->finalize     = suil_win_wrapper_finalize;
-}
-
-static void
-suil_win_wrapper_init(SuilWinWrapper* self)
-{
-	self->instance   = NULL;
-	self->flt_win    = NULL;
-	self->idle_iface = NULL;
-	self->idle_ms    = 1000 / 30;  // 30 Hz default
-}
-
-static gboolean
-suil_win_wrapper_idle(void* data)
-{
-	SuilWinWrapper* const wrap = SUIL_WIN_WRAPPER(data);
-	wrap->idle_iface->idle(wrap->instance->handle);
-	return TRUE;  // Continue calling
-}
-
-static int
-wrapper_resize(LV2UI_Feature_Handle handle, int width, int height)
-{
-	gtk_drawing_area_size(GTK_DRAWING_AREA(handle), width, height);
-	return 0;
-}
-
-static int
-wrapper_wrap(SuilWrapper*  wrapper,
-             SuilInstance* instance)
-{
-	SuilWinWrapper* const wrap = SUIL_WIN_WRAPPER(wrapper->impl);
-
-	instance->host_widget = GTK_WIDGET(wrap);
-	wrap->wrapper         = wrapper;
-	wrap->instance        = instance;
-
-	const LV2UI_Idle_Interface* idle_iface = NULL;
-	if (instance->descriptor->extension_data) {
-		idle_iface = (const LV2UI_Idle_Interface*)
-			instance->descriptor->extension_data(LV2_UI__idleInterface);
-	}
-	if (idle_iface) {
-		wrap->idle_iface = idle_iface;
-		wrap->idle_id    = g_timeout_add (wrap->idle_ms, suil_win_wrapper_idle, wrap);
-	}
-
-	return 0;
-}
-
-static GdkFilterReturn
-event_filter(GdkXEvent* xevent, GdkEvent* event, gpointer data)
-{
-	SuilWinWrapper* wrap = (SuilWinWrapper*)data;
-	MSG*            msg  = (MSG*)xevent;
-	if (msg->message == WM_KEYDOWN || msg->message == WM_KEYUP) {
-		// Forward keyboard events to UI window
-		PostMessage((HWND)wrap->instance->ui_widget,
-		            msg->message, msg->wParam, msg->lParam);
-		return GDK_FILTER_REMOVE;
-	} else if (msg->message == WM_MOUSEWHEEL || msg->message == WM_MOUSEHWHEEL) {
-		PostMessage((HWND)wrap->instance->ui_widget,
-		            msg->message, msg->wParam, msg->lParam);
-		return GDK_FILTER_REMOVE;
-	}
-	return GDK_FILTER_CONTINUE;
-}
-
-static void
-wrapper_free(SuilWrapper* wrapper)
-{
-	if (wrapper->impl) {
-		SuilWinWrapper* const wrap = SUIL_WIN_WRAPPER(wrapper->impl);
-		if (wrap->idle_id) {
-			g_source_remove(wrap->idle_id);
-			wrap->idle_id = 0;
-		}
-
-		gdk_window_remove_filter(wrap->flt_win, event_filter, wrapper->impl);
-		gtk_object_destroy(GTK_OBJECT(wrap));
-	}
-}
-
-SUIL_LIB_EXPORT
-SuilWrapper*
-suil_wrapper_new(SuilHost*      host,
-                 const char*    host_type_uri,
-                 const char*    ui_type_uri,
-                 LV2_Feature*** features,
-                 unsigned       n_features)
-{
-	GtkWidget* parent = NULL;
-	for (unsigned i = 0; i < n_features; ++i) {
-		if (!strcmp((*features)[i]->URI, LV2_UI__parent)) {
-			parent = (GtkWidget*)(*features)[i]->data;
-		}
-	}
-
-	if (!GTK_CONTAINER(parent)) {
-		SUIL_ERRORF("No GtkContainer parent given for %s UI\n",
-		            ui_type_uri);
-		return NULL;
-	}
-
-	SuilWrapper* wrapper = (SuilWrapper*)calloc(1, sizeof(SuilWrapper));
-	wrapper->wrap = wrapper_wrap;
-	wrapper->free = wrapper_free;
-
-	SuilWinWrapper* const wrap = SUIL_WIN_WRAPPER(
-		g_object_new(SUIL_TYPE_WIN_WRAPPER, NULL));
-
-	wrap->wrapper = NULL;
-
-	wrapper->impl             = wrap;
-	wrapper->resize.handle    = wrap;
-	wrapper->resize.ui_resize = wrapper_resize;
-
-	gtk_container_add(GTK_CONTAINER(parent), GTK_WIDGET(wrap));
-	gtk_widget_set_can_focus(GTK_WIDGET(wrap), TRUE);
-	gtk_widget_set_sensitive(GTK_WIDGET(wrap), TRUE);
-	gtk_widget_realize(GTK_WIDGET(wrap));
-
-	GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(wrap));
-
-	wrap->flt_win = gtk_widget_get_window(parent);
-	gdk_window_add_filter(wrap->flt_win, event_filter, wrap);
-
-	HWND parent_window = (HWND)GDK_WINDOW_HWND(window);
-	suil_add_feature(features, &n_features, LV2_UI__parent, parent_window);
-	suil_add_feature(features, &n_features, LV2_UI__resize, &wrapper->resize);
-	suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL);
-
-	// Scan for URID map and options
-	LV2_URID_Map*       map     = NULL;
-	LV2_Options_Option* options = NULL;
-	for (LV2_Feature** f = *features; *f && (!map || !options); ++f) {
-		if (!strcmp((*f)->URI, LV2_OPTIONS__options)) {
-			options = (LV2_Options_Option *)(*f)->data;
-		} else if (!strcmp((*f)->URI, LV2_URID__map)) {
-			map = (LV2_URID_Map *)(*f)->data;
-		}
-	}
-
-	if (map && options) {
-		// Set UI update rate if given
-		LV2_URID ui_updateRate = map->map(map->handle, LV2_UI__updateRate);
-		for (LV2_Options_Option* o = options; o->key; ++o) {
-			if (o->key == ui_updateRate) {
-				wrap->idle_ms = 1000.0f / *(const float*)o->value;
-				break;
-			}
-		}
-	}
-
-	return wrapper;
-}
-
-}  // extern "C"
diff --git a/src/x11.c b/src/x11.c
deleted file mode 100644
index 4c8a15a..0000000
--- a/src/x11.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-  Copyright 2017 David Robillard <http://drobilla.net>
-  Copyright 2017 Stefan Westerfeld <stefan@space.twc.de>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#include <X11/Xlib.h>
-
-#include "./suil_internal.h"
-
-SUIL_LIB_EXPORT
-void
-suil_host_init(void)
-{
-	// This must be called first for Qt5 in Gtk2 to function correctly
-	XInitThreads();
-}
diff --git a/src/x11_in_gtk2.c b/src/x11_in_gtk2.c
deleted file mode 100644
index 7ec9592..0000000
--- a/src/x11_in_gtk2.c
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
-  Copyright 2011-2016 David Robillard <http://drobilla.net>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-#include <string.h>
-
-#include "lv2/lv2plug.in/ns/ext/options/options.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-
-#include "./suil_internal.h"
-
-#define SUIL_TYPE_X11_WRAPPER (suil_x11_wrapper_get_type())
-#define SUIL_X11_WRAPPER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SUIL_TYPE_X11_WRAPPER, SuilX11Wrapper))
-
-typedef struct _SuilX11Wrapper      SuilX11Wrapper;
-typedef struct _SuilX11WrapperClass SuilX11WrapperClass;
-
-struct _SuilX11Wrapper {
-	GtkSocket                   socket;
-	GtkPlug*                    plug;
-	SuilWrapper*                wrapper;
-	SuilInstance*               instance;
-	const LV2UI_Idle_Interface* idle_iface;
-	guint                       idle_id;
-	guint                       idle_ms;
-};
-
-struct _SuilX11WrapperClass {
-	GtkSocketClass parent_class;
-};
-
-GType suil_x11_wrapper_get_type(void);  // Accessor for SUIL_TYPE_X11_WRAPPER
-
-G_DEFINE_TYPE(SuilX11Wrapper, suil_x11_wrapper, GTK_TYPE_SOCKET)
-
-/**
-   Check if 'swallowed' subwindow is known to the X server.
-
-   Gdk/GTK can mark the window as realized, mapped and visible even though
-   there is no window-ID on the X server for it yet.  Then,
-   suil_x11_on_size_allocate() will cause a "BadWinow" X error.
-*/
-static bool
-x_window_is_valid(SuilX11Wrapper* socket)
-{
-	GdkWindow* window     = gtk_widget_get_window(GTK_WIDGET(socket->plug));
-	Window     root       = 0;
-	Window     parent     = 0;
-	Window*    children   = NULL;
-	unsigned   childcount = 0;
-
-	XQueryTree(GDK_WINDOW_XDISPLAY(window),
-	           GDK_WINDOW_XID(window),
-	           &root, &parent, &children, &childcount);
-	for (unsigned i = 0; i < childcount; ++i) {
-		if (children[i] == (Window)socket->instance->ui_widget) {
-			XFree(children);
-			return true;
-		}
-	}
-	XFree(children);
-	return false;
-}
-
-static gboolean
-on_plug_removed(GtkSocket* sock, gpointer data)
-{
-	SuilX11Wrapper* const self = SUIL_X11_WRAPPER(sock);
-
-	if (self->idle_id) {
-		g_source_remove(self->idle_id);
-		self->idle_id = 0;
-	}
-
-	if (self->instance->handle) {
-		self->instance->descriptor->cleanup(self->instance->handle);
-		self->instance->handle = NULL;
-	}
-
-	self->plug = NULL;
-	return TRUE;
-}
-
-static void
-suil_x11_wrapper_finalize(GObject* gobject)
-{
-	SuilX11Wrapper* const self = SUIL_X11_WRAPPER(gobject);
-
-	self->wrapper->impl = NULL;
-
-	G_OBJECT_CLASS(suil_x11_wrapper_parent_class)->finalize(gobject);
-}
-
-static void
-suil_x11_wrapper_realize(GtkWidget* w)
-{
-	SuilX11Wrapper* const wrap   = SUIL_X11_WRAPPER(w);
-	GtkSocket* const      socket = GTK_SOCKET(w);
-
-	if (GTK_WIDGET_CLASS(suil_x11_wrapper_parent_class)->realize) {
-		GTK_WIDGET_CLASS(suil_x11_wrapper_parent_class)->realize(w);
-	}
-
-	gtk_socket_add_id(socket, gtk_plug_get_id(wrap->plug));
-
-	gtk_widget_set_sensitive(GTK_WIDGET(wrap->plug), TRUE);
-	gtk_widget_set_can_focus(GTK_WIDGET(wrap->plug), TRUE);
-	gtk_widget_grab_focus(GTK_WIDGET(wrap->plug));
-}
-
-static void
-suil_x11_wrapper_show(GtkWidget* w)
-{
-	SuilX11Wrapper* const wrap = SUIL_X11_WRAPPER(w);
-
-	if (GTK_WIDGET_CLASS(suil_x11_wrapper_parent_class)->show) {
-		GTK_WIDGET_CLASS(suil_x11_wrapper_parent_class)->show(w);
-	}
-
-	gtk_widget_show(GTK_WIDGET(wrap->plug));
-}
-
-static gboolean
-forward_key_event(SuilX11Wrapper* socket,
-                  GdkEvent*       gdk_event)
-{
-	GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(socket->plug));
-	GdkScreen* screen = gdk_visual_get_screen(gdk_window_get_visual(window));
-
-	Window target_window;
-	if (gdk_event->any.window == window) {
-		// Event sent up to the plug window, forward it up to the parent
-		GtkWidget* widget = GTK_WIDGET(socket->instance->host_widget);
-		GdkWindow* parent = gtk_widget_get_parent_window(widget);
-		if (parent) {
-			target_window = GDK_WINDOW_XID(parent);
-		} else {
-			return FALSE;  // Wrapper is a top-level window, do nothing
-		}
-	} else {
-		// Event sent anywhere else, send to the plugin
-		target_window = (Window)socket->instance->ui_widget;
-	}
-
-	XKeyEvent xev;
-	memset(&xev, 0, sizeof(xev));
-	xev.type      = (gdk_event->type == GDK_KEY_PRESS) ? KeyPress : KeyRelease;
-	xev.root      = GDK_WINDOW_XID(gdk_screen_get_root_window(screen));
-	xev.window    = target_window;
-	xev.subwindow = None;
-	xev.time      = gdk_event->key.time;
-	xev.state     = gdk_event->key.state;
-	xev.keycode   = gdk_event->key.hardware_keycode;
-
-	XSendEvent(GDK_WINDOW_XDISPLAY(window),
-	           target_window,
-	           False,
-	           NoEventMask,
-	           (XEvent*)&xev);
-
-	return (gdk_event->any.window != window);
-}
-
-static gboolean
-idle_size_request(gpointer user_data)
-{
-	GtkWidget* w = GTK_WIDGET(user_data);
-	gtk_widget_queue_resize(w);
-	return FALSE;
-}
-
-static void
-forward_size_request(SuilX11Wrapper* socket,
-                     GtkAllocation*  allocation)
-{
-	GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(socket->plug));
-	if (x_window_is_valid(socket)) {
-		// Calculate allocation size constrained to X11 limits for widget
-		int        width  = allocation->width;
-		int        height = allocation->height;
-		XSizeHints hints;
-		memset(&hints, 0, sizeof(hints));
-		XGetNormalHints(GDK_WINDOW_XDISPLAY(window),
-		                (Window)socket->instance->ui_widget,
-		                &hints);
-		if (hints.flags & PMaxSize) {
-			width  = MIN(width, hints.max_width);
-			height = MIN(height, hints.max_height);
-		}
-		if (hints.flags & PMinSize) {
-			width  = MAX(width, hints.min_width);
-			height = MAX(height, hints.min_height);
-		}
-
-		// Resize widget window
-		XResizeWindow(GDK_WINDOW_XDISPLAY(window),
-		              (Window)socket->instance->ui_widget,
-		              width, height);
-
-		// Get actual widget geometry
-		Window       root;
-		int          wx, wy;
-		unsigned int ww, wh;
-		unsigned int ignored;
-		XGetGeometry(GDK_WINDOW_XDISPLAY(window),
-		             (Window)socket->instance->ui_widget,
-		             &root,
-		             &wx, &wy, &ww, &wh,
-		             &ignored, &ignored);
-
-		// Center widget in allocation
-		wx = (allocation->width  - ww) / 2;
-		wy = (allocation->height - wh) / 2;
-		XMoveWindow(GDK_WINDOW_XDISPLAY(window),
-		            (Window)socket->instance->ui_widget,
-		            wx, wy);
-	} else {
-		/* Child has not been realized, so unable to resize now.
-		   Queue an idle resize. */
-		g_idle_add(idle_size_request, socket->plug);
-	}
-}
-
-static gboolean
-suil_x11_wrapper_key_event(GtkWidget*   widget,
-                           GdkEventKey* event)
-{
-	SuilX11Wrapper* const self = SUIL_X11_WRAPPER(widget);
-
-	if (self->plug) {
-		return forward_key_event(self, (GdkEvent*)event);
-	}
-
-	return FALSE;
-}
-
-static void
-suil_x11_on_size_allocate(GtkWidget*     widget,
-                          GtkAllocation* a)
-{
-	SuilX11Wrapper* const self = SUIL_X11_WRAPPER(widget);
-
-	if (self->plug
-	    && GTK_WIDGET_REALIZED(widget)
-	    && GTK_WIDGET_MAPPED(widget)
-	    && GTK_WIDGET_VISIBLE(widget)) {
-		forward_size_request(self, a);
-	}
-}
-
-static void
-suil_x11_wrapper_class_init(SuilX11WrapperClass* klass)
-{
-	GObjectClass* const   gobject_class = G_OBJECT_CLASS(klass);
-	GtkWidgetClass* const widget_class  = GTK_WIDGET_CLASS(klass);
-
-	gobject_class->finalize         = suil_x11_wrapper_finalize;
-	widget_class->realize           = suil_x11_wrapper_realize;
-	widget_class->show              = suil_x11_wrapper_show;
-	widget_class->key_press_event   = suil_x11_wrapper_key_event;
-	widget_class->key_release_event = suil_x11_wrapper_key_event;
-}
-
-static void
-suil_x11_wrapper_init(SuilX11Wrapper* self)
-{
-	self->plug       = GTK_PLUG(gtk_plug_new(0));
-	self->wrapper    = NULL;
-	self->instance   = NULL;
-	self->idle_iface = NULL;
-	self->idle_ms    = 1000 / 30;  // 30 Hz default
-}
-
-static int
-wrapper_resize(LV2UI_Feature_Handle handle, int width, int height)
-{
-	gtk_widget_set_size_request(GTK_WIDGET(handle), width, height);
-	return 0;
-}
-
-static gboolean
-suil_x11_wrapper_idle(void* data)
-{
-	SuilX11Wrapper* const wrap = SUIL_X11_WRAPPER(data);
-
-	wrap->idle_iface->idle(wrap->instance->handle);
-
-	return TRUE;  // Continue calling
-}
-
-static int
-wrapper_wrap(SuilWrapper*  wrapper,
-             SuilInstance* instance)
-{
-	SuilX11Wrapper* const wrap = SUIL_X11_WRAPPER(wrapper->impl);
-
-	instance->host_widget = GTK_WIDGET(wrap);
-	wrap->wrapper         = wrapper;
-	wrap->instance        = instance;
-
-	const LV2UI_Idle_Interface* idle_iface = NULL;
-	if (instance->descriptor->extension_data) {
-		idle_iface = (const LV2UI_Idle_Interface*)
-			instance->descriptor->extension_data(LV2_UI__idleInterface);
-	}
-	if (idle_iface) {
-		wrap->idle_iface = idle_iface;
-		wrap->idle_id    = g_timeout_add(
-			wrap->idle_ms, suil_x11_wrapper_idle, wrap);
-	}
-
-	g_signal_connect(G_OBJECT(wrap),
-	                 "plug-removed",
-	                 G_CALLBACK(on_plug_removed),
-	                 NULL);
-
-	g_signal_connect(G_OBJECT(wrap),
-	                 "size-allocate",
-	                 G_CALLBACK(suil_x11_on_size_allocate),
-	                 NULL);
-
-	return 0;
-}
-
-static void
-wrapper_free(SuilWrapper* wrapper)
-{
-	if (wrapper->impl) {
-		SuilX11Wrapper* const wrap = SUIL_X11_WRAPPER(wrapper->impl);
-		gtk_object_destroy(GTK_OBJECT(wrap));
-	}
-}
-
-SUIL_LIB_EXPORT
-SuilWrapper*
-suil_wrapper_new(SuilHost*      host,
-                 const char*    host_type_uri,
-                 const char*    ui_type_uri,
-                 LV2_Feature*** features,
-                 unsigned       n_features)
-{
-	SuilWrapper* wrapper = (SuilWrapper*)calloc(1, sizeof(SuilWrapper));
-	wrapper->wrap = wrapper_wrap;
-	wrapper->free = wrapper_free;
-
-	SuilX11Wrapper* const wrap = SUIL_X11_WRAPPER(
-		g_object_new(SUIL_TYPE_X11_WRAPPER, NULL));
-
-	wrapper->impl             = wrap;
-	wrapper->resize.handle    = wrap;
-	wrapper->resize.ui_resize = wrapper_resize;
-
-	gtk_widget_set_sensitive(GTK_WIDGET(wrap), TRUE);
-	gtk_widget_set_can_focus(GTK_WIDGET(wrap), TRUE);
-
-	const intptr_t parent_id = (intptr_t)gtk_plug_get_id(wrap->plug);
-	suil_add_feature(features, &n_features, LV2_UI__parent, (void*)parent_id);
-	suil_add_feature(features, &n_features, LV2_UI__resize, &wrapper->resize);
-	suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL);
-
-	// Scan for URID map and options
-	LV2_URID_Map*       map     = NULL;
-	LV2_Options_Option* options = NULL;
-	for (LV2_Feature** f = *features; *f && (!map || !options); ++f) {
-		if (!strcmp((*f)->URI, LV2_OPTIONS__options)) {
-			options = (LV2_Options_Option*)(*f)->data;
-		} else if (!strcmp((*f)->URI, LV2_URID__map)) {
-			map = (LV2_URID_Map*)(*f)->data;
-		}
-	}
-
-	if (map && options) {
-		// Set UI update rate if given
-		LV2_URID ui_updateRate = map->map(map->handle, LV2_UI__updateRate);
-		for (LV2_Options_Option* o = options; o->key; ++o) {
-			if (o->key == ui_updateRate) {
-				wrap->idle_ms = 1000.0f / *(const float*)o->value;
-				break;
-			}
-		}
-	}
-
-	return wrapper;
-}
diff --git a/src/x11_in_gtk3.c b/src/x11_in_gtk3.c
deleted file mode 100644
index 0c016c9..0000000
--- a/src/x11_in_gtk3.c
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
-  Copyright 2011-2016 David Robillard <http://drobilla.net>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#include <string.h>
-
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-#include <gtk/gtkx.h>
-
-#include "./suil_internal.h"
-
-#include "lv2/lv2plug.in/ns/ext/options/options.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-
-#define SUIL_TYPE_X11_WRAPPER (suil_x11_wrapper_get_type())
-#define SUIL_X11_WRAPPER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SUIL_TYPE_X11_WRAPPER, SuilX11Wrapper))
-
-typedef struct _SuilX11Wrapper      SuilX11Wrapper;
-typedef struct _SuilX11WrapperClass SuilX11WrapperClass;
-
-struct _SuilX11Wrapper {
-	GtkSocket                   socket;
-	GtkPlug*                    plug;
-	SuilWrapper*                wrapper;
-	SuilInstance*               instance;
-	const LV2UI_Idle_Interface* idle_iface;
-	guint                       idle_id;
-	guint                       idle_ms;
-};
-
-struct _SuilX11WrapperClass {
-	GtkSocketClass parent_class;
-};
-
-GType suil_x11_wrapper_get_type(void);  // Accessor for SUIL_TYPE_X11_WRAPPER
-
-G_DEFINE_TYPE(SuilX11Wrapper, suil_x11_wrapper, GTK_TYPE_SOCKET)
-
-/**
-   Check if 'swallowed' subwindow is known to the X server.
-
-   Gdk/GTK can mark the window as realized, mapped and visible even though
-   there is no window-ID on the X server for it yet.  Then,
-   suil_x11_on_size_allocate() will cause a "BadWinow" X error.
-*/
-static bool
-x_window_is_valid(SuilX11Wrapper* socket)
-{
-	GdkWindow* window     = gtk_widget_get_window(GTK_WIDGET(socket->plug));
-	Window     root       = 0;
-	Window     parent     = 0;
-	Window*    children   = NULL;
-	unsigned   childcount = 0;
-
-	XQueryTree(GDK_WINDOW_XDISPLAY(window),
-	           GDK_WINDOW_XID(window),
-	           &root, &parent, &children, &childcount);
-	for (unsigned i = 0; i < childcount; ++i) {
-		if (children[i] == (Window)socket->instance->ui_widget) {
-			XFree(children);
-			return true;
-		}
-	}
-	XFree(children);
-	return false;
-}
-
-static gboolean
-on_plug_removed(GtkSocket* sock, gpointer data)
-{
-	SuilX11Wrapper* const self = SUIL_X11_WRAPPER(sock);
-
-	if (self->idle_id) {
-		g_source_remove(self->idle_id);
-		self->idle_id = 0;
-	}
-
-	if (self->instance->handle) {
-		self->instance->descriptor->cleanup(self->instance->handle);
-		self->instance->handle = NULL;
-	}
-
-	self->plug = NULL;
-	return TRUE;
-}
-
-static void
-suil_x11_wrapper_finalize(GObject* gobject)
-{
-	SuilX11Wrapper* const self = SUIL_X11_WRAPPER(gobject);
-
-	self->wrapper->impl = NULL;
-
-	G_OBJECT_CLASS(suil_x11_wrapper_parent_class)->finalize(gobject);
-}
-
-static void
-suil_x11_wrapper_realize(GtkWidget* w)
-{
-	SuilX11Wrapper* const wrap   = SUIL_X11_WRAPPER(w);
-	GtkSocket* const      socket = GTK_SOCKET(w);
-
-	if (GTK_WIDGET_CLASS(suil_x11_wrapper_parent_class)->realize) {
-		GTK_WIDGET_CLASS(suil_x11_wrapper_parent_class)->realize(w);
-	}
-
-	gtk_socket_add_id(socket, gtk_plug_get_id(wrap->plug));
-
-	gtk_widget_realize(GTK_WIDGET(wrap->plug));
-
-	gtk_widget_set_sensitive(GTK_WIDGET(wrap->plug), TRUE);
-	gtk_widget_set_can_focus(GTK_WIDGET(wrap->plug), TRUE);
-	gtk_widget_grab_focus(GTK_WIDGET(wrap->plug));
-}
-
-static void
-suil_x11_wrapper_show(GtkWidget* w)
-{
-	SuilX11Wrapper* const wrap = SUIL_X11_WRAPPER(w);
-
-	if (GTK_WIDGET_CLASS(suil_x11_wrapper_parent_class)->show) {
-		GTK_WIDGET_CLASS(suil_x11_wrapper_parent_class)->show(w);
-	}
-
-	gtk_widget_show(GTK_WIDGET(wrap->plug));
-}
-
-static gboolean
-forward_key_event(SuilX11Wrapper* socket,
-                  GdkEvent*       gdk_event)
-{
-	GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(socket->plug));
-	GdkScreen* screen = gdk_visual_get_screen(gdk_window_get_visual(window));
-
-	Window target_window;
-	if (gdk_event->any.window == window) {
-		// Event sent up to the plug window, forward it up to the parent
-		GtkWidget* widget = GTK_WIDGET(socket->instance->host_widget);
-		GdkWindow* parent = gtk_widget_get_parent_window(widget);
-		if (parent) {
-			target_window = GDK_WINDOW_XID(parent);
-		} else {
-			return FALSE;  // Wrapper is a top-level window, do nothing
-		}
-	} else {
-		// Event sent anywhere else, send to the plugin
-		target_window = (Window)socket->instance->ui_widget;
-	}
-
-	XKeyEvent xev;
-	memset(&xev, 0, sizeof(xev));
-	xev.type      = (gdk_event->type == GDK_KEY_PRESS) ? KeyPress : KeyRelease;
-	xev.root      = GDK_WINDOW_XID(gdk_screen_get_root_window(screen));
-	xev.window    = target_window;
-	xev.subwindow = None;
-	xev.time      = gdk_event->key.time;
-	xev.state     = gdk_event->key.state;
-	xev.keycode   = gdk_event->key.hardware_keycode;
-
-	XSendEvent(GDK_WINDOW_XDISPLAY(window),
-	           target_window,
-	           False,
-	           NoEventMask,
-	           (XEvent*)&xev);
-
-	return (gdk_event->any.window != window);
-}
-
-static gboolean
-idle_size_request(gpointer user_data)
-{
-	GtkWidget* w = GTK_WIDGET(user_data);
-	gtk_widget_queue_resize(w);
-	return FALSE;
-}
-
-static void
-forward_size_request(SuilX11Wrapper* socket,
-                     GtkAllocation*  allocation)
-{
-	GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(socket->plug));
-	if (x_window_is_valid(socket)) {
-		// Calculate allocation size constrained to X11 limits for widget
-		int        width  = allocation->width;
-		int        height = allocation->height;
-		XSizeHints hints;
-		memset(&hints, 0, sizeof(hints));
-		XGetNormalHints(GDK_WINDOW_XDISPLAY(window),
-		                (Window)socket->instance->ui_widget,
-		                &hints);
-		if (hints.flags & PMaxSize) {
-			width  = MIN(width, hints.max_width);
-			height = MIN(height, hints.max_height);
-		}
-		if (hints.flags & PMinSize) {
-			width  = MAX(width, hints.min_width);
-			height = MAX(height, hints.min_height);
-		}
-
-		// Resize widget window
-		XResizeWindow(GDK_WINDOW_XDISPLAY(window),
-		              (Window)socket->instance->ui_widget,
-		              width, height);
-
-		// Get actual widget geometry
-		Window       root;
-		int          wx, wy;
-		unsigned int ww, wh;
-		unsigned int ignored;
-		XGetGeometry(GDK_WINDOW_XDISPLAY(window),
-		             (Window)socket->instance->ui_widget,
-		             &root,
-		             &wx, &wy, &ww, &wh,
-		             &ignored, &ignored);
-
-		// Center widget in allocation
-		wx = (allocation->width  - ww) / 2;
-		wy = (allocation->height - wh) / 2;
-		XMoveWindow(GDK_WINDOW_XDISPLAY(window),
-		            (Window)socket->instance->ui_widget,
-		            wx, wy);
-	} else {
-		/* Child has not been realized, so unable to resize now.
-		   Queue an idle resize. */
-		g_idle_add(idle_size_request, socket->plug);
-	}
-}
-
-static gboolean
-suil_x11_wrapper_key_event(GtkWidget*   widget,
-                           GdkEventKey* event)
-{
-	SuilX11Wrapper* const self = SUIL_X11_WRAPPER(widget);
-
-	if (self->plug) {
-		return forward_key_event(self, (GdkEvent*)event);
-	}
-
-	return FALSE;
-}
-
-static void
-suil_x11_on_size_allocate(GtkWidget*     widget,
-                          GtkAllocation* a)
-{
-	SuilX11Wrapper* const self = SUIL_X11_WRAPPER(widget);
-
-	if (self->plug
-	    && gtk_widget_get_realized(widget)
-	    && gtk_widget_get_mapped(widget)
-	    && gtk_widget_get_visible(widget)) {
-		forward_size_request(self, a);
-	}
-}
-
-static void
-suil_x11_wrapper_class_init(SuilX11WrapperClass* klass)
-{
-	GObjectClass* const   gobject_class = G_OBJECT_CLASS(klass);
-	GtkWidgetClass* const widget_class  = GTK_WIDGET_CLASS(klass);
-
-	gobject_class->finalize         = suil_x11_wrapper_finalize;
-	widget_class->realize           = suil_x11_wrapper_realize;
-	widget_class->show              = suil_x11_wrapper_show;
-	widget_class->key_press_event   = suil_x11_wrapper_key_event;
-	widget_class->key_release_event = suil_x11_wrapper_key_event;
-}
-
-static void
-suil_x11_wrapper_init(SuilX11Wrapper* self)
-{
-	self->plug       = GTK_PLUG(gtk_plug_new(0));
-	self->wrapper    = NULL;
-	self->instance   = NULL;
-	self->idle_iface = NULL;
-	self->idle_ms    = 1000 / 30;  // 30 Hz default
-}
-
-static int
-wrapper_resize(LV2UI_Feature_Handle handle, int width, int height)
-{
-	gtk_widget_set_size_request(GTK_WIDGET(handle), width, height);
-	return 0;
-}
-
-static gboolean
-suil_x11_wrapper_idle(void* data)
-{
-	SuilX11Wrapper* const wrap = SUIL_X11_WRAPPER(data);
-
-	wrap->idle_iface->idle(wrap->instance->handle);
-
-	return TRUE;  // Continue calling
-}
-
-static int
-wrapper_wrap(SuilWrapper*  wrapper,
-             SuilInstance* instance)
-{
-	SuilX11Wrapper* const wrap = SUIL_X11_WRAPPER(wrapper->impl);
-
-	instance->host_widget = GTK_WIDGET(wrap);
-	wrap->wrapper         = wrapper;
-	wrap->instance        = instance;
-
-	const LV2UI_Idle_Interface* idle_iface = NULL;
-	if (instance->descriptor->extension_data) {
-		idle_iface = (const LV2UI_Idle_Interface*)
-			instance->descriptor->extension_data(LV2_UI__idleInterface);
-	}
-	if (idle_iface) {
-		wrap->idle_iface = idle_iface;
-		wrap->idle_id    = g_timeout_add(
-			wrap->idle_ms, suil_x11_wrapper_idle, wrap);
-	}
-
-	g_signal_connect(G_OBJECT(wrap),
-	                 "plug-removed",
-	                 G_CALLBACK(on_plug_removed),
-	                 NULL);
-
-	g_signal_connect(G_OBJECT(wrap),
-	                 "size-allocate",
-	                 G_CALLBACK(suil_x11_on_size_allocate),
-	                 NULL);
-
-	return 0;
-}
-
-static void
-wrapper_free(SuilWrapper* wrapper)
-{
-	if (wrapper->impl) {
-		SuilX11Wrapper* const wrap = SUIL_X11_WRAPPER(wrapper->impl);
-		gtk_widget_destroy(GTK_WIDGET(wrap));
-	}
-}
-
-SUIL_LIB_EXPORT
-SuilWrapper*
-suil_wrapper_new(SuilHost*      host,
-                 const char*    host_type_uri,
-                 const char*    ui_type_uri,
-                 LV2_Feature*** features,
-                 unsigned       n_features)
-{
-	SuilWrapper* wrapper = (SuilWrapper*)calloc(1, sizeof(SuilWrapper));
-	wrapper->wrap = wrapper_wrap;
-	wrapper->free = wrapper_free;
-
-	SuilX11Wrapper* const wrap = SUIL_X11_WRAPPER(
-		g_object_new(SUIL_TYPE_X11_WRAPPER, NULL));
-
-	wrapper->impl             = wrap;
-	wrapper->resize.handle    = wrap;
-	wrapper->resize.ui_resize = wrapper_resize;
-
-	gtk_widget_set_sensitive(GTK_WIDGET(wrap), TRUE);
-	gtk_widget_set_can_focus(GTK_WIDGET(wrap), TRUE);
-
-	const intptr_t parent_id = (intptr_t)gtk_plug_get_id(wrap->plug);
-	suil_add_feature(features, &n_features, LV2_UI__parent, (void*)parent_id);
-	suil_add_feature(features, &n_features, LV2_UI__resize, &wrapper->resize);
-	suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL);
-
-	// Scan for URID map and options
-	LV2_URID_Map*       map     = NULL;
-	LV2_Options_Option* options = NULL;
-	for (LV2_Feature** f = *features; *f && (!map || !options); ++f) {
-		if (!strcmp((*f)->URI, LV2_OPTIONS__options)) {
-			options = (LV2_Options_Option*)(*f)->data;
-		} else if (!strcmp((*f)->URI, LV2_URID__map)) {
-			map = (LV2_URID_Map*)(*f)->data;
-		}
-	}
-
-	if (map && options) {
-		// Set UI update rate if given
-		LV2_URID ui_updateRate = map->map(map->handle, LV2_UI__updateRate);
-		for (LV2_Options_Option* o = options; o->key; ++o) {
-			if (o->key == ui_updateRate) {
-				wrap->idle_ms = 1000.0f / *(const float*)o->value;
-				break;
-			}
-		}
-	}
-
-	return wrapper;
-}
diff --git a/src/x11_in_qt4.cpp b/src/x11_in_qt4.cpp
deleted file mode 100644
index c21357d..0000000
--- a/src/x11_in_qt4.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-  Copyright 2011-2015 David Robillard <http://drobilla.net>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#include <QX11EmbedContainer>
-#include <QtEvents>
-#undef signals
-
-#include "./suil_config.h"
-#include "./suil_internal.h"
-
-extern "C" {
-
-typedef struct {
-	QX11EmbedContainer* host_widget;
-	QX11EmbedWidget*    parent;
-} SuilX11InQt4Wrapper;
-
-class SuilQX11Container : public QX11EmbedContainer
-{
-public:
-	SuilQX11Container(SuilInstance*               instance,
-	                  const LV2UI_Idle_Interface* idle_iface,
-	                  QX11EmbedWidget*            widget)
-		: QX11EmbedContainer()
-		, _instance(instance)
-		, _idle_iface(idle_iface)
-		, _widget(widget)
-		, _ui_timer(0)
-	{}
-
-protected:
-	void showEvent(QShowEvent* event) {
-		if (_idle_iface && _ui_timer == 0) {
-			_ui_timer = this->startTimer(30);
-			_widget->embedInto(winId());
-			resize(_widget->size());
-		}
-		QX11EmbedContainer::showEvent(event);
-	}
-
-	void timerEvent(QTimerEvent* event) {
-		if (event->timerId() == _ui_timer && _idle_iface) {
-			_idle_iface->idle(_instance->handle);
-		}
-		QX11EmbedContainer::timerEvent(event);
-	}
-
-	void closeEvent(QCloseEvent* event) {
-		if (_ui_timer && _idle_iface) {
-			this->killTimer(_ui_timer);
-			_ui_timer = 0;
-		}
-		QX11EmbedContainer::closeEvent(event);
-	}
-
-private:
-	SuilInstance* const               _instance;
-	const LV2UI_Idle_Interface* const _idle_iface;
-	QX11EmbedWidget* const            _widget;
-	int                               _ui_timer;
-};
-
-static void
-wrapper_free(SuilWrapper* wrapper)
-{
-	SuilX11InQt4Wrapper* impl = (SuilX11InQt4Wrapper*)wrapper->impl;
-
-	if (impl->parent) {
-		delete impl->parent;
-	}
-
-	if (impl->host_widget) {
-		delete impl->host_widget;
-	}
-
-	free(impl);
-}
-
-static int
-wrapper_wrap(SuilWrapper*  wrapper,
-             SuilInstance* instance)
-{
-	const LV2UI_Idle_Interface* idle_iface = NULL;
-	if (instance->descriptor->extension_data) {
-		idle_iface = (const LV2UI_Idle_Interface*)
-			instance->descriptor->extension_data(LV2_UI__idleInterface);
-	}
-
-	SuilX11InQt4Wrapper* const impl = (SuilX11InQt4Wrapper*)wrapper->impl;
-	QX11EmbedWidget* const     ew   = impl->parent;
-
-	impl->host_widget = new SuilQX11Container(instance, idle_iface, ew);
-
-	instance->host_widget = impl->host_widget;
-
-	return 0;
-}
-
-static int
-wrapper_resize(LV2UI_Feature_Handle handle, int width, int height)
-{
-	QX11EmbedWidget* const ew = (QX11EmbedWidget*)handle;
-	ew->resize(width, height);
-	return 0;
-}
-
-SUIL_LIB_EXPORT
-SuilWrapper*
-suil_wrapper_new(SuilHost*      host,
-                 const char*    host_type_uri,
-                 const char*    ui_type_uri,
-                 LV2_Feature*** features,
-                 unsigned       n_features)
-{
-	SuilX11InQt4Wrapper* const impl = (SuilX11InQt4Wrapper*)
-		calloc(1, sizeof(SuilX11InQt4Wrapper));
-
-	SuilWrapper* wrapper = (SuilWrapper*)calloc(1, sizeof(SuilWrapper));
-	wrapper->wrap = wrapper_wrap;
-	wrapper->free = wrapper_free;
-
-	QX11EmbedWidget* const ew = new QX11EmbedWidget();
-
-	impl->parent = ew;
-
-	wrapper->impl             = impl;
-	wrapper->resize.handle    = ew;
-	wrapper->resize.ui_resize = wrapper_resize;
-
-	const intptr_t parent_id = (intptr_t)ew->winId();
-	suil_add_feature(features, &n_features, LV2_UI__parent, (void*)parent_id);
-	suil_add_feature(features, &n_features, LV2_UI__resize, &wrapper->resize);
-	suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL);
-
-	return wrapper;
-}
-
-}  // extern "C"
diff --git a/src/x11_in_qt5.cpp b/src/x11_in_qt5.cpp
deleted file mode 100644
index be90323..0000000
--- a/src/x11_in_qt5.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-  Copyright 2011-2015 David Robillard <http://drobilla.net>
-  Copyright 2015 Rui Nuno Capela <rncbc@rncbc.org>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#include <QWidget>
-
-#include <QTimerEvent>
-#include <QCloseEvent>
-
-#undef signals
-
-#include "./suil_config.h"
-#include "./suil_internal.h"
-
-extern "C" {
-
-typedef struct {
-	QWidget* host_widget;
-	QWidget* parent;
-} SuilX11InQt5Wrapper;
-
-class SuilQX11Widget : public QWidget
-{
-public:
-	SuilQX11Widget(QWidget* parent, Qt::WindowFlags wflags)
-		: QWidget(parent, wflags)
-		, _instance(NULL)
-		, _idle_iface(NULL)
-		, _ui_timer(0)
-	{}
-
-	void start_idle(SuilInstance*               instance,
-	                const LV2UI_Idle_Interface* idle_iface) {
-		_instance   = instance;
-		_idle_iface = idle_iface;
-		if (_idle_iface && _ui_timer == 0) {
-			_ui_timer = this->startTimer(30);
-		}
-	}
-
-protected:
-	void timerEvent(QTimerEvent* event) {
-		if (event->timerId() == _ui_timer && _idle_iface) {
-			_idle_iface->idle(_instance->handle);
-		}
-		QWidget::timerEvent(event);
-	}
-
-	void closeEvent(QCloseEvent* event) {
-		if (_ui_timer && _idle_iface) {
-			this->killTimer(_ui_timer);
-			_ui_timer = 0;
-		}
-		QWidget::closeEvent(event);
-	}
-
-private:
-	SuilInstance*               _instance;
-	const LV2UI_Idle_Interface* _idle_iface;
-	int                         _ui_timer;
-};
-
-static void
-wrapper_free(SuilWrapper* wrapper)
-{
-	SuilX11InQt5Wrapper* impl = (SuilX11InQt5Wrapper*)wrapper->impl;
-
-	if (impl->host_widget) {
-		delete impl->host_widget;
-	}
-
-	free(impl);
-}
-
-static int
-wrapper_wrap(SuilWrapper*  wrapper,
-             SuilInstance* instance)
-{
-	SuilX11InQt5Wrapper* const impl = (SuilX11InQt5Wrapper*)wrapper->impl;
-	SuilQX11Widget* const      ew   = (SuilQX11Widget*)impl->parent;
-
-	if (instance->descriptor->extension_data) {
-		const LV2UI_Idle_Interface* idle_iface
-			= (const LV2UI_Idle_Interface*)
-				instance->descriptor->extension_data(LV2_UI__idleInterface);
-		ew->start_idle(instance, idle_iface);
-	}
-
-	impl->host_widget = ew;
-
-	instance->host_widget = impl->host_widget;
-
-	return 0;
-}
-
-static int
-wrapper_resize(LV2UI_Feature_Handle handle, int width, int height)
-{
-	QWidget* const ew = (QWidget*)handle;
-	ew->resize(width, height);
-	return 0;
-}
-
-SUIL_LIB_EXPORT
-SuilWrapper*
-suil_wrapper_new(SuilHost*      host,
-                 const char*    host_type_uri,
-                 const char*    ui_type_uri,
-                 LV2_Feature*** features,
-                 unsigned       n_features)
-{
-	SuilX11InQt5Wrapper* const impl = (SuilX11InQt5Wrapper*)
-		calloc(1, sizeof(SuilX11InQt5Wrapper));
-
-	SuilWrapper* wrapper = (SuilWrapper*)malloc(sizeof(SuilWrapper));
-	wrapper->wrap = wrapper_wrap;
-	wrapper->free = wrapper_free;
-
-	QWidget* const ew = new SuilQX11Widget(NULL, Qt::Window);
-
-	impl->parent = ew;
-
-	wrapper->impl             = impl;
-	wrapper->resize.handle    = ew;
-	wrapper->resize.ui_resize = wrapper_resize;
-
-	void* parent_id = (void*)(intptr_t)ew->winId();
-	suil_add_feature(features, &n_features, LV2_UI__parent, parent_id);
-	suil_add_feature(features, &n_features, LV2_UI__resize, &wrapper->resize);
-	suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL);
-
-	return wrapper;
-}
-
-}  // extern "C"
diff --git a/suil.pc.in b/suil.pc.in
deleted file mode 100644
index 1bff552..0000000
--- a/suil.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
-libdir=@LIBDIR@
-includedir=@INCLUDEDIR@
-
-Name: Suil
-Version: @SUIL_VERSION@
-Description: LV2 plugin UI hosting library
-Libs: -L${libdir} -l@LIB_SUIL@
-Cflags: -I${includedir}/suil-@SUIL_MAJOR_VERSION@
diff --git a/suil/suil.h b/suil/suil.h
deleted file mode 100644
index 5f1b7fe..0000000
--- a/suil/suil.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
-  Copyright 2011-2017 David Robillard <http://drobilla.net>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-/**
-   @file suil.h API for Suil, an LV2 UI wrapper library.
-*/
-
-#ifndef SUIL_SUIL_H
-#define SUIL_SUIL_H
-
-#include <stdint.h>
-
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-
-#ifdef _WIN32
-#    define SUIL_LIB_IMPORT __declspec(dllimport)
-#    define SUIL_LIB_EXPORT __declspec(dllexport)
-#else
-#    define SUIL_LIB_IMPORT __attribute__((visibility("default")))
-#    define SUIL_LIB_EXPORT __attribute__((visibility("default")))
-#endif
-
-#ifdef SUIL_SHARED
-#    ifdef SUIL_INTERNAL
-#        define SUIL_API SUIL_LIB_EXPORT
-#    else
-#        define SUIL_API SUIL_LIB_IMPORT
-#    endif
-#else
-#    define SUIL_API
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#else
-#    include <stdbool.h>
-#endif
-
-/**
-   @defgroup suil Suil
-
-   Suil is a library for loading and wrapping LV2 plugin UIs.  With Suil, a
-   host written in one supported toolkit can embed a plugin UI written in a
-   different supported toolkit.  Suil insulates hosts from toolkit libraries
-   used by plugin UIs.  For example, a Gtk host can embed a Qt UI without
-   linking against Qt at compile time.
-
-   Visit <http://drobilla.net/software/suil> for more information.
-
-   @{
-*/
-
-/**
-   UI host descriptor.
-
-   This contains the various functions that a plugin UI may use to communicate
-   with the plugin.  It is passed to suil_instance_new() to provide these
-   functions to the UI.
-*/
-typedef struct SuilHostImpl SuilHost;
-
-/** An instance of an LV2 plugin UI. */
-typedef struct SuilInstanceImpl SuilInstance;
-
-/** Opaque pointer to a UI handle. */
-typedef void* SuilHandle;
-
-/** Opaque pointer to a UI widget. */
-typedef void* SuilWidget;
-
-/**
-   UI controller.
-
-   This is an opaque pointer passed by the user which is passed to the various
-   UI control functions (e.g. SuilPortWriteFunc).  It is typically used to pass
-   a pointer to some controller object the host uses to communicate with
-   plugins.
-*/
-typedef void* SuilController;
-
-/** Function to write/send a value to a port. */
-typedef void (*SuilPortWriteFunc)(
-	SuilController controller,
-	uint32_t       port_index,
-	uint32_t       buffer_size,
-	uint32_t       protocol,
-	void const*    buffer);
-
-/** Function to return the index for a port by symbol. */
-typedef uint32_t (*SuilPortIndexFunc)(
-	SuilController controller,
-	const char*    port_symbol);
-
-/** Function to subscribe to notifications for a port. */
-typedef uint32_t (*SuilPortSubscribeFunc)(
-	SuilController            controller,
-	uint32_t                  port_index,
-	uint32_t                  protocol,
-	const LV2_Feature* const* features);
-
-/** Function to unsubscribe from notifications for a port. */
-typedef uint32_t (*SuilPortUnsubscribeFunc)(
-	SuilController            controller,
-	uint32_t                  port_index,
-	uint32_t                  protocol,
-	const LV2_Feature* const* features);
-
-/** Function called when a control is grabbed or released. */
-typedef void (*SuilTouchFunc)(
-	SuilController controller,
-	uint32_t       port_index,
-	bool           grabbed);
-
-/** Initialization argument. */
-typedef enum {
-	SUIL_ARG_NONE
-} SuilArg;
-
-/**
-   Initialize suil.
-
-   This function should be called as early as possible, before any other GUI
-   toolkit functions.  The variable argument list is a sequence of SuilArg keys
-   and corresponding value pairs for passing any necessary platform-specific
-   information.  It must be terminated with SUIL_ARG_NONE.
-*/
-SUIL_API
-void
-suil_init(int* argc, char*** argv, SuilArg key, ...);
-
-/**
-   Create a new UI host descriptor.
-   @param write_func Function to send a value to a plugin port.
-   @param index_func Function to get the index for a port by symbol.
-   @param subscribe_func Function to subscribe to port updates.
-   @param unsubscribe_func Function to unsubscribe from port updates.
-*/
-SUIL_API
-SuilHost*
-suil_host_new(SuilPortWriteFunc       write_func,
-              SuilPortIndexFunc       index_func,
-              SuilPortSubscribeFunc   subscribe_func,
-              SuilPortUnsubscribeFunc unsubscribe_func);
-
-/**
-   Set a touch function for a host descriptor.
-
-   Note this function will only be called if the UI supports it.
-*/
-SUIL_API
-void
-suil_host_set_touch_func(SuilHost*     host,
-                         SuilTouchFunc touch_func);
-
-/**
-   Free `host`.
-*/
-SUIL_API
-void
-suil_host_free(SuilHost* host);
-
-/**
-   Check if suil can wrap a UI type.
-   @param host_type_uri The URI of the desired widget type of the host,
-   corresponding to the `type_uri` parameter of suil_instance_new().
-   @param ui_type_uri The URI of the UI widget type.
-   @return 0 if wrapping is unsupported, otherwise the quality of the wrapping
-   where 1 is the highest quality (direct native embedding with no wrapping)
-   and increasing values are of a progressively lower quality and/or stability.
-*/
-SUIL_API
-unsigned
-suil_ui_supported(const char* host_type_uri,
-                  const char* ui_type_uri);
-
-/**
-   Instantiate a UI for an LV2 plugin.
-
-   This funcion may load a suil module to adapt the UI to the desired toolkit.
-   Suil is configured at compile time to load modules from the appropriate
-   place, but this can be changed at run-time via the environment variable
-   SUIL_MODULE_DIR.  This makes it possible to bundle suil with an application.
-
-   Note that some situations (Gtk in Qt, Windows in Gtk) require a parent
-   container to be passed as a feature with URI LV2_UI__parent
-   (http://lv2plug.in/ns/extensions/ui#ui) in order to work correctly.  The
-   data must point to a single child container of the host widget set.
-
-   @param host Host descriptor.
-   @param controller Opaque host controller pointer.
-   @param container_type_uri URI of the desired host container widget type.
-   @param plugin_uri URI of the plugin to instantiate this UI for.
-   @param ui_uri URI of the specifically desired UI.
-   @param ui_type_uri URI of the actual UI widget type.
-   @param ui_bundle_path Path of the UI bundle.
-   @param ui_binary_path Path of the UI binary.
-   @param features NULL-terminated array of supported features, or NULL.
-   @return A new UI instance, or NULL if instantiation failed.
-*/
-SUIL_API
-SuilInstance*
-suil_instance_new(SuilHost*                 host,
-                  SuilController            controller,
-                  const char*               container_type_uri,
-                  const char*               plugin_uri,
-                  const char*               ui_uri,
-                  const char*               ui_type_uri,
-                  const char*               ui_bundle_path,
-                  const char*               ui_binary_path,
-                  const LV2_Feature* const* features);
-
-/**
-   Free a plugin UI instance.
-
-   The caller must ensure all references to the UI have been dropped before
-   calling this function (e.g. it has been removed from its parent).
-*/
-SUIL_API
-void
-suil_instance_free(SuilInstance* instance);
-
-/**
-   Get the handle for a UI instance.
-
-   Returns the handle to the UI instance.  The returned handle has opaque type
-   to insulate the Suil API from LV2 extensions, but in pactice it is currently
-   of type `LV2UI_Handle`.  This should not normally be needed.
-
-   The returned handle is shared and must not be deleted.
-*/
-SUIL_API
-SuilHandle
-suil_instance_get_handle(SuilInstance* instance);
-
-/**
-   Get the widget for a UI instance.
-
-   Returns an opaque pointer to a widget, the type of which matches the
-   `container_type_uri` parameter of suil_instance_new().  Note this may be a
-   wrapper widget created by Suil, and not necessarily the widget directly
-   implemented by the UI.
-*/
-SUIL_API
-SuilWidget
-suil_instance_get_widget(SuilInstance* instance);
-
-/**
-   Notify the UI about a change in a plugin port.
-   @param instance UI instance.
-   @param port_index Index of the port which has changed.
-   @param buffer_size Size of `buffer` in bytes.
-   @param format Format of `buffer` (mapped URI, or 0 for float).
-   @param buffer Change data, e.g. the new port value.
-
-   This function can be used to notify the UI about any port change, but in the
-   simplest case is used to set the value of lv2:ControlPort ports.  For
-   simplicity, this is a special case where `format` is 0, `buffer_size` is 4,
-   and `buffer` should point to a single float.
-
-   The `buffer` must be valid only for the duration of this call, the UI must
-   not keep a reference to it.
-*/
-SUIL_API
-void
-suil_instance_port_event(SuilInstance* instance,
-                         uint32_t      port_index,
-                         uint32_t      buffer_size,
-                         uint32_t      format,
-                         const void*   buffer);
-
-/**
-   Return a data structure defined by some LV2 extension URI.
-*/
-SUIL_API
-const void*
-suil_instance_extension_data(SuilInstance* instance,
-                             const char*   uri);
-
-/**
-   @}
-*/
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* SUIL_SUIL_H */
diff --git a/waflib/.gitignore b/waflib/.gitignore
deleted file mode 100644
index 8d35cb3..0000000
--- a/waflib/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-__pycache__
-*.pyc
diff --git a/waflib/COPYING b/waflib/COPYING
deleted file mode 100644
index a4147d2..0000000
--- a/waflib/COPYING
+++ /dev/null
@@ -1,25 +0,0 @@
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/waflib/README.md b/waflib/README.md
deleted file mode 100644
index c5361b9..0000000
--- a/waflib/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Autowaf
-=======
-
-This is autowaf, a bundle of waf and a few extensions intended to be easy to
-use directly as source code in a project.  Using this as a submodule or subtree
-named `waflib` in a project allows waf to be used without including binary
-encoded data in the waf script.  This gets along with revision control and
-distributions better, among other advantages, without losing
-self-containedness.
-
-To use this in a project, add this repository as a directory named `waflib` in
-the top level of the project, and link or copy `waf` to the top level.
-
-Two waf extras are also included: `autowaf.py` and `lv2.py`.
-
-The `autowaf.py` module is a kitchen sink of Python utilities for building
-consistent packages, and can be imported in a wcript as
-`waflib.extras.autowaf`.
-
-The `lv2.py` extra defines options for LV2 plugin installation paths.  It can
-be used by calling `opt.load('lv2')` and `conf.load('lv2')` in the appropriate
-locations in a wscript.
-
- -- David Robillard <d@drobilla.net>
diff --git a/waflib/waf b/waflib/waf
deleted file mode 100755
index e22930a..0000000
--- a/waflib/waf
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env python
-
-# Minimal waf script for projects that include waflib directly
-
-from waflib import Context, Scripting
-
-import inspect
-import os
-
-def main():
-    script_path = os.path.abspath(inspect.getfile(inspect.getmodule(main)))
-    project_path = os.path.dirname(script_path)
-    Scripting.waf_entry_point(os.getcwd(), Context.WAFVERSION, project_path)
-
-if __name__ == '__main__':
-    main()
diff --git a/wscript b/wscript
deleted file mode 100644
index 89ab039..0000000
--- a/wscript
+++ /dev/null
@@ -1,420 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import subprocess
-
-from waflib import TaskGen
-from waflib.extras import autowaf
-
-# Semver package/library version
-SUIL_VERSION       = '0.10.2'
-SUIL_MAJOR_VERSION = SUIL_VERSION[0:SUIL_VERSION.find('.')]
-
-# Mandatory waf variables
-APPNAME = 'suil'        # Package name for waf dist
-VERSION = SUIL_VERSION  # Package version for waf dist
-top     = '.'           # Source directory
-out     = 'build'       # Build directory
-
-def options(ctx):
-    ctx.load('compiler_c')
-    ctx.load('compiler_cxx')
-    autowaf.set_options(ctx)
-    opt = ctx.get_option_group('Configuration options')
-
-    opt.add_option('--gtk2-lib-name', type='string', dest='gtk2_lib_name',
-                   default="libgtk-x11-2.0.so.0",
-                   help="Gtk2 library name [Default: libgtk-x11-2.0.so.0]")
-    opt.add_option('--gtk3-lib-name', type='string', dest='gtk3_lib_name',
-                   default="libgtk-x11-3.0.so.0",
-                   help="Gtk3 library name [Default: libgtk-x11-3.0.so.0]")
-
-    autowaf.add_flags(
-        opt,
-        {'static':    'build static library',
-         'no-shared': 'do not build shared library',
-         'no-gtk':    'do not build support for Gtk',
-         'no-qt':     'do not build support for Qt (any version)',
-         'no-qt4':    'do not build support for Qt4',
-         'no-qt5':    'do not build support for Qt5'})
-
-def configure(conf):
-    autowaf.display_header('Suil Configuration')
-    autowaf.set_line_just(conf, 42)
-    conf.load('compiler_c', cache=True)
-    conf.load('compiler_cxx', cache=True)
-    conf.load('autowaf', cache=True)
-    autowaf.set_c_lang(conf, 'c99')
-
-    conf.env.BUILD_SHARED = not conf.options.no_shared
-    conf.env.BUILD_STATIC = conf.options.static
-
-    if not conf.env.BUILD_SHARED and not conf.env.BUILD_STATIC:
-        conf.fatal('Neither a shared nor a static build requested')
-
-    conf.env.NODELETE_FLAGS = []
-    if (not conf.env.MSVC_COMPILER and
-        conf.check(linkflags = ['-Wl,-z,nodelete'],
-                   msg       = 'Checking for link flags -Wl,-z,-nodelete',
-                   mandatory = False)):
-        conf.env.NODELETE_FLAGS = ['-Wl,-z,nodelete']
-
-    autowaf.check_pkg(conf, 'lv2', atleast_version='1.12.0', uselib_store='LV2')
-    autowaf.check_pkg(conf, 'x11', uselib_store='X11', mandatory=False)
-
-    if not conf.options.no_gtk:
-        autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK2',
-                          atleast_version='2.18.0', mandatory=False)
-        if not conf.env.HAVE_GTK2:
-            autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK2',
-                              atleast_version='2.0.0', mandatory=False)
-            if conf.env.HAVE_GTK2:
-                autowaf.define(conf, 'SUIL_OLD_GTK', 1)
-
-        autowaf.check_pkg(conf, 'gtk+-x11-2.0', uselib_store='GTK2_X11',
-                          atleast_version='2.0.0', mandatory=False)
-
-        autowaf.check_pkg(conf, 'gtk+-quartz-2.0', uselib_store='GTK2_QUARTZ',
-                          atleast_version='2.0.0', mandatory=False)
-
-        autowaf.check_pkg(conf, 'gtk+-3.0', uselib_store='GTK3',
-                          atleast_version='3.14.0', mandatory=False)
-
-        autowaf.check_pkg(conf, 'gtk+-x11-3.0', uselib_store='GTK3_X11',
-                          atleast_version='3.14.0', mandatory=False)
-
-    if not conf.options.no_qt:
-        if not conf.options.no_qt4:
-            autowaf.check_pkg(conf, 'QtGui', uselib_store='QT4',
-                              atleast_version='4.4.0', mandatory=False)
-
-        if not conf.options.no_qt5:
-            autowaf.check_pkg(conf, 'Qt5Widgets', uselib_store='QT5',
-                              atleast_version='5.1.0', mandatory=False)
-            if conf.check_cxx(header_name = 'QMacCocoaViewContainer',
-                              uselib      = 'QT5',
-                              mandatory   = False):
-                autowaf.define(conf, 'SUIL_WITH_COCOA_IN_QT5', 1)
-
-    conf.check_cc(define_name   = 'HAVE_LIBDL',
-                  lib           = 'dl',
-                  mandatory     = False)
-
-    autowaf.define(conf, 'SUIL_MODULE_DIR',
-                   os.path.join(conf.env.LIBDIR, 'suil-' + SUIL_MAJOR_VERSION))
-    autowaf.define(conf, 'SUIL_DIR_SEP', '/')
-    autowaf.define(conf, 'SUIL_GTK2_LIB_NAME', conf.options.gtk2_lib_name);
-    autowaf.define(conf, 'SUIL_GTK3_LIB_NAME', conf.options.gtk3_lib_name);
-
-    if conf.env.HAVE_GTK2 and conf.env.HAVE_QT4:
-        autowaf.define(conf, 'SUIL_WITH_QT4_IN_GTK2', 1)
-        if conf.env.HAVE_GTK2_X11:
-            autowaf.define(conf, 'SUIL_WITH_GTK2_IN_QT4', 1)
-
-    if conf.env.HAVE_GTK2 and conf.env.HAVE_QT5:
-        autowaf.define(conf, 'SUIL_WITH_GTK2_IN_QT5', 1)
-        autowaf.define(conf, 'SUIL_WITH_QT5_IN_GTK2', 1)
-
-    if conf.env.HAVE_GTK2 and conf.env.HAVE_GTK2_X11:
-        autowaf.define(conf, 'SUIL_WITH_X11_IN_GTK2', 1)
-
-    if conf.env.HAVE_GTK3 and conf.env.HAVE_GTK3_X11:
-        autowaf.define(conf, 'SUIL_WITH_X11_IN_GTK3', 1)
-
-    if conf.env.HAVE_GTK2 and conf.env.HAVE_GTK2_QUARTZ:
-        autowaf.define(conf, 'SUIL_WITH_COCOA_IN_GTK2', 1)
-
-    if conf.env.HAVE_GTK2 and conf.env.DEST_OS == 'win32':
-        autowaf.define(conf, 'SUIL_WITH_WIN_IN_GTK2', 1)
-
-    if conf.env.HAVE_QT4:
-        autowaf.define(conf, 'SUIL_WITH_X11_IN_QT4', 1)
-
-    if conf.env.HAVE_QT5:
-        autowaf.define(conf, 'SUIL_WITH_X11_IN_QT5', 1)
-
-    if conf.env.HAVE_X11:
-        autowaf.define(conf, 'SUIL_WITH_X11', 1)
-
-    module_prefix = ''
-    module_ext    = ''
-    if conf.env.PARDEBUG:
-        module_ext += 'D'
-    if conf.env.DEST_OS == 'win32':
-        module_ext += '.dll'
-    elif conf.env.DEST_OS == 'darwin':
-        module_prefix = 'lib'
-        module_ext += '.dylib'
-    else:
-        module_prefix = 'lib'
-        module_ext += '.so'
-
-    autowaf.define(conf, 'SUIL_MODULE_PREFIX', module_prefix)
-    autowaf.define(conf, 'SUIL_MODULE_EXT', module_ext)
-
-    autowaf.set_lib_env(conf, 'suil', SUIL_VERSION)
-    conf.write_config_header('suil_config.h', remove=False)
-
-    autowaf.display_summary(
-        conf,
-        {'Static library': bool(conf.env.BUILD_STATIC),
-         'Shared library': bool(conf.env.BUILD_SHARED)})
-
-    if conf.env.HAVE_GTK2:
-        autowaf.display_msg(conf, "Gtk2 Library Name",
-                            conf.env.SUIL_GTK2_LIB_NAME)
-    if conf.env.HAVE_GTK3:
-        autowaf.display_msg(conf, "Gtk3 Library Name",
-                            conf.env.SUIL_GTK3_LIB_NAME)
-
-    # Print summary message for every potentially supported wrapper
-    wrappers = [('cocoa', 'gtk2'),
-                ('gtk2', 'qt4'),
-                ('gtk2', 'qt5'),
-                ('qt4', 'gtk2'),
-                ('qt5', 'gtk2'),
-                ('win', 'gtk2'),
-                ('x11', 'gtk2'),
-                ('x11', 'gtk3'),
-                ('x11', 'qt4'),
-                ('x11', 'qt5'),
-                ('cocoa', 'qt5')]
-    for w in wrappers:
-        var = 'SUIL_WITH_%s_IN_%s' % (w[0].upper(), w[1].upper())
-        autowaf.display_msg(conf, 'Support for %s in %s' % (w[0], w[1]),
-                            bool(conf.env[var]))
-
-def build(bld):
-    # C Headers
-    includedir = '${INCLUDEDIR}/suil-%s/suil' % SUIL_MAJOR_VERSION
-    bld.install_files(includedir, bld.path.ant_glob('suil/*.h'))
-    TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc']
-
-    # Pkgconfig file
-    autowaf.build_pc(bld, 'SUIL', SUIL_VERSION, SUIL_MAJOR_VERSION, [],
-                     {'SUIL_MAJOR_VERSION' : SUIL_MAJOR_VERSION})
-
-    cflags = []
-    lib    = []
-    modlib = []
-    if bld.env.DEST_OS == 'win32':
-        modlib += ['user32']
-    else:
-        cflags += ['-fvisibility=hidden']
-        if bld.is_defined('HAVE_LIBDL'):
-            lib    += ['dl']
-            modlib += ['dl']
-
-    module_dir = '${LIBDIR}/suil-' + SUIL_MAJOR_VERSION
-
-    # Shared Library
-    if bld.env.BUILD_SHARED:
-        obj = bld(features        = 'c cshlib',
-                  export_includes = ['.'],
-                  source          = 'src/host.c src/instance.c',
-                  target          = 'suil-%s' % SUIL_MAJOR_VERSION,
-                  includes        = ['.'],
-                  defines         = ['SUIL_SHARED', 'SUIL_INTERNAL'],
-                  name            = 'libsuil',
-                  vnum            = SUIL_VERSION,
-                  install_path    = '${LIBDIR}',
-                  cflags          = cflags,
-                  lib             = lib,
-                  uselib          = 'LV2')
-
-    # Static library
-    if bld.env.BUILD_STATIC:
-        obj = bld(features        = 'c cstlib',
-                  export_includes = ['.'],
-                  source          = 'src/host.c src/instance.c',
-                  target          = 'suil-%s' % SUIL_MAJOR_VERSION,
-                  includes        = ['.'],
-                  defines         = ['SUIL_INTERNAL'],
-                  name            = 'libsuil_static',
-                  vnum            = SUIL_VERSION,
-                  install_path    = '${LIBDIR}',
-                  cflags          = cflags,
-                  lib             = lib,
-                  uselib          = 'LV2')
-
-    if bld.env.SUIL_WITH_GTK2_IN_QT4:
-        obj = bld(features     = 'cxx cxxshlib',
-                  source       = 'src/gtk2_in_qt4.cpp',
-                  target       = 'suil_gtk2_in_qt4',
-                  includes     = ['.'],
-                  defines      = ['SUIL_SHARED', 'SUIL_INTERNAL'],
-                  install_path = module_dir,
-                  cxxflags     = cflags,
-                  lib          = modlib)
-        autowaf.use_lib(bld, obj, 'GTK2 QT4 LV2')
-
-    if bld.env.SUIL_WITH_GTK2_IN_QT5:
-        obj = bld(features     = 'cxx cxxshlib',
-                  source       = 'src/gtk2_in_qt5.cpp',
-                  target       = 'suil_gtk2_in_qt5',
-                  includes     = ['.'],
-                  defines      = ['SUIL_SHARED', 'SUIL_INTERNAL'],
-                  install_path = module_dir,
-                  cxxflags     = cflags,
-                  lib          = modlib)
-        autowaf.use_lib(bld, obj, 'GTK2 QT5 LV2')
-
-    if bld.env.SUIL_WITH_QT4_IN_GTK2:
-        obj = bld(features     = 'cxx cxxshlib',
-                  source       = 'src/qt4_in_gtk2.cpp',
-                  target       = 'suil_qt4_in_gtk2',
-                  includes     = ['.'],
-                  defines      = ['SUIL_SHARED', 'SUIL_INTERNAL'],
-                  install_path = module_dir,
-                  cxxflags     = cflags,
-                  lib          = modlib,
-                  linkflags    = bld.env.NODELETE_FLAGS)
-        autowaf.use_lib(bld, obj, 'GTK2 QT4 LV2')
-
-    if bld.env.SUIL_WITH_QT5_IN_GTK2:
-        obj = bld(features     = 'cxx cxxshlib',
-                  source       = 'src/qt5_in_gtk2.cpp',
-                  target       = 'suil_qt5_in_gtk2',
-                  includes     = ['.'],
-                  defines      = ['SUIL_SHARED', 'SUIL_INTERNAL'],
-                  install_path = module_dir,
-                  cxxflags     = cflags,
-                  lib          = modlib,
-                  linkflags    = bld.env.NODELETE_FLAGS)
-        autowaf.use_lib(bld, obj, 'GTK2 QT5 LV2')
-
-    if bld.env.SUIL_WITH_X11_IN_GTK2:
-        obj = bld(features     = 'c cshlib',
-                  source       = 'src/x11_in_gtk2.c',
-                  target       = 'suil_x11_in_gtk2',
-                  includes     = ['.'],
-                  defines      = ['SUIL_SHARED', 'SUIL_INTERNAL'],
-                  install_path = module_dir,
-                  cflags       = cflags,
-                  lib          = modlib + ['X11'],
-                  linkflags    = bld.env.NODELETE_FLAGS)
-        autowaf.use_lib(bld, obj, 'GTK2 GTK2_X11 LV2')
-
-    if bld.env.SUIL_WITH_X11_IN_GTK3:
-        obj = bld(features     = 'c cshlib',
-                  source       = 'src/x11_in_gtk3.c',
-                  target       = 'suil_x11_in_gtk3',
-                  includes     = ['.'],
-                  defines      = ['SUIL_SHARED', 'SUIL_INTERNAL'],
-                  install_path = module_dir,
-                  cflags       = cflags,
-                  lib          = modlib + ['X11'],
-                  linkflags    = bld.env.NODELETE_FLAGS)
-        autowaf.use_lib(bld, obj, 'GTK3 GTK3_X11 LV2')
-
-    if bld.env.SUIL_WITH_COCOA_IN_GTK2:
-        obj = bld(features     = 'cxx cshlib',
-                  source       = 'src/cocoa_in_gtk2.mm',
-                  target       = 'suil_cocoa_in_gtk2',
-                  includes     = ['.'],
-                  defines      = ['SUIL_SHARED', 'SUIL_INTERNAL'],
-                  install_path = module_dir,
-                  cflags       = cflags,
-                  lib          = modlib,
-                  linkflags    = ['-framework', 'Cocoa'])
-        autowaf.use_lib(bld, obj, 'GTK2 LV2')
-
-    if bld.env.SUIL_WITH_WIN_IN_GTK2:
-        obj = bld(features     = 'cxx cxxshlib',
-                  source       = 'src/win_in_gtk2.cpp',
-                  target       = 'suil_win_in_gtk2',
-                  includes     = ['.'],
-                  defines      = ['SUIL_SHARED', 'SUIL_INTERNAL'],
-                  install_path = module_dir,
-                  cflags       = cflags,
-                  lib          = modlib,
-                  linkflags    = bld.env.NODELETE_FLAGS)
-        autowaf.use_lib(bld, obj, 'GTK2 LV2')
-
-    if bld.env.SUIL_WITH_X11_IN_QT4:
-        obj = bld(features     = 'cxx cxxshlib',
-                  source       = 'src/x11_in_qt4.cpp',
-                  target       = 'suil_x11_in_qt4',
-                  includes     = ['.'],
-                  defines      = ['SUIL_SHARED', 'SUIL_INTERNAL'],
-                  install_path = module_dir,
-                  cflags       = cflags,
-                  lib          = modlib)
-        autowaf.use_lib(bld, obj, 'QT4 LV2')
-
-    if bld.env.SUIL_WITH_X11_IN_QT5:
-        obj = bld(features     = 'cxx cxxshlib',
-                  source       = 'src/x11_in_qt5.cpp',
-                  target       = 'suil_x11_in_qt5',
-                  includes     = ['.'],
-                  defines      = ['SUIL_SHARED', 'SUIL_INTERNAL'],
-                  install_path = module_dir,
-                  cflags       = cflags,
-                  lib          = modlib)
-        autowaf.use_lib(bld, obj, 'QT5 LV2')
-
-    if bld.env.SUIL_WITH_COCOA_IN_QT5:
-        obj = bld(features     = 'cxx cxxshlib',
-                  source       = 'src/cocoa_in_qt5.mm',
-                  target       = 'suil_cocoa_in_qt5',
-                  includes     = ['.'],
-                  defines      = ['SUIL_SHARED', 'SUIL_INTERNAL'],
-                  install_path = module_dir,
-                  cflags       = cflags,
-                  lib          = modlib,
-                  linkflags    = ['-framework', 'Cocoa'])
-        autowaf.use_lib(bld, obj, 'QT5 QT5_MAC_EXTRAS LV2')
-
-    if bld.env.SUIL_WITH_X11:
-        obj = bld(features     = 'c cshlib',
-                  source       = 'src/x11.c',
-                  target       = 'suil_x11',
-                  includes     = ['.'],
-                  defines      = ['SUIL_SHARED', 'SUIL_INTERNAL'],
-                  install_path = module_dir,
-                  cflags       = cflags,
-                  lib          = modlib)
-        autowaf.use_lib(bld, obj, 'X11 LV2')
-
-    # Documentation
-    autowaf.build_dox(bld, 'SUIL', SUIL_VERSION, top, out)
-
-    bld.add_post_fun(autowaf.run_ldconfig)
-    if bld.env.DOCS:
-        bld.add_post_fun(lambda ctx: autowaf.make_simple_dox(APPNAME))
-
-def lint(ctx):
-    "checks code for style issues"
-    import subprocess
-    cmd = ("clang-tidy -p=. -header-filter=suil/ -checks=\"*," +
-           "-clang-analyzer-alpha.*," +
-           "-cppcoreguidelines-*," +
-           "-google-readability-todo," +
-           "-llvm-header-guard," +
-           "-llvm-include-order," +
-           "-misc-unused-parameters," +
-           "-misc-unused-parameters," +
-           "-modernize-*," +
-           "-readability-else-after-return," +
-           "-readability-implicit-bool-cast\" " +
-           "$(find .. -name '*.c' -or -name '*.cpp' -or -name '*.mm')")
-    subprocess.call(cmd, cwd='build', shell=True)
-
-def release(ctx):
-    autowaf.release(APPNAME.title(), VERSION)
-
-def upload(ctx):
-    autowaf.run_script(
-        ['scp suil-%s.tar* drobilla@drobilla.net:~/download.drobilla.net/' % VERSION,
-         'rsync -ravz --delete -e ssh build/doc/html/ drobilla@drobilla.net:~/drobilla.net/docs/suil/'])
-
-def posts(ctx):
-    path = str(ctx.path.abspath())
-    autowaf.news_to_posts(
-        os.path.join(path, 'NEWS'),
-        {'title'        : 'Suil',
-         'description'  : autowaf.get_blurb(os.path.join(path, 'README.md')),
-         'dist_pattern' : 'http://download.drobilla.net/suil-%s.tar.bz2'},
-        { 'Author' : 'drobilla',
-          'Tags'   : 'Hacking, LAD, LV2, Suil' },
-        os.path.join(out, 'posts'))