3 files changed, 4 insertions, 5 deletions
diff --git a/logic/launch/LaunchTask.cpp b/logic/launch/LaunchTask.cpp
index 1defeba3..5b7ff182 100644
--- a/logic/launch/LaunchTask.cpp
+++ b/logic/launch/LaunchTask.cpp
@@ -20,7 +20,6 @@
 #include "MMCStrings.h"
 #include "java/JavaChecker.h"
 #include "tasks/Task.h"
-#include <pathutils.h>
 #include <QDebug>
 #include <QDir>
 #include <QEventLoop>
diff --git a/logic/launch/steps/CheckJava.cpp b/logic/launch/steps/CheckJava.cpp
index 7482624f..66f7cc2b 100644
--- a/logic/launch/steps/CheckJava.cpp
+++ b/logic/launch/steps/CheckJava.cpp
@@ -15,7 +15,7 @@
 
 #include "CheckJava.h"
 #include <launch/LaunchTask.h>
-#include <pathutils.h>
+#include <FileSystem.h>
 #include <QStandardPaths>
 #include <QFileInfo>
 
@@ -23,7 +23,7 @@ void CheckJava::executeTask()
 {
 	auto instance = m_parent->instance();
 	auto settings = instance->settings();
-	m_javaPath = ResolveExecutable(settings->get("JavaPath").toString());
+	m_javaPath = FS::ResolveExecutable(settings->get("JavaPath").toString());
 	bool perInstance = settings->get("OverrideJava").toBool() || settings->get("OverrideJavaLocation").toBool();
 
 	auto realJavaPath = QStandardPaths::findExecutable(m_javaPath);
diff --git a/logic/launch/steps/LaunchMinecraft.cpp b/logic/launch/steps/LaunchMinecraft.cpp
index 84abb375..3d75f5f2 100644
--- a/logic/launch/steps/LaunchMinecraft.cpp
+++ b/logic/launch/steps/LaunchMinecraft.cpp
@@ -16,7 +16,7 @@
 #include "LaunchMinecraft.h"
 #include <launch/LaunchTask.h>
 #include <minecraft/OneSixInstance.h>
-#include <pathutils.h>
+#include <FileSystem.h>
 #include <QStandardPaths>
 
 LaunchMinecraft::LaunchMinecraft(LaunchTask *parent) : LaunchStep(parent)
@@ -34,7 +34,7 @@ void LaunchMinecraft::executeTask()
 	QString allArgs = args.join(", ");
 	emit logLine("Java Arguments:\n[" + m_parent->censorPrivateInfo(allArgs) + "]\n\n", MessageLevel::MultiMC);
 
-	auto javaPath = ResolveExecutable(instance->settings()->get("JavaPath").toString());
+	auto javaPath = FS::ResolveExecutable(instance->settings()->get("JavaPath").toString());
 
 	m_process.setProcessEnvironment(instance->createEnvironment());