From 0eb6cb7faf3296dd3c26c3b11e3af86228167685 Mon Sep 17 00:00:00 2001
From: Angad <angadmisra28@gmail.com>
Date: Tue, 12 Sep 2023 23:15:45 -0700
Subject: [PATCH] Cleanup PCH

---
 cmake/Plugin.h.in |   2 +-
 include/PCH.h     | 181 +++++++++++++++++++++++++++++-----------------
 2 files changed, 114 insertions(+), 69 deletions(-)

diff --git a/cmake/Plugin.h.in b/cmake/Plugin.h.in
index 0c64a54..4db8481 100644
--- a/cmake/Plugin.h.in
+++ b/cmake/Plugin.h.in
@@ -7,6 +7,6 @@ namespace Plugin
     static constexpr auto Name{ "PluginName"sv };
     static constexpr auto Author{ "AuthorName"sv };
     static constexpr auto Version{
-        REL::Version{ @PROJECT_VERSION_MAJOR@, @PROJECT_VERSION_MINOR@, @PROJECT_VERSION_PATCH@, 0 }
+        REL::Version{@PROJECT_VERSION_MAJOR@, @PROJECT_VERSION_MINOR@, @PROJECT_VERSION_PATCH@, 0}
     };
 } // namespace Plugin
diff --git a/include/PCH.h b/include/PCH.h
index d948952..9200308 100644
--- a/include/PCH.h
+++ b/include/PCH.h
@@ -1,97 +1,142 @@
 #pragma once
 
-#include <algorithm>
+/* +++++++++++++++++++++++++ C++23 Standard Library +++++++++++++++++++++++++ */
+
+// Concepts library
+#include <concepts>
+
+// Utilities library
 #include <any>
-#include <array>
-#include <atomic>
-#include <barrier>
-#include <bit>
 #include <bitset>
-#include <cassert>
-#include <cctype>
-#include <cerrno>
-#include <cfenv>
-#include <cfloat>
-#include <charconv>
 #include <chrono>
-#include <cinttypes>
-#include <climits>
-#include <clocale>
-#include <cmath>
 #include <compare>
-#include <complex>
-#include <concepts>
-#include <condition_variable>
 #include <csetjmp>
 #include <csignal>
 #include <cstdarg>
 #include <cstddef>
-#include <cstdint>
-#include <cstdio>
 #include <cstdlib>
-#include <cstring>
 #include <ctime>
+#include <expected>
+#include <functional>
+#include <initializer_list>
+#include <optional>
+#include <source_location>
+#include <tuple>
+#include <type_traits>
+#include <typeindex>
+#include <typeinfo>
+#include <utility>
+#include <variant>
+#include <version>
+
+// Dynamic memory management
+#include <memory>
+#include <memory_resource>
+#include <new>
+#include <scoped_allocator>
+
+// Numeric limits
+#include <cfloat>
+#include <cinttypes>
+#include <climits>
+#include <cstdint>
+#include <limits>
+#include <stdfloat>
+
+// Error handling
+#include <cassert>
+#include <cerrno>
+#include <exception>
+#include <stacktrace>
+#include <stdexcept>
+#include <system_error>
+
+// Strings library
+#include <cctype>
+#include <charconv>
+#include <cstring>
 #include <cuchar>
 #include <cwchar>
 #include <cwctype>
+#include <string>
+#include <string_view>
+
+// Containers library
+#include <array>
 #include <deque>
-#include <exception>
-#include <execution>
-#include <filesystem>
 #include <forward_list>
+#include <list>
+#include <map>
+#include <queue>
+#include <set>
+#include <span>
+#include <stack>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
+// Iterators library
+#include <iterator>
+
+// Ranges library
+#include <ranges>
+
+// Algorithms library
+#include <algorithm>
+#include <execution>
+
+// Numerics library
+#include <bit>
+#include <cfenv>
+#include <cmath>
+#include <complex>
+#include <numbers>
+#include <numeric>
+#include <random>
+#include <ratio>
+#include <valarray>
+
+// Localization library
+#include <clocale>
+#include <locale>
+
+// Input/output library
+#include <cstdio>
 #include <fstream>
-#include <functional>
-#include <future>
-#include <initializer_list>
 #include <iomanip>
 #include <ios>
 #include <iosfwd>
 #include <iostream>
 #include <istream>
-#include <iterator>
-#include <latch>
-#include <limits>
-#include <locale>
-#include <map>
-#include <memory>
-#include <memory_resource>
-#include <mutex>
-#include <new>
-#include <numbers>
-#include <numeric>
-#include <optional>
 #include <ostream>
-#include <queue>
-#include <random>
-#include <ranges>
-#include <ratio>
-#include <regex>
-#include <scoped_allocator>
-#include <semaphore>
-#include <set>
-#include <shared_mutex>
-#include <source_location>
-#include <span>
+#include <print>
+#include <spanstream>
 #include <sstream>
-#include <stack>
-#include <stdexcept>
 #include <streambuf>
-#include <string>
-#include <string_view>
+#include <strstream>
 #include <syncstream>
-#include <system_error>
+
+// Filesystem library
+#include <filesystem>
+
+// Regular Expressions library
+#include <regex>
+
+// Atomic Operations library
+#include <atomic>
+
+// Thread support library
+#include <barrier>
+#include <condition_variable>
+#include <future>
+#include <latch>
+#include <mutex>
+#include <semaphore>
+#include <shared_mutex>
+#include <stop_token>
 #include <thread>
-#include <tuple>
-#include <type_traits>
-#include <typeindex>
-#include <typeinfo>
-#include <unordered_map>
-#include <unordered_set>
-#include <utility>
-#include <valarray>
-#include <variant>
-#include <vector>
-#include <version>
+
+/* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
 
 // clang-format off
 #include <RE/Starfield.h>
@@ -108,6 +153,8 @@
 #include <spdlog/sinks/basic_file_sink.h>
 #include <spdlog/sinks/msvc_sink.h>
 
+#define SFSEPluginVersion extern "C" __declspec(dllexport) constinit SFSE::PluginVersionData SFSEPlugin_Version
+
 using namespace std::literals;
 using namespace REL::literals;
 
@@ -159,5 +206,3 @@ namespace stl
         T::func = vtbl.write_vfunc(T::idx, T::Thunk);
     }
 } // namespace stl
-
-#define SFSEPluginVersion extern "C" __declspec(dllexport) constinit SFSE::PluginVersionData SFSEPlugin_Version