Header guards: Remove leading underscores (and trailing underscores).

Names with leading underscores are reserved in C++.

33 files changed, 98 insertions, 98 deletions

diff --git a/sigc++/adaptors/adaptor_base.h b/sigc++/adaptors/adaptor_base.h
index 8902f26..4f864a4 100644
--- a/sigc++/adaptors/adaptor_base.h
+++ b/sigc++/adaptors/adaptor_base.h
@@ -1,5 +1,5 @@
-#ifndef _SIGC_ADAPTORS_DEDUCE_RESULT_TYPE_H_
-#define _SIGC_ADAPTORS_DEDUCE_RESULT_TYPE_H_
+#ifndef SIGC_ADAPTORS_DEDUCE_RESULT_TYPE_H
+#define SIGC_ADAPTORS_DEDUCE_RESULT_TYPE_H
 
 namespace sigc
 {
@@ -21,4 +21,4 @@ struct adaptor_base
 };
 
 } /* namespace sigc */
-#endif /* _SIGC_ADAPTORS_DEDUCE_RESULT_TYPE_H_ */
+#endif /* SIGC_ADAPTORS_DEDUCE_RESULT_TYPE_H */
diff --git a/sigc++/adaptors/adaptor_trait.h b/sigc++/adaptors/adaptor_trait.h
index 120d371..8fa0885 100644
--- a/sigc++/adaptors/adaptor_trait.h
+++ b/sigc++/adaptors/adaptor_trait.h
@@ -1,5 +1,5 @@
-#ifndef _SIGC_ADAPTORS_ADAPTOR_TRAIT_H_
-#define _SIGC_ADAPTORS_ADAPTOR_TRAIT_H_
+#ifndef SIGC_ADAPTORS_ADAPTOR_TRAIT_H
+#define SIGC_ADAPTORS_ADAPTOR_TRAIT_H
 #include <sigc++config.h> //To get SIGC_TEMPLATE_KEYWORD_OPERATOR_OVERLOAD
 #include <sigc++/visit_each.h>
 #include <sigc++/functors/functor_trait.h>
@@ -160,4 +160,4 @@ public:
 };
 
 } /* namespace sigc */
-#endif /* _SIGC_ADAPTORS_ADAPTOR_TRAIT_H_ */
+#endif /* SIGC_ADAPTORS_ADAPTOR_TRAIT_H */
diff --git a/sigc++/adaptors/adaptors.h b/sigc++/adaptors/adaptors.h
index 2353890..3abb41c 100644
--- a/sigc++/adaptors/adaptors.h
+++ b/sigc++/adaptors/adaptors.h
@@ -17,8 +17,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#ifndef _SIGC_ADAPTOR_HPP_
-#define _SIGC_ADAPTOR_HPP_
+#ifndef SIGC_ADAPTOR_HPP
+#define SIGC_ADAPTOR_HPP
 
 #include <sigc++/adaptors/bind.h>
 #include <sigc++/adaptors/bind_return.h>
@@ -29,4 +29,4 @@
 #include <sigc++/adaptors/exception_catch.h>
 #include <sigc++/adaptors/track_obj.h>
 
-#endif /* _SIGC_ADAPTOR_HPP_ */
+#endif /* SIGC_ADAPTOR_HPP */
diff --git a/sigc++/adaptors/adapts.h b/sigc++/adaptors/adapts.h
index 46e40ea..7cb26f5 100644
--- a/sigc++/adaptors/adapts.h
+++ b/sigc++/adaptors/adapts.h
@@ -1,5 +1,5 @@
-#ifndef _SIGC_ADAPTORS_ADAPTS_H_
-#define _SIGC_ADAPTORS_ADAPTS_H_
+#ifndef SIGC_ADAPTORS_ADAPTS_H
+#define SIGC_ADAPTORS_ADAPTS_H
 #include <sigc++config.h> //To get SIGC_TEMPLATE_KEYWORD_OPERATOR_OVERLOAD
 #include <sigc++/visit_each.h>
 #include <sigc++/functors/functor_trait.h>
@@ -89,4 +89,4 @@ public:
 };
 
 } /* namespace sigc */
