diff --git a/third_party/icu/source/common/bmpset.cpp b/third_party/icu/source/common/bmpset.cpp
index 08b841229703..bc79f5e5a63b 100644
--- a/third_party/icu/source/common/bmpset.cpp
+++ b/third_party/icu/source/common/bmpset.cpp
@@ -16,9 +16,6 @@
 *   created by: Markus W. Scherer
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/uniset.h"
 #include "unicode/utf8.h"
diff --git a/third_party/icu/source/common/brkiter.cpp b/third_party/icu/source/common/brkiter.cpp
index e4400cf4023e..b9b6ca65cd4b 100644
--- a/third_party/icu/source/common/brkiter.cpp
+++ b/third_party/icu/source/common/brkiter.cpp
@@ -24,9 +24,6 @@
 
 #if !UCONFIG_NO_BREAK_ITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/rbbi.h"
 #include "unicode/brkiter.h"
 #include "unicode/udata.h"
diff --git a/third_party/icu/source/common/bytestrie.cpp b/third_party/icu/source/common/bytestrie.cpp
index c2cce903f668..c4d498c4bfad 100644
--- a/third_party/icu/source/common/bytestrie.cpp
+++ b/third_party/icu/source/common/bytestrie.cpp
@@ -14,9 +14,6 @@
 *   created by: Markus W. Scherer
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/bytestream.h"
 #include "unicode/bytestrie.h"
diff --git a/third_party/icu/source/common/bytestriebuilder.cpp b/third_party/icu/source/common/bytestriebuilder.cpp
index 24e0dcfd7987..ec1ab7d8f508 100644
--- a/third_party/icu/source/common/bytestriebuilder.cpp
+++ b/third_party/icu/source/common/bytestriebuilder.cpp
@@ -14,9 +14,6 @@
 *   created by: Markus W. Scherer
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/bytestrie.h"
 #include "unicode/bytestriebuilder.h"
diff --git a/third_party/icu/source/common/bytestrieiterator.cpp b/third_party/icu/source/common/bytestrieiterator.cpp
index 1b804dc6f005..e64961a1f136 100644
--- a/third_party/icu/source/common/bytestrieiterator.cpp
+++ b/third_party/icu/source/common/bytestrieiterator.cpp
@@ -14,9 +14,6 @@
 *   created by: Markus W. Scherer
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/bytestrie.h"
 #include "unicode/stringpiece.h"
diff --git a/third_party/icu/source/common/cmemory.cpp b/third_party/icu/source/common/cmemory.cpp
index e0e8ba9a46e5..663c1411e4cb 100644
--- a/third_party/icu/source/common/cmemory.cpp
+++ b/third_party/icu/source/common/cmemory.cpp
@@ -20,9 +20,6 @@
 *
 ******************************************************************************
 */
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/uclean.h"
 #include "cmemory.h"
 #include "putilimp.h"
diff --git a/third_party/icu/source/common/cmemory.h b/third_party/icu/source/common/cmemory.h
index fc63f9e2f67e..210bc7645e56 100644
--- a/third_party/icu/source/common/cmemory.h
+++ b/third_party/icu/source/common/cmemory.h
@@ -28,9 +28,6 @@
 
 #include "unicode/utypes.h"
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif
 #include <stddef.h>
 #include <string.h>
 #include "unicode/localpointer.h"
diff --git a/third_party/icu/source/common/cstring.cpp b/third_party/icu/source/common/cstring.cpp
index 81c84e40ae6f..06275c4b5643 100644
--- a/third_party/icu/source/common/cstring.cpp
+++ b/third_party/icu/source/common/cstring.cpp
@@ -22,13 +22,9 @@
 */
 
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#else
-#include <stdio.h>
-#endif
 
 #include <stdlib.h>
+#include <stdio.h>
 #include "unicode/utypes.h"
 #include "cmemory.h"
 #include "cstring.h"
diff --git a/third_party/icu/source/common/cwchar.h b/third_party/icu/source/common/cwchar.h
index 25a283ecddb9..6c17b48533af 100644
--- a/third_party/icu/source/common/cwchar.h
+++ b/third_party/icu/source/common/cwchar.h
@@ -23,10 +23,8 @@
 #ifndef __CWCHAR_H__
 #define __CWCHAR_H__
 
-#if !defined(STARBOARD)
 #include <string.h>
 #include <stdlib.h>
-#endif
 #include "unicode/utypes.h"
 
 /* Do this after utypes.h so that we have U_HAVE_WCHAR_H . */
diff --git a/third_party/icu/source/common/dictbe.cpp b/third_party/icu/source/common/dictbe.cpp
index 2d61f93df92d..ce6c97a85d3d 100644
--- a/third_party/icu/source/common/dictbe.cpp
+++ b/third_party/icu/source/common/dictbe.cpp
@@ -13,9 +13,6 @@
 
 #if !UCONFIG_NO_BREAK_ITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "brkeng.h"
 #include "dictbe.h"
 #include "unicode/uniset.h"
diff --git a/third_party/icu/source/common/loadednormalizer2impl.cpp b/third_party/icu/source/common/loadednormalizer2impl.cpp
index 38528e646dbc..e4b36f1055f1 100644
--- a/third_party/icu/source/common/loadednormalizer2impl.cpp
+++ b/third_party/icu/source/common/loadednormalizer2impl.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_NORMALIZATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/udata.h"
 #include "unicode/localpointer.h"
 #include "unicode/normalizer2.h"
diff --git a/third_party/icu/source/common/locavailable.cpp b/third_party/icu/source/common/locavailable.cpp
index e805e9c2c92a..e8ec512e3709 100644
--- a/third_party/icu/source/common/locavailable.cpp
+++ b/third_party/icu/source/common/locavailable.cpp
@@ -19,9 +19,6 @@
 *   that then do not depend on resource bundle code and res_index bundles.
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/errorcode.h"
 #include "unicode/utypes.h"
 #include "unicode/locid.h"
diff --git a/third_party/icu/source/common/locid.cpp b/third_party/icu/source/common/locid.cpp
index 941d92a272c0..feadbcbccccb 100644
--- a/third_party/icu/source/common/locid.cpp
+++ b/third_party/icu/source/common/locid.cpp
@@ -31,10 +31,6 @@
 ******************************************************************************
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
-
 #include <utility>
 
 #include "unicode/bytestream.h"
diff --git a/third_party/icu/source/common/locutil.cpp b/third_party/icu/source/common/locutil.cpp
index 70ca5ff511cb..3d9d69ff7ed0 100644
--- a/third_party/icu/source/common/locutil.cpp
+++ b/third_party/icu/source/common/locutil.cpp
@@ -10,9 +10,6 @@
 
 #if !UCONFIG_NO_SERVICE || !UCONFIG_NO_TRANSLITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/resbund.h"
 #include "unicode/uenum.h"
 #include "cmemory.h"
diff --git a/third_party/icu/source/common/messagepattern.cpp b/third_party/icu/source/common/messagepattern.cpp
index 93406a50cb40..f223d0671164 100644
--- a/third_party/icu/source/common/messagepattern.cpp
+++ b/third_party/icu/source/common/messagepattern.cpp
@@ -18,9 +18,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/messagepattern.h"
 #include "unicode/unistr.h"
 #include "unicode/utf16.h"
diff --git a/third_party/icu/source/common/normalizer2impl.cpp b/third_party/icu/source/common/normalizer2impl.cpp
index 5ec4c17ce1df..cbf6b4d98045 100644
--- a/third_party/icu/source/common/normalizer2impl.cpp
+++ b/third_party/icu/source/common/normalizer2impl.cpp
@@ -22,9 +22,6 @@
 
 #if !UCONFIG_NO_NORMALIZATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/bytestream.h"
 #include "unicode/edits.h"
 #include "unicode/normalizer2.h"
diff --git a/third_party/icu/source/common/propsvec.cpp b/third_party/icu/source/common/propsvec.cpp
index d3d75bc42305..056fcda9cf68 100644
--- a/third_party/icu/source/common/propsvec.cpp
+++ b/third_party/icu/source/common/propsvec.cpp
@@ -18,9 +18,6 @@
 *   Store bits (Unicode character properties) in bit set vectors.
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include <stdlib.h>
 #include "unicode/utypes.h"
 #include "cmemory.h"
