Include specification .h file in implementation .c file.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 7b37a0c440fd826bbd6be127bf28808399a26ec7..63880481d4caf41e321fcd080d6b0f556c12999e 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,19 @@
+2001-09-08  Bruno Haible  <haible@clisp.cons.org>
+
+       * findprog.c: Include specification header before all other headers.
+       * fstrcmp.c: Likewise.
+       * full-write.c: Likewise.
+       * hash.c: Likewise.
+       * linebreak.c: Likewise.
+       * mbswidth.c: Likewise.
+       * progname.c: Likewise.
+       * safe-read.c: Likewise.
+       * wait-process.c: Likewise.
+       * xerror.c: Likewise.
+       * getline.c: Include getline.h.
+       * mbswidth.h: Include <stddef.h>, for size_t.
+       * wait-process.h: Include <unistd,h> and <sys/types.h>, for pid_t.
+
 2001-09-08  Bruno Haible  <haible@clisp.cons.org>
 
        * javacomp.sh.in: New file.

diff --git a/lib/c-ctype.c b/lib/c-ctype.c
index 476c2168abc763513a19f3360569f0f02aded01a..f1c5a0e92491045aeafe36e7410db230275cfc68 100644 (file)
--- a/lib/c-ctype.c
+++ b/lib/c-ctype.c
@@ -16,6 +16,7 @@ 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.  */
 
+/* Specification.  */
 #include "c-ctype.h"
 
 #undef c_isalnum

diff --git a/lib/concatpath.c b/lib/concatpath.c
index e229cdb9a87fdf36445c5376c4186282c1ede31e..cc9088d8592acccc47a6bfd4217d611545d93ac3 100644 (file)
--- a/lib/concatpath.c
+++ b/lib/concatpath.c
@@ -22,6 +22,7 @@
 # include <config.h>
 #endif
 
+/* Specification.  */
 #include "system.h"
 
 /* Concatenate a directory pathname, a relative pathname and an optional

diff --git a/lib/findprog.c b/lib/findprog.c
index b2ab40a37feb779dfa48d8694ac2fc8f34bc4192..5b18d562b4e86385542dd639bfbcdda0bd3891c8 100644 (file)
--- a/lib/findprog.c
+++ b/lib/findprog.c
@@ -21,6 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "findprog.h"
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -28,7 +31,6 @@
 # include <unistd.h>
 #endif
 
-#include "findprog.h"
 #include "system.h"
 
 

diff --git a/lib/fstrcmp.c b/lib/fstrcmp.c
index 1a0d74c6642f5eb8e801ff1f2e3a6f2484735bf9..7604aa5ce0f738bced5521d31b14d7ba63753773 100644 (file)
--- a/lib/fstrcmp.c
+++ b/lib/fstrcmp.c
@@ -34,12 +34,14 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "fstrcmp.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <limits.h>
 
 #include "system.h"
-#include "fstrcmp.h"
 
 
 /*

diff --git a/lib/full-write.c b/lib/full-write.c
index 13eae22dc9dd01336fd759a61e28bab02a478806..bb784ac400b61ed43575813ac13cabbff23c1dd6 100644 (file)
--- a/lib/full-write.c
+++ b/lib/full-write.c
@@ -22,6 +22,9 @@
 # include <config.h>
 #endif
 
+/* Specification.  */
+#include "full-write.h"
+
 #include <sys/types.h>
 
 #if HAVE_UNISTD_H
@@ -33,8 +36,6 @@
 extern int errno;
 #endif
 
-#include "full-write.h"
-
 /* Write LEN bytes at PTR to descriptor DESC, retrying if interrupted.
    Return LEN upon success, write's (negative) error code otherwise.  */
 

