diff --git a/app/codec/decoder.cpp b/app/codec/decoder.cpp
index fb2620718..e1f2b1390 100644
--- a/app/codec/decoder.cpp
+++ b/app/codec/decoder.cpp
@@ -25,11 +25,7 @@
 #include "codec/ffmpeg/ffmpegdecoder.h"
 #include "codec/planarfiledevice.h"
 #include "codec/oiio/oiiodecoder.h"
-#include "common/ffmpegutils.h"
-#include "common/filefunctions.h"
 #include "conformmanager.h"
-#include "node/project.h"
-#include "task/taskmanager.h"
 
 namespace olive
 {
diff --git a/app/codec/exportcodec.cpp b/app/codec/exportcodec.cpp
index bbc4c86b4..abf4ea076 100644
--- a/app/codec/exportcodec.cpp
+++ b/app/codec/exportcodec.cpp
@@ -19,8 +19,6 @@
 #include "exportcodec.h"
 
 extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavutil/pixdesc.h>
 }
 
 namespace olive
diff --git a/app/codec/ffmpeg/ffmpegdecoder.cpp b/app/codec/ffmpeg/ffmpegdecoder.cpp
index db322b385..462a17e7a 100644
--- a/app/codec/ffmpeg/ffmpegdecoder.cpp
+++ b/app/codec/ffmpeg/ffmpegdecoder.cpp
@@ -20,23 +20,16 @@
 
 extern "C" {
 #include <libavcodec/avcodec.h>
-#include <libavfilter/buffersink.h>
-#include <libavfilter/buffersrc.h>
 #include <libavformat/avformat.h>
-#include <libavutil/imgutils.h>
-#include <libavutil/opt.h>
-#include <libavutil/pixdesc.h>
 #include <libavutil/frame.h>
 }
 
-#include <OpenImageIO/imagebuf.h>
 #include <QDebug>
 #include <QFile>
 #include <QFileInfo>
 #include <QString>
 #include <QtMath>
 #include <QThread>
-#include <QtConcurrent/QtConcurrent>
 
 #include "codec/planarfiledevice.h"
 #include "common/ffmpegutils.h"
diff --git a/app/codec/oiio/oiiodecoder.cpp b/app/codec/oiio/oiiodecoder.cpp
index eaf756d6a..32d1f9cbe 100644
--- a/app/codec/oiio/oiiodecoder.cpp
+++ b/app/codec/oiio/oiiodecoder.cpp
@@ -23,10 +23,7 @@
 #include <QFileInfo>
 #include <QMessageBox>
 
-#include "common/define.h"
 #include "common/oiioutils.h"
-#include "config/config.h"
-#include "core.h"
 #include "render/renderer.h"
 
 namespace olive
diff --git a/app/config/config.cpp b/app/config/config.cpp
index 0ef8d4660..464ca7dee 100644
--- a/app/config/config.cpp
+++ b/app/config/config.cpp
@@ -33,6 +33,7 @@
 #include "timeline/timelinecommon.h"
 #include "ui/colorcoding.h"
 #include "ui/style/style.h"
+#include "widget/timelinewidget/tool/import.h"
 #include "window/mainwindow/mainwindow.h"
 
 namespace olive
diff --git a/app/core.cpp b/app/core.cpp
index 105e93da5..c7a991430 100644
--- a/app/core.cpp
+++ b/app/core.cpp
@@ -26,6 +26,7 @@
 #include <QHBoxLayout>
 #include <QInputDialog>
 #include <QMessageBox>
+#include <QStatusBar>
 #include <QStyleFactory>
 #include "window/mainwindow/mainwindowundo.h"
 #ifdef Q_OS_WINDOWS
@@ -71,9 +72,6 @@
 #include "ui/style/style.h"
 #include "undo/undostack.h"
 #include "widget/menu/menushared.h"
