enertial · charlestytler · Jan 19, 2026 · Jan 17, 2026 · Jan 19, 2026
diff --git a/Sources/backend-cpp/ElgatoSD/EPLJSONUtils.h b/Sources/backend-cpp/ElgatoSD/EPLJSONUtils.h
@@ -17,7 +17,7 @@
 // Includes
 //------------------------------------------------------------------------------
 
-#include "nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
 using json = nlohmann::json;
 
 class EPLJSONUtils

diff --git a/Sources/backend-cpp/ElgatoSD/ESDBasePlugin.h b/Sources/backend-cpp/ElgatoSD/ESDBasePlugin.h
@@ -12,7 +12,7 @@
 
 #pragma once
 
-#include "nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
 using json = nlohmann::json;
 
 class ESDConnectionManager;

diff --git a/Sources/backend-cpp/ElgatoSD/test/CMakeLists.txt b/Sources/backend-cpp/ElgatoSD/test/CMakeLists.txt
@@ -4,5 +4,5 @@ target_sources(MockESDConnectionManager INTERFACE MockESDConnectionManager.h)
 
 target_include_directories(
     MockESDConnectionManager
-    INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}
+    INTERFACE ${CMAKE_SOURCE_DIR}
 )
diff --git a/Sources/backend-cpp/SimulatorInterface/Protocols/test/DcsBiosProtocolTest.cpp b/Sources/backend-cpp/SimulatorInterface/Protocols/test/DcsBiosProtocolTest.cpp
@@ -1,6 +1,6 @@
 // Copyright 2021 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "SimulatorInterface/Protocols/DcsBiosProtocol.h"
 

diff --git a/Sources/backend-cpp/SimulatorInterface/Protocols/test/DcsBiosStreamParserTest.cpp b/Sources/backend-cpp/SimulatorInterface/Protocols/test/DcsBiosStreamParserTest.cpp
@@ -1,6 +1,6 @@
 // Copyright 2021 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "SimulatorInterface/Protocols/DcsBiosStreamParser.h"
 

diff --git a/Sources/backend-cpp/SimulatorInterface/Protocols/test/DcsExportScriptProtocolTest.cpp b/Sources/backend-cpp/SimulatorInterface/Protocols/test/DcsExportScriptProtocolTest.cpp
@@ -1,6 +1,6 @@
 // Copyright 2020 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "SimulatorInterface/Protocols/DcsExportScriptProtocol.h"
 

diff --git a/Sources/backend-cpp/SimulatorInterface/SimulatorInterface.h b/Sources/backend-cpp/SimulatorInterface/SimulatorInterface.h
@@ -4,7 +4,7 @@
 
 #include "Utilities/Decimal.h"
 #include "Utilities/UdpSocket.h"
-#include "nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
 using json = nlohmann::json;
 
 #include <optional>

diff --git a/Sources/backend-cpp/SimulatorInterface/test/SimConnectionManagerTest.cpp b/Sources/backend-cpp/SimulatorInterface/test/SimConnectionManagerTest.cpp
@@ -1,6 +1,6 @@
 // Copyright 2021 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "SimulatorInterface/SimConnectionManager.h"
 

diff --git a/Sources/backend-cpp/SimulatorInterface/test/SimulatorInterfaceTest.cpp b/Sources/backend-cpp/SimulatorInterface/test/SimulatorInterfaceTest.cpp
@@ -1,6 +1,6 @@
 // Copyright 2020 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "SimulatorInterface/SimulatorInterface.h"
 

diff --git a/Sources/backend-cpp/StreamdeckContext/BackwardsCompatibilityHandler.h b/Sources/backend-cpp/StreamdeckContext/BackwardsCompatibilityHandler.h
@@ -1,6 +1,6 @@
 // Copyright 2022 Charles Tytler
 
-#include "nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
 using json = nlohmann::json;
 
 json backwardsCompatibilityHandler(const json &prevVersionPayload);