diff --git a/third_party/icu/source/common/punycode.cpp b/third_party/icu/source/common/punycode.cpp
index 3e57f1507cd5..4832938ff7eb 100644
--- a/third_party/icu/source/common/punycode.cpp
+++ b/third_party/icu/source/common/punycode.cpp
@@ -44,9 +44,6 @@ Disclaimer and license
  * - UTF-16 handling
  */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_IDNA
diff --git a/third_party/icu/source/common/putil.cpp b/third_party/icu/source/common/putil.cpp
index 7867559f3d26..0680009833ce 100644
--- a/third_party/icu/source/common/putil.cpp
+++ b/third_party/icu/source/common/putil.cpp
@@ -39,12 +39,6 @@
 ******************************************************************************
 */
 
-// Starboard poems must be included before uposixdefs.h, or else they cause
-// compiler errors on some platforms.
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
-
 // Defines _XOPEN_SOURCE for access to POSIX functions.
 // Must be before any other #includes.
 #include "uposixdefs.h"
diff --git a/third_party/icu/source/common/rbbi.cpp b/third_party/icu/source/common/rbbi.cpp
index 0d3a10ad19d1..9b7e70c3cf41 100644
--- a/third_party/icu/source/common/rbbi.cpp
+++ b/third_party/icu/source/common/rbbi.cpp
@@ -18,10 +18,6 @@
 
 #if !UCONFIG_NO_BREAK_ITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
-
 #include <cinttypes>
 
 #include "unicode/rbbi.h"
diff --git a/third_party/icu/source/common/rbbidata.cpp b/third_party/icu/source/common/rbbidata.cpp
index 6099c2696782..193acafc4420 100644
--- a/third_party/icu/source/common/rbbidata.cpp
+++ b/third_party/icu/source/common/rbbidata.cpp
@@ -11,9 +11,6 @@
 
 #if !UCONFIG_NO_BREAK_ITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/ucptrie.h"
 #include "unicode/utypes.h"
 #include "rbbidata.h"
diff --git a/third_party/icu/source/common/rbbinode.cpp b/third_party/icu/source/common/rbbinode.cpp
index 50111b071e70..69d84151fe81 100644
--- a/third_party/icu/source/common/rbbinode.cpp
+++ b/third_party/icu/source/common/rbbinode.cpp
@@ -21,9 +21,6 @@
 
 #if !UCONFIG_NO_BREAK_ITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/unistr.h"
 #include "unicode/uniset.h"
 #include "unicode/uchar.h"
diff --git a/third_party/icu/source/common/rbbiscan.cpp b/third_party/icu/source/common/rbbiscan.cpp
index a8f42f41b735..9c406af67136 100644
--- a/third_party/icu/source/common/rbbiscan.cpp
+++ b/third_party/icu/source/common/rbbiscan.cpp
@@ -18,9 +18,6 @@
 
 #if !UCONFIG_NO_BREAK_ITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/unistr.h"
 #include "unicode/uniset.h"
 #include "unicode/uchar.h"
diff --git a/third_party/icu/source/common/rbbisetb.cpp b/third_party/icu/source/common/rbbisetb.cpp
index 7f84f6413c61..29faeb8c456d 100644
--- a/third_party/icu/source/common/rbbisetb.cpp
+++ b/third_party/icu/source/common/rbbisetb.cpp
@@ -34,9 +34,6 @@
 
 #if !UCONFIG_NO_BREAK_ITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/uniset.h"
 #include "uvector.h"
 #include "uassert.h"
diff --git a/third_party/icu/source/common/rbbitblb.cpp b/third_party/icu/source/common/rbbitblb.cpp
index 1c918310bb8b..bcbdab9227c7 100644
--- a/third_party/icu/source/common/rbbitblb.cpp
+++ b/third_party/icu/source/common/rbbitblb.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_BREAK_ITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/unistr.h"
 #include "rbbitblb.h"
 #include "rbbirb.h"
diff --git a/third_party/icu/source/common/sharedobject.cpp b/third_party/icu/source/common/sharedobject.cpp
index 20030a6fbb13..6eeca8605f00 100644
--- a/third_party/icu/source/common/sharedobject.cpp
+++ b/third_party/icu/source/common/sharedobject.cpp
@@ -7,9 +7,6 @@
 ******************************************************************************
 * sharedobject.cpp
 */
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "sharedobject.h"
 #include "mutex.h"
 #include "uassert.h"
diff --git a/third_party/icu/source/common/stringtriebuilder.cpp b/third_party/icu/source/common/stringtriebuilder.cpp
index fe12d776ae9e..bad99fd678c4 100644
--- a/third_party/icu/source/common/stringtriebuilder.cpp
+++ b/third_party/icu/source/common/stringtriebuilder.cpp
@@ -14,9 +14,6 @@
 *   created by: Markus W. Scherer
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "utypeinfo.h"  // for 'typeid' to work
 #include "unicode/utypes.h"
 #include "unicode/stringtriebuilder.h"
diff --git a/third_party/icu/source/common/uassert.h b/third_party/icu/source/common/uassert.h
index a42f823a1af4..72d19fa10666 100644
--- a/third_party/icu/source/common/uassert.h
+++ b/third_party/icu/source/common/uassert.h
@@ -32,9 +32,7 @@
 #include "starboard/configuration.h"
 #endif  // defined(STARBOARD)
 #if U_DEBUG
-#if !defined(STARBOARD)
 #   include <assert.h>
-#endif
 #   define U_ASSERT(exp) assert(exp)
 #elif U_CPLUSPLUS_VERSION
 #   define U_ASSERT(exp) (void)0
diff --git a/third_party/icu/source/common/ubidi.cpp b/third_party/icu/source/common/ubidi.cpp
index 7d8b7a6dcc8f..3ddb45721e25 100644
--- a/third_party/icu/source/common/ubidi.cpp
+++ b/third_party/icu/source/common/ubidi.cpp
@@ -17,9 +17,6 @@
 *
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "cmemory.h"
 #include "unicode/utypes.h"
 #include "unicode/ustring.h"
diff --git a/third_party/icu/source/common/ubidiln.cpp b/third_party/icu/source/common/ubidiln.cpp
index 8d46750a105b..3545f4e111ce 100644
--- a/third_party/icu/source/common/ubidiln.cpp
+++ b/third_party/icu/source/common/ubidiln.cpp
@@ -16,9 +16,6 @@
 *   created by: Markus W. Scherer, updated by Matitiahu Allouche
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "cmemory.h"
 #include "unicode/utypes.h"
 #include "unicode/ustring.h"
diff --git a/third_party/icu/source/common/uchar.cpp b/third_party/icu/source/common/uchar.cpp
index 4e826272c140..eb14e4c75d5a 100644
--- a/third_party/icu/source/common/uchar.cpp
+++ b/third_party/icu/source/common/uchar.cpp
@@ -21,9 +21,6 @@
 ******************************************************************************
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/uchar.h"
 #include "unicode/uscript.h"
diff --git a/third_party/icu/source/common/ucharstriebuilder.cpp b/third_party/icu/source/common/ucharstriebuilder.cpp
index 583179816d1e..049997a27545 100644
--- a/third_party/icu/source/common/ucharstriebuilder.cpp
+++ b/third_party/icu/source/common/ucharstriebuilder.cpp
@@ -14,9 +14,6 @@
 *   created by: Markus W. Scherer
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/ucharstrie.h"
 #include "unicode/ucharstriebuilder.h"
diff --git a/third_party/icu/source/common/ucharstrieiterator.cpp b/third_party/icu/source/common/ucharstrieiterator.cpp
index 837dc98ea4dd..b3132241fe2b 100644
--- a/third_party/icu/source/common/ucharstrieiterator.cpp
+++ b/third_party/icu/source/common/ucharstrieiterator.cpp
@@ -14,9 +14,6 @@
 *   created by: Markus W. Scherer
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/ucharstrie.h"
 #include "unicode/unistr.h"
diff --git a/third_party/icu/source/common/ucln_cmn.cpp b/third_party/icu/source/common/ucln_cmn.cpp
index 2078d5221146..f3e07c6b8918 100644
--- a/third_party/icu/source/common/ucln_cmn.cpp
+++ b/third_party/icu/source/common/ucln_cmn.cpp
@@ -14,9 +14,6 @@
 *   created by: George Rhoten
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/uclean.h"
 #include "cmemory.h"
