diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml
index fa25e9ee4..4e72ea5d6 100644
--- a/.github/workflows/client.yml
+++ b/.github/workflows/client.yml
@@ -6,7 +6,7 @@ on:
     paths-ignore:
       - '**.md' #Do not need to run CI for markdown changes.
   pull_request:
-    branches: [ main ]
+    branches: [ main, server-side ]
     paths-ignore:
       - '**.md'
 
diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml
index 9c1ce1752..d33bc4423 100644
--- a/.github/workflows/common.yml
+++ b/.github/workflows/common.yml
@@ -6,7 +6,7 @@ on:
     paths-ignore:
       - '**.md' #Do not need to run CI for markdown changes.
   pull_request:
-    branches: [ main ]
+    branches: [ main, server-side ]
     paths-ignore:
       - '**.md'
 
diff --git a/.github/workflows/cpp-linter.yml b/.github/workflows/cpp-linter.yml
index 55a3f4d9e..4a969f4be 100644
--- a/.github/workflows/cpp-linter.yml
+++ b/.github/workflows/cpp-linter.yml
@@ -7,7 +7,7 @@ on:
   push:
     branches: [ "main" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", server-side  ]
 
 jobs:
   cpp-linter:
diff --git a/.github/workflows/internal.yml b/.github/workflows/internal.yml
index 0986b723d..c8f998a4a 100644
--- a/.github/workflows/internal.yml
+++ b/.github/workflows/internal.yml
@@ -6,7 +6,7 @@ on:
     paths-ignore:
       - '**.md' #Do not need to run CI for markdown changes.
   pull_request:
-    branches: [ main ]
+    branches: [ main, server-side  ]
     paths-ignore:
       - '**.md'
 
diff --git a/libs/common/include/launchdarkly/config/shared/built/events.hpp b/libs/common/include/launchdarkly/config/shared/built/events.hpp
index f7c59e0ec..2b3e76c35 100644
--- a/libs/common/include/launchdarkly/config/shared/built/events.hpp
+++ b/libs/common/include/launchdarkly/config/shared/built/events.hpp
@@ -4,6 +4,7 @@
 
 #include <chrono>
 #include <cstddef>
+#include <optional>
 #include <string>
 #include <unordered_map>
 
diff --git a/libs/internal/include/launchdarkly/serialization/json_primitives.hpp b/libs/internal/include/launchdarkly/serialization/json_primitives.hpp
index 4ddb8f208..268b9596a 100644
--- a/libs/internal/include/launchdarkly/serialization/json_primitives.hpp
+++ b/libs/internal/include/launchdarkly/serialization/json_primitives.hpp
@@ -6,6 +6,9 @@
 #include <boost/core/ignore_unused.hpp>
 #include <boost/json.hpp>
 
+#include <optional>
+#include <unordered_map>
+
 namespace launchdarkly {
 
 template <typename T>
diff --git a/libs/internal/include/launchdarkly/serialization/value_mapping.hpp b/libs/internal/include/launchdarkly/serialization/value_mapping.hpp
index d2aa82ea3..5d7d7484a 100644
--- a/libs/internal/include/launchdarkly/serialization/value_mapping.hpp
+++ b/libs/internal/include/launchdarkly/serialization/value_mapping.hpp
@@ -3,10 +3,13 @@
 #include <launchdarkly/serialization/json_errors.hpp>
 #include <launchdarkly/serialization/json_primitives.hpp>
 
-#include <boost/json.hpp>
 #include <boost/core/ignore_unused.hpp>
+#include <boost/json.hpp>
 #include <tl/expected.hpp>
 
+#include <optional>
+#include <type_traits>
+
 // Parses a field, propagating an error if the field's value is of the wrong
 // type. If the field was null or omitted in the data, it is set to
 // default_value.
diff --git a/libs/internal/src/serialization/value_mapping.cpp b/libs/internal/src/serialization/value_mapping.cpp
index db8d75c70..b83183725 100644
--- a/libs/internal/src/serialization/value_mapping.cpp
+++ b/libs/internal/src/serialization/value_mapping.cpp
@@ -1,5 +1,7 @@
 #include <launchdarkly/serialization/value_mapping.hpp>
 
+#include <vector>
+
 namespace launchdarkly {
 
 template <>