diff --git a/src/duckdb/ub_extension_core_functions_aggregate_algebraic.cpp b/src/duckdb/ub_extension_core_functions_aggregate_algebraic.cpp
index 1fdfd5cdb..8cf8af345 100644
--- a/src/duckdb/ub_extension_core_functions_aggregate_algebraic.cpp
+++ b/src/duckdb/ub_extension_core_functions_aggregate_algebraic.cpp
@@ -1,8 +1,8 @@
 #include "extension/core_functions/aggregate/algebraic/avg.cpp"
 
+#include "extension/core_functions/aggregate/algebraic/corr.cpp"
+
 #include "extension/core_functions/aggregate/algebraic/covar.cpp"
 
 #include "extension/core_functions/aggregate/algebraic/stddev.cpp"
 
-#include "extension/core_functions/aggregate/algebraic/corr.cpp"
-
diff --git a/src/duckdb/ub_extension_core_functions_aggregate_distributive.cpp b/src/duckdb/ub_extension_core_functions_aggregate_distributive.cpp
index ffd7c8dad..8b42b3359 100644
--- a/src/duckdb/ub_extension_core_functions_aggregate_distributive.cpp
+++ b/src/duckdb/ub_extension_core_functions_aggregate_distributive.cpp
@@ -2,19 +2,19 @@
 
 #include "extension/core_functions/aggregate/distributive/arg_min_max.cpp"
 
-#include "extension/core_functions/aggregate/distributive/product.cpp"
+#include "extension/core_functions/aggregate/distributive/bitagg.cpp"
 
-#include "extension/core_functions/aggregate/distributive/skew.cpp"
+#include "extension/core_functions/aggregate/distributive/bitstring_agg.cpp"
 
-#include "extension/core_functions/aggregate/distributive/kurtosis.cpp"
+#include "extension/core_functions/aggregate/distributive/bool.cpp"
 
-#include "extension/core_functions/aggregate/distributive/sum.cpp"
+#include "extension/core_functions/aggregate/distributive/kurtosis.cpp"
 
-#include "extension/core_functions/aggregate/distributive/bitagg.cpp"
+#include "extension/core_functions/aggregate/distributive/product.cpp"
 
-#include "extension/core_functions/aggregate/distributive/bitstring_agg.cpp"
+#include "extension/core_functions/aggregate/distributive/skew.cpp"
 
 #include "extension/core_functions/aggregate/distributive/string_agg.cpp"
 
-#include "extension/core_functions/aggregate/distributive/bool.cpp"
+#include "extension/core_functions/aggregate/distributive/sum.cpp"
 
diff --git a/src/duckdb/ub_extension_core_functions_aggregate_holistic.cpp b/src/duckdb/ub_extension_core_functions_aggregate_holistic.cpp
index 4f892afa3..4bebdae55 100644
--- a/src/duckdb/ub_extension_core_functions_aggregate_holistic.cpp
+++ b/src/duckdb/ub_extension_core_functions_aggregate_holistic.cpp
@@ -1,12 +1,12 @@
-#include "extension/core_functions/aggregate/holistic/quantile.cpp"
+#include "extension/core_functions/aggregate/holistic/approx_top_k.cpp"
 
-#include "extension/core_functions/aggregate/holistic/mode.cpp"
+#include "extension/core_functions/aggregate/holistic/approximate_quantile.cpp"
 
-#include "extension/core_functions/aggregate/holistic/reservoir_quantile.cpp"
+#include "extension/core_functions/aggregate/holistic/mad.cpp"
 
-#include "extension/core_functions/aggregate/holistic/approx_top_k.cpp"
+#include "extension/core_functions/aggregate/holistic/mode.cpp"
 
-#include "extension/core_functions/aggregate/holistic/mad.cpp"
+#include "extension/core_functions/aggregate/holistic/quantile.cpp"
 
-#include "extension/core_functions/aggregate/holistic/approximate_quantile.cpp"
+#include "extension/core_functions/aggregate/holistic/reservoir_quantile.cpp"
 
diff --git a/src/duckdb/ub_extension_core_functions_aggregate_nested.cpp b/src/duckdb/ub_extension_core_functions_aggregate_nested.cpp
index 340382e4f..8f3f5452f 100644
--- a/src/duckdb/ub_extension_core_functions_aggregate_nested.cpp
+++ b/src/duckdb/ub_extension_core_functions_aggregate_nested.cpp
@@ -1,6 +1,6 @@
+#include "extension/core_functions/aggregate/nested/binned_histogram.cpp"
+
 #include "extension/core_functions/aggregate/nested/histogram.cpp"
 
 #include "extension/core_functions/aggregate/nested/list.cpp"
 
-#include "extension/core_functions/aggregate/nested/binned_histogram.cpp"
-
diff --git a/src/duckdb/ub_extension_core_functions_aggregate_regression.cpp b/src/duckdb/ub_extension_core_functions_aggregate_regression.cpp
index 071bc16d4..95eeba945 100644
--- a/src/duckdb/ub_extension_core_functions_aggregate_regression.cpp
+++ b/src/duckdb/ub_extension_core_functions_aggregate_regression.cpp
@@ -1,14 +1,14 @@
-#include "extension/core_functions/aggregate/regression/regr_r2.cpp"
-
 #include "extension/core_functions/aggregate/regression/regr_avg.cpp"
 
-#include "extension/core_functions/aggregate/regression/regr_sxy.cpp"
+#include "extension/core_functions/aggregate/regression/regr_count.cpp"
 
-#include "extension/core_functions/aggregate/regression/regr_sxx_syy.cpp"
+#include "extension/core_functions/aggregate/regression/regr_intercept.cpp"
+
+#include "extension/core_functions/aggregate/regression/regr_r2.cpp"
 
 #include "extension/core_functions/aggregate/regression/regr_slope.cpp"
 
-#include "extension/core_functions/aggregate/regression/regr_count.cpp"
+#include "extension/core_functions/aggregate/regression/regr_sxx_syy.cpp"
 
-#include "extension/core_functions/aggregate/regression/regr_intercept.cpp"
+#include "extension/core_functions/aggregate/regression/regr_sxy.cpp"
 
diff --git a/src/duckdb/ub_extension_core_functions_scalar_array.cpp b/src/duckdb/ub_extension_core_functions_scalar_array.cpp
index 9b9a475b4..e4f63a369 100644
--- a/src/duckdb/ub_extension_core_functions_scalar_array.cpp
+++ b/src/duckdb/ub_extension_core_functions_scalar_array.cpp
@@ -1,4 +1,4 @@
-#include "extension/core_functions/scalar/array/array_value.cpp"
-
 #include "extension/core_functions/scalar/array/array_functions.cpp"
 
+#include "extension/core_functions/scalar/array/array_value.cpp"
+
diff --git a/src/duckdb/ub_extension_core_functions_scalar_blob.cpp b/src/duckdb/ub_extension_core_functions_scalar_blob.cpp
index f50a94222..1eda3bad1 100644
--- a/src/duckdb/ub_extension_core_functions_scalar_blob.cpp
+++ b/src/duckdb/ub_extension_core_functions_scalar_blob.cpp
@@ -1,4 +1,4 @@
-#include "extension/core_functions/scalar/blob/encode.cpp"
-
 #include "extension/core_functions/scalar/blob/base64.cpp"
 
+#include "extension/core_functions/scalar/blob/encode.cpp"
+
diff --git a/src/duckdb/ub_extension_core_functions_scalar_date.cpp b/src/duckdb/ub_extension_core_functions_scalar_date.cpp
index 869059d9b..94c857ed0 100644
--- a/src/duckdb/ub_extension_core_functions_scalar_date.cpp
+++ b/src/duckdb/ub_extension_core_functions_scalar_date.cpp
@@ -1,20 +1,20 @@
-#include "extension/core_functions/scalar/date/time_bucket.cpp"
+#include "extension/core_functions/scalar/date/age.cpp"
 
 #include "extension/core_functions/scalar/date/current.cpp"
 
-#include "extension/core_functions/scalar/date/date_sub.cpp"
-
-#include "extension/core_functions/scalar/date/make_date.cpp"
-
-#include "extension/core_functions/scalar/date/age.cpp"
+#include "extension/core_functions/scalar/date/date_diff.cpp"
 
 #include "extension/core_functions/scalar/date/date_part.cpp"
 
-#include "extension/core_functions/scalar/date/to_interval.cpp"
+#include "extension/core_functions/scalar/date/date_sub.cpp"
+
+#include "extension/core_functions/scalar/date/date_trunc.cpp"
 
 #include "extension/core_functions/scalar/date/epoch.cpp"
 