-#endif /* _SIGC_ADAPTORS_ADAPTS_H_ */
+#endif /* SIGC_ADAPTORS_ADAPTS_H */
diff --git a/sigc++/adaptors/bind.h b/sigc++/adaptors/bind.h
index d0e1f6a..623af7f 100644
--- a/sigc++/adaptors/bind.h
+++ b/sigc++/adaptors/bind.h
@@ -1,5 +1,5 @@
-#ifndef _SIGC_ADAPTORS_BIND_H_
-#define _SIGC_ADAPTORS_BIND_H_
+#ifndef SIGC_ADAPTORS_BIND_H
+#define SIGC_ADAPTORS_BIND_H
 #include <sigc++/adaptors/adapts.h>
 #include <sigc++/adaptors/bound_argument.h>
 #include <sigc++/adaptors/tuple_visitor_visit_each.h>
@@ -284,4 +284,4 @@ bind(const T_functor& _A_func, T_type... _A_b)
 
 } /* namespace sigc */
 
-#endif /* _SIGC_ADAPTORS_BIND_H_ */
+#endif /* SIGC_ADAPTORS_BIND_H */
diff --git a/sigc++/adaptors/bind_return.h b/sigc++/adaptors/bind_return.h
index b0a5a05..cbe432c 100644
--- a/sigc++/adaptors/bind_return.h
+++ b/sigc++/adaptors/bind_return.h
@@ -1,5 +1,5 @@
-#ifndef _SIGC_ADAPTORS_BIND_RETURN_H_
-#define _SIGC_ADAPTORS_BIND_RETURN_H_
+#ifndef SIGC_ADAPTORS_BIND_RETURN_H
+#define SIGC_ADAPTORS_BIND_RETURN_H
 #include <sigc++/adaptors/adapts.h>
 #include <sigc++/adaptors/bound_argument.h>
 
@@ -95,4 +95,4 @@ bind_return(const T_functor& _A_functor, T_return _A_ret_value)
 }
 
 } /* namespace sigc */
-#endif /* _SIGC_ADAPTORS_BIND_RETURN_H_ */
+#endif /* SIGC_ADAPTORS_BIND_RETURN_H */
diff --git a/sigc++/adaptors/bound_argument.h b/sigc++/adaptors/bound_argument.h
index f37f936..a14a35e 100644
--- a/sigc++/adaptors/bound_argument.h
+++ b/sigc++/adaptors/bound_argument.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#ifndef _SIGC_BOUND_ARGUMENT_H_
-#define _SIGC_BOUND_ARGUMENT_H_
+#ifndef SIGC_BOUND_ARGUMENT_H
+#define SIGC_BOUND_ARGUMENT_H
 
 #include <sigc++/limit_reference.h>
 #include <sigc++/reference_wrapper.h>
@@ -158,4 +158,4 @@ struct visitor<bound_argument<T_type>>
 
 } /* namespace sigc */
 
-#endif /* _SIGC_BOUND_ARGUMENT_H_ */
+#endif /* SIGC_BOUND_ARGUMENT_H */
diff --git a/sigc++/adaptors/compose.h b/sigc++/adaptors/compose.h
index 0940c21..8339b2a 100644
--- a/sigc++/adaptors/compose.h
+++ b/sigc++/adaptors/compose.h
@@ -1,5 +1,5 @@
-#ifndef _SIGC_ADAPTORS_COMPOSE_H_
-#define _SIGC_ADAPTORS_COMPOSE_H_
+#ifndef SIGC_ADAPTORS_COMPOSE_H
+#define SIGC_ADAPTORS_COMPOSE_H
 #include <sigc++/adaptors/adapts.h>
 
 namespace sigc
@@ -177,4 +177,4 @@ compose(const T_setter& _A_setter, const T_getter1& _A_getter1, const T_getter2&
 }
 
 } /* namespace sigc */