diff --git a/third_party/icu/source/common/ucln_imp.h b/third_party/icu/source/common/ucln_imp.h
index 72231f414620..63a54c86f624 100644
--- a/third_party/icu/source/common/ucln_imp.h
+++ b/third_party/icu/source/common/ucln_imp.h
@@ -21,9 +21,7 @@
 #define __UCLN_IMP_H__
 
 #include "ucln.h"
-#if !defined(STARBOARD)
 #include <stdlib.h>
-#endif
 
 /**
  * Auto cleanup of ICU libraries
diff --git a/third_party/icu/source/common/ucnv.cpp b/third_party/icu/source/common/ucnv.cpp
index 5041a896a6d2..5dcf35e04385 100644
--- a/third_party/icu/source/common/ucnv.cpp
+++ b/third_party/icu/source/common/ucnv.cpp
@@ -21,9 +21,6 @@
 *   06/20/2000  helena      OS/400 port changes; mostly typecast.
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_CONVERSION
diff --git a/third_party/icu/source/common/ucnv_bld.cpp b/third_party/icu/source/common/ucnv_bld.cpp
index 0d6958709e44..0e198892f1bd 100644
--- a/third_party/icu/source/common/ucnv_bld.cpp
+++ b/third_party/icu/source/common/ucnv_bld.cpp
@@ -25,9 +25,6 @@
 
 #if !UCONFIG_NO_CONVERSION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/putil.h"
 #include "unicode/udata.h"
 #include "unicode/ucnv.h"
diff --git a/third_party/icu/source/common/ucnv_ext.cpp b/third_party/icu/source/common/ucnv_ext.cpp
index 560950ae08fd..7dea4eef41a4 100644
--- a/third_party/icu/source/common/ucnv_ext.cpp
+++ b/third_party/icu/source/common/ucnv_ext.cpp
@@ -22,9 +22,6 @@
 
 #if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/uset.h"
 #include "unicode/ustring.h"
 #include "ucnv_bld.h"
diff --git a/third_party/icu/source/common/ucnv_io.cpp b/third_party/icu/source/common/ucnv_io.cpp
index 2d9741fce55d..7a95a3f1e61d 100644
--- a/third_party/icu/source/common/ucnv_io.cpp
+++ b/third_party/icu/source/common/ucnv_io.cpp
@@ -29,9 +29,6 @@
 *******************************************************************************
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_CONVERSION
diff --git a/third_party/icu/source/common/ucnvsel.cpp b/third_party/icu/source/common/ucnvsel.cpp
index c53995485295..2dff5ac1bc83 100644
--- a/third_party/icu/source/common/ucnvsel.cpp
+++ b/third_party/icu/source/common/ucnvsel.cpp
@@ -30,9 +30,6 @@
 
 #if !UCONFIG_NO_CONVERSION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include <string.h>
 
 #include "unicode/uchar.h"
diff --git a/third_party/icu/source/common/udata.cpp b/third_party/icu/source/common/udata.cpp
index f2bd38c81081..37464a3386ec 100644
--- a/third_party/icu/source/common/udata.cpp
+++ b/third_party/icu/source/common/udata.cpp
@@ -16,10 +16,6 @@
 *   created by: Markus W. Scherer
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
-
 #include "unicode/utypes.h"  /* U_PLATFORM etc. */
 
 #ifdef __GNUC__
diff --git a/third_party/icu/source/common/uhash.cpp b/third_party/icu/source/common/uhash.cpp
index 358cb979922a..86311ceb0b25 100644
--- a/third_party/icu/source/common/uhash.cpp
+++ b/third_party/icu/source/common/uhash.cpp
@@ -12,9 +12,6 @@
 ******************************************************************************
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "uhash.h"
 #include "unicode/ustring.h"
 #include "cstring.h"
diff --git a/third_party/icu/source/common/uidna.cpp b/third_party/icu/source/common/uidna.cpp
index e6cb4e12e007..ac2f9c3c8cd9 100644
--- a/third_party/icu/source/common/uidna.cpp
+++ b/third_party/icu/source/common/uidna.cpp
@@ -20,9 +20,6 @@
 
 #if !UCONFIG_NO_IDNA
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/uidna.h"
 #include "unicode/ustring.h"
 #include "unicode/usprep.h"
diff --git a/third_party/icu/source/common/uinvchar.cpp b/third_party/icu/source/common/uinvchar.cpp
index 613efede8a3b..52b890656856 100644
--- a/third_party/icu/source/common/uinvchar.cpp
+++ b/third_party/icu/source/common/uinvchar.cpp
@@ -19,9 +19,6 @@
 *   for better modularization.
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/ustring.h"
 #include "udataswp.h"
diff --git a/third_party/icu/source/common/uloc.cpp b/third_party/icu/source/common/uloc.cpp
index 78e387c10433..ebfbb506508c 100644
--- a/third_party/icu/source/common/uloc.cpp
+++ b/third_party/icu/source/common/uloc.cpp
@@ -30,9 +30,6 @@
      l = lang, C = ctry, M = charmap, V = variant
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/bytestream.h"
 #include "unicode/errorcode.h"
 #include "unicode/stringpiece.h"
diff --git a/third_party/icu/source/common/uloc_keytype.cpp b/third_party/icu/source/common/uloc_keytype.cpp
index d259ec65ec00..019da058cf49 100644
--- a/third_party/icu/source/common/uloc_keytype.cpp
+++ b/third_party/icu/source/common/uloc_keytype.cpp
@@ -6,10 +6,6 @@
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 */
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
-
 #include <algorithm>
 
 #include "unicode/utypes.h"
diff --git a/third_party/icu/source/common/uloc_tag.cpp b/third_party/icu/source/common/uloc_tag.cpp
index e687436dfc7b..7f7fd9119e90 100644
--- a/third_party/icu/source/common/uloc_tag.cpp
+++ b/third_party/icu/source/common/uloc_tag.cpp
@@ -7,9 +7,6 @@
 **********************************************************************
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/bytestream.h"
 #include "unicode/utypes.h"
 #include "unicode/ures.h"
diff --git a/third_party/icu/source/common/umapfile.cpp b/third_party/icu/source/common/umapfile.cpp
index bb1d68de53c1..3e714876a4dc 100644
--- a/third_party/icu/source/common/umapfile.cpp
+++ b/third_party/icu/source/common/umapfile.cpp
@@ -340,6 +340,7 @@ typedef HANDLE MemoryMap;
         }
     }
 
+
 #elif MAP_IMPLEMENTATION==MAP_390DLL
     /*  390 specific Library Loading.
      *  This is the only platform left that dynamically loads an ICU Data Library.
diff --git a/third_party/icu/source/common/umutex.cpp b/third_party/icu/source/common/umutex.cpp
index 89cea563a9d6..ccbee9960a39 100644
--- a/third_party/icu/source/common/umutex.cpp
+++ b/third_party/icu/source/common/umutex.cpp
@@ -20,9 +20,6 @@
 ******************************************************************************
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "umutex.h"
 
 #include "unicode/utypes.h"
diff --git a/third_party/icu/source/common/unames.cpp b/third_party/icu/source/common/unames.cpp
index 8acc7ca78e15..5776058f957f 100644
--- a/third_party/icu/source/common/unames.cpp
+++ b/third_party/icu/source/common/unames.cpp
@@ -16,9 +16,6 @@
 *   created by: Markus W. Scherer
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/putil.h"
 #include "unicode/uchar.h"
diff --git a/third_party/icu/source/common/unicode/uconfig.h b/third_party/icu/source/common/unicode/uconfig.h
index 53ecdcc66e52..39920a63f6ac 100644
--- a/third_party/icu/source/common/unicode/uconfig.h
+++ b/third_party/icu/source/common/unicode/uconfig.h
@@ -181,8 +181,7 @@
  * 1 if a custom library suffix is set.
  * @internal
  */
-
-#if defined(STARBOARD) || defined(__LB_XB1__) || defined(__LB_PS3__)
+#if defined(STARBOARD)
 #define U_LIB_SUFFIX_C_NAME
 #define U_LIB_SUFFIX_C_NAME_STRING ""
 #define U_HAVE_LIB_SUFFIX 0
