Include specification .h file in implementation .c file.

23 files changed, 78 insertions, 20 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 550a08b..1eced76 100644
--- 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 f1e5fe4..9761ffa 100644
--- 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 1cffa56..e2da461 100644
--- 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 e7bc7b4..38419d9 100644
--- 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 3857e36..cac5c6d 100644
--- 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 758e96f..4e01bd8 100644
--- 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 3b528e7..0fb6559 100644
--- 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 a1ff339..8a5f0dd 100644
--- 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 f7db13c..45f01b9 100644
--- 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 0faa1c2..e34c328 100644
--- 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 4540f3d..f8ffb69 100644
--- 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 8ce0f87..556168a 100644
--- 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 4465226..f4fd12f 100644
--- 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 510cd37..da39d49 100644
--- 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 68ce63d..7232ee7 100644
--- 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 6d456b0..34127a4 100644
--- 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 e4b9668..951d72f 100644
--- 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 0d7bf18..b740479 100644
--- 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 47a305e..78d5a5b 100644
--- 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 a961ef3..4609434 100644
--- 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 fa1488c..c234e24 100644
--- 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 2f9c7db..cbae7ef 100644
--- 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 e9c2280..c101827 100644
--- 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"