-#endif /* _SIGC_ADAPTORS_COMPOSE_H_ */
+#endif /* SIGC_ADAPTORS_COMPOSE_H */
diff --git a/sigc++/adaptors/exception_catch.h b/sigc++/adaptors/exception_catch.h
index 06a4558..6812615 100644
--- a/sigc++/adaptors/exception_catch.h
+++ b/sigc++/adaptors/exception_catch.h
@@ -1,5 +1,5 @@
-#ifndef _SIGC_ADAPTORS_EXCEPTION_CATCH_H_
-#define _SIGC_ADAPTORS_EXCEPTION_CATCH_H_
+#ifndef SIGC_ADAPTORS_EXCEPTION_CATCH_H
+#define SIGC_ADAPTORS_EXCEPTION_CATCH_H
 #include <sigc++/adaptors/adapts.h>
 
 namespace sigc
@@ -114,4 +114,4 @@ exception_catch(const T_functor& _A_func, const T_catcher& _A_catcher)
 }
 
 } /* namespace sigc */
-#endif /* _SIGC_ADAPTORS_EXCEPTION_CATCH_H_ */
+#endif /* SIGC_ADAPTORS_EXCEPTION_CATCH_H */
diff --git a/sigc++/adaptors/hide.h b/sigc++/adaptors/hide.h
index 43d914f..ef0149f 100644
--- a/sigc++/adaptors/hide.h
+++ b/sigc++/adaptors/hide.h
@@ -1,5 +1,5 @@
-#ifndef _SIGC_ADAPTORS_HIDE_H_
-#define _SIGC_ADAPTORS_HIDE_H_
+#ifndef SIGC_ADAPTORS_HIDE_H
+#define SIGC_ADAPTORS_HIDE_H
 
 #include <sigc++/adaptors/adapts.h>
 #include <sigc++/tuple-utils/tuple_end.h>
@@ -163,4 +163,4 @@ hide(const T_functor& _A_func)
 
 } /* namespace sigc */
 
-#endif /* _SIGC_ADAPTORS_HIDE_H_ */
+#endif /* SIGC_ADAPTORS_HIDE_H */
diff --git a/sigc++/adaptors/retype.h b/sigc++/adaptors/retype.h
index 660232d..cac00d3 100644
--- a/sigc++/adaptors/retype.h
+++ b/sigc++/adaptors/retype.h
@@ -1,5 +1,5 @@
-#ifndef _SIGC_ADAPTORS_RETYPE_H_
-#define _SIGC_ADAPTORS_RETYPE_H_
+#ifndef SIGC_ADAPTORS_RETYPE_H
+#define SIGC_ADAPTORS_RETYPE_H
 
 #include <sigc++/adaptors/adapts.h>
 #include <sigc++/functors/ptr_fun.h>
@@ -131,4 +131,4 @@ retype(const T_functor<T_return(T_arg...)>& _A_functor)
 
 } /* namespace sigc */
 
-#endif /* _SIGC_ADAPTORS_RETYPE_H_ */
+#endif /* SIGC_ADAPTORS_RETYPE_H */
diff --git a/sigc++/adaptors/retype_return.h b/sigc++/adaptors/retype_return.h
index 314fbb6..7749abb 100644
--- a/sigc++/adaptors/retype_return.h
+++ b/sigc++/adaptors/retype_return.h
@@ -1,5 +1,5 @@
-#ifndef _SIGC_ADAPTORS_RETYPE_RETURN_H_
-#define _SIGC_ADAPTORS_RETYPE_RETURN_H_
+#ifndef SIGC_ADAPTORS_RETYPE_RETURN_H
+#define SIGC_ADAPTORS_RETYPE_RETURN_H
 #include <sigc++/adaptors/adapts.h>
 
 namespace sigc
@@ -129,4 +129,4 @@ hide_return(const T_functor& _A_functor)
 }
 
 } /* namespace sigc */