diff --git a/third_party/icu/source/common/unicode/utrace.h b/third_party/icu/source/common/unicode/utrace.h
index 6ca252f07591..28c313c582f8 100644
--- a/third_party/icu/source/common/unicode/utrace.h
+++ b/third_party/icu/source/common/unicode/utrace.h
@@ -22,9 +22,7 @@
 #ifndef __UTRACE_H__
 #define __UTRACE_H__
 
-#if !defined(STARBOARD)
 #include <stdarg.h>
-#endif
 #include "unicode/utypes.h"
 
 /**
diff --git a/third_party/icu/source/common/unicode/utypes.h b/third_party/icu/source/common/unicode/utypes.h
index 89ed56d6586a..63e70d57dafb 100644
--- a/third_party/icu/source/common/unicode/utypes.h
+++ b/third_party/icu/source/common/unicode/utypes.h
@@ -38,9 +38,7 @@
 #include "unicode/umachine.h"
 #include "unicode/uversion.h"
 #include "unicode/uconfig.h"
-#if !defined(STARBOARD)
 #include <float.h>
-#endif
 
 #if !U_NO_DEFAULT_INCLUDE_UTF_HEADERS
 #   include "unicode/utf.h"
diff --git a/third_party/icu/source/common/unifiedcache.cpp b/third_party/icu/source/common/unifiedcache.cpp
index d0f83acd593a..493ab79f6d90 100644
--- a/third_party/icu/source/common/unifiedcache.cpp
+++ b/third_party/icu/source/common/unifiedcache.cpp
@@ -15,10 +15,6 @@
 #include <algorithm>      // For std::max()
 #include <mutex>
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
-
 #include "uassert.h"
 #include "uhash.h"
 #include "ucln_cmn.h"
diff --git a/third_party/icu/source/common/uniset_props.cpp b/third_party/icu/source/common/uniset_props.cpp
index 82f0d2f82f96..37277fcb751f 100644
--- a/third_party/icu/source/common/uniset_props.cpp
+++ b/third_party/icu/source/common/uniset_props.cpp
@@ -18,9 +18,6 @@
 *   Character property dependent functions moved here from uniset.cpp
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/uniset.h"
 #include "unicode/parsepos.h"
diff --git a/third_party/icu/source/common/unistr.cpp b/third_party/icu/source/common/unistr.cpp
index c8f7e60e0f5e..077b4d6ef208 100644
--- a/third_party/icu/source/common/unistr.cpp
+++ b/third_party/icu/source/common/unistr.cpp
@@ -20,9 +20,6 @@
 ******************************************************************************
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/appendable.h"
 #include "unicode/putil.h"
diff --git a/third_party/icu/source/common/uposixdefs.h b/third_party/icu/source/common/uposixdefs.h
index 23c3f6d46670..5344a952db8d 100644
--- a/third_party/icu/source/common/uposixdefs.h
+++ b/third_party/icu/source/common/uposixdefs.h
@@ -20,6 +20,13 @@
 #ifndef __UPOSIXDEFS_H__
 #define __UPOSIXDEFS_H__
 
+#if defined(STARBOARD)
+#include "starboard/configuration.h"
+#if SB_HAS(SYS_TYPES_H)
+#include <sys/types.h>
+#endif  // SB_HAS(SYS_TYPES_H)
+#endif  // defined(STARBOARD)
+
 /*
  * Define _XOPEN_SOURCE for access to POSIX functions.
  *
diff --git a/third_party/icu/source/common/uresbund.cpp b/third_party/icu/source/common/uresbund.cpp
index b1275bd73191..2ece87897d7c 100644
--- a/third_party/icu/source/common/uresbund.cpp
+++ b/third_party/icu/source/common/uresbund.cpp
@@ -21,9 +21,6 @@
 ******************************************************************************
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/ures.h"
 #include "unicode/ustring.h"
 #include "unicode/ucnv.h"
diff --git a/third_party/icu/source/common/uresdata.cpp b/third_party/icu/source/common/uresdata.cpp
index 93a495dbffdb..ae731e454428 100644
--- a/third_party/icu/source/common/uresdata.cpp
+++ b/third_party/icu/source/common/uresdata.cpp
@@ -19,9 +19,6 @@
 *   06/24/02    weiv        Added support for resource sharing
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/udata.h"
 #include "unicode/ustring.h"
diff --git a/third_party/icu/source/common/ushape.cpp b/third_party/icu/source/common/ushape.cpp
index a56b2c802124..ae13b5c11834 100644
--- a/third_party/icu/source/common/ushape.cpp
+++ b/third_party/icu/source/common/ushape.cpp
@@ -18,9 +18,6 @@
  *   Arabic letter shaping implemented by Ayman Roshdy
  */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/uchar.h"
 #include "unicode/ustring.h"
diff --git a/third_party/icu/source/common/ustrcase.cpp b/third_party/icu/source/common/ustrcase.cpp
index d797e9e97fc9..618e847c65d5 100644
--- a/third_party/icu/source/common/ustrcase.cpp
+++ b/third_party/icu/source/common/ustrcase.cpp
@@ -20,9 +20,6 @@
 *   to the Unicode Character Database (uprops.dat).
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/brkiter.h"
 #include "unicode/casemap.h"
diff --git a/third_party/icu/source/common/ustrenum.cpp b/third_party/icu/source/common/ustrenum.cpp
index eb1660f18226..ed23eaa232ec 100644
--- a/third_party/icu/source/common/ustrenum.cpp
+++ b/third_party/icu/source/common/ustrenum.cpp
@@ -10,9 +10,6 @@
 * Since: ICU 2.4
 **********************************************************************
 */
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "utypeinfo.h"  // for 'typeid' to work 
 
 #include "unicode/ustring.h"
diff --git a/third_party/icu/source/common/ustrtrns.cpp b/third_party/icu/source/common/ustrtrns.cpp
index b8976517592e..5dc032c02fb8 100644
--- a/third_party/icu/source/common/ustrtrns.cpp
+++ b/third_party/icu/source/common/ustrtrns.cpp
@@ -26,9 +26,6 @@
  */
 
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/putil.h"
 #include "unicode/ustring.h"
 #include "unicode/utf.h"
diff --git a/third_party/icu/source/common/utext.cpp b/third_party/icu/source/common/utext.cpp
index e811f455ea39..763b6684fbae 100644
--- a/third_party/icu/source/common/utext.cpp
+++ b/third_party/icu/source/common/utext.cpp
@@ -18,10 +18,6 @@
 
 #include <cstddef>
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
-
 #include "unicode/utypes.h"
 #include "unicode/ustring.h"
 #include "unicode/unistr.h"
diff --git a/third_party/icu/source/common/utf_impl.cpp b/third_party/icu/source/common/utf_impl.cpp
index bcdb98e749e2..9dd241a12bfa 100644
--- a/third_party/icu/source/common/utf_impl.cpp
+++ b/third_party/icu/source/common/utf_impl.cpp
@@ -20,9 +20,6 @@
 */
 
 /* set import/export definitions */
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #ifndef U_UTF8_IMPL
 #   define U_UTF8_IMPL
 #endif
diff --git a/third_party/icu/source/common/utrace.cpp b/third_party/icu/source/common/utrace.cpp
index 1ad4a4871ecf..c98154659470 100644
--- a/third_party/icu/source/common/utrace.cpp
+++ b/third_party/icu/source/common/utrace.cpp
@@ -11,9 +11,6 @@
 *   indentation:4
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utrace.h"
 #include "utracimp.h"
 #include "cstring.h"
diff --git a/third_party/icu/source/common/utrie2.cpp b/third_party/icu/source/common/utrie2.cpp
index 0340356b01e4..24ef5782c905 100644
--- a/third_party/icu/source/common/utrie2.cpp
+++ b/third_party/icu/source/common/utrie2.cpp
@@ -24,9 +24,6 @@
 *   This file contains only the runtime and enumeration code, for read-only access.
 *   See utrie2_builder.c for the builder code.
 */
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #ifdef UCPTRIE_DEBUG
 #include "unicode/umutablecptrie.h"
diff --git a/third_party/icu/source/common/uvectr32.cpp b/third_party/icu/source/common/uvectr32.cpp
index 2580e3350c96..d1ae65995850 100644
--- a/third_party/icu/source/common/uvectr32.cpp
+++ b/third_party/icu/source/common/uvectr32.cpp
@@ -10,9 +10,6 @@
 **********************************************************************
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "uvectr32.h"
 #include "cmemory.h"
 #include "putilimp.h"
