diff --git a/include/uit_emp/_codegen/pylib/_iter_header_paths.py b/include/uit_emp/_codegen/pylib/_iter_header_paths.py
index 8d4d2a011..1b2d1efc2 100644
--- a/include/uit_emp/_codegen/pylib/_iter_header_paths.py
+++ b/include/uit_emp/_codegen/pylib/_iter_header_paths.py
@@ -7,10 +7,6 @@ def iter_header_paths() -> typing.Iterator[str]:
   # )
 
   yield from (
-      "base/assert.hpp",
-      "base/always_assert.hpp",
-      "base/error.hpp",
-      "base/errors.hpp",
       "data/DataNode.hpp",
       "data/DataFile.hpp",
       "datastructs/QueueCache.hpp",
diff --git a/include/uit_emp/vendorization/pop_headerguards.hh b/include/uit_emp/vendorization/pop_headerguards.hh
index 39b119f1c..fb80b46a7 100644
--- a/include/uit_emp/vendorization/pop_headerguards.hh
+++ b/include/uit_emp/vendorization/pop_headerguards.hh
@@ -5,6 +5,11 @@
 #endif // #ifdef EMP_ALWAYS_ASSERT_HPP
 #pragma pop_macro("EMP_ALWAYS_ASSERT_HPP")
 
+#ifdef EMP_ARRAY_H
+#define UIT_EMP_ARRAY_H_HEADERGUARD
+#endif // #ifdef EMP_ARRAY_H
+#pragma pop_macro("EMP_ARRAY_H")
+
 #ifdef EMP_ASSERT_HPP
 #define UIT_EMP_ASSERT_HPP_HEADERGUARD
 #endif // #ifdef EMP_ASSERT_HPP
@@ -20,6 +25,31 @@
 #endif // #ifdef EMP_BASE_EMP_NAMESPACE_HPP
 #pragma pop_macro("EMP_BASE_EMP_NAMESPACE_HPP")
 
+#ifdef EMP_BITSET_UTILS_H
+#define UIT_EMP_BITSET_UTILS_H_HEADERGUARD
+#endif // #ifdef EMP_BITSET_UTILS_H
+#pragma pop_macro("EMP_BITSET_UTILS_H")
+
+#ifdef EMP_CONST_H
+#define UIT_EMP_CONST_H_HEADERGUARD
+#endif // #ifdef EMP_CONST_H
+#pragma pop_macro("EMP_CONST_H")
+
+#ifdef EMP_DATA_NODE_H
+#define UIT_EMP_DATA_NODE_H_HEADERGUARD
+#endif // #ifdef EMP_DATA_NODE_H
+#pragma pop_macro("EMP_DATA_NODE_H")
+
+#ifdef EMP_FUNCTION_SET_H
+#define UIT_EMP_FUNCTION_SET_H_HEADERGUARD
+#endif // #ifdef EMP_FUNCTION_SET_H
+#pragma pop_macro("EMP_FUNCTION_SET_H")
+
+#ifdef EMP_INDEX_MAP_H
+#define UIT_EMP_INDEX_MAP_H_HEADERGUARD
+#endif // #ifdef EMP_INDEX_MAP_H
+#pragma pop_macro("EMP_INDEX_MAP_H")
+
 #ifdef EMP_IS_STREAMABLE_HPP
 #define UIT_EMP_IS_STREAMABLE_HPP_HEADERGUARD
 #endif // #ifdef EMP_IS_STREAMABLE_HPP
@@ -35,9 +65,79 @@
 #endif // #ifdef EMP_MACRO_MATH_H
 #pragma pop_macro("EMP_MACRO_MATH_H")
 
+#ifdef EMP_MATH_H
+#define UIT_EMP_MATH_H_HEADERGUARD
+#endif // #ifdef EMP_MATH_H
+#pragma pop_macro("EMP_MATH_H")
+
+#ifdef EMP_META_H
+#define UIT_EMP_META_H_HEADERGUARD
+#endif // #ifdef EMP_META_H
+#pragma pop_macro("EMP_META_H")
+
 #ifdef EMP_NATIVE_ASSERT_TRIGGER_HPP
 #define UIT_EMP_NATIVE_ASSERT_TRIGGER_HPP_HEADERGUARD
 #endif // #ifdef EMP_NATIVE_ASSERT_TRIGGER_HPP
 #pragma pop_macro("EMP_NATIVE_ASSERT_TRIGGER_HPP")
 
+#ifdef EMP_OPTIONAL_H
+#define UIT_EMP_OPTIONAL_H_HEADERGUARD
+#endif // #ifdef EMP_OPTIONAL_H
+#pragma pop_macro("EMP_OPTIONAL_H")
+
+#ifdef EMP_PTR_H
+#define UIT_EMP_PTR_H_HEADERGUARD
+#endif // #ifdef EMP_PTR_H
+#pragma pop_macro("EMP_PTR_H")
+
+#ifdef EMP_RANDOM_H
+#define UIT_EMP_RANDOM_H_HEADERGUARD
+#endif // #ifdef EMP_RANDOM_H
+#pragma pop_macro("EMP_RANDOM_H")
+
+#ifdef EMP_RANGE_H
+#define UIT_EMP_RANGE_H_HEADERGUARD
+#endif // #ifdef EMP_RANGE_H
+#pragma pop_macro("EMP_RANGE_H")
+
+#ifdef EMP_REFLECTION_H
+#define UIT_EMP_REFLECTION_H_HEADERGUARD
+#endif // #ifdef EMP_REFLECTION_H
+#pragma pop_macro("EMP_REFLECTION_H")
+
+#ifdef EMP_STRING_TYPE_H
+#define UIT_EMP_STRING_TYPE_H_HEADERGUARD
+#endif // #ifdef EMP_STRING_TYPE_H
+#pragma pop_macro("EMP_STRING_TYPE_H")
+
+#ifdef EMP_STRING_UTILS_H
+#define UIT_EMP_STRING_UTILS_H_HEADERGUARD
+#endif // #ifdef EMP_STRING_UTILS_H
+#pragma pop_macro("EMP_STRING_UTILS_H")
+
+#ifdef EMP_TYPE_ID_H
+#define UIT_EMP_TYPE_ID_H_HEADERGUARD
+#endif // #ifdef EMP_TYPE_ID_H
+#pragma pop_macro("EMP_TYPE_ID_H")
+
+#ifdef EMP_TYPE_PACK_H
+#define UIT_EMP_TYPE_PACK_H_HEADERGUARD
+#endif // #ifdef EMP_TYPE_PACK_H
+#pragma pop_macro("EMP_TYPE_PACK_H")
+
+#ifdef EMP_TYPE_TRAITS_H
+#define UIT_EMP_TYPE_TRAITS_H_HEADERGUARD
+#endif // #ifdef EMP_TYPE_TRAITS_H
+#pragma pop_macro("EMP_TYPE_TRAITS_H")
+
+#ifdef EMP_VAL_PACK_H
+#define UIT_EMP_VAL_PACK_H_HEADERGUARD
+#endif // #ifdef EMP_VAL_PACK_H
+#pragma pop_macro("EMP_VAL_PACK_H")
+
+#ifdef EMP_VECTOR_H
+#define UIT_EMP_VECTOR_H_HEADERGUARD
+#endif // #ifdef EMP_VECTOR_H
+#pragma pop_macro("EMP_VECTOR_H")
+
 #endif // #ifdef UIT_VENDORIZE_EMP
diff --git a/include/uit_emp/vendorization/pop_macros.hh b/include/uit_emp/vendorization/pop_macros.hh
index c167592c2..4fcdd749f 100644
--- a/include/uit_emp/vendorization/pop_macros.hh
+++ b/include/uit_emp/vendorization/pop_macros.hh
@@ -264,6 +264,102 @@
 
 #endif // #ifdef EMP_ADD_IMPL
 
+#ifdef EMP_ADD_TYPE_FROM_MEMBER
+
+  #ifndef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER
+    #define UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER
+
+    #ifdef UIT_EXTERNAL_1ST_EMP_ADD_TYPE_FROM_MEMBER
+      #pragma pop_macro("EMP_ADD_TYPE_FROM_MEMBER")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER
+      #ifndef UIT_INTERNAL_1ST_EMP_ADD_TYPE_FROM_MEMBER
+        #define UIT_INTERNAL_1ST_EMP_ADD_TYPE_FROM_MEMBER
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER
+    #pragma push_macro("EMP_ADD_TYPE_FROM_MEMBER")
+    #undef EMP_ADD_TYPE_FROM_MEMBER
+  #endif
+
+#endif // #ifdef EMP_ADD_TYPE_FROM_MEMBER
+
+#ifdef EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+
+  #ifndef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+    #define UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+
+    #ifdef UIT_EXTERNAL_1ST_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+      #pragma pop_macro("EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+      #ifndef UIT_INTERNAL_1ST_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+        #define UIT_INTERNAL_1ST_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+    #pragma push_macro("EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE")
+    #undef EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+  #endif
+
+#endif // #ifdef EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+
+#ifdef EMP_ADD_TYPE_FROM_TYPE
+
+  #ifndef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE
+    #define UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE
+
+    #ifdef UIT_EXTERNAL_1ST_EMP_ADD_TYPE_FROM_TYPE
+      #pragma pop_macro("EMP_ADD_TYPE_FROM_TYPE")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE
+      #ifndef UIT_INTERNAL_1ST_EMP_ADD_TYPE_FROM_TYPE
+        #define UIT_INTERNAL_1ST_EMP_ADD_TYPE_FROM_TYPE
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE
+    #pragma push_macro("EMP_ADD_TYPE_FROM_TYPE")
+    #undef EMP_ADD_TYPE_FROM_TYPE
+  #endif
+
+#endif // #ifdef EMP_ADD_TYPE_FROM_TYPE
+
+#ifdef EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+
+  #ifndef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+    #define UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+
+    #ifdef UIT_EXTERNAL_1ST_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+      #pragma pop_macro("EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+      #ifndef UIT_INTERNAL_1ST_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+        #define UIT_INTERNAL_1ST_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+    #pragma push_macro("EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER")
+    #undef EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+  #endif
+
+#endif // #ifdef EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+
 #ifdef EMP_AND
 
   #ifndef UIT_INTERNAL_HAS_EMP_AND
@@ -25680,6 +25776,30 @@
 
 #endif // #ifdef EMP_BOOL_IMPL
 
+#ifdef EMP_BUILD_TYPE_PACK
+
+  #ifndef UIT_INTERNAL_HAS_EMP_BUILD_TYPE_PACK
+    #define UIT_INTERNAL_HAS_EMP_BUILD_TYPE_PACK
+
+    #ifdef UIT_EXTERNAL_1ST_EMP_BUILD_TYPE_PACK
+      #pragma pop_macro("EMP_BUILD_TYPE_PACK")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_EMP_BUILD_TYPE_PACK
+      #ifndef UIT_INTERNAL_1ST_EMP_BUILD_TYPE_PACK
+        #define UIT_INTERNAL_1ST_EMP_BUILD_TYPE_PACK
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_EMP_BUILD_TYPE_PACK
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_BUILD_TYPE_PACK
+    #pragma push_macro("EMP_BUILD_TYPE_PACK")
+    #undef EMP_BUILD_TYPE_PACK
+  #endif
+
+#endif // #ifdef EMP_BUILD_TYPE_PACK
+
 #ifdef EMP_CALL_BY_PACKS
 
   #ifndef UIT_INTERNAL_HAS_EMP_CALL_BY_PACKS
@@ -26280,6 +26400,30 @@
 
 #endif // #ifdef EMP_CALL_BY_PACKS_implD
 
+#ifdef EMP_CHOOSE_MEMBER_TYPE
+
+  #ifndef UIT_INTERNAL_HAS_EMP_CHOOSE_MEMBER_TYPE
+    #define UIT_INTERNAL_HAS_EMP_CHOOSE_MEMBER_TYPE
+
+    #ifdef UIT_EXTERNAL_1ST_EMP_CHOOSE_MEMBER_TYPE
+      #pragma pop_macro("EMP_CHOOSE_MEMBER_TYPE")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_EMP_CHOOSE_MEMBER_TYPE
+      #ifndef UIT_INTERNAL_1ST_EMP_CHOOSE_MEMBER_TYPE
+        #define UIT_INTERNAL_1ST_EMP_CHOOSE_MEMBER_TYPE
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_EMP_CHOOSE_MEMBER_TYPE
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_CHOOSE_MEMBER_TYPE
+    #pragma push_macro("EMP_CHOOSE_MEMBER_TYPE")
+    #undef EMP_CHOOSE_MEMBER_TYPE
+  #endif
+
+#endif // #ifdef EMP_CHOOSE_MEMBER_TYPE
+
 #ifdef EMP_COMPARE
 
   #ifndef UIT_INTERNAL_HAS_EMP_COMPARE
@@ -26760,6 +26904,102 @@
 
 #endif // #ifdef EMP_COUNT_ONES
 
+#ifdef EMP_CREATE_EVAL_SELECT
+
+  #ifndef UIT_INTERNAL_HAS_EMP_CREATE_EVAL_SELECT
+    #define UIT_INTERNAL_HAS_EMP_CREATE_EVAL_SELECT
+
+    #ifdef UIT_EXTERNAL_1ST_EMP_CREATE_EVAL_SELECT
+      #pragma pop_macro("EMP_CREATE_EVAL_SELECT")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_EMP_CREATE_EVAL_SELECT
+      #ifndef UIT_INTERNAL_1ST_EMP_CREATE_EVAL_SELECT
+        #define UIT_INTERNAL_1ST_EMP_CREATE_EVAL_SELECT
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_EMP_CREATE_EVAL_SELECT
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_CREATE_EVAL_SELECT
+    #pragma push_macro("EMP_CREATE_EVAL_SELECT")
+    #undef EMP_CREATE_EVAL_SELECT
+  #endif
+
+#endif // #ifdef EMP_CREATE_EVAL_SELECT
+
+#ifdef EMP_CREATE_METHOD_FALLBACK
+
+  #ifndef UIT_INTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK
+    #define UIT_INTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK
+
+    #ifdef UIT_EXTERNAL_1ST_EMP_CREATE_METHOD_FALLBACK
+      #pragma pop_macro("EMP_CREATE_METHOD_FALLBACK")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK
+      #ifndef UIT_INTERNAL_1ST_EMP_CREATE_METHOD_FALLBACK
+        #define UIT_INTERNAL_1ST_EMP_CREATE_METHOD_FALLBACK
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK
+    #pragma push_macro("EMP_CREATE_METHOD_FALLBACK")
+    #undef EMP_CREATE_METHOD_FALLBACK
+  #endif
+
+#endif // #ifdef EMP_CREATE_METHOD_FALLBACK
+
+#ifdef EMP_CREATE_METHOD_FALLBACK_VAL
+
+  #ifndef UIT_INTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK_VAL
+    #define UIT_INTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK_VAL
+
+    #ifdef UIT_EXTERNAL_1ST_EMP_CREATE_METHOD_FALLBACK_VAL
+      #pragma pop_macro("EMP_CREATE_METHOD_FALLBACK_VAL")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK_VAL
+      #ifndef UIT_INTERNAL_1ST_EMP_CREATE_METHOD_FALLBACK_VAL
+        #define UIT_INTERNAL_1ST_EMP_CREATE_METHOD_FALLBACK_VAL
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK_VAL
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK_VAL
+    #pragma push_macro("EMP_CREATE_METHOD_FALLBACK_VAL")
+    #undef EMP_CREATE_METHOD_FALLBACK_VAL
+  #endif
+
+#endif // #ifdef EMP_CREATE_METHOD_FALLBACK_VAL
+
+#ifdef EMP_CREATE_OPTIONAL_METHOD
+
+  #ifndef UIT_INTERNAL_HAS_EMP_CREATE_OPTIONAL_METHOD
+    #define UIT_INTERNAL_HAS_EMP_CREATE_OPTIONAL_METHOD
+
+    #ifdef UIT_EXTERNAL_1ST_EMP_CREATE_OPTIONAL_METHOD
+      #pragma pop_macro("EMP_CREATE_OPTIONAL_METHOD")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_EMP_CREATE_OPTIONAL_METHOD
+      #ifndef UIT_INTERNAL_1ST_EMP_CREATE_OPTIONAL_METHOD
+        #define UIT_INTERNAL_1ST_EMP_CREATE_OPTIONAL_METHOD
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_EMP_CREATE_OPTIONAL_METHOD
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_CREATE_OPTIONAL_METHOD
+    #pragma push_macro("EMP_CREATE_OPTIONAL_METHOD")
+    #undef EMP_CREATE_OPTIONAL_METHOD
+  #endif
+
+#endif // #ifdef EMP_CREATE_OPTIONAL_METHOD
+
 #ifdef EMP_CROP_ARGS_TO
 
   #ifndef UIT_INTERNAL_HAS_EMP_CROP_ARGS_TO
@@ -54312,6 +54552,30 @@
 
 #endif // #ifdef EMP_EVAL_G
 
+#ifdef EMP_EXPAND_PPACK
+
+  #ifndef UIT_INTERNAL_HAS_EMP_EXPAND_PPACK
+    #define UIT_INTERNAL_HAS_EMP_EXPAND_PPACK
+
+    #ifdef UIT_EXTERNAL_1ST_EMP_EXPAND_PPACK
+      #pragma pop_macro("EMP_EXPAND_PPACK")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_EMP_EXPAND_PPACK
+      #ifndef UIT_INTERNAL_1ST_EMP_EXPAND_PPACK
+        #define UIT_INTERNAL_1ST_EMP_EXPAND_PPACK
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_EMP_EXPAND_PPACK
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_EXPAND_PPACK
+    #pragma push_macro("EMP_EXPAND_PPACK")
+    #undef EMP_EXPAND_PPACK
+  #endif
+
+#endif // #ifdef EMP_EXPAND_PPACK
+
 #ifdef EMP_FORCE_ARGS_TO
 
   #ifndef UIT_INTERNAL_HAS_EMP_FORCE_ARGS_TO
@@ -54936,6 +55200,78 @@
 
 #endif // #ifdef EMP_IMERGE_9
 
+#ifdef EMP_IMPL_TYPE_DEFAULT
+
+  #ifndef UIT_INTERNAL_HAS_EMP_IMPL_TYPE_DEFAULT
+    #define UIT_INTERNAL_HAS_EMP_IMPL_TYPE_DEFAULT
+
+    #ifdef UIT_EXTERNAL_1ST_EMP_IMPL_TYPE_DEFAULT
+      #pragma pop_macro("EMP_IMPL_TYPE_DEFAULT")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_EMP_IMPL_TYPE_DEFAULT
+      #ifndef UIT_INTERNAL_1ST_EMP_IMPL_TYPE_DEFAULT
+        #define UIT_INTERNAL_1ST_EMP_IMPL_TYPE_DEFAULT
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_EMP_IMPL_TYPE_DEFAULT
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_IMPL_TYPE_DEFAULT
+    #pragma push_macro("EMP_IMPL_TYPE_DEFAULT")
+    #undef EMP_IMPL_TYPE_DEFAULT
+  #endif
+
+#endif // #ifdef EMP_IMPL_TYPE_DEFAULT
+
+#ifdef EMP_IMPL_TYPE_HAS_MEMBER
+
+  #ifndef UIT_INTERNAL_HAS_EMP_IMPL_TYPE_HAS_MEMBER
+    #define UIT_INTERNAL_HAS_EMP_IMPL_TYPE_HAS_MEMBER
+
+    #ifdef UIT_EXTERNAL_1ST_EMP_IMPL_TYPE_HAS_MEMBER
+      #pragma pop_macro("EMP_IMPL_TYPE_HAS_MEMBER")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_EMP_IMPL_TYPE_HAS_MEMBER
+      #ifndef UIT_INTERNAL_1ST_EMP_IMPL_TYPE_HAS_MEMBER
+        #define UIT_INTERNAL_1ST_EMP_IMPL_TYPE_HAS_MEMBER
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_EMP_IMPL_TYPE_HAS_MEMBER
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_IMPL_TYPE_HAS_MEMBER
+    #pragma push_macro("EMP_IMPL_TYPE_HAS_MEMBER")
+    #undef EMP_IMPL_TYPE_HAS_MEMBER
+  #endif
+
+#endif // #ifdef EMP_IMPL_TYPE_HAS_MEMBER
+
+#ifdef EMP_IMPL_TYPE_HAS_TYPE
+
+  #ifndef UIT_INTERNAL_HAS_EMP_IMPL_TYPE_HAS_TYPE
+    #define UIT_INTERNAL_HAS_EMP_IMPL_TYPE_HAS_TYPE
+
+    #ifdef UIT_EXTERNAL_1ST_EMP_IMPL_TYPE_HAS_TYPE
+      #pragma pop_macro("EMP_IMPL_TYPE_HAS_TYPE")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_EMP_IMPL_TYPE_HAS_TYPE
+      #ifndef UIT_INTERNAL_1ST_EMP_IMPL_TYPE_HAS_TYPE
+        #define UIT_INTERNAL_1ST_EMP_IMPL_TYPE_HAS_TYPE
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_EMP_IMPL_TYPE_HAS_TYPE
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_IMPL_TYPE_HAS_TYPE
+    #pragma push_macro("EMP_IMPL_TYPE_HAS_TYPE")
+    #undef EMP_IMPL_TYPE_HAS_TYPE
+  #endif
+
+#endif // #ifdef EMP_IMPL_TYPE_HAS_TYPE
+
 #ifdef EMP_INC
 
   #ifndef UIT_INTERNAL_HAS_EMP_INC
@@ -65256,6 +65592,30 @@
 
 #endif // #ifdef EMP_SELECT_x
 
+#ifdef EMP_SETUP_TYPE_SELECTOR
+
+  #ifndef UIT_INTERNAL_HAS_EMP_SETUP_TYPE_SELECTOR
+    #define UIT_INTERNAL_HAS_EMP_SETUP_TYPE_SELECTOR
+
+    #ifdef UIT_EXTERNAL_1ST_EMP_SETUP_TYPE_SELECTOR
+      #pragma pop_macro("EMP_SETUP_TYPE_SELECTOR")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_EMP_SETUP_TYPE_SELECTOR
+      #ifndef UIT_INTERNAL_1ST_EMP_SETUP_TYPE_SELECTOR
+        #define UIT_INTERNAL_1ST_EMP_SETUP_TYPE_SELECTOR
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_EMP_SETUP_TYPE_SELECTOR
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_SETUP_TYPE_SELECTOR
+    #pragma push_macro("EMP_SETUP_TYPE_SELECTOR")
+    #undef EMP_SETUP_TYPE_SELECTOR
+  #endif
+
+#endif // #ifdef EMP_SETUP_TYPE_SELECTOR
+
 #ifdef EMP_SHIFTL
 
   #ifndef UIT_INTERNAL_HAS_EMP_SHIFTL
@@ -66240,6 +66600,78 @@
 
 #endif // #ifdef EMP_TEST_IF_VOID__void
 
+#ifdef EMP_TEXT_HASH
+
+  #ifndef UIT_INTERNAL_HAS_EMP_TEXT_HASH
+    #define UIT_INTERNAL_HAS_EMP_TEXT_HASH
+
+    #ifdef UIT_EXTERNAL_1ST_EMP_TEXT_HASH
+      #pragma pop_macro("EMP_TEXT_HASH")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_EMP_TEXT_HASH
+      #ifndef UIT_INTERNAL_1ST_EMP_TEXT_HASH
+        #define UIT_INTERNAL_1ST_EMP_TEXT_HASH
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_EMP_TEXT_HASH
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_TEXT_HASH
+    #pragma push_macro("EMP_TEXT_HASH")
+    #undef EMP_TEXT_HASH
+  #endif
+
+#endif // #ifdef EMP_TEXT_HASH
+
+#ifdef EMP_TEXT_PACK
+
+  #ifndef UIT_INTERNAL_HAS_EMP_TEXT_PACK
+    #define UIT_INTERNAL_HAS_EMP_TEXT_PACK
+
+    #ifdef UIT_EXTERNAL_1ST_EMP_TEXT_PACK
+      #pragma pop_macro("EMP_TEXT_PACK")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_EMP_TEXT_PACK
+      #ifndef UIT_INTERNAL_1ST_EMP_TEXT_PACK
+        #define UIT_INTERNAL_1ST_EMP_TEXT_PACK
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_EMP_TEXT_PACK
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_TEXT_PACK
+    #pragma push_macro("EMP_TEXT_PACK")
+    #undef EMP_TEXT_PACK
+  #endif
+
+#endif // #ifdef EMP_TEXT_PACK
+
+#ifdef EMP_TEXT_TYPE
+
+  #ifndef UIT_INTERNAL_HAS_EMP_TEXT_TYPE
+    #define UIT_INTERNAL_HAS_EMP_TEXT_TYPE
+
+    #ifdef UIT_EXTERNAL_1ST_EMP_TEXT_TYPE
+      #pragma pop_macro("EMP_TEXT_TYPE")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_EMP_TEXT_TYPE
+      #ifndef UIT_INTERNAL_1ST_EMP_TEXT_TYPE
+        #define UIT_INTERNAL_1ST_EMP_TEXT_TYPE
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_EMP_TEXT_TYPE
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_TEXT_TYPE
+    #pragma push_macro("EMP_TEXT_TYPE")
+    #undef EMP_TEXT_TYPE
+  #endif
+
+#endif // #ifdef EMP_TEXT_TYPE
+
 #ifdef EMP_TYPES_TO_VALS
 
   #ifndef UIT_INTERNAL_HAS_EMP_TYPES_TO_VALS
@@ -69576,4 +70008,52 @@
 
 #endif // #ifdef emp_assert_TO_PAIR
 
+#ifdef emp_bool_decoy
+
+  #ifndef UIT_INTERNAL_HAS_emp_bool_decoy
+    #define UIT_INTERNAL_HAS_emp_bool_decoy
+
+    #ifdef UIT_EXTERNAL_1ST_emp_bool_decoy
+      #pragma pop_macro("emp_bool_decoy")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_emp_bool_decoy
+      #ifndef UIT_INTERNAL_1ST_emp_bool_decoy
+        #define UIT_INTERNAL_1ST_emp_bool_decoy
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_emp_bool_decoy
+
+  #ifndef UIT_EXTERNAL_HAS_emp_bool_decoy
+    #pragma push_macro("emp_bool_decoy")
+    #undef emp_bool_decoy
+  #endif
+
+#endif // #ifdef emp_bool_decoy
+
+#ifdef emp_int_decoy
+
+  #ifndef UIT_INTERNAL_HAS_emp_int_decoy
+    #define UIT_INTERNAL_HAS_emp_int_decoy
+
+    #ifdef UIT_EXTERNAL_1ST_emp_int_decoy
+      #pragma pop_macro("emp_int_decoy")
+    #endif
+
+    #ifndef UIT_EXTERNAL_HAS_emp_int_decoy
+      #ifndef UIT_INTERNAL_1ST_emp_int_decoy
+        #define UIT_INTERNAL_1ST_emp_int_decoy
+      #endif
+    #endif
+
+  #endif // #ifndef UIT_INTERNAL_HAS_emp_int_decoy
+
+  #ifndef UIT_EXTERNAL_HAS_emp_int_decoy
+    #pragma push_macro("emp_int_decoy")
+    #undef emp_int_decoy
+  #endif
+
+#endif // #ifdef emp_int_decoy
+
 #endif // #ifdef UIT_VENDORIZE_EMP
diff --git a/include/uit_emp/vendorization/push_headerguards.hh b/include/uit_emp/vendorization/push_headerguards.hh
index 2049d9ce9..120d1a6dd 100644
--- a/include/uit_emp/vendorization/push_headerguards.hh
+++ b/include/uit_emp/vendorization/push_headerguards.hh
@@ -6,6 +6,12 @@
 #define EMP_ALWAYS_ASSERT_HPP
 #endif
 
+#pragma push_macro("EMP_ARRAY_H")
+#undef EMP_ARRAY_H
+#ifdef UIT_EMP_ARRAY_H_HEADERGUARD
+#define EMP_ARRAY_H
+#endif
+
 #pragma push_macro("EMP_ASSERT_HPP")
 #undef EMP_ASSERT_HPP
 #ifdef UIT_EMP_ASSERT_HPP_HEADERGUARD
@@ -24,6 +30,36 @@
 #define EMP_BASE_EMP_NAMESPACE_HPP
 #endif
 
+#pragma push_macro("EMP_BITSET_UTILS_H")
+#undef EMP_BITSET_UTILS_H
+#ifdef UIT_EMP_BITSET_UTILS_H_HEADERGUARD
+#define EMP_BITSET_UTILS_H
+#endif
+
+#pragma push_macro("EMP_CONST_H")
+#undef EMP_CONST_H
+#ifdef UIT_EMP_CONST_H_HEADERGUARD
+#define EMP_CONST_H
+#endif
+
+#pragma push_macro("EMP_DATA_NODE_H")
+#undef EMP_DATA_NODE_H
+#ifdef UIT_EMP_DATA_NODE_H_HEADERGUARD
+#define EMP_DATA_NODE_H
+#endif
+
+#pragma push_macro("EMP_FUNCTION_SET_H")
+#undef EMP_FUNCTION_SET_H
+#ifdef UIT_EMP_FUNCTION_SET_H_HEADERGUARD
+#define EMP_FUNCTION_SET_H
+#endif
+
+#pragma push_macro("EMP_INDEX_MAP_H")
+#undef EMP_INDEX_MAP_H
+#ifdef UIT_EMP_INDEX_MAP_H_HEADERGUARD
+#define EMP_INDEX_MAP_H
+#endif
+
 #pragma push_macro("EMP_IS_STREAMABLE_HPP")
 #undef EMP_IS_STREAMABLE_HPP
 #ifdef UIT_EMP_IS_STREAMABLE_HPP_HEADERGUARD
@@ -42,10 +78,94 @@
 #define EMP_MACRO_MATH_H
 #endif
 
+#pragma push_macro("EMP_MATH_H")
+#undef EMP_MATH_H
+#ifdef UIT_EMP_MATH_H_HEADERGUARD
+#define EMP_MATH_H
+#endif
+
+#pragma push_macro("EMP_META_H")
+#undef EMP_META_H
+#ifdef UIT_EMP_META_H_HEADERGUARD
+#define EMP_META_H
+#endif
+
 #pragma push_macro("EMP_NATIVE_ASSERT_TRIGGER_HPP")
 #undef EMP_NATIVE_ASSERT_TRIGGER_HPP
 #ifdef UIT_EMP_NATIVE_ASSERT_TRIGGER_HPP_HEADERGUARD
 #define EMP_NATIVE_ASSERT_TRIGGER_HPP
 #endif
 
+#pragma push_macro("EMP_OPTIONAL_H")
+#undef EMP_OPTIONAL_H
+#ifdef UIT_EMP_OPTIONAL_H_HEADERGUARD
+#define EMP_OPTIONAL_H
+#endif
+
+#pragma push_macro("EMP_PTR_H")
+#undef EMP_PTR_H
+#ifdef UIT_EMP_PTR_H_HEADERGUARD
+#define EMP_PTR_H
+#endif
+
+#pragma push_macro("EMP_RANDOM_H")
+#undef EMP_RANDOM_H
+#ifdef UIT_EMP_RANDOM_H_HEADERGUARD
+#define EMP_RANDOM_H
+#endif
+
+#pragma push_macro("EMP_RANGE_H")
+#undef EMP_RANGE_H
+#ifdef UIT_EMP_RANGE_H_HEADERGUARD
+#define EMP_RANGE_H
+#endif
+
+#pragma push_macro("EMP_REFLECTION_H")
+#undef EMP_REFLECTION_H
+#ifdef UIT_EMP_REFLECTION_H_HEADERGUARD
+#define EMP_REFLECTION_H
+#endif
+
+#pragma push_macro("EMP_STRING_TYPE_H")
+#undef EMP_STRING_TYPE_H
+#ifdef UIT_EMP_STRING_TYPE_H_HEADERGUARD
+#define EMP_STRING_TYPE_H
+#endif
+
+#pragma push_macro("EMP_STRING_UTILS_H")
+#undef EMP_STRING_UTILS_H
+#ifdef UIT_EMP_STRING_UTILS_H_HEADERGUARD
+#define EMP_STRING_UTILS_H
+#endif
+
+#pragma push_macro("EMP_TYPE_ID_H")
+#undef EMP_TYPE_ID_H
+#ifdef UIT_EMP_TYPE_ID_H_HEADERGUARD
+#define EMP_TYPE_ID_H
+#endif
+
+#pragma push_macro("EMP_TYPE_PACK_H")
+#undef EMP_TYPE_PACK_H
+#ifdef UIT_EMP_TYPE_PACK_H_HEADERGUARD
+#define EMP_TYPE_PACK_H
+#endif
+
+#pragma push_macro("EMP_TYPE_TRAITS_H")
+#undef EMP_TYPE_TRAITS_H
+#ifdef UIT_EMP_TYPE_TRAITS_H_HEADERGUARD
+#define EMP_TYPE_TRAITS_H
+#endif
+
+#pragma push_macro("EMP_VAL_PACK_H")
+#undef EMP_VAL_PACK_H
+#ifdef UIT_EMP_VAL_PACK_H_HEADERGUARD
+#define EMP_VAL_PACK_H
+#endif
+
+#pragma push_macro("EMP_VECTOR_H")
+#undef EMP_VECTOR_H
+#ifdef UIT_EMP_VECTOR_H_HEADERGUARD
+#define EMP_VECTOR_H
+#endif
+
 #endif // #ifdef UIT_VENDORIZE_EMP
diff --git a/include/uit_emp/vendorization/push_macros.hh b/include/uit_emp/vendorization/push_macros.hh
index 7e5917994..09b87c5f0 100644
--- a/include/uit_emp/vendorization/push_macros.hh
+++ b/include/uit_emp/vendorization/push_macros.hh
@@ -418,6 +418,158 @@
 
 #endif // #ifdef EMP_ADD_IMPL
 
+#ifdef EMP_ADD_TYPE_FROM_MEMBER
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER
+    #define UIT_EXTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER
+    #ifndef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER
+      #define UIT_EXTERNAL_1ST_EMP_ADD_TYPE_FROM_MEMBER
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER
+    #pragma push_macro("EMP_ADD_TYPE_FROM_MEMBER")
+    #undef EMP_ADD_TYPE_FROM_MEMBER
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER) && defined(UIT_EXTERNAL_1ST_EMP_ADD_TYPE_FROM_MEMBER\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_EMP_ADD_TYPE_FROM_MEMBER_INSEEP_WARNING
+      #define UIT_EMP_ADD_TYPE_FROM_MEMBER_INSEEP_WARNING
+      #pragma message(\
+        "EMP_ADD_TYPE_FROM_MEMBER defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef EMP_ADD_TYPE_FROM_MEMBER
+
+  #ifdef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER
+    #pragma pop_macro("EMP_ADD_TYPE_FROM_MEMBER")
+  #endif // #ifdef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER
+
+#endif // #ifdef EMP_ADD_TYPE_FROM_MEMBER
+
+#ifdef EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+    #define UIT_EXTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+    #ifndef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+      #define UIT_EXTERNAL_1ST_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+    #pragma push_macro("EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE")
+    #undef EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE) && defined(UIT_EXTERNAL_1ST_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE_INSEEP_WARNING
+      #define UIT_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE_INSEEP_WARNING
+      #pragma message(\
+        "EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+
+  #ifdef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+    #pragma pop_macro("EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE")
+  #endif // #ifdef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+
+#endif // #ifdef EMP_ADD_TYPE_FROM_MEMBER_OR_TYPE
+
+#ifdef EMP_ADD_TYPE_FROM_TYPE
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE
+    #define UIT_EXTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE
+    #ifndef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE
+      #define UIT_EXTERNAL_1ST_EMP_ADD_TYPE_FROM_TYPE
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE
+    #pragma push_macro("EMP_ADD_TYPE_FROM_TYPE")
+    #undef EMP_ADD_TYPE_FROM_TYPE
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE) && defined(UIT_EXTERNAL_1ST_EMP_ADD_TYPE_FROM_TYPE\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_EMP_ADD_TYPE_FROM_TYPE_INSEEP_WARNING
+      #define UIT_EMP_ADD_TYPE_FROM_TYPE_INSEEP_WARNING
+      #pragma message(\
+        "EMP_ADD_TYPE_FROM_TYPE defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef EMP_ADD_TYPE_FROM_TYPE
+
+  #ifdef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE
+    #pragma pop_macro("EMP_ADD_TYPE_FROM_TYPE")
+  #endif // #ifdef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE
+
+#endif // #ifdef EMP_ADD_TYPE_FROM_TYPE
+
+#ifdef EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+    #define UIT_EXTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+    #ifndef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+      #define UIT_EXTERNAL_1ST_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+    #pragma push_macro("EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER")
+    #undef EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER) && defined(UIT_EXTERNAL_1ST_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER_INSEEP_WARNING
+      #define UIT_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER_INSEEP_WARNING
+      #pragma message(\
+        "EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+
+  #ifdef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+    #pragma pop_macro("EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER")
+  #endif // #ifdef UIT_INTERNAL_HAS_EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+
+#endif // #ifdef EMP_ADD_TYPE_FROM_TYPE_OR_MEMBER
+
 #ifdef EMP_AND
 
   #ifndef UIT_EXTERNAL_HAS_EMP_AND
@@ -40660,6 +40812,44 @@
 
 #endif // #ifdef EMP_BOOL_IMPL
 
+#ifdef EMP_BUILD_TYPE_PACK
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_BUILD_TYPE_PACK
+    #define UIT_EXTERNAL_HAS_EMP_BUILD_TYPE_PACK
+    #ifndef UIT_INTERNAL_HAS_EMP_BUILD_TYPE_PACK
+      #define UIT_EXTERNAL_1ST_EMP_BUILD_TYPE_PACK
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_EMP_BUILD_TYPE_PACK
+    #pragma push_macro("EMP_BUILD_TYPE_PACK")
+    #undef EMP_BUILD_TYPE_PACK
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_EMP_BUILD_TYPE_PACK) && defined(UIT_EXTERNAL_1ST_EMP_BUILD_TYPE_PACK\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_EMP_BUILD_TYPE_PACK_INSEEP_WARNING
+      #define UIT_EMP_BUILD_TYPE_PACK_INSEEP_WARNING
+      #pragma message(\
+        "EMP_BUILD_TYPE_PACK defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef EMP_BUILD_TYPE_PACK
+
+  #ifdef UIT_INTERNAL_HAS_EMP_BUILD_TYPE_PACK
+    #pragma pop_macro("EMP_BUILD_TYPE_PACK")
+  #endif // #ifdef UIT_INTERNAL_HAS_EMP_BUILD_TYPE_PACK
+
+#endif // #ifdef EMP_BUILD_TYPE_PACK
+
 #ifdef EMP_CALL_BY_PACKS
 
   #ifndef UIT_EXTERNAL_HAS_EMP_CALL_BY_PACKS
@@ -41610,6 +41800,44 @@
 
 #endif // #ifdef EMP_CALL_BY_PACKS_implD
 
+#ifdef EMP_CHOOSE_MEMBER_TYPE
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_CHOOSE_MEMBER_TYPE
+    #define UIT_EXTERNAL_HAS_EMP_CHOOSE_MEMBER_TYPE
+    #ifndef UIT_INTERNAL_HAS_EMP_CHOOSE_MEMBER_TYPE
+      #define UIT_EXTERNAL_1ST_EMP_CHOOSE_MEMBER_TYPE
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_EMP_CHOOSE_MEMBER_TYPE
+    #pragma push_macro("EMP_CHOOSE_MEMBER_TYPE")
+    #undef EMP_CHOOSE_MEMBER_TYPE
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_EMP_CHOOSE_MEMBER_TYPE) && defined(UIT_EXTERNAL_1ST_EMP_CHOOSE_MEMBER_TYPE\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_EMP_CHOOSE_MEMBER_TYPE_INSEEP_WARNING
+      #define UIT_EMP_CHOOSE_MEMBER_TYPE_INSEEP_WARNING
+      #pragma message(\
+        "EMP_CHOOSE_MEMBER_TYPE defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef EMP_CHOOSE_MEMBER_TYPE
+
+  #ifdef UIT_INTERNAL_HAS_EMP_CHOOSE_MEMBER_TYPE
+    #pragma pop_macro("EMP_CHOOSE_MEMBER_TYPE")
+  #endif // #ifdef UIT_INTERNAL_HAS_EMP_CHOOSE_MEMBER_TYPE
+
+#endif // #ifdef EMP_CHOOSE_MEMBER_TYPE
+
 #ifdef EMP_COMPARE
 
   #ifndef UIT_EXTERNAL_HAS_EMP_COMPARE
@@ -42370,6 +42598,158 @@
 
 #endif // #ifdef EMP_COUNT_ONES
 
+#ifdef EMP_CREATE_EVAL_SELECT
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_CREATE_EVAL_SELECT
+    #define UIT_EXTERNAL_HAS_EMP_CREATE_EVAL_SELECT
+    #ifndef UIT_INTERNAL_HAS_EMP_CREATE_EVAL_SELECT
+      #define UIT_EXTERNAL_1ST_EMP_CREATE_EVAL_SELECT
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_EMP_CREATE_EVAL_SELECT
+    #pragma push_macro("EMP_CREATE_EVAL_SELECT")
+    #undef EMP_CREATE_EVAL_SELECT
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_EMP_CREATE_EVAL_SELECT) && defined(UIT_EXTERNAL_1ST_EMP_CREATE_EVAL_SELECT\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_EMP_CREATE_EVAL_SELECT_INSEEP_WARNING
+      #define UIT_EMP_CREATE_EVAL_SELECT_INSEEP_WARNING
+      #pragma message(\
+        "EMP_CREATE_EVAL_SELECT defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef EMP_CREATE_EVAL_SELECT
+
+  #ifdef UIT_INTERNAL_HAS_EMP_CREATE_EVAL_SELECT
+    #pragma pop_macro("EMP_CREATE_EVAL_SELECT")
+  #endif // #ifdef UIT_INTERNAL_HAS_EMP_CREATE_EVAL_SELECT
+
+#endif // #ifdef EMP_CREATE_EVAL_SELECT
+
+#ifdef EMP_CREATE_METHOD_FALLBACK
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK
+    #define UIT_EXTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK
+    #ifndef UIT_INTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK
+      #define UIT_EXTERNAL_1ST_EMP_CREATE_METHOD_FALLBACK
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK
+    #pragma push_macro("EMP_CREATE_METHOD_FALLBACK")
+    #undef EMP_CREATE_METHOD_FALLBACK
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK) && defined(UIT_EXTERNAL_1ST_EMP_CREATE_METHOD_FALLBACK\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_EMP_CREATE_METHOD_FALLBACK_INSEEP_WARNING
+      #define UIT_EMP_CREATE_METHOD_FALLBACK_INSEEP_WARNING
+      #pragma message(\
+        "EMP_CREATE_METHOD_FALLBACK defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef EMP_CREATE_METHOD_FALLBACK
+
+  #ifdef UIT_INTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK
+    #pragma pop_macro("EMP_CREATE_METHOD_FALLBACK")
+  #endif // #ifdef UIT_INTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK
+
+#endif // #ifdef EMP_CREATE_METHOD_FALLBACK
+
+#ifdef EMP_CREATE_METHOD_FALLBACK_VAL
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK_VAL
+    #define UIT_EXTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK_VAL
+    #ifndef UIT_INTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK_VAL
+      #define UIT_EXTERNAL_1ST_EMP_CREATE_METHOD_FALLBACK_VAL
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK_VAL
+    #pragma push_macro("EMP_CREATE_METHOD_FALLBACK_VAL")
+    #undef EMP_CREATE_METHOD_FALLBACK_VAL
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK_VAL) && defined(UIT_EXTERNAL_1ST_EMP_CREATE_METHOD_FALLBACK_VAL\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_EMP_CREATE_METHOD_FALLBACK_VAL_INSEEP_WARNING
+      #define UIT_EMP_CREATE_METHOD_FALLBACK_VAL_INSEEP_WARNING
+      #pragma message(\
+        "EMP_CREATE_METHOD_FALLBACK_VAL defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef EMP_CREATE_METHOD_FALLBACK_VAL
+
+  #ifdef UIT_INTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK_VAL
+    #pragma pop_macro("EMP_CREATE_METHOD_FALLBACK_VAL")
+  #endif // #ifdef UIT_INTERNAL_HAS_EMP_CREATE_METHOD_FALLBACK_VAL
+
+#endif // #ifdef EMP_CREATE_METHOD_FALLBACK_VAL
+
+#ifdef EMP_CREATE_OPTIONAL_METHOD
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_CREATE_OPTIONAL_METHOD
+    #define UIT_EXTERNAL_HAS_EMP_CREATE_OPTIONAL_METHOD
+    #ifndef UIT_INTERNAL_HAS_EMP_CREATE_OPTIONAL_METHOD
+      #define UIT_EXTERNAL_1ST_EMP_CREATE_OPTIONAL_METHOD
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_EMP_CREATE_OPTIONAL_METHOD
+    #pragma push_macro("EMP_CREATE_OPTIONAL_METHOD")
+    #undef EMP_CREATE_OPTIONAL_METHOD
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_EMP_CREATE_OPTIONAL_METHOD) && defined(UIT_EXTERNAL_1ST_EMP_CREATE_OPTIONAL_METHOD\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_EMP_CREATE_OPTIONAL_METHOD_INSEEP_WARNING
+      #define UIT_EMP_CREATE_OPTIONAL_METHOD_INSEEP_WARNING
+      #pragma message(\
+        "EMP_CREATE_OPTIONAL_METHOD defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef EMP_CREATE_OPTIONAL_METHOD
+
+  #ifdef UIT_INTERNAL_HAS_EMP_CREATE_OPTIONAL_METHOD
+    #pragma pop_macro("EMP_CREATE_OPTIONAL_METHOD")
+  #endif // #ifdef UIT_INTERNAL_HAS_EMP_CREATE_OPTIONAL_METHOD
+
+#endif // #ifdef EMP_CREATE_OPTIONAL_METHOD
+
 #ifdef EMP_CROP_ARGS_TO
 
   #ifndef UIT_EXTERNAL_HAS_EMP_CROP_ARGS_TO
@@ -85994,6 +86374,44 @@
 
 #endif // #ifdef EMP_EVAL_G
 
+#ifdef EMP_EXPAND_PPACK
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_EXPAND_PPACK
+    #define UIT_EXTERNAL_HAS_EMP_EXPAND_PPACK
+    #ifndef UIT_INTERNAL_HAS_EMP_EXPAND_PPACK
+      #define UIT_EXTERNAL_1ST_EMP_EXPAND_PPACK
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_EMP_EXPAND_PPACK
+    #pragma push_macro("EMP_EXPAND_PPACK")
+    #undef EMP_EXPAND_PPACK
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_EMP_EXPAND_PPACK) && defined(UIT_EXTERNAL_1ST_EMP_EXPAND_PPACK\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_EMP_EXPAND_PPACK_INSEEP_WARNING
+      #define UIT_EMP_EXPAND_PPACK_INSEEP_WARNING
+      #pragma message(\
+        "EMP_EXPAND_PPACK defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef EMP_EXPAND_PPACK
+
+  #ifdef UIT_INTERNAL_HAS_EMP_EXPAND_PPACK
+    #pragma pop_macro("EMP_EXPAND_PPACK")
+  #endif // #ifdef UIT_INTERNAL_HAS_EMP_EXPAND_PPACK
+
+#endif // #ifdef EMP_EXPAND_PPACK
+
 #ifdef EMP_FORCE_ARGS_TO
 
   #ifndef UIT_EXTERNAL_HAS_EMP_FORCE_ARGS_TO
@@ -86982,6 +87400,120 @@
 
 #endif // #ifdef EMP_IMERGE_9
 
+#ifdef EMP_IMPL_TYPE_DEFAULT
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_IMPL_TYPE_DEFAULT
+    #define UIT_EXTERNAL_HAS_EMP_IMPL_TYPE_DEFAULT
+    #ifndef UIT_INTERNAL_HAS_EMP_IMPL_TYPE_DEFAULT
+      #define UIT_EXTERNAL_1ST_EMP_IMPL_TYPE_DEFAULT
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_EMP_IMPL_TYPE_DEFAULT
+    #pragma push_macro("EMP_IMPL_TYPE_DEFAULT")
+    #undef EMP_IMPL_TYPE_DEFAULT
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_EMP_IMPL_TYPE_DEFAULT) && defined(UIT_EXTERNAL_1ST_EMP_IMPL_TYPE_DEFAULT\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_EMP_IMPL_TYPE_DEFAULT_INSEEP_WARNING
+      #define UIT_EMP_IMPL_TYPE_DEFAULT_INSEEP_WARNING
+      #pragma message(\
+        "EMP_IMPL_TYPE_DEFAULT defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef EMP_IMPL_TYPE_DEFAULT
+
+  #ifdef UIT_INTERNAL_HAS_EMP_IMPL_TYPE_DEFAULT
+    #pragma pop_macro("EMP_IMPL_TYPE_DEFAULT")
+  #endif // #ifdef UIT_INTERNAL_HAS_EMP_IMPL_TYPE_DEFAULT
+
+#endif // #ifdef EMP_IMPL_TYPE_DEFAULT
+
+#ifdef EMP_IMPL_TYPE_HAS_MEMBER
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_IMPL_TYPE_HAS_MEMBER
+    #define UIT_EXTERNAL_HAS_EMP_IMPL_TYPE_HAS_MEMBER
+    #ifndef UIT_INTERNAL_HAS_EMP_IMPL_TYPE_HAS_MEMBER
+      #define UIT_EXTERNAL_1ST_EMP_IMPL_TYPE_HAS_MEMBER
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_EMP_IMPL_TYPE_HAS_MEMBER
+    #pragma push_macro("EMP_IMPL_TYPE_HAS_MEMBER")
+    #undef EMP_IMPL_TYPE_HAS_MEMBER
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_EMP_IMPL_TYPE_HAS_MEMBER) && defined(UIT_EXTERNAL_1ST_EMP_IMPL_TYPE_HAS_MEMBER\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_EMP_IMPL_TYPE_HAS_MEMBER_INSEEP_WARNING
+      #define UIT_EMP_IMPL_TYPE_HAS_MEMBER_INSEEP_WARNING
+      #pragma message(\
+        "EMP_IMPL_TYPE_HAS_MEMBER defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef EMP_IMPL_TYPE_HAS_MEMBER
+
+  #ifdef UIT_INTERNAL_HAS_EMP_IMPL_TYPE_HAS_MEMBER
+    #pragma pop_macro("EMP_IMPL_TYPE_HAS_MEMBER")
+  #endif // #ifdef UIT_INTERNAL_HAS_EMP_IMPL_TYPE_HAS_MEMBER
+
+#endif // #ifdef EMP_IMPL_TYPE_HAS_MEMBER
+
+#ifdef EMP_IMPL_TYPE_HAS_TYPE
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_IMPL_TYPE_HAS_TYPE
+    #define UIT_EXTERNAL_HAS_EMP_IMPL_TYPE_HAS_TYPE
+    #ifndef UIT_INTERNAL_HAS_EMP_IMPL_TYPE_HAS_TYPE
+      #define UIT_EXTERNAL_1ST_EMP_IMPL_TYPE_HAS_TYPE
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_EMP_IMPL_TYPE_HAS_TYPE
+    #pragma push_macro("EMP_IMPL_TYPE_HAS_TYPE")
+    #undef EMP_IMPL_TYPE_HAS_TYPE
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_EMP_IMPL_TYPE_HAS_TYPE) && defined(UIT_EXTERNAL_1ST_EMP_IMPL_TYPE_HAS_TYPE\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_EMP_IMPL_TYPE_HAS_TYPE_INSEEP_WARNING
+      #define UIT_EMP_IMPL_TYPE_HAS_TYPE_INSEEP_WARNING
+      #pragma message(\
+        "EMP_IMPL_TYPE_HAS_TYPE defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef EMP_IMPL_TYPE_HAS_TYPE
+
+  #ifdef UIT_INTERNAL_HAS_EMP_IMPL_TYPE_HAS_TYPE
+    #pragma pop_macro("EMP_IMPL_TYPE_HAS_TYPE")
+  #endif // #ifdef UIT_INTERNAL_HAS_EMP_IMPL_TYPE_HAS_TYPE
+
+#endif // #ifdef EMP_IMPL_TYPE_HAS_TYPE
+
 #ifdef EMP_INC
 
   #ifndef UIT_EXTERNAL_HAS_EMP_INC
@@ -103322,6 +103854,44 @@
 
 #endif // #ifdef EMP_SELECT_x
 
+#ifdef EMP_SETUP_TYPE_SELECTOR
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_SETUP_TYPE_SELECTOR
+    #define UIT_EXTERNAL_HAS_EMP_SETUP_TYPE_SELECTOR
+    #ifndef UIT_INTERNAL_HAS_EMP_SETUP_TYPE_SELECTOR
+      #define UIT_EXTERNAL_1ST_EMP_SETUP_TYPE_SELECTOR
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_EMP_SETUP_TYPE_SELECTOR
+    #pragma push_macro("EMP_SETUP_TYPE_SELECTOR")
+    #undef EMP_SETUP_TYPE_SELECTOR
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_EMP_SETUP_TYPE_SELECTOR) && defined(UIT_EXTERNAL_1ST_EMP_SETUP_TYPE_SELECTOR\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_EMP_SETUP_TYPE_SELECTOR_INSEEP_WARNING
+      #define UIT_EMP_SETUP_TYPE_SELECTOR_INSEEP_WARNING
+      #pragma message(\
+        "EMP_SETUP_TYPE_SELECTOR defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef EMP_SETUP_TYPE_SELECTOR
+
+  #ifdef UIT_INTERNAL_HAS_EMP_SETUP_TYPE_SELECTOR
+    #pragma pop_macro("EMP_SETUP_TYPE_SELECTOR")
+  #endif // #ifdef UIT_INTERNAL_HAS_EMP_SETUP_TYPE_SELECTOR
+
+#endif // #ifdef EMP_SETUP_TYPE_SELECTOR
+
 #ifdef EMP_SHIFTL
 
   #ifndef UIT_EXTERNAL_HAS_EMP_SHIFTL
@@ -104880,6 +105450,120 @@
 
 #endif // #ifdef EMP_TEST_IF_VOID__void
 
+#ifdef EMP_TEXT_HASH
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_TEXT_HASH
+    #define UIT_EXTERNAL_HAS_EMP_TEXT_HASH
+    #ifndef UIT_INTERNAL_HAS_EMP_TEXT_HASH
+      #define UIT_EXTERNAL_1ST_EMP_TEXT_HASH
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_EMP_TEXT_HASH
+    #pragma push_macro("EMP_TEXT_HASH")
+    #undef EMP_TEXT_HASH
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_EMP_TEXT_HASH) && defined(UIT_EXTERNAL_1ST_EMP_TEXT_HASH\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_EMP_TEXT_HASH_INSEEP_WARNING
+      #define UIT_EMP_TEXT_HASH_INSEEP_WARNING
+      #pragma message(\
+        "EMP_TEXT_HASH defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef EMP_TEXT_HASH
+
+  #ifdef UIT_INTERNAL_HAS_EMP_TEXT_HASH
+    #pragma pop_macro("EMP_TEXT_HASH")
+  #endif // #ifdef UIT_INTERNAL_HAS_EMP_TEXT_HASH
+
+#endif // #ifdef EMP_TEXT_HASH
+
+#ifdef EMP_TEXT_PACK
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_TEXT_PACK
+    #define UIT_EXTERNAL_HAS_EMP_TEXT_PACK
+    #ifndef UIT_INTERNAL_HAS_EMP_TEXT_PACK
+      #define UIT_EXTERNAL_1ST_EMP_TEXT_PACK
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_EMP_TEXT_PACK
+    #pragma push_macro("EMP_TEXT_PACK")
+    #undef EMP_TEXT_PACK
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_EMP_TEXT_PACK) && defined(UIT_EXTERNAL_1ST_EMP_TEXT_PACK\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_EMP_TEXT_PACK_INSEEP_WARNING
+      #define UIT_EMP_TEXT_PACK_INSEEP_WARNING
+      #pragma message(\
+        "EMP_TEXT_PACK defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef EMP_TEXT_PACK
+
+  #ifdef UIT_INTERNAL_HAS_EMP_TEXT_PACK
+    #pragma pop_macro("EMP_TEXT_PACK")
+  #endif // #ifdef UIT_INTERNAL_HAS_EMP_TEXT_PACK
+
+#endif // #ifdef EMP_TEXT_PACK
+
+#ifdef EMP_TEXT_TYPE
+
+  #ifndef UIT_EXTERNAL_HAS_EMP_TEXT_TYPE
+    #define UIT_EXTERNAL_HAS_EMP_TEXT_TYPE
+    #ifndef UIT_INTERNAL_HAS_EMP_TEXT_TYPE
+      #define UIT_EXTERNAL_1ST_EMP_TEXT_TYPE
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_EMP_TEXT_TYPE
+    #pragma push_macro("EMP_TEXT_TYPE")
+    #undef EMP_TEXT_TYPE
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_EMP_TEXT_TYPE) && defined(UIT_EXTERNAL_1ST_EMP_TEXT_TYPE\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_EMP_TEXT_TYPE_INSEEP_WARNING
+      #define UIT_EMP_TEXT_TYPE_INSEEP_WARNING
+      #pragma message(\
+        "EMP_TEXT_TYPE defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef EMP_TEXT_TYPE
+
+  #ifdef UIT_INTERNAL_HAS_EMP_TEXT_TYPE
+    #pragma pop_macro("EMP_TEXT_TYPE")
+  #endif // #ifdef UIT_INTERNAL_HAS_EMP_TEXT_TYPE
+
+#endif // #ifdef EMP_TEXT_TYPE
+
 #ifdef EMP_TYPES_TO_VALS
 
   #ifndef UIT_EXTERNAL_HAS_EMP_TYPES_TO_VALS
@@ -110162,4 +110846,80 @@
 
 #endif // #ifdef emp_assert_TO_PAIR
 
+#ifdef emp_bool_decoy
+
+  #ifndef UIT_EXTERNAL_HAS_emp_bool_decoy
+    #define UIT_EXTERNAL_HAS_emp_bool_decoy
+    #ifndef UIT_INTERNAL_HAS_emp_bool_decoy
+      #define UIT_EXTERNAL_1ST_emp_bool_decoy
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_emp_bool_decoy
+    #pragma push_macro("emp_bool_decoy")
+    #undef emp_bool_decoy
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_emp_bool_decoy) && defined(UIT_EXTERNAL_1ST_emp_bool_decoy\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_emp_bool_decoy_INSEEP_WARNING
+      #define UIT_emp_bool_decoy_INSEEP_WARNING
+      #pragma message(\
+        "emp_bool_decoy defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef emp_bool_decoy
+
+  #ifdef UIT_INTERNAL_HAS_emp_bool_decoy
+    #pragma pop_macro("emp_bool_decoy")
+  #endif // #ifdef UIT_INTERNAL_HAS_emp_bool_decoy
+
+#endif // #ifdef emp_bool_decoy
+
+#ifdef emp_int_decoy
+
+  #ifndef UIT_EXTERNAL_HAS_emp_int_decoy
+    #define UIT_EXTERNAL_HAS_emp_int_decoy
+    #ifndef UIT_INTERNAL_HAS_emp_int_decoy
+      #define UIT_EXTERNAL_1ST_emp_int_decoy
+    #endif
+  #endif
+
+  #ifndef UIT_INTERNAL_HAS_emp_int_decoy
+    #pragma push_macro("emp_int_decoy")
+    #undef emp_int_decoy
+  #endif
+
+  #if defined(\
+    UIT_INTERNAL_HAS_emp_int_decoy) && defined(UIT_EXTERNAL_1ST_emp_int_decoy\
+  )
+    #ifndef UIT_SUPPRESS_MACRO_INSEEP_WARNINGS
+    #ifndef UIT_emp_int_decoy_INSEEP_WARNING
+      #define UIT_emp_int_decoy_INSEEP_WARNING
+      #pragma message(\
+        "emp_int_decoy defined first outside vendorized header,"\
+        " so outside definition will be used inside vendorized header"\
+        " on subsequent includes of the vendorized header"\
+        " --- if causes problems, try changing header include order"\
+      )
+    #endif
+    #endif
+  #endif
+
+#else // #ifdef emp_int_decoy
+
+  #ifdef UIT_INTERNAL_HAS_emp_int_decoy
+    #pragma pop_macro("emp_int_decoy")
+  #endif // #ifdef UIT_INTERNAL_HAS_emp_int_decoy
+
+#endif // #ifdef emp_int_decoy
+
 #endif // #ifdef UIT_VENDORIZE_EMP