--- a/libtwamr/namespace.awk	Sun May 05 22:56:24 2024 +0000
+++ b/libtwamr/namespace.awk	Mon May 06 01:49:57 2024 +0000
@@ -8,8 +8,12 @@
 	print ""
 }
 
-NF == 1 && $1 !~ /^#/ {
-	printf "#define	%s	amr__%s\n", $1, $1
+{
+	for (i = 1; i <= NF; i++) {
+		if ($i ~ /^#/)
+			break;
+		printf "#define	%s	amr__%s\n", $i, $i;
+	}
 }
 
 END {

--- a/libtwamr/namespace.list	Sun May 05 22:56:24 2024 +0000
+++ b/libtwamr/namespace.list	Mon May 06 01:49:57 2024 +0000
@@ -1,147 +1,53 @@
 # This file is the source input for automatic generation of namespace.h
-# for libtwamr.  Each non-empty, non-comment line names one function or
-# data object with intermodule linkage whose name needs to be transformed
-# in order to avoid namespace pollution for users of our library.
+# for libtwamr.  Each word in every non-empty, non-comment line lists a
+# function or a data object with intermodule linkage whose name needs to be
+# transformed in order to avoid namespace pollution for users of our library.
 
-Overflow
-Carry
+Overflow Carry
 
-add
-sub
-abs_s
-shl
-shr
-mult
-L_mult
-negate
-extract_h
-extract_l
-round
-L_mac
-L_msu
-L_macNs
-L_msuNs
-L_add
-L_sub
-L_add_c
-L_sub_c
-L_negate
-mult_r
-L_shl
-L_shr
-shr_r
-mac_r
-msu_r
-L_deposit_h
-L_deposit_l
-L_shr_r
-L_abs
-L_sat
-norm_m
-div_s
-norm_l
+add sub abs_s shl shr mult
+L_mult negate extract_h extract_l round
+L_mac L_msu L_macNs L_msuNs L_add L_sub L_add_c L_sub_c L_negate
+mult_r L_shl L_shr shr_r mac_r msu_r
+L_deposit_h L_deposit_l L_shr_r L_abs L_sat
+norm_m div_s norm_l
+L_Extract L_Comp Mpy_32 Mpy_32_16 Div_32
 
-L_Extract
-L_Comp
-Mpy_32
-Mpy_32_16
-Div_32
-
-Inv_sqrt
-Log2
-Log2_norm
-Pow2
+Inv_sqrt Log2 Log2_norm Pow2
 
-A_Refl
-Autocorr
-Az_lsp
-Bgn_scd
-Bgn_scd_reset
+A_Refl Autocorr Az_lsp
+Bgn_scd Bgn_scd_reset
 Convolve
-Dec_gain
-Dec_lag3
-Dec_lag6
-D_plsf_reset
-D_plsf_5
-D_plsf_3
-Init_D_plsf_3
-Lsf_lsp
-Lsp_lsf
-Reorder_lsf
+Dec_gain Dec_lag3 Dec_lag6
+D_plsf_reset D_plsf_5 D_plsf_3 Init_D_plsf_3
+Lsf_lsp Lsp_lsf Reorder_lsf
 
-agc
-agc2
-agc_reset
-pseudonoise
-build_CN_code
-build_CN_param
-gmed_n
+agc agc2 agc_reset
+pseudonoise build_CN_code build_CN_param
 sqrt_l_exp
-set_sign
-set_sign12k2
-cor_h
-cor_h_x
-cor_h_x2
-comp_corr
+set_sign set_sign12k2
+cor_h cor_h_x cor_h_x2 comp_corr
 cbsearch
-d_gain_code
-d_gain_pitch
-
-Bits2prm
-Prm2bits
+d_gain_code d_gain_pitch
+gc_pred gc_pred_copy gc_pred_reset gc_pred_update gc_pred_average_limited
+gmed_n
 
-bitno
-prmno
-prmnofs
-gray
-dgray
-window_200_40
-window_160_80
-window_232_8
-qua_gain_pitch
-qua_gain_code
-table_gain_highrates
-table_gain_lowrates
-table_gain_MR475
+Bits2prm Prm2bits
 
-mean_lsf
-mean_lsf3
-dico1_lsf
-dico2_lsf
-dico3_lsf
-dico4_lsf
-dico5_lsf
-dico1_lsf3
-dico2_lsf3
-dico3_lsf3
-mr515_3_lsf
-mr795_1_lsf
-past_rq_init
-pred_fact
-
-Cb_gain_average
-Cb_gain_average_reset
+bitno prmno prmnofs gray dgray
+window_200_40 window_160_80 window_232_8
+qua_gain_pitch qua_gain_code
+table_gain_highrates table_gain_lowrates table_gain_MR475
 
-calc_unfilt_energies
-calc_filt_energies
-calc_target_energy
-code_2i40_9bits
-code_2i40_11bits
-code_3i40_14bits
-code_4i40_17bits
-code_8i40_31bits
-code_10i40_35bits
-search_10and8i40
+mean_lsf mean_lsf3
+dico1_lsf dico2_lsf dico3_lsf dico4_lsf dico5_lsf
+dico1_lsf3 dico2_lsf3 dico3_lsf3 mr515_3_lsf mr795_1_lsf
+past_rq_init pred_fact
 
-decode_2i40_9bits
-decode_2i40_11bits
-decode_3i40_14bits
-decode_4i40_17bits
-dec_8i40_31bits
-dec_10i40_35bits
+Cb_gain_average Cb_gain_average_reset
 
-gc_pred
-gc_pred_copy
-gc_pred_reset
-gc_pred_update
-gc_pred_average_limited
+calc_unfilt_energies calc_filt_energies calc_target_energy
+code_2i40_9bits code_2i40_11bits code_3i40_14bits code_4i40_17bits
+code_8i40_31bits code_10i40_35bits search_10and8i40
+decode_2i40_9bits decode_2i40_11bits decode_3i40_14bits decode_4i40_17bits
+dec_8i40_31bits dec_10i40_35bits