diff --git a/core/subsurfacestartup.c b/core/subsurfacestartup.c
index 500e91857..1f9518136 100644
--- a/core/subsurfacestartup.c
+++ b/core/subsurfacestartup.c
@@ -7,7 +7,7 @@
 #include "git-access.h"
 #include "libdivecomputer/version.h"
 
-struct preferences prefs, informational_prefs, git_prefs;
+struct preferences prefs, git_prefs;
 struct preferences default_prefs = {
 	.cloud_base_url = "https://cloud.subsurface-divelog.org/",
 #if defined(SUBSURFACE_MOBILE)
diff --git a/export-html.cpp b/export-html.cpp
index e030cb6c5..53b3a2791 100644
--- a/export-html.cpp
+++ b/export-html.cpp
@@ -2,18 +2,19 @@
 
 #include <QString>
 #include <QCommandLineParser>
+#include <QApplication>
 #include <QDebug>
 
-#include "qt-gui.h"
-#include "qthelper.h"
-#include "dive.h"
-#include "save-html.h"
-#include "stdio.h"
+#include "core/qt-gui.h"
+#include "core/qthelper.h"
+#include "core/dive.h"
+#include "core/save-html.h"
+#include <stdio.h>
 #include "git2.h"
-#include "subsurfacestartup.h"
-#include "divelogexportlogic.h"
-#include "windowtitleupdate.h"
-#include "statistics.h"
+#include "core/subsurfacestartup.h"
+#include "core/divelogexportlogic.h"
+#include "core/windowtitleupdate.h"
+#include "core/statistics.h"
 
 int main(int argc, char **argv)
 {
@@ -51,8 +52,8 @@ int main(int argc, char **argv)
 	// this should have set up the informational preferences - let's grab
 	// the units from there
 
-	prefs.unit_system = informational_prefs.unit_system;
-	prefs.units = informational_prefs.units;
+	prefs.unit_system = git_prefs.unit_system;
+	prefs.units = git_prefs.units;
 
 	// populate the statistics
 	struct dive *d = get_dive(0);