-#include "extension/core_functions/scalar/date/date_trunc.cpp"
+#include "extension/core_functions/scalar/date/make_date.cpp"
 
-#include "extension/core_functions/scalar/date/date_diff.cpp"
+#include "extension/core_functions/scalar/date/time_bucket.cpp"
+
+#include "extension/core_functions/scalar/date/to_interval.cpp"
 
diff --git a/src/duckdb/ub_extension_core_functions_scalar_debug.cpp b/src/duckdb/ub_extension_core_functions_scalar_debug.cpp
index 4ba1ce617..cae836ec8 100644
--- a/src/duckdb/ub_extension_core_functions_scalar_debug.cpp
+++ b/src/duckdb/ub_extension_core_functions_scalar_debug.cpp
@@ -1,6 +1,6 @@
+#include "extension/core_functions/scalar/debug/index_key.cpp"
+
 #include "extension/core_functions/scalar/debug/sleep.cpp"
 
 #include "extension/core_functions/scalar/debug/vector_type.cpp"
 
-#include "extension/core_functions/scalar/debug/index_key.cpp"
-
diff --git a/src/duckdb/ub_extension_core_functions_scalar_generic.cpp b/src/duckdb/ub_extension_core_functions_scalar_generic.cpp
index 0242be3c2..eca94e2e4 100644
--- a/src/duckdb/ub_extension_core_functions_scalar_generic.cpp
+++ b/src/duckdb/ub_extension_core_functions_scalar_generic.cpp
@@ -1,22 +1,22 @@
+#include "extension/core_functions/scalar/generic/alias.cpp"
+
 #include "extension/core_functions/scalar/generic/binning.cpp"
 
-#include "extension/core_functions/scalar/generic/system_functions.cpp"
+#include "extension/core_functions/scalar/generic/can_implicitly_cast.cpp"
 
-#include "extension/core_functions/scalar/generic/stats.cpp"
+#include "extension/core_functions/scalar/generic/cast_to_type.cpp"
 
 #include "extension/core_functions/scalar/generic/current_setting.cpp"
 
-#include "extension/core_functions/scalar/generic/least.cpp"
+#include "extension/core_functions/scalar/generic/hash.cpp"
 
-#include "extension/core_functions/scalar/generic/type_functions.cpp"
+#include "extension/core_functions/scalar/generic/least.cpp"
 
 #include "extension/core_functions/scalar/generic/replace_type.cpp"
 
-#include "extension/core_functions/scalar/generic/can_implicitly_cast.cpp"
-
-#include "extension/core_functions/scalar/generic/cast_to_type.cpp"
+#include "extension/core_functions/scalar/generic/stats.cpp"
 
-#include "extension/core_functions/scalar/generic/alias.cpp"
+#include "extension/core_functions/scalar/generic/system_functions.cpp"
 
-#include "extension/core_functions/scalar/generic/hash.cpp"
+#include "extension/core_functions/scalar/generic/type_functions.cpp"
 
diff --git a/src/duckdb/ub_extension_core_functions_scalar_list.cpp b/src/duckdb/ub_extension_core_functions_scalar_list.cpp
index a0909eac1..796dce437 100644
--- a/src/duckdb/ub_extension_core_functions_scalar_list.cpp
+++ b/src/duckdb/ub_extension_core_functions_scalar_list.cpp
@@ -1,22 +1,22 @@
-#include "extension/core_functions/scalar/list/list_reduce.cpp"
+#include "extension/core_functions/scalar/list/array_slice.cpp"
 
 #include "extension/core_functions/scalar/list/flatten.cpp"
 
-#include "extension/core_functions/scalar/list/list_filter.cpp"
+#include "extension/core_functions/scalar/list/list_aggregates.cpp"
 
-#include "extension/core_functions/scalar/list/list_value.cpp"
+#include "extension/core_functions/scalar/list/list_distance.cpp"
 
-#include "extension/core_functions/scalar/list/list_sort.cpp"
+#include "extension/core_functions/scalar/list/list_filter.cpp"
 
-#include "extension/core_functions/scalar/list/range.cpp"
+#include "extension/core_functions/scalar/list/list_has_any_or_all.cpp"
 
-#include "extension/core_functions/scalar/list/list_transform.cpp"
+#include "extension/core_functions/scalar/list/list_reduce.cpp"
 
-#include "extension/core_functions/scalar/list/list_distance.cpp"
+#include "extension/core_functions/scalar/list/list_sort.cpp"
 
-#include "extension/core_functions/scalar/list/list_has_any_or_all.cpp"
+#include "extension/core_functions/scalar/list/list_transform.cpp"
 
-#include "extension/core_functions/scalar/list/list_aggregates.cpp"
+#include "extension/core_functions/scalar/list/list_value.cpp"
 
-#include "extension/core_functions/scalar/list/array_slice.cpp"
+#include "extension/core_functions/scalar/list/range.cpp"
 
diff --git a/src/duckdb/ub_extension_core_functions_scalar_map.cpp b/src/duckdb/ub_extension_core_functions_scalar_map.cpp
index 78538a430..b6b14fb60 100644
--- a/src/duckdb/ub_extension_core_functions_scalar_map.cpp
+++ b/src/duckdb/ub_extension_core_functions_scalar_map.cpp
@@ -1,16 +1,16 @@
-#include "extension/core_functions/scalar/map/switch.cpp"
-
-#include "extension/core_functions/scalar/map/map_entries.cpp"
+#include "extension/core_functions/scalar/map/cardinality.cpp"
 
 #include "extension/core_functions/scalar/map/map.cpp"
 
-#include "extension/core_functions/scalar/map/map_keys_values.cpp"
-
-#include "extension/core_functions/scalar/map/cardinality.cpp"
-
 #include "extension/core_functions/scalar/map/map_concat.cpp"
 
+#include "extension/core_functions/scalar/map/map_entries.cpp"
+
 #include "extension/core_functions/scalar/map/map_extract.cpp"
 
 #include "extension/core_functions/scalar/map/map_from_entries.cpp"
 
+#include "extension/core_functions/scalar/map/map_keys_values.cpp"
+
+#include "extension/core_functions/scalar/map/switch.cpp"
+
diff --git a/src/duckdb/ub_extension_core_functions_scalar_random.cpp b/src/duckdb/ub_extension_core_functions_scalar_random.cpp
index 3e74feb30..f71b7b4cd 100644
--- a/src/duckdb/ub_extension_core_functions_scalar_random.cpp
+++ b/src/duckdb/ub_extension_core_functions_scalar_random.cpp
@@ -1,4 +1,4 @@
-#include "extension/core_functions/scalar/random/setseed.cpp"
-
 #include "extension/core_functions/scalar/random/random.cpp"
 
+#include "extension/core_functions/scalar/random/setseed.cpp"
+
diff --git a/src/duckdb/ub_extension_core_functions_scalar_string.cpp b/src/duckdb/ub_extension_core_functions_scalar_string.cpp
index 9da959101..5618f6993 100644
--- a/src/duckdb/ub_extension_core_functions_scalar_string.cpp
+++ b/src/duckdb/ub_extension_core_functions_scalar_string.cpp
@@ -1,50 +1,50 @@
-#include "extension/core_functions/scalar/string/translate.cpp"
-
-#include "extension/core_functions/scalar/string/jaro_winkler.cpp"
-
-#include "extension/core_functions/scalar/string/parse_formatted_bytes.cpp"
-
-#include "extension/core_functions/scalar/string/hamming.cpp"
+#include "extension/core_functions/scalar/string/ascii.cpp"
 
-#include "extension/core_functions/scalar/string/unicode.cpp"
+#include "extension/core_functions/scalar/string/bar.cpp"
 
 #include "extension/core_functions/scalar/string/chr.cpp"
 
+#include "extension/core_functions/scalar/string/damerau_levenshtein.cpp"
+
 #include "extension/core_functions/scalar/string/format_bytes.cpp"
 
-#include "extension/core_functions/scalar/string/reverse.cpp"
+#include "extension/core_functions/scalar/string/hamming.cpp"
 
 #include "extension/core_functions/scalar/string/hex.cpp"
 
 #include "extension/core_functions/scalar/string/instr.cpp"
 
-#include "extension/core_functions/scalar/string/parse_path.cpp"
+#include "extension/core_functions/scalar/string/jaccard.cpp"
 
-#include "extension/core_functions/scalar/string/starts_with.cpp"
+#include "extension/core_functions/scalar/string/jaro_winkler.cpp"
 
