diff --git a/libasn1fix/asn1fix_bitstring.h b/libasn1fix/asn1fix_bitstring.h
index 1230856..79b3d00 100644
--- a/libasn1fix/asn1fix_bitstring.h
+++ b/libasn1fix/asn1fix_bitstring.h
@@ -1,6 +1,6 @@
-#ifndef	_ASN1FIX_BIT_STRING_H_
-#define	_ASN1FIX_BIT_STRING_H_
+#ifndef	ASN1FIX_BIT_STRING_H
+#define	ASN1FIX_BIT_STRING_H
 
 int asn1f_fix_bit_string(arg_t *);
 
-#endif	/* _ASN1FIX_BIT_STRING_H_ */
+#endif	/* ASN1FIX_BIT_STRING_H */
diff --git a/libasn1fix/asn1fix_class.h b/libasn1fix/asn1fix_class.h
index b704ff8..2120bc8 100644
--- a/libasn1fix/asn1fix_class.h
+++ b/libasn1fix/asn1fix_class.h
@@ -1,9 +1,9 @@
-#ifndef	_ASN1FIX_CLASS_H_
-#define	_ASN1FIX_CLASS_H_
+#ifndef	ASN1FIX_CLASS_H
+#define	ASN1FIX_CLASS_H
 
 /*
  * Fetch the element from the class-related stuff (thing) by its reference.
  */
 asn1p_expr_t *asn1f_class_access(arg_t *, asn1p_module_t *mod, asn1p_expr_t *rhs_pspecs, asn1p_ref_t *);
 
-#endif	/* _ASN1FIX_CLASS_H_ */
+#endif	/* ASN1FIX_CLASS_H */
diff --git a/libasn1fix/asn1fix_compat.h b/libasn1fix/asn1fix_compat.h
index 429e7dd..b147a1b 100644
--- a/libasn1fix/asn1fix_compat.h
+++ b/libasn1fix/asn1fix_compat.h
@@ -1,5 +1,5 @@
-#ifndef	_ASN1FIX_COMPAT_H_
-#define	_ASN1FIX_COMPAT_H_
+#ifndef	ASN1FIX_COMPAT_H
+#define	ASN1FIX_COMPAT_H
 
 /*
  * Check that the expressions given are compatible in their type.
@@ -11,4 +11,4 @@
 	asn1p_expr_t *a,
 	asn1p_expr_t *b);
 
-#endif	/* _ASN1FIX_COMPAT_H_ */
+#endif	/* ASN1FIX_COMPAT_H */
diff --git a/libasn1fix/asn1fix_constr.h b/libasn1fix/asn1fix_constr.h
index ffed143..5d9c4f9 100644
--- a/libasn1fix/asn1fix_constr.h
+++ b/libasn1fix/asn1fix_constr.h
@@ -1,5 +1,5 @@
-#ifndef	_ASN1FIX_CONSTRUCTED_H_
-#define	_ASN1FIX_CONSTRUCTED_H_
+#ifndef	ASN1FIX_CONSTRUCTED_H
+#define	ASN1FIX_CONSTRUCTED_H
 
 /*
  * Pull in COMPONENTS OF.
@@ -26,4 +26,4 @@
  */
 int asn1f_fix_constr_autotag(arg_t *);
 
-#endif	/* _ASN1FIX_CONSTRUCTED_H_ */
+#endif	/* ASN1FIX_CONSTRUCTED_H */
diff --git a/libasn1fix/asn1fix_constraint.h b/libasn1fix/asn1fix_constraint.h
index 9e692ef..a027513 100644
--- a/libasn1fix/asn1fix_constraint.h
+++ b/libasn1fix/asn1fix_constraint.h
@@ -1,5 +1,5 @@
-#ifndef	_ASN1FIX_CONSTRAINT_H_
-#define	_ASN1FIX_CONSTRAINT_H_
+#ifndef	ASN1FIX_CONSTRAINT_H
+#define	ASN1FIX_CONSTRAINT_H
 
 /*
  * Resolve referenced values inside constraints.
@@ -16,4 +16,4 @@
  */
 int asn1constraint_pullup(arg_t *arg);
 
