diff --git a/desktop-widgets/maintab.ui b/desktop-widgets/maintab.ui
index 964593b38..bfd67bf40 100644
--- a/desktop-widgets/maintab.ui
+++ b/desktop-widgets/maintab.ui
@@ -1223,7 +1223,7 @@
   <customwidget>
    <class>TableView</class>
    <extends>QWidget</extends>
-   <header>desktop-widgets/desktop-widget/tableview.h</header>
+   <header>desktop-widgets/tableview.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
diff --git a/desktop-widgets/printer.cpp b/desktop-widgets/printer.cpp
index 33ee71b55..eea304347 100644
--- a/desktop-widgets/printer.cpp
+++ b/desktop-widgets/printer.cpp
@@ -1,7 +1,7 @@
 #include "printer.h"
 #include "templatelayout.h"
-#include "statistics.h"
-#include "helpers.h"
+#include "core/statistics.h"
+#include "core/helpers.h"
 
 #include <algorithm>
 #include <QtWebKitWidgets>
diff --git a/desktop-widgets/printoptions.cpp b/desktop-widgets/printoptions.cpp
index 75d6ad8c4..e7b5f5a69 100644
--- a/desktop-widgets/printoptions.cpp
+++ b/desktop-widgets/printoptions.cpp
@@ -1,6 +1,6 @@
 #include "printoptions.h"
 #include "templateedit.h"
-#include "helpers.h"
+#include "core/helpers.h"
 
 #include <QDebug>
 #include <QFileDialog>
diff --git a/desktop-widgets/templatelayout.cpp b/desktop-widgets/templatelayout.cpp
index fd0a44c75..3bd9f1fa8 100644
--- a/desktop-widgets/templatelayout.cpp
+++ b/desktop-widgets/templatelayout.cpp
@@ -1,8 +1,8 @@
 #include <string>
 
 #include "templatelayout.h"
-#include "helpers.h"
-#include "display.h"
+#include "core/helpers.h"
+#include "core/display.h"
 
 QList<QString> grantlee_templates, grantlee_statistics_templates;
 
diff --git a/desktop-widgets/templatelayout.h b/desktop-widgets/templatelayout.h
index fc77a5079..195441fcd 100644
--- a/desktop-widgets/templatelayout.h
+++ b/desktop-widgets/templatelayout.h
@@ -4,9 +4,9 @@
 #include <grantlee_templates.h>
 #include "mainwindow.h"
 #include "printoptions.h"
-#include "statistics.h"
-#include "qthelper.h"
-#include "helpers.h"
+#include "core/statistics.h"
+#include "core/qthelper.h"
+#include "core/helpers.h"
 #include "core/subsurface-qt/DiveObjectHelper.h"
 
 int getTotalWork(print_options *printOptions);