diff --git a/lib/getline.c b/lib/getline.c
index 4bbdfe9db99439e0b45a98a7456d965e72316f66..02592b1a01136a813d0080fcc3a82efe9bcb0ef4 100644 (file)
--- a/lib/getline.c
+++ b/lib/getline.c
@@ -1,6 +1,6 @@
 /* getline.c -- Replacement for GNU C library function getline
 
-Copyright (C) 1993, 1996 Free Software Foundation, Inc.
+Copyright (C) 1993, 1996, 2001 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -22,6 +22,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 # include <config.h>
 #endif
 
+/* Specification.  */
+#include "getline.h"
+
 /* The `getdelim' function is only declared if the following symbol
    is defined.  */
 #ifndef _GNU_SOURCE

diff --git a/lib/hash.c b/lib/hash.c
index 705848b18e25f9f7a01c04ae8bd774622e408736..f7f9ff334c1fd4f49559687bc4bdc1c2f40a609a 100644 (file)
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -20,6 +20,9 @@
 # include <config.h>
 #endif
 
+/* Specification.  */
+#include "hash.h"
+
 #if STDC_HEADERS 
 # include <stdlib.h> 
 #else
@@ -47,8 +50,6 @@
 # include <values.h>
 #endif
 
-#include "hash.h"
-
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free free
 

diff --git a/lib/linebreak.c b/lib/linebreak.c
index 45837a4af42a57a5d373794a26e22609e4724376..7afbee60202732013e974159a401fb10596117f7 100644 (file)
--- a/lib/linebreak.c
+++ b/lib/linebreak.c
@@ -20,9 +20,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include <config.h>
 #endif
 
+/* Specification.  */
+#include "linebreak.h"
+
 #include <stddef.h>
 #include <string.h>
-#include "linebreak.h"
 #include "c-ctype.h"
 
 #include "utf8-ucs4.h"

diff --git a/lib/mbswidth.c b/lib/mbswidth.c
index 69a801ceaed6350681e0fd117b821e06525993da..9d5ebe74ae055c5ca88b884ddc1cda3ef74f0dac 100644 (file)
--- a/lib/mbswidth.c
+++ b/lib/mbswidth.c
@@ -21,6 +21,9 @@
 # include <config.h>
 #endif
 
+/* Specification.  */
+#include "mbswidth.h"
+
 /* Get MB_CUR_MAX.  */
 #include <stdlib.h>
 
@@ -78,8 +81,6 @@ int wcwidth ();
 #undef ISCNTRL
 #define ISCNTRL(c) (IN_CTYPE_DOMAIN (c) && iscntrl (c))
 
-#include "mbswidth.h"
-
 /* Returns the number of columns needed to represent the multibyte
    character string pointed to by STRING.  If a non-printable character
    occurs, and MBSW_REJECT_UNPRINTABLE is specified, -1 is returned.

diff --git a/lib/mbswidth.h b/lib/mbswidth.h
index 38911da00259d5ee8ed1859100fa3c76cc6623fd..7b2482a5428c70ff33432672fdb558312843d27b 100644 (file)
--- a/lib/mbswidth.h
+++ b/lib/mbswidth.h
@@ -15,6 +15,8 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#include <stddef.h>
+
 #ifndef PARAMS
 # if defined (__GNUC__) || __STDC__
 #  define PARAMS(Args) Args

diff --git a/lib/pipe-bidi.c b/lib/pipe-bidi.c
index 244a84a1dd75784efcd720931804c89a9888e981..b52aacb2c39e798bf28c81f6e97ab00d33a4d89f 100644 (file)
--- a/lib/pipe-bidi.c
+++ b/lib/pipe-bidi.c
@@ -21,6 +21,7 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
 #include "pipe.h"
 
 #include <errno.h>

diff --git a/lib/pipe-in.c b/lib/pipe-in.c
index fe63544e29e3d6ba67f33685b32fddafa788c335..85e911f7b6bb3b50e1711a84effe89c24cc973f9 100644 (file)
--- a/lib/pipe-in.c
+++ b/lib/pipe-in.c
@@ -21,6 +21,7 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
 #include "pipe.h"
 
 #include <errno.h>

diff --git a/lib/pipe-out.c b/lib/pipe-out.c
index 77803d6de75592420ae66772e248f40f054921b5..ffb6ef292835c01d2e867dabbb7f399ca3cf2df4 100644 (file)
--- a/lib/pipe-out.c
+++ b/lib/pipe-out.c
@@ -21,6 +21,7 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
 #include "pipe.h"
 
 #include <errno.h>

diff --git a/lib/progname.c b/lib/progname.c
index 9d3b93d07a75d28879532da794dee08ee1d61f6f..78d40cb5581db6f262ec2c013ea47777b9ad438d 100644 (file)
--- a/lib/progname.c
+++ b/lib/progname.c
@@ -21,11 +21,12 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "progname.h"
+
 #include <stdio.h>
 #include <string.h>
 
-#include "progname.h"
-
 
 /* String containing name the program is called with.
    To be initialized by main().  */

