[gedit] Do not prefix macro names with underscores

From: Sébastien Wilmet <swilmet src gnome org>
To: commits-list gnome org
Cc:
Subject: [gedit] Do not prefix macro names with underscores
Date: Thu, 28 Apr 2016 16:37:09 +0000 (UTC)
commit 061b82bcee2b3e215f142752896dca30506cfdf1
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Apr 28 18:27:55 2016 +0200

    Do not prefix macro names with underscores
    
    Symbols (even preprocessor macro names) that begin with an underscore are
    reserved for the use of the compiler.

 gedit/gedit-app-activatable.h                      |    6 +++---
 gedit/gedit-app-osx.h                              |    6 +++---
 gedit/gedit-app-private.h                          |    6 +++---
 gedit/gedit-app-win32.h                            |    6 +++---
 gedit/gedit-app-x11.h                              |    6 +++---
 gedit/gedit-app.h                                  |    6 +++---
 gedit/gedit-close-confirmation-dialog.h            |    6 +++---
 gedit/gedit-commands-private.h                     |    6 +++---
 gedit/gedit-commands.h                             |    6 +++---
 gedit/gedit-debug.h                                |    6 +++---
 gedit/gedit-dirs.h                                 |    6 +++---
 gedit/gedit-document-private.h                     |    6 +++---
 gedit/gedit-document.h                             |    6 +++---
 gedit/gedit-documents-panel.h                      |    6 +++---
 gedit/gedit-encoding-items.h                       |    6 +++---
 gedit/gedit-encodings-combo-box.h                  |    6 +++---
 gedit/gedit-encodings-dialog.h                     |    6 +++---
 gedit/gedit-enum-types.h.template                  |    6 +++---
 gedit/gedit-file-chooser-dialog-gtk.h              |    6 +++---
 gedit/gedit-file-chooser-dialog-osx.h              |    6 +++---
 gedit/gedit-file-chooser-dialog.h                  |    6 +++---
 gedit/gedit-highlight-mode-dialog.h                |    6 +++---
 gedit/gedit-highlight-mode-selector.h              |    6 +++---
 gedit/gedit-history-entry.h                        |    6 +++---
 gedit/gedit-io-error-info-bar.h                    |    6 +++---
 gedit/gedit-menu-extension.h                       |    6 +++---
 gedit/gedit-menu-stack-switcher.h                  |    6 +++---
 gedit/gedit-message-bus.h                          |    6 +++---
 gedit/gedit-message.h                              |    6 +++---
 gedit/gedit-metadata-manager.h                     |    6 +++---
 gedit/gedit-multi-notebook.h                       |    6 +++---
 gedit/gedit-notebook-popup-menu.h                  |    6 +++---
 gedit/gedit-notebook-stack-switcher.h              |    6 +++---
 gedit/gedit-open-document-selector-helper.h        |    6 +++---
 gedit/gedit-open-document-selector-store.h         |    6 +++---
 gedit/gedit-open-document-selector.h               |    6 +++---
 gedit/gedit-plugins-engine.h                       |    6 +++---
 gedit/gedit-preferences-dialog.h                   |    6 +++---
 gedit/gedit-print-job.h                            |    6 +++---
 gedit/gedit-print-preview.h                        |    6 +++---
 gedit/gedit-progress-info-bar.h                    |    6 +++---
 gedit/gedit-recent.h                               |    6 +++---
 gedit/gedit-replace-dialog.h                       |    6 +++---
 gedit/gedit-settings.h                             |    6 +++---
 gedit/gedit-status-menu-button.h                   |    6 +++---
 gedit/gedit-tab-label.h                            |    6 +++---
 gedit/gedit-tab-private.h                          |    6 +++---
 gedit/gedit-tab.h                                  |    6 +++---
 gedit/gedit-utils.h                                |    6 +++---
 gedit/gedit-view-activatable.h                     |    6 +++---
 gedit/gedit-view-centering.h                       |    6 +++---
 gedit/gedit-view-frame.h                           |    6 +++---
 gedit/gedit-view.h                                 |    6 +++---
 gedit/gedit-window-activatable.h                   |    6 +++---
 gedit/gedit-window-private.h                       |    6 +++---
 gedit/gedit-window.h                               |    6 +++---
 plugins/checkupdate/gedit-check-update-plugin.h    |    6 +++---
 plugins/docinfo/gedit-docinfo-plugin.h             |    6 +++---
 plugins/filebrowser/gedit-file-bookmarks-store.h   |    6 +++---
 plugins/filebrowser/gedit-file-browser-error.h     |    6 +++---
 plugins/filebrowser/gedit-file-browser-messages.h  |    6 +++---
 plugins/filebrowser/gedit-file-browser-plugin.h    |    6 +++---
 plugins/filebrowser/gedit-file-browser-store.h     |    6 +++---
 plugins/filebrowser/gedit-file-browser-utils.h     |    6 +++---
 plugins/filebrowser/gedit-file-browser-view.h      |    6 +++---
 plugins/filebrowser/gedit-file-browser-widget.h    |    6 +++---
 .../gedit-file-browser-message-activation.h        |    6 +++---
 .../gedit-file-browser-message-add-filter.h        |    6 +++---
 ...edit-file-browser-message-extend-context-menu.h |    6 +++---
 .../messages/gedit-file-browser-message-get-root.h |    6 +++---
 .../messages/gedit-file-browser-message-get-view.h |    6 +++---
 .../gedit-file-browser-message-id-location.h       |    6 +++---
 .../messages/gedit-file-browser-message-id.h       |    6 +++---
 .../gedit-file-browser-message-set-emblem.h        |    6 +++---
 .../gedit-file-browser-message-set-markup.h        |    6 +++---
 .../messages/gedit-file-browser-message-set-root.h |    6 +++---
 plugins/filebrowser/messages/messages.h            |    6 +++---
 plugins/modelines/gedit-modeline-plugin.h          |    6 +++---
 plugins/modelines/modeline-parser.h                |    6 +++---
 plugins/sort/gedit-sort-plugin.h                   |    6 +++---
 plugins/spell/gedit-spell-app-activatable.h        |    6 +++---
 plugins/spell/gedit-spell-plugin.h                 |    6 +++---
 plugins/time/gedit-time-plugin.h                   |    6 +++---
 83 files changed, 249 insertions(+), 249 deletions(-)
---
diff --git a/gedit/gedit-app-activatable.h b/gedit/gedit-app-activatable.h
index dbfc6ac..f3f6606 100644
--- a/gedit/gedit-app-activatable.h
+++ b/gedit/gedit-app-activatable.h
@@ -19,8 +19,8 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_APP_ACTIVATABLE_H__
-#define __GEDIT_APP_ACTIVATABLE_H__
+#ifndef GEDIT_APP_ACTIVATABLE_H
+#define GEDIT_APP_ACTIVATABLE_H
 
 #include <glib-object.h>
 #include <gedit/gedit-menu-extension.h>