-#include "extension/core_functions/scalar/string/to_base.cpp"
+#include "extension/core_functions/scalar/string/left_right.cpp"
 
-#include "extension/core_functions/scalar/string/ascii.cpp"
+#include "extension/core_functions/scalar/string/levenshtein.cpp"
 
-#include "extension/core_functions/scalar/string/repeat.cpp"
+#include "extension/core_functions/scalar/string/pad.cpp"
 
-#include "extension/core_functions/scalar/string/url_encode.cpp"
+#include "extension/core_functions/scalar/string/parse_formatted_bytes.cpp"
 
-#include "extension/core_functions/scalar/string/jaccard.cpp"
+#include "extension/core_functions/scalar/string/parse_path.cpp"
 
-#include "extension/core_functions/scalar/string/levenshtein.cpp"
+#include "extension/core_functions/scalar/string/printf.cpp"
 
-#include "extension/core_functions/scalar/string/damerau_levenshtein.cpp"
+#include "extension/core_functions/scalar/string/repeat.cpp"
 
 #include "extension/core_functions/scalar/string/replace.cpp"
 
-#include "extension/core_functions/scalar/string/printf.cpp"
+#include "extension/core_functions/scalar/string/reverse.cpp"
 
-#include "extension/core_functions/scalar/string/left_right.cpp"
+#include "extension/core_functions/scalar/string/starts_with.cpp"
 
-#include "extension/core_functions/scalar/string/pad.cpp"
+#include "extension/core_functions/scalar/string/to_base.cpp"
+
+#include "extension/core_functions/scalar/string/translate.cpp"
 
 #include "extension/core_functions/scalar/string/trim.cpp"
 
-#include "extension/core_functions/scalar/string/bar.cpp"
+#include "extension/core_functions/scalar/string/unicode.cpp"
+
+#include "extension/core_functions/scalar/string/url_encode.cpp"
 
diff --git a/src/duckdb/ub_extension_core_functions_scalar_struct.cpp b/src/duckdb/ub_extension_core_functions_scalar_struct.cpp
index 7cc473ffb..f9b263647 100644
--- a/src/duckdb/ub_extension_core_functions_scalar_struct.cpp
+++ b/src/duckdb/ub_extension_core_functions_scalar_struct.cpp
@@ -1,8 +1,8 @@
 #include "extension/core_functions/scalar/struct/struct_insert.cpp"
 
-#include "extension/core_functions/scalar/struct/struct_values.cpp"
+#include "extension/core_functions/scalar/struct/struct_keys.cpp"
 
 #include "extension/core_functions/scalar/struct/struct_update.cpp"
 
-#include "extension/core_functions/scalar/struct/struct_keys.cpp"
+#include "extension/core_functions/scalar/struct/struct_values.cpp"
 
diff --git a/src/duckdb/ub_extension_core_functions_scalar_union.cpp b/src/duckdb/ub_extension_core_functions_scalar_union.cpp
index fad24f297..bf2eecf72 100644
--- a/src/duckdb/ub_extension_core_functions_scalar_union.cpp
+++ b/src/duckdb/ub_extension_core_functions_scalar_union.cpp
@@ -1,6 +1,6 @@
 #include "extension/core_functions/scalar/union/union_extract.cpp"
 
-#include "extension/core_functions/scalar/union/union_value.cpp"
-
 #include "extension/core_functions/scalar/union/union_tag.cpp"
 
+#include "extension/core_functions/scalar/union/union_value.cpp"
+
diff --git a/src/duckdb/ub_extension_icu_third_party_icu_common.cpp b/src/duckdb/ub_extension_icu_third_party_icu_common.cpp
index 4a230511f..381b5e9ea 100644
--- a/src/duckdb/ub_extension_icu_third_party_icu_common.cpp
+++ b/src/duckdb/ub_extension_icu_third_party_icu_common.cpp
@@ -1,222 +1,222 @@
-#include "extension/icu/third_party/icu/common/uniset_props.cpp"
+#include "extension/icu/third_party/icu/common/appendable.cpp"
 
-#include "extension/icu/third_party/icu/common/propname.cpp"
+#include "extension/icu/third_party/icu/common/bmpset.cpp"
 
-#include "extension/icu/third_party/icu/common/unorm.cpp"
+#include "extension/icu/third_party/icu/common/bytesinkutil.cpp"
 
-#include "extension/icu/third_party/icu/common/normalizer2.cpp"
+#include "extension/icu/third_party/icu/common/bytestream.cpp"
 
-#include "extension/icu/third_party/icu/common/dtintrv.cpp"
+#include "extension/icu/third_party/icu/common/bytestrie.cpp"
 
-#include "extension/icu/third_party/icu/common/loclikely.cpp"
+#include "extension/icu/third_party/icu/common/bytestrieiterator.cpp"
 
-#include "extension/icu/third_party/icu/common/cstr.cpp"
+#include "extension/icu/third_party/icu/common/caniter.cpp"
 
-#include "extension/icu/third_party/icu/common/stringpiece.cpp"
+#include "extension/icu/third_party/icu/common/characterproperties.cpp"
 
-#include "extension/icu/third_party/icu/common/ustring.cpp"
+#include "extension/icu/third_party/icu/common/chariter.cpp"
+
+#include "extension/icu/third_party/icu/common/charstr.cpp"
 
 #include "extension/icu/third_party/icu/common/cmemory.cpp"
 
-#include "extension/icu/third_party/icu/common/uvectr32.cpp"
+#include "extension/icu/third_party/icu/common/cstr.cpp"
 
-#include "extension/icu/third_party/icu/common/ucurr.cpp"
+#include "extension/icu/third_party/icu/common/cstring.cpp"
 
-#include "extension/icu/third_party/icu/common/bytestream.cpp"
+#include "extension/icu/third_party/icu/common/dtintrv.cpp"
 
-#include "extension/icu/third_party/icu/common/appendable.cpp"
+#include "extension/icu/third_party/icu/common/edits.cpp"
 
-#include "extension/icu/third_party/icu/common/locavailable.cpp"
+#include "extension/icu/third_party/icu/common/emojiprops.cpp"
 
-#include "extension/icu/third_party/icu/common/utypes.cpp"
+#include "extension/icu/third_party/icu/common/errorcode.cpp"
 
-#include "extension/icu/third_party/icu/common/utrie_swap.cpp"
+#include "extension/icu/third_party/icu/common/filterednormalizer2.cpp"
 
-#include "extension/icu/third_party/icu/common/schriter.cpp"
+#include "extension/icu/third_party/icu/common/fixedstring.cpp"
 
-#include "extension/icu/third_party/icu/common/utext.cpp"
+#include "extension/icu/third_party/icu/common/icudataver.cpp"
 
-#include "extension/icu/third_party/icu/common/unistr.cpp"
+#include "extension/icu/third_party/icu/common/localematcher.cpp"
 
-#include "extension/icu/third_party/icu/common/uloc_keytype.cpp"
+#include "extension/icu/third_party/icu/common/localeprioritylist.cpp"
 
-#include "extension/icu/third_party/icu/common/ustrtrns.cpp"
+#include "extension/icu/third_party/icu/common/locavailable.cpp"
 
-#include "extension/icu/third_party/icu/common/uniset.cpp"
+#include "extension/icu/third_party/icu/common/locbased.cpp"
 
-#include "extension/icu/third_party/icu/common/uobject.cpp"
+#include "extension/icu/third_party/icu/common/locdispnames.cpp"
 
-#include "extension/icu/third_party/icu/common/umutex.cpp"
+#include "extension/icu/third_party/icu/common/locdspnm.cpp"
 
-#include "extension/icu/third_party/icu/common/unistr_case_locale.cpp"
+#include "extension/icu/third_party/icu/common/locid.cpp"
 
-#include "extension/icu/third_party/icu/common/ulist.cpp"
+#include "extension/icu/third_party/icu/common/loclikely.cpp"
 
-#include "extension/icu/third_party/icu/common/uarrsort.cpp"
+#include "extension/icu/third_party/icu/common/locresdata.cpp"
 
-#include "extension/icu/third_party/icu/common/ustack.cpp"
+#include "extension/icu/third_party/icu/common/lsr.cpp"
 
-#include "extension/icu/third_party/icu/common/characterproperties.cpp"
+#include "extension/icu/third_party/icu/common/messagepattern.cpp"
 
-#include "extension/icu/third_party/icu/common/ubidiln.cpp"
+#include "extension/icu/third_party/icu/common/normalizer2.cpp"
 
