Standardize header guards.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42615 138bc75d-0d04-0410-961f-82ee72b054a4

38 files changed, 122 insertions, 111 deletions

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 210229cd885..95942e7070a 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,13 @@
+2001-05-25  Sam TH  <sam@uchicago.edu>
+
+	* bad.h: Fix header include guards.
+	* bit.h bld.h com.h data.h equiv.h expr.h global.h
+	implic.h info.h intrin.h lab.h lex.h malloc.h name.h
+	proj.h src.h st.h sta.h stb.h stc.h std.h ste.h
+	storag.h stp.h str.h sts.h stt.h stu.h stv.h stw.h
+	symbol.h target.h top.h type.h version.h 
+	where.h: Likewise.
+
 2001-05-22  Toon Moene  <toon@moene.indiv.nluug.nl>
 
 	* g77.texi: Update last-changed date.
diff --git a/gcc/f/bad.h b/gcc/f/bad.h
index 734022370cd..8589943cc46 100644
--- a/gcc/f/bad.h
+++ b/gcc/f/bad.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_bad
-#define _H_f_bad
+#ifndef GCC_F_BAD_H
+#define GCC_F_BAD_H
 
 /* Simple definitions and enumerations. */
 
@@ -105,4 +105,4 @@ void ffebad_string (const char *string);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_BAD_H */
diff --git a/gcc/f/bit.h b/gcc/f/bit.h
index a2acc25a9e9..6b559efe668 100644
--- a/gcc/f/bit.h
+++ b/gcc/f/bit.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_bit
-#define _H_f_bit
+#ifndef GCC_F_BIT_H
+#define GCC_F_BIT_H
 
 /* Simple definitions and enumerations. */
 
