From: Bruno Haible <bruno@clisp.org>
Date: Fri, 22 Aug 2003 13:55:38 +0000 (+0000)
Subject: Move the error_with_progname variable from module 'progname' to a new module
X-Git-Tag: v0.13~357
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86ec2c1319487e658c35bc53f84a3486c4dd9dda;p=thirdparty%2Fgettext.git

Move the error_with_progname variable from module 'progname' to a new module
'error-progname'.
---

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index c4e72e065..98a2d368d 100644
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,15 @@
+2003-08-22  Bruno Haible  <bruno@clisp.org>
+
+	* error-progname.h: New file, extracted from progname.h.
+	* error-progname.c: New file, extracted from progname.c.
+	* progname.h (error_with_progname, maybe_print_progname): Remove
+	declarations.
+	* progname.c (error_with_progname): Remove variable.
+	(maybe_print_progname): Remove function.
+	* xerror.c: Include error-progname.h.
+	* Makefile.am (libgettextlib_la_SOURCES): Add error-progname.h and
+	error-progname.c.
+
 2003-08-20  Bruno Haible  <bruno@clisp.org>
 
 	* config.charset (linux-gnulibc1*): Change hr_HR, ro_RO to ISO-8859-2.
diff --git a/gettext-tools/lib/Makefile.am b/gettext-tools/lib/Makefile.am
index 0d7a574b3..47fbbef0c 100644
--- a/gettext-tools/lib/Makefile.am
+++ b/gettext-tools/lib/Makefile.am
@@ -39,6 +39,7 @@ libgettextlib_la_SOURCES = \
   classpath.h classpath.c \
   copy-file.h copy-file.c \
   error.h error.c \
+  error-progname.h error-progname.c \
   execute.h execute.c w32spawn.h \
   exit.h \
   findprog.h findprog.c \
diff --git a/gettext-tools/lib/error-progname.c b/gettext-tools/lib/error-progname.c
new file mode 100644
index 000000000..e7ab21cce
--- /dev/null
+++ b/gettext-tools/lib/error-progname.c
@@ -0,0 +1,43 @@
+/* Use of program name in error-reporting functions.
+   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Written by Bruno Haible <haible@clisp.cons.org>, 2001.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+/* Specification.  */
+#include "error-progname.h"
+
+#include <stdio.h>
+
+#include "progname.h"
+
+
+/* Indicates whether errors and warnings get prefixed with program_name.
+   Default is true.  */
+bool error_with_progname = true;
+
+/* Print program_name prefix on stderr if and only if error_with_progname
+   is true.  */
+void
+maybe_print_progname ()
+{
+  if (error_with_progname)
+    fprintf (stderr, "%s: ", program_name);
+}
diff --git a/gettext-tools/lib/error-progname.h b/gettext-tools/lib/error-progname.h
new file mode 100644
index 000000000..ed5342f8e
--- /dev/null
+++ b/gettext-tools/lib/error-progname.h
@@ -0,0 +1,41 @@
+/* Use of program name in error-reporting functions.
+   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Written by Bruno Haible <haible@clisp.cons.org>, 2001.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef _ERROR_PROGNAME_H
+#define _ERROR_PROGNAME_H
+
+#include <stdbool.h>
+
+/* This file supports selectively prefixing or nor prefixing error messages
+   with the program name.
+
+   Programs using this file should do the following in main():
+     error_print_progname = maybe_print_progname;
+ */
+
+/* Indicates whether errors and warnings get prefixed with program_name.
+   Default is true.
+   A reason to omit the prefix is for better interoperability with Emacs'
+   compile.el.  */
+extern bool error_with_progname;
+
+/* Print program_name prefix on stderr if and only if error_with_progname
+   is true.  */
+extern void maybe_print_progname (void);
+
+#endif /* _ERROR_PROGNAME_H */
diff --git a/gettext-tools/lib/progname.c b/gettext-tools/lib/progname.c
index ff8424524..8453706c9 100644
--- a/gettext-tools/lib/progname.c
+++ b/gettext-tools/lib/progname.c
@@ -24,7 +24,6 @@
 /* Specification.  */
 #include "progname.h"
 
-#include <stdio.h>
 #include <string.h>
 
 #undef set_program_name
