diff --git a/src/geanyentryaction.h b/src/geanyentryaction.h
index ec6fcd51e..76b88f529 100644
--- a/src/geanyentryaction.h
+++ b/src/geanyentryaction.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef __GEANY_ENTRY_ACTION_H__
-#define __GEANY_ENTRY_ACTION_H__
+#ifndef GEANY_ENTRY_ACTION_H
+#define GEANY_ENTRY_ACTION_H
 
 G_BEGIN_DECLS
 
@@ -60,4 +60,4 @@ GtkWidget*	geany_entry_action_get_menu	(GeanyEntryAction *action);
 
 G_END_DECLS
 
-#endif /* __GEANY_ENTRY_ACTION_H__ */
+#endif /* GEANY_ENTRY_ACTION_H */
diff --git a/src/geanymenubuttonaction.h b/src/geanymenubuttonaction.h
index 56decca5c..dbb0ec9ba 100644
--- a/src/geanymenubuttonaction.h
+++ b/src/geanymenubuttonaction.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef __GEANY_MENU_BUTTON_ACTION_H__
-#define __GEANY_MENU_BUTTON_ACTION_H__
+#ifndef GEANY_MENU_BUTTON_ACTION_H
+#define GEANY_MENU_BUTTON_ACTION_H
 
 G_BEGIN_DECLS
 
@@ -63,4 +63,4 @@ void		geany_menu_button_action_set_menu	(GeanyMenubuttonAction *action, GtkWidge
 
 G_END_DECLS
 
-#endif /* __GEANY_MENU_BUTTON_ACTION_H__ */
+#endif /* GEANY_MENU_BUTTON_ACTION_H */
diff --git a/src/geanyobject.h b/src/geanyobject.h
index 9190f62dc..3957b5571 100644
--- a/src/geanyobject.h
+++ b/src/geanyobject.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef __GEANYOBJECT_H__
-#define __GEANYOBJECT_H__
+#ifndef GEANYOBJECT_H
+#define GEANYOBJECT_H
 
 #include <glib-object.h>
 
@@ -105,4 +105,4 @@ GObject*	geany_object_new		(void);
 
 G_END_DECLS
 
-#endif /* __GEANYOBJECT_H__ */
+#endif /* GEANYOBJECT_H */
diff --git a/src/geanywraplabel.h b/src/geanywraplabel.h
index f799da146..e37c5b58c 100644
--- a/src/geanywraplabel.h
+++ b/src/geanywraplabel.h
@@ -19,8 +19,8 @@
  *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __GEANY_WRAP_LABEL_H__
-#define __GEANY_WRAP_LABEL_H__
+#ifndef GEANY_WRAP_LABEL_H
+#define GEANY_WRAP_LABEL_H
 
 G_BEGIN_DECLS
 
@@ -45,4 +45,4 @@ GtkWidget*		geany_wrap_label_new				(const gchar *text);
 
 G_END_DECLS
 
-#endif /* __GEANY_WRAP_LABEL_H__ */
+#endif /* GEANY_WRAP_LABEL_H */