diff --git a/lib/safe-read.c b/lib/safe-read.c
index d362e48b687a7396622f8c4af86c38ed992976f0..a8947af389cb9843d7c54220225f5087c86241b3 100644 (file)
--- a/lib/safe-read.c
+++ b/lib/safe-read.c
@@ -20,6 +20,9 @@
 # include <config.h>
 #endif
 
+/* Specification.  */
+#include "safe-read.h"
+
 #include <sys/types.h>
 
 #if HAVE_UNISTD_H
@@ -31,8 +34,6 @@
 extern int errno;
 #endif
 
-#include "safe-read.h"
-
 /* Read LEN bytes at PTR from descriptor DESC, retrying if interrupted.
    Return the actual number of bytes read, zero for EOF, or negative
    for an error.  */

diff --git a/lib/wait-process.c b/lib/wait-process.c
index 89399425aa2f6a4478c3889a0e7e35568b582534..2dd9422dca2b3f305823a68e84c69e831d59cb8d 100644 (file)
--- a/lib/wait-process.c
+++ b/lib/wait-process.c
@@ -21,6 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "wait-process.h"
+
 #include <errno.h>
 #include <stdlib.h>
 
@@ -71,7 +74,6 @@
 # endif
 #endif
 
-#include "wait-process.h"
 #include "error.h"
 #include "libgettext.h"
 

diff --git a/lib/wait-process.h b/lib/wait-process.h
index 23dd0ecf0e15f5fb0a64eb956c9b8918d302d88d..3d591a0cc61a7acc34a70fbefbcb353fa4254c10 100644 (file)
--- a/lib/wait-process.h
+++ b/lib/wait-process.h
@@ -19,6 +19,13 @@
 #ifndef _WAIT_PROCESS_H
 #define _WAIT_PROCESS_H
 
+/* Get pid_t.  */
+#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <sys/types.h>
+
 /* Wait for a subprocess to finish.  Exit if it didn't terminate
    correctly.  Otherwise return its exit code.  */
 extern int wait_subprocess PARAMS ((pid_t child, const char *progname));

diff --git a/lib/xerror.c b/lib/xerror.c
index 5b035cd96fecb3dd489964cc720d6ed76ecf4f65..41b858325ecb7d45c638501ca45da019ce667b28 100644 (file)
--- a/lib/xerror.c
+++ b/lib/xerror.c
@@ -21,11 +21,13 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "xerror.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "xerror.h"
 #include "error.h"
 #include "progname.h"
 #include "mbswidth.h"

diff --git a/src/ChangeLog b/src/ChangeLog
index 550a08b5b1f1bb466bb9e9ed282885ddbca3e212..1eced767c9b3d3120f21a9ef5522cd9feb6bcc5c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,24 @@
+2001-09-08  Bruno Haible  <haible@clisp.cons.org>
+
+       * dir-list.c: Include specification header before all other headers.
+       * file-list.c: Likewise.
+       * message.c: Likewise.
+       * msgl-cat.c: Likewise.
+       * msgl-charset.c: Likewise.
+       * msgl-iconv.c: Likewise.
+       * open-po.c: Likewise.
+       * po.c: Likewise.
+       * po-gram-gen.y: Likewise.
+       * po-hash-gen.y: Likewise.
+       * po-lex.c: Likewise.
+       * read-po.c: Likewise.
+       * str-list.c: Likewise.
+       * write-mo.c: Likewise.
+       * write-po.c: Likewise.
+       * msgfmt.h: Don't include message.h.
+       * open-po.h: Include <stdio.h>, for FILE.
+       * write-mo.h: Include message.h and <stddef.h>.
+
 2001-09-21  Tommy Johansson  <tommy.johansson@kanalen.org>
 
        * x-java.l (create_char_buf): Fix problem with empty messages.

