diff --git a/profile-widget/divepixmapitem.cpp b/profile-widget/divepixmapitem.cpp
index 7b0d4993e..698172cc6 100644
--- a/profile-widget/divepixmapitem.cpp
+++ b/profile-widget/divepixmapitem.cpp
@@ -1,6 +1,6 @@
 #include "divepixmapitem.h"
 #include "animationfunctions.h"
-#include "divepicturemodel.h"
+#include "qt-models/divepicturemodel.h"
 #include "pref.h"
 #ifndef SUBSURFACE_MOBILE
 #include "preferences/preferencesdialog.h"
diff --git a/profile-widget/diveprofileitem.cpp b/profile-widget/diveprofileitem.cpp
index 4262326d7..93c954fd4 100644
--- a/profile-widget/diveprofileitem.cpp
+++ b/profile-widget/diveprofileitem.cpp
@@ -8,7 +8,7 @@
 #ifndef SUBSURFACE_MOBILE
 #include "preferences/preferencesdialog.h"
 #endif
-#include "diveplannermodel.h"
+#include "qt-models/diveplannermodel.h"
 #include "helpers.h"
 #include <subsurface-qt/SettingsObjectWrapper.h>
 #include "libdivecomputer/parser.h"
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp
index 0d6e38588..38276b235 100644
--- a/profile-widget/profilewidget2.cpp
+++ b/profile-widget/profilewidget2.cpp
@@ -1,5 +1,5 @@
 #include "profilewidget2.h"
-#include "diveplotdatamodel.h"
+#include "qt-models/diveplotdatamodel.h"
 #include "helpers.h"
 #include "profile.h"
 #include "diveeventitem.h"
@@ -10,15 +10,15 @@
 #include "ruleritem.h"
 #include "tankitem.h"
 #include "pref.h"
-#include "divepicturewidget.h"
-#include "diveplannermodel.h"
-#include "models.h"
-#include "divepicturemodel.h"
+#include "qt-models/diveplannermodel.h"
+#include "qt-models/models.h"
+#include "qt-models/divepicturemodel.h"
 #include "divelist.h"
 #include <subsurface-qt/SettingsObjectWrapper.h>
 #ifndef SUBSURFACE_MOBILE
 #include "diveplanner.h"
 #include "simplewidgets.h"
+#include "divepicturewidget.h"
 #endif
 
 #include <libdivecomputer/parser.h>
@@ -34,7 +34,9 @@
 #ifndef QT_NO_DEBUG
 #include <QTableView>
 #endif
+#ifndef SUBSURFACE_MOBILE
 #include "preferences/preferencesdialog.h"
+#endif
 #include <QtWidgets>
 
 // a couple of helpers we need
diff --git a/qt-models/divelocationmodel.h b/qt-models/divelocationmodel.h
index f3e9cac1f..185e0bc5f 100644
--- a/qt-models/divelocationmodel.h
+++ b/qt-models/divelocationmodel.h
@@ -4,7 +4,7 @@
 #include <QAbstractTableModel>
 #include <QStringListModel>
 #include <stdint.h>
-
+#include "units.h"
 #include "ssrfsortfilterproxymodel.h"
 
 class QLineEdit;
diff --git a/subsurface-core/configuredivecomputerthreads.cpp b/subsurface-core/configuredivecomputerthreads.cpp
index 53a8aa7f1..0b6487c96 100644
--- a/subsurface-core/configuredivecomputerthreads.cpp
+++ b/subsurface-core/configuredivecomputerthreads.cpp
@@ -1,6 +1,7 @@
 #include "configuredivecomputerthreads.h"
 #include "libdivecomputer/hw.h"
 #include "libdivecomputer.h"
+#include <libdivecomputer/version.h>
 
 #define OSTC3_GAS1			0x10
 #define OSTC3_GAS2			0x11
diff --git a/subsurface-core/file.c b/subsurface-core/file.c
index 3f6dd6dbb..3bac96ea0 100644
--- a/subsurface-core/file.c
+++ b/subsurface-core/file.c
@@ -923,13 +923,14 @@ int parse_csv_file(const char *filename, char **params, int pnr, const char *csv
 	 * input file added as last parameter.
 	 */
 
+#ifndef SUBSURFACE_MOBILE
 	if (verbose >= 2) {
 		fprintf(stderr, "(echo '<csv>'; cat %s;echo '</csv>') | xsltproc ", filename);
 		for (i=0; params[i]; i+=2)
 			fprintf(stderr, "--stringparam %s %s ", params[i], params[i+1]);
 		fprintf(stderr, "%s/xslt/csv2xml.xslt -\n", SUBSURFACE_SOURCE);
 	}
-
+#endif
 	ret = parse_xml_buffer(filename, mem.buffer, mem.size, &dive_table, (const char **)params);
 
 	free(mem.buffer);
diff --git a/subsurface-core/libdivecomputer.c b/subsurface-core/libdivecomputer.c
index 39908847b..6cfcf015d 100644
--- a/subsurface-core/libdivecomputer.c
+++ b/subsurface-core/libdivecomputer.c
@@ -11,7 +11,7 @@
 #include "libdivecomputer.h"
 #include <libdivecomputer/uwatec.h>
 #include <libdivecomputer/hw.h>
-
+#include <libdivecomputer/version.h>
 
 /* Christ. Libdivecomputer has the worst configuration system ever. */
 #ifdef HW_FROG_H
diff --git a/subsurface-core/libdivecomputer.h b/subsurface-core/libdivecomputer.h
index f52f6959a..99f1c2490 100644
--- a/subsurface-core/libdivecomputer.h
+++ b/subsurface-core/libdivecomputer.h
@@ -7,7 +7,9 @@
 #ifdef DC_VERSION /* prevent a warning with wingdi.h */
 #undef DC_VERSION
 #endif
+#ifdef HAVE_LIBDIVECOMPUTER
 #include <libdivecomputer/version.h>
+#endif
 #include <libdivecomputer/device.h>
 #include <libdivecomputer/parser.h>
 
diff --git a/subsurface-core/subsurfacestartup.c b/subsurface-core/subsurfacestartup.c
index c39c89c17..864134724 100644
--- a/subsurface-core/subsurfacestartup.c
+++ b/subsurface-core/subsurfacestartup.c
@@ -5,6 +5,7 @@
 #include "gettext.h"
 #include "qthelperfromc.h"
 #include "git-access.h"
+#include "libdivecomputer/version.h"
 
 struct preferences prefs, informational_prefs;
 struct preferences default_prefs = {