12 files changed, 22 insertions, 10 deletions
diff --git a/src-qt5/desktop-utils/lumina-fm/Browser.cpp b/src-qt5/desktop-utils/lumina-fm/Browser.cpp
index 72920757..5b84e2e7 100644
--- a/src-qt5/desktop-utils/lumina-fm/Browser.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/Browser.cpp
@@ -11,7 +11,7 @@
 #include <QtConcurrent>
 #include <QDebug>
 
-#include <LuminaUtils.h>
+#include <LUtils.h>
 
 Browser::Browser(QObject *parent) : QObject(parent){
   watcher = new QFileSystemWatcher(this);
diff --git a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp
index da651cca..8db13718 100644
--- a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp
@@ -10,7 +10,7 @@
 #include <QTimer>
 #include <QSettings>
 
-#include <LuminaUtils.h>
+#include <LUtils.h>
 #include <LuminaOS.h>
 
 BrowserWidget::BrowserWidget(QString objID, QWidget *parent) : QWidget(parent){
diff --git a/src-qt5/desktop-utils/lumina-fm/DirData.h b/src-qt5/desktop-utils/lumina-fm/DirData.h
index 546dd6c5..c887ed5c 100644
--- a/src-qt5/desktop-utils/lumina-fm/DirData.h
+++ b/src-qt5/desktop-utils/lumina-fm/DirData.h
@@ -16,7 +16,7 @@
 #include  <QDir>
 
 #include <LuminaXDG.h>
-#include <LuminaUtils.h>
+#include <LUtils.h>
 
 #define ZSNAPDIR QString("/.zfs/snapshot/")
 
diff --git a/src-qt5/desktop-utils/lumina-fm/FODialog.h b/src-qt5/desktop-utils/lumina-fm/FODialog.h
index a595b9f2..9b53a934 100644
--- a/src-qt5/desktop-utils/lumina-fm/FODialog.h
+++ b/src-qt5/desktop-utils/lumina-fm/FODialog.h
@@ -21,7 +21,7 @@
 
 // libLumina includes
 #include <LuminaXDG.h>
-#include <LuminaUtils.h>
+#include <LUtils.h>
 
 class FOWorker : public QObject{
 	Q_OBJECT
diff --git a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
index 128c4cd5..0744ac84 100644
--- a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
@@ -7,10 +7,13 @@
 #include "MainUI.h"
 #include "ui_MainUI.h"
 
+#include <QMenu>
 #include <QFileInfo>
 #include "gitCompat.h"
 #include "gitWizard.h"
 
+#include <LDesktopUtils.h>
+
 #define DEBUG 0
 
 MainUI::MainUI() : QMainWindow(), ui(new Ui::MainUI){
@@ -845,7 +848,7 @@ void MainUI::PasteFiles(QString dir, QStringList raw){
 void MainUI::FavoriteFiles(QStringList list){
   qDebug() << "Favorite Files:" << list;
   for(int i=0; i<list.length(); i++){
-    LUtils::addFavorite(list[i]);
+    LDesktopUtils::addFavorite(list[i]);
   }
   //Might want to make this a "toggle" instead of an add later on...
 }
diff --git a/src-qt5/desktop-utils/lumina-fm/OPWidget.h b/src-qt5/desktop-utils/lumina-fm/OPWidget.h
index 13fb3cb3..4fdb7db8 100644
--- a/src-qt5/desktop-utils/lumina-fm/OPWidget.h
+++ b/src-qt5/desktop-utils/lumina-fm/OPWidget.h
@@ -11,6 +11,9 @@
 
 #include "FODialog.h"
 #include "ScrollDialog.h"
+
+#include <QWidgetAction>
+
 namespace Ui{
 	class OPWidget;
 };
diff --git a/src-qt5/desktop-utils/lumina-fm/gitCompat.h b/src-qt5/desktop-utils/lumina-fm/gitCompat.h
index 3e6cb15e..4e63e780 100644
--- a/src-qt5/desktop-utils/lumina-fm/gitCompat.h
+++ b/src-qt5/desktop-utils/lumina-fm/gitCompat.h
@@ -14,7 +14,7 @@
 #include <QProcessEnvironment>
 #include <QDebug>
 #include <QTemporaryFile>
-#include <LuminaUtils.h>
+#include <LUtils.h>
 
 #include <unistd.h>
 
diff --git a/src-qt5/desktop-utils/lumina-fm/gitWizard.h b/src-qt5/desktop-utils/lumina-fm/gitWizard.h
index 4a6ec2bc..e49f43aa 100644
--- a/src-qt5/desktop-utils/lumina-fm/gitWizard.h
+++ b/src-qt5/desktop-utils/lumina-fm/gitWizard.h
@@ -12,6 +12,7 @@
 #include <QWizard>
 #include <QString>
 #include <QMessageBox>
+#include <QCloseEvent>
 
 #include "gitCompat.h"
 
diff --git a/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro b/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro
index 92042ad7..a98161f0 100644
--- a/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro
+++ b/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro
@@ -9,6 +9,12 @@ target.path = $${L_BINDIR}
 
 TEMPLATE = app
 
+#include all the special classes from the Lumina tree
+include(../../core/libLumina/LDesktopUtils.pri) #includes LUtils
+include(../../core/libLumina/LuminaXDG.pri)
+include(../../core/libLumina/LuminaSingleApplication.pri)
+include(../../core/libLumina/LuminaThemes.pri)
+
 SOURCES += main.cpp \
 		MainUI.cpp \
 		FODialog.cpp \
@@ -51,7 +57,6 @@ FORMS    += MainUI.ui \
 icons.files = Insight-FileManager.png
 icons.path = $${L_SHAREDIR}/pixmaps
 
-LIBS     += -lLuminaUtils
 
 TRANSLATIONS =  i18n/lumina-fm_af.ts \
                 i18n/lumina-fm_ar.ts \
diff --git a/src-qt5/desktop-utils/lumina-fm/main.cpp b/src-qt5/desktop-utils/lumina-fm/main.cpp
index eaaf182c..c72f031e 100644
--- a/src-qt5/desktop-utils/lumina-fm/main.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/main.cpp
@@ -6,7 +6,7 @@
 #include "MainUI.h"
 #include <LuminaOS.h>
 #include <LuminaThemes.h>
-#include <LuminaUtils.h>
+#include <LUtils.h>
 #include <LuminaSingleApplication.h>
 
 #include "BrowserWidget.h"
diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DDListWidgets.h b/src-qt5/desktop-utils/lumina-fm/widgets/DDListWidgets.h
index 8049600e..48127efa 100644
--- a/src-qt5/desktop-utils/lumina-fm/widgets/DDListWidgets.h
+++ b/src-qt5/desktop-utils/lumina-fm/widgets/DDListWidgets.h
@@ -24,7 +24,7 @@
 #include <QUrl>
 #include <QDir>
 
-#include <LuminaUtils.h>
+#include <LUtils.h>
 
 //==============
 //  LIST WIDGET
diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
index 161225e4..29adf09d 100644
--- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
@@ -19,7 +19,7 @@
 
 #include <LuminaOS.h>
 #include <LuminaXDG.h>
-#include <LuminaUtils.h>
+#include <LUtils.h>
 
 #include "../ScrollDialog.h"