-#endif /* _SIGC_ADAPTORS_RETYPE_RETURN_H_ */
+#endif /* SIGC_ADAPTORS_RETYPE_RETURN_H */
diff --git a/sigc++/adaptors/track_obj.h b/sigc++/adaptors/track_obj.h
index f1b2f71..730133c 100644
--- a/sigc++/adaptors/track_obj.h
+++ b/sigc++/adaptors/track_obj.h
@@ -1,5 +1,5 @@
-#ifndef _SIGC_ADAPTORS_TRACK_OBJ_H_
-#define _SIGC_ADAPTORS_TRACK_OBJ_H_
+#ifndef SIGC_ADAPTORS_TRACK_OBJ_H
+#define SIGC_ADAPTORS_TRACK_OBJ_H
 
 #include <sigc++/adaptors/adapts.h>
 #include <sigc++/adaptors/tuple_visitor_visit_each.h>
@@ -131,4 +131,4 @@ track_obj(const T_functor& _A_func, const T_obj&... _A_obj)
 
 } /* namespace sigc */
 
-#endif /* _SIGC_ADAPTORS_TRACK_OBJ_H_ */
+#endif /* SIGC_ADAPTORS_TRACK_OBJ_H */
diff --git a/sigc++/adaptors/tuple_visitor_visit_each.h b/sigc++/adaptors/tuple_visitor_visit_each.h
index b556a6a..e13ae1c 100644
--- a/sigc++/adaptors/tuple_visitor_visit_each.h
+++ b/sigc++/adaptors/tuple_visitor_visit_each.h
@@ -1,5 +1,5 @@
-#ifndef _SIGC_TUPLE_VISITOR_VISIT_EACH_H_
-#define _SIGC_TUPLE_VISITOR_VISIT_EACH_H_
+#ifndef SIGC_TUPLE_VISITOR_VISIT_EACH_H
+#define SIGC_TUPLE_VISITOR_VISIT_EACH_H
 
 #include <tuple>
 
@@ -25,4 +25,4 @@ struct TupleVisitorVisitEach
 
 } // namespace sigc
 
-#endif /* _SIGC_TUPLE_VISITOR_VISIT_EACH_H_ */
+#endif /* SIGC_TUPLE_VISITOR_VISIT_EACH_H */
diff --git a/sigc++/bind.h b/sigc++/bind.h
index 4741377..9972678 100644
--- a/sigc++/bind.h
+++ b/sigc++/bind.h
@@ -16,9 +16,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#ifndef _SIGC_BIND_HPP_
-#define _SIGC_BIND_HPP_
+#ifndef SIGC_BIND_HPP
+#define SIGC_BIND_HPP
 
 #include <sigc++/adaptors/bind.h>
 
-#endif /* _SIGC_BIND_HPP_ */
+#endif /* SIGC_BIND_HPP */
diff --git a/sigc++/bind_return.h b/sigc++/bind_return.h
index 97873da..ee9ccdb 100644
--- a/sigc++/bind_return.h
+++ b/sigc++/bind_return.h
@@ -16,9 +16,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#ifndef _SIGC_BIND_RETURN_HPP_
-#define _SIGC_BIND_RETURN_HPP_
+#ifndef SIGC_BIND_RETURN_HPP
+#define SIGC_BIND_RETURN_HPP
 
 #include <sigc++/adaptors/bind_return.h>
 
-#endif /* _SIGC_BIND_RETURN_HPP_ */
+#endif /* SIGC_BIND_RETURN_HPP */
diff --git a/sigc++/connection.h b/sigc++/connection.h
index 058d0d5..6b99b0c 100644
--- a/sigc++/connection.h
+++ b/sigc++/connection.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#ifndef _SIGC_CONNECTION_HPP_
-#define _SIGC_CONNECTION_HPP_
+#ifndef SIGC_CONNECTION_HPP
+#define SIGC_CONNECTION_HPP
 #include <sigc++config.h>
 #include <sigc++/signal.h>
 
@@ -132,4 +132,4 @@ private:
 
 } /* namespace sigc */
 
-#endif /* _SIGC_TRACKABLE_HPP_ */
+#endif /* SIGC_TRACKABLE_HPP */
diff --git a/sigc++/functors/functor_trait.h b/sigc++/functors/functor_trait.h
index bc1696b..07fa347 100644
--- a/sigc++/functors/functor_trait.h
+++ b/sigc++/functors/functor_trait.h
@@ -1,5 +1,5 @@
-#ifndef _SIGC_FUNCTORS_FUNCTOR_TRAIT_H_
-#define _SIGC_FUNCTORS_FUNCTOR_TRAIT_H_
+#ifndef SIGC_FUNCTORS_FUNCTOR_TRAIT_H
+#define SIGC_FUNCTORS_FUNCTOR_TRAIT_H
 #include <sigc++/functors/mem_fun.h>
 #include <sigc++/functors/ptr_fun.h>
 #include <sigc++/type_traits.h>