-#include "extension/icu/third_party/icu/common/udataswp.cpp"
+#include "extension/icu/third_party/icu/common/normalizer2impl.cpp"
 
-#include "extension/icu/third_party/icu/common/locdispnames.cpp"
+#include "extension/icu/third_party/icu/common/normlzr.cpp"
 
-#include "extension/icu/third_party/icu/common/unisetspan.cpp"
+#include "extension/icu/third_party/icu/common/parsepos.cpp"
 
-#include "extension/icu/third_party/icu/common/uinvchar.cpp"
+#include "extension/icu/third_party/icu/common/patternprops.cpp"
 
-#include "extension/icu/third_party/icu/common/ucln_cmn.cpp"
+#include "extension/icu/third_party/icu/common/pluralmap.cpp"
 
-#include "extension/icu/third_party/icu/common/uinit.cpp"
+#include "extension/icu/third_party/icu/common/propname.cpp"
 
-#include "extension/icu/third_party/icu/common/localeprioritylist.cpp"
+#include "extension/icu/third_party/icu/common/propsvec.cpp"
 
-#include "extension/icu/third_party/icu/common/unifilt.cpp"
+#include "extension/icu/third_party/icu/common/resbund.cpp"
 
-#include "extension/icu/third_party/icu/common/ubidiwrt.cpp"
+#include "extension/icu/third_party/icu/common/resbund_cnv.cpp"
 
-#include "extension/icu/third_party/icu/common/fixedstring.cpp"
+#include "extension/icu/third_party/icu/common/resource.cpp"
 
-#include "extension/icu/third_party/icu/common/umath.cpp"
+#include "extension/icu/third_party/icu/common/ruleiter.cpp"
 
-#include "extension/icu/third_party/icu/common/uenum.cpp"
+#include "extension/icu/third_party/icu/common/schriter.cpp"
 
-#include "extension/icu/third_party/icu/common/uset_props.cpp"
+#include "extension/icu/third_party/icu/common/sharedobject.cpp"
 
-#include "extension/icu/third_party/icu/common/unifunct.cpp"
+#include "extension/icu/third_party/icu/common/simpleformatter.cpp"
 
-#include "extension/icu/third_party/icu/common/errorcode.cpp"
+#include "extension/icu/third_party/icu/common/stringpiece.cpp"
 
-#include "extension/icu/third_party/icu/common/uloc_tag.cpp"
+#include "extension/icu/third_party/icu/common/stringtriebuilder.cpp"
 
-#include "extension/icu/third_party/icu/common/ustrenum.cpp"
+#include "extension/icu/third_party/icu/common/uarrsort.cpp"
 
-#include "extension/icu/third_party/icu/common/parsepos.cpp"
+#include "extension/icu/third_party/icu/common/ubidi.cpp"
 
-#include "extension/icu/third_party/icu/common/uset.cpp"
+#include "extension/icu/third_party/icu/common/ubidiln.cpp"
 
-#include "extension/icu/third_party/icu/common/cstring.cpp"
+#include "extension/icu/third_party/icu/common/ubidiwrt.cpp"
 
 #include "extension/icu/third_party/icu/common/ucasemap.cpp"
 
-#include "extension/icu/third_party/icu/common/uiter.cpp"
-
-#include "extension/icu/third_party/icu/common/lsr.cpp"
+#include "extension/icu/third_party/icu/common/ucat.cpp"
 
-#include "extension/icu/third_party/icu/common/edits.cpp"
+#include "extension/icu/third_party/icu/common/uchar.cpp"
 
-#include "extension/icu/third_party/icu/common/emojiprops.cpp"
+#include "extension/icu/third_party/icu/common/ucharstrie.cpp"
 
-#include "extension/icu/third_party/icu/common/stringtriebuilder.cpp"
+#include "extension/icu/third_party/icu/common/ucharstrieiterator.cpp"
 
-#include "extension/icu/third_party/icu/common/uvectr64.cpp"
+#include "extension/icu/third_party/icu/common/uchriter.cpp"
 
-#include "extension/icu/third_party/icu/common/resbund.cpp"
+#include "extension/icu/third_party/icu/common/ucln_cmn.cpp"
 
-#include "extension/icu/third_party/icu/common/ucharstrie.cpp"
+#include "extension/icu/third_party/icu/common/ucmndata.cpp"
 
-#include "extension/icu/third_party/icu/common/filterednormalizer2.cpp"
+#include "extension/icu/third_party/icu/common/ucol_swp.cpp"
 
-#include "extension/icu/third_party/icu/common/uchar.cpp"
+#include "extension/icu/third_party/icu/common/ucurr.cpp"
 
-#include "extension/icu/third_party/icu/common/chariter.cpp"
+#include "extension/icu/third_party/icu/common/udata.cpp"
 
-#include "extension/icu/third_party/icu/common/locid.cpp"
+#include "extension/icu/third_party/icu/common/udatamem.cpp"
 
-#include "extension/icu/third_party/icu/common/ustrcase_locale.cpp"
+#include "extension/icu/third_party/icu/common/udataswp.cpp"
 
-#include "extension/icu/third_party/icu/common/unistr_case.cpp"
+#include "extension/icu/third_party/icu/common/uenum.cpp"
 
-#include "extension/icu/third_party/icu/common/sharedobject.cpp"
+#include "extension/icu/third_party/icu/common/uhash_us.cpp"
 
-#include "extension/icu/third_party/icu/common/simpleformatter.cpp"
+#include "extension/icu/third_party/icu/common/uinit.cpp"
 
-#include "extension/icu/third_party/icu/common/util.cpp"
+#include "extension/icu/third_party/icu/common/uinvchar.cpp"
 
-#include "extension/icu/third_party/icu/common/normalizer2impl.cpp"
+#include "extension/icu/third_party/icu/common/uiter.cpp"
 
-#include "extension/icu/third_party/icu/common/uprops.cpp"
+#include "extension/icu/third_party/icu/common/ulist.cpp"
 
-#include "extension/icu/third_party/icu/common/patternprops.cpp"
+#include "extension/icu/third_party/icu/common/uloc_keytype.cpp"
 
-#include "extension/icu/third_party/icu/common/locdspnm.cpp"
+#include "extension/icu/third_party/icu/common/uloc_tag.cpp"
 
-#include "extension/icu/third_party/icu/common/ucharstrieiterator.cpp"
+#include "extension/icu/third_party/icu/common/umath.cpp"
 
-#include "extension/icu/third_party/icu/common/messagepattern.cpp"
+#include "extension/icu/third_party/icu/common/umutex.cpp"
 
-#include "extension/icu/third_party/icu/common/bytestrie.cpp"
+#include "extension/icu/third_party/icu/common/unifilt.cpp"
 
-#include "extension/icu/third_party/icu/common/uscript.cpp"
+#include "extension/icu/third_party/icu/common/unifunct.cpp"
 
-#include "extension/icu/third_party/icu/common/utf_impl.cpp"
+#include "extension/icu/third_party/icu/common/uniset.cpp"
 
 #include "extension/icu/third_party/icu/common/uniset_closure.cpp"
 
-#include "extension/icu/third_party/icu/common/bmpset.cpp"
+#include "extension/icu/third_party/icu/common/uniset_props.cpp"
 
-#include "extension/icu/third_party/icu/common/pluralmap.cpp"
+#include "extension/icu/third_party/icu/common/unisetspan.cpp"
 
-#include "extension/icu/third_party/icu/common/ucat.cpp"
+#include "extension/icu/third_party/icu/common/unistr.cpp"
 
-#include "extension/icu/third_party/icu/common/udata.cpp"
+#include "extension/icu/third_party/icu/common/unistr_case.cpp"
 
-#include "extension/icu/third_party/icu/common/normlzr.cpp"
+#include "extension/icu/third_party/icu/common/unistr_case_locale.cpp"
 
-#include "extension/icu/third_party/icu/common/ustr_wcs.cpp"
+#include "extension/icu/third_party/icu/common/unistr_props.cpp"
 
-#include "extension/icu/third_party/icu/common/locbased.cpp"
+#include "extension/icu/third_party/icu/common/unorm.cpp"
 
-#include "extension/icu/third_party/icu/common/usetiter.cpp"
+#include "extension/icu/third_party/icu/common/uobject.cpp"
 
-#include "extension/icu/third_party/icu/common/localematcher.cpp"
+#include "extension/icu/third_party/icu/common/uprops.cpp"
 
-#include "extension/icu/third_party/icu/common/charstr.cpp"
+#include "extension/icu/third_party/icu/common/ures_cnv.cpp"
 