diff --git a/third_party/icu/source/common/uvectr64.cpp b/third_party/icu/source/common/uvectr64.cpp
index e713936158d2..081565959cf6 100644
--- a/third_party/icu/source/common/uvectr64.cpp
+++ b/third_party/icu/source/common/uvectr64.cpp
@@ -7,9 +7,6 @@
 ******************************************************************************
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "uvectr64.h"
 #include "cmemory.h"
 #include "putilimp.h"
diff --git a/third_party/icu/source/i18n/alphaindex.cpp b/third_party/icu/source/i18n/alphaindex.cpp
index 78ee577e5a0d..9c312bd8e674 100644
--- a/third_party/icu/source/i18n/alphaindex.cpp
+++ b/third_party/icu/source/i18n/alphaindex.cpp
@@ -11,9 +11,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/alphaindex.h"
 #include "unicode/coll.h"
 #include "unicode/localpointer.h"
diff --git a/third_party/icu/source/i18n/brktrans.cpp b/third_party/icu/source/i18n/brktrans.cpp
index 615ca7356ffc..46b0e345dae9 100644
--- a/third_party/icu/source/i18n/brktrans.cpp
+++ b/third_party/icu/source/i18n/brktrans.cpp
@@ -16,9 +16,6 @@
 
 #if  !UCONFIG_NO_TRANSLITERATION && !UCONFIG_NO_BREAK_ITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/brkiter.h"
 #include "unicode/localpointer.h"
 #include "unicode/uchar.h"
diff --git a/third_party/icu/source/i18n/calendar.cpp b/third_party/icu/source/i18n/calendar.cpp
index eeac95a701da..c3e5e8c4f662 100644
--- a/third_party/icu/source/i18n/calendar.cpp
+++ b/third_party/icu/source/i18n/calendar.cpp
@@ -32,9 +32,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/gregocal.h"
 #include "unicode/basictz.h"
 #include "unicode/simpletz.h"
diff --git a/third_party/icu/source/i18n/choicfmt.cpp b/third_party/icu/source/i18n/choicfmt.cpp
index 07fc45b9b7fa..7e26bb7a1f6d 100644
--- a/third_party/icu/source/i18n/choicfmt.cpp
+++ b/third_party/icu/source/i18n/choicfmt.cpp
@@ -29,9 +29,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/choicfmt.h"
 #include "unicode/numfmt.h"
 #include "unicode/locid.h"
diff --git a/third_party/icu/source/i18n/coleitr.cpp b/third_party/icu/source/i18n/coleitr.cpp
index 25663ffda665..64d3ab4d2bfe 100644
--- a/third_party/icu/source/i18n/coleitr.cpp
+++ b/third_party/icu/source/i18n/coleitr.cpp
@@ -29,9 +29,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/chariter.h"
 #include "unicode/coleitr.h"
 #include "unicode/tblcoll.h"
diff --git a/third_party/icu/source/i18n/coll.cpp b/third_party/icu/source/i18n/coll.cpp
index 80a09d258021..7b87b41dff24 100644
--- a/third_party/icu/source/i18n/coll.cpp
+++ b/third_party/icu/source/i18n/coll.cpp
@@ -46,9 +46,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/coll.h"
 #include "unicode/tblcoll.h"
 #include "collationdata.h"
diff --git a/third_party/icu/source/i18n/collation.cpp b/third_party/icu/source/i18n/collation.cpp
index 3a04abad3a32..14cb86576b82 100644
--- a/third_party/icu/source/i18n/collation.cpp
+++ b/third_party/icu/source/i18n/collation.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "collation.h"
 #include "uassert.h"
 
diff --git a/third_party/icu/source/i18n/collationbuilder.cpp b/third_party/icu/source/i18n/collationbuilder.cpp
index 937bd1e6a792..45ac6ddcd583 100644
--- a/third_party/icu/source/i18n/collationbuilder.cpp
+++ b/third_party/icu/source/i18n/collationbuilder.cpp
@@ -21,9 +21,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/caniter.h"
 #include "unicode/normalizer2.h"
 #include "unicode/tblcoll.h"
diff --git a/third_party/icu/source/i18n/collationcompare.cpp b/third_party/icu/source/i18n/collationcompare.cpp
index cea995affecd..cbf32c9fe68f 100644
--- a/third_party/icu/source/i18n/collationcompare.cpp
+++ b/third_party/icu/source/i18n/collationcompare.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/ucol.h"
 #include "cmemory.h"
 #include "collation.h"
diff --git a/third_party/icu/source/i18n/collationdata.cpp b/third_party/icu/source/i18n/collationdata.cpp
index e09f097eecef..688770f8f62c 100644
--- a/third_party/icu/source/i18n/collationdata.cpp
+++ b/third_party/icu/source/i18n/collationdata.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/ucol.h"
 #include "unicode/udata.h"
 #include "unicode/uscript.h"
diff --git a/third_party/icu/source/i18n/collationdatabuilder.cpp b/third_party/icu/source/i18n/collationdatabuilder.cpp
index 4f247c960067..53361b86c7c7 100644
--- a/third_party/icu/source/i18n/collationdatabuilder.cpp
+++ b/third_party/icu/source/i18n/collationdatabuilder.cpp
@@ -17,9 +17,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/localpointer.h"
 #include "unicode/uchar.h"
 #include "unicode/ucharstrie.h"
diff --git a/third_party/icu/source/i18n/collationdatareader.cpp b/third_party/icu/source/i18n/collationdatareader.cpp
index fd9131a34cbb..0eb1861343cd 100644
--- a/third_party/icu/source/i18n/collationdatareader.cpp
+++ b/third_party/icu/source/i18n/collationdatareader.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/ucol.h"
 #include "unicode/udata.h"
 #include "unicode/uscript.h"
diff --git a/third_party/icu/source/i18n/collationdatawriter.cpp b/third_party/icu/source/i18n/collationdatawriter.cpp
index 32b9e6ac5de5..823c8eb0111d 100644
--- a/third_party/icu/source/i18n/collationdatawriter.cpp
+++ b/third_party/icu/source/i18n/collationdatawriter.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/tblcoll.h"
 #include "unicode/udata.h"
 #include "unicode/uniset.h"
diff --git a/third_party/icu/source/i18n/collationfastlatin.cpp b/third_party/icu/source/i18n/collationfastlatin.cpp
index ecceabb327bd..b98b8457f458 100644
--- a/third_party/icu/source/i18n/collationfastlatin.cpp
+++ b/third_party/icu/source/i18n/collationfastlatin.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/ucol.h"
 #include "collationdata.h"
 #include "collationfastlatin.h"
diff --git a/third_party/icu/source/i18n/collationfastlatinbuilder.cpp b/third_party/icu/source/i18n/collationfastlatinbuilder.cpp
index 8eb263511e79..e5ba2f0e21dd 100644
--- a/third_party/icu/source/i18n/collationfastlatinbuilder.cpp
+++ b/third_party/icu/source/i18n/collationfastlatinbuilder.cpp
@@ -21,9 +21,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/ucol.h"
 #include "unicode/ucharstrie.h"
 #include "unicode/unistr.h"
diff --git a/third_party/icu/source/i18n/collationiterator.cpp b/third_party/icu/source/i18n/collationiterator.cpp
index 329283a2e40a..18ccf014f0a4 100644
--- a/third_party/icu/source/i18n/collationiterator.cpp
+++ b/third_party/icu/source/i18n/collationiterator.cpp
@@ -17,9 +17,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/ucharstrie.h"
 #include "unicode/ustringtrie.h"
 #include "charstr.h"
diff --git a/third_party/icu/source/i18n/collationkeys.cpp b/third_party/icu/source/i18n/collationkeys.cpp
index 664094ccd217..b5c322fb4467 100644
--- a/third_party/icu/source/i18n/collationkeys.cpp
+++ b/third_party/icu/source/i18n/collationkeys.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/bytestream.h"
 #include "collation.h"
 #include "collationiterator.h"