@@ -69,4 +69,4 @@ struct functor_trait<T_return (T_obj::*)(T_arg...) const>
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 } /* namespace sigc */
-#endif /* _SIGC_FUNCTORS_FUNCTOR_TRAIT_H_ */
+#endif /* SIGC_FUNCTORS_FUNCTOR_TRAIT_H */
diff --git a/sigc++/functors/functors.h b/sigc++/functors/functors.h
index 3a9619c..c3f3a8b 100644
--- a/sigc++/functors/functors.h
+++ b/sigc++/functors/functors.h
@@ -17,11 +17,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#ifndef _SIGC_FUNCTOR_HPP_
-#define _SIGC_FUNCTOR_HPP_
+#ifndef SIGC_FUNCTOR_HPP
+#define SIGC_FUNCTOR_HPP
 
 #include <sigc++/functors/slot.h>
 #include <sigc++/functors/ptr_fun.h>
 #include <sigc++/functors/mem_fun.h>
 
-#endif /* _SIGC_FUNCTOR_HPP_ */
+#endif /* SIGC_FUNCTOR_HPP */
diff --git a/sigc++/functors/mem_fun.h b/sigc++/functors/mem_fun.h
index a85be06..eeb8493 100644
--- a/sigc++/functors/mem_fun.h
+++ b/sigc++/functors/mem_fun.h
@@ -1,5 +1,5 @@
-#ifndef _SIGC_FUNCTORS_MEM_FUN_H_
-#define _SIGC_FUNCTORS_MEM_FUN_H_
+#ifndef SIGC_FUNCTORS_MEM_FUN_H
+#define SIGC_FUNCTORS_MEM_FUN_H
 #include <sigc++/type_traits.h>
 #include <sigc++/limit_reference.h>
 #include <sigc++/member_method_trait.h>
@@ -276,4 +276,4 @@ mem_fun(/*const*/ T_obj& _A_obj, T_return (T_obj2::*_A_func)(T_arg...) const vol
 }
 
 } /* namespace sigc */
-#endif /* _SIGC_FUNCTORS_MEM_FUN_H_ */
+#endif /* SIGC_FUNCTORS_MEM_FUN_H */
diff --git a/sigc++/functors/ptr_fun.h b/sigc++/functors/ptr_fun.h
index 36b2203..faec0ca 100644
--- a/sigc++/functors/ptr_fun.h
+++ b/sigc++/functors/ptr_fun.h
@@ -1,5 +1,5 @@
-#ifndef _SIGC_FUNCTORS_PTR_FUN_H_
-#define _SIGC_FUNCTORS_PTR_FUN_H_
+#ifndef SIGC_FUNCTORS_PTR_FUN_H
+#define SIGC_FUNCTORS_PTR_FUN_H
 #include <sigc++/type_traits.h>
 
 namespace sigc
@@ -91,4 +91,4 @@ inline decltype(auto) ptr_fun(T_return (*_A_func)(T_args...))
 }
 
 } /* namespace sigc */
-#endif /* _SIGC_FUNCTORS_PTR_FUN_H_ */
+#endif /* SIGC_FUNCTORS_PTR_FUN_H */
diff --git a/sigc++/functors/slot.h b/sigc++/functors/slot.h
index 59dc3c6..b9de448 100644
--- a/sigc++/functors/slot.h
+++ b/sigc++/functors/slot.h
@@ -1,5 +1,5 @@
-#ifndef _SIGC_FUNCTORS_SLOT_H_
-#define _SIGC_FUNCTORS_SLOT_H_
+#ifndef SIGC_FUNCTORS_SLOT_H
+#define SIGC_FUNCTORS_SLOT_H
 
 #include <sigc++/trackable.h>
 #include <sigc++/visit_each.h>
