148 files changed, 568 insertions, 418 deletions

diff --git a/.gitmodules b/.gitmodules
index 77580d8..feb5114 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,7 +5,7 @@
 	path = plugin/plugingizmo
 	url = git://git.drumgizmo.org/plugingizmo.git
 [submodule "plugingui/lodepng"]
-	path = plugingui/lodepng
+	path = dggui/lodepng
 	url = git://git.drumgizmo.org/lodepng.git
 	branch = a71964ed5fe4f82a32ac7f8201338900f66e855d
 [submodule "getoptpp"]
diff --git a/Makefile.am b/Makefile.am
index 4196db7..3ac094f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = gnu
-SUBDIRS = tools src plugingui plugin drumgizmo man test
-DISTDIRS = tools src plugingui plugin drumgizmo man test
+SUBDIRS = tools src dggui plugingui plugin drumgizmo man test
+DISTDIRS = tools src dggui plugingui plugin drumgizmo man test
 
 EXTRA_DIST = \
 	version.h \
@@ -16,7 +16,7 @@ EXTRA_DIST = \
 \
 	getoptpp/getoptpp.hpp \
 \
-	plugingui/lodepng/lodepng.h \
+	dggui/lodepng/lodepng.h \
 \
 	pugixml/src/pugixml.hpp \
 	pugixml/src/pugiconfig.hpp \
diff --git a/configure.ac b/configure.ac
index 47fedd6..ee53a72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -720,6 +720,7 @@ AC_CONFIG_FILES(
 	src/Makefile
 	plugin/Makefile
 	plugin/vst/Makefile
+	dggui/Makefile
 	plugingui/Makefile
 	plugingui/locale/Makefile
 	man/Makefile
diff --git a/dggui/Makefile.am b/dggui/Makefile.am
new file mode 100644
index 0000000..e55fe12
--- /dev/null
+++ b/dggui/Makefile.am
@@ -0,0 +1,184 @@
+noinst_PROGRAMS = rcgen
+noinst_LTLIBRARIES = libdggui.la
+
+libdggui_la_CPPFLAGS = \
+	$(DEBUG_FLAGS) \
+	-I$(top_srcdir) \
+	$(GUI_CPPFLAGS) \
+	-I$(top_srcdir)/hugin \
+	-I$(top_srcdir)/src \
+	-DWITH_HUG_MUTEX $(PTHREAD_CFLAGS) \
+	-DLODEPNG_NO_COMPILE_ENCODER \
+	-DLODEPNG_NO_COMPILE_DISK \
+	-DLODEPNG_NO_COMPILE_ANCILLARY_CHUNKS \
+	-DLODEPNG_NO_COMPILE_ERROR_TEXT \
+	-DLODEPNG_NO_COMPILE_CPP
+
+libdggui_la_CFLAGS =
+
+libdggui_la_LIBTOOLFLAGS=--tag=CC
+
+libdggui_la_LIBADD = \
+	$(GUI_LIBS) $(PTHREAD_LIBS)
+
+# If you add a file here, remember to add it to plugin/Makefile.mingw32.in
+GUI_SRC = \
+	button.cc \
+	button_base.cc \
+	checkbox.cc \
+	colour.cc \
+	combobox.cc \
+	dialog.cc \
+	eventhandler.cc \
+	font.cc \
+	frame.cc \
+	helpbutton.cc \
+	image.cc \
+	imagecache.cc \
+	knob.cc \
+	label.cc \
+	layout.cc \
+	led.cc \
+	lineedit.cc \
+	listbox.cc \
+	listboxbasic.cc \
+	listboxthin.cc \
+	painter.cc \
+	pixelbuffer.cc \
+	powerbutton.cc \
+	progressbar.cc \
+	rc_data.cc \
+	resource.cc \
+	scrollbar.cc \
+	slider.cc \
+	stackedwidget.cc \
+	tabbutton.cc \
+	tabwidget.cc \
+	textedit.cc \
+	texture.cc \
+	texturedbox.cc \
+	toggle.cc \
+	tooltip.cc \
+	uitranslation.cc \
+	utf8.cc \
+	verticalline.cc \
+	widget.cc \
+	window.cc
+
+GUI_HDR = \
+	button.h \
+	button_base.h \
+	canvas.h \
+	checkbox.h \
+	colour.h \
+	combobox.h \
+	dialog.h \
+	drawable.h \
+	eventhandler.h \
+	font.h \
+	frame.h \
+	guievent.h \
+	helpbutton.h \
+	image.h \
+	imagecache.h \
+	knob.h \
+	label.h \
+	layout.h \
+	led.h \
+	lineedit.h \
+	listbox.h \
+	listboxbasic.h \
+	listboxthin.h \
+	nativewindow.h \
+	nativewindow_cocoa.h \
+	nativewindow_cocoa.mm \
+	nativewindow_pugl.h \
+	nativewindow_pugl.cc \
+	nativewindow_win32.h \
+	nativewindow_win32.cc \
+	nativewindow_x11.h \
+	nativewindow_x11.cc \
+	painter.h \
+	pixelbuffer.h \
+	powerbutton.h \
+	progressbar.h \
+	resource.h \
+	resource_data.h \
+	scrollbar.h \
+	slider.h \
+	stackedwidget.h \
+	tabbutton.h \
+	tabwidget.h \
+	textedit.h \
+	texture.h \
+	texturedbox.h \
+	toggle.h \
+	tooltip.h \
+	uitranslation.h \
+	utf8.h \
+	verticalline.h \
+	widget.h \
+	window.h
+
+libdggui_la_SOURCES = \
+	$(GUI_SRC) \
+	lodepng/lodepng.cpp
+
+nodist_libdggui_la_SOURCES =
+
+if ENABLE_X11
+nodist_libdggui_la_SOURCES += \
+	nativewindow_x11.cc
+endif
+
+if ENABLE_WIN32
+nodist_libdggui_la_SOURCES += \
+	nativewindow_win32.cc
+endif
+
+if ENABLE_COCOA
+nodist_libdggui_la_SOURCES += \
+	nativewindow_cocoa.mm
+
+libdggui_la_OBJCXXFLAGS = \
+	-fblocks
+endif
+
+if ENABLE_PUGL_X11
+nodist_libdggui_la_SOURCES += \
+	nativewindow_pugl.cc \
+	$(top_srcdir)/pugl/pugl/pugl_x11.c
+
+libdggui_la_CPPFLAGS += \
+	-I$(top_srcdir)/pugl
+
+libdggui_la_CFLAGS += \
+	-std=c99
+endif
+
+if ENABLE_PUGL_WIN32
+nodist_libdggui_la_SOURCES += \
+	nativewindow_pugl.cc \
+	$(top_srcdir)/pugl/pugl/pugl_win.cpp
+
+libdggui_la_CPPFLAGS += \
+	-I$(top_srcdir)/pugl
+endif
+
+if ENABLE_PUGL_COCOA
+nodist_libdggui_la_SOURCES += \
+	nativewindow_pugl.cc \
+	$(top_srcdir)/pugl/pugl/pugl_osx.m
+
+libdggui_la_CPPFLAGS += \
+	-I$(top_srcdir)/pugl
+endif
+
+rcgen_LDFLAGS = -static
+rcgen_CXXFLAGS = -I$(top_srcdir)/getoptpp
+rcgen_SOURCES = \
+	rcgentool.cc
+
+EXTRA_DIST = \
+	$(RES) \
+	$(GUI_HDR)
diff --git a/plugingui/button.cc b/dggui/button.cc
index 30bda82..30bda82 100644
--- a/plugingui/button.cc
+++ b/dggui/button.cc
diff --git a/plugingui/button.h b/dggui/button.h
index 52f22e2..52f22e2 100644
--- a/plugingui/button.h
+++ b/dggui/button.h
diff --git a/plugingui/button_base.cc b/dggui/button_base.cc
index bf441f5..bf441f5 100644
--- a/plugingui/button_base.cc
+++ b/dggui/button_base.cc
diff --git a/plugingui/button_base.h b/dggui/button_base.h
index c872d9b..c872d9b 100644
--- a/plugingui/button_base.h
+++ b/dggui/button_base.h
diff --git a/plugingui/canvas.h b/dggui/canvas.h
index d6e8f99..d6e8f99 100644
--- a/plugingui/canvas.h
+++ b/dggui/canvas.h
diff --git a/plugingui/checkbox.cc b/dggui/checkbox.cc
index f3601bd..f3601bd 100644
--- a/plugingui/checkbox.cc
+++ b/dggui/checkbox.cc
diff --git a/plugingui/checkbox.h b/dggui/checkbox.h
index 6627304..6627304 100644
--- a/plugingui/checkbox.h
+++ b/dggui/checkbox.h
diff --git a/plugingui/colour.cc b/dggui/colour.cc
index 7fd649c..7fd649c 100644
--- a/plugingui/colour.cc
+++ b/dggui/colour.cc
diff --git a/plugingui/colour.h b/dggui/colour.h
index 0bc8659..0bc8659 100644
--- a/plugingui/colour.h
+++ b/dggui/colour.h
diff --git a/plugingui/combobox.cc b/dggui/combobox.cc
index aa2058e..aa2058e 100644
--- a/plugingui/combobox.cc
+++ b/dggui/combobox.cc
diff --git a/plugingui/combobox.h b/dggui/combobox.h
index 778d54c..778d54c 100644
--- a/plugingui/combobox.h
+++ b/dggui/combobox.h
diff --git a/plugingui/dialog.cc b/dggui/dialog.cc
index 9ba579d..9ba579d 100644
--- a/plugingui/dialog.cc
+++ b/dggui/dialog.cc
diff --git a/plugingui/dialog.h b/dggui/dialog.h
index 1b0c6da..1b0c6da 100644
--- a/plugingui/dialog.h
+++ b/dggui/dialog.h
diff --git a/plugingui/drawable.h b/dggui/drawable.h
index 95492d6..95492d6 100644
--- a/plugingui/drawable.h
+++ b/dggui/drawable.h
diff --git a/plugingui/eventhandler.cc b/dggui/eventhandler.cc
index fd333b8..fd333b8 100644
--- a/plugingui/eventhandler.cc
+++ b/dggui/eventhandler.cc
diff --git a/plugingui/eventhandler.h b/dggui/eventhandler.h
index 8d6f492..8d6f492 100644
--- a/plugingui/eventhandler.h
+++ b/dggui/eventhandler.h
diff --git a/plugingui/font.cc b/dggui/font.cc
index 0500e81..0500e81 100644
--- a/plugingui/font.cc
+++ b/dggui/font.cc
diff --git a/plugingui/font.h b/dggui/font.h
index 2e3f87a..2e3f87a 100644
--- a/plugingui/font.h
+++ b/dggui/font.h
diff --git a/plugingui/frame.cc b/dggui/frame.cc
index d375b6d..d375b6d 100644
--- a/plugingui/frame.cc
+++ b/dggui/frame.cc
diff --git a/plugingui/frame.h b/dggui/frame.h
index db26ea9..db26ea9 100644
--- a/plugingui/frame.h
+++ b/dggui/frame.h
diff --git a/plugingui/guievent.h b/dggui/guievent.h
index 4ad0798..4ad0798 100644
--- a/plugingui/guievent.h
+++ b/dggui/guievent.h
diff --git a/plugingui/helpbutton.cc b/dggui/helpbutton.cc
index fa061a6..fa061a6 100644
--- a/plugingui/helpbutton.cc
+++ b/dggui/helpbutton.cc
diff --git a/plugingui/helpbutton.h b/dggui/helpbutton.h
index 6e97eca..6e97eca 100644
--- a/plugingui/helpbutton.h
+++ b/dggui/helpbutton.h
diff --git a/plugingui/image.cc b/dggui/image.cc
index 118203e..118203e 100644
--- a/plugingui/image.cc
+++ b/dggui/image.cc
diff --git a/plugingui/image.h b/dggui/image.h
index d162a75..d162a75 100644
--- a/plugingui/image.h
+++ b/dggui/image.h
diff --git a/plugingui/imagecache.cc b/dggui/imagecache.cc
index d3130fe..d3130fe 100644
--- a/plugingui/imagecache.cc
+++ b/dggui/imagecache.cc
diff --git a/plugingui/imagecache.h b/dggui/imagecache.h
index d31a844..d31a844 100644
--- a/plugingui/imagecache.h
+++ b/dggui/imagecache.h
diff --git a/plugingui/knob.cc b/dggui/knob.cc
index 25200a7..25200a7 100644
--- a/plugingui/knob.cc
+++ b/dggui/knob.cc
diff --git a/plugingui/knob.h b/dggui/knob.h
index fc71511..fc71511 100644
--- a/plugingui/knob.h
+++ b/dggui/knob.h
diff --git a/plugingui/label.cc b/dggui/label.cc
index b5239ec..b5239ec 100644
--- a/plugingui/label.cc
+++ b/dggui/label.cc
diff --git a/plugingui/label.h b/dggui/label.h
index 45b4176..45b4176 100644
--- a/plugingui/label.h
+++ b/dggui/label.h
diff --git a/plugingui/layout.cc b/dggui/layout.cc
index 61e4f77..61e4f77 100644
--- a/plugingui/layout.cc
+++ b/dggui/layout.cc
diff --git a/plugingui/layout.h b/dggui/layout.h
index 210c86e..210c86e 100644
--- a/plugingui/layout.h
+++ b/dggui/layout.h
diff --git a/plugingui/led.cc b/dggui/led.cc
index f77e31a..f77e31a 100644
--- a/plugingui/led.cc
+++ b/dggui/led.cc
diff --git a/plugingui/led.h b/dggui/led.h
index 14ab6ef..14ab6ef 100644
--- a/plugingui/led.h
+++ b/dggui/led.h
diff --git a/plugingui/lineedit.cc b/dggui/lineedit.cc
index 14cc234..14cc234 100644
--- a/plugingui/lineedit.cc
+++ b/dggui/lineedit.cc
diff --git a/plugingui/lineedit.h b/dggui/lineedit.h
index 86ad986..86ad986 100644
--- a/plugingui/lineedit.h
+++ b/dggui/lineedit.h
diff --git a/plugingui/listbox.cc b/dggui/listbox.cc
index 28c074e..28c074e 100644
--- a/plugingui/listbox.cc
+++ b/dggui/listbox.cc
diff --git a/plugingui/listbox.h b/dggui/listbox.h
index 0d9ad4d..0d9ad4d 100644
--- a/plugingui/listbox.h
+++ b/dggui/listbox.h
diff --git a/plugingui/listboxbasic.cc b/dggui/listboxbasic.cc
index b2637eb..b2637eb 100644
--- a/plugingui/listboxbasic.cc
+++ b/dggui/listboxbasic.cc
diff --git a/plugingui/listboxbasic.h b/dggui/listboxbasic.h
index 27822e6..27822e6 100644
--- a/plugingui/listboxbasic.h
+++ b/dggui/listboxbasic.h
diff --git a/plugingui/listboxthin.cc b/dggui/listboxthin.cc
index d224f11..d224f11 100644
--- a/plugingui/listboxthin.cc
+++ b/dggui/listboxthin.cc
diff --git a/plugingui/listboxthin.h b/dggui/listboxthin.h
index e861745..e861745 100644
--- a/plugingui/listboxthin.h
+++ b/dggui/listboxthin.h
diff --git a/plugingui/lodepng b/dggui/lodepng
-Subproject a71964ed5fe4f82a32ac7f8201338900f66e855
+Subproject a71964ed5fe4f82a32ac7f8201338900f66e855
diff --git a/plugingui/nativewindow.h b/dggui/nativewindow.h
index 400ff57..400ff57 100644
--- a/plugingui/nativewindow.h
+++ b/dggui/nativewindow.h
diff --git a/plugingui/nativewindow_cocoa.h b/dggui/nativewindow_cocoa.h
index 8dc73e6..8dc73e6 100644
--- a/plugingui/nativewindow_cocoa.h
+++ b/dggui/nativewindow_cocoa.h
diff --git a/plugingui/nativewindow_cocoa.mm b/dggui/nativewindow_cocoa.mm
index 7b6ecc8..7b6ecc8 100644
--- a/plugingui/nativewindow_cocoa.mm
+++ b/dggui/nativewindow_cocoa.mm
diff --git a/plugingui/nativewindow_pugl.cc b/dggui/nativewindow_pugl.cc
index f94b82b..f94b82b 100644
--- a/plugingui/nativewindow_pugl.cc
+++ b/dggui/nativewindow_pugl.cc
diff --git a/plugingui/nativewindow_pugl.h b/dggui/nativewindow_pugl.h
index 6a667f4..6a667f4 100644
--- a/plugingui/nativewindow_pugl.h
+++ b/dggui/nativewindow_pugl.h
diff --git a/plugingui/nativewindow_win32.cc b/dggui/nativewindow_win32.cc
index 4b31130..4b31130 100644
--- a/plugingui/nativewindow_win32.cc
+++ b/dggui/nativewindow_win32.cc
diff --git a/plugingui/nativewindow_win32.h b/dggui/nativewindow_win32.h
index 046b38a..046b38a 100644
--- a/plugingui/nativewindow_win32.h
+++ b/dggui/nativewindow_win32.h
diff --git a/plugingui/nativewindow_x11.cc b/dggui/nativewindow_x11.cc
index 33dde7b..33dde7b 100644
--- a/plugingui/nativewindow_x11.cc
+++ b/dggui/nativewindow_x11.cc
diff --git a/plugingui/nativewindow_x11.h b/dggui/nativewindow_x11.h
index cb56fbc..cb56fbc 100644
--- a/plugingui/nativewindow_x11.h
+++ b/dggui/nativewindow_x11.h
diff --git a/plugingui/painter.cc b/dggui/painter.cc
index f746f83..f746f83 100644
--- a/plugingui/painter.cc
+++ b/dggui/painter.cc
diff --git a/plugingui/painter.h b/dggui/painter.h
index 9bf7fbf..9bf7fbf 100644
--- a/plugingui/painter.h
+++ b/dggui/painter.h
diff --git a/plugingui/pixelbuffer.cc b/dggui/pixelbuffer.cc
index 3c666cd..3c666cd 100644
--- a/plugingui/pixelbuffer.cc
+++ b/dggui/pixelbuffer.cc
diff --git a/plugingui/pixelbuffer.h b/dggui/pixelbuffer.h
index 5c11d14..5c11d14 100644
--- a/plugingui/pixelbuffer.h
+++ b/dggui/pixelbuffer.h
diff --git a/plugingui/powerbutton.cc b/dggui/powerbutton.cc
index 5bf2a2c..5bf2a2c 100644
--- a/plugingui/powerbutton.cc
+++ b/dggui/powerbutton.cc
diff --git a/plugingui/powerbutton.h b/dggui/powerbutton.h
index 14dbeca..14dbeca 100644
--- a/plugingui/powerbutton.h
+++ b/dggui/powerbutton.h
diff --git a/plugingui/progressbar.cc b/dggui/progressbar.cc
index dd3e130..dd3e130 100644
--- a/plugingui/progressbar.cc
+++ b/dggui/progressbar.cc
diff --git a/plugingui/progressbar.h b/dggui/progressbar.h
index 76cc6fd..76cc6fd 100644
--- a/plugingui/progressbar.h
+++ b/dggui/progressbar.h
diff --git a/dggui/rc_data.cc b/dggui/rc_data.cc
new file mode 100644
index 0000000..18e3cd5
--- /dev/null
+++ b/dggui/rc_data.cc
@@ -0,0 +1,29 @@
+/* -*- Mode: c++ -*- */
+/***************************************************************************
+ *            rc_data.cc
+ *
+ *  Wed Dec 23 09:51:20 CET 2020
+ *  Copyright 2020 Bent Bisballe Nyeng
+ *  deva@aasimon.org
+ ****************************************************************************/
+
+/*
+ *  This file is part of DrumGizmo.
+ *
+ *  DrumGizmo is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  DrumGizmo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with DrumGizmo; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ */
+#include "resource_data.h"
+
+const rc_data_t* rc_data __attribute__((__weak__)) = nullptr;
diff --git a/plugingui/rcgen.cc b/dggui/rcgentool.cc
index f7b5590..c0ba0db 100644
--- a/plugingui/rcgen.cc
+++ b/dggui/rcgentool.cc
@@ -117,9 +117,9 @@ int main(int argc, char *argv[])
 	}
 
 	fprintf(out, "/* This file is autogenerated by rcgen. Do not modify! */\n");
