diff --git a/include/__hash_table b/include/__hash_table
index adc732c..9462565 100644
--- a/include/__hash_table
+++ b/include/__hash_table
@@ -2063,7 +2063,8 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__emplace_unique_key_args(_Key const&
     size_type __bc = bucket_count();
     bool __inserted = false;
     __next_pointer __nd;
-    size_t __chash;
+    // TODO remove me, just trying to make gcc-12 build this code.
+    size_t __chash = 0;
     if (__bc != 0)
     {
         __chash = __constrain_hash(__hash, __bc);
diff --git a/include/string b/include/string
index fd6a742..53795fa 100644
--- a/include/string
+++ b/include/string
@@ -635,21 +635,6 @@ struct __can_be_converted_to_string_view : public _BoolConstant<
      !is_convertible<const _Tp&, const _CharT*>::value
     > {};
 
-#ifdef _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT
-
-template <class _CharT, size_t = sizeof(_CharT)>
-struct __padding
-{
-    unsigned char __xx[sizeof(_CharT)-1];
-};
-
-template <class _CharT>
-struct __padding<_CharT, 1>
-{
-};
-
-#endif // _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT
-
 #ifndef _LIBCPP_HAS_NO_CHAR8_T
 typedef basic_string<char8_t> u8string;
 #endif
@@ -723,11 +708,8 @@ private:
     struct __short
     {
         value_type __data_[__min_cap];
-        struct
-            : __padding<value_type>
-        {
-            unsigned char __size_;
-        };
+        unsigned char __padding[sizeof(value_type) - 1];
+        unsigned char __size_;
     };
 
 #else