@@ -81,4 +81,4 @@ void ffebit_test (ffebit b, ffebitCount offset, bool *value, ffebitCount *length
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_BIT_H */
diff --git a/gcc/f/bld.h b/gcc/f/bld.h
index ddbd44841e7..3347b1cd92f 100644
--- a/gcc/f/bld.h
+++ b/gcc/f/bld.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_bld
-#define _H_f_bld
+#ifndef GCC_F_BLD_H
+#define GCC_F_BLD_H
 
 /* Simple definitions and enumerations. */
 
@@ -1036,4 +1036,4 @@ ffetargetCharacterSize ffebld_size_max (ffebld b);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_BLD_H */
diff --git a/gcc/f/com.h b/gcc/f/com.h
index 07abfb06d06..a0d08b1736a 100644
--- a/gcc/f/com.h
+++ b/gcc/f/com.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_com
-#define _H_f_com
+#ifndef GCC_F_COM_H
+#define GCC_F_COM_H
 
 /* Simple definitions and enumerations. */
 
@@ -347,4 +347,4 @@ tree ffecom_which_entrypoint_decl (void);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_COM_H */
diff --git a/gcc/f/data.h b/gcc/f/data.h
index 666612e3964..a99369d0b04 100644
--- a/gcc/f/data.h
+++ b/gcc/f/data.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_data
-#define _H_f_data
+#ifndef GCC_F_DATA_H
+#define GCC_F_DATA_H
 
 /* Simple definitions and enumerations. */
 
@@ -71,4 +71,4 @@ bool ffedata_value (ffetargetIntegerDefault rpt, ffebld value,
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_DATA_H */
diff --git a/gcc/f/equiv.h b/gcc/f/equiv.h
index 0a0ce92f423..f3d2c858d43 100644
--- a/gcc/f/equiv.h
+++ b/gcc/f/equiv.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_equiv
-#define _H_f_equiv
+#ifndef GCC_F_EQUIV_H
+#define GCC_F_EQUIV_H
 
 /* Simple definitions and enumerations. */
 
@@ -100,4 +100,4 @@ void ffeequiv_update_save (ffeequiv eq);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_EQUIV_H */
diff --git a/gcc/f/expr.h b/gcc/f/expr.h
index 3f781f91904..b82173bbf0e 100644
--- a/gcc/f/expr.h
+++ b/gcc/f/expr.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_expr
-#define _H_f_expr
+#ifndef GCC_F_EXPR_H
+#define GCC_F_EXPR_H
 
 /* Simple definitions and enumerations. */
 
@@ -191,4 +191,4 @@ void ffeexpr_type_combine (ffeinfoBasictype *nbt, ffeinfoKindtype *nkt,
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_EXPR_H */
diff --git a/gcc/f/global.h b/gcc/f/global.h
index eaf99214b8c..5ab67417bb1 100644
--- a/gcc/f/global.h
+++ b/gcc/f/global.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_global
-#define _H_f_global
+#ifndef GCC_F_GLOBAL_H
+#define GCC_F_GLOBAL_H
 
 /* Simple definitions and enumerations. */
 
@@ -197,4 +197,5 @@ void ffeglobal_terminate_1 (void);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_GLOBAL_H */
+ 
diff --git a/gcc/f/implic.h b/gcc/f/implic.h
index ae966538491..44fbfac4e4f 100644
--- a/gcc/f/implic.h
+++ b/gcc/f/implic.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_implic
-#define _H_f_implic
+#ifndef GCC_F_IMPLIC_H
+#define GCC_F_IMPLIC_H
 
 /* Simple definitions and enumerations. */
 
@@ -71,4 +71,4 @@ void ffeimplic_terminate_2 (void);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_IMPLIC_H */
diff --git a/gcc/f/info.h b/gcc/f/info.h
index bbf4e94930d..69defd27ab6 100644
--- a/gcc/f/info.h
+++ b/gcc/f/info.h
@@ -29,8 +29,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_info
-#define _H_f_info
+#ifndef GCC_F_INFO_H
+#define GCC_F_INFO_H
 
 /* Simple definitions and enumerations. */
 
@@ -183,4 +183,4 @@ ffetype ffeinfo_type (ffeinfoBasictype basictype, ffeinfoKindtype kindtype);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_INFO_H */
diff --git a/gcc/f/intrin.h b/gcc/f/intrin.h
index d6cca3b9f79..76b59dca3fb 100644
--- a/gcc/f/intrin.h
+++ b/gcc/f/intrin.h
@@ -21,8 +21,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 */
 
-#ifndef _H_f_intrin
-#define _H_f_intrin
+#ifndef GCC_F_INTRIN_H
+#define GCC_F_INTRIN_H
 
 #ifndef FFEINTRIN_DOC
 #define FFEINTRIN_DOC 0	/* 1 means intrinsic documentation only (intdoc.c). */
@@ -134,4 +134,4 @@ ffeIntrinsicState ffeintrin_state_family (ffeintrinFamily family);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_INTRIN_H */
diff --git a/gcc/f/lab.h b/gcc/f/lab.h
index 09f1291ed5e..fba3808ec8e 100644
--- a/gcc/f/lab.h
+++ b/gcc/f/lab.h
@@ -29,8 +29,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_lab
-#define _H_f_lab
+#ifndef GCC_F_LAB_H
+#define GCC_F_LAB_H
 
 /* Simple definitions and enumerations. */
 
@@ -151,4 +151,4 @@ ffelab ffelab_new (ffelabValue v);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_LAB_H */
diff --git a/gcc/f/lex.h b/gcc/f/lex.h
index c82a9c86b94..a28d0ac1691 100644
--- a/gcc/f/lex.h
+++ b/gcc/f/lex.h
@@ -29,8 +29,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_lex
-#define _H_f_lex
+#ifndef GCC_F_LEX_H
+#define GCC_F_LEX_H
 
 /* Simple definitions and enumerations. */
 
@@ -198,4 +198,4 @@ ffelexToken ffelex_token_use (ffelexToken t);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_LEX_H */
diff --git a/gcc/f/malloc.h b/gcc/f/malloc.h
index d9efdf281da..1c827209f2c 100644
--- a/gcc/f/malloc.h
+++ b/gcc/f/malloc.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_malloc
-#define _H_f_malloc
+#ifndef GCC_F_MALLOC_H
+#define GCC_F_MALLOC_H
 
 #ifndef MALLOC_DEBUG
 #define MALLOC_DEBUG 0	/* 1 means check caller's use of this module. */
@@ -180,4 +180,4 @@ void malloc_verify_inpool_ (mallocPool pool, mallocType_ type, void *ptr,
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_MALLOC_H */
diff --git a/gcc/f/name.h b/gcc/f/name.h
index 6c3499f07e0..4b18805d3d0 100644
--- a/gcc/f/name.h
+++ b/gcc/f/name.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_name
-#define _H_f_name
+#ifndef GCC_F_NAME_H
+#define GCC_F_NAME_H
 
 /* Simple definitions and enumerations. */
 
@@ -106,4 +106,4 @@ ffenameSpace ffename_space_new (mallocPool pool);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_NAME_H */
diff --git a/gcc/f/proj.h b/gcc/f/proj.h
index 4e6a06e5592..fd4a65cc59f 100644
--- a/gcc/f/proj.h
+++ b/gcc/f/proj.h
@@ -21,8 +21,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 */
 
-#ifndef _H_f_proj
-#define _H_f_proj
+#ifndef GCC_F_PROJ_H
+#define GCC_F_PROJ_H
 
 #ifdef USE_HCONFIG
 #include "hconfig.h"
@@ -47,4 +47,4 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #define dmpout stderr
 #endif
 
-#endif
+#endif /* ! GCC_F_PROJ_H */
diff --git a/gcc/f/src.h b/gcc/f/src.h
index 666bd853056..ce5843eaa0e 100644
--- a/gcc/f/src.h
+++ b/gcc/f/src.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_src
-#define _H_f_src
+#ifndef GCC_F_SRC_H
+#define GCC_F_SRC_H
 
 #include "bad.h"
 #include "top.h"
@@ -137,4 +137,4 @@ int ffesrc_strncmp_2c (ffeCase mcase, const char *var, const char *str_uc,
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_SRC_H */
diff --git a/gcc/f/st.h b/gcc/f/st.h
index cfcc7bee6a9..65b99f9bbfe 100644
--- a/gcc/f/st.h
+++ b/gcc/f/st.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_st
-#define _H_f_st
+#ifndef GCC_F_ST_H
+#define GCC_F_ST_H
 
 /* Simple definitions and enumerations. */
 
@@ -78,4 +78,4 @@ void ffest_terminate_4 (void);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_ST_H */
diff --git a/gcc/f/sta.h b/gcc/f/sta.h
index 64e16079815..cf417771557 100644
--- a/gcc/f/sta.h
+++ b/gcc/f/sta.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_sta
-#define _H_f_sta
+#ifndef GCC_F_STA_H
+#define GCC_F_STA_H
 
 /* Simple definitions and enumerations. */
 
@@ -114,4 +114,4 @@ void ffesta_set_outpooldisp (ffestaPooldisp d);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_STA_H */
diff --git a/gcc/f/stb.h b/gcc/f/stb.h
index 6ee761d588c..a9b3acc586c 100644
--- a/gcc/f/stb.h
+++ b/gcc/f/stb.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_stb
-#define _H_f_stb
+#ifndef GCC_F_STB_H
+#define GCC_F_STB_H
 
 /* Simple definitions and enumerations. */
 
@@ -250,4 +250,4 @@ ffelexHandler ffestb_V027 (ffelexToken t);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_STB_H */
diff --git a/gcc/f/stc.h b/gcc/f/stc.h
index 12b4783f442..8b2f7c3aafe 100644
--- a/gcc/f/stc.h
+++ b/gcc/f/stc.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_stc
-#define _H_f_stc
+#ifndef GCC_F_STC_H
+#define GCC_F_STC_H
 
 /* Simple definitions and enumerations. */
 
@@ -357,4 +357,4 @@ void ffestc_any (void);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_STC_H */
diff --git a/gcc/f/std.h b/gcc/f/std.h
index bfad671bb25..ea8292cc8dc 100644
--- a/gcc/f/std.h
+++ b/gcc/f/std.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_std
-#define _H_f_std
+#ifndef GCC_F_STD_H
+#define GCC_F_STD_H
 
 /* Simple definitions and enumerations. */
 
@@ -295,4 +295,4 @@ void ffestd_any (void);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_STD_H */
diff --git a/gcc/f/ste.h b/gcc/f/ste.h
index 78e98818b09..a4473578e41 100644
--- a/gcc/f/ste.h
+++ b/gcc/f/ste.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_ste
-#define _H_f_ste
+#ifndef GCC_F_STE_H
+#define GCC_F_STE_H
 
 /* Simple definitions and enumerations. */
 
@@ -169,4 +169,4 @@ void ffeste_terminate_2 (void);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_STE_H */
diff --git a/gcc/f/storag.h b/gcc/f/storag.h
index bc5c9e6ad14..e4aa4046db7 100644
--- a/gcc/f/storag.h
+++ b/gcc/f/storag.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_storag
-#define _H_f_storag
+#ifndef GCC_F_STORAG_H
+#define GCC_F_STORAG_H
 
 /* Simple definitions and enumerations. */
 
@@ -164,4 +164,4 @@ void ffestorag_update_save (ffestorag s);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_STORAG_H */
diff --git a/gcc/f/stp.h b/gcc/f/stp.h
index d995cf0079e..eca8d0d563d 100644
--- a/gcc/f/stp.h
+++ b/gcc/f/stp.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_stp
-#define _H_f_stp
+#ifndef GCC_F_STP_H
+#define GCC_F_STP_H
 
 /* Simple definitions and enumerations. */
 
@@ -505,4 +505,4 @@ extern union _ffestp_fileu_ ffestp_file;
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_STP_H */
diff --git a/gcc/f/str.h b/gcc/f/str.h
index 1ed1228e35d..543eeeb7c90 100644
--- a/gcc/f/str.h
+++ b/gcc/f/str.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_str
-#define _H_f_str
+#ifndef GCC_F_STR_H
+#define GCC_F_STR_H
 
 /* Simple definitions and enumerations. */
 
@@ -82,4 +82,4 @@ ffestrSecond ffestr_second (ffelexToken t);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_STR_H */
diff --git a/gcc/f/sts.h b/gcc/f/sts.h
index e1448cdc5fb..3ca494d81de 100644
--- a/gcc/f/sts.h
+++ b/gcc/f/sts.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_sts
-#define _H_f_sts
+#ifndef GCC_F_STS_H
+#define GCC_F_STS_H
 
 /* Simple definitions and enumerations. */
 
@@ -82,4 +82,4 @@ void ffests_puttext (ffests s, const char *text, ffestsLength length);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_STS_H */
diff --git a/gcc/f/stt.h b/gcc/f/stt.h
index 341daa7a41d..e56e843fe30 100644
--- a/gcc/f/stt.h
+++ b/gcc/f/stt.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_stt
-#define _H_f_stt
+#ifndef GCC_F_STT_H
+#define GCC_F_STT_H
 
 /* Simple definitions and enumerations. */
 
@@ -227,4 +227,4 @@ void ffestt_tokenlist_kill (ffesttTokenList list);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_STT_H */
diff --git a/gcc/f/stu.h b/gcc/f/stu.h
index b9d9d521f34..e01b741b389 100644
--- a/gcc/f/stu.h
+++ b/gcc/f/stu.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_stu
-#define _H_f_stu
+#ifndef GCC_F_STU_H
+#define GCC_F_STU_H
 
 /* Simple definitions and enumerations. */
 
@@ -66,4 +66,4 @@ ffesymbol ffestu_sym_exec_transition (ffesymbol s);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_STU_H */
diff --git a/gcc/f/stv.h b/gcc/f/stv.h
index 22b177e027a..a3f959f4608 100644
--- a/gcc/f/stv.h
+++ b/gcc/f/stv.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_stv
-#define _H_f_stv
+#ifndef GCC_F_STV_H
+#define GCC_F_STV_H
 
 /* Simple definitions and enumerations. */
 
@@ -162,4 +162,4 @@ extern ffelabNumber ffestv_num_label_defines_;
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_STV_H */
diff --git a/gcc/f/stw.h b/gcc/f/stw.h
index 554d047e611..826e941e447 100644
--- a/gcc/f/stw.h
+++ b/gcc/f/stw.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_stw
-#define _H_f_stw
+#ifndef GCC_F_STW_H
+#define GCC_F_STW_H
 
 /* Simple definitions and enumerations. */
 
@@ -184,4 +184,4 @@ ffestw ffestw_use (ffestw block);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_STW_H */
diff --git a/gcc/f/symbol.h b/gcc/f/symbol.h
index 0c7262cd0a6..cc8b1c0eb2d 100644
--- a/gcc/f/symbol.h
+++ b/gcc/f/symbol.h
@@ -19,8 +19,8 @@ along with GNU Fortran; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
-#ifndef _H_f_symbol
-#define _H_f_symbol
+#ifndef GCC_F_SYMBOL_H
+#define GCC_F_SYMBOL_H
 
 /* The main symbol type.  */
 
@@ -293,4 +293,4 @@ void ffesymbol_update_save (ffesymbol s);
 #define ffesymbol_where_line(s) (((s)->name == NULL) ? ffewhere_line_unknown() \
       : ffename_where_line((s)->name))
 
-#endif
+#endif /* ! GCC_F_SYMBOL_H */
diff --git a/gcc/f/target.h b/gcc/f/target.h
index 7eab1067ca7..5ce663d5a34 100644
--- a/gcc/f/target.h
+++ b/gcc/f/target.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_target
-#define _H_f_target
+#ifndef GCC_F_TARGET_H
+#define GCC_F_TARGET_H
 
 #ifdef FFE_STANDALONE
 #define HOST_WIDE_INT long
@@ -1892,4 +1892,4 @@ void *ffetarget_memcpy_ (void *dst, void *src, size_t len);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_TARGET_H */
diff --git a/gcc/f/top.h b/gcc/f/top.h
index e15449751b9..eb820fe9dbf 100644
--- a/gcc/f/top.h
+++ b/gcc/f/top.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_parse
-#define _H_f_parse
+#ifndef GCC_F_TOP_H
+#define GCC_F_TOP_H
 
 /* Simple definitions and enumerations. */
 
@@ -261,4 +261,4 @@ void ffe_terminate_4 (void);
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_TOP_H */
diff --git a/gcc/f/type.h b/gcc/f/type.h
index aaae51e6565..9e3bd801e19 100644
--- a/gcc/f/type.h
+++ b/gcc/f/type.h
@@ -19,8 +19,8 @@ along with GNU Fortran; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
-#ifndef _H_f_type
-#define _H_f_type
+#ifndef GCC_F_TYPE_H
+#define GCC_F_TYPE_H
 
 typedef struct _ffetype_ *ffetype;
 typedef struct _ffetype_indexes_ *ffetype_indexes_;
@@ -61,4 +61,4 @@ void ffetype_set_star (ffetype base_type, int star, ffetype type);
 #define ffetype_terminate_3()
 #define ffetype_terminate_4()
 
-#endif
+#endif /* ! GCC_F_TYPE_H */
diff --git a/gcc/f/version.h b/gcc/f/version.h
index 62f941d25d3..c612071ddbe 100644
--- a/gcc/f/version.h
+++ b/gcc/f/version.h
@@ -1,6 +1,6 @@
-#ifndef _H_f_version
-#define _H_f_version
+#ifndef GCC_F_VERSION_H
+#define GCC_F_VERSION_H
 
 extern const char *ffe_version_string;
 
-#endif
+#endif /* ! GCC_F_VERSION_H */
diff --git a/gcc/f/where.h b/gcc/f/where.h
index a6a3e1c15f7..a3adb4bda6b 100644
--- a/gcc/f/where.h
+++ b/gcc/f/where.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* Allow multiple inclusion to work. */
 
-#ifndef _H_f_where
-#define _H_f_where
+#ifndef GCC_F_WHERE_H
+#define GCC_F_WHERE_H
 
 /* Simple definitions and enumerations. */
 
@@ -135,4 +135,4 @@ void ffewhere_track_kill (ffewhereLine wrl, ffewhereColumn wrc, ffewhereTrack wt
 
 /* End of #include file. */
 
-#endif
+#endif /* ! GCC_F_EHERE_H */