-	fprintf(out, "#include \"resource_data.h\"\n");
+	fprintf(out, "#include <dggui/resource_data.h>\n");
 	fprintf(out, "\n");
-	fprintf(out, "const rc_data_t rc_data[] =\n");
+	fprintf(out, "const rc_data_t rc_dataX[] =\n");
 	fprintf(out, "{\n");
 
 	if(!dirRoot.empty())
@@ -186,5 +186,7 @@ int main(int argc, char *argv[])
 	fprintf(out, "	{ \"\", 0, 0 }\n");
 	fprintf(out, "};\n");
 
+	fprintf(out, "\nconst rc_data_t* rc_data = rc_dataX;\n");
+
 	return 0;
 }
diff --git a/plugingui/resource.cc b/dggui/resource.cc
index 44f5540..52aca0a 100644
--- a/plugingui/resource.cc
+++ b/dggui/resource.cc
@@ -41,6 +41,8 @@
 // rcgen generated file containing rc_data declaration.
 #include "resource_data.h"
 
+extern const rc_data_t* rc_data;
+
 namespace GUI
 {
 
@@ -77,7 +79,7 @@ Resource::Resource(const std::string& name)
 
 		// Find internal resource in rc_data.
 		const rc_data_t* p = rc_data;
-		while(*p->name) // last entry in rc_data has the name := ""
+		while(p && *p->name) // last entry in rc_data has the name := ""
 		{
 			if(name == p->name)
 			{
diff --git a/plugingui/resource.h b/dggui/resource.h
index 5f7b3b4..5f7b3b4 100644
--- a/plugingui/resource.h
+++ b/dggui/resource.h
diff --git a/plugingui/resource_data.h b/dggui/resource_data.h
index 337caf6..d685e13 100644
--- a/plugingui/resource_data.h
+++ b/dggui/resource_data.h
@@ -31,5 +31,3 @@ typedef struct {
 	unsigned int size;
 	const char *data;
 } rc_data_t;
-
-extern const rc_data_t rc_data[];
diff --git a/plugingui/scrollbar.cc b/dggui/scrollbar.cc
index 9a17d1d..9a17d1d 100644
--- a/plugingui/scrollbar.cc
+++ b/dggui/scrollbar.cc
diff --git a/plugingui/scrollbar.h b/dggui/scrollbar.h
index 5e60673..5e60673 100644
--- a/plugingui/scrollbar.h
+++ b/dggui/scrollbar.h
diff --git a/plugingui/slider.cc b/dggui/slider.cc
index 15a82b3..15a82b3 100644
--- a/plugingui/slider.cc
+++ b/dggui/slider.cc
diff --git a/plugingui/slider.h b/dggui/slider.h
index 90905fd..90905fd 100644
--- a/plugingui/slider.h
+++ b/dggui/slider.h
diff --git a/plugingui/stackedwidget.cc b/dggui/stackedwidget.cc
index 05f8f3c..05f8f3c 100644
--- a/plugingui/stackedwidget.cc
+++ b/dggui/stackedwidget.cc
diff --git a/plugingui/stackedwidget.h b/dggui/stackedwidget.h
index 24213f7..24213f7 100644
--- a/plugingui/stackedwidget.h
+++ b/dggui/stackedwidget.h
diff --git a/plugingui/tabbutton.cc b/dggui/tabbutton.cc
index 6a27f61..6a27f61 100644
--- a/plugingui/tabbutton.cc
+++ b/dggui/tabbutton.cc
diff --git a/plugingui/tabbutton.h b/dggui/tabbutton.h
index 1e9371a..1e9371a 100644
--- a/plugingui/tabbutton.h
+++ b/dggui/tabbutton.h
diff --git a/plugingui/tabwidget.cc b/dggui/tabwidget.cc
index 635f1bd..635f1bd 100644
--- a/plugingui/tabwidget.cc
+++ b/dggui/tabwidget.cc
diff --git a/plugingui/tabwidget.h b/dggui/tabwidget.h
index 129826a..129826a 100644
--- a/plugingui/tabwidget.h
+++ b/dggui/tabwidget.h
diff --git a/plugingui/textedit.cc b/dggui/textedit.cc
index 9688b82..9688b82 100644
--- a/plugingui/textedit.cc
+++ b/dggui/textedit.cc
diff --git a/plugingui/textedit.h b/dggui/textedit.h
index 17a04ff..17a04ff 100644
--- a/plugingui/textedit.h
+++ b/dggui/textedit.h
diff --git a/plugingui/texture.cc b/dggui/texture.cc
index 8cd7040..8cd7040 100644
--- a/plugingui/texture.cc
+++ b/dggui/texture.cc
diff --git a/plugingui/texture.h b/dggui/texture.h
index c751ed4..c751ed4 100644
--- a/plugingui/texture.h
+++ b/dggui/texture.h
diff --git a/plugingui/texturedbox.cc b/dggui/texturedbox.cc
index e48353a..e48353a 100644
--- a/plugingui/texturedbox.cc
+++ b/dggui/texturedbox.cc
diff --git a/plugingui/texturedbox.h b/dggui/texturedbox.h
index 7aa3967..7aa3967 100644
--- a/plugingui/texturedbox.h
+++ b/dggui/texturedbox.h
diff --git a/plugingui/toggle.cc b/dggui/toggle.cc
index 39587de..39587de 100644
--- a/plugingui/toggle.cc
+++ b/dggui/toggle.cc
diff --git a/plugingui/toggle.h b/dggui/toggle.h
index 3466459..3466459 100644
--- a/plugingui/toggle.h
+++ b/dggui/toggle.h
diff --git a/plugingui/tooltip.cc b/dggui/tooltip.cc
index e251ed5..e251ed5 100644
--- a/plugingui/tooltip.cc
+++ b/dggui/tooltip.cc
diff --git a/plugingui/tooltip.h b/dggui/tooltip.h
index 9d1619d..9d1619d 100644
--- a/plugingui/tooltip.h
+++ b/dggui/tooltip.h
diff --git a/plugingui/uitranslation.cc b/dggui/uitranslation.cc
index 0546be8..0546be8 100644
--- a/plugingui/uitranslation.cc
+++ b/dggui/uitranslation.cc
diff --git a/plugingui/uitranslation.h b/dggui/uitranslation.h
index 5341255..5341255 100644
--- a/plugingui/uitranslation.h
+++ b/dggui/uitranslation.h
diff --git a/plugingui/utf8.cc b/dggui/utf8.cc
index 747e726..747e726 100644
--- a/plugingui/utf8.cc
+++ b/dggui/utf8.cc
diff --git a/plugingui/utf8.h b/dggui/utf8.h
index 04c26b1..04c26b1 100644
--- a/plugingui/utf8.h
+++ b/dggui/utf8.h
diff --git a/plugingui/verticalline.cc b/dggui/verticalline.cc
index 6a3a98a..6a3a98a 100644
--- a/plugingui/verticalline.cc
+++ b/dggui/verticalline.cc
diff --git a/plugingui/verticalline.h b/dggui/verticalline.h
index 3403244..3403244 100644
--- a/plugingui/verticalline.h
+++ b/dggui/verticalline.h
diff --git a/plugingui/widget.cc b/dggui/widget.cc
index da6b1e2..da6b1e2 100644
--- a/plugingui/widget.cc
+++ b/dggui/widget.cc
diff --git a/plugingui/widget.h b/dggui/widget.h
index b9436b7..b9436b7 100644
--- a/plugingui/widget.h
+++ b/dggui/widget.h
diff --git a/plugingui/window.cc b/dggui/window.cc
index 5e0ad31..5e0ad31 100644
--- a/plugingui/window.cc
+++ b/dggui/window.cc
diff --git a/plugingui/window.h b/dggui/window.h
index 6031500..6031500 100644
--- a/plugingui/window.h
+++ b/dggui/window.h
diff --git a/drumgizmo/Makefile.am b/drumgizmo/Makefile.am
index 2cb46bf..b3bca32 100644
--- a/drumgizmo/Makefile.am
+++ b/drumgizmo/Makefile.am
@@ -109,7 +109,7 @@ dgvalidator_CXXFLAGS = \
 	-I$(top_srcdir)/src -I$(top_srcdir)/getoptpp \
 	-I$(top_srcdir)/hugin -DWITH_HUG_MUTEX -DWITH_HUG_FILTER \
 	$(SSEFLAGS) \
-	-I$(top_srcdir)/plugingui \
+	-I$(top_srcdir)/ \
 	-DLODEPNG_NO_COMPILE_ENCODER \
 	-DLODEPNG_NO_COMPILE_DISK \
 	-DLODEPNG_NO_COMPILE_ANCILLARY_CHUNKS \
@@ -122,9 +122,9 @@ dgvalidator_SOURCES = \
 	dgvalidator.cc \
 	$(top_srcdir)/hugin/hugin.c \
 	$(top_srcdir)/hugin/hugin_filter.c \
-	$(top_srcdir)/plugingui/lodepng/lodepng.cpp \
-	$(top_srcdir)/plugingui/image.cc \
-	$(top_srcdir)/plugingui/resource.cc \
-	$(top_srcdir)/plugingui/colour.cc
+	$(top_srcdir)/dggui/lodepng/lodepng.cpp \
+	$(top_srcdir)/dggui/image.cc \
+	$(top_srcdir)/dggui/resource.cc \
+	$(top_srcdir)/dggui/colour.cc
 
 endif # ENABLE_CLI
diff --git a/drumgizmo/dgvalidator.cc b/drumgizmo/dgvalidator.cc
index 6a7c546..1b21c59 100644
--- a/drumgizmo/dgvalidator.cc
+++ b/drumgizmo/dgvalidator.cc
@@ -37,8 +37,6 @@
 #include <sstream>
 #include <climits>
 
-#include <lodepng/lodepng.h>
-
 #include <config.h>
 #include <platform.h>
 
@@ -48,11 +46,13 @@
 #include <unistd.h>
 #endif
 
-#include <image.h>
+#include <dggui/image.h>
 
 // Needed for Resource class
-#include <resource_data.h>
-const rc_data_t rc_data[] = {};
+#include <dggui/resource_data.h>
+
+const rc_data_t rc_dataX[] = {};
+const rc_data_t* rc_data = rc_dataX;
 
 namespace
 {
diff --git a/plugin/Makefile.am b/plugin/Makefile.am
index f382acc..935b601 100644
--- a/plugin/Makefile.am
+++ b/plugin/Makefile.am
@@ -19,6 +19,7 @@ drumgizmo_la_CXXFLAGS = -DLV2 -DLV2_PLUGIN_URI=\"http://drumgizmo.org/lv2\" \
 	$(LV2_CFLAGS) \
 	$(SNDFILE_CFLAGS) \
 	-I$(top_srcdir)/plugin/plugingizmo \
+	-I$(top_srcdir)/ \
 	-I$(top_srcdir)/plugingui \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/hugin
@@ -35,7 +36,7 @@ drumgizmo_la_LDFLAGS = -shared -module -avoid-version \
 	-no-undefined -export-symbols $(top_srcdir)/plugin/drumgizmo_lv2.sym
 
 drumgizmo_la_LIBADD = $(LV2_LIBS) \
-	$(top_builddir)/plugingui/libdggui.la \
+	$(top_builddir)/plugingui/libplugingui.la \
 	$(top_builddir)/src/libdg.la \
 	$(top_builddir)/src/libnls.la
 
@@ -93,6 +94,7 @@ drumgizmo_vst_la_CXXFLAGS = -DVST \
 	-I$(top_srcdir)/zita-resampler/libs \
 	$(SNDFILE_CFLAGS) \
 	-I$(top_srcdir)/plugin/plugingizmo \
+	-I$(top_srcdir)/ \
 	-I$(top_srcdir)/plugingui \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/hugin \
@@ -111,7 +113,7 @@ drumgizmo_vst_la_LDFLAGS = -shared -module -avoid-version \
 
 drumgizmo_vst_la_LIBADD = \
 	vst/libvstsdk.la \
-	$(top_builddir)/plugingui/libdggui.la \
+	$(top_builddir)/plugingui/libplugingui.la \
 	$(top_builddir)/src/libdg.la \
 	$(top_builddir)/src/libnls.la
 
diff --git a/plugin/Makefile.mingw32.in b/plugin/Makefile.mingw32.in
index 2c2055c..ad47bcc 100644
--- a/plugin/Makefile.mingw32.in
+++ b/plugin/Makefile.mingw32.in
@@ -59,66 +59,70 @@ DG_CFLAGS = -I@top_srcdir@ -I@top_srcdir@/src \
 GUI_SRC = \
 	@top_srcdir@/plugingui/abouttab.cc \
 	@top_srcdir@/plugingui/bleedcontrolframecontent.cc \
-	@top_srcdir@/plugingui/button.cc \
-	@top_srcdir@/plugingui/button_base.cc \
-	@top_srcdir@/plugingui/checkbox.cc \
-	@top_srcdir@/plugingui/colour.cc \
-	@top_srcdir@/plugingui/combobox.cc \
-	@top_srcdir@/plugingui/dialog.cc \
 	@top_srcdir@/plugingui/diskstreamingframecontent.cc \
 	@top_srcdir@/plugingui/drumkitframecontent.cc \
 	@top_srcdir@/plugingui/drumkittab.cc \
-	@top_srcdir@/plugingui/eventhandler.cc \
 	@top_srcdir@/plugingui/filebrowser.cc \
-	@top_srcdir@/plugingui/font.cc \
-	@top_srcdir@/plugingui/frame.cc \
-	@top_srcdir@/plugingui/helpbutton.cc \
-	@top_srcdir@/plugingui/humanizerframecontent.cc \
 	@top_srcdir@/plugingui/humaniservisualiser.cc \
-	@top_srcdir@/plugingui/image.cc \
-	@top_srcdir@/plugingui/imagecache.cc \
-	@top_srcdir@/plugingui/knob.cc \
-	@top_srcdir@/plugingui/label.cc \
-	@top_srcdir@/plugingui/layout.cc \
-	@top_srcdir@/plugingui/led.cc \
-	@top_srcdir@/plugingui/lineedit.cc \
-	@top_srcdir@/plugingui/listbox.cc \
-	@top_srcdir@/plugingui/listboxbasic.cc \
-	@top_srcdir@/plugingui/listboxthin.cc \
+	@top_srcdir@/plugingui/humanizerframecontent.cc \
 	@top_srcdir@/plugingui/maintab.cc \
 	@top_srcdir@/plugingui/mainwindow.cc \
-	@top_srcdir@/plugingui/nativewindow_win32.cc \
-	@top_srcdir@/plugingui/painter.cc \
-	@top_srcdir@/plugingui/pixelbuffer.cc \
 	@top_srcdir@/plugingui/pluginconfig.cc \
-	@top_srcdir@/plugingui/powerbutton.cc \
 	@top_srcdir@/plugingui/powerwidget.cc \
-	@top_srcdir@/plugingui/progressbar.cc \
 	@top_srcdir@/plugingui/resamplingframecontent.cc \
-	@top_srcdir@/plugingui/resource.cc \
 	@top_srcdir@/plugingui/sampleselectionframecontent.cc \
-	@top_srcdir@/plugingui/scrollbar.cc \
-	@top_srcdir@/plugingui/slider.cc \
-	@top_srcdir@/plugingui/stackedwidget.cc \
 	@top_srcdir@/plugingui/statusframecontent.cc \
-	@top_srcdir@/plugingui/tabbutton.cc \
-	@top_srcdir@/plugingui/tabwidget.cc \
-	@top_srcdir@/plugingui/textedit.cc \
-	@top_srcdir@/plugingui/texture.cc \
-	@top_srcdir@/plugingui/texturedbox.cc \
 	@top_srcdir@/plugingui/timingframecontent.cc \
-	@top_srcdir@/plugingui/toggle.cc \
-	@top_srcdir@/plugingui/tooltip.cc \
-	@top_srcdir@/plugingui/uitranslation.cc \
-	@top_srcdir@/plugingui/utf8.cc \
-	@top_srcdir@/plugingui/verticalline.cc \
 	@top_srcdir@/plugingui/visualizerframecontent.cc \
 	@top_srcdir@/plugingui/voicelimitframecontent.cc \
-	@top_srcdir@/plugingui/widget.cc \
-	@top_srcdir@/plugingui/window.cc \
-	@top_srcdir@/plugingui/lodepng/lodepng.cpp
+\
+	@top_srcdir@/dggui/button.cc \
+	@top_srcdir@/dggui/button_base.cc \
+	@top_srcdir@/dggui/checkbox.cc \
+	@top_srcdir@/dggui/colour.cc \
+	@top_srcdir@/dggui/combobox.cc \
+	@top_srcdir@/dggui/dialog.cc \
+	@top_srcdir@/dggui/eventhandler.cc \
+	@top_srcdir@/dggui/font.cc \
+	@top_srcdir@/dggui/frame.cc \
+	@top_srcdir@/dggui/helpbutton.cc \
+	@top_srcdir@/dggui/image.cc \
+	@top_srcdir@/dggui/imagecache.cc \
+	@top_srcdir@/dggui/knob.cc \
+	@top_srcdir@/dggui/label.cc \
+	@top_srcdir@/dggui/layout.cc \
+	@top_srcdir@/dggui/led.cc \
+	@top_srcdir@/dggui/lineedit.cc \
+	@top_srcdir@/dggui/listbox.cc \
+	@top_srcdir@/dggui/listboxbasic.cc \
+	@top_srcdir@/dggui/listboxthin.cc \
+	@top_srcdir@/dggui/painter.cc \
+	@top_srcdir@/dggui/pixelbuffer.cc \
+	@top_srcdir@/dggui/powerbutton.cc \
+	@top_srcdir@/dggui/progressbar.cc \
+	@top_srcdir@/dggui/rc_data.cc \
+	@top_srcdir@/dggui/resource.cc \
+	@top_srcdir@/dggui/scrollbar.cc \
+	@top_srcdir@/dggui/slider.cc \
+	@top_srcdir@/dggui/stackedwidget.cc \
+	@top_srcdir@/dggui/tabbutton.cc \
+	@top_srcdir@/dggui/tabwidget.cc \
+	@top_srcdir@/dggui/textedit.cc \
+	@top_srcdir@/dggui/texture.cc \
+	@top_srcdir@/dggui/texturedbox.cc \
+	@top_srcdir@/dggui/toggle.cc \
+	@top_srcdir@/dggui/tooltip.cc \
+	@top_srcdir@/dggui/uitranslation.cc \
+	@top_srcdir@/dggui/utf8.cc \
+	@top_srcdir@/dggui/verticalline.cc \
+	@top_srcdir@/dggui/widget.cc \
+	@top_srcdir@/dggui/window.cc \
+\
+	@top_srcdir@/dggui/lodepng/lodepng.cpp \
+	@top_srcdir@/dggui/nativewindow_win32.cc
+
 
-GUI_CPPFLAGS=-I@top_srcdir@/plugingui/ -DUSE_THREAD @GUI_CPPFLAGS@
+GUI_CPPFLAGS=-I@top_srcdir@/plugingui/ -I@top_srcdir@/ -DUSE_THREAD @GUI_CPPFLAGS@
 GUI_LIBS=@GUI_LIBS@
 
 DBG_SRC = \
@@ -186,9 +190,9 @@ NLS_RES = \
 all:
 	(cd @top_srcdir@/plugingui/locale; msgfmt -c -v -o da.mo da.po)
 	(cd @top_srcdir@/plugingui/locale; msgfmt -c -v -o fr.mo fr.po)
-	g++ -I@top_srcdir@/getoptpp @top_srcdir@/plugingui/rcgen.cc -o @top_srcdir@/plugingui/rcgen
-	@top_srcdir@/plugingui/rcgen -s @top_srcdir@/plugingui/ -s @top_builddir@/plugingui/ $(RES) $(NLS_RES) -o @top_srcdir@/plugingui/resource_data.cc
-	g++ $(CXXFLAGS) @top_srcdir@/plugingui/resource_data.cc -c
+	g++ -I@top_srcdir@/getoptpp @top_srcdir@/dggui/rcgentool.cc -o @top_srcdir@/dggui/rcgen
+	@top_srcdir@/dggui/rcgen -s @top_srcdir@/dggui/ -s @top_builddir@/plugingui/ $(RES) $(NLS_RES) -o @top_srcdir@/plugingui/resource_data.cc
+	g++ $(CXXFLAGS) -I@top_srcdir@ @top_srcdir@/plugingui/resource_data.cc -c
 	gcc $(CFLAGS) $(DBG_CFLAGS) @top_srcdir@/hugin/hugin.c -c
 	gcc $(CFLAGS) $(DBG_CFLAGS) @top_srcdir@/hugin/hugin_syslog.c -c
 	g++ $(LDFLAGS) $(CXXFLAGS) -std=c++11 -static -static-libgcc -O2 -g -Wall $(DBG_CFLAGS) $(DG_CFLAGS) $(DG_LIBS) $(VST_CFLAGS) hugin.o hugin_syslog.o resource_data.o $(DG_SRC) $(VST_SRC) ${SRC} ${GUI_SRC} ${GUI_CPPFLAGS} $(GUI_LIBS) $(SNDFILE_CFLAGS) $(SNDFILE_LIBS) -latomic -shared -Wl,-retain-symbols-file -Wl,drumgizmo_vst.sym -o drumgizmo_vst.dll -Wl,--out-implib,libdrumgizmo_vst.a
diff --git a/plugin/drumgizmo_plugin.h b/plugin/drumgizmo_plugin.h
index 78a74dc..4ecf489 100644
--- a/plugin/drumgizmo_plugin.h
+++ b/plugin/drumgizmo_plugin.h
@@ -39,14 +39,14 @@
 #endif
 
 #include <drumgizmo.h>
-#include <uitranslation.h>
 #include <audioinputenginemidi.h>
 #include <audiooutputengine.h>
 #include <mainwindow.h>
 
-#include <texturedbox.h>
-#include <imagecache.h>
-#include <image.h>
+#include <dggui/uitranslation.h>
+#include <dggui/texturedbox.h>
+#include <dggui/imagecache.h>
+#include <dggui/image.h>
 
 class DrumGizmoPlugin
 #ifdef LV2
diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am
index ab2e076..706b3c9 100644
--- a/plugingui/Makefile.am
+++ b/plugingui/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = locale
 DISTDIRS = locale
 
-noinst_PROGRAMS = plugingui rcgen
-noinst_LTLIBRARIES = libdggui.la
+noinst_PROGRAMS = plugingui
+noinst_LTLIBRARIES = libplugingui.la
 
 # If you add a file here, remember to add it to plugin/Makefile.mingw32.in
 RES = \
@@ -70,14 +70,14 @@ BUILT_SOURCES = \
 	resource_data.cc \
 	$(NLS_RES)
 
-resource_data.cc: rcgen$(EXEEXT) $(RES) $(NLS_RES)
-	$(rcgen_verbose)./rcgen$(EXEEXT) -s $(top_srcdir)/plugingui/ -s $(top_builddir)/plugingui/ -o $@ $(RES) $(NLS_RES)
+resource_data.cc: $(top_builddir)/dggui/rcgen$(EXEEXT) $(RES) $(NLS_RES)
+	$(rcgen_verbose)$(top_builddir)/dggui/rcgen$(EXEEXT) -s $(top_srcdir)/plugingui/ -s $(top_builddir)/plugingui/ -o $@ $(RES) $(NLS_RES)
 
 CLEANFILES = \
 	resource_data.cc \
 	$(NLS_RES)
 
-libdggui_la_CPPFLAGS = \
+libplugingui_la_CPPFLAGS = \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir) \
 	$(GUI_CPPFLAGS) \
@@ -90,205 +90,64 @@ libdggui_la_CPPFLAGS = \
 	-DLODEPNG_NO_COMPILE_ERROR_TEXT \
 	-DLODEPNG_NO_COMPILE_CPP
 
-libdggui_la_CFLAGS =
+libplugingui_la_CFLAGS =
 
-libdggui_la_LIBTOOLFLAGS=--tag=CC
+libplugingui_la_LIBTOOLFLAGS=--tag=CC
 
-libdggui_la_LIBADD = \
+libplugingui_la_LIBADD = \
+	$(top_builddir)/dggui/libdggui.la \
 	$(GUI_LIBS) $(PTHREAD_LIBS)
 
 # If you add a file here, remember to add it to plugin/Makefile.mingw32.in
 GUI_SRC = \
 	abouttab.cc \
 	bleedcontrolframecontent.cc \
-	button.cc \
-	button_base.cc \
-	checkbox.cc \
-	colour.cc \
-	combobox.cc \
-	dialog.cc \
 	diskstreamingframecontent.cc \
 	drumkitframecontent.cc \
 	drumkittab.cc \
-	eventhandler.cc \
 	filebrowser.cc \
-	font.cc \
-	frame.cc \
-	helpbutton.cc \
-	humanizerframecontent.cc \
 	humaniservisualiser.cc \
-	image.cc \
-	imagecache.cc \
-	knob.cc \
-	label.cc \
-	layout.cc \
-	led.cc \
-	lineedit.cc \
-	listbox.cc \
-	listboxbasic.cc \
-	listboxthin.cc \
+	humanizerframecontent.cc \
 	maintab.cc \
 	mainwindow.cc \
-	painter.cc \
-	pixelbuffer.cc \
 	pluginconfig.cc \
-	powerbutton.cc \
 	powerwidget.cc \
-	progressbar.cc \
 	resamplingframecontent.cc \
-	resource.cc \
 	sampleselectionframecontent.cc \
-	scrollbar.cc \
-	slider.cc \
-	stackedwidget.cc \
 	statusframecontent.cc \
-	tabbutton.cc \
-	tabwidget.cc \
-	textedit.cc \
-	texture.cc \
-	texturedbox.cc \
 	timingframecontent.cc \
-	toggle.cc \
-	tooltip.cc \
-	uitranslation.cc \
-	utf8.cc \
-	verticalline.cc \
 	visualizerframecontent.cc \
-	voicelimitframecontent.cc \
-	widget.cc \
-	window.cc
+	voicelimitframecontent.cc
 
 GUI_HDR = \
 	abouttab.h \
 	bleedcontrolframecontent.h \
-	button.h \
-	button_base.h \
-	canvas.h \
-	checkbox.h \
-	colour.h \
-	combobox.h \
-	dialog.h \
 	diskstreamingframecontent.h \
-	drawable.h \
 	drumkitframecontent.h \
 	drumkittab.h \
-	eventhandler.h \
 	filebrowser.h \
-	font.h \
-	frame.h \
-	guievent.h \
-	helpbutton.h \
 	humaniservisualiser.h \
 	humanizerframecontent.h \
-	image.h \
-	imagecache.h \
-	knob.h \
-	label.h \
 	labeledcontrol.h \
-	layout.h \
-	led.h \
-	lineedit.h \
-	listbox.h \
-	listboxbasic.h \
-	listboxthin.h \
 	maintab.h \
 	mainwindow.h \
-	nativewindow.h \
-	nativewindow_cocoa.h \
-	nativewindow_cocoa.mm \
-	nativewindow_pugl.h \
-	nativewindow_pugl.cc \
-	nativewindow_win32.h \
-	nativewindow_win32.cc \
-	nativewindow_x11.h \
-	nativewindow_x11.cc \
-	painter.h \
-	pixelbuffer.h \
 	pluginconfig.h \
-	powerbutton.h \
 	powerwidget.h \
-	progressbar.h \
 	resamplingframecontent.h \
-	resource.h \
-	resource_data.h \
 	sampleselectionframecontent.h \
-	scrollbar.h \
-	slider.h \
-	stackedwidget.h \
 	statusframecontent.h \
-	tabbutton.h \
-	tabwidget.h \
-	textedit.h \
-	texture.h \
-	texturedbox.h \
 	timingframecontent.h \
-	toggle.h \
-	tooltip.h \
-	uitranslation.h \
-	utf8.h \
-	verticalline.h \
 	visualizerframecontent.h \
-	voicelimitframecontent.h \
-	widget.h \
-	window.h
+	voicelimitframecontent.h
 
-libdggui_la_SOURCES = \
-	$(GUI_SRC) \
-	lodepng/lodepng.cpp
+libplugingui_la_SOURCES = \
+	$(GUI_SRC)
 
-nodist_libdggui_la_SOURCES = \
+nodist_libplugingui_la_SOURCES = \
 	$(top_builddir)/plugingui/resource_data.cc
 
-if ENABLE_X11
-nodist_libdggui_la_SOURCES += \
-	nativewindow_x11.cc
-endif
-
-if ENABLE_WIN32
-nodist_libdggui_la_SOURCES += \
-	nativewindow_win32.cc
-endif
-
-if ENABLE_COCOA
-nodist_libdggui_la_SOURCES += \
-	nativewindow_cocoa.mm
-
-libdggui_la_OBJCXXFLAGS = \
-	-fblocks
-endif
-
-if ENABLE_PUGL_X11
-nodist_libdggui_la_SOURCES += \
-	nativewindow_pugl.cc \
-	$(top_srcdir)/pugl/pugl/pugl_x11.c
-
-libdggui_la_CPPFLAGS += \
-	-I$(top_srcdir)/pugl
-
-libdggui_la_CFLAGS += \
-	-std=c99
-endif
-
-if ENABLE_PUGL_WIN32
-nodist_libdggui_la_SOURCES += \
-	nativewindow_pugl.cc \
-	$(top_srcdir)/pugl/pugl/pugl_win.cpp
-
-libdggui_la_CPPFLAGS += \
-	-I$(top_srcdir)/pugl
-endif
-
-if ENABLE_PUGL_COCOA
-nodist_libdggui_la_SOURCES += \
-	nativewindow_pugl.cc \
-	$(top_srcdir)/pugl/pugl/pugl_osx.m
-
-libdggui_la_CPPFLAGS += \
-	-I$(top_srcdir)/pugl
-endif
-
 plugingui_LDADD = \
-	libdggui.la \
+	libplugingui.la \
 	$(top_builddir)/src/libdg.la \
 	$(top_builddir)/src/libnls.la
 
@@ -297,6 +156,7 @@ plugingui_CXXFLAGS = \
 	$(GUI_CPPFLAGS) \
 	$(SNDFILE_CXXFLAGS) \
 	$(PTHREAD_CFLAGS) \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/hugin
 
@@ -306,11 +166,6 @@ plugingui_SOURCES = \
 	testmain.cc \
 	$(top_srcdir)/hugin/hugin.c
 
-rcgen_LDFLAGS = -static
-rcgen_CXXFLAGS = -I$(top_srcdir)/getoptpp
-rcgen_SOURCES = \
-	rcgen.cc
-
 EXTRA_DIST = \
 	$(RES) \
 	$(GUI_HDR)
diff --git a/plugingui/abouttab.cc b/plugingui/abouttab.cc
index 384c815..094ed5d 100644
--- a/plugingui/abouttab.cc
+++ b/plugingui/abouttab.cc
@@ -29,7 +29,7 @@
 #include <version.h>
 #include <translation.h>
 
-#include "utf8.h"
+#include <dggui/utf8.h>
 
 namespace
 {
diff --git a/plugingui/abouttab.h b/plugingui/abouttab.h
index ed06b1d..99653d1 100644
--- a/plugingui/abouttab.h
+++ b/plugingui/abouttab.h
@@ -26,9 +26,9 @@
  */
 #pragma once
 
-#include "widget.h"
-#include "resource.h"
-#include "textedit.h"
+#include <dggui/widget.h>
+#include <dggui/resource.h>
+#include <dggui/textedit.h>
 
 #include <string>
 
diff --git a/plugingui/bleedcontrolframecontent.h b/plugingui/bleedcontrolframecontent.h
index 78733c0..d4f6c2e 100644
--- a/plugingui/bleedcontrolframecontent.h
+++ b/plugingui/bleedcontrolframecontent.h
@@ -25,9 +25,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
 
-#include "label.h"
-#include "slider.h"
-#include "widget.h"
+#include <dggui/label.h>
+#include <dggui/slider.h>
+#include <dggui/widget.h>
 
 struct Settings;
 class SettingsNotifier;
diff --git a/plugingui/diskstreamingframecontent.h b/plugingui/diskstreamingframecontent.h
index eabc6e2..1f7ab39 100644
--- a/plugingui/diskstreamingframecontent.h
+++ b/plugingui/diskstreamingframecontent.h
@@ -26,10 +26,10 @@
  */
 #pragma once
 
-#include "button.h"
-#include "label.h"
-#include "slider.h"
-#include "widget.h"
+#include <dggui/button.h>
+#include <dggui/label.h>
+#include <dggui/slider.h>
+#include <dggui/widget.h>
 
 struct Settings;
 class SettingsNotifier;
diff --git a/plugingui/drumkitframecontent.cc b/plugingui/drumkitframecontent.cc
index 7dd2234..2bdff7a 100644
--- a/plugingui/drumkitframecontent.cc
+++ b/plugingui/drumkitframecontent.cc
@@ -28,7 +28,6 @@
 
 #include <settings.h>
 
-#include "label.h"
 #include "pluginconfig.h"
 
 #include <translation.h>
diff --git a/plugingui/drumkitframecontent.h b/plugingui/drumkitframecontent.h
index 921927d..3661d8e 100644
--- a/plugingui/drumkitframecontent.h
+++ b/plugingui/drumkitframecontent.h
@@ -28,11 +28,12 @@
 
 #include <settings.h>
 
-#include "button.h"
-#include "label.h"
-#include "lineedit.h"
-#include "progressbar.h"
-#include "widget.h"
+#include <dggui/button.h>
+#include <dggui/label.h>
+#include <dggui/lineedit.h>
+#include <dggui/progressbar.h>
+#include <dggui/widget.h>
+
 #include "filebrowser.h"
 
 namespace GUI
diff --git a/plugingui/drumkittab.cc b/plugingui/drumkittab.cc
index 8d85f1e..46c448e 100644
--- a/plugingui/drumkittab.cc
+++ b/plugingui/drumkittab.cc
@@ -31,7 +31,9 @@
 #include <sstream>
 
 #include "cpp11fix.h" // required for c++11
-#include "painter.h"
+
+#include <dggui/painter.h>
+
 #include "settings.h"
 
 #include <dgxmlparser.h>
diff --git a/plugingui/drumkittab.h b/plugingui/drumkittab.h
index a14a9c5..3243fba 100644
--- a/plugingui/drumkittab.h
+++ b/plugingui/drumkittab.h
@@ -32,9 +32,9 @@
 
 #include <grid.h>
 
-#include "image.h"
-#include "label.h"
-#include "widget.h"
+#include <dggui/image.h>
+#include <dggui/label.h>
+#include <dggui/widget.h>
 
 struct Settings;
 class SettingsNotifier;
diff --git a/plugingui/filebrowser.cc b/plugingui/filebrowser.cc
index 59daab4..9f322c8 100644
--- a/plugingui/filebrowser.cc
+++ b/plugingui/filebrowser.cc
@@ -26,8 +26,8 @@
  */
 #include "filebrowser.h"
 
-#include "painter.h"
-#include "button.h"
+#include <dggui/painter.h>
+#include <dggui/button.h>
 
 #include <sys/types.h>
 #include <dirent.h>
diff --git a/plugingui/filebrowser.h b/plugingui/filebrowser.h
index bc7adb3..53a058d 100644
--- a/plugingui/filebrowser.h
+++ b/plugingui/filebrowser.h
@@ -30,12 +30,12 @@
 #include <platform.h>
 #include <directory.h>
 
-#include "dialog.h"
-#include "button.h"
-#include "listbox.h"
-#include "lineedit.h"
-#include "label.h"
-#include "image.h"
+#include <dggui/dialog.h>
+#include <dggui/button.h>
+#include <dggui/listbox.h>
+#include <dggui/lineedit.h>
+#include <dggui/label.h>
+#include <dggui/image.h>
 
 namespace GUI
 {
diff --git a/plugingui/humaniservisualiser.cc b/plugingui/humaniservisualiser.cc
index 92da164..2a17197 100644
--- a/plugingui/humaniservisualiser.cc
+++ b/plugingui/humaniservisualiser.cc
@@ -26,7 +26,7 @@
  */
 #include "humaniservisualiser.h"
 
-#include "painter.h"
+#include <dggui/painter.h>
 
 #include <notifier.h>
 #include <settings.h>
diff --git a/plugingui/humaniservisualiser.h b/plugingui/humaniservisualiser.h
index 55e37d2..41179fa 100644
--- a/plugingui/humaniservisualiser.h
+++ b/plugingui/humaniservisualiser.h
@@ -26,9 +26,9 @@
  */
 #pragma once
 
-#include "widget.h"
-#include "texturedbox.h"
-#include "texture.h"
+#include <dggui/widget.h>
+#include <dggui/texturedbox.h>
+#include <dggui/texture.h>
 
 struct Settings;
 class SettingsNotifier;
diff --git a/plugingui/humanizerframecontent.cc b/plugingui/humanizerframecontent.cc
index 475f16d..a4f71e5 100644
--- a/plugingui/humanizerframecontent.cc
+++ b/plugingui/humanizerframecontent.cc
@@ -28,7 +28,7 @@
 
 #include <settings.h>
 
-#include "painter.h"
+#include <dggui/painter.h>
 
 namespace GUI
 {
diff --git a/plugingui/humanizerframecontent.h b/plugingui/humanizerframecontent.h
index 10ae0f3..ef60b8e 100644
--- a/plugingui/humanizerframecontent.h
+++ b/plugingui/humanizerframecontent.h
@@ -26,10 +26,11 @@
  */
 #pragma once
 
-#include "knob.h"
+#include <dggui/knob.h>
+#include <dggui/layout.h>
+#include <dggui/widget.h>
+
 #include "labeledcontrol.h"
-#include "layout.h"
-#include "widget.h"
 
 #include <translation.h>
 
diff --git a/plugingui/labeledcontrol.h b/plugingui/labeledcontrol.h
index 3cbae39..1972072 100644
--- a/plugingui/labeledcontrol.h
+++ b/plugingui/labeledcontrol.h
@@ -26,8 +26,8 @@
  */
 #pragma once
 
-#include "label.h"
-#include "widget.h"
+#include <dggui/label.h>
+#include <dggui/widget.h>
 
 #include <iomanip>
 #include <sstream>
diff --git a/plugingui/maintab.h b/plugingui/maintab.h
index 57aec72..74b970a 100644
--- a/plugingui/maintab.h
+++ b/plugingui/maintab.h
@@ -26,9 +26,10 @@
  */
 #pragma once
 
-#include "widget.h"
-#include "layout.h"
-#include "frame.h"
+#include <dggui/widget.h>
+#include <dggui/layout.h>
+#include <dggui/frame.h>
+
 #include "drumkitframecontent.h"
 #include "statusframecontent.h"
 #include "humanizerframecontent.h"
diff --git a/plugingui/mainwindow.cc b/plugingui/mainwindow.cc
index 932e8f3..ea79cb5 100644
--- a/plugingui/mainwindow.cc
+++ b/plugingui/mainwindow.cc
@@ -32,7 +32,7 @@
 
 #include <translation.h>
 
-#include "painter.h"
+#include <dggui/painter.h>
 
 namespace GUI
 {
diff --git a/plugingui/mainwindow.h b/plugingui/mainwindow.h
index 219f851..efacf07 100644
--- a/plugingui/mainwindow.h
+++ b/plugingui/mainwindow.h
@@ -28,12 +28,13 @@
 
 #include <settings.h>
 
+#include <dggui/image.h>
+#include <dggui/tabwidget.h>
+#include <dggui/texturedbox.h>
+#include <dggui/window.h>
+
 #include "abouttab.h"
 #include "drumkittab.h"
-#include "image.h"
-#include "tabwidget.h"
-#include "texturedbox.h"
-#include "window.h"
 #include "maintab.h"
 #include "pluginconfig.h"
 
diff --git a/plugingui/powerwidget.cc b/plugingui/powerwidget.cc
index 0a565e6..301f396 100644
--- a/plugingui/powerwidget.cc
+++ b/plugingui/powerwidget.cc
@@ -26,11 +26,11 @@
  */
 #include "powerwidget.h"
 
-#include "painter.h"
+#include <dggui/painter.h>
+#include <dggui/colour.h>
 
 #include <notifier.h>
 #include <settings.h>
-#include <colour.h>
 #include <powermap.h>
 
 #include <hugin.hpp>
diff --git a/plugingui/powerwidget.h b/plugingui/powerwidget.h
index c5c6665..8398f75 100644
--- a/plugingui/powerwidget.h
+++ b/plugingui/powerwidget.h
@@ -26,13 +26,14 @@
  */
 #pragma once
 
-#include <widget.h>
-#include <texturedbox.h>
-#include <texture.h>
-#include <knob.h>
-#include <checkbox.h>
-#include <label.h>
-#include <font.h>
+#include <dggui/widget.h>
+#include <dggui/texturedbox.h>
+#include <dggui/texture.h>
+#include <dggui/knob.h>
+#include <dggui/checkbox.h>
+#include <dggui/label.h>
+#include <dggui/font.h>
+
 #include <powermap.h>
 
 struct Settings;
diff --git a/plugingui/resamplingframecontent.h b/plugingui/resamplingframecontent.h
index 3efc62e..e66bec5 100644
--- a/plugingui/resamplingframecontent.h
+++ b/plugingui/resamplingframecontent.h
@@ -26,10 +26,10 @@
  */
 #pragma once
 
-#include "widget.h"
-#include "textedit.h"
-#include "knob.h"
-#include "label.h"
+#include <dggui/widget.h>
+#include <dggui/textedit.h>
+#include <dggui/knob.h>
+#include <dggui/label.h>
 
 class SettingsNotifier;
 struct Settings;
diff --git a/plugingui/sampleselectionframecontent.cc b/plugingui/sampleselectionframecontent.cc
index f0aa5e7..a647144 100644
--- a/plugingui/sampleselectionframecontent.cc
+++ b/plugingui/sampleselectionframecontent.cc
@@ -28,7 +28,7 @@
 
 #include <settings.h>
 
-#include "painter.h"
+#include <dggui/painter.h>
 
 namespace GUI
 {
diff --git a/plugingui/sampleselectionframecontent.h b/plugingui/sampleselectionframecontent.h
index f3636da..d56f545 100644
--- a/plugingui/sampleselectionframecontent.h
+++ b/plugingui/sampleselectionframecontent.h
@@ -26,10 +26,11 @@
  */
 #pragma once
 
-#include "knob.h"
+#include <dggui/knob.h>
+#include <dggui/layout.h>
+#include <dggui/widget.h>
+
 #include "labeledcontrol.h"
-#include "layout.h"
-#include "widget.h"
 
 #include <translation.h>
 
diff --git a/plugingui/statusframecontent.h b/plugingui/statusframecontent.h
index 998e87c..fdf6d05 100644
--- a/plugingui/statusframecontent.h
+++ b/plugingui/statusframecontent.h
@@ -27,8 +27,9 @@
 #pragma once
 
 #include "settings.h"
-#include "textedit.h"
-#include "widget.h"
+
+#include <dggui/textedit.h>
+#include <dggui/widget.h>
 
 class SettingsNotifier;
 
diff --git a/plugingui/testmain.cc b/plugingui/testmain.cc
index 3f73039..4b94083 100644
--- a/plugingui/testmain.cc
+++ b/plugingui/testmain.cc
@@ -31,10 +31,10 @@
 #include <settings.h>
 #include <config.h>
 
-#include "mainwindow.h"
-#include "window.h"
-#include "resource.h"
-#include "uitranslation.h"
+#include <dggui/window.h>
+#include <dggui/resource.h>
+#include <dggui/uitranslation.h>
+
 #include "mainwindow.h"
 
 int main()
diff --git a/plugingui/timingframecontent.cc b/plugingui/timingframecontent.cc
index ceaf5be..ffcd07e 100644
--- a/plugingui/timingframecontent.cc
+++ b/plugingui/timingframecontent.cc
@@ -29,7 +29,7 @@
 #include <cmath>
 #include <iostream>
 
-#include "painter.h"
+#include <dggui/painter.h>
 
 namespace GUI
 {
diff --git a/plugingui/timingframecontent.h b/plugingui/timingframecontent.h
index 3dde8c1..adecc01 100644
--- a/plugingui/timingframecontent.h
+++ b/plugingui/timingframecontent.h
@@ -26,11 +26,12 @@
  */
 #pragma once
 
-#include "knob.h"
-#include "label.h"
+#include <dggui/knob.h>
+#include <dggui/label.h>
+#include <dggui/layout.h>
+#include <dggui/widget.h>
+
 #include "labeledcontrol.h"
-#include "layout.h"
-#include "widget.h"
 
 #include <settings.h>
 
diff --git a/plugingui/visualizerframecontent.cc b/plugingui/visualizerframecontent.cc
index 7e5b298..d6ea2c2 100644
--- a/plugingui/visualizerframecontent.cc
+++ b/plugingui/visualizerframecontent.cc
@@ -29,7 +29,7 @@
 #include <cmath>
 #include <iostream>
 
-#include "painter.h"
+#include <dggui/painter.h>
 
 namespace GUI
 {
diff --git a/plugingui/visualizerframecontent.h b/plugingui/visualizerframecontent.h
index edf8f35..3012762 100644
--- a/plugingui/visualizerframecontent.h
+++ b/plugingui/visualizerframecontent.h
@@ -25,8 +25,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
 #pragma once
-#include "layout.h"
-#include "widget.h"
+
+#include <dggui/layout.h>
+#include <dggui/widget.h>
+
 #include "humaniservisualiser.h"
 
 #include <settings.h>
diff --git a/plugingui/voicelimitframecontent.h b/plugingui/voicelimitframecontent.h
index 8b08014..0fbc306 100644
--- a/plugingui/voicelimitframecontent.h
+++ b/plugingui/voicelimitframecontent.h
@@ -28,10 +28,11 @@
 
 #include <translation.h>
 
-#include "label.h"
-#include "knob.h"
+#include <dggui/label.h>
+#include <dggui/knob.h>
+#include <dggui/widget.h>
+
 #include "labeledcontrol.h"
-#include "widget.h"
 
 struct Settings;
 class SettingsNotifier;
diff --git a/test/Makefile.am b/test/Makefile.am
index c2c151d..add962a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -25,26 +25,31 @@ TESTS += lv2
 endif
 
 check_PROGRAMS = $(TESTS)
-resource_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"resource\" $(SNDFILE_CFLAGS) \
+resource_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"resource\" \
+	$(SNDFILE_CFLAGS) \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/plugingui \
+	-I$(top_srcdir)/ \
 	-I$(top_srcdir)/hugin
 resource_LDFLAGS = $(SNDFILE_LIBS)
 nodist_resource_SOURCES = \
 	$(top_builddir)/plugingui/resource_data.cc
 resource_SOURCES = \
-	$(top_srcdir)/plugingui/resource.cc \
+	$(top_srcdir)/dggui/resource.cc \
 	$(top_srcdir)/hugin/hugin.c \
 	$(top_srcdir)/src/random.cc \
 	uunit/uunit.cc \
 	drumkit_creator.cc \
 	resource_test.cc
 
-audiocache_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"audiocache\" \
+audiocache_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"audiocache\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/hugin -DDISABLE_HUGIN $(PTHREAD_CFLAGS) $(SNDFILE_CFLAGS)
+	-I$(top_srcdir)/hugin -DDISABLE_HUGIN \
+	$(PTHREAD_CFLAGS) \
+	$(SNDFILE_CFLAGS)
 audiocache_LDFLAGS = $(PTHREAD_LIBS) $(SNDFILE_LIBS)
 audiocache_SOURCES = \
 	$(top_srcdir)/src/audiocache.cc \
@@ -59,10 +64,13 @@ audiocache_SOURCES = \
 	drumkit_creator.cc \
 	audiocachetest.cc
 
-audiocachefile_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"audiocachefile\" \
+audiocachefile_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"audiocachefile\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/hugin -DDISABLE_HUGIN $(PTHREAD_CFLAGS) $(SNDFILE_CFLAGS)
+	-I$(top_srcdir)/hugin -DDISABLE_HUGIN \
+	$(PTHREAD_CFLAGS) \
+	$(SNDFILE_CFLAGS)
 audiocachefile_LDFLAGS = $(PTHREAD_LIBS) $(SNDFILE_LIBS)
 audiocachefile_SOURCES = \
 	$(top_srcdir)/src/audiocachefile.cc \
@@ -74,20 +82,25 @@ audiocachefile_SOURCES = \
 	drumkit_creator.cc \
 	audiocachefiletest.cc
 
-audiocacheidmanager_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"audiocacheidmanager\" \
+audiocacheidmanager_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"audiocacheidmanager\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/hugin -DDISABLE_HUGIN $(SNDFILE_CFLAGS)
+	-I$(top_srcdir)/hugin -DDISABLE_HUGIN \
+	$(SNDFILE_CFLAGS)
 audiocacheidmanager_LDFLAGS = $(SNDFILE_LIBS)
 audiocacheidmanager_SOURCES = \
 	$(top_srcdir)/src/audiocacheidmanager.cc \
 	uunit/uunit.cc \
 	audiocacheidmanagertest.cc
 
-audiocacheeventhandler_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"audiocacheeventhandler\" \
+audiocacheeventhandler_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"audiocacheeventhandler\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/hugin -DDISABLE_HUGIN $(PTHREAD_CFLAGS) $(SNDFILE_CFLAGS)
+	-I$(top_srcdir)/hugin -DDISABLE_HUGIN \
+	$(PTHREAD_CFLAGS) \
+	$(SNDFILE_CFLAGS)
 audiocacheeventhandler_LDFLAGS = $(PTHREAD_LIBS) $(SNDFILE_LIBS)
 audiocacheeventhandler_SOURCES = \
 	$(top_srcdir)/src/audiocacheeventhandler.cc \
@@ -98,10 +111,12 @@ audiocacheeventhandler_SOURCES = \
 	uunit/uunit.cc \
 	audiocacheeventhandlertest.cc
 
-enginetest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"enginetest\" \
+enginetest_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"enginetest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/hugin $(PTHREAD_CFLAGS) $(SNDFILE_CFLAGS)
+	-I$(top_srcdir)/hugin $(PTHREAD_CFLAGS) \
+	$(SNDFILE_CFLAGS)
 enginetest_LDFLAGS = $(PTHREAD_LIBS) $(SNDFILE_LIBS) \
 	 $(top_builddir)/src/libdg.la
 enginetest_SOURCES = \
@@ -110,20 +125,26 @@ enginetest_SOURCES = \
 	drumkit_creator.cc \
 	enginetest.cc
 
-paintertest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"paintertest\" \
+paintertest_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"paintertest\" \
 	$(DEBUG_FLAGS) \
-	-I$(top_srcdir)/src -I$(top_srcdir)/plugingui \
-	-I$(top_srcdir)/hugin $(PTHREAD_CFLAGS)
-paintertest_LDFLAGS = $(top_builddir)/plugingui/libdggui.la
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/ \
+	-I$(top_srcdir)/hugin \
+	$(PTHREAD_CFLAGS)
+paintertest_LDFLAGS = \
+	$(top_builddir)/dggui/libdggui.la
 paintertest_SOURCES = \
 	$(top_srcdir)/hugin/hugin.c \
 	uunit/uunit.cc \
-	paintertest.cc
+	paintertest.cc \
+	$(top_builddir)/plugingui/resource_data.cc
 
-lv2_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"lv2\" \
+lv2_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"lv2\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src \
-	 `pkg-config --cflags serd-0` `pkg-config --cflags lilv-0` \
+	`pkg-config --cflags serd-0` `pkg-config --cflags lilv-0` \
 	-DLV2_PATH=\"@LV2DIR@\" $(SNDFILE_CFLAGS)
 lv2_LDFLAGS = `pkg-config --libs serd-0` \
 	`pkg-config --libs lilv-0` -lcrypto \
@@ -135,9 +156,11 @@ lv2_SOURCES = \
 	lv2_test_host.cc \
 	lv2.cc
 
-configfile_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"configfile\" \
+configfile_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"configfile\" \
 	$(DEBUG_FLAGS) \
-	-I$(top_srcdir)/hugin -I$(top_srcdir)/src
+	-I$(top_srcdir)/hugin \
+	-I$(top_srcdir)/src
 configfile_LDFLAGS =
 configfile_SOURCES = \
 	$(top_srcdir)/src/configfile.cc \
@@ -146,7 +169,8 @@ configfile_SOURCES = \
 	uunit/uunit.cc \
 	configtest.cc
 
-randomtest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"randomtest\" \
+randomtest_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"randomtest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/hugin -DDISABLE_HUGIN
@@ -157,30 +181,42 @@ randomtest_SOURCES = \
 	uunit/uunit.cc \
 	randomtest.cc
 
-atomictest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"atomictest\" \
+atomictest_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"atomictest\" \
 	$(DEBUG_FLAGS) \
-	-I$(top_srcdir)/src -I$(top_srcdir)/hugin
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/hugin
 atomictest_LDFLAGS =
 atomictest_SOURCES = atomictest.cc uunit/uunit.cc
 
-syncedsettingstest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"syncedsettingstest\" \
+syncedsettingstest_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"syncedsettingstest\" \
 	$(DEBUG_FLAGS) \
-	-I$(top_srcdir)/src -I$(top_srcdir)/hugin
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/hugin
 syncedsettingstest_LDFLAGS =
 syncedsettingstest_SOURCES = syncedsettings.cc uunit/uunit.cc
 
-imagecachetest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"imagecachetest\" \
+imagecachetest_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"imagecachetest\" \
 	$(DEBUG_FLAGS) \
-	-I$(top_srcdir)/src -I$(top_srcdir)/plugingui  -I$(top_srcdir)/hugin
-imagecachetest_LDFLAGS = $(top_builddir)/plugingui/libdggui.la
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/ \
+	-I$(top_srcdir)/hugin
+imagecachetest_LDFLAGS = \
+	$(top_builddir)/dggui/libdggui.la \
+	$(top_builddir)/plugingui/libplugingui.la
 imagecachetest_SOURCES = \
 	$(top_srcdir)/hugin/hugin.c \
 	imagecachetest.cc \
 	uunit/uunit.cc
 
-semaphoretest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"semaphoretest\" \
+semaphoretest_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"semaphoretest\" \
 	$(DEBUG_FLAGS) \
-	-I$(top_srcdir)/src -I$(top_srcdir)/hugin $(PTHREAD_CFLAGS)
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/hugin \
+	$(PTHREAD_CFLAGS)
 semaphoretest_LDFLAGS = $(PTHREAD_LIBS)
 semaphoretest_SOURCES = \
 	$(top_srcdir)/hugin/hugin.c \
@@ -188,10 +224,12 @@ semaphoretest_SOURCES = \
 	semaphoretest.cc \
 	uunit/uunit.cc
 
-drumkitcreatortest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"drumkitcreatortest\" \
+drumkitcreatortest_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"drumkitcreatortest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/hugin -DDISABLE_HUGIN $(SNDFILE_CFLAGS)
+	-I$(top_srcdir)/hugin -DDISABLE_HUGIN \
+	$(SNDFILE_CFLAGS)
 drumkitcreatortest_CFLAGS = -DDISABLE_HUGIN
 drumkitcreatortest_LDFLAGS = $(SNDFILE_LIBS)
 drumkitcreatortest_SOURCES = \
@@ -200,7 +238,8 @@ drumkitcreatortest_SOURCES = \
 	drumkit_creator.cc \
 	drumkitcreatortest.cc
 
-bytesizeparsertest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"bytesizeparsertest\" \
+bytesizeparsertest_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"bytesizeparsertest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src
 bytesizeparsertest_LDFLAGS =
@@ -209,7 +248,8 @@ bytesizeparsertest_SOURCES = \
 	bytesizeparsertest.cc \
 	uunit/uunit.cc
 
-notifiertest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"notifiertest\" \
+notifiertest_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"notifiertest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src
 notifiertest_LDFLAGS =
@@ -217,9 +257,11 @@ notifiertest_SOURCES = \
 	notifiertest.cc \
 	uunit/uunit.cc
 
-dgxmlparsertest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"dgxmlparsertest\" \
+dgxmlparsertest_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"dgxmlparsertest\" \
 	$(DEBUG_FLAGS) \
-	-I$(top_srcdir)/src -I$(top_srcdir)/hugin \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/hugin \
 	-I$(top_srcdir)/pugixml/src
 dgxmlparsertest_LDFLAGS =
 dgxmlparsertest_SOURCES = \
@@ -230,7 +272,8 @@ dgxmlparsertest_SOURCES = \
 	scopedfile.cc \
 	uunit/uunit.cc
 
-domloadertest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"domloadertest\" \
+domloadertest_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"domloadertest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src
 domloadertest_LDFLAGS = \
@@ -241,9 +284,11 @@ domloadertest_SOURCES = \
 	scopedfile.cc \
 	uunit/uunit.cc
 
-configparsertest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"configparsertest\" \
+configparsertest_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"configparsertest\" \
 	$(DEBUG_FLAGS) \
-	-I$(top_srcdir)/src -I$(top_srcdir)/hugin \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/hugin \
 	-I$(top_srcdir)/pugixml/src
 configparsertest_LDFLAGS =
 configparsertest_SOURCES = \
@@ -253,9 +298,11 @@ configparsertest_SOURCES = \
 	configparsertest.cc \
 	uunit/uunit.cc
 
-midimapparsertest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"midimapparsertest\" \
+midimapparsertest_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"midimapparsertest\" \
 	$(DEBUG_FLAGS) \
-	-I$(top_srcdir)/src -I$(top_srcdir)/hugin \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/hugin \
 	-I$(top_srcdir)/pugixml/src
 midimapparsertest_LDFLAGS =
 midimapparsertest_SOURCES = \
@@ -266,7 +313,8 @@ midimapparsertest_SOURCES = \
 	midimapparsertest.cc \
 	uunit/uunit.cc
 
-eventsdstest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"eventsdstest\" \
+eventsdstest_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"eventsdstest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src
 eventsdstest_LDFLAGS =
@@ -275,7 +323,8 @@ eventsdstest_SOURCES = \
 	eventsdstest.cc \
 	uunit/uunit.cc
 
-powermaptest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"powermaptest\" \
+powermaptest_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"powermaptest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src
 powermaptest_LDFLAGS =
@@ -291,12 +340,12 @@ rcgen_verbose = $(rcgen_verbose_@AM_V@)
 rcgen_verbose_ = $(rcgen_verbose_@AM_DEFAULT_V@)
 rcgen_verbose_0 = @echo "  RCGEN    "$@;
 
-translationtest_resource_data.cc: $(top_builddir)/plugingui/rcgen $(RES)
-	$(rcgen_verbose)$(top_builddir)/plugingui/rcgen$(EXEEXT) -s $(top_srcdir)/test/ -o $@ $(RES)
+translationtest_resource_data.cc: $(top_builddir)/dggui/rcgen $(RES)
+	$(rcgen_verbose)$(top_builddir)/dggui/rcgen$(EXEEXT) -s $(top_srcdir)/test/ -o $@ $(RES)
 
-translationtest_CXXFLAGS = -I$(top_srcdir)/test/uunit \
-	-DOUTPUT=\"translationtest\" \
-	-I$(top_srcdir)/plugingui \
+translationtest_CXXFLAGS = \
+	-I$(top_srcdir)/test/uunit -DOUTPUT=\"translationtest\" \
+	-I$(top_srcdir)/ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/hugin \
 	-DMO_SRC=\"$(top_srcdir)/test/locale/da.mo\" \
@@ -306,9 +355,9 @@ nodist_translationtest_SOURCES = \
 	$(top_builddir)/test/translationtest_resource_data.cc
 translationtest_SOURCES = \
 	$(top_srcdir)/hugin/hugin.c \
-	$(top_srcdir)/plugingui/resource.cc \
+	$(top_srcdir)/dggui/resource.cc \
 	$(top_srcdir)/src/translation.cc \
-	$(top_srcdir)/plugingui/uitranslation.cc \
+	$(top_srcdir)/dggui/uitranslation.cc \
 	translationtest.cc \
 	uunit/uunit.cc
 
diff --git a/test/imagecachetest.cc b/test/imagecachetest.cc
index 5471afb..6fa08d4 100644
--- a/test/imagecachetest.cc
+++ b/test/imagecachetest.cc
@@ -26,10 +26,8 @@
  */
 #include <uunit.h>
 
-#include <cassert>
-
-#include <imagecache.h>
-#include <image.h>
+#include <dggui/imagecache.h>
+#include <dggui/image.h>
 
 class TestableImageCache
 	: public GUI::ImageCache
diff --git a/test/paintertest.cc b/test/paintertest.cc
index fb17a91..611693c 100644
--- a/test/paintertest.cc
+++ b/test/paintertest.cc
@@ -26,10 +26,10 @@
  */
 #include <uunit.h>
 
-#include "../plugingui/canvas.h"
-#include "../plugingui/painter.h"
-#include "../plugingui/image.h"
-#include "../plugingui/font.h"
+#include <dggui/canvas.h>
+#include <dggui/painter.h>
+#include <dggui/image.h>
+#include <dggui/font.h>
 
 class TestColour
 {
diff --git a/test/resource_test.cc b/test/resource_test.cc
index 1433dca..929544c 100644
--- a/test/resource_test.cc
+++ b/test/resource_test.cc
@@ -26,7 +26,7 @@
  */
 #include <uunit.h>
 
-#include "../plugingui/resource.h"
+#include "../dggui/resource.h"
 
 #include "drumkit_creator.h"
 
diff --git a/test/translationtest.cc b/test/translationtest.cc
index d99c623..7525881 100644
--- a/test/translationtest.cc
+++ b/test/translationtest.cc
@@ -29,7 +29,7 @@
 #include <locale>
 
 #include <translation.h>
-#include <uitranslation.h>
+#include <dggui/uitranslation.h>
 #include <stdlib.h>
 
 class TranslationTest
diff --git a/test/uitests/Makefile.am b/test/uitests/Makefile.am
index 8b1877e..a27a44b 100644
--- a/test/uitests/Makefile.am
+++ b/test/uitests/Makefile.am
@@ -2,11 +2,12 @@ noinst_PROGRAMS = resizetest tabwidgettest framewidgettest \
 	filebrowsertest benchmarktest powerwidgettest
 
 resizetest_LDADD = \
-	$(top_builddir)/plugingui/libdggui.la \
+	$(top_builddir)/dggui/libdggui.la \
+	$(top_builddir)/plugingui/libplugingui.la \
 	$(top_builddir)/src/libdg.la \
 	$(top_builddir)/src/libnls.la
 resizetest_CXXFLAGS = \
-	-I$(top_srcdir)/plugingui \
+	-I$(top_srcdir)/ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/hugin
 resizetest_SOURCES = \
@@ -14,11 +15,12 @@ resizetest_SOURCES = \
 	$(top_srcdir)/hugin/hugin.c
 
 tabwidgettest_LDADD = \
-	$(top_builddir)/plugingui/libdggui.la \
+	$(top_builddir)/dggui/libdggui.la \
+	$(top_builddir)/plugingui/libplugingui.la \
 	$(top_builddir)/src/libdg.la \
 	$(top_builddir)/src/libnls.la
 tabwidgettest_CXXFLAGS = \
-	-I$(top_srcdir)/plugingui \
+	-I$(top_srcdir)/ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/hugin
 tabwidgettest_SOURCES = \
@@ -26,11 +28,13 @@ tabwidgettest_SOURCES = \
 	$(top_srcdir)/hugin/hugin.c
 
 filebrowsertest_LDADD = \
-	$(top_builddir)/plugingui/libdggui.la \
+	$(top_builddir)/dggui/libdggui.la \
+	$(top_builddir)/plugingui/libplugingui.la \
 	$(top_builddir)/src/libdg.la \
 	$(top_builddir)/src/libnls.la
 filebrowsertest_CXXFLAGS = \
 	-I$(top_srcdir)/plugingui \
+	-I$(top_srcdir)/ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/hugin
 filebrowsertest_SOURCES = \
@@ -38,11 +42,12 @@ filebrowsertest_SOURCES = \
 	$(top_srcdir)/hugin/hugin.c
 
 framewidgettest_LDADD = \
-	$(top_builddir)/plugingui/libdggui.la \
+	$(top_builddir)/dggui/libdggui.la \
+	$(top_builddir)/plugingui/libplugingui.la \
 	$(top_builddir)/src/libdg.la \
 	$(top_builddir)/src/libnls.la
 framewidgettest_CXXFLAGS = \
-	-I$(top_srcdir)/plugingui \
+	-I$(top_srcdir)/ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/hugin
 framewidgettest_SOURCES = \
@@ -59,15 +64,15 @@ rcgen_verbose = $(rcgen_verbose_@AM_V@)
 rcgen_verbose_ = $(rcgen_verbose_@AM_DEFAULT_V@)
 rcgen_verbose_0 = @echo "  RCGEN    "$@;
 
-benchmarktest_resource_data.cc: $(top_builddir)/plugingui/rcgen $(RES)
-	$(rcgen_verbose)$(top_builddir)/plugingui/rcgen$(EXEEXT) -d $(top_srcdir)/test/uitests -o $@ $(RES)
+benchmarktest_resource_data.cc: $(top_builddir)/dggui/rcgen $(RES)
+	$(rcgen_verbose)$(top_builddir)/dggui/rcgen$(EXEEXT) -d $(top_srcdir)/test/uitests -o $@ $(RES)
 
 benchmarktest_LDADD = \
-	$(top_builddir)/plugingui/libdggui.la \
+	$(top_builddir)/dggui/libdggui.la \
 	$(top_builddir)/src/libdg.la \
 	$(top_builddir)/src/libnls.la
 benchmarktest_CXXFLAGS = \
-	-I$(top_srcdir)/plugingui \
+	-I$(top_srcdir)/ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/hugin
 nodist_benchmarktest_SOURCES = \
@@ -81,11 +86,13 @@ CLEANFILES = benchmarktest_resource_data.cc
 
 
 powerwidgettest_LDADD = \
-	$(top_builddir)/plugingui/libdggui.la \
+	$(top_builddir)/dggui/libdggui.la \
+	$(top_builddir)/plugingui/libplugingui.la \
 	$(top_builddir)/src/libdg.la \
 	$(top_builddir)/src/libnls.la
 powerwidgettest_CXXFLAGS = \
 	-I$(top_srcdir)/plugingui \
+	-I$(top_srcdir)/ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/hugin
 powerwidgettest_SOURCES = \
diff --git a/test/uitests/benchmarktest.cc b/test/uitests/benchmarktest.cc
index aaf3946..5566942 100644
--- a/test/uitests/benchmarktest.cc
+++ b/test/uitests/benchmarktest.cc
@@ -29,9 +29,9 @@
 #include <cstdint>
 #include <string>
 
-#include <image.h>
-#include <painter.h>
-#include <canvas.h>
+#include <dggui/image.h>
+#include <dggui/painter.h>
+#include <dggui/canvas.h>
 
 class TimedCanvas
 	: public GUI::Canvas
diff --git a/test/uitests/filebrowsertest.cc b/test/uitests/filebrowsertest.cc
index 5f78921..7c309d9 100644
--- a/test/uitests/filebrowsertest.cc
+++ b/test/uitests/filebrowsertest.cc
@@ -29,9 +29,10 @@
 #include <thread>
 
 #include <hugin.hpp>
-#include <window.h>
-#include <button.h>
-#include <label.h>
+
+#include <dggui/window.h>
+#include <dggui/button.h>
+#include <dggui/label.h>
 #include <filebrowser.h>
 
 class TestWindow
diff --git a/test/uitests/framewidgettest.cc b/test/uitests/framewidgettest.cc
index a2a24db..4f0e0fd 100644
--- a/test/uitests/framewidgettest.cc
+++ b/test/uitests/framewidgettest.cc
@@ -28,14 +28,15 @@
 #include <chrono>
 #include <thread>
 
-#include <button.h>
-#include <checkbox.h>
-#include <frame.h>
 #include <hugin.hpp>
-#include <label.h>
-#include <layout.h>
-#include <window.h>
-#include <painter.h>
+
+#include <dggui/button.h>
+#include <dggui/checkbox.h>
+#include <dggui/frame.h>
+#include <dggui/label.h>
+#include <dggui/layout.h>
+#include <dggui/window.h>
+#include <dggui/painter.h>
 
 // TODO: fix segfault on close
 
diff --git a/test/uitests/powerwidgettest.cc b/test/uitests/powerwidgettest.cc
index 9ab0458..41aff67 100644
--- a/test/uitests/powerwidgettest.cc
+++ b/test/uitests/powerwidgettest.cc
@@ -28,15 +28,18 @@
 #include <chrono>
 #include <thread>
 
-#include <button.h>
-#include <checkbox.h>
-#include <frame.h>
 #include <hugin.hpp>
-#include <label.h>
-#include <layout.h>
-#include <window.h>
-#include <painter.h>
+
+#include <dggui/button.h>
+#include <dggui/checkbox.h>
+#include <dggui/frame.h>
+#include <dggui/label.h>
+#include <dggui/layout.h>
+#include <dggui/window.h>
+#include <dggui/painter.h>
+
 #include <settings.h>
+
 #include <powerwidget.h>
 
 class TestWindow
diff --git a/test/uitests/resizetest.cc b/test/uitests/resizetest.cc
index 8facc61..28439d1 100644
--- a/test/uitests/resizetest.cc
+++ b/test/uitests/resizetest.cc
@@ -29,9 +29,10 @@
 #include <thread>
 
 #include <hugin.hpp>
-#include <window.h>
-#include <font.h>
-#include <painter.h>
+
+#include <dggui/window.h>
+#include <dggui/font.h>
+#include <dggui/painter.h>
 
 class TestWindow
 	: public GUI::Window
diff --git a/test/uitests/tabwidgettest.cc b/test/uitests/tabwidgettest.cc
index 722dc02..36a69cc 100644
--- a/test/uitests/tabwidgettest.cc
+++ b/test/uitests/tabwidgettest.cc
@@ -29,12 +29,13 @@
 #include <thread>
 
 #include <hugin.hpp>
-#include <window.h>
-#include <tabwidget.h>
-#include <label.h>
-#include <layout.h>
-#include <button.h>
-#include <painter.h>
+
+#include <dggui/window.h>
+#include <dggui/tabwidget.h>
+#include <dggui/label.h>
+#include <dggui/layout.h>
+#include <dggui/button.h>
+#include <dggui/painter.h>
 
 class Widget1
 	: public GUI::Widget