-#include "extension/icu/third_party/icu/common/bytesinkutil.cpp"
+#include "extension/icu/third_party/icu/common/usc_impl.cpp"
 
-#include "extension/icu/third_party/icu/common/resbund_cnv.cpp"
+#include "extension/icu/third_party/icu/common/uscript.cpp"
 
-#include "extension/icu/third_party/icu/common/bytestrieiterator.cpp"
+#include "extension/icu/third_party/icu/common/uset.cpp"
 
-#include "extension/icu/third_party/icu/common/icudataver.cpp"
+#include "extension/icu/third_party/icu/common/uset_props.cpp"
 
-#include "extension/icu/third_party/icu/common/resource.cpp"
+#include "extension/icu/third_party/icu/common/usetiter.cpp"
 
-#include "extension/icu/third_party/icu/common/ucol_swp.cpp"
+#include "extension/icu/third_party/icu/common/ushape.cpp"
 
-#include "extension/icu/third_party/icu/common/ruleiter.cpp"
+#include "extension/icu/third_party/icu/common/ustack.cpp"
 
-#include "extension/icu/third_party/icu/common/udatamem.cpp"
+#include "extension/icu/third_party/icu/common/ustr_wcs.cpp"
 
-#include "extension/icu/third_party/icu/common/ures_cnv.cpp"
+#include "extension/icu/third_party/icu/common/ustrcase_locale.cpp"
 
-#include "extension/icu/third_party/icu/common/ushape.cpp"
+#include "extension/icu/third_party/icu/common/ustrenum.cpp"
 
-#include "extension/icu/third_party/icu/common/propsvec.cpp"
+#include "extension/icu/third_party/icu/common/ustrfmt.cpp"
 
-#include "extension/icu/third_party/icu/common/usc_impl.cpp"
+#include "extension/icu/third_party/icu/common/ustring.cpp"
 
-#include "extension/icu/third_party/icu/common/util_props.cpp"
+#include "extension/icu/third_party/icu/common/ustrtrns.cpp"
 
-#include "extension/icu/third_party/icu/common/uhash_us.cpp"
+#include "extension/icu/third_party/icu/common/utext.cpp"
 
-#include "extension/icu/third_party/icu/common/unistr_props.cpp"
+#include "extension/icu/third_party/icu/common/utf_impl.cpp"
 
-#include "extension/icu/third_party/icu/common/ucmndata.cpp"
+#include "extension/icu/third_party/icu/common/util.cpp"
 
-#include "extension/icu/third_party/icu/common/ustrfmt.cpp"
+#include "extension/icu/third_party/icu/common/util_props.cpp"
 
-#include "extension/icu/third_party/icu/common/uchriter.cpp"
+#include "extension/icu/third_party/icu/common/utrace.cpp"
 
-#include "extension/icu/third_party/icu/common/caniter.cpp"
+#include "extension/icu/third_party/icu/common/utrie_swap.cpp"
 
-#include "extension/icu/third_party/icu/common/locresdata.cpp"
+#include "extension/icu/third_party/icu/common/utypes.cpp"
 
-#include "extension/icu/third_party/icu/common/utrace.cpp"
+#include "extension/icu/third_party/icu/common/uvectr32.cpp"
 
-#include "extension/icu/third_party/icu/common/ubidi.cpp"
+#include "extension/icu/third_party/icu/common/uvectr64.cpp"
 
diff --git a/src/duckdb/ub_extension_icu_third_party_icu_i18n.cpp b/src/duckdb/ub_extension_icu_third_party_icu_i18n.cpp
index 8171e1d4a..89baa4a55 100644
--- a/src/duckdb/ub_extension_icu_third_party_icu_i18n.cpp
+++ b/src/duckdb/ub_extension_icu_third_party_icu_i18n.cpp
@@ -1,182 +1,182 @@
-#include "extension/icu/third_party/icu/i18n/tztrans.cpp"
+#include "extension/icu/third_party/icu/i18n/alphaindex.cpp"
 
-#include "extension/icu/third_party/icu/i18n/collationruleparser.cpp"
+#include "extension/icu/third_party/icu/i18n/astro.cpp"
 
 #include "extension/icu/third_party/icu/i18n/basictz.cpp"
 
-#include "extension/icu/third_party/icu/i18n/utmscale.cpp"
-
-#include "extension/icu/third_party/icu/i18n/tzrule.cpp"
-
-#include "extension/icu/third_party/icu/i18n/listformatter.cpp"
+#include "extension/icu/third_party/icu/i18n/bocsu.cpp"
 
 #include "extension/icu/third_party/icu/i18n/coleitr.cpp"
 
-#include "extension/icu/third_party/icu/i18n/collationdata.cpp"
+#include "extension/icu/third_party/icu/i18n/coll.cpp"
 
-#include "extension/icu/third_party/icu/i18n/ucoleitr.cpp"
+#include "extension/icu/third_party/icu/i18n/collation.cpp"
 
-#include "extension/icu/third_party/icu/i18n/sortkey.cpp"
+#include "extension/icu/third_party/icu/i18n/collationbuilder.cpp"
 
-#include "extension/icu/third_party/icu/i18n/dangical.cpp"
+#include "extension/icu/third_party/icu/i18n/collationcompare.cpp"
 
-#include "extension/icu/third_party/icu/i18n/uregion.cpp"
+#include "extension/icu/third_party/icu/i18n/collationdata.cpp"
 
-#include "extension/icu/third_party/icu/i18n/udateintervalformat.cpp"
+#include "extension/icu/third_party/icu/i18n/collationdatabuilder.cpp"
 
-#include "extension/icu/third_party/icu/i18n/ucln_in.cpp"
+#include "extension/icu/third_party/icu/i18n/collationdatareader.cpp"
 
-#include "extension/icu/third_party/icu/i18n/formattedval_iterimpl.cpp"
+#include "extension/icu/third_party/icu/i18n/collationdatawriter.cpp"
 
-#include "extension/icu/third_party/icu/i18n/collationsettings.cpp"
+#include "extension/icu/third_party/icu/i18n/collationfastlatin.cpp"
 
-#include "extension/icu/third_party/icu/i18n/rbtz.cpp"
+#include "extension/icu/third_party/icu/i18n/collationfastlatinbuilder.cpp"
 
-#include "extension/icu/third_party/icu/i18n/collationtailoring.cpp"
+#include "extension/icu/third_party/icu/i18n/collationfcd.cpp"
 
-#include "extension/icu/third_party/icu/i18n/tznames_impl.cpp"
+#include "extension/icu/third_party/icu/i18n/collationiterator.cpp"
 
-#include "extension/icu/third_party/icu/i18n/currunit.cpp"
+#include "extension/icu/third_party/icu/i18n/collationkeys.cpp"
 
-#include "extension/icu/third_party/icu/i18n/region.cpp"
+#include "extension/icu/third_party/icu/i18n/collationrootelements.cpp"
 
-#include "extension/icu/third_party/icu/i18n/ulocdata.cpp"
+#include "extension/icu/third_party/icu/i18n/collationruleparser.cpp"
 
-#include "extension/icu/third_party/icu/i18n/format.cpp"
+#include "extension/icu/third_party/icu/i18n/collationsets.cpp"
 
-#include "extension/icu/third_party/icu/i18n/collationdatawriter.cpp"
+#include "extension/icu/third_party/icu/i18n/collationsettings.cpp"
 
-#include "extension/icu/third_party/icu/i18n/collationkeys.cpp"
+#include "extension/icu/third_party/icu/i18n/collationtailoring.cpp"
 
-#include "extension/icu/third_party/icu/i18n/formattedvalue.cpp"
+#include "extension/icu/third_party/icu/i18n/collationweights.cpp"
 
-#include "extension/icu/third_party/icu/i18n/decContext.cpp"
+#include "extension/icu/third_party/icu/i18n/curramt.cpp"
 
-#include "extension/icu/third_party/icu/i18n/reldtfmt.cpp"
+#include "extension/icu/third_party/icu/i18n/currfmt.cpp"
 
-#include "extension/icu/third_party/icu/i18n/standardplural.cpp"
+#include "extension/icu/third_party/icu/i18n/currunit.cpp"
 
-#include "extension/icu/third_party/icu/i18n/alphaindex.cpp"
+#include "extension/icu/third_party/icu/i18n/dangical.cpp"
 
 #include "extension/icu/third_party/icu/i18n/datefmt.cpp"
 