@@ -60,5 +60,5 @@ GeditMenuExtension    *gedit_app_activatable_extend_menu      (GeditAppActivatable *acti
 
 G_END_DECLS
 
-#endif /* __GEDIT_APP_ACTIVATABLE_H__ */
+#endif /* GEDIT_APP_ACTIVATABLE_H */
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-app-osx.h b/gedit/gedit-app-osx.h
index 6a01311..e73c880 100644
--- a/gedit/gedit-app-osx.h
+++ b/gedit/gedit-app-osx.h
@@ -20,8 +20,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GEDIT_APP_OSX_H__
-#define __GEDIT_APP_OSX_H__
+#ifndef GEDIT_APP_OSX_H
+#define GEDIT_APP_OSX_H
 
 #include "gedit-app.h"
 
@@ -41,6 +41,6 @@ gboolean       gedit_app_osx_show_url                 (GeditAppOSX *app,
 
 G_END_DECLS
 
-#endif /* __GEDIT_APP_OSX_H__ */
+#endif /* GEDIT_APP_OSX_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-app-private.h b/gedit/gedit-app-private.h
index 43d457b..f5f1d7f 100644
--- a/gedit/gedit-app-private.h
+++ b/gedit/gedit-app-private.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_APP_PRIVATE_H__
-#define __GEDIT_APP_PRIVATE_H__
+#ifndef GEDIT_APP_PRIVATE_H
+#define GEDIT_APP_PRIVATE_H
 
 #include "gedit-app.h"
 #include "gedit-settings.h"
@@ -63,6 +63,6 @@ GeditMenuExtension    *_gedit_app_extend_menu                 (GeditApp    *app,
 
 G_END_DECLS
 
-#endif /* __GEDIT_APP_PRIVATE_H__ */
+#endif /* GEDIT_APP_PRIVATE_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-app-win32.h b/gedit/gedit-app-win32.h
index 4f18de7..071beba 100644
--- a/gedit/gedit-app-win32.h
+++ b/gedit/gedit-app-win32.h
@@ -20,8 +20,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GEDIT_APP_WIN32_H__
-#define __GEDIT_APP_WIN32_H__
+#ifndef GEDIT_APP_WIN32_H
+#define GEDIT_APP_WIN32_H
 
 #include "gedit-app.h"
 
@@ -33,6 +33,6 @@ G_DECLARE_FINAL_TYPE (GeditAppWin32, gedit_app_win32, GEDIT, APP_WIN32, GeditApp
 
 G_END_DECLS
 
-#endif /* __GEDIT_APP_WIN32_H__ */
+#endif /* GEDIT_APP_WIN32_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-app-x11.h b/gedit/gedit-app-x11.h
index 0935e7a..f49e6aa 100644
--- a/gedit/gedit-app-x11.h
+++ b/gedit/gedit-app-x11.h
@@ -20,8 +20,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GEDIT_APP_X11_H__
-#define __GEDIT_APP_X11_H__
+#ifndef GEDIT_APP_X11_H
+#define GEDIT_APP_X11_H
 
 #include "gedit-app.h"
 
@@ -33,6 +33,6 @@ G_DECLARE_FINAL_TYPE (GeditAppX11, gedit_app_x11, GEDIT, APP_X11, GeditApp)
 
 G_END_DECLS
 
-#endif /* __GEDIT_APP_X11_H__ */
+#endif /* GEDIT_APP_X11_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-app.h b/gedit/gedit-app.h
index bc023fd..e009565 100644
--- a/gedit/gedit-app.h
+++ b/gedit/gedit-app.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_APP_H__
-#define __GEDIT_APP_H__
+#ifndef GEDIT_APP_H
+#define GEDIT_APP_H
 
 #include <gtk/gtk.h>
 #include <gedit/gedit-window.h>
@@ -91,6 +91,6 @@ gboolean      gedit_app_process_window_event          (GeditApp    *app,
 
 G_END_DECLS
 
-#endif /* __GEDIT_APP_H__ */
+#endif /* GEDIT_APP_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-close-confirmation-dialog.h b/gedit/gedit-close-confirmation-dialog.h
index ad5b9e7..cfdb06e 100644
--- a/gedit/gedit-close-confirmation-dialog.h
+++ b/gedit/gedit-close-confirmation-dialog.h
@@ -19,8 +19,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_CLOSE_CONFIRMATION_DIALOG_H__
-#define __GEDIT_CLOSE_CONFIRMATION_DIALOG_H__
+#ifndef GEDIT_CLOSE_CONFIRMATION_DIALOG_H
+#define GEDIT_CLOSE_CONFIRMATION_DIALOG_H
 
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -42,5 +42,5 @@ const GList   *gedit_close_confirmation_dialog_get_unsaved_documents  (GeditCloseC
 
 GList          *gedit_close_confirmation_dialog_get_selected_documents (GeditCloseConfirmationDialog *dlg);
 
-#endif /* __GEDIT_CLOSE_CONFIRMATION_DIALOG_H__ */
+#endif /* GEDIT_CLOSE_CONFIRMATION_DIALOG_H */
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-commands-private.h b/gedit/gedit-commands-private.h
index 80d3431..0c2f0d7 100644
--- a/gedit/gedit-commands-private.h
+++ b/gedit/gedit-commands-private.h
@@ -21,8 +21,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_COMMANDS_PRIVATE_H__
-#define __GEDIT_COMMANDS_PRIVATE_H__
+#ifndef GEDIT_COMMANDS_PRIVATE_H
+#define GEDIT_COMMANDS_PRIVATE_H
 
 #include <gtksourceview/gtksource.h>
 #include <gedit/gedit-window.h>
@@ -168,5 +168,5 @@ void                _gedit_cmd_file_close_notebook          (GeditWindow   *window,
 
 G_END_DECLS
 
-#endif /* __GEDIT_COMMANDS_PRIVATE_H__ */
+#endif /* GEDIT_COMMANDS_PRIVATE_H */
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-commands.h b/gedit/gedit-commands.h
index ab70eff..a003c3a 100644
--- a/gedit/gedit-commands.h
+++ b/gedit/gedit-commands.h
@@ -21,8 +21,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_COMMANDS_H__
-#define __GEDIT_COMMANDS_H__
+#ifndef GEDIT_COMMANDS_H
+#define GEDIT_COMMANDS_H
 
 #include <gtksourceview/gtksource.h>
 #include <gedit/gedit-window.h>
@@ -59,5 +59,5 @@ void           gedit_commands_save_all_documents      (GeditWindow         *window);
 
 G_END_DECLS
 
-#endif /* __GEDIT_COMMANDS_H__ */
+#endif /* GEDIT_COMMANDS_H */
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-debug.h b/gedit/gedit-debug.h
index 226a0ba..49e5127 100644
--- a/gedit/gedit-debug.h
+++ b/gedit/gedit-debug.h
@@ -20,8 +20,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_DEBUG_H__
-#define __GEDIT_DEBUG_H__
+#ifndef GEDIT_DEBUG_H
+#define GEDIT_DEBUG_H
 
 #include <glib.h>
 
@@ -81,5 +81,5 @@ void gedit_debug_plugin_message (const gchar       *file,
                                 const gchar       *function,
                                 const gchar       *message);
 
-#endif /* __GEDIT_DEBUG_H__ */
+#endif /* GEDIT_DEBUG_H */
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-dirs.h b/gedit/gedit-dirs.h
index 119d33b..899bba5 100644
--- a/gedit/gedit-dirs.h
+++ b/gedit/gedit-dirs.h
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef __GEDIT_DIRS_H__
-#define __GEDIT_DIRS_H__
+#ifndef GEDIT_DIRS_H
+#define GEDIT_DIRS_H
 
 #include <glib.h>
 
@@ -50,6 +50,6 @@ const gchar   *gedit_dirs_get_gedit_plugins_data_dir  (void);
 
 G_END_DECLS
 
-#endif /* __GEDIT_DIRS_H__ */
+#endif /* GEDIT_DIRS_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-document-private.h b/gedit/gedit-document-private.h
index a1233fb..dabb2a8 100644
--- a/gedit/gedit-document-private.h
+++ b/gedit/gedit-document-private.h
@@ -21,8 +21,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_DOCUMENT_PRIVATE_H__
-#define __GEDIT_DOCUMENT_PRIVATE_H__
+#ifndef GEDIT_DOCUMENT_PRIVATE_H
+#define GEDIT_DOCUMENT_PRIVATE_H
 
 #include "gedit-document.h"
 
@@ -51,5 +51,5 @@ gboolean       _gedit_document_get_create                             (GeditDocument       
*doc);
 
 G_END_DECLS
 
-#endif /* __GEDIT_DOCUMENT_PRIVATE_H__ */
+#endif /* GEDIT_DOCUMENT_PRIVATE_H */
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-document.h b/gedit/gedit-document.h
index b169642..ac05261 100644
--- a/gedit/gedit-document.h
+++ b/gedit/gedit-document.h
@@ -21,8 +21,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_DOCUMENT_H__
-#define __GEDIT_DOCUMENT_H__
+#ifndef GEDIT_DOCUMENT_H
+#define GEDIT_DOCUMENT_H
 
 #include <gtksourceview/gtksource.h>
 
@@ -127,5 +127,5 @@ GtkSourceSearchContext *
 
 G_END_DECLS
 
-#endif /* __GEDIT_DOCUMENT_H__ */
+#endif /* GEDIT_DOCUMENT_H */
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-documents-panel.h b/gedit/gedit-documents-panel.h
index df5d8f8..08f0e63 100644
--- a/gedit/gedit-documents-panel.h
+++ b/gedit/gedit-documents-panel.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_DOCUMENTS_PANEL_H__
-#define __GEDIT_DOCUMENTS_PANEL_H__
+#ifndef GEDIT_DOCUMENTS_PANEL_H
+#define GEDIT_DOCUMENTS_PANEL_H
 
 #include <gtk/gtk.h>
 
@@ -35,6 +35,6 @@ GtkWidget     *gedit_documents_panel_new      (GeditWindow *window);
 
 G_END_DECLS
 
-#endif  /* __GEDIT_DOCUMENTS_PANEL_H__  */
+#endif  /* GEDIT_DOCUMENTS_PANEL_H  */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-encoding-items.h b/gedit/gedit-encoding-items.h
index 950ba87..07e3917 100644
--- a/gedit/gedit-encoding-items.h
+++ b/gedit/gedit-encoding-items.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_ENCODING_ITEMS_H__
-#define __GEDIT_ENCODING_ITEMS_H__
+#ifndef GEDIT_ENCODING_ITEMS_H
+#define GEDIT_ENCODING_ITEMS_H
 
 #include <gtksourceview/gtksource.h>
 
@@ -35,6 +35,6 @@ const gchar                   *gedit_encoding_item_get_name           (GeditEncodingItem 
*item);
 
 G_END_DECLS
 
-#endif /* __GEDIT_ENCODING_ITEMS_H__ */
+#endif /* GEDIT_ENCODING_ITEMS_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-encodings-combo-box.h b/gedit/gedit-encodings-combo-box.h
index 377f40a..c37f341 100644
--- a/gedit/gedit-encodings-combo-box.h
+++ b/gedit/gedit-encodings-combo-box.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_ENCODINGS_COMBO_BOX_H__
-#define __GEDIT_ENCODINGS_COMBO_BOX_H__
+#ifndef GEDIT_ENCODINGS_COMBO_BOX_H
+#define GEDIT_ENCODINGS_COMBO_BOX_H
 
 #include <gtksourceview/gtksource.h>
 
@@ -38,6 +38,6 @@ void                   gedit_encodings_combo_box_set_selected_encoding        
(GeditEncodingsComboBox
 
 G_END_DECLS
 
-#endif /* __GEDIT_ENCODINGS_COMBO_BOX_H__ */
+#endif /* GEDIT_ENCODINGS_COMBO_BOX_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-encodings-dialog.h b/gedit/gedit-encodings-dialog.h
index 1c800df..4acd17a 100644
--- a/gedit/gedit-encodings-dialog.h
+++ b/gedit/gedit-encodings-dialog.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_ENCODINGS_DIALOG_H__
-#define __GEDIT_ENCODINGS_DIALOG_H__
+#ifndef GEDIT_ENCODINGS_DIALOG_H
+#define GEDIT_ENCODINGS_DIALOG_H
 
 #include <gtk/gtk.h>
 
@@ -33,5 +33,5 @@ GtkWidget     *gedit_encodings_dialog_new             (void);
 
 G_END_DECLS
 
-#endif /* __GEDIT_ENCODINGS_DIALOG_H__ */
+#endif /* GEDIT_ENCODINGS_DIALOG_H */
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-enum-types.h.template b/gedit/gedit-enum-types.h.template
index 78f39ce..365f357 100644
--- a/gedit/gedit-enum-types.h.template
+++ b/gedit/gedit-enum-types.h.template
@@ -1,6 +1,6 @@
 /*** BEGIN file-header ***/
-#ifndef __GEDIT_ENUM_TYPES_H__
-#define __GEDIT_ENUM_TYPES_H__
+#ifndef GEDIT_ENUM_TYPES_H
+#define GEDIT_ENUM_TYPES_H
 
 #include <glib-object.h>
 
@@ -22,6 +22,6 @@ GType @enum_name _get_type    (void) G_GNUC_CONST;
 /*** BEGIN file-tail ***/
 G_END_DECLS
 
-#endif /* __GEDIT_ENUM_TYPES_H__ */
+#endif /* GEDIT_ENUM_TYPES_H */
 /*** END file-tail ***/
 
diff --git a/gedit/gedit-file-chooser-dialog-gtk.h b/gedit/gedit-file-chooser-dialog-gtk.h
index ac67f67..39dfca9 100644
--- a/gedit/gedit-file-chooser-dialog-gtk.h
+++ b/gedit/gedit-file-chooser-dialog-gtk.h
@@ -19,8 +19,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_FILE_CHOOSER_DIALOG_GTK_H__
-#define __GEDIT_FILE_CHOOSER_DIALOG_GTK_H__
+#ifndef GEDIT_FILE_CHOOSER_DIALOG_GTK_H
+#define GEDIT_FILE_CHOOSER_DIALOG_GTK_H
 
 #include <gtk/gtk.h>
 #include "gedit-file-chooser-dialog.h"
@@ -42,6 +42,6 @@ GeditFileChooserDialog        *gedit_file_chooser_dialog_gtk_create           (const gchar
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_CHOOSER_DIALOG_GTK_H__ */
+#endif /* GEDIT_FILE_CHOOSER_DIALOG_GTK_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-file-chooser-dialog-osx.h b/gedit/gedit-file-chooser-dialog-osx.h
index 89e7c22..d9263f9 100644
--- a/gedit/gedit-file-chooser-dialog-osx.h
+++ b/gedit/gedit-file-chooser-dialog-osx.h
@@ -19,8 +19,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_FILE_CHOOSER_DIALOG_OSX_H__
-#define __GEDIT_FILE_CHOOSER_DIALOG_OSX_H__
+#ifndef GEDIT_FILE_CHOOSER_DIALOG_OSX_H
+#define GEDIT_FILE_CHOOSER_DIALOG_OSX_H
 
 #include <gtk/gtk.h>
 #include "gedit-file-chooser-dialog.h"
@@ -42,6 +42,6 @@ GeditFileChooserDialog        *gedit_file_chooser_dialog_osx_create           (const gchar
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_CHOOSER_DIALOG_OSX_H__ */
+#endif /* GEDIT_FILE_CHOOSER_DIALOG_OSX_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-file-chooser-dialog.h b/gedit/gedit-file-chooser-dialog.h
index 66e302b..1a86cf7 100644
--- a/gedit/gedit-file-chooser-dialog.h
+++ b/gedit/gedit-file-chooser-dialog.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_FILE_CHOOSER_DIALOG_H__
-#define __GEDIT_FILE_CHOOSER_DIALOG_H__
+#ifndef GEDIT_FILE_CHOOSER_DIALOG_H
+#define GEDIT_FILE_CHOOSER_DIALOG_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksource.h>
@@ -144,6 +144,6 @@ void                 gedit_file_chooser_dialog_add_pattern_filter   
(GeditFileChooserDialog   *d
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_CHOOSER_DIALOG_H__ */
+#endif /* GEDIT_FILE_CHOOSER_DIALOG_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-highlight-mode-dialog.h b/gedit/gedit-highlight-mode-dialog.h
index df67fc1..b26d3c9 100644
--- a/gedit/gedit-highlight-mode-dialog.h
+++ b/gedit/gedit-highlight-mode-dialog.h
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef __GEDIT_HIGHLIGHT_MODE_DIALOG_H__
-#define __GEDIT_HIGHLIGHT_MODE_DIALOG_H__
+#ifndef GEDIT_HIGHLIGHT_MODE_DIALOG_H
+#define GEDIT_HIGHLIGHT_MODE_DIALOG_H
 
 #include <glib.h>
 #include "gedit-highlight-mode-selector.h"
@@ -37,6 +37,6 @@ GeditHighlightModeSelector *gedit_highlight_mode_dialog_get_selector    (GeditHi
 
 G_END_DECLS
 
-#endif /* __GEDIT_HIGHLIGHT_MODE_DIALOG_H__ */
+#endif /* GEDIT_HIGHLIGHT_MODE_DIALOG_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-highlight-mode-selector.h b/gedit/gedit-highlight-mode-selector.h
index bcf853c..daf8561 100644
--- a/gedit/gedit-highlight-mode-selector.h
+++ b/gedit/gedit-highlight-mode-selector.h
@@ -18,8 +18,8 @@
  * along with gedit. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_HIGHLIGHT_MODE_SELECTOR_H__
-#define __GEDIT_HIGHLIGHT_MODE_SELECTOR_H__
+#ifndef GEDIT_HIGHLIGHT_MODE_SELECTOR_H
+#define GEDIT_HIGHLIGHT_MODE_SELECTOR_H
 
 #include <glib-object.h>
 #include <gtksourceview/gtksource.h>
@@ -41,6 +41,6 @@ void                        gedit_highlight_mode_selector_activate_selected_lang
 
 G_END_DECLS
 
-#endif /* __GEDIT_HIGHLIGHT_MODE_SELECTOR_H__ */
+#endif /* GEDIT_HIGHLIGHT_MODE_SELECTOR_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-history-entry.h b/gedit/gedit-history-entry.h
index 7295034..5440be1 100644
--- a/gedit/gedit-history-entry.h
+++ b/gedit/gedit-history-entry.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_HISTORY_ENTRY_H__
-#define __GEDIT_HISTORY_ENTRY_H__
+#ifndef GEDIT_HISTORY_ENTRY_H
+#define GEDIT_HISTORY_ENTRY_H
 
 #include <gtk/gtk.h>
 
@@ -54,6 +54,6 @@ GtkWidget     *gedit_history_entry_get_entry                  (GeditHistoryEntry *entry);
 
 G_END_DECLS
 
-#endif /* __GEDIT_HISTORY_ENTRY_H__ */
+#endif /* GEDIT_HISTORY_ENTRY_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-io-error-info-bar.h b/gedit/gedit-io-error-info-bar.h
index a524673..44b9b8b 100644
--- a/gedit/gedit-io-error-info-bar.h
+++ b/gedit/gedit-io-error-info-bar.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_IO_ERROR_INFO_BAR_H__
-#define __GEDIT_IO_ERROR_INFO_BAR_H__
+#ifndef GEDIT_IO_ERROR_INFO_BAR_H
+#define GEDIT_IO_ERROR_INFO_BAR_H
 
 #include <gtksourceview/gtksource.h>
 
@@ -59,6 +59,6 @@ GtkWidget     *gedit_network_unavailable_info_bar_new                 (GFile               
*locati
 
 G_END_DECLS
 
-#endif  /* __GEDIT_IO_ERROR_INFO_BAR_H__  */
+#endif  /* GEDIT_IO_ERROR_INFO_BAR_H  */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-menu-extension.h b/gedit/gedit-menu-extension.h
index 58efe25..1803b3b 100644
--- a/gedit/gedit-menu-extension.h
+++ b/gedit/gedit-menu-extension.h
@@ -18,8 +18,8 @@
  * along with gedit. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_MENU_EXTENSION_H__
-#define __GEDIT_MENU_EXTENSION_H__
+#ifndef GEDIT_MENU_EXTENSION_H
+#define GEDIT_MENU_EXTENSION_H
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -42,6 +42,6 @@ void                      gedit_menu_extension_remove_items        (GeditMenuExt
 
 G_END_DECLS
 
-#endif /* __GEDIT_MENU_EXTENSION_H__ */
+#endif /* GEDIT_MENU_EXTENSION_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-menu-stack-switcher.h b/gedit/gedit-menu-stack-switcher.h
index cb249d5..4a4e3b1 100644
--- a/gedit/gedit-menu-stack-switcher.h
+++ b/gedit/gedit-menu-stack-switcher.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_MENU_STACK_SWITCHER_H__
-#define __GEDIT_MENU_STACK_SWITCHER_H__
+#ifndef GEDIT_MENU_STACK_SWITCHER_H
+#define GEDIT_MENU_STACK_SWITCHER_H
 
 #include <gtk/gtk.h>
 
@@ -38,6 +38,6 @@ GtkStack *   gedit_menu_stack_switcher_get_stack  (GeditMenuStackSwitcher *switc
 
 G_END_DECLS
 
-#endif  /* __GEDIT_MENU_STACK_SWITCHER_H__  */
+#endif  /* GEDIT_MENU_STACK_SWITCHER_H  */
 
 /* ex:set ts=2 sw=2 et: */
diff --git a/gedit/gedit-message-bus.h b/gedit/gedit-message-bus.h
index a7b58d9..e8403e0 100644
--- a/gedit/gedit-message-bus.h
+++ b/gedit/gedit-message-bus.h
@@ -20,8 +20,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GEDIT_MESSAGE_BUS_H__
-#define __GEDIT_MESSAGE_BUS_H__
+#ifndef GEDIT_MESSAGE_BUS_H
+#define GEDIT_MESSAGE_BUS_H
 
 #include <glib-object.h>
 #include <gedit/gedit-message.h>
@@ -149,6 +149,6 @@ GeditMessage     *gedit_message_bus_send_sync          (GeditMessageBus        *
 
 G_END_DECLS
 
-#endif /* __GEDIT_MESSAGE_BUS_H__ */
+#endif /* GEDIT_MESSAGE_BUS_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-message.h b/gedit/gedit-message.h
index 8b59514..8f15734 100644
--- a/gedit/gedit-message.h
+++ b/gedit/gedit-message.h
@@ -20,8 +20,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GEDIT_MESSAGE_H__
-#define __GEDIT_MESSAGE_H__
+#ifndef GEDIT_MESSAGE_H
+#define GEDIT_MESSAGE_H
 
 #include <glib-object.h>
 
@@ -72,6 +72,6 @@ gchar       *gedit_message_type_identifier      (const gchar  *object_path,
 
 G_END_DECLS
 
-#endif /* __GEDIT_MESSAGE_H__ */
+#endif /* GEDIT_MESSAGE_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-metadata-manager.h b/gedit/gedit-metadata-manager.h
index 07eac78..a25654f 100644
--- a/gedit/gedit-metadata-manager.h
+++ b/gedit/gedit-metadata-manager.h
@@ -19,8 +19,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_METADATA_MANAGER_H__
-#define __GEDIT_METADATA_MANAGER_H__
+#ifndef GEDIT_METADATA_MANAGER_H
+#define GEDIT_METADATA_MANAGER_H
 
 #include <gio/gio.h>
 
@@ -39,6 +39,6 @@ void           gedit_metadata_manager_set             (GFile       *location,
 
 G_END_DECLS
 
-#endif /* __GEDIT_METADATA_MANAGER_H__ */
+#endif /* GEDIT_METADATA_MANAGER_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-multi-notebook.h b/gedit/gedit-multi-notebook.h
index c21f740..2022bd8 100644
--- a/gedit/gedit-multi-notebook.h
+++ b/gedit/gedit-multi-notebook.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef __GEDIT_MULTI_NOTEBOOK_H__
-#define __GEDIT_MULTI_NOTEBOOK_H__
+#ifndef GEDIT_MULTI_NOTEBOOK_H
+#define GEDIT_MULTI_NOTEBOOK_H
 
 #include <gtk/gtk.h>
 
@@ -143,6 +143,6 @@ void                        _gedit_multi_notebook_set_show_tabs             
(GeditMultiNotebook *mnb,
 
 G_END_DECLS
 
-#endif /* __GEDIT_MULTI_NOTEBOOK_H__ */
+#endif /* GEDIT_MULTI_NOTEBOOK_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-notebook-popup-menu.h b/gedit/gedit-notebook-popup-menu.h
index e56e872..10b3c6a 100644
--- a/gedit/gedit-notebook-popup-menu.h
+++ b/gedit/gedit-notebook-popup-menu.h
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef __GEDIT_NOTEBOOK_POPUP_MENU_H__
-#define __GEDIT_NOTEBOOK_POPUP_MENU_H__
+#ifndef GEDIT_NOTEBOOK_POPUP_MENU_H
+#define GEDIT_NOTEBOOK_POPUP_MENU_H
 
 #include <gtk/gtk.h>
 #include "gedit-window.h"
@@ -36,4 +36,4 @@ GtkWidget           *gedit_notebook_popup_menu_new          (GeditWindow *window
 
 G_END_DECLS
 
-#endif /* __GEDIT_NOTEBOOK_POPUP_MENU_H__ */
+#endif /* GEDIT_NOTEBOOK_POPUP_MENU_H */
diff --git a/gedit/gedit-notebook-stack-switcher.h b/gedit/gedit-notebook-stack-switcher.h
index 96cca0d..ec3f929 100644
--- a/gedit/gedit-notebook-stack-switcher.h
+++ b/gedit/gedit-notebook-stack-switcher.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_NOTEBOOK_STACK_SWITCHER_H__
-#define __GEDIT_NOTEBOOK_STACK_SWITCHER_H__
+#ifndef GEDIT_NOTEBOOK_STACK_SWITCHER_H
+#define GEDIT_NOTEBOOK_STACK_SWITCHER_H
 
 #include <gtk/gtk.h>
 
@@ -66,6 +66,6 @@ GtkStack      *gedit_notebook_stack_switcher_get_stack  (GeditNotebookStackSwitcher *
 
 G_END_DECLS
 
-#endif  /* __GEDIT_NOTEBOOK_STACK_SWITCHER_H__  */
+#endif  /* GEDIT_NOTEBOOK_STACK_SWITCHER_H  */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-open-document-selector-helper.h b/gedit/gedit-open-document-selector-helper.h
index b6278c2..6feb654 100644
--- a/gedit/gedit-open-document-selector-helper.h
+++ b/gedit/gedit-open-document-selector-helper.h
@@ -18,8 +18,8 @@
  * along with gedit. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_OPEN_DOCUMENT_SELECTOR_HELPER_H__
-#define __GEDIT_OPEN_DOCUMENT_SELECTOR_HELPER_H__
+#ifndef GEDIT_OPEN_DOCUMENT_SELECTOR_HELPER_H
+#define GEDIT_OPEN_DOCUMENT_SELECTOR_HELPER_H
 
 #include "gedit-open-document-selector.h"
 
@@ -98,6 +98,6 @@ FileItem      *gedit_open_document_selector_copy_fileitem_item        (FileItem *item);
 
 G_END_DECLS
 
-#endif /* __GEDIT_OPEN_DOCUMENT_SELECTOR_HELPER_H__ */
+#endif /* GEDIT_OPEN_DOCUMENT_SELECTOR_HELPER_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-open-document-selector-store.h b/gedit/gedit-open-document-selector-store.h
index 0393a7a..d1e17a9 100644
--- a/gedit/gedit-open-document-selector-store.h
+++ b/gedit/gedit-open-document-selector-store.h
@@ -18,8 +18,8 @@
  * along with gedit. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_OPEN_DOCUMENT_SELECTOR_STORE_H__
-#define __GEDIT_OPEN_DOCUMENT_SELECTOR_STORE_H__
+#ifndef GEDIT_OPEN_DOCUMENT_SELECTOR_STORE_H
+#define GEDIT_OPEN_DOCUMENT_SELECTOR_STORE_H
 
 #include "gedit-open-document-selector-helper.h"
 #include "gedit-open-document-selector.h"
@@ -64,5 +64,5 @@ GeditOpenDocumentSelectorStore        *gedit_open_document_selector_store_get_default
 
 G_END_DECLS
 
-#endif /* __GEDIT_OPEN_DOCUMENT_SELECTOR_STORE_H__ */
+#endif /* GEDIT_OPEN_DOCUMENT_SELECTOR_STORE_H */
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-open-document-selector.h b/gedit/gedit-open-document-selector.h
index 7de9e59..b4d50ce 100644
--- a/gedit/gedit-open-document-selector.h
+++ b/gedit/gedit-open-document-selector.h
@@ -18,8 +18,8 @@
  * along with gedit. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_OPEN_DOCUMENT_SELECTOR_H__
-#define __GEDIT_OPEN_DOCUMENT_SELECTOR_H__
+#ifndef GEDIT_OPEN_DOCUMENT_SELECTOR_H
+#define GEDIT_OPEN_DOCUMENT_SELECTOR_H
 
 #include <glib-object.h>
 #include "gedit-window.h"
@@ -40,5 +40,5 @@ GtkWidget                     *gedit_open_document_selector_get_search_entry  
(GeditOpenDocumentSel
 
 G_END_DECLS
 
-#endif /* __GEDIT_OPEN_DOCUMENT_SELECTOR_H__ */
+#endif /* GEDIT_OPEN_DOCUMENT_SELECTOR_H */
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-plugins-engine.h b/gedit/gedit-plugins-engine.h
index 5c18fc3..124937b 100644
--- a/gedit/gedit-plugins-engine.h
+++ b/gedit/gedit-plugins-engine.h
@@ -19,8 +19,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_PLUGINS_ENGINE_H__
-#define __GEDIT_PLUGINS_ENGINE_H__
+#ifndef GEDIT_PLUGINS_ENGINE_H
+#define GEDIT_PLUGINS_ENGINE_H
 
 #include <glib.h>
 #include <libpeas/peas.h>
@@ -34,6 +34,6 @@ GeditPluginsEngine    *gedit_plugins_engine_get_default       (void);
 
 G_END_DECLS
 
-#endif  /* __GEDIT_PLUGINS_ENGINE_H__ */
+#endif  /* GEDIT_PLUGINS_ENGINE_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-preferences-dialog.h b/gedit/gedit-preferences-dialog.h
index 6f022c5..1d35559 100644
--- a/gedit/gedit-preferences-dialog.h
+++ b/gedit/gedit-preferences-dialog.h
@@ -19,8 +19,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_PREFERENCES_DIALOG_H__
-#define __GEDIT_PREFERENCES_DIALOG_H__
+#ifndef GEDIT_PREFERENCES_DIALOG_H
+#define GEDIT_PREFERENCES_DIALOG_H
 
 #include "gedit-window.h"
 
@@ -30,6 +30,6 @@ void           gedit_show_preferences_dialog          (GeditWindow *parent);
 
 G_END_DECLS
 
-#endif /* __GEDIT_PREFERENCES_DIALOG_H__ */
+#endif /* GEDIT_PREFERENCES_DIALOG_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-print-job.h b/gedit/gedit-print-job.h
index ba44d79..f95563c 100644
--- a/gedit/gedit-print-job.h
+++ b/gedit/gedit-print-job.h
@@ -19,8 +19,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_PRINT_JOB_H__
-#define __GEDIT_PRINT_JOB_H__
+#ifndef GEDIT_PRINT_JOB_H
+#define GEDIT_PRINT_JOB_H
 
 #include <gtk/gtk.h>
 #include <gedit/gedit-view.h>
@@ -65,6 +65,6 @@ GtkPageSetup          *gedit_print_job_get_page_setup         (GeditPrintJob            
*job);
 
 G_END_DECLS
 
-#endif /* __GEDIT_PRINT_JOB_H__ */
+#endif /* GEDIT_PRINT_JOB_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-print-preview.h b/gedit/gedit-print-preview.h
index a42f532..40d85c8 100644
--- a/gedit/gedit-print-preview.h
+++ b/gedit/gedit-print-preview.h
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_PRINT_PREVIEW_H__
-#define __GEDIT_PRINT_PREVIEW_H__
+#ifndef GEDIT_PRINT_PREVIEW_H
+#define GEDIT_PRINT_PREVIEW_H
 
 #include <gtk/gtk.h>
 
@@ -34,6 +34,6 @@ GtkWidget     *gedit_print_preview_new        (GtkPrintOperation        *operation,
 
 G_END_DECLS
 
-#endif /* __GEDIT_PRINT_PREVIEW_H__ */
+#endif /* GEDIT_PRINT_PREVIEW_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-progress-info-bar.h b/gedit/gedit-progress-info-bar.h
index cf57412..0d820d8 100644
--- a/gedit/gedit-progress-info-bar.h
+++ b/gedit/gedit-progress-info-bar.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_PROGRESS_INFO_BAR_H__
-#define __GEDIT_PROGRESS_INFO_BAR_H__
+#ifndef GEDIT_PROGRESS_INFO_BAR_H
+#define GEDIT_PROGRESS_INFO_BAR_H
 
 #include <gtk/gtk.h>
 
@@ -48,6 +48,6 @@ void           gedit_progress_info_bar_pulse                  (GeditProgressInfoBar *bar);
 
 G_END_DECLS
 
-#endif  /* __GEDIT_PROGRESS_INFO_BAR_H__  */
+#endif  /* GEDIT_PROGRESS_INFO_BAR_H  */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-recent.h b/gedit/gedit-recent.h
index 27178dd..ca27bf6 100644
--- a/gedit/gedit-recent.h
+++ b/gedit/gedit-recent.h
@@ -20,8 +20,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_RECENT_H__
-#define __GEDIT_RECENT_H__
+#ifndef GEDIT_RECENT_H
+#define GEDIT_RECENT_H
 
 #include <gtk/gtk.h>
 #include <gedit/gedit-document.h>
@@ -51,6 +51,6 @@ GList         *gedit_recent_get_items                  (GeditRecentConfiguration *config);
 
 G_END_DECLS
 
-#endif  /* __GEDIT_RECENT_H__  */
+#endif  /* GEDIT_RECENT_H  */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-replace-dialog.h b/gedit/gedit-replace-dialog.h
index 8083624..235b587 100644
--- a/gedit/gedit-replace-dialog.h
+++ b/gedit/gedit-replace-dialog.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_REPLACE_DIALOG_H__
-#define __GEDIT_REPLACE_DIALOG_H__
+#ifndef GEDIT_REPLACE_DIALOG_H
+#define GEDIT_REPLACE_DIALOG_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksource.h>
@@ -53,6 +53,6 @@ void                   gedit_replace_dialog_set_replace_error         (GeditReplaceDialog 
*dialog,
 
 G_END_DECLS
 
-#endif  /* __GEDIT_REPLACE_DIALOG_H__  */
+#endif  /* GEDIT_REPLACE_DIALOG_H  */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-settings.h b/gedit/gedit-settings.h
index 0e59867..0573b8e 100644
--- a/gedit/gedit-settings.h
+++ b/gedit/gedit-settings.h
@@ -21,8 +21,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GEDIT_SETTINGS_H__
-#define __GEDIT_SETTINGS_H__
+#ifndef GEDIT_SETTINGS_H
+#define GEDIT_SETTINGS_H
 
 #include <glib-object.h>
 #include <glib.h>
@@ -107,6 +107,6 @@ void                         gedit_settings_set_list                        (GSettings    
 *settings,
 
 G_END_DECLS
 
-#endif /* __GEDIT_SETTINGS_H__ */
+#endif /* GEDIT_SETTINGS_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-status-menu-button.h b/gedit/gedit-status-menu-button.h
index cde6961..baeaa53 100644
--- a/gedit/gedit-status-menu-button.h
+++ b/gedit/gedit-status-menu-button.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_STATUS_MENU_BUTTON_H__
-#define __GEDIT_STATUS_MENU_BUTTON_H__
+#ifndef GEDIT_STATUS_MENU_BUTTON_H
+#define GEDIT_STATUS_MENU_BUTTON_H
 
 #include <gtk/gtk.h>
 
@@ -38,6 +38,6 @@ const gchar *gedit_status_menu_button_get_label (GeditStatusMenuButton *button);
 
 G_END_DECLS
 
-#endif /* __GEDIT_STATUS_MENU_BUTTON_H__ */
+#endif /* GEDIT_STATUS_MENU_BUTTON_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-tab-label.h b/gedit/gedit-tab-label.h
index b44964b..df54eae 100644
--- a/gedit/gedit-tab-label.h
+++ b/gedit/gedit-tab-label.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_TAB_LABEL_H__
-#define __GEDIT_TAB_LABEL_H__
+#ifndef GEDIT_TAB_LABEL_H
+#define GEDIT_TAB_LABEL_H
 
 #include <gtk/gtk.h>
 #include <gedit/gedit-tab.h>
@@ -36,6 +36,6 @@ GeditTab      *gedit_tab_label_get_tab                        (GeditTabLabel *tab_label);
 
 G_END_DECLS
 
-#endif /* __GEDIT_TAB_LABEL_H__ */
+#endif /* GEDIT_TAB_LABEL_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-tab-private.h b/gedit/gedit-tab-private.h
index 9ea2636..7559bf1 100644
--- a/gedit/gedit-tab-private.h
+++ b/gedit/gedit-tab-private.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_TAB_PRIVATE_H__
-#define __GEDIT_TAB_PRIVATE_H__
+#ifndef GEDIT_TAB_PRIVATE_H
+#define GEDIT_TAB_PRIVATE_H
 
 #include "gedit-tab.h"
 #include "gedit-view-frame.h"
@@ -79,6 +79,6 @@ void           _gedit_tab_set_network_available       (GeditTab            *tab,
 
 G_END_DECLS
 
-#endif  /* __GEDIT_TAB_PRIVATE_H__ */
+#endif  /* GEDIT_TAB_PRIVATE_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-tab.h b/gedit/gedit-tab.h
index 27fd478..0be8804 100644
--- a/gedit/gedit-tab.h
+++ b/gedit/gedit-tab.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_TAB_H__
-#define __GEDIT_TAB_H__
+#ifndef GEDIT_TAB_H
+#define GEDIT_TAB_H
 
 #include <gtksourceview/gtksource.h>
 #include <gedit/gedit-view.h>
@@ -74,6 +74,6 @@ void           gedit_tab_set_info_bar                 (GeditTab            *tab,
 
 G_END_DECLS
 
-#endif  /* __GEDIT_TAB_H__  */
+#endif  /* GEDIT_TAB_H  */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-utils.h b/gedit/gedit-utils.h
index 5032d1e..2da6234 100644
--- a/gedit/gedit-utils.h
+++ b/gedit/gedit-utils.h
@@ -20,8 +20,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_UTILS_H__
-#define __GEDIT_UTILS_H__
+#ifndef GEDIT_UTILS_H
+#define GEDIT_UTILS_H
 
 #include <gtksourceview/gtksource.h>
 
@@ -141,6 +141,6 @@ const gchar     *gedit_utils_newline_type_to_string (GtkSourceNewlineType newlin
 
 G_END_DECLS
 
-#endif /* __GEDIT_UTILS_H__ */
+#endif /* GEDIT_UTILS_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-view-activatable.h b/gedit/gedit-view-activatable.h
index 5ff45e4..77799ea 100644
--- a/gedit/gedit-view-activatable.h
+++ b/gedit/gedit-view-activatable.h
@@ -18,8 +18,8 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_VIEW_ACTIVATABLE_H__
-#define __GEDIT_VIEW_ACTIVATABLE_H__
+#ifndef GEDIT_VIEW_ACTIVATABLE_H
+#define GEDIT_VIEW_ACTIVATABLE_H
 
 #include <glib-object.h>
 
@@ -43,5 +43,5 @@ void   gedit_view_activatable_deactivate      (GeditViewActivatable *activatable);
 
 G_END_DECLS
 
-#endif /* __GEDIT_VIEW_ACTIVATABLE_H__ */
+#endif /* GEDIT_VIEW_ACTIVATABLE_H */
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-view-centering.h b/gedit/gedit-view-centering.h
index ea47d4b..1d72189 100644
--- a/gedit/gedit-view-centering.h
+++ b/gedit/gedit-view-centering.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GEDIT_VIEW_CENTERING_H__
-#define __GEDIT_VIEW_CENTERING_H__
+#ifndef GEDIT_VIEW_CENTERING_H
+#define GEDIT_VIEW_CENTERING_H
 
 #include <gtk/gtk.h>
 
@@ -62,6 +62,6 @@ gboolean              gedit_view_centering_get_centered               (GeditViewCentering 
*container);
 
 G_END_DECLS
 
-#endif /* __GEDIT_VIEW_CENTERING_H__ */
+#endif /* GEDIT_VIEW_CENTERING_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-view-frame.h b/gedit/gedit-view-frame.h
index be977bb..d2e5508 100644
--- a/gedit/gedit-view-frame.h
+++ b/gedit/gedit-view-frame.h
@@ -18,8 +18,8 @@
  * along with gedit. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_VIEW_FRAME_H__
-#define __GEDIT_VIEW_FRAME_H__
+#ifndef GEDIT_VIEW_FRAME_H
+#define GEDIT_VIEW_FRAME_H
 
 #include <gtk/gtk.h>
 #include "gedit-document.h"
@@ -46,4 +46,4 @@ void           gedit_view_frame_clear_search          (GeditViewFrame *frame);
 
 G_END_DECLS
 
-#endif /* __GEDIT_VIEW_FRAME_H__ */
+#endif /* GEDIT_VIEW_FRAME_H */
diff --git a/gedit/gedit-view.h b/gedit/gedit-view.h
index 33dc728..36304b9 100644
--- a/gedit/gedit-view.h
+++ b/gedit/gedit-view.h
@@ -20,8 +20,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_VIEW_H__
-#define __GEDIT_VIEW_H__
+#ifndef GEDIT_VIEW_H
+#define GEDIT_VIEW_H
 
 #include <gtk/gtk.h>
 
@@ -77,6 +77,6 @@ void           gedit_view_set_font            (GeditView       *view,
 
 G_END_DECLS
 
-#endif /* __GEDIT_VIEW_H__ */
+#endif /* GEDIT_VIEW_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-window-activatable.h b/gedit/gedit-window-activatable.h
index a7a6bd1..e0ab35f 100644
--- a/gedit/gedit-window-activatable.h
+++ b/gedit/gedit-window-activatable.h
@@ -18,8 +18,8 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_WINDOW_ACTIVATABLE_H__
-#define __GEDIT_WINDOW_ACTIVATABLE_H__
+#ifndef GEDIT_WINDOW_ACTIVATABLE_H
+#define GEDIT_WINDOW_ACTIVATABLE_H
 
 #include <glib-object.h>
 
@@ -45,5 +45,5 @@ void   gedit_window_activatable_update_state  (GeditWindowActivatable *activatable
 
 G_END_DECLS
 
-#endif /* __GEDIT_WINDOW_ACTIVATABLE_H__ */
+#endif /* GEDIT_WINDOW_ACTIVATABLE_H */
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-window-private.h b/gedit/gedit-window-private.h
index e1d0a4a..9b8bd0e 100644
--- a/gedit/gedit-window-private.h
+++ b/gedit/gedit-window-private.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_WINDOW_PRIVATE_H__
-#define __GEDIT_WINDOW_PRIVATE_H__
+#ifndef GEDIT_WINDOW_PRIVATE_H
+#define GEDIT_WINDOW_PRIVATE_H
 
 #include <libpeas/peas-extension-set.h>
 
@@ -122,5 +122,5 @@ struct _GeditWindowPrivate
 
 G_END_DECLS
 
-#endif  /* __GEDIT_WINDOW_PRIVATE_H__  */
+#endif  /* GEDIT_WINDOW_PRIVATE_H  */
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-window.h b/gedit/gedit-window.h
index 04241cf..f02a044 100644
--- a/gedit/gedit-window.h
+++ b/gedit/gedit-window.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_WINDOW_H__
-#define __GEDIT_WINDOW_H__
+#ifndef GEDIT_WINDOW_H
+#define GEDIT_WINDOW_H
 
 #include <gtksourceview/gtksource.h>
 #include <gio/gio.h>
@@ -169,6 +169,6 @@ GFile               *_gedit_window_pop_last_closed_doc      (GeditWindow         *window);
 
 G_END_DECLS
 
-#endif  /* __GEDIT_WINDOW_H__  */
+#endif  /* GEDIT_WINDOW_H  */
 
 /* ex:set ts=8 noet: */
diff --git a/plugins/checkupdate/gedit-check-update-plugin.h b/plugins/checkupdate/gedit-check-update-plugin.h
index d370b53..82bf4f6 100644
--- a/plugins/checkupdate/gedit-check-update-plugin.h
+++ b/plugins/checkupdate/gedit-check-update-plugin.h
@@ -15,8 +15,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_CHECK_UPDATE_PLUGIN_H__
-#define __GEDIT_CHECK_UPDATE_PLUGIN_H__
+#ifndef GEDIT_CHECK_UPDATE_PLUGIN_H
+#define GEDIT_CHECK_UPDATE_PLUGIN_H
 
 #include <glib.h>
 #include <glib-object.h>
@@ -55,5 +55,5 @@ G_MODULE_EXPORT void  peas_register_types                     (PeasObjectModule *module);
 
 G_END_DECLS
 
-#endif /* __GEDIT_CHECK_UPDATE_PLUGIN_H__ */
+#endif /* GEDIT_CHECK_UPDATE_PLUGIN_H */
 /* ex:set ts=8 noet: */
diff --git a/plugins/docinfo/gedit-docinfo-plugin.h b/plugins/docinfo/gedit-docinfo-plugin.h
index be96b5a..e657c9f 100644
--- a/plugins/docinfo/gedit-docinfo-plugin.h
+++ b/plugins/docinfo/gedit-docinfo-plugin.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __GEDIT_DOCINFO_PLUGIN_H__
-#define __GEDIT_DOCINFO_PLUGIN_H__
+#ifndef GEDIT_DOCINFO_PLUGIN_H
+#define GEDIT_DOCINFO_PLUGIN_H
 
 #include <glib.h>
 #include <glib-object.h>
@@ -58,6 +58,6 @@ G_MODULE_EXPORT void peas_register_types (PeasObjectModule *module);
 
 G_END_DECLS
 
-#endif /* __GEDIT_DOCINFO_PLUGIN_H__ */
+#endif /* GEDIT_DOCINFO_PLUGIN_H */
 
 /* ex:set ts=8 noet: */
diff --git a/plugins/filebrowser/gedit-file-bookmarks-store.h 
b/plugins/filebrowser/gedit-file-bookmarks-store.h
index 670924f..8ac91b1 100644
--- a/plugins/filebrowser/gedit-file-bookmarks-store.h
+++ b/plugins/filebrowser/gedit-file-bookmarks-store.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_FILE_BOOKMARKS_STORE_H__
-#define __GEDIT_FILE_BOOKMARKS_STORE_H__
+#ifndef GEDIT_FILE_BOOKMARKS_STORE_H
+#define GEDIT_FILE_BOOKMARKS_STORE_H
 
 #include <gtk/gtk.h>
 
@@ -86,5 +86,5 @@ void                   _gedit_file_bookmarks_store_register_type      (GTypeModule          
   *type
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_BOOKMARKS_STORE_H__ */
+#endif /* GEDIT_FILE_BOOKMARKS_STORE_H */
 /* ex:set ts=8 noet: */
diff --git a/plugins/filebrowser/gedit-file-browser-error.h b/plugins/filebrowser/gedit-file-browser-error.h
index 234e014..89e6ae3 100644
--- a/plugins/filebrowser/gedit-file-browser-error.h
+++ b/plugins/filebrowser/gedit-file-browser-error.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_FILE_BROWSER_ERROR_H__
-#define __GEDIT_FILE_BROWSER_ERROR_H__
+#ifndef GEDIT_FILE_BROWSER_ERROR_H
+#define GEDIT_FILE_BROWSER_ERROR_H
 
 G_BEGIN_DECLS
 
@@ -37,5 +37,5 @@ typedef enum {
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_BROWSER_ERROR_H__ */
+#endif /* GEDIT_FILE_BROWSER_ERROR_H */
 /* ex:set ts=8 noet: */
diff --git a/plugins/filebrowser/gedit-file-browser-messages.h 
b/plugins/filebrowser/gedit-file-browser-messages.h
index bb62ba6..9fcb316 100644
--- a/plugins/filebrowser/gedit-file-browser-messages.h
+++ b/plugins/filebrowser/gedit-file-browser-messages.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_FILE_BROWSER_MESSAGES_H__
-#define __GEDIT_FILE_BROWSER_MESSAGES_H__
+#ifndef GEDIT_FILE_BROWSER_MESSAGES_H
+#define GEDIT_FILE_BROWSER_MESSAGES_H
 
 #include <gedit/gedit-window.h>
 #include <gedit/gedit-message-bus.h>
@@ -29,5 +29,5 @@ void gedit_file_browser_messages_register   (GeditWindow            *window,
                                             GeditFileBrowserWidget *widget);
 void gedit_file_browser_messages_unregister (GeditWindow            *window);
 
-#endif /* __GEDIT_FILE_BROWSER_MESSAGES_H__ */
+#endif /* GEDIT_FILE_BROWSER_MESSAGES_H */
 /* ex:set ts=8 noet: */
diff --git a/plugins/filebrowser/gedit-file-browser-plugin.h b/plugins/filebrowser/gedit-file-browser-plugin.h
index 5b9d079..27fe706 100644
--- a/plugins/filebrowser/gedit-file-browser-plugin.h
+++ b/plugins/filebrowser/gedit-file-browser-plugin.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_FILE_BROWSER_PLUGIN_H__
-#define __GEDIT_FILE_BROWSER_PLUGIN_H__
+#ifndef GEDIT_FILE_BROWSER_PLUGIN_H
+#define GEDIT_FILE_BROWSER_PLUGIN_H
 
 #include <glib.h>
 #include <glib-object.h>
@@ -65,6 +65,6 @@ G_MODULE_EXPORT void  peas_register_types                     (PeasObjectModule *module);
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_BROWSER_PLUGIN_H__ */
+#endif /* GEDIT_FILE_BROWSER_PLUGIN_H */
 
 /* ex:set ts=8 noet: */
diff --git a/plugins/filebrowser/gedit-file-browser-store.h b/plugins/filebrowser/gedit-file-browser-store.h
index 5505adf..fd403f9 100644
--- a/plugins/filebrowser/gedit-file-browser-store.h
+++ b/plugins/filebrowser/gedit-file-browser-store.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_FILE_BROWSER_STORE_H__
-#define __GEDIT_FILE_BROWSER_STORE_H__
+#ifndef GEDIT_FILE_BROWSER_STORE_H
+#define GEDIT_FILE_BROWSER_STORE_H
 
 #include <gtk/gtk.h>
 
@@ -206,5 +206,5 @@ void                 _gedit_file_browser_store_register_type        (GTypeModule
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_BROWSER_STORE_H__ */
+#endif /* GEDIT_FILE_BROWSER_STORE_H */
 /* ex:set ts=8 noet: */
diff --git a/plugins/filebrowser/gedit-file-browser-utils.h b/plugins/filebrowser/gedit-file-browser-utils.h
index 4bca7bb..6b9c359 100644
--- a/plugins/filebrowser/gedit-file-browser-utils.h
+++ b/plugins/filebrowser/gedit-file-browser-utils.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_FILE_BROWSER_UTILS_H__
-#define __GEDIT_FILE_BROWSER_UTILS_H__
+#ifndef GEDIT_FILE_BROWSER_UTILS_H
+#define GEDIT_FILE_BROWSER_UTILS_H
 
 #include <gedit/gedit-window.h>
 #include <gio/gio.h>
@@ -41,5 +41,5 @@ gboolean       gedit_file_browser_utils_confirmation_dialog   (GeditWindow    *window,
                                                                 gchar const    *secondary,
                                                                 gchar const    *button_label);
 
-#endif /* __GEDIT_FILE_BROWSER_UTILS_H__ */
+#endif /* GEDIT_FILE_BROWSER_UTILS_H */
 /* ex:set ts=8 noet: */
diff --git a/plugins/filebrowser/gedit-file-browser-view.h b/plugins/filebrowser/gedit-file-browser-view.h
index ab2db80..7707231 100644
--- a/plugins/filebrowser/gedit-file-browser-view.h
+++ b/plugins/filebrowser/gedit-file-browser-view.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_FILE_BROWSER_VIEW_H__
-#define __GEDIT_FILE_BROWSER_VIEW_H__
+#ifndef GEDIT_FILE_BROWSER_VIEW_H
+#define GEDIT_FILE_BROWSER_VIEW_H
 
 #include <gtk/gtk.h>
 
@@ -80,5 +80,5 @@ void           _gedit_file_browser_view_register_type                 (GTypeModule
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_BROWSER_VIEW_H__ */
+#endif /* GEDIT_FILE_BROWSER_VIEW_H */
 /* ex:set ts=8 noet: */
diff --git a/plugins/filebrowser/gedit-file-browser-widget.h b/plugins/filebrowser/gedit-file-browser-widget.h
index 67c14be..8da8312 100644
--- a/plugins/filebrowser/gedit-file-browser-widget.h
+++ b/plugins/filebrowser/gedit-file-browser-widget.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_FILE_BROWSER_WIDGET_H__
-#define __GEDIT_FILE_BROWSER_WIDGET_H__
+#ifndef GEDIT_FILE_BROWSER_WIDGET_H
+#define GEDIT_FILE_BROWSER_WIDGET_H
 
 #include <gtk/gtk.h>
 #include <gedit/gedit-menu-extension.h>
@@ -122,5 +122,5 @@ void                 _gedit_file_browser_widget_register_type      (GTypeModule           
 *ty
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_BROWSER_WIDGET_H__ */
+#endif /* GEDIT_FILE_BROWSER_WIDGET_H */
 /* ex:set ts=8 noet: */
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-activation.h 
b/plugins/filebrowser/messages/gedit-file-browser-message-activation.h
index d9c56e5..bd3b1ed 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-activation.h
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-activation.h
@@ -21,8 +21,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GEDIT_FILE_BROWSER_MESSAGE_ACTIVATION_H__
-#define __GEDIT_FILE_BROWSER_MESSAGE_ACTIVATION_H__
+#ifndef GEDIT_FILE_BROWSER_MESSAGE_ACTIVATION_H
+#define GEDIT_FILE_BROWSER_MESSAGE_ACTIVATION_H
 
 #include <gedit/gedit-message.h>
 
@@ -66,4 +66,4 @@ GType gedit_file_browser_message_activation_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_BROWSER_MESSAGE_ACTIVATION_H__ */
+#endif /* GEDIT_FILE_BROWSER_MESSAGE_ACTIVATION_H */
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-add-filter.h 
b/plugins/filebrowser/messages/gedit-file-browser-message-add-filter.h
index b66fb76..4a5b35c 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-add-filter.h
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-add-filter.h
@@ -21,8 +21,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GEDIT_FILE_BROWSER_MESSAGE_ADD_FILTER_H__
-#define __GEDIT_FILE_BROWSER_MESSAGE_ADD_FILTER_H__
+#ifndef GEDIT_FILE_BROWSER_MESSAGE_ADD_FILTER_H
+#define GEDIT_FILE_BROWSER_MESSAGE_ADD_FILTER_H
 
 #include <gedit/gedit-message.h>
 
@@ -66,4 +66,4 @@ GType gedit_file_browser_message_add_filter_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_BROWSER_MESSAGE_ADD_FILTER_H__ */
+#endif /* GEDIT_FILE_BROWSER_MESSAGE_ADD_FILTER_H */
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-extend-context-menu.h 
b/plugins/filebrowser/messages/gedit-file-browser-message-extend-context-menu.h
index 66df0c6..643485d 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-extend-context-menu.h
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-extend-context-menu.h
@@ -22,8 +22,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GEDIT_FILE_BROWSER_MESSAGE_EXTEND_CONTEXT_MENU_H__
-#define __GEDIT_FILE_BROWSER_MESSAGE_EXTEND_CONTEXT_MENU_H__
+#ifndef GEDIT_FILE_BROWSER_MESSAGE_EXTEND_CONTEXT_MENU_H
+#define GEDIT_FILE_BROWSER_MESSAGE_EXTEND_CONTEXT_MENU_H
 
 #include <gedit/gedit-message.h>
 
@@ -67,4 +67,4 @@ GType gedit_file_browser_message_extend_context_menu_get_type (void) G_GNUC_CONS
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_BROWSER_MESSAGE_EXTEND_CONTEXT_MENU_H__ */
+#endif /* GEDIT_FILE_BROWSER_MESSAGE_EXTEND_CONTEXT_MENU_H */
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-get-root.h 
b/plugins/filebrowser/messages/gedit-file-browser-message-get-root.h
index ee44d90..8cc114d 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-get-root.h
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-get-root.h
@@ -21,8 +21,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GEDIT_FILE_BROWSER_MESSAGE_GET_ROOT_H__
-#define __GEDIT_FILE_BROWSER_MESSAGE_GET_ROOT_H__
+#ifndef GEDIT_FILE_BROWSER_MESSAGE_GET_ROOT_H
+#define GEDIT_FILE_BROWSER_MESSAGE_GET_ROOT_H
 
 #include <gedit/gedit-message.h>
 
@@ -66,4 +66,4 @@ GType gedit_file_browser_message_get_root_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_BROWSER_MESSAGE_GET_ROOT_H__ */
+#endif /* GEDIT_FILE_BROWSER_MESSAGE_GET_ROOT_H */
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-get-view.h 
b/plugins/filebrowser/messages/gedit-file-browser-message-get-view.h
index c3ab4a0..452abbc 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-get-view.h
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-get-view.h
@@ -21,8 +21,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GEDIT_FILE_BROWSER_MESSAGE_GET_VIEW_H__
-#define __GEDIT_FILE_BROWSER_MESSAGE_GET_VIEW_H__
+#ifndef GEDIT_FILE_BROWSER_MESSAGE_GET_VIEW_H
+#define GEDIT_FILE_BROWSER_MESSAGE_GET_VIEW_H
 
 #include <gedit/gedit-message.h>
 
@@ -66,4 +66,4 @@ GType gedit_file_browser_message_get_view_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_BROWSER_MESSAGE_GET_VIEW_H__ */
+#endif /* GEDIT_FILE_BROWSER_MESSAGE_GET_VIEW_H */
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-id-location.h 
b/plugins/filebrowser/messages/gedit-file-browser-message-id-location.h
index 0442364..0af4c77 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-id-location.h
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-id-location.h
@@ -22,8 +22,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GEDIT_FILE_BROWSER_MESSAGE_ID_LOCATION_H__
-#define __GEDIT_FILE_BROWSER_MESSAGE_ID_LOCATION_H__
+#ifndef GEDIT_FILE_BROWSER_MESSAGE_ID_LOCATION_H
+#define GEDIT_FILE_BROWSER_MESSAGE_ID_LOCATION_H
 
 #include <gedit/gedit-message.h>
 
@@ -67,4 +67,4 @@ GType gedit_file_browser_message_id_location_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_BROWSER_MESSAGE_ID_LOCATION_H__ */
+#endif /* GEDIT_FILE_BROWSER_MESSAGE_ID_LOCATION_H */
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-id.h 
b/plugins/filebrowser/messages/gedit-file-browser-message-id.h
index 91f095d..8351c3b 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-id.h
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-id.h
@@ -21,8 +21,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GEDIT_FILE_BROWSER_MESSAGE_ID_H__
-#define __GEDIT_FILE_BROWSER_MESSAGE_ID_H__
+#ifndef GEDIT_FILE_BROWSER_MESSAGE_ID_H
+#define GEDIT_FILE_BROWSER_MESSAGE_ID_H
 
 #include <gedit/gedit-message.h>
 
@@ -66,4 +66,4 @@ GType gedit_file_browser_message_id_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_BROWSER_MESSAGE_ID_H__ */
+#endif /* GEDIT_FILE_BROWSER_MESSAGE_ID_H */
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-set-emblem.h 
b/plugins/filebrowser/messages/gedit-file-browser-message-set-emblem.h
index c9bf9c4..6daa795 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-set-emblem.h
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-set-emblem.h
@@ -21,8 +21,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GEDIT_FILE_BROWSER_MESSAGE_SET_EMBLEM_H__
-#define __GEDIT_FILE_BROWSER_MESSAGE_SET_EMBLEM_H__
+#ifndef GEDIT_FILE_BROWSER_MESSAGE_SET_EMBLEM_H
+#define GEDIT_FILE_BROWSER_MESSAGE_SET_EMBLEM_H
 
 #include <gedit/gedit-message.h>
 
@@ -66,4 +66,4 @@ GType gedit_file_browser_message_set_emblem_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_BROWSER_MESSAGE_SET_EMBLEM_H__ */
+#endif /* GEDIT_FILE_BROWSER_MESSAGE_SET_EMBLEM_H */
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-set-markup.h 
b/plugins/filebrowser/messages/gedit-file-browser-message-set-markup.h
index f8e6437..ab9a1dc 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-set-markup.h
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-set-markup.h
@@ -22,8 +22,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GEDIT_FILE_BROWSER_MESSAGE_SET_MARKUP_H__
-#define __GEDIT_FILE_BROWSER_MESSAGE_SET_MARKUP_H__
+#ifndef GEDIT_FILE_BROWSER_MESSAGE_SET_MARKUP_H
+#define GEDIT_FILE_BROWSER_MESSAGE_SET_MARKUP_H
 
 #include <gedit/gedit-message.h>
 
@@ -67,4 +67,4 @@ GType gedit_file_browser_message_set_markup_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_BROWSER_MESSAGE_SET_MARKUP_H__ */
+#endif /* GEDIT_FILE_BROWSER_MESSAGE_SET_MARKUP_H */
diff --git a/plugins/filebrowser/messages/gedit-file-browser-message-set-root.h 
b/plugins/filebrowser/messages/gedit-file-browser-message-set-root.h
index 7a17157..8b61c50 100644
--- a/plugins/filebrowser/messages/gedit-file-browser-message-set-root.h
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-set-root.h
@@ -21,8 +21,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __GEDIT_FILE_BROWSER_MESSAGE_SET_ROOT_H__
-#define __GEDIT_FILE_BROWSER_MESSAGE_SET_ROOT_H__
+#ifndef GEDIT_FILE_BROWSER_MESSAGE_SET_ROOT_H
+#define GEDIT_FILE_BROWSER_MESSAGE_SET_ROOT_H
 
 #include <gedit/gedit-message.h>
 
@@ -66,4 +66,4 @@ GType gedit_file_browser_message_set_root_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GEDIT_FILE_BROWSER_MESSAGE_SET_ROOT_H__ */
+#endif /* GEDIT_FILE_BROWSER_MESSAGE_SET_ROOT_H */
diff --git a/plugins/filebrowser/messages/messages.h b/plugins/filebrowser/messages/messages.h
index e470e82..4dc0f51 100644
--- a/plugins/filebrowser/messages/messages.h
+++ b/plugins/filebrowser/messages/messages.h
@@ -1,5 +1,5 @@
-#ifndef __GEDIT_FILE_BROWER_MESSAGES_MESSAGES_H__
-#define __GEDIT_FILE_BROWER_MESSAGES_MESSAGES_H__
+#ifndef GEDIT_FILE_BROWER_MESSAGES_MESSAGES_H
+#define GEDIT_FILE_BROWER_MESSAGES_MESSAGES_H
 
 #include "gedit-file-browser-message-activation.h"
 #include "gedit-file-browser-message-add-filter.h"
@@ -12,5 +12,5 @@
 #include "gedit-file-browser-message-set-markup.h"
 #include "gedit-file-browser-message-set-root.h"
 
-#endif /* __GEDIT_FILE_BROWER_MESSAGES_MESSAGES_H__ */
+#endif /* GEDIT_FILE_BROWER_MESSAGES_MESSAGES_H */
 
diff --git a/plugins/modelines/gedit-modeline-plugin.h b/plugins/modelines/gedit-modeline-plugin.h
index ee76895..d3557e4 100644
--- a/plugins/modelines/gedit-modeline-plugin.h
+++ b/plugins/modelines/gedit-modeline-plugin.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_MODELINE_PLUGIN_H__
-#define __GEDIT_MODELINE_PLUGIN_H__
+#ifndef GEDIT_MODELINE_PLUGIN_H
+#define GEDIT_MODELINE_PLUGIN_H
 
 #include <glib.h>
 #include <glib-object.h>
@@ -56,5 +56,5 @@ G_MODULE_EXPORT void peas_register_types (PeasObjectModule *module);
 
 G_END_DECLS
 
-#endif /* __GEDIT_MODELINE_PLUGIN_H__ */
+#endif /* GEDIT_MODELINE_PLUGIN_H */
 /* ex:set ts=8 noet: */
diff --git a/plugins/modelines/modeline-parser.h b/plugins/modelines/modeline-parser.h
index ae68aa4..0fbf9a1 100644
--- a/plugins/modelines/modeline-parser.h
+++ b/plugins/modelines/modeline-parser.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __MODELINE_PARSER_H__
-#define __MODELINE_PARSER_H__
+#ifndef MODELINE_PARSER_H
+#define MODELINE_PARSER_H
 
 #include <glib.h>
 #include <gtksourceview/gtksource.h>
@@ -32,5 +32,5 @@ void  modeline_parser_apply_modeline  (GtkSourceView *view);
 
 G_END_DECLS
 
-#endif /* __MODELINE_PARSER_H__ */
+#endif /* MODELINE_PARSER_H */
 /* ex:set ts=8 noet: */
diff --git a/plugins/sort/gedit-sort-plugin.h b/plugins/sort/gedit-sort-plugin.h
index 3907d6f..e8739e0 100644
--- a/plugins/sort/gedit-sort-plugin.h
+++ b/plugins/sort/gedit-sort-plugin.h
@@ -15,8 +15,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_SORT_PLUGIN_H__
-#define __GEDIT_SORT_PLUGIN_H__
+#ifndef GEDIT_SORT_PLUGIN_H
+#define GEDIT_SORT_PLUGIN_H
 
 #include <glib.h>
 #include <glib-object.h>
@@ -55,5 +55,5 @@ G_MODULE_EXPORT void  peas_register_types             (PeasObjectModule *module);
 
 G_END_DECLS
 
-#endif /* __GEDIT_SORT_PLUGIN_H__ */
+#endif /* GEDIT_SORT_PLUGIN_H */
 /* ex:set ts=8 noet: */
diff --git a/plugins/spell/gedit-spell-app-activatable.h b/plugins/spell/gedit-spell-app-activatable.h
index f6bf3f4..aebb5ca 100644
--- a/plugins/spell/gedit-spell-app-activatable.h
+++ b/plugins/spell/gedit-spell-app-activatable.h
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef __GEDIT_SPELL_APP_ACTIVATABLE_H__
-#define __GEDIT_SPELL_APP_ACTIVATABLE_H__
+#ifndef GEDIT_SPELL_APP_ACTIVATABLE_H
+#define GEDIT_SPELL_APP_ACTIVATABLE_H
 
 #include <glib-object.h>
 
@@ -35,4 +35,4 @@ void  gedit_spell_app_activatable_register    (GTypeModule *module);
 
 G_END_DECLS
 
-#endif /* __GEDIT_SPELL_APP_ACTIVATABLE_H__ */
+#endif /* GEDIT_SPELL_APP_ACTIVATABLE_H */
diff --git a/plugins/spell/gedit-spell-plugin.h b/plugins/spell/gedit-spell-plugin.h
index abb1135..13539b4 100644
--- a/plugins/spell/gedit-spell-plugin.h
+++ b/plugins/spell/gedit-spell-plugin.h
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_SPELL_PLUGIN_H__
-#define __GEDIT_SPELL_PLUGIN_H__
+#ifndef GEDIT_SPELL_PLUGIN_H
+#define GEDIT_SPELL_PLUGIN_H
 
 #include <glib.h>
 #include <glib-object.h>
@@ -57,6 +57,6 @@ G_MODULE_EXPORT void  peas_register_types             (PeasObjectModule *module);
 
 G_END_DECLS
 
-#endif /* __GEDIT_SPELL_PLUGIN_H__ */
+#endif /* GEDIT_SPELL_PLUGIN_H */
 
 /* ex:set ts=8 noet: */
diff --git a/plugins/time/gedit-time-plugin.h b/plugins/time/gedit-time-plugin.h
index beb02b6..42ad349 100644
--- a/plugins/time/gedit-time-plugin.h
+++ b/plugins/time/gedit-time-plugin.h
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GEDIT_TIME_PLUGIN_H__
-#define __GEDIT_TIME_PLUGIN_H__
+#ifndef GEDIT_TIME_PLUGIN_H
+#define GEDIT_TIME_PLUGIN_H
 
 #include <glib.h>
 #include <glib-object.h>
@@ -57,5 +57,5 @@ G_MODULE_EXPORT void  peas_register_types             (PeasObjectModule *module);
 
 G_END_DECLS
 
-#endif /* __GEDIT_TIME_PLUGIN_H__ */
+#endif /* GEDIT_TIME_PLUGIN_H */
 /* ex:set ts=8 noet: */
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]