Merge tag 'upstream/0.23.5'

Upstream version 0.23.5

44 files changed, 3148 insertions, 0 deletions

diff --git a/src/.unitize/_CameraInternals.c b/src/.unitize/_CameraInternals.c
new file mode 100644
index 0000000..4b84aa5
--- /dev/null
+++ b/src/.unitize/_CameraInternals.c
@@ -0,0 +1,115 @@
+/* _CameraInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _CameraInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint camera__unit_init_count;
+gint camera__unit_init_count = 0;
+
+void camera_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void sidebar_init_entry (GError** error);
+void camera_init (GError** error);
+void camera_terminate_entry (void);
+void camera_terminate (void);
+void unit_terminate_entry (void);
+void sidebar_terminate_entry (void);
+
+
+void camera_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+	_tmp0_ = camera__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+	camera__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+		return;
+#line 42 "_CameraInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+		return;
+#line 52 "_CameraInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+	sidebar_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+		return;
+#line 62 "_CameraInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+	camera_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+		return;
+#line 72 "_CameraInternals.c"
+	}
+}
+
+
+void camera_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+	_tmp1_ = camera__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+		_tmp0_ = TRUE;
+#line 86 "_CameraInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+		_tmp2_ = camera__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+		camera__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+		_tmp3_ = camera__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 98 "_CameraInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+		return;
+#line 104 "_CameraInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+	camera_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+	unit_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
+	sidebar_terminate_entry ();
+#line 112 "_CameraInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_CameraInternals.vala b/src/.unitize/_CameraInternals.vala
new file mode 100644
index 0000000..68d37ca
--- /dev/null
+++ b/src/.unitize/_CameraInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Camera {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry(); Sidebar.init_entry();
+
+    Camera.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    Camera.terminate();
+
+    Unit.terminate_entry(); Sidebar.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_ConfigInternals.c b/src/.unitize/_ConfigInternals.c
new file mode 100644
index 0000000..d7eb0e4
--- /dev/null
+++ b/src/.unitize/_ConfigInternals.c
@@ -0,0 +1,101 @@
+/* _ConfigInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _ConfigInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint config__unit_init_count;
+gint config__unit_init_count = 0;
+
+void config_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void config_init (GError** error);
+void config_terminate_entry (void);
+void config_terminate (void);
+void unit_terminate_entry (void);
+
+
+void config_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+	_tmp0_ = config__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+	config__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+		return;
+#line 40 "_ConfigInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+		return;
+#line 50 "_ConfigInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+	config_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+		return;
+#line 60 "_ConfigInternals.c"
+	}
+}
+
+
+void config_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+	_tmp1_ = config__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+		_tmp0_ = TRUE;
+#line 74 "_ConfigInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+		_tmp2_ = config__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+		config__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+		_tmp3_ = config__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 86 "_ConfigInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+		return;
+#line 92 "_ConfigInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+	config_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_ConfigInternals.vala"
+	unit_terminate_entry ();
+#line 98 "_ConfigInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_ConfigInternals.vala b/src/.unitize/_ConfigInternals.vala
new file mode 100644
index 0000000..90a46a0
--- /dev/null
+++ b/src/.unitize/_ConfigInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Config {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry();
+
+    Config.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    Config.terminate();
+
+    Unit.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_CoreInternals.c b/src/.unitize/_CoreInternals.c
new file mode 100644
index 0000000..f95207a
--- /dev/null
+++ b/src/.unitize/_CoreInternals.c
@@ -0,0 +1,101 @@
+/* _CoreInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _CoreInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint core__unit_init_count;
+gint core__unit_init_count = 0;
+
+void core_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void core_init (GError** error);
+void core_terminate_entry (void);
+void core_terminate (void);
+void unit_terminate_entry (void);
+
+
+void core_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+	_tmp0_ = core__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+	core__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+		return;
+#line 40 "_CoreInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+		return;
+#line 50 "_CoreInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+	core_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+		return;
+#line 60 "_CoreInternals.c"
+	}
+}
+
+
+void core_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+	_tmp1_ = core__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+		_tmp0_ = TRUE;
+#line 74 "_CoreInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+		_tmp2_ = core__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+		core__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+		_tmp3_ = core__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 86 "_CoreInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+		return;
+#line 92 "_CoreInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+	core_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_CoreInternals.vala"
+	unit_terminate_entry ();
+#line 98 "_CoreInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_CoreInternals.vala b/src/.unitize/_CoreInternals.vala
new file mode 100644
index 0000000..b581845
--- /dev/null
+++ b/src/.unitize/_CoreInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Core {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry();
+
+    Core.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    Core.terminate();
+
+    Unit.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_DataImportsInternals.c b/src/.unitize/_DataImportsInternals.c
new file mode 100644
index 0000000..2d2fc94
--- /dev/null
+++ b/src/.unitize/_DataImportsInternals.c
@@ -0,0 +1,101 @@
+/* _DataImportsInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _DataImportsInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint data_imports__unit_init_count;
+gint data_imports__unit_init_count = 0;
+
+void data_imports_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void data_imports_init (GError** error);
+void data_imports_terminate_entry (void);
+void data_imports_terminate (void);
+void unit_terminate_entry (void);
+
+
+void data_imports_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+	_tmp0_ = data_imports__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+	data_imports__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+		return;
+#line 40 "_DataImportsInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+		return;
+#line 50 "_DataImportsInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+	data_imports_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+		return;
+#line 60 "_DataImportsInternals.c"
+	}
+}
+
+
+void data_imports_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+	_tmp1_ = data_imports__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+		_tmp0_ = TRUE;
+#line 74 "_DataImportsInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+		_tmp2_ = data_imports__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+		data_imports__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+		_tmp3_ = data_imports__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 86 "_DataImportsInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+		return;
+#line 92 "_DataImportsInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+	data_imports_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_DataImportsInternals.vala"
+	unit_terminate_entry ();
+#line 98 "_DataImportsInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_DataImportsInternals.vala b/src/.unitize/_DataImportsInternals.vala
new file mode 100644
index 0000000..002b6a7
--- /dev/null
+++ b/src/.unitize/_DataImportsInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace DataImports {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry();
+
+    DataImports.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    DataImports.terminate();
+
+    Unit.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_DbInternals.c b/src/.unitize/_DbInternals.c
new file mode 100644
index 0000000..47e29a8
--- /dev/null
+++ b/src/.unitize/_DbInternals.c
@@ -0,0 +1,101 @@
+/* _DbInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _DbInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint db__unit_init_count;
+gint db__unit_init_count = 0;
+
+void db_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void db_init (GError** error);
+void db_terminate_entry (void);
+void db_terminate (void);
+void unit_terminate_entry (void);
+
+
+void db_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+	_tmp0_ = db__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+	db__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+		return;
+#line 40 "_DbInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+		return;
+#line 50 "_DbInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+	db_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+		return;
+#line 60 "_DbInternals.c"
+	}
+}
+
+
+void db_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+	_tmp1_ = db__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+		_tmp0_ = TRUE;
+#line 74 "_DbInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+		_tmp2_ = db__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+		db__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+		_tmp3_ = db__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 86 "_DbInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+		return;
+#line 92 "_DbInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+	db_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_DbInternals.vala"
+	unit_terminate_entry ();
+#line 98 "_DbInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_DbInternals.vala b/src/.unitize/_DbInternals.vala
new file mode 100644
index 0000000..a80bd57
--- /dev/null
+++ b/src/.unitize/_DbInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Db {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry();
+
+    Db.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    Db.terminate();
+
+    Unit.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_DirectInternals.c b/src/.unitize/_DirectInternals.c
new file mode 100644
index 0000000..2095fcb
--- /dev/null
+++ b/src/.unitize/_DirectInternals.c
@@ -0,0 +1,171 @@
+/* _DirectInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _DirectInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint direct__unit_init_count;
+gint direct__unit_init_count = 0;
+
+void direct_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void db_init_entry (GError** error);
+void util_init_entry (GError** error);
+void photos_init_entry (GError** error);
+void slideshow_init_entry (GError** error);
+void core_init_entry (GError** error);
+void direct_init (GError** error);
+void direct_terminate_entry (void);
+void direct_terminate (void);
+void unit_terminate_entry (void);
+void db_terminate_entry (void);
+void util_terminate_entry (void);
+void photos_terminate_entry (void);
+void slideshow_terminate_entry (void);
+void core_terminate_entry (void);
+
+
+void direct_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	_tmp0_ = direct__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	direct__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		return;
+#line 50 "_DirectInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		return;
+#line 60 "_DirectInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	db_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		return;
+#line 70 "_DirectInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	util_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		return;
+#line 80 "_DirectInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	photos_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		return;
+#line 90 "_DirectInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	slideshow_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		return;
+#line 100 "_DirectInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	core_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		return;
+#line 110 "_DirectInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	direct_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		return;
+#line 120 "_DirectInternals.c"
+	}
+}
+
+
+void direct_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	_tmp1_ = direct__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		_tmp0_ = TRUE;
+#line 134 "_DirectInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		_tmp2_ = direct__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		direct__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		_tmp3_ = direct__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 146 "_DirectInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+		return;
+#line 152 "_DirectInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	direct_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	unit_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	db_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	util_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	photos_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	slideshow_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
+	core_terminate_entry ();
+#line 168 "_DirectInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_DirectInternals.vala b/src/.unitize/_DirectInternals.vala
new file mode 100644
index 0000000..86dc65c
--- /dev/null
+++ b/src/.unitize/_DirectInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Direct {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry(); Db.init_entry(); Util.init_entry(); Photos.init_entry(); Slideshow.init_entry(); Core.init_entry();
+
+    Direct.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    Direct.terminate();
+
+    Unit.terminate_entry(); Db.terminate_entry(); Util.terminate_entry(); Photos.terminate_entry(); Slideshow.terminate_entry(); Core.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_Direct_unitize_entry.c b/src/.unitize/_Direct_unitize_entry.c
new file mode 100644
index 0000000..148e461
--- /dev/null
+++ b/src/.unitize/_Direct_unitize_entry.c
@@ -0,0 +1,46 @@
+/* _Direct_unitize_entry.c generated by valac 0.32.1, the Vala compiler
+ * generated from _Direct_unitize_entry.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+
+void direct_app_init (GError** error);
+void direct_init_entry (GError** error);
+void direct_app_terminate (void);
+void direct_terminate_entry (void);
+
+
+void direct_app_init (GError** error) {
+	GError * _inner_error_ = NULL;
+#line 12 "/home/jens/Source/shotwell/src/.unitize/_Direct_unitize_entry.vala"
+	direct_init_entry (&_inner_error_);
+#line 12 "/home/jens/Source/shotwell/src/.unitize/_Direct_unitize_entry.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 12 "/home/jens/Source/shotwell/src/.unitize/_Direct_unitize_entry.vala"
+		g_propagate_error (error, _inner_error_);
+#line 12 "/home/jens/Source/shotwell/src/.unitize/_Direct_unitize_entry.vala"
+		return;
+#line 35 "_Direct_unitize_entry.c"
+	}
+}
+
+
+void direct_app_terminate (void) {
+#line 16 "/home/jens/Source/shotwell/src/.unitize/_Direct_unitize_entry.vala"
+	direct_terminate_entry ();
+#line 43 "_Direct_unitize_entry.c"
+}
+
+
+
diff --git a/src/.unitize/_Direct_unitize_entry.vala b/src/.unitize/_Direct_unitize_entry.vala
new file mode 100644
index 0000000..4879efb
--- /dev/null
+++ b/src/.unitize/_Direct_unitize_entry.vala
@@ -0,0 +1,19 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Direct {
+
+public void app_init() throws Error {
+    Direct.init_entry();
+}
+
+public void app_terminate() {
+    Direct.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_EditingToolsInternals.c b/src/.unitize/_EditingToolsInternals.c
new file mode 100644
index 0000000..5f351af
--- /dev/null
+++ b/src/.unitize/_EditingToolsInternals.c
@@ -0,0 +1,101 @@
+/* _EditingToolsInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _EditingToolsInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint editing_tools__unit_init_count;
+gint editing_tools__unit_init_count = 0;
+
+void editing_tools_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void editing_tools_init (GError** error);
+void editing_tools_terminate_entry (void);
+void editing_tools_terminate (void);
+void unit_terminate_entry (void);
+
+
+void editing_tools_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+	_tmp0_ = editing_tools__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+	editing_tools__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+		return;
+#line 40 "_EditingToolsInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+		return;
+#line 50 "_EditingToolsInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+	editing_tools_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+		return;
+#line 60 "_EditingToolsInternals.c"
+	}
+}
+
+
+void editing_tools_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+	_tmp1_ = editing_tools__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+		_tmp0_ = TRUE;
+#line 74 "_EditingToolsInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+		_tmp2_ = editing_tools__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+		editing_tools__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+		_tmp3_ = editing_tools__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 86 "_EditingToolsInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+		return;
+#line 92 "_EditingToolsInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+	editing_tools_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
+	unit_terminate_entry ();
+#line 98 "_EditingToolsInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_EditingToolsInternals.vala b/src/.unitize/_EditingToolsInternals.vala
new file mode 100644
index 0000000..7b913f6
--- /dev/null
+++ b/src/.unitize/_EditingToolsInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace EditingTools {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry();
+
+    EditingTools.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    EditingTools.terminate();
+
+    Unit.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_EventsInternals.c b/src/.unitize/_EventsInternals.c
new file mode 100644
index 0000000..33088f7
--- /dev/null
+++ b/src/.unitize/_EventsInternals.c
@@ -0,0 +1,115 @@
+/* _EventsInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _EventsInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint events__unit_init_count;
+gint events__unit_init_count = 0;
+
+void events_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void sidebar_init_entry (GError** error);
+void events_init (GError** error);
+void events_terminate_entry (void);
+void events_terminate (void);
+void unit_terminate_entry (void);
+void sidebar_terminate_entry (void);
+
+
+void events_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+	_tmp0_ = events__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+	events__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+		return;
+#line 42 "_EventsInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+		return;
+#line 52 "_EventsInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+	sidebar_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+		return;
+#line 62 "_EventsInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+	events_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+		return;
+#line 72 "_EventsInternals.c"
+	}
+}
+
+
+void events_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+	_tmp1_ = events__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+		_tmp0_ = TRUE;
+#line 86 "_EventsInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+		_tmp2_ = events__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+		events__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+		_tmp3_ = events__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 98 "_EventsInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+		return;
+#line 104 "_EventsInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+	events_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+	unit_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_EventsInternals.vala"
+	sidebar_terminate_entry ();
+#line 112 "_EventsInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_EventsInternals.vala b/src/.unitize/_EventsInternals.vala
new file mode 100644
index 0000000..5d4f419
--- /dev/null
+++ b/src/.unitize/_EventsInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Events {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry(); Sidebar.init_entry();
+
+    Events.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    Events.terminate();
+
+    Unit.terminate_entry(); Sidebar.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_FoldersInternals.c b/src/.unitize/_FoldersInternals.c
new file mode 100644
index 0000000..1a3988e
--- /dev/null
+++ b/src/.unitize/_FoldersInternals.c
@@ -0,0 +1,129 @@
+/* _FoldersInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _FoldersInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint folders__unit_init_count;
+gint folders__unit_init_count = 0;
+
+void folders_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void sidebar_init_entry (GError** error);
+void photos_init_entry (GError** error);
+void folders_init (GError** error);
+void folders_terminate_entry (void);
+void folders_terminate (void);
+void unit_terminate_entry (void);
+void sidebar_terminate_entry (void);
+void photos_terminate_entry (void);
+
+
+void folders_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+	_tmp0_ = folders__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+	folders__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+		return;
+#line 44 "_FoldersInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+		return;
+#line 54 "_FoldersInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+	sidebar_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+		return;
+#line 64 "_FoldersInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+	photos_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+		return;
+#line 74 "_FoldersInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+	folders_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+		return;
+#line 84 "_FoldersInternals.c"
+	}
+}
+
+
+void folders_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+	_tmp1_ = folders__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+		_tmp0_ = TRUE;
+#line 98 "_FoldersInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+		_tmp2_ = folders__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+		folders__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+		_tmp3_ = folders__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 110 "_FoldersInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+		return;
+#line 116 "_FoldersInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+	folders_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+	unit_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+	sidebar_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
+	photos_terminate_entry ();
+#line 126 "_FoldersInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_FoldersInternals.vala b/src/.unitize/_FoldersInternals.vala
new file mode 100644
index 0000000..49bad90
--- /dev/null
+++ b/src/.unitize/_FoldersInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Folders {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry(); Sidebar.init_entry(); Photos.init_entry();
+
+    Folders.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    Folders.terminate();
+
+    Unit.terminate_entry(); Sidebar.terminate_entry(); Photos.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_LibraryInternals.c b/src/.unitize/_LibraryInternals.c
new file mode 100644
index 0000000..6d70073
--- /dev/null
+++ b/src/.unitize/_LibraryInternals.c
@@ -0,0 +1,311 @@
+/* _LibraryInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _LibraryInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint library__unit_init_count;
+gint library__unit_init_count = 0;
+
+void library_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void util_init_entry (GError** error);
+void threads_init_entry (GError** error);
+void db_init_entry (GError** error);
+void plugins_init_entry (GError** error);
+void slideshow_init_entry (GError** error);
+void photos_init_entry (GError** error);
+void publishing_init_entry (GError** error);
+void core_init_entry (GError** error);
+void sidebar_init_entry (GError** error);
+void events_init_entry (GError** error);
+void tags_init_entry (GError** error);
+void camera_init_entry (GError** error);
+void searches_init_entry (GError** error);
+void data_imports_init_entry (GError** error);
+void folders_init_entry (GError** error);
+void library_init (GError** error);
+void library_terminate_entry (void);
+void library_terminate (void);
+void unit_terminate_entry (void);
+void util_terminate_entry (void);
+void threads_terminate_entry (void);
+void db_terminate_entry (void);
+void plugins_terminate_entry (void);
+void slideshow_terminate_entry (void);
+void photos_terminate_entry (void);
+void publishing_terminate_entry (void);
+void core_terminate_entry (void);
+void sidebar_terminate_entry (void);
+void events_terminate_entry (void);
+void tags_terminate_entry (void);
+void camera_terminate_entry (void);
+void searches_terminate_entry (void);
+void data_imports_terminate_entry (void);
+void folders_terminate_entry (void);
+
+
+void library_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	_tmp0_ = library__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	library__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 70 "_LibraryInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 80 "_LibraryInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	util_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 90 "_LibraryInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	threads_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 100 "_LibraryInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	db_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 110 "_LibraryInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	plugins_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 120 "_LibraryInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	slideshow_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 130 "_LibraryInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	photos_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 140 "_LibraryInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	publishing_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 150 "_LibraryInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	core_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 160 "_LibraryInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	sidebar_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 170 "_LibraryInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	events_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 180 "_LibraryInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	tags_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 190 "_LibraryInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	camera_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 200 "_LibraryInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	searches_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 210 "_LibraryInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	data_imports_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 220 "_LibraryInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	folders_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 230 "_LibraryInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	library_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 240 "_LibraryInternals.c"
+	}
+}
+
+
+void library_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	_tmp1_ = library__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		_tmp0_ = TRUE;
+#line 254 "_LibraryInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		_tmp2_ = library__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		library__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		_tmp3_ = library__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 266 "_LibraryInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+		return;
+#line 272 "_LibraryInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	library_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	unit_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	util_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	threads_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	db_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	plugins_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	slideshow_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	photos_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	publishing_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	core_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	sidebar_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	events_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	tags_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	camera_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	searches_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	data_imports_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
+	folders_terminate_entry ();
+#line 308 "_LibraryInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_LibraryInternals.vala b/src/.unitize/_LibraryInternals.vala
new file mode 100644
index 0000000..1baa298
--- /dev/null
+++ b/src/.unitize/_LibraryInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Library {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry(); Util.init_entry(); Threads.init_entry(); Db.init_entry(); Plugins.init_entry(); Slideshow.init_entry(); Photos.init_entry(); Publishing.init_entry(); Core.init_entry(); Sidebar.init_entry(); Events.init_entry(); Tags.init_entry(); Camera.init_entry(); Searches.init_entry(); DataImports.init_entry(); Folders.init_entry();
+
+    Library.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    Library.terminate();
+
+    Unit.terminate_entry(); Util.terminate_entry(); Threads.terminate_entry(); Db.terminate_entry(); Plugins.terminate_entry(); Slideshow.terminate_entry(); Photos.terminate_entry(); Publishing.terminate_entry(); Core.terminate_entry(); Sidebar.terminate_entry(); Events.terminate_entry(); Tags.terminate_entry(); Camera.terminate_entry(); Searches.terminate_entry(); DataImports.terminate_entry(); Folders.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_Library_unitize_entry.c b/src/.unitize/_Library_unitize_entry.c
new file mode 100644
index 0000000..8e7246c
--- /dev/null
+++ b/src/.unitize/_Library_unitize_entry.c
@@ -0,0 +1,46 @@
+/* _Library_unitize_entry.c generated by valac 0.32.1, the Vala compiler
+ * generated from _Library_unitize_entry.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+
+void library_app_init (GError** error);
+void library_init_entry (GError** error);
+void library_app_terminate (void);
+void library_terminate_entry (void);
+
+
+void library_app_init (GError** error) {
+	GError * _inner_error_ = NULL;
+#line 12 "/home/jens/Source/shotwell/src/.unitize/_Library_unitize_entry.vala"
+	library_init_entry (&_inner_error_);
+#line 12 "/home/jens/Source/shotwell/src/.unitize/_Library_unitize_entry.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 12 "/home/jens/Source/shotwell/src/.unitize/_Library_unitize_entry.vala"
+		g_propagate_error (error, _inner_error_);
+#line 12 "/home/jens/Source/shotwell/src/.unitize/_Library_unitize_entry.vala"
+		return;
+#line 35 "_Library_unitize_entry.c"
+	}
+}
+
+
+void library_app_terminate (void) {
+#line 16 "/home/jens/Source/shotwell/src/.unitize/_Library_unitize_entry.vala"
+	library_terminate_entry ();
+#line 43 "_Library_unitize_entry.c"
+}
+
+
+
diff --git a/src/.unitize/_Library_unitize_entry.vala b/src/.unitize/_Library_unitize_entry.vala
new file mode 100644
index 0000000..2de3647
--- /dev/null
+++ b/src/.unitize/_Library_unitize_entry.vala
@@ -0,0 +1,19 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Library {
+
+public void app_init() throws Error {
+    Library.init_entry();
+}
+
+public void app_terminate() {
+    Library.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_PhotosInternals.c b/src/.unitize/_PhotosInternals.c
new file mode 100644
index 0000000..3710e7b
--- /dev/null
+++ b/src/.unitize/_PhotosInternals.c
@@ -0,0 +1,101 @@
+/* _PhotosInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _PhotosInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint photos__unit_init_count;
+gint photos__unit_init_count = 0;
+
+void photos_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void photos_init (GError** error);
+void photos_terminate_entry (void);
+void photos_terminate (void);
+void unit_terminate_entry (void);
+
+
+void photos_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+	_tmp0_ = photos__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+	photos__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+		return;
+#line 40 "_PhotosInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+		return;
+#line 50 "_PhotosInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+	photos_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+		return;
+#line 60 "_PhotosInternals.c"
+	}
+}
+
+
+void photos_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+	_tmp1_ = photos__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+		_tmp0_ = TRUE;
+#line 74 "_PhotosInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+		_tmp2_ = photos__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+		photos__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+		_tmp3_ = photos__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 86 "_PhotosInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+		return;
+#line 92 "_PhotosInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+	photos_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_PhotosInternals.vala"
+	unit_terminate_entry ();
+#line 98 "_PhotosInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_PhotosInternals.vala b/src/.unitize/_PhotosInternals.vala
new file mode 100644
index 0000000..b5d77b2
--- /dev/null
+++ b/src/.unitize/_PhotosInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Photos {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry();
+
+    Photos.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    Photos.terminate();
+
+    Unit.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_PluginsInternals.c b/src/.unitize/_PluginsInternals.c
new file mode 100644
index 0000000..9a9ee42
--- /dev/null
+++ b/src/.unitize/_PluginsInternals.c
@@ -0,0 +1,115 @@
+/* _PluginsInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _PluginsInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint plugins__unit_init_count;
+gint plugins__unit_init_count = 0;
+
+void plugins_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void util_init_entry (GError** error);
+void plugins_init (GError** error);
+void plugins_terminate_entry (void);
+void plugins_terminate (void);
+void unit_terminate_entry (void);
+void util_terminate_entry (void);
+
+
+void plugins_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	_tmp0_ = plugins__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	plugins__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		return;
+#line 42 "_PluginsInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		return;
+#line 52 "_PluginsInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	util_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		return;
+#line 62 "_PluginsInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	plugins_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		return;
+#line 72 "_PluginsInternals.c"
+	}
+}
+
+
+void plugins_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	_tmp1_ = plugins__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		_tmp0_ = TRUE;
+#line 86 "_PluginsInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		_tmp2_ = plugins__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		plugins__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		_tmp3_ = plugins__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 98 "_PluginsInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		return;
+#line 104 "_PluginsInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	plugins_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	unit_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	util_terminate_entry ();
+#line 112 "_PluginsInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_PluginsInternals.vala b/src/.unitize/_PluginsInternals.vala
new file mode 100644
index 0000000..97ffc2c
--- /dev/null
+++ b/src/.unitize/_PluginsInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Plugins {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry(); Util.init_entry();
+
+    Plugins.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    Plugins.terminate();
+
+    Unit.terminate_entry(); Util.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_PublishingInternals.c b/src/.unitize/_PublishingInternals.c
new file mode 100644
index 0000000..b1d0861
--- /dev/null
+++ b/src/.unitize/_PublishingInternals.c
@@ -0,0 +1,115 @@
+/* _PublishingInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _PublishingInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint publishing__unit_init_count;
+gint publishing__unit_init_count = 0;
+
+void publishing_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void plugins_init_entry (GError** error);
+void publishing_init (GError** error);
+void publishing_terminate_entry (void);
+void publishing_terminate (void);
+void unit_terminate_entry (void);
+void plugins_terminate_entry (void);
+
+
+void publishing_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+	_tmp0_ = publishing__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+	publishing__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+		return;
+#line 42 "_PublishingInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+		return;
+#line 52 "_PublishingInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+	plugins_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+		return;
+#line 62 "_PublishingInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+	publishing_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+		return;
+#line 72 "_PublishingInternals.c"
+	}
+}
+
+
+void publishing_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+	_tmp1_ = publishing__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+		_tmp0_ = TRUE;
+#line 86 "_PublishingInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+		_tmp2_ = publishing__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+		publishing__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+		_tmp3_ = publishing__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 98 "_PublishingInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+		return;
+#line 104 "_PublishingInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+	publishing_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+	unit_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_PublishingInternals.vala"
+	plugins_terminate_entry ();
+#line 112 "_PublishingInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_PublishingInternals.vala b/src/.unitize/_PublishingInternals.vala
new file mode 100644
index 0000000..1b39d37
--- /dev/null
+++ b/src/.unitize/_PublishingInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Publishing {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry(); Plugins.init_entry();
+
+    Publishing.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    Publishing.terminate();
+
+    Unit.terminate_entry(); Plugins.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_SearchesInternals.c b/src/.unitize/_SearchesInternals.c
new file mode 100644
index 0000000..7b0f7e8
--- /dev/null
+++ b/src/.unitize/_SearchesInternals.c
@@ -0,0 +1,101 @@
+/* _SearchesInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _SearchesInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint searches__unit_init_count;
+gint searches__unit_init_count = 0;
+
+void searches_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void searches_init (GError** error);
+void searches_terminate_entry (void);
+void searches_terminate (void);
+void unit_terminate_entry (void);
+
+
+void searches_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+	_tmp0_ = searches__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+	searches__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+		return;
+#line 40 "_SearchesInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+		return;
+#line 50 "_SearchesInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+	searches_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+		return;
+#line 60 "_SearchesInternals.c"
+	}
+}
+
+
+void searches_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+	_tmp1_ = searches__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+		_tmp0_ = TRUE;
+#line 74 "_SearchesInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+		_tmp2_ = searches__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+		searches__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+		_tmp3_ = searches__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 86 "_SearchesInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+		return;
+#line 92 "_SearchesInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+	searches_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_SearchesInternals.vala"
+	unit_terminate_entry ();
+#line 98 "_SearchesInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_SearchesInternals.vala b/src/.unitize/_SearchesInternals.vala
new file mode 100644
index 0000000..effb551
--- /dev/null
+++ b/src/.unitize/_SearchesInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Searches {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry();
+
+    Searches.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    Searches.terminate();
+
+    Unit.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_SidebarInternals.c b/src/.unitize/_SidebarInternals.c
new file mode 100644
index 0000000..f312282
--- /dev/null
+++ b/src/.unitize/_SidebarInternals.c
@@ -0,0 +1,101 @@
+/* _SidebarInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _SidebarInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint sidebar__unit_init_count;
+gint sidebar__unit_init_count = 0;
+
+void sidebar_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void sidebar_init (GError** error);
+void sidebar_terminate_entry (void);
+void sidebar_terminate (void);
+void unit_terminate_entry (void);
+
+
+void sidebar_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+	_tmp0_ = sidebar__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+	sidebar__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+		return;
+#line 40 "_SidebarInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+		return;
+#line 50 "_SidebarInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+	sidebar_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+		return;
+#line 60 "_SidebarInternals.c"
+	}
+}
+
+
+void sidebar_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+	_tmp1_ = sidebar__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+		_tmp0_ = TRUE;
+#line 74 "_SidebarInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+		_tmp2_ = sidebar__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+		sidebar__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+		_tmp3_ = sidebar__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 86 "_SidebarInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+		return;
+#line 92 "_SidebarInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+	sidebar_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_SidebarInternals.vala"
+	unit_terminate_entry ();
+#line 98 "_SidebarInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_SidebarInternals.vala b/src/.unitize/_SidebarInternals.vala
new file mode 100644
index 0000000..0940c43
--- /dev/null
+++ b/src/.unitize/_SidebarInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Sidebar {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry();
+
+    Sidebar.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    Sidebar.terminate();
+
+    Unit.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_SlideshowInternals.c b/src/.unitize/_SlideshowInternals.c
new file mode 100644
index 0000000..31b8124
--- /dev/null
+++ b/src/.unitize/_SlideshowInternals.c
@@ -0,0 +1,115 @@
+/* _SlideshowInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _SlideshowInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint slideshow__unit_init_count;
+gint slideshow__unit_init_count = 0;
+
+void slideshow_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void plugins_init_entry (GError** error);
+void slideshow_init (GError** error);
+void slideshow_terminate_entry (void);
+void slideshow_terminate (void);
+void unit_terminate_entry (void);
+void plugins_terminate_entry (void);
+
+
+void slideshow_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+	_tmp0_ = slideshow__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+	slideshow__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+		return;
+#line 42 "_SlideshowInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+		return;
+#line 52 "_SlideshowInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+	plugins_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+		return;
+#line 62 "_SlideshowInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+	slideshow_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+		return;
+#line 72 "_SlideshowInternals.c"
+	}
+}
+
+
+void slideshow_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+	_tmp1_ = slideshow__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+		_tmp0_ = TRUE;
+#line 86 "_SlideshowInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+		_tmp2_ = slideshow__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+		slideshow__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+		_tmp3_ = slideshow__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 98 "_SlideshowInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+		return;
+#line 104 "_SlideshowInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+	slideshow_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+	unit_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_SlideshowInternals.vala"
+	plugins_terminate_entry ();
+#line 112 "_SlideshowInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_SlideshowInternals.vala b/src/.unitize/_SlideshowInternals.vala
new file mode 100644
index 0000000..d6de981
--- /dev/null
+++ b/src/.unitize/_SlideshowInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Slideshow {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry(); Plugins.init_entry();
+
+    Slideshow.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    Slideshow.terminate();
+
+    Unit.terminate_entry(); Plugins.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_TagsInternals.c b/src/.unitize/_TagsInternals.c
new file mode 100644
index 0000000..599fb26
--- /dev/null
+++ b/src/.unitize/_TagsInternals.c
@@ -0,0 +1,115 @@
+/* _TagsInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _TagsInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint tags__unit_init_count;
+gint tags__unit_init_count = 0;
+
+void tags_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void sidebar_init_entry (GError** error);
+void tags_init (GError** error);
+void tags_terminate_entry (void);
+void tags_terminate (void);
+void unit_terminate_entry (void);
+void sidebar_terminate_entry (void);
+
+
+void tags_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+	_tmp0_ = tags__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+	tags__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+		return;
+#line 42 "_TagsInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+		return;
+#line 52 "_TagsInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+	sidebar_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+		return;
+#line 62 "_TagsInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+	tags_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+		return;
+#line 72 "_TagsInternals.c"
+	}
+}
+
+
+void tags_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+	_tmp1_ = tags__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+		_tmp0_ = TRUE;
+#line 86 "_TagsInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+		_tmp2_ = tags__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+		tags__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+		_tmp3_ = tags__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 98 "_TagsInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+		return;
+#line 104 "_TagsInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+	tags_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+	unit_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_TagsInternals.vala"
+	sidebar_terminate_entry ();
+#line 112 "_TagsInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_TagsInternals.vala b/src/.unitize/_TagsInternals.vala
new file mode 100644
index 0000000..84df7ab
--- /dev/null
+++ b/src/.unitize/_TagsInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Tags {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry(); Sidebar.init_entry();
+
+    Tags.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    Tags.terminate();
+
+    Unit.terminate_entry(); Sidebar.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_ThreadsInternals.c b/src/.unitize/_ThreadsInternals.c
new file mode 100644
index 0000000..69712a7
--- /dev/null
+++ b/src/.unitize/_ThreadsInternals.c
@@ -0,0 +1,101 @@
+/* _ThreadsInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _ThreadsInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint threads__unit_init_count;
+gint threads__unit_init_count = 0;
+
+void threads_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void threads_init (GError** error);
+void threads_terminate_entry (void);
+void threads_terminate (void);
+void unit_terminate_entry (void);
+
+
+void threads_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+	_tmp0_ = threads__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+	threads__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+		return;
+#line 40 "_ThreadsInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+		return;
+#line 50 "_ThreadsInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+	threads_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+		return;
+#line 60 "_ThreadsInternals.c"
+	}
+}
+
+
+void threads_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+	_tmp1_ = threads__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+		_tmp0_ = TRUE;
+#line 74 "_ThreadsInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+		_tmp2_ = threads__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+		threads__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+		_tmp3_ = threads__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 86 "_ThreadsInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+		return;
+#line 92 "_ThreadsInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+	threads_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_ThreadsInternals.vala"
+	unit_terminate_entry ();
+#line 98 "_ThreadsInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_ThreadsInternals.vala b/src/.unitize/_ThreadsInternals.vala
new file mode 100644
index 0000000..fddac3d
--- /dev/null
+++ b/src/.unitize/_ThreadsInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Threads {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry();
+
+    Threads.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    Threads.terminate();
+
+    Unit.terminate_entry();
+}
+
+}
diff --git a/src/.unitize/_UnitInternals.c b/src/.unitize/_UnitInternals.c
new file mode 100644
index 0000000..102107b
--- /dev/null
+++ b/src/.unitize/_UnitInternals.c
@@ -0,0 +1,87 @@
+/* _UnitInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _UnitInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint unit__unit_init_count;
+gint unit__unit_init_count = 0;
+
+void unit_init_entry (GError** error);
+void unit_init (GError** error);
+void unit_terminate_entry (void);
+void unit_terminate (void);
+
+
+void unit_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
+	_tmp0_ = unit__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
+	unit__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
+		return;
+#line 38 "_UnitInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
+	unit_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
+		return;
+#line 48 "_UnitInternals.c"
+	}
+}
+
+
+void unit_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
+	_tmp1_ = unit__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
+		_tmp0_ = TRUE;
+#line 62 "_UnitInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
+		_tmp2_ = unit__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
+		unit__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
+		_tmp3_ = unit__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 74 "_UnitInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
+		return;
+#line 80 "_UnitInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
+	unit_terminate ();
+#line 84 "_UnitInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_UnitInternals.vala b/src/.unitize/_UnitInternals.vala
new file mode 100644
index 0000000..01cd908
--- /dev/null
+++ b/src/.unitize/_UnitInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Unit {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+
+
+    Unit.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    Unit.terminate();
+
+
+}
+
+}
diff --git a/src/.unitize/_UtilInternals.c b/src/.unitize/_UtilInternals.c
new file mode 100644
index 0000000..ddfb022
--- /dev/null
+++ b/src/.unitize/_UtilInternals.c
@@ -0,0 +1,101 @@
+/* _UtilInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _UtilInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint util__unit_init_count;
+gint util__unit_init_count = 0;
+
+void util_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void util_init (GError** error);
+void util_terminate_entry (void);
+void util_terminate (void);
+void unit_terminate_entry (void);
+
+
+void util_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	_tmp0_ = util__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	util__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		return;
+#line 40 "_UtilInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		return;
+#line 50 "_UtilInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	util_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		return;
+#line 60 "_UtilInternals.c"
+	}
+}
+
+
+void util_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	_tmp1_ = util__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		_tmp0_ = TRUE;
+#line 74 "_UtilInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		_tmp2_ = util__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		util__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		_tmp3_ = util__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 86 "_UtilInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		return;
+#line 92 "_UtilInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	util_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	unit_terminate_entry ();
+#line 98 "_UtilInternals.c"
+}
+
+
+
diff --git a/src/.unitize/_UtilInternals.vala b/src/.unitize/_UtilInternals.vala
new file mode 100644
index 0000000..25b1ccb
--- /dev/null
+++ b/src/.unitize/_UtilInternals.vala
@@ -0,0 +1,31 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace Util {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+
+    Unit.init_entry();
+
+    Util.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+
+    Util.terminate();
+
+    Unit.terminate_entry();
+}
+
+}