-#include "widget/taskview/taskviewitem.h"
-#include "widget/viewer/viewer.h"
-#include "window/mainwindow/mainstatusbar.h"
 #include "window/mainwindow/mainwindow.h"
 
 namespace olive
diff --git a/app/dialog/about/about.cpp b/app/dialog/about/about.cpp
index b54224719..c2f6d3c1d 100644
--- a/app/dialog/about/about.cpp
+++ b/app/dialog/about/about.cpp
@@ -23,7 +23,6 @@
 #include <QLabel>
 #include <QVBoxLayout>
 
-#include "common/qtutils.h"
 #include "config/config.h"
 #include "patreon.h"
 #include "scrollinglabel.h"
diff --git a/app/dialog/diskcache/diskcachedialog.cpp b/app/dialog/diskcache/diskcachedialog.cpp
index ac513ff59..f1d978874 100644
--- a/app/dialog/diskcache/diskcachedialog.cpp
+++ b/app/dialog/diskcache/diskcachedialog.cpp
@@ -23,8 +23,6 @@
 #include <QLabel>
 #include <QMessageBox>
 
-#include "config/config.h"
-#include "core.h"
 
 namespace olive
 {
diff --git a/app/dialog/export/exportaudiotab.cpp b/app/dialog/export/exportaudiotab.cpp
index f24342b79..2d7a81faf 100644
--- a/app/dialog/export/exportaudiotab.cpp
+++ b/app/dialog/export/exportaudiotab.cpp
@@ -21,7 +21,6 @@
 #include <QGridLayout>
 #include <QLabel>
 
-#include "core.h"
 
 namespace olive
 {
diff --git a/app/dialog/export/exportvideotab.cpp b/app/dialog/export/exportvideotab.cpp
index 8d5cdd805..942144db9 100644
--- a/app/dialog/export/exportvideotab.cpp
+++ b/app/dialog/export/exportvideotab.cpp
@@ -24,7 +24,6 @@
 #include <QLabel>
 #include <QPushButton>
 
-#include "core.h"
 #include "exportadvancedvideodialog.h"
 #include "node/color/colormanager/colormanager.h"
 
diff --git a/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp b/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp
index 5f843b9ab..4a74c5ea7 100644
--- a/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp
+++ b/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp
@@ -24,9 +24,7 @@
 #include <QLabel>
 #include <QMessageBox>
 
-#include "common/ocioutils.h"
-#include "core.h"
-#include "undo/undostack.h"
+#include "node/project.h"
 
 namespace olive
 {
diff --git a/app/dialog/preferences/tabs/preferencesappearancetab.cpp b/app/dialog/preferences/tabs/preferencesappearancetab.cpp
index 463ce8fa2..770fb9505 100644
--- a/app/dialog/preferences/tabs/preferencesappearancetab.cpp
+++ b/app/dialog/preferences/tabs/preferencesappearancetab.cpp
@@ -25,9 +25,6 @@
 #include <QLabel>
 
 #include "node/node.h"
-#include "widget/colorbutton/colorbutton.h"
-#include "widget/menu/menushared.h"
-#include "ui/colorcoding.h"
 
 namespace olive
 {
diff --git a/app/dialog/preferences/tabs/preferencesgeneraltab.cpp b/app/dialog/preferences/tabs/preferencesgeneraltab.cpp
index 867b5b798..a0f0ba33c 100644
--- a/app/dialog/preferences/tabs/preferencesgeneraltab.cpp
+++ b/app/dialog/preferences/tabs/preferencesgeneraltab.cpp
@@ -25,8 +25,6 @@
 
 #include "common/autoscroll.h"
 #include "core.h"
-#include "dialog/sequence/sequence.h"
-#include "node/project/sequence/sequence.h"
 
 namespace olive
 {
diff --git a/app/dialog/sequence/sequence.cpp b/app/dialog/sequence/sequence.cpp
index d90d6cc85..0793da8eb 100644
--- a/app/dialog/sequence/sequence.cpp
+++ b/app/dialog/sequence/sequence.cpp
@@ -29,7 +29,6 @@
 
 #include "config/config.h"
 #include "core.h"
-#include "common/channellayout.h"
 #include "common/qtutils.h"
 #include "undo/undostack.h"
 
diff --git a/app/dialog/sequence/sequencedialogparametertab.cpp b/app/dialog/sequence/sequencedialogparametertab.cpp
index 2b3018147..edaf18425 100644
--- a/app/dialog/sequence/sequencedialogparametertab.cpp
+++ b/app/dialog/sequence/sequencedialogparametertab.cpp
@@ -23,7 +23,6 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-#include "core.h"
 
 namespace olive
 {
diff --git a/app/dialog/sequence/sequencedialogpresettab.cpp b/app/dialog/sequence/sequencedialogpresettab.cpp
index 78911a600..dc26b8b98 100644
--- a/app/dialog/sequence/sequencedialogpresettab.cpp
+++ b/app/dialog/sequence/sequencedialogpresettab.cpp
@@ -27,7 +27,6 @@
 #include <QTreeWidgetItem>
 #include <QXmlStreamWriter>
 
-#include "common/filefunctions.h"
 #include "config/config.h"
 #include "render/videoparams.h"
 #include "ui/icons/icons.h"
diff --git a/app/dialog/task/task.cpp b/app/dialog/task/task.cpp
index d975bfa87..8f3df4ab6 100644
--- a/app/dialog/task/task.cpp
+++ b/app/dialog/task/task.cpp
@@ -18,7 +18,8 @@
 
 #include "task.h"
 
-#include <QtConcurrent/QtConcurrent>
+#include <QFutureWatcher>
+#include <QtConcurrent>
 
 namespace olive
 {
diff --git a/app/dialog/text/text.cpp b/app/dialog/text/text.cpp
index 0258359b4..dfd9c0e47 100644
--- a/app/dialog/text/text.cpp
+++ b/app/dialog/text/text.cpp
@@ -24,7 +24,6 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-#include "ui/icons/icons.h"
 
 namespace olive
 {
diff --git a/app/node/block/block.cpp b/app/node/block/block.cpp
index d67e485e7..73294a0e6 100644
--- a/app/node/block/block.cpp
+++ b/app/node/block/block.cpp
@@ -21,8 +21,6 @@
 #include <QDebug>
 
 #include "node/inputdragger.h"
-#include "node/output/track/track.h"
-#include "transition/transition.h"
 #include "widget/slider/rationalslider.h"
 
 namespace olive
diff --git a/app/node/block/clip/clip.cpp b/app/node/block/clip/clip.cpp
index f8f742d1b..d6ea1d261 100644
--- a/app/node/block/clip/clip.cpp
+++ b/app/node/block/clip/clip.cpp
@@ -20,9 +20,9 @@
 
 #include "config/config.h"
 #include "node/block/transition/transition.h"
-#include "node/project/sequence/sequence.h"
 #include "node/output/track/track.h"
 #include "node/output/viewer/viewer.h"
+#include "node/project/sequence/sequence.h"
 #include "widget/slider/floatslider.h"
 #include "widget/slider/rationalslider.h"
 
diff --git a/ext/core b/ext/core
index 0cf81e6e8..25e4152bb 160000
--- a/ext/core
+++ b/ext/core
@@ -1 +1 @@
-Subproject commit 0cf81e6e8759690f23d2b09811c71d0a55c9b33f
+Subproject commit 25e4152bb70a0f4e30b9249e4f4b31e7936dc84a
diff --git a/icon.png b/icon.png
new file mode 100644
index 000000000..393dea9fe
Binary files /dev/null and b/icon.png differ
diff --git a/icon.xcf b/icon.xcf
new file mode 100644
index 000000000..c953e0f70
Binary files /dev/null and b/icon.xcf differ