More changes
diff --git a/quiche/common/print_elements.h b/quiche/common/print_elements.h
index ae69c40..3c39cd4 100644
--- a/quiche/common/print_elements.h
+++ b/quiche/common/print_elements.h
@@ -16,7 +16,7 @@
 // Print elements of any iterable container that has cbegin() and cend() methods
 // and the elements have operator<<(ostream) override.
 template <typename T>
-QUICHE_EXPORT inline std::string PrintElements(const T& container) {
+QUICHE_NO_EXPORT inline std::string PrintElements(const T& container) {
   std::stringstream debug_string;
   debug_string << "{";
   auto it = container.cbegin();
diff --git a/quiche/common/wire_serialization_test.cc b/quiche/common/wire_serialization_test.cc
index 37216ca..f35c13d 100644
--- a/quiche/common/wire_serialization_test.cc
+++ b/quiche/common/wire_serialization_test.cc
@@ -237,14 +237,15 @@
 };
 
 TEST(SerializationTest, CustomStructWritesTooLittle) {
-  constexpr absl::string_view kStr = "\xaa\xbb\xcc\xdd";
   absl::Status status;
 #if defined(NDEBUG)
+  constexpr absl::string_view kStr = "\xaa\xbb\xcc\xdd";
   status = SerializeIntoSimpleBuffer(WireFormatterThatWritesTooLittle(kStr))
                .status();
   EXPECT_THAT(status, StatusIs(absl::StatusCode::kInternal,
                                ::testing::HasSubstr("Excess 1 bytes")));
-#else
+#elif GTEST_HAS_DEATH_TEST
+  constexpr absl::string_view kStr = "\xaa\xbb\xcc\xdd";
   EXPECT_QUICHE_DEBUG_DEATH(
       status = SerializeIntoSimpleBuffer(WireFormatterThatWritesTooLittle(kStr))
                    .status(),