@@ -270,4 +270,4 @@ struct visitor<slot<T_return, T_arg...>>
 
 } /* namespace sigc */
 
-#endif /* _SIGC_FUNCTORS_SLOT_H_ */
+#endif /* SIGC_FUNCTORS_SLOT_H */
diff --git a/sigc++/functors/slot_base.h b/sigc++/functors/slot_base.h
index 7ad2d51..d0f8c7d 100644
--- a/sigc++/functors/slot_base.h
+++ b/sigc++/functors/slot_base.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#ifndef _SIGC_SLOT_BASE_HPP_
-#define _SIGC_SLOT_BASE_HPP_
+#ifndef SIGC_SLOT_BASE_HPP
+#define SIGC_SLOT_BASE_HPP
 
 #include <sigc++config.h>
 #include <sigc++/trackable.h>
@@ -397,4 +397,4 @@ private:
 
 } // namespace sigc
 
-#endif //_SIGC_SLOT_BASE_HPP_
+#endif //SIGC_SLOT_BASE_HPP
diff --git a/sigc++/limit_reference.h b/sigc++/limit_reference.h
index ce094a1..d581b84 100644
--- a/sigc++/limit_reference.h
+++ b/sigc++/limit_reference.h
@@ -1,5 +1,5 @@
-#ifndef _SIGC_LIMIT_REFERENCE_H_
-#define _SIGC_LIMIT_REFERENCE_H_
+#ifndef SIGC_LIMIT_REFERENCE_H
+#define SIGC_LIMIT_REFERENCE_H
 
 #include <sigc++/visit_each.h>
 #include <sigc++/type_traits.h>
@@ -121,4 +121,4 @@ struct visitor<limit_reference<T_type>>
 
 } /* namespace sigc */
 
-#endif /* _SIGC_LIMIT_REFERENCE_H_ */
+#endif /* SIGC_LIMIT_REFERENCE_H */
diff --git a/sigc++/member_method_trait.h b/sigc++/member_method_trait.h
index a8a1458..a23b454 100644
--- a/sigc++/member_method_trait.h
+++ b/sigc++/member_method_trait.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#ifndef _SIGC_MEMBER_METHOD_TRAITS_H_
-#define _SIGC_MEMBER_METHOD_TRAITS_H_
+#ifndef SIGC_MEMBER_METHOD_TRAITS_H
+#define SIGC_MEMBER_METHOD_TRAITS_H
 
 #include <sigc++config.h>
 
@@ -147,4 +147,4 @@ struct member_method_result<T_result (T_obj::*)(T_arg...) const volatile>
 
 } // namespace sigc
 
-#endif /* _SIGC_MEMBER_METHOD_TRAITS_H_ */
+#endif /* SIGC_MEMBER_METHOD_TRAITS_H */
diff --git a/sigc++/reference_wrapper.h b/sigc++/reference_wrapper.h
index 41f3661..e929c3b 100644
--- a/sigc++/reference_wrapper.h
+++ b/sigc++/reference_wrapper.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#ifndef _SIGC_REFERENCE_WRAPPER_H_
-#define _SIGC_REFERENCE_WRAPPER_H_
+#ifndef SIGC_REFERENCE_WRAPPER_H
+#define SIGC_REFERENCE_WRAPPER_H
 
 namespace sigc
 {
@@ -56,4 +56,4 @@ unwrap(const std::reference_wrapper<const T_type>& v)
 
 } /* namespace sigc */
 
-#endif /* _SIGC_REFERENCE_WRAPPER_H_ */
+#endif /* SIGC_REFERENCE_WRAPPER_H */
diff --git a/sigc++/retype_return.h b/sigc++/retype_return.h
index 8f0837b..89eddaf 100644
--- a/sigc++/retype_return.h
+++ b/sigc++/retype_return.h
@@ -16,9 +16,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#ifndef _SIGC_RETYPE_RETURN_HPP_
-#define _SIGC_RETYPE_RETURN_HPP_
+#ifndef SIGC_RETYPE_RETURN_HPP
+#define SIGC_RETYPE_RETURN_HPP
 
 #include <sigc++/adaptors/retype_return.h>
 
