diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk
index 377e75970b..9fa0199425 100644
--- a/src/bin/initdb/nls.mk
+++ b/src/bin/initdb/nls.mk
@@ -1,5 +1,5 @@
 # src/bin/initdb/nls.mk
 CATALOG_NAME     = initdb
 AVAIL_LANGUAGES  = cs de es fr it ja pl pt_BR ru zh_CN
-GETTEXT_FILES    = findtimezone.c initdb.c ../../common/exec.c ../../common/fe_memutils.c ../../common/pgfnames.c ../../common/rmtree.c ../../common/wait_error.c ../../port/dirmod.c
+GETTEXT_FILES    = findtimezone.c initdb.c ../../common/exec.c ../../common/fe_memutils.c ../../common/pgfnames.c ../../common/rmtree.c ../../common/username.c ../../common/wait_error.c ../../port/dirmod.c
 GETTEXT_TRIGGERS = simple_prompt
diff --git a/src/bin/pg_dump/nls.mk b/src/bin/pg_dump/nls.mk
index bf40e28eaf..c53826df44 100644
--- a/src/bin/pg_dump/nls.mk
+++ b/src/bin/pg_dump/nls.mk
@@ -7,7 +7,8 @@ GETTEXT_FILES    = pg_backup_archiver.c pg_backup_db.c pg_backup_custom.c \
                    pg_dump.c common.c pg_dump_sort.c \
                    pg_restore.c pg_dumpall.c \
                    parallel.c parallel.h pg_backup_utils.c pg_backup_utils.h \
-                   ../../common/exec.c ../../common/fe_memutils.c
+                   ../../common/exec.c ../../common/fe_memutils.c \
+                   ../../common/wait_error.c
 GETTEXT_TRIGGERS = write_msg:2 exit_horribly:2 simple_prompt \
                    ExecuteSqlCommand:3 ahlog:3 warn_or_exit_horribly:3
 GETTEXT_FLAGS  = \
diff --git a/src/bin/psql/nls.mk b/src/bin/psql/nls.mk
index e2505f1774..a535eb6fd6 100644
--- a/src/bin/psql/nls.mk
+++ b/src/bin/psql/nls.mk
@@ -4,6 +4,7 @@ AVAIL_LANGUAGES  = cs de es fr it ja pl pt_BR ru zh_CN zh_TW
 GETTEXT_FILES    = command.c common.c copy.c help.c input.c large_obj.c \
                    mainloop.c print.c psqlscan.c startup.c describe.c sql_help.h sql_help.c \
                    tab-complete.c variables.c \
-                   ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c
+                   ../../common/exec.c ../../common/fe_memutils.c ../../common/username.c \
+                   ../../common/wait_error.c
 GETTEXT_TRIGGERS = N_ psql_error simple_prompt
 GETTEXT_FLAGS    = psql_error:1:c-format
diff --git a/src/bin/scripts/nls.mk b/src/bin/scripts/nls.mk
index 3e3c4d9a58..b83a8ae76a 100644
--- a/src/bin/scripts/nls.mk
+++ b/src/bin/scripts/nls.mk
@@ -6,5 +6,5 @@ GETTEXT_FILES    = createdb.c createlang.c createuser.c \
                    clusterdb.c vacuumdb.c reindexdb.c \
                    pg_isready.c \
                    common.c \
-                   ../../common/fe_memutils.c
+                   ../../common/fe_memutils.c ../../common/username.c
 GETTEXT_TRIGGERS = simple_prompt yesno_prompt