-#endif	/* _ASN1FIX_CONSTRAINT_H_ */
+#endif	/* ASN1FIX_CONSTRAINT_H */
diff --git a/libasn1fix/asn1fix_cstring.h b/libasn1fix/asn1fix_cstring.h
index bd647ab..9804d21 100644
--- a/libasn1fix/asn1fix_cstring.h
+++ b/libasn1fix/asn1fix_cstring.h
@@ -1,6 +1,6 @@
-#ifndef	_ASN1FIX_CSTRING_H_
-#define	_ASN1FIX_CSTRING_H_
+#ifndef	ASN1FIX_CSTRING_H
+#define	ASN1FIX_CSTRING_H
 
 int asn1f_fix_cstring(arg_t *);
 
-#endif	/* _ASN1FIX_CSTRING_H_ */
+#endif	/* ASN1FIX_CSTRING_H */
diff --git a/libasn1fix/asn1fix_cws.h b/libasn1fix/asn1fix_cws.h
index aa76b49..3d24f16 100644
--- a/libasn1fix/asn1fix_cws.h
+++ b/libasn1fix/asn1fix_cws.h
@@ -1,9 +1,9 @@
-#ifndef	_ASN1FIX_CLASS_WITH_SYNTAX_H_
-#define	_ASN1FIX_CLASS_WITH_SYNTAX_H_
+#ifndef	ASN1FIX_CLASS_WITH_SYNTAX_H
+#define	ASN1FIX_CLASS_WITH_SYNTAX_H
 
 /*
  * Parse class objects
  */
 int asn1f_parse_class_object(arg_t *arg);
 
-#endif	/* _ASN1FIX_CLASS_WITH_SYNTAX_H_ */
+#endif	/* ASN1FIX_CLASS_WITH_SYNTAX_H */
diff --git a/libasn1fix/asn1fix_dereft.h b/libasn1fix/asn1fix_dereft.h
index bee8151..36f3f2e 100644
--- a/libasn1fix/asn1fix_dereft.h
+++ b/libasn1fix/asn1fix_dereft.h
@@ -1,6 +1,6 @@
-#ifndef	_ASN1FIX_DEREFT_H_
-#define	_ASN1FIX_DEREFT_H_
+#ifndef	ASN1FIX_DEREFT_H
+#define	ASN1FIX_DEREFT_H
 
 int asn1f_fix_dereference_types(arg_t *);
 
-#endif	/* _ASN1FIX_DEREFT_H_ */
+#endif	/* ASN1FIX_DEREFT_H */
diff --git a/libasn1fix/asn1fix_derefv.h b/libasn1fix/asn1fix_derefv.h
index 3964f53..2e69317 100644
--- a/libasn1fix/asn1fix_derefv.h
+++ b/libasn1fix/asn1fix_derefv.h
@@ -1,8 +1,8 @@
-#ifndef	_ASN1FIX_DEREFV_H_
-#define	_ASN1FIX_DEREFV_H_
+#ifndef	ASN1FIX_DEREFV_H
+#define	ASN1FIX_DEREFV_H
 
 int asn1f_fix_dereference_values(arg_t *);
 
 int asn1f_fix_dereference_defaults(arg_t *);
 
-#endif	/* _ASN1FIX_DEREFV_H_ */
+#endif	/* ASN1FIX_DEREFV_H */
diff --git a/libasn1fix/asn1fix_enum.h b/libasn1fix/asn1fix_enum.h
index 14c6fb5..7c2a9db 100644
--- a/libasn1fix/asn1fix_enum.h
+++ b/libasn1fix/asn1fix_enum.h
@@ -1,6 +1,6 @@
-#ifndef	_ASN1FIX_ENUM_H_
-#define	_ASN1FIX_ENUM_H_
+#ifndef	ASN1FIX_ENUM_H
+#define	ASN1FIX_ENUM_H
 
 int asn1f_fix_enum(arg_t *);	/* Enumeration ::= ENUMERATED { a(1), b(2) } */
 