diff --git a/third_party/icu/source/i18n/collationrootelements.cpp b/third_party/icu/source/i18n/collationrootelements.cpp
index c061c6814668..9b46d14144bb 100644
--- a/third_party/icu/source/i18n/collationrootelements.cpp
+++ b/third_party/icu/source/i18n/collationrootelements.cpp
@@ -11,9 +11,6 @@
 * created by: Markus W. Scherer
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_COLLATION
diff --git a/third_party/icu/source/i18n/collationruleparser.cpp b/third_party/icu/source/i18n/collationruleparser.cpp
index 3b2c4b03bf8f..ade6ecb552ae 100644
--- a/third_party/icu/source/i18n/collationruleparser.cpp
+++ b/third_party/icu/source/i18n/collationruleparser.cpp
@@ -17,9 +17,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/normalizer2.h"
 #include "unicode/parseerr.h"
 #include "unicode/uchar.h"
diff --git a/third_party/icu/source/i18n/collationsets.cpp b/third_party/icu/source/i18n/collationsets.cpp
index 615d6c32fc32..09581416a854 100644
--- a/third_party/icu/source/i18n/collationsets.cpp
+++ b/third_party/icu/source/i18n/collationsets.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/ucharstrie.h"
 #include "unicode/uniset.h"
 #include "unicode/unistr.h"
diff --git a/third_party/icu/source/i18n/collationsettings.cpp b/third_party/icu/source/i18n/collationsettings.cpp
index 7363bd6c6027..534e20df3e84 100644
--- a/third_party/icu/source/i18n/collationsettings.cpp
+++ b/third_party/icu/source/i18n/collationsettings.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/ucol.h"
 #include "cmemory.h"
 #include "collation.h"
diff --git a/third_party/icu/source/i18n/collationtailoring.cpp b/third_party/icu/source/i18n/collationtailoring.cpp
index 568c6c981a54..78a11fbb26b8 100644
--- a/third_party/icu/source/i18n/collationtailoring.cpp
+++ b/third_party/icu/source/i18n/collationtailoring.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/udata.h"
 #include "unicode/unistr.h"
 #include "unicode/ures.h"
diff --git a/third_party/icu/source/i18n/collationweights.cpp b/third_party/icu/source/i18n/collationweights.cpp
index c21a548486d1..05458962c6d9 100644
--- a/third_party/icu/source/i18n/collationweights.cpp
+++ b/third_party/icu/source/i18n/collationweights.cpp
@@ -24,9 +24,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "cmemory.h"
 #include "collation.h"
 #include "collationweights.h"
diff --git a/third_party/icu/source/i18n/dangical.cpp b/third_party/icu/source/i18n/dangical.cpp
index bf65e237f4de..02db40368ec8 100644
--- a/third_party/icu/source/i18n/dangical.cpp
+++ b/third_party/icu/source/i18n/dangical.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "gregoimp.h" // Math
 #include "uassert.h"
 #include "ucln_in.h"
diff --git a/third_party/icu/source/i18n/decNumber.cpp b/third_party/icu/source/i18n/decNumber.cpp
index 0bf8bc97111c..cee2f8e94984 100644
--- a/third_party/icu/source/i18n/decNumber.cpp
+++ b/third_party/icu/source/i18n/decNumber.cpp
@@ -176,9 +176,6 @@
 /*      **  -- raise to the power                                     */
 /* ------------------------------------------------------------------ */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include <stdlib.h>                /* for malloc, free, etc.  */
 /*  #include <stdio.h>   */        /* for printf [if needed]  */
 #include <string.h>                /* for strcpy  */
diff --git a/third_party/icu/source/i18n/decimfmt.cpp b/third_party/icu/source/i18n/decimfmt.cpp
index fdbc1ecd3081..daa1129a6ab1 100644
--- a/third_party/icu/source/i18n/decimfmt.cpp
+++ b/third_party/icu/source/i18n/decimfmt.cpp
@@ -12,9 +12,6 @@
 #include <cmath>
 #include <cstdlib>
 #include <stdlib.h>
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/errorcode.h"
 #include "unicode/decimfmt.h"
 #include "number_decimalquantity.h"
diff --git a/third_party/icu/source/i18n/double-conversion-utils.h b/third_party/icu/source/i18n/double-conversion-utils.h
index fb6d08ae56b3..8c6a0e16e005 100644
--- a/third_party/icu/source/i18n/double-conversion-utils.h
+++ b/third_party/icu/source/i18n/double-conversion-utils.h
@@ -39,9 +39,6 @@
 
 #include <cstdlib>
 #include <cstring>
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif
 
 // ICU PATCH: Use U_ASSERT instead of <assert.h>
 #include "uassert.h"
diff --git a/third_party/icu/source/i18n/fphdlimp.cpp b/third_party/icu/source/i18n/fphdlimp.cpp
index 79524ae0eea9..f51bf4bae788 100644
--- a/third_party/icu/source/i18n/fphdlimp.cpp
+++ b/third_party/icu/source/i18n/fphdlimp.cpp
@@ -11,9 +11,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "fphdlimp.h"
 #include "uvectr32.h"
 
diff --git a/third_party/icu/source/i18n/fpositer.cpp b/third_party/icu/source/i18n/fpositer.cpp
index c863d742023f..75d529eb8c92 100644
--- a/third_party/icu/source/i18n/fpositer.cpp
+++ b/third_party/icu/source/i18n/fpositer.cpp
@@ -14,9 +14,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/fpositer.h"
 #include "cmemory.h"
 #include "uvectr32.h"
diff --git a/third_party/icu/source/i18n/gender.cpp b/third_party/icu/source/i18n/gender.cpp
index 570de287a1d7..dc5def6ad350 100644
--- a/third_party/icu/source/i18n/gender.cpp
+++ b/third_party/icu/source/i18n/gender.cpp
@@ -19,9 +19,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/gender.h"
 #include "unicode/ugender.h"
 #include "unicode/ures.h"
diff --git a/third_party/icu/source/i18n/gregoimp.cpp b/third_party/icu/source/i18n/gregoimp.cpp
index 645f08cdf009..537aa19d8a40 100644
--- a/third_party/icu/source/i18n/gregoimp.cpp
+++ b/third_party/icu/source/i18n/gregoimp.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/ucal.h"
 #include "uresimp.h"
 #include "cstring.h"
diff --git a/third_party/icu/source/i18n/islamcal.cpp b/third_party/icu/source/i18n/islamcal.cpp
index e47ef52bfe2d..982b3ad2d1c2 100644
--- a/third_party/icu/source/i18n/islamcal.cpp
+++ b/third_party/icu/source/i18n/islamcal.cpp
@@ -19,9 +19,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "umutex.h"
 #include <float.h>
 #include "gregoimp.h" // Math
diff --git a/third_party/icu/source/i18n/measunit.cpp b/third_party/icu/source/i18n/measunit.cpp
index 4eaba4e183b1..02624f824e15 100644
--- a/third_party/icu/source/i18n/measunit.cpp
+++ b/third_party/icu/source/i18n/measunit.cpp
@@ -16,9 +16,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/uenum.h"
 #include "unicode/errorcode.h"
 #include "ustrenum.h"
diff --git a/third_party/icu/source/i18n/msgfmt.cpp b/third_party/icu/source/i18n/msgfmt.cpp
index b5a1e07f2343..3ca368ef9548 100644
--- a/third_party/icu/source/i18n/msgfmt.cpp
+++ b/third_party/icu/source/i18n/msgfmt.cpp
@@ -25,9 +25,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/appendable.h"
 #include "unicode/choicfmt.h"
 #include "unicode/datefmt.h"
diff --git a/third_party/icu/source/i18n/numfmt.cpp b/third_party/icu/source/i18n/numfmt.cpp
index 64879623b7d2..7c3a0551c329 100644
--- a/third_party/icu/source/i18n/numfmt.cpp
+++ b/third_party/icu/source/i18n/numfmt.cpp
@@ -28,9 +28,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/numfmt.h"
 #include "unicode/locid.h"
 #include "unicode/dcfmtsym.h"
diff --git a/third_party/icu/source/i18n/olsontz.cpp b/third_party/icu/source/i18n/olsontz.cpp
index 2a3c86be5623..4873caaee6d4 100644
--- a/third_party/icu/source/i18n/olsontz.cpp
+++ b/third_party/icu/source/i18n/olsontz.cpp
@@ -17,9 +17,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/ures.h"
 #include "unicode/simpletz.h"
 #include "unicode/gregocal.h"