diff --git a/Sources/backend-cpp/StreamdeckContext/ExportMonitors/test/ImageStateMonitorTest.cpp b/Sources/backend-cpp/StreamdeckContext/ExportMonitors/test/ImageStateMonitorTest.cpp
@@ -1,6 +1,6 @@
 // Copyright 2021 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "SimulatorInterface/SimConnectionManager.h"
 #include "StreamdeckContext/ExportMonitors/ImageStateMonitor.h"

diff --git a/Sources/backend-cpp/StreamdeckContext/ExportMonitors/test/IncrementMonitorTest.cpp b/Sources/backend-cpp/StreamdeckContext/ExportMonitors/test/IncrementMonitorTest.cpp
@@ -1,6 +1,6 @@
 // Copyright 2021 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "SimulatorInterface/SimConnectionManager.h"
 #include "StreamdeckContext/ExportMonitors/IncrementMonitor.h"

diff --git a/Sources/backend-cpp/StreamdeckContext/ExportMonitors/test/TitleMonitorTest.cpp b/Sources/backend-cpp/StreamdeckContext/ExportMonitors/test/TitleMonitorTest.cpp
@@ -1,6 +1,6 @@
 // Copyright 2021 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "SimulatorInterface/SimConnectionManager.h"
 #include "StreamdeckContext/ExportMonitors/TitleMonitor.h"

diff --git a/Sources/backend-cpp/StreamdeckContext/SendActions/test/IncrementActionTest.cpp b/Sources/backend-cpp/StreamdeckContext/SendActions/test/IncrementActionTest.cpp
@@ -1,11 +1,11 @@
 // Copyright 2021 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "SimulatorInterface/SimConnectionManager.h"
 #include "StreamdeckContext/SendActions/IncrementAction.h"
 