-#endif	/* _ASN1FIX_ENUM_H_ */
+#endif	/* ASN1FIX_ENUM_H */
diff --git a/libasn1fix/asn1fix_export.h b/libasn1fix/asn1fix_export.h
index 606ddf8..be06623 100644
--- a/libasn1fix/asn1fix_export.h
+++ b/libasn1fix/asn1fix_export.h
@@ -2,8 +2,8 @@
  * This header exports fixer procedures that are common enough to be used
  * in other modules.
  */
-#ifndef	_ASN1FIX_EXPORT_H_
-#define	_ASN1FIX_EXPORT_H_
+#ifndef	ASN1FIX_EXPORT_H
+#define	ASN1FIX_EXPORT_H
 
 #include "asn1fix_tags.h"
 
@@ -38,4 +38,4 @@
 int asn1f_fix_dereference_values_ex(asn1p_t *asn, asn1p_module_t *mod,
 	asn1p_expr_t *expr);
 
-#endif	/* _ASN1FIX_EXPORT_H_ */
+#endif	/* ASN1FIX_EXPORT_H */
diff --git a/libasn1fix/asn1fix_integer.h b/libasn1fix/asn1fix_integer.h
index d306fc0..cd40d6c 100644
--- a/libasn1fix/asn1fix_integer.h
+++ b/libasn1fix/asn1fix_integer.h
@@ -1,6 +1,6 @@
-#ifndef	_ASN1FIX_INTEGER_H_
-#define	_ASN1FIX_INTEGER_H_
+#ifndef	ASN1FIX_INTEGER_H
+#define	ASN1FIX_INTEGER_H
 
 int asn1f_fix_integer(arg_t *);		/* Type1 ::= INTEGER { a(1), b(2) } */
 
-#endif	/* _ASN1FIX_INTEGER_H_ */
+#endif	/* ASN1FIX_INTEGER_H */
diff --git a/libasn1fix/asn1fix_internal.h b/libasn1fix/asn1fix_internal.h
index cfd9cec..e212359 100644
--- a/libasn1fix/asn1fix_internal.h
+++ b/libasn1fix/asn1fix_internal.h
@@ -1,5 +1,5 @@
-#ifndef	_ASN1FIX_INTERNAL_H_
-#define	_ASN1FIX_INTERNAL_H_
+#ifndef	ASN1FIX_INTERNAL_H
+#define	ASN1FIX_INTERNAL_H
 
 #ifdef	HAVE_CONFIG_H
 #include <config.h>
@@ -135,4 +135,4 @@
 #endif
 
 
-#endif	/* _ASN1FIX_INTERNAL_H_ */
+#endif	/* ASN1FIX_INTERNAL_H */
diff --git a/libasn1fix/asn1fix_misc.h b/libasn1fix/asn1fix_misc.h
index 6dcd220..0114d49 100644
--- a/libasn1fix/asn1fix_misc.h
+++ b/libasn1fix/asn1fix_misc.h
@@ -1,8 +1,8 @@
 /*
  * Miscellaneous functions necessary for several other modules.
  */
-#ifndef	_ASN1FIX_MISC_H_
-#define	_ASN1FIX_MISC_H_
+#ifndef	ASN1FIX_MISC_H
+#define	ASN1FIX_MISC_H
 
 /*
  * Recursively invoke a given function over the given expr and all its
@@ -35,4 +35,4 @@
  */
 int asn1f_check_known_external_type(const char *);
 