diff --git a/third_party/icu/source/i18n/plurfmt.cpp b/third_party/icu/source/i18n/plurfmt.cpp
index 7913f6e5711a..aac35c5b094f 100644
--- a/third_party/icu/source/i18n/plurfmt.cpp
+++ b/third_party/icu/source/i18n/plurfmt.cpp
@@ -10,9 +10,6 @@
 *******************************************************************************
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/decimfmt.h"
 #include "unicode/messagepattern.h"
 #include "unicode/plurfmt.h"
diff --git a/third_party/icu/source/i18n/plurrule.cpp b/third_party/icu/source/i18n/plurrule.cpp
index edc8148d58c3..d3bf71ebcbef 100644
--- a/third_party/icu/source/i18n/plurrule.cpp
+++ b/third_party/icu/source/i18n/plurrule.cpp
@@ -11,7 +11,6 @@
 
 #if defined(STARBOARD)
 #include "starboard/client_porting/cwrappers/pow_wrapper.h"
-#include "starboard/client_porting/poem/assert_poem.h"
 #endif  // defined(STARBOARD)
 #include <math.h>
 #include <stdio.h>
diff --git a/third_party/icu/source/i18n/quantityformatter.cpp b/third_party/icu/source/i18n/quantityformatter.cpp
index 92f16a6372fa..9c9aa99b6709 100644
--- a/third_party/icu/source/i18n/quantityformatter.cpp
+++ b/third_party/icu/source/i18n/quantityformatter.cpp
@@ -12,9 +12,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/simpleformatter.h"
 #include "quantityformatter.h"
 #include "uassert.h"
diff --git a/third_party/icu/source/i18n/regexcmp.cpp b/third_party/icu/source/i18n/regexcmp.cpp
index fcc99f9233a5..dd777b753840 100644
--- a/third_party/icu/source/i18n/regexcmp.cpp
+++ b/third_party/icu/source/i18n/regexcmp.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_REGULAR_EXPRESSIONS
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/ustring.h"
 #include "unicode/unistr.h"
 #include "unicode/uniset.h"
diff --git a/third_party/icu/source/i18n/regexst.cpp b/third_party/icu/source/i18n/regexst.cpp
index 3930e18945a2..97e417ab5a8f 100644
--- a/third_party/icu/source/i18n/regexst.cpp
+++ b/third_party/icu/source/i18n/regexst.cpp
@@ -20,9 +20,6 @@
 
 #if !UCONFIG_NO_REGULAR_EXPRESSIONS
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/unistr.h"
 #include "unicode/uniset.h"
 #include "unicode/uchar.h"
diff --git a/third_party/icu/source/i18n/rematch.cpp b/third_party/icu/source/i18n/rematch.cpp
index 6f2f6dcca520..8e496329ad35 100644
--- a/third_party/icu/source/i18n/rematch.cpp
+++ b/third_party/icu/source/i18n/rematch.cpp
@@ -16,9 +16,6 @@
 #include "unicode/utypes.h"
 #if !UCONFIG_NO_REGULAR_EXPRESSIONS
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/regex.h"
 #include "unicode/uniset.h"
 #include "unicode/uchar.h"
diff --git a/third_party/icu/source/i18n/repattrn.cpp b/third_party/icu/source/i18n/repattrn.cpp
index eddfd63de00c..b3028e04f7a9 100644
--- a/third_party/icu/source/i18n/repattrn.cpp
+++ b/third_party/icu/source/i18n/repattrn.cpp
@@ -13,9 +13,6 @@
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_REGULAR_EXPRESSIONS
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 
 #include "unicode/regex.h"
 #include "unicode/uclean.h"
diff --git a/third_party/icu/source/i18n/rulebasedcollator.cpp b/third_party/icu/source/i18n/rulebasedcollator.cpp
index 0b2de137a70d..917482d65bb4 100644
--- a/third_party/icu/source/i18n/rulebasedcollator.cpp
+++ b/third_party/icu/source/i18n/rulebasedcollator.cpp
@@ -17,9 +17,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/coll.h"
 #include "unicode/coleitr.h"
 #include "unicode/localpointer.h"
diff --git a/third_party/icu/source/i18n/smpdtfmt.cpp b/third_party/icu/source/i18n/smpdtfmt.cpp
index 819f907dbbc5..4717899cf38d 100644
--- a/third_party/icu/source/i18n/smpdtfmt.cpp
+++ b/third_party/icu/source/i18n/smpdtfmt.cpp
@@ -31,9 +31,6 @@
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/smpdtfmt.h"
 #include "unicode/dtfmtsym.h"
 #include "unicode/ures.h"
diff --git a/third_party/icu/source/i18n/smpdtfst.cpp b/third_party/icu/source/i18n/smpdtfst.cpp
index 60178662776c..db59a4b4ab7f 100644
--- a/third_party/icu/source/i18n/smpdtfst.cpp
+++ b/third_party/icu/source/i18n/smpdtfst.cpp
@@ -17,9 +17,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/uniset.h"
 #include "unicode/udat.h"
 #include "cmemory.h"
diff --git a/third_party/icu/source/i18n/standardplural.cpp b/third_party/icu/source/i18n/standardplural.cpp
index ed5b3b26517c..0391034b3e4a 100644
--- a/third_party/icu/source/i18n/standardplural.cpp
+++ b/third_party/icu/source/i18n/standardplural.cpp
@@ -11,9 +11,6 @@
  * created by: Markus W. Scherer
  */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
diff --git a/third_party/icu/source/i18n/timezone.cpp b/third_party/icu/source/i18n/timezone.cpp
index 7ff4599c9814..679fd451e04a 100644
--- a/third_party/icu/source/i18n/timezone.cpp
+++ b/third_party/icu/source/i18n/timezone.cpp
@@ -37,9 +37,6 @@
 *                           available IDs code.  Misc. cleanup.
 *********************************************************************************/
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "utypeinfo.h"  // for 'typeid' to work
 
 #include "unicode/utypes.h"
diff --git a/third_party/icu/source/i18n/tmunit.cpp b/third_party/icu/source/i18n/tmunit.cpp
index b464f5c45282..910489b1784e 100644
--- a/third_party/icu/source/i18n/tmunit.cpp
+++ b/third_party/icu/source/i18n/tmunit.cpp
@@ -7,9 +7,6 @@
  *******************************************************************************
  */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/tmunit.h"
 #include "uassert.h"
 
diff --git a/third_party/icu/source/i18n/tmutfmt.cpp b/third_party/icu/source/i18n/tmutfmt.cpp
index e25605c510ba..231ea5799c37 100644
--- a/third_party/icu/source/i18n/tmutfmt.cpp
+++ b/third_party/icu/source/i18n/tmutfmt.cpp
@@ -11,9 +11,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/decimfmt.h"
 #include "unicode/localpointer.h"
 #include "plurrule_impl.h"
diff --git a/third_party/icu/source/i18n/translit.cpp b/third_party/icu/source/i18n/translit.cpp
index cd4140dec61c..ef44f42aa666 100644
--- a/third_party/icu/source/i18n/translit.cpp
+++ b/third_party/icu/source/i18n/translit.cpp
@@ -16,9 +16,6 @@
 
 #if !UCONFIG_NO_TRANSLITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/putil.h"
 #include "unicode/translit.h"
 #include "unicode/locid.h"
diff --git a/third_party/icu/source/i18n/transreg.cpp b/third_party/icu/source/i18n/transreg.cpp
index c54dabddf636..c412a20079e7 100644
--- a/third_party/icu/source/i18n/transreg.cpp
+++ b/third_party/icu/source/i18n/transreg.cpp
@@ -14,9 +14,6 @@
 
 #if !UCONFIG_NO_TRANSLITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/translit.h"
 #include "unicode/resbund.h"
 #include "unicode/uniset.h"
diff --git a/third_party/icu/source/i18n/tridpars.cpp b/third_party/icu/source/i18n/tridpars.cpp
index eb7f79cf767f..65bfc880633a 100644
--- a/third_party/icu/source/i18n/tridpars.cpp
+++ b/third_party/icu/source/i18n/tridpars.cpp
@@ -14,9 +14,6 @@
 
 #if !UCONFIG_NO_TRANSLITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "tridpars.h"
 #include "hash.h"
 #include "mutex.h"
diff --git a/third_party/icu/source/i18n/tzfmt.cpp b/third_party/icu/source/i18n/tzfmt.cpp
index 9c8142dc6625..f87f0f67b13b 100644
--- a/third_party/icu/source/i18n/tzfmt.cpp
+++ b/third_party/icu/source/i18n/tzfmt.cpp
@@ -11,9 +11,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/calendar.h"
 #include "unicode/tzfmt.h"
 #include "unicode/numsys.h"
