diff --git a/chrome/updater/utils_test.cc b/chrome/updater/utils_test.cc
index 174f3b0e39c2..b398128c98e4 100644
--- a/chrome/updater/utils_test.cc
+++ b/chrome/updater/utils_test.cc
@@ -22,6 +22,7 @@
 #include "base/strings/strcat.h"
 #include "base/values.h"
 #include "gmock/gmock.h"
+#include "starboard/common/file.h"
 #include "starboard/directory.h"
 #include "starboard/extension/installation_manager.h"
 #include "starboard/file.h"
diff --git a/cobalt/browser/browser_module.cc b/cobalt/browser/browser_module.cc
index b7e86fcf9baf..85823a5f5c6e 100644
--- a/cobalt/browser/browser_module.cc
+++ b/cobalt/browser/browser_module.cc
@@ -60,7 +60,6 @@
 #include "cobalt/web/csp_delegate_factory.h"
 #include "cobalt/web/navigator_ua_data.h"
 #include "starboard/atomic.h"
-#include "starboard/common/string.h"
 #include "starboard/configuration.h"
 #include "starboard/extension/graphics.h"
 #include "starboard/system.h"
diff --git a/cobalt/browser/memory_settings/pretty_print.cc b/cobalt/browser/memory_settings/pretty_print.cc
index d141817b0102..cc3ce9836819 100644
--- a/cobalt/browser/memory_settings/pretty_print.cc
+++ b/cobalt/browser/memory_settings/pretty_print.cc
@@ -23,7 +23,6 @@
 #include "base/strings/string_split.h"
 #include "cobalt/browser/memory_settings/memory_settings.h"
 #include "cobalt/browser/memory_settings/table_printer.h"