-#include "extension/icu/third_party/icu/i18n/uitercollationiterator.cpp"
+#include "extension/icu/third_party/icu/i18n/dcfmtsym.cpp"
 
-#include "extension/icu/third_party/icu/i18n/collationdatareader.cpp"
+#include "extension/icu/third_party/icu/i18n/decContext.cpp"
 
-#include "extension/icu/third_party/icu/i18n/number_notation.cpp"
+#include "extension/icu/third_party/icu/i18n/displayoptions.cpp"
+
+#include "extension/icu/third_party/icu/i18n/dtitvinf.cpp"
 
 #include "extension/icu/third_party/icu/i18n/dtrule.cpp"
 
-#include "extension/icu/third_party/icu/i18n/unum.cpp"
+#include "extension/icu/third_party/icu/i18n/erarules.cpp"
 
-#include "extension/icu/third_party/icu/i18n/ulistformatter.cpp"
+#include "extension/icu/third_party/icu/i18n/format.cpp"
 
-#include "extension/icu/third_party/icu/i18n/tmutamt.cpp"
+#include "extension/icu/third_party/icu/i18n/formatted_string_builder.cpp"
 
-#include "extension/icu/third_party/icu/i18n/bocsu.cpp"
+#include "extension/icu/third_party/icu/i18n/formattedval_iterimpl.cpp"
 
-#include "extension/icu/third_party/icu/i18n/utf16collationiterator.cpp"
+#include "extension/icu/third_party/icu/i18n/formattedvalue.cpp"
 
-#include "extension/icu/third_party/icu/i18n/tmunit.cpp"
+#include "extension/icu/third_party/icu/i18n/fphdlimp.cpp"
 
 #include "extension/icu/third_party/icu/i18n/fpositer.cpp"
 
-#include "extension/icu/third_party/icu/i18n/collationfastlatinbuilder.cpp"
-
-#include "extension/icu/third_party/icu/i18n/number_modifiers.cpp"
+#include "extension/icu/third_party/icu/i18n/gender.cpp"
 
-#include "extension/icu/third_party/icu/i18n/collationcompare.cpp"
+#include "extension/icu/third_party/icu/i18n/listformatter.cpp"
 
 #include "extension/icu/third_party/icu/i18n/measunit.cpp"
 
-#include "extension/icu/third_party/icu/i18n/astro.cpp"
+#include "extension/icu/third_party/icu/i18n/measure.cpp"
 
-#include "extension/icu/third_party/icu/i18n/udat.cpp"
+#include "extension/icu/third_party/icu/i18n/number_affixutils.cpp"
 
-#include "extension/icu/third_party/icu/i18n/utf8collationiterator.cpp"
+#include "extension/icu/third_party/icu/i18n/number_decimfmtprops.cpp"
 
-#include "extension/icu/third_party/icu/i18n/selfmt.cpp"
+#include "extension/icu/third_party/icu/i18n/number_modifiers.cpp"
 
-#include "extension/icu/third_party/icu/i18n/collationiterator.cpp"
+#include "extension/icu/third_party/icu/i18n/number_notation.cpp"
 
-#include "extension/icu/third_party/icu/i18n/tzfmt.cpp"
+#include "extension/icu/third_party/icu/i18n/number_padding.cpp"
 
-#include "extension/icu/third_party/icu/i18n/units_converter.cpp"
+#include "extension/icu/third_party/icu/i18n/olsontz.cpp"
+
+#include "extension/icu/third_party/icu/i18n/rbtz.cpp"
+
+#include "extension/icu/third_party/icu/i18n/region.cpp"
+
+#include "extension/icu/third_party/icu/i18n/reldtfmt.cpp"
 
 #include "extension/icu/third_party/icu/i18n/rulebasedcollator.cpp"
 
-#include "extension/icu/third_party/icu/i18n/dcfmtsym.cpp"
+#include "extension/icu/third_party/icu/i18n/scientificnumberformatter.cpp"
 
-#include "extension/icu/third_party/icu/i18n/dtitvinf.cpp"
+#include "extension/icu/third_party/icu/i18n/selfmt.cpp"
 
-#include "extension/icu/third_party/icu/i18n/collationfcd.cpp"
+#include "extension/icu/third_party/icu/i18n/simpletz.cpp"
 
-#include "extension/icu/third_party/icu/i18n/udatpg.cpp"
+#include "extension/icu/third_party/icu/i18n/smpdtfst.cpp"
 
-#include "extension/icu/third_party/icu/i18n/scientificnumberformatter.cpp"
+#include "extension/icu/third_party/icu/i18n/sortkey.cpp"
 
-#include "extension/icu/third_party/icu/i18n/coll.cpp"
+#include "extension/icu/third_party/icu/i18n/standardplural.cpp"
 
-#include "extension/icu/third_party/icu/i18n/unumsys.cpp"
+#include "extension/icu/third_party/icu/i18n/tmunit.cpp"
 
-#include "extension/icu/third_party/icu/i18n/displayoptions.cpp"
+#include "extension/icu/third_party/icu/i18n/tmutamt.cpp"
 
-#include "extension/icu/third_party/icu/i18n/smpdtfst.cpp"
+#include "extension/icu/third_party/icu/i18n/tzfmt.cpp"
 
-#include "extension/icu/third_party/icu/i18n/zrule.cpp"
+#include "extension/icu/third_party/icu/i18n/tznames.cpp"
 
-#include "extension/icu/third_party/icu/i18n/collationbuilder.cpp"
+#include "extension/icu/third_party/icu/i18n/tznames_impl.cpp"
 
-#include "extension/icu/third_party/icu/i18n/vzone.cpp"
+#include "extension/icu/third_party/icu/i18n/tzrule.cpp"
 
-#include "extension/icu/third_party/icu/i18n/ufieldpositer.cpp"
+#include "extension/icu/third_party/icu/i18n/tztrans.cpp"
 
-#include "extension/icu/third_party/icu/i18n/ucol_sit.cpp"
+#include "extension/icu/third_party/icu/i18n/ucal.cpp"
 
-#include "extension/icu/third_party/icu/i18n/collationdatabuilder.cpp"
+#include "extension/icu/third_party/icu/i18n/ucln_in.cpp"
 
-#include "extension/icu/third_party/icu/i18n/collationfastlatin.cpp"
+#include "extension/icu/third_party/icu/i18n/ucol_sit.cpp"
 
-#include "extension/icu/third_party/icu/i18n/number_padding.cpp"
+#include "extension/icu/third_party/icu/i18n/ucoleitr.cpp"
 
-#include "extension/icu/third_party/icu/i18n/erarules.cpp"
+#include "extension/icu/third_party/icu/i18n/udat.cpp"
 
-#include "extension/icu/third_party/icu/i18n/collationweights.cpp"
+#include "extension/icu/third_party/icu/i18n/udateintervalformat.cpp"
 
-#include "extension/icu/third_party/icu/i18n/collationrootelements.cpp"
+#include "extension/icu/third_party/icu/i18n/udatpg.cpp"
 
-#include "extension/icu/third_party/icu/i18n/measure.cpp"
+#include "extension/icu/third_party/icu/i18n/ufieldpositer.cpp"
 
-#include "extension/icu/third_party/icu/i18n/collationsets.cpp"
+#include "extension/icu/third_party/icu/i18n/uitercollationiterator.cpp"
 
-#include "extension/icu/third_party/icu/i18n/ucal.cpp"
+#include "extension/icu/third_party/icu/i18n/ulistformatter.cpp"
 
-#include "extension/icu/third_party/icu/i18n/number_decimfmtprops.cpp"
+#include "extension/icu/third_party/icu/i18n/ulocdata.cpp"
 
 #include "extension/icu/third_party/icu/i18n/umsg.cpp"
 
-#include "extension/icu/third_party/icu/i18n/tznames.cpp"
-
-#include "extension/icu/third_party/icu/i18n/curramt.cpp"
+#include "extension/icu/third_party/icu/i18n/units_converter.cpp"
 
-#include "extension/icu/third_party/icu/i18n/simpletz.cpp"
+#include "extension/icu/third_party/icu/i18n/unum.cpp"
 
-#include "extension/icu/third_party/icu/i18n/number_affixutils.cpp"
+#include "extension/icu/third_party/icu/i18n/unumsys.cpp"
 
-#include "extension/icu/third_party/icu/i18n/zonemeta.cpp"
+#include "extension/icu/third_party/icu/i18n/uregion.cpp"
 
-#include "extension/icu/third_party/icu/i18n/olsontz.cpp"
+#include "extension/icu/third_party/icu/i18n/utf16collationiterator.cpp"
 
