diff --git a/UABE_Generic/FileContextInfo.h b/UABE_Generic/FileContextInfo.h
index 836cea0..8d5c79a 100644
--- a/UABE_Generic/FileContextInfo.h
+++ b/UABE_Generic/FileContextInfo.h
@@ -11,6 +11,7 @@
 #include <memory>
 #include <mutex>
 #include <shared_mutex>
+#include <optional>
 
 //unique_ptr to a IAssetsReader with a deleter.
 typedef std::unique_ptr<IAssetsReader, void(*)(IAssetsReader*)> IAssetsReader_ptr;
diff --git a/UABE_Win32/AssetViewModifyDialog.cpp b/UABE_Win32/AssetViewModifyDialog.cpp
index f3e4f04..6fdea20 100644
--- a/UABE_Win32/AssetViewModifyDialog.cpp
+++ b/UABE_Win32/AssetViewModifyDialog.cpp
@@ -9,6 +9,7 @@
 #include "Win32PluginManager.h"
 #include <string>
 #include <WindowsX.h>
+#include <format>
 
 class AssetInstanceTask : public ITask
 {
diff --git a/UABE_Win32/Win32TaskStatusTracker.cpp b/UABE_Win32/Win32TaskStatusTracker.cpp
index 7d27887..0bb0d86 100644
--- a/UABE_Win32/Win32TaskStatusTracker.cpp
+++ b/UABE_Win32/Win32TaskStatusTracker.cpp
@@ -4,6 +4,7 @@
 #include "resource.h"
 #include <windowsx.h>
 #include "../libStringConverter/convert.h"
+#include <format>
 
 static int GetTextExtent(HWND hListBox, const TCHAR* text)
 {