-#include "MockESDConnectionManager.h"
+#include "ElgatoSD/test/MockESDConnectionManager.h"
 
 namespace test
 {

diff --git a/Sources/backend-cpp/StreamdeckContext/SendActions/test/MomentaryActionTest.cpp b/Sources/backend-cpp/StreamdeckContext/SendActions/test/MomentaryActionTest.cpp
@@ -1,11 +1,11 @@
 // Copyright 2021 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "SimulatorInterface/SimConnectionManager.h"
 #include "StreamdeckContext/SendActions/MomentaryAction.h"
 
-#include "MockESDConnectionManager.h"
+#include "ElgatoSD/test/MockESDConnectionManager.h"
 
 namespace test
 {

diff --git a/Sources/backend-cpp/StreamdeckContext/SendActions/test/SendActionFactoryTest.cpp b/Sources/backend-cpp/StreamdeckContext/SendActions/test/SendActionFactoryTest.cpp
@@ -1,6 +1,6 @@
 // Copyright 2021 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "StreamdeckContext/SendActions/SendActionFactory.h"
 

diff --git a/Sources/backend-cpp/StreamdeckContext/SendActions/test/SwitchActionTest.cpp b/Sources/backend-cpp/StreamdeckContext/SendActions/test/SwitchActionTest.cpp
@@ -1,10 +1,10 @@
 // Copyright 2021 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "StreamdeckContext/SendActions/SwitchAction.h"
 
-#include "MockESDConnectionManager.h"
+#include "ElgatoSD/test/MockESDConnectionManager.h"
 #include "SimulatorInterface/SimConnectionManager.h"
 namespace test
 {

diff --git a/Sources/backend-cpp/StreamdeckContext/test/BackwardsCompatibilityHandlerTest.cpp b/Sources/backend-cpp/StreamdeckContext/test/BackwardsCompatibilityHandlerTest.cpp
@@ -1,6 +1,6 @@
 // Copyright 2022 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "StreamdeckContext/BackwardsCompatibilityHandler.h"
 

diff --git a/Sources/backend-cpp/StreamdeckContext/test/StreamdeckContextTest.cpp b/Sources/backend-cpp/StreamdeckContext/test/StreamdeckContextTest.cpp
@@ -1,9 +1,9 @@
 // Copyright 2020 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <unordered_map>
 
-#include "MockESDConnectionManager.h" // Must be called before other includes
+#include "ElgatoSD/test/MockESDConnectionManager.h" // Must be called before other includes
 
 #include "SimulatorInterface/SimConnectionManager.h"
 #include "StreamdeckContext/StreamdeckContext.h"

diff --git a/Sources/backend-cpp/StreamdeckInterface/StreamdeckInterface.cpp b/Sources/backend-cpp/StreamdeckInterface/StreamdeckInterface.cpp
@@ -21,7 +21,7 @@
 #include "Utilities/JsonReader.h"
 #include "Utilities/LuaReader.h"
 
-#include "nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
 using json = nlohmann::json;
 
 class CallBackTimer

diff --git a/Sources/backend-cpp/Utilities/JsonReader.h b/Sources/backend-cpp/Utilities/JsonReader.h
@@ -5,7 +5,7 @@
 #include <optional>
 #include <string>
 
-#include "nlohmann\json.hpp"
+#include <nlohmann/json.hpp>
 using json = nlohmann::json;
 
 std::optional<json> get_module_list(const std::string &path);

diff --git a/Sources/backend-cpp/Utilities/LuaReader.cpp b/Sources/backend-cpp/Utilities/LuaReader.cpp
@@ -2,7 +2,7 @@
 
 #include "LuaReader.h"
 
-#include "lua.hpp"
+#include <lua.hpp>
 
 #include <filesystem>
 #include <iostream>

diff --git a/Sources/backend-cpp/Utilities/LuaReader.h b/Sources/backend-cpp/Utilities/LuaReader.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
@@ -25,4 +25,4 @@ json get_installed_modules(const std::string &dcs_install_path, const std::strin
  */
 json get_clickabledata(const std::string &dcs_install_path,
                        const std::string &module_name,
-                       const std::string &lua_script);
+                       const std::string &lua_script);
diff --git a/Sources/backend-cpp/Utilities/test/DecimalTest.cpp b/Sources/backend-cpp/Utilities/test/DecimalTest.cpp
@@ -1,6 +1,6 @@
 // Copyright 2020 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "Utilities/Decimal.h"
 

diff --git a/Sources/backend-cpp/Utilities/test/JsonReaderTest.cpp b/Sources/backend-cpp/Utilities/test/JsonReaderTest.cpp
@@ -1,6 +1,6 @@
 // Copyright 2021 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "Utilities/JsonReader.h"
 

diff --git a/Sources/backend-cpp/Utilities/test/LuaReaderTest.cpp b/Sources/backend-cpp/Utilities/test/LuaReaderTest.cpp
@@ -1,10 +1,10 @@
 // Copyright 2020 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "Utilities/LuaReader.h"
 
-#include "nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
 using json = nlohmann::json;
 
 namespace test
@@ -28,4 +28,4 @@ TEST(LuaReaderTest, nonexistant_lua_file)
     EXPECT_EQ(0, returned_values["clickabledata_items"].size());
 }
 
-} // namespace test
+} // namespace test
diff --git a/Sources/backend-cpp/Utilities/test/StringUtilitiesTest.cpp b/Sources/backend-cpp/Utilities/test/StringUtilitiesTest.cpp
@@ -1,6 +1,6 @@
 // Copyright 2020 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "Utilities/StringUtilities.h"
 
@@ -189,4 +189,4 @@ TEST(StringUtilitiesTest, pop_key_and_value_missing_token_delim)
     EXPECT_EQ("value1key2=value2", key_and_value.value().second);
 }
 
-} // namespace test
+} // namespace test
diff --git a/Sources/backend-cpp/Utilities/test/UdpSocketTest.cpp b/Sources/backend-cpp/Utilities/test/UdpSocketTest.cpp
@@ -1,6 +1,6 @@
 // Copyright 2020 Charles Tytler
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "Utilities/UdpSocket.h"