diff --git a/CMakeLists.txt b/CMakeLists.txt
index b581c842..26cebaa8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,16 +227,18 @@ if(ENABLE_GLSLANG_JS)
     endif()
 endif()
 
-# Request C++11
+# BEGIN @MEWIN - 2023-11-04 - Increased to C++17 so my changes actually work when compiling the regular way.
+# Request C++17
 if(${CMAKE_VERSION} VERSION_LESS 3.1)
     # CMake versions before 3.1 do not understand CMAKE_CXX_STANDARD
     # remove this block once CMake >=3.1 has fixated in the ecosystem
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 else()
-    set(CMAKE_CXX_STANDARD 11)
+    set(CMAKE_CXX_STANDARD 17)
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
     set(CMAKE_CXX_EXTENSIONS OFF)
 endif()
+# END @MEWIN
 
 function(glslang_set_link_args TARGET)
     # For MinGW compiles, statically link against the GCC and C++ runtimes.
@@ -402,4 +404,4 @@ if(ENABLE_GLSLANG_INSTALL)
         DESTINATION
             "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
     )
-endif()
\ No newline at end of file
+endif()
diff --git a/SPIRV/SpvTools.cpp b/SPIRV/SpvTools.cpp
index 1b262800..3a75d74b 100644
--- a/SPIRV/SpvTools.cpp
+++ b/SPIRV/SpvTools.cpp
@@ -226,7 +226,7 @@ void SpirvToolsTransform(const glslang::TIntermediate& intermediate, std::vector
 bool SpirvToolsAnalyzeDeadOutputStores(spv_target_env target_env, std::vector<unsigned int>& spirv,
                                        std::unordered_set<uint32_t>* live_locs,
                                        std::unordered_set<uint32_t>* live_builtins,
-                                       spv::SpvBuildLogger* logger)
+                                       [[maybe_unused]] spv::SpvBuildLogger* logger) // @MEWIN 2023-11-04 - Added [[maybe_unused]] to fix compiler warnings.
 {
   spvtools::Optimizer optimizer(target_env);
   optimizer.SetMessageConsumer(OptimizerMesssageConsumer);
@@ -242,7 +242,7 @@ bool SpirvToolsAnalyzeDeadOutputStores(spv_target_env target_env, std::vector<un
 void SpirvToolsEliminateDeadOutputStores(spv_target_env target_env, std::vector<unsigned int>& spirv,
                                          std::unordered_set<uint32_t>* live_locs,
                                          std::unordered_set<uint32_t>* live_builtins,
-                                         spv::SpvBuildLogger* logger)
+                                         [[maybe_unused]] spv::SpvBuildLogger* logger) // @MEWIN 2023-11-04 - Added [[maybe_unused]] to fix compiler warnings.
 {
   spvtools::Optimizer optimizer(target_env);
   optimizer.SetMessageConsumer(OptimizerMesssageConsumer);
@@ -259,7 +259,7 @@ void SpirvToolsEliminateDeadOutputStores(spv_target_env target_env, std::vector<
 }
 
 void SpirvToolsEliminateDeadInputComponents(spv_target_env target_env, std::vector<unsigned int>& spirv,
-                                            spv::SpvBuildLogger* logger)
+                                            [[maybe_unused]] spv::SpvBuildLogger* logger) // @MEWIN 2023-11-04 - Added [[maybe_unused]] to fix compiler warnings.
 {
   spvtools::Optimizer optimizer(target_env);
   optimizer.SetMessageConsumer(OptimizerMesssageConsumer);