diff --git a/src/dir-list.c b/src/dir-list.c
index f1e5fe49b0b2fae2fb7d298159f42719184af321..9761ffa2b687a4566c686896b6bc259ef8eec6b8 100644 (file)
--- a/src/dir-list.c
+++ b/src/dir-list.c
@@ -22,10 +22,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "config.h"
 #endif
 
+/* Specification.  */
+#include "dir-list.h"
+
 #include <stdlib.h>
 
 #include "system.h"
-#include "dir-list.h"
 #include "str-list.h"
 
 static string_list_ty *directory /* = NULL */;

diff --git a/src/file-list.c b/src/file-list.c
index 1cffa56557047c899dede056f8bf07a66c10de9e..e2da4612fe02d5edd889cae1090259dc0cfd1797 100644 (file)
--- a/src/file-list.c
+++ b/src/file-list.c
@@ -19,12 +19,14 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "file-list.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "file-list.h"
 #include "str-list.h"
 #include "error.h"
 #include "getline.h"

diff --git a/src/format.c b/src/format.c
index e7bc7b479bcbb1d2cf1998710ea0888147a7b5d1..38419d960dffda37d451de6c1d615d5fd2e92642 100644 (file)
--- a/src/format.c
+++ b/src/format.c
@@ -20,6 +20,7 @@
 # include <config.h>
 #endif
 
+/* Specification.  */
 #include "format.h"
 
 /* Table of all format string parsers.  */

diff --git a/src/message.c b/src/message.c
index 3857e36bfd7d76085e9eceefeaaeab9abbaa7352..cac5c6dd5c94e28781c3e54714b656d8cb5c1349 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -21,11 +21,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include <config.h>
 #endif
 
+/* Specification.  */
+#include "message.h"
+
 #include <stdlib.h>
 #include <string.h>
 
 #include "fstrcmp.h"
-#include "message.h"
 #include "system.h"
 
 

diff --git a/src/msgfmt.h b/src/msgfmt.h
index 758e96f82c6578dd024a4008ff554517f95cf691..4e01bd881499e71bec4aac86d8d8de2e375de61b 100644 (file)
--- a/src/msgfmt.h
+++ b/src/msgfmt.h
@@ -1,4 +1,4 @@
-/* msgfmt specific message representation
+/* msgfmt specifics
    Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
@@ -19,8 +19,6 @@
 #ifndef _MSGFMT_H
 #define _MSGFMT_H
 
-#include "message.h"
-
 /* Be more verbose.  Use only 'fprintf' and 'multiline_warning' but not
    'error' or 'multiline_error' to emit verbosity messages, because 'error'
    and 'multiline_error' during PO file parsing cause the program to exit

diff --git a/src/msgl-ascii.c b/src/msgl-ascii.c
index 3b528e7d4b8a6d12b7bbf2f1840c8ea5c2848bec..0fb6559055ff6bdc6ea929b4532ef802a32a00d2 100644 (file)
--- a/src/msgl-ascii.c
+++ b/src/msgl-ascii.c
@@ -21,7 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
 #include "msgl-ascii.h"
+
 #include "c-ctype.h"
 
 

diff --git a/src/msgl-cat.c b/src/msgl-cat.c
index a1ff339419e5e611e9bb52023c60cccee127dab1..8a5f0dd1154337d32ed3f70894fd25acf05840e9 100644 (file)
--- a/src/msgl-cat.c
+++ b/src/msgl-cat.c
@@ -21,9 +21,11 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "msgl-cat.h"
+
 #include <stdlib.h>
 
-#include "msgl-cat.h"
 #include "error.h"
 #include "xerror.h"
 #include "message.h"

diff --git a/src/msgl-charset.c b/src/msgl-charset.c
index f7db13cfe368b2f7be183d4b36667feefae89065..45f01b9f2789a0add4352213c856359b976e5f7a 100644 (file)
--- a/src/msgl-charset.c
+++ b/src/msgl-charset.c
@@ -21,11 +21,13 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "msgl-charset.h"
+
 #include <stdlib.h>
 #include <string.h>
 
 #include "po-charset.h"
-#include "msgl-charset.h"
 #include "error.h"
 #include "progname.h"
 #include "xerror.h"

diff --git a/src/msgl-iconv.c b/src/msgl-iconv.c
index 0faa1c2ab27cfb34cad21e3311506a5fc634a4d4..e34c32887b26a8ccf11baa54521e42f5dbb0d4bf 100644 (file)
--- a/src/msgl-iconv.c
+++ b/src/msgl-iconv.c
@@ -21,6 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "msgl-iconv.h"
+
 #include <errno.h>
 #include <stdlib.h>
 
@@ -28,7 +31,6 @@
 # include <iconv.h>
 #endif
 
-#include "msgl-iconv.h"
 #include "error.h"
 #include "progname.h"
 #include "message.h"

diff --git a/src/open-po.c b/src/open-po.c
index 4540f3df173bb1b19eaac30d08f3a122e142a1bf..f8ffb69142b2f43b37fef7431be31095f0d73f89 100644 (file)
--- a/src/open-po.c
+++ b/src/open-po.c
@@ -20,13 +20,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include <config.h>
 #endif
 
+/* Specification.  */
+#include "open-po.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "open-po.h"
 #include "dir-list.h"
 #include "error.h"
 #include "system.h"