@@ -52,17 +51,3 @@ set_program_name (const char *argv0)
     argv0 = base + 3;
   program_name = argv0;
 }
-
-
-/* Indicates whether errors and warnings get prefixed with program_name.
-   Default is true.  */
-bool error_with_progname = true;
-
-/* Print program_name prefix on stderr if and only if error_with_progname
-   is true.  */
-void
-maybe_print_progname ()
-{
-  if (error_with_progname)
-    fprintf (stderr, "%s: ", program_name);
-}
diff --git a/gettext-tools/lib/progname.h b/gettext-tools/lib/progname.h
index 13d87cd00..89f0127c7 100644
--- a/gettext-tools/lib/progname.h
+++ b/gettext-tools/lib/progname.h
@@ -21,12 +21,8 @@
 
 #include <stdbool.h>
 
-/* This file supports selectively prefixing or nor prefixing error messages
-   with the program name.
-
-   Programs using this file should do the following in main():
+/* Programs using this file should do the following in main():
      set_program_name (argv[0]);
-     error_print_progname = maybe_print_progname;
  */
 
 /* String containing name the program is called with.  */
@@ -51,14 +47,4 @@ extern char *get_full_program_name (void);
 
 #endif
 
-/* Indicates whether errors and warnings get prefixed with program_name.
-   Default is true.
-   A reason to omit the prefix is for better interoperability with Emacs'
-   compile.el.  */
-extern bool error_with_progname;
-
-/* Print program_name prefix on stderr if and only if error_with_progname
-   is true.  */
-extern void maybe_print_progname (void);
-
 #endif /* _PROGNAME_H */