-#include "starboard/common/string.h"
 
 namespace cobalt {
 namespace browser {
diff --git a/cobalt/browser/user_agent_platform_info.cc b/cobalt/browser/user_agent_platform_info.cc
index ee852f8a0c67..280eece27e63 100644
--- a/cobalt/browser/user_agent_platform_info.cc
+++ b/cobalt/browser/user_agent_platform_info.cc
@@ -25,7 +25,6 @@
 #include "cobalt/script/javascript_engine.h"
 #include "cobalt/version.h"
 #include "cobalt_build_id.h"  // NOLINT(build/include_subdir)
-#include "starboard/common/string.h"
 #include "starboard/common/system_property.h"
 #include "starboard/extension/platform_info.h"
 #if SB_IS(EVERGREEN)
diff --git a/cobalt/browser/user_agent_string.cc b/cobalt/browser/user_agent_string.cc
index fa9455f9bd95..4db2e02c89ad 100644
--- a/cobalt/browser/user_agent_string.cc
+++ b/cobalt/browser/user_agent_string.cc
@@ -23,7 +23,6 @@
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "cobalt/browser/switches.h"
-#include "starboard/common/string.h"
 #include "starboard/log.h"
 #include "starboard/system.h"
 
diff --git a/cobalt/css_parser/trivial_string_piece.h b/cobalt/css_parser/trivial_string_piece.h
index eb491ebbbc5b..ba51d44c4277 100644
--- a/cobalt/css_parser/trivial_string_piece.h
+++ b/cobalt/css_parser/trivial_string_piece.h
@@ -16,11 +16,11 @@
 #define COBALT_CSS_PARSER_TRIVIAL_STRING_PIECE_H_
 
 #include <algorithm>
+#include <cstring>
 #include <iostream>
 #include <string>
 
 #include "base/logging.h"
-#include "starboard/common/string.h"
 
 namespace cobalt {
 namespace css_parser {
diff --git a/cobalt/debug/backend/tracing_controller.cc b/cobalt/debug/backend/tracing_controller.cc
index dd4c954cd993..93aec696e937 100644
--- a/cobalt/debug/backend/tracing_controller.cc
+++ b/cobalt/debug/backend/tracing_controller.cc
@@ -23,7 +23,6 @@
 #include "base/trace_event/trace_event.h"
 #include "base/values.h"
 #include "cobalt/script/script_debugger.h"
-#include "starboard/common/string.h"
 
 namespace cobalt {
 namespace debug {
diff --git a/cobalt/dom/track_base.h b/cobalt/dom/track_base.h
index 9b0a1776d371..77043fe8e47f 100644
--- a/cobalt/dom/track_base.h
+++ b/cobalt/dom/track_base.h
@@ -20,7 +20,6 @@
 #include "base/memory/weak_ptr.h"
 #include "cobalt/dom/html_media_element.h"
 #include "cobalt/script/wrappable.h"
-#include "starboard/common/string.h"
 
 namespace cobalt {
 namespace dom {
diff --git a/cobalt/h5vcc/h5vcc_platform_service.cc b/cobalt/h5vcc/h5vcc_platform_service.cc
index a76add18d9d8..04dd050e3761 100644
--- a/cobalt/h5vcc/h5vcc_platform_service.cc
+++ b/cobalt/h5vcc/h5vcc_platform_service.cc
@@ -22,7 +22,6 @@
 #include "cobalt/base/polymorphic_downcast.h"
 #include "cobalt/web/context.h"
 #include "cobalt/web/environment_settings.h"
-#include "starboard/common/string.h"
 #include "starboard/configuration.h"
 
 namespace cobalt {
diff --git a/cobalt/loader/cors_preflight.cc b/cobalt/loader/cors_preflight.cc
index 01d8104e2f02..46172a83de95 100644
--- a/cobalt/loader/cors_preflight.cc
+++ b/cobalt/loader/cors_preflight.cc
@@ -27,7 +27,6 @@
 #include "base/strings/string_util.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_util.h"
-#include "starboard/common/string.h"
 
 namespace cobalt {
 namespace loader {
diff --git a/cobalt/loader/cors_preflight_cache.h b/cobalt/loader/cors_preflight_cache.h
index 4f5bcfc4ec30..8821786217f1 100644
--- a/cobalt/loader/cors_preflight_cache.h
+++ b/cobalt/loader/cors_preflight_cache.h
@@ -29,7 +29,6 @@
 #include "base/time/time.h"
 #include "cobalt/network/custom/url_fetcher.h"
 #include "net/http/http_request_headers.h"
-#include "starboard/common/string.h"
 #include "url/gurl.h"
 
 namespace cobalt {
diff --git a/cobalt/media/media_module.cc b/cobalt/media/media_module.cc
index 1947cf960ef5..7d027fee8c21 100644
--- a/cobalt/media/media_module.cc
+++ b/cobalt/media/media_module.cc
@@ -27,7 +27,6 @@
 #include "base/synchronization/waitable_event.h"
 #include "cobalt/media/base/format_support_query_metrics.h"
 #include "media/base/mime_util.h"
-#include "starboard/common/string.h"
 #include "starboard/media.h"
 #include "starboard/window.h"
 
diff --git a/cobalt/media/sandbox/format_guesstimator.cc b/cobalt/media/sandbox/format_guesstimator.cc
index 72a2923ba633..36972f4b512b 100644
--- a/cobalt/media/sandbox/format_guesstimator.cc
+++ b/cobalt/media/sandbox/format_guesstimator.cc
@@ -37,7 +37,6 @@
 #include "media/filters/chunk_demuxer.h"
 #include "net/base/filename_util.h"
 #include "net/base/url_util.h"
-#include "starboard/common/string.h"
 #include "starboard/memory.h"
 #include "starboard/types.h"
 #include "ui/gfx/geometry/size.h"
diff --git a/cobalt/media/sandbox/fuzzer_app.cc b/cobalt/media/sandbox/fuzzer_app.cc
index 49ea02b4946f..53e3402d5728 100644
--- a/cobalt/media/sandbox/fuzzer_app.cc
+++ b/cobalt/media/sandbox/fuzzer_app.cc
@@ -18,7 +18,6 @@
 
 #include "base/files/file_util.h"
 #include "base/logging.h"
-#include "starboard/common/string.h"
 #include "starboard/configuration_constants.h"
 #include "starboard/directory.h"
 
diff --git a/cobalt/media/sandbox/media2_sandbox.cc b/cobalt/media/sandbox/media2_sandbox.cc
index 20c52f783428..1333209b649b 100644
--- a/cobalt/media/sandbox/media2_sandbox.cc
+++ b/cobalt/media/sandbox/media2_sandbox.cc
@@ -29,7 +29,6 @@
 #include "cobalt/media/decoder_buffer_allocator.h"
 #include "media/base/media_log.h"
 #include "media/filters/chunk_demuxer.h"
-#include "starboard/common/string.h"
 #include "starboard/event.h"
 
 namespace cobalt {
diff --git a/cobalt/media_capture/media_devices.cc b/cobalt/media_capture/media_devices.cc
index 0747eebb9139..6d8cf0af3e03 100644
--- a/cobalt/media_capture/media_devices.cc
+++ b/cobalt/media_capture/media_devices.cc
@@ -31,7 +31,6 @@
 #include "cobalt/web/dom_exception.h"
 #include "cobalt/web/environment_settings.h"
 #include "cobalt/web/environment_settings_helper.h"
-#include "starboard/common/string.h"
 
 namespace cobalt {
 namespace media_capture {
diff --git a/cobalt/overlay_info/overlay_info_registry.cc b/cobalt/overlay_info/overlay_info_registry.cc
index f03d7f1a0d7a..ca1df8d46d3e 100644
--- a/cobalt/overlay_info/overlay_info_registry.cc
+++ b/cobalt/overlay_info/overlay_info_registry.cc
@@ -14,10 +14,11 @@
 
 #include "cobalt/overlay_info/overlay_info_registry.h"
 
+#include <cstring>
+
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"
-#include "starboard/common/string.h"
 
 namespace cobalt {
 namespace overlay_info {
diff --git a/cobalt/renderer/rasterizer/skia/skia/src/ports/SkFontStyleSet_cobalt.cc b/cobalt/renderer/rasterizer/skia/skia/src/ports/SkFontStyleSet_cobalt.cc
index ebfb60d861d1..9f57139bb0ce 100644
--- a/cobalt/renderer/rasterizer/skia/skia/src/ports/SkFontStyleSet_cobalt.cc
+++ b/cobalt/renderer/rasterizer/skia/skia/src/ports/SkFontStyleSet_cobalt.cc
@@ -24,7 +24,6 @@
 #include "base/trace_event/trace_event.h"
 #include "cobalt/renderer/rasterizer/skia/skia/src/ports/SkFreeType_cobalt.h"
 #include "cobalt/renderer/rasterizer/skia/skia/src/ports/SkTypeface_cobalt.h"
-#include "starboard/common/string.h"
 #include "third_party/skia/src/utils/SkOSPath.h"
 
 namespace {
diff --git a/cobalt/script/v8c/helpers.h b/cobalt/script/v8c/helpers.h
index 2529039d3989..68604ee2d212 100644
--- a/cobalt/script/v8c/helpers.h
+++ b/cobalt/script/v8c/helpers.h
@@ -17,7 +17,6 @@
 
 #include <string>
 
-#include "starboard/common/string.h"
 #include "v8/include/v8.h"
 
 // Utility functions that are primarily utility V8 wrappers, and aren't
diff --git a/cobalt/trace_event/json_file_outputter.cc b/cobalt/trace_event/json_file_outputter.cc
index c11227b9e954..4d1b2e1fa849 100644
--- a/cobalt/trace_event/json_file_outputter.cc
+++ b/cobalt/trace_event/json_file_outputter.cc
@@ -30,7 +30,6 @@
 #endif
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
-#include "starboard/common/string.h"
 
 namespace cobalt {
 namespace trace_event {
diff --git a/cobalt/web/message_event.cc b/cobalt/web/message_event.cc
index 262e23158873..142a4550d0e1 100644
--- a/cobalt/web/message_event.cc
+++ b/cobalt/web/message_event.cc
@@ -26,7 +26,6 @@
 #include "cobalt/web/context.h"
 #include "cobalt/web/environment_settings.h"
 #include "cobalt/web/environment_settings_helper.h"
-#include "starboard/common/string.h"
 #include "starboard/memory.h"
 #include "v8/include/v8.h"
 
diff --git a/components/update_client/cobalt_slot_management_test.cc b/components/update_client/cobalt_slot_management_test.cc
index aa4d23ab0885..47e3434be6b6 100644
--- a/components/update_client/cobalt_slot_management_test.cc
+++ b/components/update_client/cobalt_slot_management_test.cc
@@ -21,6 +21,7 @@
 
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
+#include "starboard/common/file.h"
 #include "starboard/extension/free_space.h"
 #include "starboard/loader_app/app_key_files.h"
 #include "starboard/loader_app/drain_file.h"
diff --git a/url/url_parse_unittest.cc b/url/url_parse_unittest.cc
index a657eb4fa805..88b6f05efb5f 100644
--- a/url/url_parse_unittest.cc
+++ b/url/url_parse_unittest.cc
@@ -7,11 +7,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/third_party/mozilla/url_parse.h"
 
-#if defined(STARBOARD)
-#include "starboard/common/string.h"
-#include "starboard/types.h"
-#endif
-
 // Interesting IE file:isms...
 //
 //  file:/foo/bar              file:///foo/bar