diff --git a/src/open-po.h b/src/open-po.h
index 8ce0f8784b01c71b17e6d8757432d7974799de03..556168a0019feb13bbbd4aafb9efe8a01bb85391 100644 (file)
--- a/src/open-po.h
+++ b/src/open-po.h
@@ -18,6 +18,8 @@
 #ifndef _OPEN_PO_H
 #define _OPEN_PO_H
 
+#include <stdio.h>
+
 /* Open the input file with the name INPUT_NAME.  The ending .po is added
    if necessary.  If INPUT_NAME is not an absolute file name and the file is
    not found, the list of directories in "dir-list.h" is searched.  The

diff --git a/src/po-charset.c b/src/po-charset.c
index 44652263bffcd6469983a2e81b988d19f3d264cb..f4fd12fc6a48236d426bf1ddff700750bdf7d541 100644 (file)
--- a/src/po-charset.c
+++ b/src/po-charset.c
@@ -21,7 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
 #include "po-charset.h"
+
 #include "error.h"
 #include "xerror.h"
 #include "system.h"

diff --git a/src/po-gram-gen.y b/src/po-gram-gen.y
index 510cd37a354829b0cd42a40125aa507116c0ad12..da39d492ccb445be200f8061674905136e04f714 100644 (file)
--- a/src/po-gram-gen.y
+++ b/src/po-gram-gen.y
@@ -22,11 +22,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "po-gram.h"
+
 #include <stdio.h>
 
 #include "str-list.h"
 #include "po-lex.h"
-#include "po-gram.h"
 #include "error.h"
 #include "system.h"
 #include "libgettext.h"

diff --git a/src/po-hash-gen.y b/src/po-hash-gen.y
index 68ce63db3d34649e1a813e28f7e9371faf8bf7d5..7232ee7b9d063e58a788dd797b024e0d753d7274 100644 (file)
--- a/src/po-hash-gen.y
+++ b/src/po-hash-gen.y
@@ -23,10 +23,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "po-hash.h"
+
 #include <stdio.h>
 
-#include <system.h>
-#include "po-hash.h"
+#include "system.h"
 #include "po.h"
 
 /* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),

diff --git a/src/po-lex.c b/src/po-lex.c
index 6d456b0bd786354ab9d7d8e75cbaa838cf4cba8c..34127a41e11316b0fc53015c219987f6d2fa7994 100644 (file)
--- a/src/po-lex.c
+++ b/src/po-lex.c
@@ -23,6 +23,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "po-lex.h"
+
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
@@ -54,7 +57,6 @@
 
 #include "str-list.h"
 #include "po-charset.h"
-#include "po-lex.h"
 #include "system.h"
 #include "error.h"
 #include "open-po.h"

diff --git a/src/po.c b/src/po.c
index e4b966824a8c4b75a60cc1b3af16da51229bc236..951d72f3526129c007e95b5ca62f22d76e7ea720 100644 (file)
--- a/src/po.c
+++ b/src/po.c
@@ -22,9 +22,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "po.h"
+
 #include <stdlib.h>
 
-#include "po.h"
 #include "po-charset.h"
 #include "po-hash.h"
 #include "system.h"

diff --git a/src/read-mo.c b/src/read-mo.c
index 0d7bf1825ffc72050266d3abccb9de5d87fea373..b740479b958d85411f8b0eed61efc029c331eb8c 100644 (file)
--- a/src/read-mo.c
+++ b/src/read-mo.c
@@ -20,6 +20,7 @@
 # include <config.h>
 #endif
 
+/* Specification.  */
 #include "read-mo.h"
 
 #include <errno.h>

