diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index 8558e29f93..e22e4701b0 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -962,16 +962,18 @@ is_na_patch() {
         HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \
           '-I^\s+$' \
           '-I^\s*/?\*/?$' \
-          '-I^\s*(//|/?\*).*\s([vV]im9|channel|job|popup|sound|terminal)' \
-          '-I^#\s*((ifdef|ifndef|undef)|(if|elif)\s.*defined\().*FEAT_' \
+          '-I^\s*(//|/?\*).*\s([vV]im9|E[0-9]{4} - |FEAT_|channel|job|popup|sound|terminal)' \
+          '-I^#\s*((ifdef|ifndef|undef)|(if|elif)\s.*defined\().*FEAT_[^_]' \
           '-I^#\s*(else|endif)' \
-          '-I^#\s*define\s+(FEAT|POPUPWIN|XDG)_' \
+          '-I^#\s*define\s+(FEAT|POPUPWIN|XDG|t)_[^_]' \
+          '-I^\s+(&&|\|\|)\s.*defined\(.*FEAT_[^_]' \
           '-IEVENT_TERMINALWINOPEN' \
           '-I^#\s*define\s+POPF_CURSORLINE\s' \
           '-I^typedef enum \{$' \
           '-I^\s+POPCLOSE_[A-Z]+,?$' \
           '-I^\} popclose_T;$' \
           '-I^EXTERN\schar\s+\*popup_transparent' \
+          '-I^EXTERN type_T static_types\[' \
           '-I^EXTERN type_T t_.* INIT[2-9]\(' \
           '-I^EXTERN\swin_T\s+\*popup_dragwin' \
           '-I^EXTERN char e_(abstract|class|enum|interface|type)_' \
@@ -979,14 +981,16 @@ is_na_patch() {
           '-I^EXTERN char e_.*enddef' \
           '-I^EXTERN char e_.*vim9' \
           '-I^EXTERN char e_cannot_declare_.*variable_str' \
+          '-I^EXTERN char e_cannot_define_new_.+_as_static' \
           '-I^EXTERN char e_dictionary_not_set' \
           '-I^EXTERN char e_dictnull' \
           '-I\sINIT\(= .+"E[0-9]+: (Abstract|Class|Enum|Interface|Type) ' \
           '-I\sINIT\(= .+"E[0-9]+: .*:def ' \
           '-I\sINIT\(= .+"E[0-9]+: .*enddef"' \
-          '-I\sINIT\(= .+"E[0-9]+: .*[vV]im9' \
+          '-I\sINIT\(= .+"E[0-9]+: .*([vV]im9|interface)' \
           '-I\sINIT\(= .+"E1016: Cannot declare .* variable: ' \
           '-I\s+INIT\(= .+"E1103: Dictionary not set' \
+          '-I\s+INIT\(= .+"E1370: Cannot define a .+ as static' \
           '-I\schar.*\s+\*w_popup_title;' \
           '-I\sint\s+ch_[_a-zA-Z]+;' \
           '-I\sint\s+w_(filter_mode|firstline|popup_drag|want_scrollbar);' \
@@ -1004,15 +1008,16 @@ is_na_patch() {
         HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \
           '-I^\s+$' \
           '-I^\s*/?\*/?$' \
-          '-I^\s*(//|/?\*).*\s([vV]im9|channel|job|popup|sound|terminal)' \
-          '-I^#\s*((ifdef|ifndef|undef)|(if|elif)\s.*defined\().*FEAT_' \
+          '-I^\s*(//|/?\*).*\s([vV]im9|E[0-9]{4} - |FEAT_|channel|job|popup|sound|terminal)' \
+          '-I^#\s*((ifdef|ifndef|undef)|(if|elif)\s.*defined\().*FEAT_[^_]' \
           '-I^#\s*(else|endif)' \
-          '-I^#\s*define\s+(FEAT|POPUPWIN|XDG)_' \
+          '-I^#\s*define\s+(FEAT|POPUPWIN|XDG|t)_[^_]' \
+          '-I^\s+(&&|\|\|)\s.*defined\(.*FEAT_[^_]' \
           '-IEVENT_TERMINALWINOPEN' \
           '-I^#\s*include\s+<proto/' \
           '-I^\s+\{"(popup|prop|sound)_[_a-z]+",.*f_(popup|prop|sound)_[_a-z]+},$' \
-          '-I^\s*(static)?\svoid$' \
-          '-I^static\svoid\s.+\(.+\);$' \
+          '-I^\s*(static)?\s(char_u|hashtab_T|int|void)( \*)?$' \
+          '-I^static\s(char_u|hashtab_T|int|void)\s\*?[^*]+\(.+\);$' \
           '-I#\s*define.*ex_ni$' \
           '-I[_.>]sc_version = ' \
           '-I[_.>]uf_script_ctx_version = ' \
diff --git a/scripts/vim_na_hunks_c.txt b/scripts/vim_na_hunks_c.txt
index 33d627a0f7..e6e81fb499 100644
--- a/scripts/vim_na_hunks_c.txt
+++ b/scripts/vim_na_hunks_c.txt
@@ -53,6 +53,7 @@
 ^restore_buffer(bufref_T
 ^static int included_patches\[\] =
 ^switch_buffer(bufref_T
+^typedef struct ss_pending_cmd_S
 ^vim_free(
 ^vim_isNormalIDc(
 ^vim_isalpha(
diff --git a/scripts/vim_na_hunks_h.txt b/scripts/vim_na_hunks_h.txt
index 39cbe1e02d..1b1408e1c4 100644
--- a/scripts/vim_na_hunks_h.txt
+++ b/scripts/vim_na_hunks_h.txt
@@ -1,2 +1,3 @@
+^EXTERN type_T static_types\[
 ^struct jobvar_S
-^struct type_S {
+^struct \(channel\|type\)_S {
diff --git a/scripts/vim_na_hunks_vim.txt b/scripts/vim_na_hunks_vim.txt
index d762fee07e..0e38f1e598 100644
--- a/scripts/vim_na_hunks_vim.txt
+++ b/scripts/vim_na_hunks_vim.txt
@@ -95,15 +95,21 @@
 \*HelpToc-mappings\*
 \*SafeStateAgain\*
 \*SigUSR1\*
+\*TerminalOpen\*
+\*TerminalWinOpen\*
+\*autocommand-events\*
 \*builtin-function-list\*
 \*emacs[_-]tags\*
+\*global-ime\*
 \*help-toc-install\*
 \*job_[a-zA-Z0-9]\+()\*
+\*multibyte-ime\*
 \*os-support\*
 \*patches-\(after-\)\?[0-9].*\*
 \*popup-window-functions\*
 \*sound-functions\*
 \*sound_[a-zA-Z0-9]\+()\*
+\*term++\(close\|open\)\*
 \*test_gui_[a-zA-Z0-9_]\+()\*
 \*v:none\*
 \*v:sizeof[a-z]\+\*
diff --git a/scripts/vim_na_regexp.txt b/scripts/vim_na_regexp.txt
index 6980c1e06b..ce7f61b82c 100644
--- a/scripts/vim_na_regexp.txt
+++ b/scripts/vim_na_regexp.txt
@@ -46,6 +46,7 @@
 ^src/config\.[a-z]
 ^src/configure
 ^src/crypt
+^src/glbl_ime\.
 ^src/gui[_.]
 ^src/gvim
 ^src/if_
@@ -89,6 +90,7 @@
 \.desktop$
 \.diff$
 \.ico$
+\.idl$
 \.info$
 \.man$
 \.mms$