diff --git a/third_party/icu/source/i18n/tzgnames.cpp b/third_party/icu/source/i18n/tzgnames.cpp
index 3ed1657ace2f..e056461dc30a 100644
--- a/third_party/icu/source/i18n/tzgnames.cpp
+++ b/third_party/icu/source/i18n/tzgnames.cpp
@@ -11,9 +11,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "tzgnames.h"
 
 #include "unicode/basictz.h"
diff --git a/third_party/icu/source/i18n/tznames.cpp b/third_party/icu/source/i18n/tznames.cpp
index 7e9b1bd5b108..d789c1236302 100644
--- a/third_party/icu/source/i18n/tznames.cpp
+++ b/third_party/icu/source/i18n/tznames.cpp
@@ -11,9 +11,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/locid.h"
 #include "unicode/tznames.h"
 #include "unicode/uenum.h"
diff --git a/third_party/icu/source/i18n/tznames_impl.cpp b/third_party/icu/source/i18n/tznames_impl.cpp
index 478a60604217..186aaaf74d06 100644
--- a/third_party/icu/source/i18n/tznames_impl.cpp
+++ b/third_party/icu/source/i18n/tznames_impl.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/strenum.h"
 #include "unicode/ustring.h"
 #include "unicode/timezone.h"
diff --git a/third_party/icu/source/i18n/ucln_in.cpp b/third_party/icu/source/i18n/ucln_in.cpp
index b10cdcd980b3..f29cbe41dde0 100644
--- a/third_party/icu/source/i18n/ucln_in.cpp
+++ b/third_party/icu/source/i18n/ucln_in.cpp
@@ -16,9 +16,6 @@
 *   created by: George Rhoten
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "ucln.h"
 #include "ucln_in.h"
 #include "mutex.h"
diff --git a/third_party/icu/source/i18n/ucol.cpp b/third_party/icu/source/i18n/ucol.cpp
index cab8276ee5de..f59333ede3c8 100644
--- a/third_party/icu/source/i18n/ucol.cpp
+++ b/third_party/icu/source/i18n/ucol.cpp
@@ -23,9 +23,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/coll.h"
 #include "unicode/tblcoll.h"
 #include "unicode/bytestream.h"
diff --git a/third_party/icu/source/i18n/ucol_res.cpp b/third_party/icu/source/i18n/ucol_res.cpp
index 592a6d5fe0e5..aa4027eb8721 100644
--- a/third_party/icu/source/i18n/ucol_res.cpp
+++ b/third_party/icu/source/i18n/ucol_res.cpp
@@ -28,9 +28,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/coll.h"
 #include "unicode/localpointer.h"
 #include "unicode/locid.h"
diff --git a/third_party/icu/source/i18n/uitercollationiterator.cpp b/third_party/icu/source/i18n/uitercollationiterator.cpp
index cd9e6ceab556..103c91cac8b1 100644
--- a/third_party/icu/source/i18n/uitercollationiterator.cpp
+++ b/third_party/icu/source/i18n/uitercollationiterator.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/uiter.h"
 #include "charstr.h"
 #include "cmemory.h"
diff --git a/third_party/icu/source/i18n/umsg.cpp b/third_party/icu/source/i18n/umsg.cpp
index 94482d26da0a..9a5344e0191a 100644
--- a/third_party/icu/source/i18n/umsg.cpp
+++ b/third_party/icu/source/i18n/umsg.cpp
@@ -21,9 +21,6 @@
 * 
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
diff --git a/third_party/icu/source/i18n/unum.cpp b/third_party/icu/source/i18n/unum.cpp
index b7bcd04e9e4e..7043f7adc123 100644
--- a/third_party/icu/source/i18n/unum.cpp
+++ b/third_party/icu/source/i18n/unum.cpp
@@ -16,9 +16,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/unum.h"
 
 #include "unicode/uloc.h"
diff --git a/third_party/icu/source/i18n/uregex.cpp b/third_party/icu/source/i18n/uregex.cpp
index dc2e47680f2e..7f41918cff93 100644
--- a/third_party/icu/source/i18n/uregex.cpp
+++ b/third_party/icu/source/i18n/uregex.cpp
@@ -12,9 +12,6 @@
 
 #if !UCONFIG_NO_REGULAR_EXPRESSIONS
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/regex.h"
 #include "unicode/uregex.h"
 #include "unicode/unistr.h"
diff --git a/third_party/icu/source/i18n/usearch.cpp b/third_party/icu/source/i18n/usearch.cpp
index ba0b51aff278..8866de703375 100644
--- a/third_party/icu/source/i18n/usearch.cpp
+++ b/third_party/icu/source/i18n/usearch.cpp
@@ -13,9 +13,6 @@
 
 #if !UCONFIG_NO_COLLATION && !UCONFIG_NO_BREAK_ITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/usearch.h"
 #include "unicode/ustring.h"
 #include "unicode/uchar.h"
diff --git a/third_party/icu/source/i18n/uspoof.cpp b/third_party/icu/source/i18n/uspoof.cpp
index 679c7d6bf04d..33682389f5b7 100644
--- a/third_party/icu/source/i18n/uspoof.cpp
+++ b/third_party/icu/source/i18n/uspoof.cpp
@@ -15,9 +15,6 @@
 *
 *   Unicode Spoof Detection
 */
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/normalizer2.h"
 #include "unicode/uspoof.h"
diff --git a/third_party/icu/source/i18n/uspoof_conf.cpp b/third_party/icu/source/i18n/uspoof_conf.cpp
index fc2d636df43c..1a7cdad60ac4 100644
--- a/third_party/icu/source/i18n/uspoof_conf.cpp
+++ b/third_party/icu/source/i18n/uspoof_conf.cpp
@@ -23,9 +23,6 @@
 #if !UCONFIG_NO_REGULAR_EXPRESSIONS
 #if !UCONFIG_NO_NORMALIZATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/unorm.h"
 #include "unicode/uregex.h"
 #include "unicode/ustring.h"
diff --git a/third_party/icu/source/i18n/uspoof_impl.cpp b/third_party/icu/source/i18n/uspoof_impl.cpp
index 90ab456396de..88245b7f8f9c 100644
--- a/third_party/icu/source/i18n/uspoof_impl.cpp
+++ b/third_party/icu/source/i18n/uspoof_impl.cpp
@@ -7,9 +7,6 @@
 **********************************************************************
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/uspoof.h"
 #include "unicode/uchar.h"
diff --git a/third_party/icu/source/i18n/utf16collationiterator.cpp b/third_party/icu/source/i18n/utf16collationiterator.cpp
index 88ae2b1ce5b3..7598b0ee521f 100644
--- a/third_party/icu/source/i18n/utf16collationiterator.cpp
+++ b/third_party/icu/source/i18n/utf16collationiterator.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "charstr.h"
 #include "cmemory.h"
 #include "collation.h"
diff --git a/third_party/icu/source/i18n/utf8collationiterator.cpp b/third_party/icu/source/i18n/utf8collationiterator.cpp
index 3348e4d69b0f..345b1994ef0e 100644
--- a/third_party/icu/source/i18n/utf8collationiterator.cpp
+++ b/third_party/icu/source/i18n/utf8collationiterator.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_COLLATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utf8.h"
 #include "charstr.h"
 #include "cmemory.h"
diff --git a/third_party/icu/source/i18n/vtzone.cpp b/third_party/icu/source/i18n/vtzone.cpp
index d393e43af537..81208ab96d73 100644
--- a/third_party/icu/source/i18n/vtzone.cpp
+++ b/third_party/icu/source/i18n/vtzone.cpp
@@ -13,9 +13,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/vtzone.h"
 #include "unicode/rbtz.h"
 #include "unicode/ucal.h"
diff --git a/third_party/icu/source/i18n/zonemeta.cpp b/third_party/icu/source/i18n/zonemeta.cpp
index c0a2de158e80..72c590f42472 100644
--- a/third_party/icu/source/i18n/zonemeta.cpp
+++ b/third_party/icu/source/i18n/zonemeta.cpp
@@ -11,9 +11,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "zonemeta.h"
 
 #include "unicode/timezone.h"