-#endif	/* _ASN1FIX_MISC_H_ */
+#endif	/* ASN1FIX_MISC_H */
diff --git a/libasn1fix/asn1fix_param.h b/libasn1fix/asn1fix_param.h
index 5940b0e..6bf5f42 100644
--- a/libasn1fix/asn1fix_param.h
+++ b/libasn1fix/asn1fix_param.h
@@ -1,6 +1,6 @@
-#ifndef	_ASN1FIX_PARAMETERIZATION_H_
-#define	_ASN1FIX_PARAMETERIZATION_H_
+#ifndef	ASN1FIX_PARAMETERIZATION_H
+#define	ASN1FIX_PARAMETERIZATION_H
 
 asn1p_expr_t *asn1f_parameterization_fork(arg_t *arg, asn1p_expr_t *expr, asn1p_expr_t *rhs_pspecs);
 
-#endif	/* _ASN1FIX_PARAMETERIZATION_H_ */
+#endif	/* ASN1FIX_PARAMETERIZATION_H */
diff --git a/libasn1fix/asn1fix_retrieve.h b/libasn1fix/asn1fix_retrieve.h
index 2aeb82b..5323904 100644
--- a/libasn1fix/asn1fix_retrieve.h
+++ b/libasn1fix/asn1fix_retrieve.h
@@ -1,8 +1,8 @@
 /*
  * Miscellaneous functions necessary for several other modules.
  */
-#ifndef	_ASN1FIX_RETRIEVE_H_
-#define	_ASN1FIX_RETRIEVE_H_
+#ifndef	ASN1FIX_RETRIEVE_H
+#define	ASN1FIX_RETRIEVE_H
 
 /*
  * Simple search for the label in the descendants of the given node.
@@ -68,4 +68,4 @@
  */
 asn1p_expr_t *asn1f_find_terminal_value(arg_t *arg, asn1p_expr_t *tc);
 
-#endif	/* _ASN1FIX_RETRIEVE_H_ */
+#endif	/* ASN1FIX_RETRIEVE_H */
diff --git a/libasn1fix/asn1fix_tags.h b/libasn1fix/asn1fix_tags.h
index 0fbbefe..3eb9062 100644
--- a/libasn1fix/asn1fix_tags.h
+++ b/libasn1fix/asn1fix_tags.h
@@ -1,5 +1,5 @@
-#ifndef	_ASN1FIX_TAGS_H_
-#define	_ASN1FIX_TAGS_H_
+#ifndef	ASN1FIX_TAGS_H
+#define	ASN1FIX_TAGS_H
 
 enum asn1f_aft_flags_e {
 	AFT_IMAGINARY_ANY	= 0x01,	/* Treat ANY tag as [IMAGINARY ANY] */
@@ -27,4 +27,4 @@
  */
 int asn1f_fetch_outmost_tag(asn1p_t *asn, asn1p_module_t *mod, asn1p_expr_t *expr, struct asn1p_type_tag_s *tag, enum asn1f_aft_flags_e);
 
-#endif	/* _ASN1FIX_TAGS_H_ */
+#endif	/* ASN1FIX_TAGS_H */
diff --git a/libasn1fix/asn1fix_value.h b/libasn1fix/asn1fix_value.h
index 067894a..00415a9 100644
--- a/libasn1fix/asn1fix_value.h
+++ b/libasn1fix/asn1fix_value.h
@@ -1,8 +1,8 @@
 /*
  * Functions related with processing values.
  */
-#ifndef	_ASN1FIX_VALUE_H_
-#define	_ASN1FIX_VALUE_H_
+#ifndef	ASN1FIX_VALUE_H
+#define	ASN1FIX_VALUE_H
 
 /*
  * Resolve the value given by reference.
@@ -26,4 +26,4 @@
 int asn1f_look_value_in_type(arg_t *arg,
 		asn1p_expr_t *type_expr, asn1p_expr_t *value_expr);
 
-#endif	/* _ASN1FIX_VALUE_H_ */
+#endif	/* ASN1FIX_VALUE_H */