-#include "extension/icu/third_party/icu/i18n/ztrans.cpp"
+#include "extension/icu/third_party/icu/i18n/utf8collationiterator.cpp"
 
-#include "extension/icu/third_party/icu/i18n/fphdlimp.cpp"
+#include "extension/icu/third_party/icu/i18n/utmscale.cpp"
 
-#include "extension/icu/third_party/icu/i18n/gender.cpp"
+#include "extension/icu/third_party/icu/i18n/vzone.cpp"
 
-#include "extension/icu/third_party/icu/i18n/currfmt.cpp"
+#include "extension/icu/third_party/icu/i18n/zonemeta.cpp"
 
-#include "extension/icu/third_party/icu/i18n/formatted_string_builder.cpp"
+#include "extension/icu/third_party/icu/i18n/zrule.cpp"
 
-#include "extension/icu/third_party/icu/i18n/collation.cpp"
+#include "extension/icu/third_party/icu/i18n/ztrans.cpp"
 
diff --git a/src/duckdb/ub_extension_json_json_functions.cpp b/src/duckdb/ub_extension_json_json_functions.cpp
index 1523a5983..727f4cf87 100644
--- a/src/duckdb/ub_extension_json_json_functions.cpp
+++ b/src/duckdb/ub_extension_json_json_functions.cpp
@@ -1,46 +1,46 @@
-#include "extension/json/json_functions/json_contains.cpp"
+#include "extension/json/json_functions/copy_json.cpp"
 
-#include "extension/json/json_functions/read_json.cpp"
+#include "extension/json/json_functions/json_array_length.cpp"
 
-#include "extension/json/json_functions/json_extract.cpp"
+#include "extension/json/json_functions/json_contains.cpp"
 
-#include "extension/json/json_functions/json_type.cpp"
+#include "extension/json/json_functions/json_create.cpp"
 
-#include "extension/json/json_functions/json_valid.cpp"
+#include "extension/json/json_functions/json_deep_merge.cpp"
 
-#include "extension/json/json_functions/json_transform.cpp"
+#include "extension/json/json_functions/json_exists.cpp"
+
+#include "extension/json/json_functions/json_extract.cpp"
 
 #include "extension/json/json_functions/json_keys.cpp"
 
-#include "extension/json/json_functions/copy_json.cpp"
+#include "extension/json/json_functions/json_merge_patch.cpp"
 
-#include "extension/json/json_functions/json_table_in_out.cpp"
+#include "extension/json/json_functions/json_merge_patch_diff.cpp"
 
-#include "extension/json/json_functions/json_serialize_plan.cpp"
+#include "extension/json/json_functions/json_normalize.cpp"
 
-#include "extension/json/json_functions/json_strip_nulls.cpp"
+#include "extension/json/json_functions/json_pretty.cpp"
 
-#include "extension/json/json_functions/json_merge_patch_diff.cpp"
+#include "extension/json/json_functions/json_serialize_plan.cpp"
 
-#include "extension/json/json_functions/json_exists.cpp"
+#include "extension/json/json_functions/json_serialize_sql.cpp"
 
-#include "extension/json/json_functions/json_structure.cpp"
+#include "extension/json/json_functions/json_strip_nulls.cpp"
 
-#include "extension/json/json_functions/json_pretty.cpp"
+#include "extension/json/json_functions/json_structure.cpp"
 
-#include "extension/json/json_functions/read_json_objects.cpp"
+#include "extension/json/json_functions/json_table_in_out.cpp"
 
-#include "extension/json/json_functions/json_create.cpp"
+#include "extension/json/json_functions/json_transform.cpp"
 
-#include "extension/json/json_functions/json_deep_merge.cpp"
+#include "extension/json/json_functions/json_type.cpp"
 
-#include "extension/json/json_functions/json_serialize_sql.cpp"
+#include "extension/json/json_functions/json_valid.cpp"
 
 #include "extension/json/json_functions/json_value.cpp"
 
-#include "extension/json/json_functions/json_array_length.cpp"
-
-#include "extension/json/json_functions/json_normalize.cpp"
+#include "extension/json/json_functions/read_json.cpp"
 
-#include "extension/json/json_functions/json_merge_patch.cpp"
+#include "extension/json/json_functions/read_json_objects.cpp"
 
diff --git a/src/duckdb/ub_extension_parquet_decoder.cpp b/src/duckdb/ub_extension_parquet_decoder.cpp
index 5d625aaf8..b369f8aae 100644
--- a/src/duckdb/ub_extension_parquet_decoder.cpp
+++ b/src/duckdb/ub_extension_parquet_decoder.cpp
@@ -1,12 +1,12 @@
-#include "extension/parquet/decoder/rle_decoder.cpp"
-
-#include "extension/parquet/decoder/dictionary_decoder.cpp"
-
-#include "extension/parquet/decoder/delta_length_byte_array_decoder.cpp"
-
 #include "extension/parquet/decoder/byte_stream_split_decoder.cpp"
 
 #include "extension/parquet/decoder/delta_binary_packed_decoder.cpp"
 
 #include "extension/parquet/decoder/delta_byte_array_decoder.cpp"
 
+#include "extension/parquet/decoder/delta_length_byte_array_decoder.cpp"
+
+#include "extension/parquet/decoder/dictionary_decoder.cpp"
+
+#include "extension/parquet/decoder/rle_decoder.cpp"
+
diff --git a/src/duckdb/ub_extension_parquet_reader.cpp b/src/duckdb/ub_extension_parquet_reader.cpp
index 28b599256..c89e72e76 100644
--- a/src/duckdb/ub_extension_parquet_reader.cpp
+++ b/src/duckdb/ub_extension_parquet_reader.cpp
@@ -1,14 +1,14 @@
-#include "extension/parquet/reader/struct_column_reader.cpp"
+#include "extension/parquet/reader/decimal_column_reader.cpp"
 
-#include "extension/parquet/reader/list_column_reader.cpp"
+#include "extension/parquet/reader/expression_column_reader.cpp"
 
-#include "extension/parquet/reader/decimal_column_reader.cpp"
+#include "extension/parquet/reader/list_column_reader.cpp"
 
-#include "extension/parquet/reader/variant_column_reader.cpp"
+#include "extension/parquet/reader/row_number_column_reader.cpp"
 
 #include "extension/parquet/reader/string_column_reader.cpp"
 
-#include "extension/parquet/reader/expression_column_reader.cpp"
+#include "extension/parquet/reader/struct_column_reader.cpp"
 
-#include "extension/parquet/reader/row_number_column_reader.cpp"
+#include "extension/parquet/reader/variant_column_reader.cpp"
 
diff --git a/src/duckdb/ub_extension_parquet_writer.cpp b/src/duckdb/ub_extension_parquet_writer.cpp
index e1d3beb0f..da35348b7 100644
--- a/src/duckdb/ub_extension_parquet_writer.cpp
+++ b/src/duckdb/ub_extension_parquet_writer.cpp
@@ -1,16 +1,16 @@
-#include "extension/parquet/writer/boolean_column_writer.cpp"
+#include "extension/parquet/writer/array_column_writer.cpp"
 
-#include "extension/parquet/writer/struct_column_writer.cpp"
+#include "extension/parquet/writer/boolean_column_writer.cpp"
 
-#include "extension/parquet/writer/array_column_writer.cpp"
+#include "extension/parquet/writer/decimal_column_writer.cpp"
 
 #include "extension/parquet/writer/enum_column_writer.cpp"
 
 #include "extension/parquet/writer/list_column_writer.cpp"
 
-#include "extension/parquet/writer/decimal_column_writer.cpp"
-
 #include "extension/parquet/writer/primitive_column_writer.cpp"
 
+#include "extension/parquet/writer/struct_column_writer.cpp"
+
 #include "extension/parquet/writer/variant_column_writer.cpp"
 
diff --git a/src/duckdb/ub_extension_parquet_writer_variant.cpp b/src/duckdb/ub_extension_parquet_writer_variant.cpp
index 6e4563d1e..61cb37a96 100644
--- a/src/duckdb/ub_extension_parquet_writer_variant.cpp
+++ b/src/duckdb/ub_extension_parquet_writer_variant.cpp
@@ -1,4 +1,4 @@
-#include "extension/parquet/writer/variant/convert_variant.cpp"
-
 #include "extension/parquet/writer/variant/analyze_variant.cpp"
 