diff --git a/src/read-po.c b/src/read-po.c
index 47a305e019b88f727d94979c1a2c64314b5965a8..78d5a5bf87e9475b6e48314d5f1c48d8fed0a8a0 100644 (file)
--- a/src/read-po.c
+++ b/src/read-po.c
@@ -20,11 +20,13 @@
 # include <config.h>
 #endif
 
+/* Specification.  */
+#include "read-po.h"
+
 #include <stdlib.h>
 #include <string.h>
 
 #include "po.h"
-#include "read-po.h"
 #include "system.h"
 #include "libgettext.h"
 

diff --git a/src/str-list.c b/src/str-list.c
index a961ef3f18aa6bda790829510c0e20ecbfe578a8..4609434f734ea5ad535d5e2595127d18086acaca 100644 (file)
--- a/src/str-list.c
+++ b/src/str-list.c
@@ -21,10 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "str-list.h"
+
 #include <stdio.h>
 
 #include "system.h"
-#include "str-list.h"
 
 
 /* Initialize an empty list of strings.  */

diff --git a/src/write-mo.c b/src/write-mo.c
index fa1488c4b0235e0d80320240e32171d7c10f234d..c234e24dcbfc6dbd1d4a903b32b1bfa91ee2caed 100644 (file)
--- a/src/write-mo.c
+++ b/src/write-mo.c
@@ -20,6 +20,9 @@
 # include <config.h>
 #endif
 
+/* Specification.  */
+#include "write-mo.h"
+
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -27,7 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "write-mo.h"
 #include "msgfmt.h"
 
 /* These two include files describe the binary .mo format.  */

diff --git a/src/write-mo.h b/src/write-mo.h
index 2f9c7dbebb44382392956fe42de439b2776eb187..cbae7efb8d7926a618dc75ab31a9400722b19ee3 100644 (file)
--- a/src/write-mo.h
+++ b/src/write-mo.h
@@ -19,9 +19,10 @@
 #ifndef _WRITE_MO_H
 #define _WRITE_MO_H
 
+#include <stddef.h>
 #include <stdbool.h>
 
-#include "msgfmt.h"
+#include "message.h"
 
 /* Alignment of strings in resulting .mo file.  */
 extern size_t alignment;

diff --git a/src/write-po.c b/src/write-po.c
index e9c22800b6e88258a6754828d4b83e2c657418e8..c101827220fa2f0a61d6cadd775eea98c3897f70 100644 (file)
--- a/src/write-po.c
+++ b/src/write-po.c
@@ -21,6 +21,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include <config.h>
 #endif
 
+/* Specification.  */
+#include "write-po.h"
+
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
@@ -31,7 +34,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include <iconv.h>
 #endif
 
-#include "write-po.h"
 #include "c-ctype.h"
 #include "linebreak.h"
 #include "msgl-ascii.h"