diff --git a/gettext-tools/lib/xerror.c b/gettext-tools/lib/xerror.c
index b07a6d662..7408c7c08 100644
--- a/gettext-tools/lib/xerror.c
+++ b/gettext-tools/lib/xerror.c
@@ -1,5 +1,5 @@
 /* Multiline error-reporting functions.
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -31,6 +31,7 @@
 
 #include "error.h"
 #include "progname.h"
+#include "error-progname.h"
 #include "exit.h"
 #include "mbswidth.h"
 #include "vasprintf.h"
diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index eca5a2e8a..3e1fcdc9e 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,46 @@
+2003-08-22  Bruno Haible  <bruno@clisp.org>
+
+	* format-awk.c: Include error-progname.h instead of progname.h.
+	* format-c.c: Likewise.
+	* format-elisp.c: Likewise.
+	* format-gcc-internal.c: Likewise.
+	* format-java.c: Likewise.
+	* format-librep.c: Likewise.
+	* format-lisp.c: Likewise.
+	* format-pascal.c: Likewise.
+	* format-perl.c: Likewise.
+	* format-perl-brace.c: Likewise.
+	* format-php.c: Likewise.
+	* format-python.c: Likewise.
+	* format-tcl.c: Likewise.
+	* format-ycp.c: Likewise.
+	* po-lex.h: Likewise.
+	* read-properties.c: Likewise.
+	* write-po.c: Likewise.
+	* x-awk.c: Likewise.
+	* x-c.c: Likewise.
+	* x-perl.c: Likewise.
+	* x-python.c: Likewise.
+	* x-rst.c: Likewise.
+	* hostname.c: Include error-progname.h.
+	* msgattrib.c: Likewise.
+	* msgcat.c: Likewise.
+	* msgcmp.c: Likewise.
+	* msgcomm.c: Likewise.
+	* msgconv.c: Likewise.
+	* msgen.c: Likewise.
+	* msgexec.c: Likewise.
+	* msgfilter.c: Likewise.
+	* msgfmt.c: Likewise.
+	* msggrep.c: Likewise.
+	* msginit.c: Likewise.
+	* msgmerge.c: Likewise.
+	* msgunfmt.c: Likewise.
+	* msguniq.c: Likewise.
+	* urlget.c: Likewise.
+	* xgettext.c: Likewise.
+	* po-lex.c: Include error-progname.h and pos.h.
+
 2003-08-15  Bruno Haible  <bruno@clisp.org>
 
 	* msginit.c (catalogname_for_locale): Add entries for Aragonese,
diff --git a/gettext-tools/src/format-awk.c b/gettext-tools/src/format-awk.c
index 273cea403..902a7fbed 100644
--- a/gettext-tools/src/format-awk.c
+++ b/gettext-tools/src/format-awk.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
diff --git a/gettext-tools/src/format-c.c b/gettext-tools/src/format-c.c
index 4eb3c2cbe..117cc8cf2 100644
--- a/gettext-tools/src/format-c.c
+++ b/gettext-tools/src/format-c.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
diff --git a/gettext-tools/src/format-elisp.c b/gettext-tools/src/format-elisp.c
index f575e3a87..d25bec032 100644
--- a/gettext-tools/src/format-elisp.c
+++ b/gettext-tools/src/format-elisp.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
diff --git a/gettext-tools/src/format-gcc-internal.c b/gettext-tools/src/format-gcc-internal.c
index 5441af3a1..8d17c20a2 100644
--- a/gettext-tools/src/format-gcc-internal.c
+++ b/gettext-tools/src/format-gcc-internal.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
diff --git a/gettext-tools/src/format-java.c b/gettext-tools/src/format-java.c
index e8ba90473..f20684bba 100644
--- a/gettext-tools/src/format-java.c
+++ b/gettext-tools/src/format-java.c
@@ -31,7 +31,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
diff --git a/gettext-tools/src/format-librep.c b/gettext-tools/src/format-librep.c
index 2dfcaa403..334c62a6c 100644
--- a/gettext-tools/src/format-librep.c
+++ b/gettext-tools/src/format-librep.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
diff --git a/gettext-tools/src/format-lisp.c b/gettext-tools/src/format-lisp.c
index 51cf6ee1e..f78ebbf79 100644
--- a/gettext-tools/src/format-lisp.c
+++ b/gettext-tools/src/format-lisp.c
@@ -31,7 +31,7 @@
 #include "format-invalid.h"
 #include "minmax.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
diff --git a/gettext-tools/src/format-pascal.c b/gettext-tools/src/format-pascal.c
index f60f8cd82..8af67d980 100644
--- a/gettext-tools/src/format-pascal.c
+++ b/gettext-tools/src/format-pascal.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
diff --git a/gettext-tools/src/format-perl-brace.c b/gettext-tools/src/format-perl-brace.c
index 334e194cf..27c542c42 100644
--- a/gettext-tools/src/format-perl-brace.c
+++ b/gettext-tools/src/format-perl-brace.c
@@ -27,7 +27,7 @@
 #include "format.h"
 #include "xmalloc.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
diff --git a/gettext-tools/src/format-perl.c b/gettext-tools/src/format-perl.c
index 6ed1ea577..64933fd38 100644
--- a/gettext-tools/src/format-perl.c
+++ b/gettext-tools/src/format-perl.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
diff --git a/gettext-tools/src/format-php.c b/gettext-tools/src/format-php.c
index d0f718fc6..9c9bdb944 100644
--- a/gettext-tools/src/format-php.c
+++ b/gettext-tools/src/format-php.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
diff --git a/gettext-tools/src/format-python.c b/gettext-tools/src/format-python.c
index 3dbc1827c..f01f37361 100644
--- a/gettext-tools/src/format-python.c
+++ b/gettext-tools/src/format-python.c
@@ -30,7 +30,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
diff --git a/gettext-tools/src/format-tcl.c b/gettext-tools/src/format-tcl.c
index 0ac982d1f..4f1ff2fca 100644
--- a/gettext-tools/src/format-tcl.c
+++ b/gettext-tools/src/format-tcl.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
diff --git a/gettext-tools/src/format-ycp.c b/gettext-tools/src/format-ycp.c
index cacab0e13..ba395187c 100644
--- a/gettext-tools/src/format-ycp.c
+++ b/gettext-tools/src/format-ycp.c
@@ -29,7 +29,7 @@
 #include "xerror.h"
 #include "format-invalid.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
diff --git a/gettext-tools/src/hostname.c b/gettext-tools/src/hostname.c
index 9e73ca86c..7099d9fca 100644
--- a/gettext-tools/src/hostname.c
+++ b/gettext-tools/src/hostname.c
@@ -78,6 +78,7 @@
 #include <stdbool.h>
 
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"
diff --git a/gettext-tools/src/msgattrib.c b/gettext-tools/src/msgattrib.c
index a394d6fd0..2856323b9 100644
--- a/gettext-tools/src/msgattrib.c
+++ b/gettext-tools/src/msgattrib.c
@@ -29,6 +29,7 @@
 
 #include "dir-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"
diff --git a/gettext-tools/src/msgcat.c b/gettext-tools/src/msgcat.c
index a4d3e5b5e..592c820f9 100644
--- a/gettext-tools/src/msgcat.c
+++ b/gettext-tools/src/msgcat.c
@@ -31,6 +31,7 @@
 #include "str-list.h"
 #include "file-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"
diff --git a/gettext-tools/src/msgcmp.c b/gettext-tools/src/msgcmp.c
index c26f0f780..3f211b6fb 100644
--- a/gettext-tools/src/msgcmp.c
+++ b/gettext-tools/src/msgcmp.c
@@ -29,6 +29,7 @@
 
 #include "dir-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"
diff --git a/gettext-tools/src/msgcomm.c b/gettext-tools/src/msgcomm.c
index 329540994..206ba1cd4 100644
--- a/gettext-tools/src/msgcomm.c
+++ b/gettext-tools/src/msgcomm.c
@@ -31,6 +31,7 @@
 #include "str-list.h"
 #include "file-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"
diff --git a/gettext-tools/src/msgconv.c b/gettext-tools/src/msgconv.c
index 1929e8cec..7ff480a47 100644
--- a/gettext-tools/src/msgconv.c
+++ b/gettext-tools/src/msgconv.c
@@ -29,6 +29,7 @@
 
 #include "dir-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"
diff --git a/gettext-tools/src/msgen.c b/gettext-tools/src/msgen.c
index 960a81211..fdb06ca81 100644
--- a/gettext-tools/src/msgen.c
+++ b/gettext-tools/src/msgen.c
@@ -29,6 +29,7 @@
 
 #include "dir-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"
diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c
index a53a333d9..42188ffac 100644
--- a/gettext-tools/src/msgexec.c
+++ b/gettext-tools/src/msgexec.c
@@ -36,6 +36,7 @@
 #include "dir-list.h"
 #include "error.h"
 #include "xerror.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"
diff --git a/gettext-tools/src/msgfilter.c b/gettext-tools/src/msgfilter.c
index 55455b2b2..5ee6800f2 100644
--- a/gettext-tools/src/msgfilter.c
+++ b/gettext-tools/src/msgfilter.c
@@ -46,6 +46,7 @@
 
 #include "dir-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"
diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c
index 265331e98..551b5350a 100644
--- a/gettext-tools/src/msgfmt.c
+++ b/gettext-tools/src/msgfmt.c
@@ -32,6 +32,7 @@
 
 #include "dir-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"
diff --git a/gettext-tools/src/msggrep.c b/gettext-tools/src/msggrep.c
index 940b46dbd..c91782f9d 100644
--- a/gettext-tools/src/msggrep.c
+++ b/gettext-tools/src/msggrep.c
@@ -38,6 +38,7 @@
 
 #include "dir-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"
diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c
index 5ff11f53f..0592713e8 100644
--- a/gettext-tools/src/msginit.c
+++ b/gettext-tools/src/msginit.c
@@ -70,6 +70,7 @@
 #endif
 
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"
diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index 009b50a05..d9cb33f75 100644
--- a/gettext-tools/src/msgmerge.c
+++ b/gettext-tools/src/msgmerge.c
@@ -31,6 +31,7 @@
 
 #include "dir-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"
diff --git a/gettext-tools/src/msgunfmt.c b/gettext-tools/src/msgunfmt.c
index e3126e4c6..6e6b54b49 100644
--- a/gettext-tools/src/msgunfmt.c
+++ b/gettext-tools/src/msgunfmt.c
@@ -28,6 +28,7 @@
 #include <locale.h>
 
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"
diff --git a/gettext-tools/src/msguniq.c b/gettext-tools/src/msguniq.c
index 522253432..b3fe4f357 100644
--- a/gettext-tools/src/msguniq.c
+++ b/gettext-tools/src/msguniq.c
@@ -30,6 +30,7 @@
 #include "dir-list.h"
 #include "str-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"
diff --git a/gettext-tools/src/po-lex.c b/gettext-tools/src/po-lex.c
index 10ed6febd..55a191388 100644
--- a/gettext-tools/src/po-lex.c
+++ b/gettext-tools/src/po-lex.c
@@ -45,6 +45,8 @@
 #include "xmalloc.h"
 #include "exit.h"
 #include "error.h"
+#include "error-progname.h"
+#include "pos.h"
 #include "str-list.h"
 #include "po-gram-gen2.h"
 
diff --git a/gettext-tools/src/po-lex.h b/gettext-tools/src/po-lex.h
index f50011cdc..ce85bf3fe 100644
--- a/gettext-tools/src/po-lex.h
+++ b/gettext-tools/src/po-lex.h
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "pos.h"
 #include "xerror.h"
 
diff --git a/gettext-tools/src/read-properties.c b/gettext-tools/src/read-properties.c
index a38a7a095..b56bff5d2 100644
--- a/gettext-tools/src/read-properties.c
+++ b/gettext-tools/src/read-properties.c
@@ -31,7 +31,7 @@
 #include <string.h>
 
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "message.h"
 #include "read-po-abstract.h"
 #include "xmalloc.h"
diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c
index d38ff4295..ea95bc667 100644
--- a/gettext-tools/src/urlget.c
+++ b/gettext-tools/src/urlget.c
@@ -34,6 +34,7 @@
 #endif
 
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"
diff --git a/gettext-tools/src/write-po.c b/gettext-tools/src/write-po.c
index 434d19020..abe8eff6d 100644
--- a/gettext-tools/src/write-po.c
+++ b/gettext-tools/src/write-po.c
@@ -43,7 +43,7 @@
 #include "xmalloc.h"
 #include "strstr.h"
 #include "exit.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "error.h"
 #include "xerror.h"
 #include "gettext.h"
diff --git a/gettext-tools/src/x-awk.c b/gettext-tools/src/x-awk.c
index 3a36054d5..3f8346ffe 100644
--- a/gettext-tools/src/x-awk.c
+++ b/gettext-tools/src/x-awk.c
@@ -31,7 +31,7 @@
 #include "x-awk.h"
 #include "xgettext.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "xmalloc.h"
 #include "exit.h"
 #include "gettext.h"
diff --git a/gettext-tools/src/x-c.c b/gettext-tools/src/x-c.c
index a0922c9a4..47f6b729d 100644
--- a/gettext-tools/src/x-c.c
+++ b/gettext-tools/src/x-c.c
@@ -31,7 +31,7 @@
 #include "x-c.h"
 #include "xgettext.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "xmalloc.h"
 #include "exit.h"
 #include "hash.h"
diff --git a/gettext-tools/src/x-perl.c b/gettext-tools/src/x-perl.c
index f17f19a9a..5b5eefcdc 100644
--- a/gettext-tools/src/x-perl.c
+++ b/gettext-tools/src/x-perl.c
@@ -31,7 +31,7 @@
 #include "x-perl.h"
 #include "xgettext.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "xmalloc.h"
 #include "exit.h"
 #include "po-charset.h"
diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c
index ea8220885..e2c69c4d7 100644
--- a/gettext-tools/src/x-python.c
+++ b/gettext-tools/src/x-python.c
@@ -32,7 +32,7 @@
 #include "x-python.h"
 #include "xgettext.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "xmalloc.h"
 #include "exit.h"
 #include "po-charset.h"
diff --git a/gettext-tools/src/x-rst.c b/gettext-tools/src/x-rst.c
index 1f93b9f47..15aa4fbcb 100644
--- a/gettext-tools/src/x-rst.c
+++ b/gettext-tools/src/x-rst.c
@@ -30,7 +30,7 @@
 #include "x-rst.h"
 #include "xgettext.h"
 #include "error.h"
-#include "progname.h"
+#include "error-progname.h"
 #include "xmalloc.h"
 #include "exit.h"
 #include "gettext.h"
diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index 0c73607f1..559d8ad7d 100644
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -36,6 +36,7 @@
 #include "file-list.h"
 #include "str-list.h"
 #include "error.h"
+#include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"
 #include "basename.h"