diff --git a/src/SaveTool/SaveTool.cpp b/src/SaveTool/SaveTool.cpp
index 2bf542e..7fcd49c 100644
--- a/src/SaveTool/SaveTool.cpp
+++ b/src/SaveTool/SaveTool.cpp
@@ -27,6 +27,8 @@
 #include <Magnum/ImGuiIntegration/Integration.h>
 #include <Magnum/ImGuiIntegration/Context.hpp>
 
+#include <SDL.h>
+
 #include <curl/curl.h>
 
 #include <shellapi.h>
diff --git a/src/SaveTool/SaveTool.h b/src/SaveTool/SaveTool.h
index 0ee8d6f..0e04e8d 100644
--- a/src/SaveTool/SaveTool.h
+++ b/src/SaveTool/SaveTool.h
@@ -27,7 +27,7 @@
 #include <Magnum/Platform/Sdl2Application.h>
 #include <Magnum/ImGuiIntegration/Context.h>
 
-#include <SDL.h>
+#include <SDL_timer.h>
 
 #include <imgui.h>
 #include <imgui_internal.h>
diff --git a/src/SaveTool/SaveTool_FileWatcher.cpp b/src/SaveTool/SaveTool_FileWatcher.cpp
index bd5b25f..3387740 100644
--- a/src/SaveTool/SaveTool_FileWatcher.cpp
+++ b/src/SaveTool/SaveTool_FileWatcher.cpp
@@ -17,6 +17,8 @@
 #include <Corrade/Utility/String.h>
 #include <Corrade/Utility/Unicode.h>
 
+#include <SDL_events.h>
+
 #include <fileapi.h>
 #include <handleapi.h>
 
diff --git a/src/SaveTool/SaveTool_Initialisation.cpp b/src/SaveTool/SaveTool_Initialisation.cpp
index c6b42a0..a40a12c 100644
--- a/src/SaveTool/SaveTool_Initialisation.cpp
+++ b/src/SaveTool/SaveTool_Initialisation.cpp
@@ -19,6 +19,9 @@
 #include <Corrade/Utility/Path.h>
 #include <Corrade/Utility/Unicode.h>
 
+#include <SDL_events.h>
+#include <SDL_messagebox.h>
+
 #include <shlobj.h>
 
 #include "../FontAwesome/IconsFontAwesome5.h"
diff --git a/src/SaveTool/SaveTool_MainManager.cpp b/src/SaveTool/SaveTool_MainManager.cpp
index 49cbfbe..fea8bc3 100644
--- a/src/SaveTool/SaveTool_MainManager.cpp
+++ b/src/SaveTool/SaveTool_MainManager.cpp
@@ -14,20 +14,19 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#include "SaveTool.h"
-
 #include <algorithm>
 
-#include <Corrade/Containers/Reference.h>
 #include <Corrade/Utility/Format.h>
 #include <Corrade/Utility/Path.h>
-#include <Corrade/Utility/String.h>
+
+#include <SDL_messagebox.h>
 
 #include "../FontAwesome/IconsFontAwesome5.h"
-
 #include "../Maps/LastMissionId.h"
 #include "../Maps/StoryProgress.h"
 
+#include "SaveTool.h"
+
 void SaveTool::drawManager() {
     ImGui::SetNextWindowPos({0.0f, ImGui::GetItemRectSize().y}, ImGuiCond_Always);
     ImGui::SetNextWindowSize({Float(windowSize().x()), Float(windowSize().y()) - ImGui::GetItemRectSize().y},
diff --git a/src/SaveTool/SaveTool_ProfileManager.cpp b/src/SaveTool/SaveTool_ProfileManager.cpp
index f4b515f..a7c2287 100644
--- a/src/SaveTool/SaveTool_ProfileManager.cpp
+++ b/src/SaveTool/SaveTool_ProfileManager.cpp
@@ -14,12 +14,14 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#include "SaveTool.h"
-
 #include <Magnum/ImGuiIntegration/Integration.h>
 
+#include <SDL_messagebox.h>
+
 #include "../FontAwesome/IconsFontAwesome5.h"
 
+#include "SaveTool.h"
+
 extern const ImVec2 center_pivot;
 
 void SaveTool::drawProfileManager() {
diff --git a/src/SaveTool/SaveTool_UpdateChecker.cpp b/src/SaveTool/SaveTool_UpdateChecker.cpp
index aaf83df..8ab2690 100644
--- a/src/SaveTool/SaveTool_UpdateChecker.cpp
+++ b/src/SaveTool/SaveTool_UpdateChecker.cpp
@@ -16,6 +16,8 @@
 
 #include <Corrade/Utility/Format.h>
 
+#include <SDL_events.h>
+
 #include <curl/curl.h>
 
 #include "SaveTool.h"