-#endif /* _SIGC_RETYPE_RETURN_HPP_ */
+#endif /* SIGC_RETYPE_RETURN_HPP */
diff --git a/sigc++/signal.h b/sigc++/signal.h
index 70e89ae..70fe47e 100644
--- a/sigc++/signal.h
+++ b/sigc++/signal.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _SIGC_SIGNAL_H_
-#define _SIGC_SIGNAL_H_
+#ifndef SIGC_SIGNAL_H
+#define SIGC_SIGNAL_H
 
 #include <list>
 #include <sigc++/signal_base.h>
@@ -1114,4 +1114,4 @@ public:
 
 } /* namespace sigc */
 
-#endif /* _SIGC_SIGNAL_H_ */
+#endif /* SIGC_SIGNAL_H */
diff --git a/sigc++/signal_base.h b/sigc++/signal_base.h
index d393a5b..8df9dc4 100644
--- a/sigc++/signal_base.h
+++ b/sigc++/signal_base.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#ifndef _SIGC_SIGNAL_BASE_H_
-#define _SIGC_SIGNAL_BASE_H_
+#ifndef SIGC_SIGNAL_BASE_H
+#define SIGC_SIGNAL_BASE_H
 
 #include <cstddef>
 #include <list>
@@ -393,4 +393,4 @@ protected:
 
 } // namespace sigc
 
-#endif /* _SIGC_SIGNAL_BASE_H_ */
+#endif /* SIGC_SIGNAL_BASE_H */
diff --git a/sigc++/slot.h b/sigc++/slot.h
index 2490f12..5bb6832 100644
--- a/sigc++/slot.h
+++ b/sigc++/slot.h
@@ -13,8 +13,8 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef _SIGC_SLOT_H_
-#define _SIGC_SLOT_H_
+#ifndef SIGC_SLOT_H
+#define SIGC_SLOT_H
 
 #include <sigc++/functors/slot.h>
-#endif /* _SIGC_SLOT_H_ */
+#endif /* SIGC_SLOT_H */
diff --git a/sigc++/trackable.h b/sigc++/trackable.h
index c5490bb..fcb5b38 100644
--- a/sigc++/trackable.h
+++ b/sigc++/trackable.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#ifndef _SIGC_TRACKABLE_HPP_
-#define _SIGC_TRACKABLE_HPP_
+#ifndef SIGC_TRACKABLE_HPP
+#define SIGC_TRACKABLE_HPP
 #include <list>
 #include <sigc++config.h>
 
@@ -166,4 +166,4 @@ private:
 
 } /* namespace sigc */
 
-#endif /* _SIGC_TRACKABLE_HPP_ */
+#endif /* SIGC_TRACKABLE_HPP */
diff --git a/sigc++/type_traits.h b/sigc++/type_traits.h
index 79bd868..78f63f2 100644
--- a/sigc++/type_traits.h
+++ b/sigc++/type_traits.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#ifndef _SIGC_TYPE_TRAIT_H_
-#define _SIGC_TYPE_TRAIT_H_
+#ifndef SIGC_TYPE_TRAIT_H
+#define SIGC_TYPE_TRAIT_H
 
 #include <sigc++config.h>
 
@@ -67,4 +67,4 @@ using type_trait_take_t = typename type_trait<T>::take;
 
 } /* namespace sigc */
 
-#endif /* _SIGC_TYPE_TRAIT_H_ */
+#endif /* SIGC_TYPE_TRAIT_H */
diff --git a/sigc++/visit_each.h b/sigc++/visit_each.h
index ea863a9..cffd703 100644
--- a/sigc++/visit_each.h
+++ b/sigc++/visit_each.h
@@ -15,8 +15,8 @@
  *  License along with this library; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-#ifndef _SIGC_VISIT_EACH_HPP_
-#define _SIGC_VISIT_EACH_HPP_
+#ifndef SIGC_VISIT_EACH_HPP
+#define SIGC_VISIT_EACH_HPP
 
 #include <sigc++/type_traits.h>
 #include <type_traits>