diff --git a/scripts/vim_na_files.txt b/scripts/vim_na_files.txt
index 3eefeb67fe..db8c811fc5 100644
--- a/scripts/vim_na_files.txt
+++ b/scripts/vim_na_files.txt
@@ -76,6 +76,7 @@ src/README.md
 src/blowfish.c
 src/cairo.c
 src/channel.c
+src/clientserver.c
 src/dlldata.c
 src/hardcopy.c
 src/iid_ole.c
diff --git a/scripts/vim_na_hunks_vim.txt b/scripts/vim_na_hunks_vim.txt
index 3cf253ba25..a7e4d417db 100644
--- a/scripts/vim_na_hunks_vim.txt
+++ b/scripts/vim_na_hunks_vim.txt
@@ -7,6 +7,9 @@
 ^err_teapot(.\+err_teapot(
 ^listener_[a-zA-Z0-9]\+(.\+listener_[a-zA-Z0-9]\+(
 ^redraw_listener_[a-zA-Z0-9]\+(.\+redraw_listener_[a-zA-Z0-9]\+(
+^remote_[a-z]\+(.\+remote_[a-z]\+(
+^server2client(.\+server2client(
+^serverlist(.\+serverlist(
 ^test_alloc_fail(.\+test_alloc_fail(
 ^test_autochdir(.\+test_autochdir(
 ^test_feedinput(.\+test_feedinput(