+#include "extension/parquet/writer/variant/convert_variant.cpp"
+
diff --git a/src/jni/duckdb_java.cpp b/src/jni/duckdb_java.cpp
index 7a4a6d144..960f5bbea 100644
--- a/src/jni/duckdb_java.cpp
+++ b/src/jni/duckdb_java.cpp
@@ -971,25 +971,10 @@ void _duckdb_jdbc_create_extension_type(JNIEnv *env, jclass, jobject conn_buf) {
 }
 
 static ProfilerPrintFormat GetProfilerPrintFormat(JNIEnv *env, jobject format) {
-	if (env->IsSameObject(format, J_ProfilerPrintFormat_QUERY_TREE)) {
-		return ProfilerPrintFormat::QUERY_TREE;
-	}
-	if (env->IsSameObject(format, J_ProfilerPrintFormat_JSON)) {
-		return ProfilerPrintFormat::JSON;
-	}
-	if (env->IsSameObject(format, J_ProfilerPrintFormat_QUERY_TREE_OPTIMIZER)) {
-		return ProfilerPrintFormat::QUERY_TREE_OPTIMIZER;
-	}
-	if (env->IsSameObject(format, J_ProfilerPrintFormat_NO_OUTPUT)) {
-		return ProfilerPrintFormat::NO_OUTPUT;
-	}
-	if (env->IsSameObject(format, J_ProfilerPrintFormat_HTML)) {
-		return ProfilerPrintFormat::HTML;
-	}
-	if (env->IsSameObject(format, J_ProfilerPrintFormat_GRAPHVIZ)) {
-		return ProfilerPrintFormat::GRAPHVIZ;
-	}
-	throw InvalidInputException("Invalid profiling format");
+	jobject jname = env->CallObjectMethod(format, J_ProfilerPrintFormat_getName);
+	check_java_exception_and_rethrow(env);
+	const std::string name = jstring_to_string(env, static_cast<jstring>(jname));
+	return ProfilerPrintFormat::FromString(name);
 }
 
 jstring _duckdb_jdbc_get_profiling_information(JNIEnv *env, jclass, jobject conn_ref_buf, jobject j_format) {
diff --git a/src/jni/refs.cpp b/src/jni/refs.cpp
index 46c142854..cd00a1e93 100644
--- a/src/jni/refs.cpp
+++ b/src/jni/refs.cpp
@@ -111,12 +111,7 @@ jmethodID J_Object_toString;
 jclass J_DuckDBTime;
 
 jclass J_ProfilerPrintFormat;
-jobject J_ProfilerPrintFormat_QUERY_TREE;
-jobject J_ProfilerPrintFormat_JSON;
-jobject J_ProfilerPrintFormat_QUERY_TREE_OPTIMIZER;
-jobject J_ProfilerPrintFormat_NO_OUTPUT;
-jobject J_ProfilerPrintFormat_HTML;
-jobject J_ProfilerPrintFormat_GRAPHVIZ;
+jmethodID J_ProfilerPrintFormat_getName;
 
 jclass J_QueryProgress;
 jmethodID J_QueryProgress_init;
@@ -305,18 +300,7 @@ void create_refs(JNIEnv *env) {
 	J_ByteOrder_NATIVE = make_static_method_call_ref(env, J_ByteOrder, "nativeOrder", "()Ljava/nio/ByteOrder;");
 
 	J_ProfilerPrintFormat = make_class_ref(env, "org/duckdb/ProfilerPrintFormat");
-	J_ProfilerPrintFormat_QUERY_TREE =
-	    make_static_object_field_ref(env, J_ProfilerPrintFormat, "QUERY_TREE", "Lorg/duckdb/ProfilerPrintFormat;");
-	J_ProfilerPrintFormat_JSON =
-	    make_static_object_field_ref(env, J_ProfilerPrintFormat, "JSON", "Lorg/duckdb/ProfilerPrintFormat;");
-	J_ProfilerPrintFormat_QUERY_TREE_OPTIMIZER = make_static_object_field_ref(
-	    env, J_ProfilerPrintFormat, "QUERY_TREE_OPTIMIZER", "Lorg/duckdb/ProfilerPrintFormat;");
-	J_ProfilerPrintFormat_NO_OUTPUT =
-	    make_static_object_field_ref(env, J_ProfilerPrintFormat, "NO_OUTPUT", "Lorg/duckdb/ProfilerPrintFormat;");
-	J_ProfilerPrintFormat_HTML =
-	    make_static_object_field_ref(env, J_ProfilerPrintFormat, "HTML", "Lorg/duckdb/ProfilerPrintFormat;");
-	J_ProfilerPrintFormat_GRAPHVIZ =
-	    make_static_object_field_ref(env, J_ProfilerPrintFormat, "GRAPHVIZ", "Lorg/duckdb/ProfilerPrintFormat;");
+	J_ProfilerPrintFormat_getName = get_method_id(env, J_ProfilerPrintFormat, "getName", "()Ljava/lang/String;");
 
 	J_QueryProgress = make_class_ref(env, "org/duckdb/QueryProgress");
 	J_QueryProgress_init = get_method_id(env, J_QueryProgress, "<init>", "(DJJ)V");
diff --git a/src/jni/refs.hpp b/src/jni/refs.hpp
index 1d55bbe3d..2206fe3ca 100644
--- a/src/jni/refs.hpp
+++ b/src/jni/refs.hpp
@@ -108,12 +108,7 @@ extern jmethodID J_Object_toString;
 extern jclass J_DuckDBTime;
 
 extern jclass J_ProfilerPrintFormat;
-extern jobject J_ProfilerPrintFormat_QUERY_TREE;
-extern jobject J_ProfilerPrintFormat_JSON;
-extern jobject J_ProfilerPrintFormat_QUERY_TREE_OPTIMIZER;
-extern jobject J_ProfilerPrintFormat_NO_OUTPUT;
-extern jobject J_ProfilerPrintFormat_HTML;
-extern jobject J_ProfilerPrintFormat_GRAPHVIZ;
+extern jmethodID J_ProfilerPrintFormat_getName;
 
 extern jclass J_QueryProgress;
 extern jmethodID J_QueryProgress_init;
diff --git a/src/main/java/org/duckdb/DuckDBConnection.java b/src/main/java/org/duckdb/DuckDBConnection.java
index 9e2c876c0..4f2e7a4ab 100644
--- a/src/main/java/org/duckdb/DuckDBConnection.java
+++ b/src/main/java/org/duckdb/DuckDBConnection.java
@@ -10,7 +10,6 @@
 import java.sql.Blob;
 import java.sql.CallableStatement;
 import java.sql.Clob;
-import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.NClob;
 import java.sql.PreparedStatement;
diff --git a/src/main/java/org/duckdb/ProfilerPrintFormat.java b/src/main/java/org/duckdb/ProfilerPrintFormat.java
index 4680af22b..a6461293f 100644
--- a/src/main/java/org/duckdb/ProfilerPrintFormat.java
+++ b/src/main/java/org/duckdb/ProfilerPrintFormat.java
@@ -1,11 +1,24 @@
 package org.duckdb;
 
 public enum ProfilerPrintFormat {
+    DEFAULT("default"),
+    TEXT("text"),
+    QUERY_TREE("query_tree"),
+    QUERY_TREE_OPTIMIZER("query_tree_optimizer"),
+    NO_OUTPUT("no_output"),
+    JSON("json"),
+    HTML("html"),
+    GRAPHVIZ("graphviz"),
+    YAML("yaml"),
+    MERMAID("mermaid");
 
-    QUERY_TREE,
-    JSON,
-    QUERY_TREE_OPTIMIZER,
-    NO_OUTPUT,
-    HTML,
-    GRAPHVIZ
+    private final String name;
+
+    ProfilerPrintFormat(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
 }
diff --git a/src/test/java/org/duckdb/TestDuckDBJDBC.java b/src/test/java/org/duckdb/TestDuckDBJDBC.java
index ee72bf901..a2aa412d0 100644
--- a/src/test/java/org/duckdb/TestDuckDBJDBC.java
+++ b/src/test/java/org/duckdb/TestDuckDBJDBC.java
@@ -34,13 +34,11 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.Set;
 import java.util.TimeZone;
 import java.util.UUID;
 import java.util.concurrent.Callable;
@@ -48,12 +46,8 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Logger;
 import javax.sql.rowset.CachedRowSet;
 import javax.sql.rowset.RowSetProvider;
-import jdk.jfr.Recording;
-import jdk.jfr.consumer.RecordedEvent;
-import jdk.jfr.consumer.RecordingFile;
 import org.duckdb.test.TempDirectory;
 
 public class TestDuckDBJDBC {