From ada62c6c59739c46cdff091bd24c7e1ecff9c2c2 Mon Sep 17 00:00:00 2001
From: Birk Magnussen <6238428+BMagnu@users.noreply.github.com>
Date: Sat, 1 Feb 2025 13:33:43 +0100
Subject: [PATCH] missing includes

---
 code/graphics/openxr_internal.h       | 2 +-
 code/localization/localize.cpp        | 2 +-
 code/model/animation/modelanimation.h | 3 +--
 code/model/modelreplace.h             | 3 +--
 code/options/Option.h                 | 2 +-
 code/options/OptionsManager.cpp       | 2 +-
 code/osapi/osregistry.h               | 1 +
 code/particle/ParticleEffect.h        | 2 +-
 code/particle/ParticleSource.h        | 2 +-
 code/scripting/api/objs/enums.h       | 2 +-
 code/scripting/hook_api.h             | 2 +-
 11 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/code/graphics/openxr_internal.h b/code/graphics/openxr_internal.h
index 0d89cf99e3..1b35408e77 100644
--- a/code/graphics/openxr_internal.h
+++ b/code/graphics/openxr_internal.h
@@ -5,7 +5,7 @@
 #include "openxr.h"
 
 #include <type_traits>
-
+#include <optional>
 
 #ifdef FS_OPENXR
 
diff --git a/code/localization/localize.cpp b/code/localization/localize.cpp
index 3755762290..af0396bcd5 100644
--- a/code/localization/localize.cpp
+++ b/code/localization/localize.cpp
@@ -21,7 +21,7 @@
 #include "mod_table/mod_table.h"
 #include "options/Option.h"
 
-
+#include <optional>
 
 // ------------------------------------------------------------------------------------------------------------
 // LOCALIZE DEFINES/VARS
diff --git a/code/model/animation/modelanimation.h b/code/model/animation/modelanimation.h
index a7d7eb42f8..f87a92aa3c 100644
--- a/code/model/animation/modelanimation.h
+++ b/code/model/animation/modelanimation.h
@@ -11,8 +11,7 @@
 #include <type_traits>
 #include <memory>
 #include <map>
-
-
+#include <optional>
 #include <any>
 
 class ship;
diff --git a/code/model/modelreplace.h b/code/model/modelreplace.h
index ce1c2a2e94..a043340d11 100644
--- a/code/model/modelreplace.h
+++ b/code/model/modelreplace.h
@@ -4,8 +4,7 @@
 #include "model/model.h"
 
 #include <memory>
-
-
+#include <optional>
 #include <variant>
 
 bool model_exists(const SCP_string& filename);
diff --git a/code/options/Option.h b/code/options/Option.h
index bc9d088192..21be9afd74 100644
--- a/code/options/Option.h
+++ b/code/options/Option.h
@@ -10,7 +10,7 @@
 #include <functional>
 #include <utility>
 #include <variant>
-
+#include <optional>
 
 namespace options {
 
diff --git a/code/options/OptionsManager.cpp b/code/options/OptionsManager.cpp
index e64d6b6851..d50b5f6090 100644
--- a/code/options/OptionsManager.cpp
+++ b/code/options/OptionsManager.cpp
@@ -5,7 +5,7 @@
 #include "Option.h"
 #include "mod_table/mod_table.h"
 #include "osapi/osregistry.h"
-
+#include <optional>
 
 namespace {
 
diff --git a/code/osapi/osregistry.h b/code/osapi/osregistry.h
index 066db1cd74..f92c1dd791 100644
--- a/code/osapi/osregistry.h
+++ b/code/osapi/osregistry.h
@@ -12,6 +12,7 @@
 
 
 #include <cstdlib>
+#include <optional>
 
 // ------------------------------------------------------------------------------------------------------------
 // REGISTRY DEFINES/VARS
diff --git a/code/particle/ParticleEffect.h b/code/particle/ParticleEffect.h
index ce987f711e..6b4c79424b 100644
--- a/code/particle/ParticleEffect.h
+++ b/code/particle/ParticleEffect.h
@@ -9,7 +9,7 @@
 #include "utils/id.h"
 #include "utils/modular_curves.h"
 
-
+#include <optional>
 
 class EffectHost;
 
diff --git a/code/particle/ParticleSource.h b/code/particle/ParticleSource.h
index 65527cc498..640c63c257 100644
--- a/code/particle/ParticleSource.h
+++ b/code/particle/ParticleSource.h
@@ -8,7 +8,7 @@
 #include "io/timer.h"
 #include "particle/EffectHost.h"
 
-
+#include <optional>
 
 struct weapon;
 
diff --git a/code/scripting/api/objs/enums.h b/code/scripting/api/objs/enums.h
index 0b68d870ef..8f6bc43514 100644
--- a/code/scripting/api/objs/enums.h
+++ b/code/scripting/api/objs/enums.h
@@ -7,7 +7,7 @@
 #include "globalincs/pstypes.h"
 #include "scripting/ade_api.h"
 
-
+#include <optional>
 
 namespace scripting {
 namespace api {
diff --git a/code/scripting/hook_api.h b/code/scripting/hook_api.h
index ea4e19024f..86f1cfb041 100644
--- a/code/scripting/hook_api.h
+++ b/code/scripting/hook_api.h
@@ -9,7 +9,7 @@
 #include "utils/tuples.h"
 
 #include <utility>
-
+#include <optional>
 
 namespace scripting {