GNOME.org
 

[gtksourceview] Do not prefix macro names with underscores

commit 43fa30e85f7ae9148ae9a93c31cd8162927dcdf9
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Apr 28 18:10:37 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.

 build/win32/gen-enums.batin                        |    6 +++---
 gtksourceview/Makefile.am                          |    6 +++---
 .../words/gtksourcecompletionwords.h               |    6 +++---
 .../words/gtksourcecompletionwordsbuffer.h         |    6 +++---
 .../words/gtksourcecompletionwordslibrary.h        |    6 +++---
 .../words/gtksourcecompletionwordsproposal.h       |    6 +++---
 .../words/gtksourcecompletionwordsutils.h          |    6 +++---
 gtksourceview/gtksource.h                          |    6 +++---
 gtksourceview/gtksourceautocleanups.h              |    6 +++---
 gtksourceview/gtksourcebuffer-private.h            |    6 +++---
 gtksourceview/gtksourcebuffer.h                    |    6 +++---
 gtksourceview/gtksourcebufferinputstream.h         |    6 +++---
 gtksourceview/gtksourcebufferoutputstream.h        |    6 +++---
 gtksourceview/gtksourcecompletion-private.h        |    6 +++---
 gtksourceview/gtksourcecompletion.h                |    6 +++---
 gtksourceview/gtksourcecompletioncontainer.h       |    6 +++---
 gtksourceview/gtksourcecompletioncontext.h         |    6 +++---
 gtksourceview/gtksourcecompletioninfo.h            |    6 +++---
 gtksourceview/gtksourcecompletionitem.h            |    6 +++---
 gtksourceview/gtksourcecompletionmodel.h           |    6 +++---
 gtksourceview/gtksourcecompletionproposal.h        |    6 +++---
 gtksourceview/gtksourcecompletionprovider.h        |    6 +++---
 gtksourceview/gtksourcecontextengine.h             |    6 +++---
 gtksourceview/gtksourceencoding-private.h          |    6 +++---
 gtksourceview/gtksourceencoding.h                  |    6 +++---
 gtksourceview/gtksourceengine.h                    |    6 +++---
 gtksourceview/gtksourcefile.h                      |    6 +++---
 gtksourceview/gtksourcefileloader.h                |    6 +++---
 gtksourceview/gtksourcefilesaver.h                 |    6 +++---
 gtksourceview/gtksourcegutter-private.h            |    6 +++---
 gtksourceview/gtksourcegutter.h                    |    6 +++---
 gtksourceview/gtksourcegutterrenderer-private.h    |    6 +++---
 gtksourceview/gtksourcegutterrenderer.h            |    6 +++---
 gtksourceview/gtksourcegutterrendererlines.h       |    6 +++---
 gtksourceview/gtksourcegutterrenderermarks.h       |    6 +++---
 gtksourceview/gtksourcegutterrendererpixbuf.h      |    6 +++---
 gtksourceview/gtksourcegutterrenderertext.h        |    6 +++---
 gtksourceview/gtksourceiter.h                      |    6 +++---
 gtksourceview/gtksourcelanguage-private.h          |    6 +++---
 gtksourceview/gtksourcelanguage.h                  |    6 +++---
 gtksourceview/gtksourcelanguagemanager.h           |    6 +++---
 gtksourceview/gtksourcemap.h                       |    6 +++---
 gtksourceview/gtksourcemark.h                      |    6 +++---
 gtksourceview/gtksourcemarkattributes.h            |    6 +++---
 gtksourceview/gtksourcemarkssequence.h             |    6 +++---
 gtksourceview/gtksourcepixbufhelper.h              |    6 +++---
 gtksourceview/gtksourceprintcompositor.h           |    6 +++---
 gtksourceview/gtksourceregex.h                     |    6 +++---
 gtksourceview/gtksourceregion.h                    |    6 +++---
 gtksourceview/gtksourcesearchcontext.h             |    6 +++---
 gtksourceview/gtksourcesearchsettings.h            |    6 +++---
 gtksourceview/gtksourcestyle-private.h             |    6 +++---
 gtksourceview/gtksourcestyle.h                     |    6 +++---
 gtksourceview/gtksourcestylescheme.h               |    6 +++---
 gtksourceview/gtksourcestyleschemechooser.h        |    6 +++---
 gtksourceview/gtksourcestyleschemechooserbutton.h  |    6 +++---
 gtksourceview/gtksourcestyleschememanager.h        |    6 +++---
 gtksourceview/gtksourcetag-private.h               |    6 +++---
 gtksourceview/gtksourcetag.h                       |    6 +++---
 gtksourceview/gtksourcetypes-private.h             |    6 +++---
 gtksourceview/gtksourcetypes.h                     |    6 +++---
 gtksourceview/gtksourceundomanager.h               |    6 +++---
 gtksourceview/gtksourceundomanagerdefault.h        |    6 +++---
 gtksourceview/gtksourceutils.h                     |    6 +++---
 gtksourceview/gtksourceversion.h.in                |    6 +++---
 gtksourceview/gtksourceview-i18n.h                 |    6 +++---
 gtksourceview/gtksourceview-utils.h                |    6 +++---
 gtksourceview/gtksourceview.h                      |    6 +++---
 68 files changed, 204 insertions(+), 204 deletions(-)
---
diff --git a/build/win32/gen-enums.batin b/build/win32/gen-enums.batin
index 831cb48..5b6bc1b 100644
--- a/build/win32/gen-enums.batin
+++ b/build/win32/gen-enums.batin
@@ -24,9 +24,9 @@ call perl %1\bin\glib-mkenums ^
 &1> gtksourceview-typebuiltins.c
 
 call perl %1\bin\glib-mkenums ^
---fhead "#ifndef __GTKSOURCEVIEW_TYPEBUILTINS_H__\n" ^
---fhead "#define __GTKSOURCEVIEW_TYPEBUILTINS_H__\n\n" ^
---ftail "#endif /* __GTKSOURCEVIEW_TYPEBUILTINS_H__ */\n" ^
+--fhead "#ifndef GTKSOURCEVIEW_TYPEBUILTINS_H\n" ^
+--fhead "#define GTKSOURCEVIEW_TYPEBUILTINS_H\n\n" ^
+--ftail "#endif /* GTKSOURCEVIEW_TYPEBUILTINS_H */\n" ^
 --fprod "#include <gtksourceview/@filename@>\n" ^
 --eprod "G_BEGIN_DECLS\n" ^
 --eprod "#define GTK_TYPE_ ENUMSHORT@ @enum_name _get_type()\n" ^
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index ad07738..bd4f165 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -231,9 +231,9 @@ gtksourceview-typebuiltins.h: stamp-gtksourceview-typebuiltins.h
 stamp-gtksourceview-typebuiltins.h: Makefile.am $(libgtksourceview_public_headers)
        $(AM_V_GEN) (cd $(srcdir) \
         && $(GLIB_MKENUMS) \
-                       --fhead "#ifndef __GTKSOURCEVIEW_TYPEBUILTINS_H__\n" \
-                       --fhead "#define __GTKSOURCEVIEW_TYPEBUILTINS_H__\n\n" \
-                       --ftail "#endif /* __GTKSOURCEVIEW_TYPEBUILTINS_H__ */\n" \
+                       --fhead "#ifndef GTKSOURCEVIEW_TYPEBUILTINS_H\n" \
+                       --fhead "#define GTKSOURCEVIEW_TYPEBUILTINS_H\n\n" \
+                       --ftail "#endif /* GTKSOURCEVIEW_TYPEBUILTINS_H */\n" \
                        --fprod "#include <gtksourceview/@filename@>\n" \
                        --eprod "G_BEGIN_DECLS\n" \
                        --eprod "#define GTK_TYPE_ ENUMSHORT@ @enum_name _get_type()\n" \
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwords.h 
b/gtksourceview/completion-providers/words/gtksourcecompletionwords.h
index 7956b25..e803099 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwords.h
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwords.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_COMPLETION_WORDS_H__
-#define __GTK_SOURCE_COMPLETION_WORDS_H__
+#ifndef GTK_SOURCE_COMPLETION_WORDS_H
+#define GTK_SOURCE_COMPLETION_WORDS_H
 
 #include <gtksourceview/gtksourcecompletionprovider.h>
 #include <gtk/gtk.h>
@@ -66,4 +66,4 @@ void          gtk_source_completion_words_unregister  (GtkSourceCompletionWords *words,
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_COMPLETION_WORDS_H__ */
+#endif /* GTK_SOURCE_COMPLETION_WORDS_H */
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.h 
b/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.h
index b7bb090..28a5d14 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.h
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_COMPLETION_WORDS_BUFFER_H__
-#define __GTK_SOURCE_COMPLETION_WORDS_BUFFER_H__
+#ifndef GTK_SOURCE_COMPLETION_WORDS_BUFFER_H
+#define GTK_SOURCE_COMPLETION_WORDS_BUFFER_H
 
 #include <gtk/gtk.h>
 
@@ -71,4 +71,4 @@ void           gtk_source_completion_words_buffer_set_minimum_word_size       
(GtkSourceComple
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_COMPLETION_WORDS_BUFFER_H__ */
+#endif /* GTK_SOURCE_COMPLETION_WORDS_BUFFER_H */
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.h 
b/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.h
index 55c2630..35c0a39 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.h
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_COMPLETION_WORDS_LIBRARY_H__
-#define __GTK_SOURCE_COMPLETION_WORDS_LIBRARY_H__
+#ifndef GTK_SOURCE_COMPLETION_WORDS_LIBRARY_H
+#define GTK_SOURCE_COMPLETION_WORDS_LIBRARY_H
 
 #include <glib-object.h>
 #include "gtksourcecompletionwordsproposal.h"
@@ -97,4 +97,4 @@ void           gtk_source_completion_words_library_unlock             
(GtkSourceCompletionWordsLib
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_COMPLETION_WORDS_LIBRARY_H__ */
+#endif /* GTK_SOURCE_COMPLETION_WORDS_LIBRARY_H */
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.h 
b/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.h
index 5b6c83b..9c1dd8b 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.h
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_COMPLETION_WORDS_PROPOSAL_H__
-#define __GTK_SOURCE_COMPLETION_WORDS_PROPOSAL_H__
+#ifndef GTK_SOURCE_COMPLETION_WORDS_PROPOSAL_H
+#define GTK_SOURCE_COMPLETION_WORDS_PROPOSAL_H
 
 #include <glib-object.h>
 #include <gtksourceview/gtksourcecompletionproposal.h>
@@ -69,4 +69,4 @@ void           gtk_source_completion_words_proposal_unuse     (GtkSourceCompletionWordsProp
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_COMPLETION_WORDS_PROPOSAL_H__ */
+#endif /* GTK_SOURCE_COMPLETION_WORDS_PROPOSAL_H */
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordsutils.h 
b/gtksourceview/completion-providers/words/gtksourcecompletionwordsutils.h
index cf8f0e1..f31993e 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwordsutils.h
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordsutils.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_COMPLETION_WORDS_UTILS_H__
-#define __GTK_SOURCE_COMPLETION_WORDS_UTILS_H__
+#ifndef GTK_SOURCE_COMPLETION_WORDS_UTILS_H
+#define GTK_SOURCE_COMPLETION_WORDS_UTILS_H
 
 #include <gtk/gtk.h>
 
@@ -44,4 +44,4 @@ void           _gtk_source_completion_words_utils_check_scan_region   (const GtkTextIter *
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_COMPLETION_WORDS_UTILS_H__ */
+#endif /* GTK_SOURCE_COMPLETION_WORDS_UTILS_H */
diff --git a/gtksourceview/gtksource.h b/gtksourceview/gtksource.h
index f64c88b..915e1e5 100644
--- a/gtksourceview/gtksource.h
+++ b/gtksourceview/gtksource.h
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_H__
-#define __GTK_SOURCE_H__
+#ifndef GTK_SOURCE_H
+#define GTK_SOURCE_H
 
 #include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourcebuffer.h>
@@ -59,4 +59,4 @@
 #include <gtksourceview/gtksourceview-typebuiltins.h>
 #include <gtksourceview/gtksourceautocleanups.h>
 
-#endif /* __GTK_SOURCE_H__ */
+#endif /* GTK_SOURCE_H */
diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h
index a5a0c18..d44857f 100644
--- a/gtksourceview/gtksourceautocleanups.h
+++ b/gtksourceview/gtksourceautocleanups.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_AUTOCLEANUPS_H__
-#define __GTK_SOURCE_AUTOCLEANUPS_H__
+#ifndef GTK_SOURCE_AUTOCLEANUPS_H
+#define GTK_SOURCE_AUTOCLEANUPS_H
 
 #ifndef __GI_SCANNER__
 
@@ -49,4 +49,4 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSourceView, g_object_unref)
 
 #endif /* __GI_SCANNER__ */
 
-#endif /* __GTK_SOURCE_AUTOCLEANUPS_H__ */
+#endif /* GTK_SOURCE_AUTOCLEANUPS_H */
diff --git a/gtksourceview/gtksourcebuffer-private.h b/gtksourceview/gtksourcebuffer-private.h
index 3367c2f..b329d92 100644
--- a/gtksourceview/gtksourcebuffer-private.h
+++ b/gtksourceview/gtksourcebuffer-private.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_BUFFER_PRIVATE_H__
-#define __GTK_SOURCE_BUFFER_PRIVATE_H__
+#ifndef GTK_SOURCE_BUFFER_PRIVATE_H
+#define GTK_SOURCE_BUFFER_PRIVATE_H
 
 #include <gtk/gtk.h>
 #include "gtksourcetypes.h"
@@ -77,4 +77,4 @@ gboolean               _gtk_source_buffer_is_undo_redo_enabled        (GtkSourceBuffer      
  *buff
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_BUFFER_PRIVATE_H__ */
+#endif /* GTK_SOURCE_BUFFER_PRIVATE_H */
diff --git a/gtksourceview/gtksourcebuffer.h b/gtksourceview/gtksourcebuffer.h
index d495656..311662d 100644
--- a/gtksourceview/gtksourcebuffer.h
+++ b/gtksourceview/gtksourcebuffer.h
@@ -23,8 +23,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_BUFFER_H__
-#define __GTK_SOURCE_BUFFER_H__
+#ifndef GTK_SOURCE_BUFFER_H
+#define GTK_SOURCE_BUFFER_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -276,4 +276,4 @@ GtkTextTag          *gtk_source_buffer_create_source_tag                    
(GtkSourceBuffer        *buff
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_BUFFER_H__ */
+#endif /* GTK_SOURCE_BUFFER_H */
diff --git a/gtksourceview/gtksourcebufferinputstream.h b/gtksourceview/gtksourcebufferinputstream.h
index bcf3ec0..375cca4 100644
--- a/gtksourceview/gtksourcebufferinputstream.h
+++ b/gtksourceview/gtksourcebufferinputstream.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_BUFFER_INPUT_STREAM_H__
-#define __GTK_SOURCE_BUFFER_INPUT_STREAM_H__
+#ifndef GTK_SOURCE_BUFFER_INPUT_STREAM_H
+#define GTK_SOURCE_BUFFER_INPUT_STREAM_H
 
 #include <gio/gio.h>
 #include <gtk/gtk.h>
@@ -69,4 +69,4 @@ gsize          _gtk_source_buffer_input_stream_tell                   
(GtkSourceBufferInputStream *stre
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_BUFFER_INPUT_STREAM_H__ */
+#endif /* GTK_SOURCE_BUFFER_INPUT_STREAM_H */
diff --git a/gtksourceview/gtksourcebufferoutputstream.h b/gtksourceview/gtksourcebufferoutputstream.h
index 80b6681..6397fa1 100644
--- a/gtksourceview/gtksourcebufferoutputstream.h
+++ b/gtksourceview/gtksourcebufferoutputstream.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_BUFFER_OUTPUT_STREAM_H__
-#define __GTK_SOURCE_BUFFER_OUTPUT_STREAM_H__
+#ifndef GTK_SOURCE_BUFFER_OUTPUT_STREAM_H
+#define GTK_SOURCE_BUFFER_OUTPUT_STREAM_H
 
 #include <gtk/gtk.h>
 #include "gtksourcetypes.h"
@@ -74,4 +74,4 @@ guint                  gtk_source_buffer_output_stream_get_num_fallbacks
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_BUFFER_OUTPUT_STREAM_H__ */
+#endif /* GTK_SOURCE_BUFFER_OUTPUT_STREAM_H */
diff --git a/gtksourceview/gtksourcecompletion-private.h b/gtksourceview/gtksourcecompletion-private.h
index 8791834..32a3c33 100644
--- a/gtksourceview/gtksourcecompletion-private.h
+++ b/gtksourceview/gtksourcecompletion-private.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_COMPLETION_PIVATE_H__
-#define __GTK_SOURCE_COMPLETION_PIVATE_H__
+#ifndef GTK_SOURCE_COMPLETION_PIVATE_H
+#define GTK_SOURCE_COMPLETION_PIVATE_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -28,5 +28,5 @@
 G_GNUC_INTERNAL
 GtkSourceCompletion *gtk_source_completion_new (GtkSourceView *source_view);
 
-#endif /* __GTK_SOURCE_COMPLETION_PIVATE_H__ */
+#endif /* GTK_SOURCE_COMPLETION_PIVATE_H */
 
diff --git a/gtksourceview/gtksourcecompletion.h b/gtksourceview/gtksourcecompletion.h
index 6cf52ad..7717ab9 100644
--- a/gtksourceview/gtksourcecompletion.h
+++ b/gtksourceview/gtksourcecompletion.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_COMPLETION_H__
-#define __GTK_SOURCE_COMPLETION_H__
+#ifndef GTK_SOURCE_COMPLETION_H
+#define GTK_SOURCE_COMPLETION_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -152,4 +152,4 @@ void                 _gtk_source_completion_add_proposals           (GtkSourceCompletion  
         *com
                                                                 gboolean                       finished);
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_COMPLETION_H__ */
+#endif /* GTK_SOURCE_COMPLETION_H */
diff --git a/gtksourceview/gtksourcecompletioncontainer.h b/gtksourceview/gtksourcecompletioncontainer.h
index 2c26fa5..dad4558 100644
--- a/gtksourceview/gtksourcecompletioncontainer.h
+++ b/gtksourceview/gtksourcecompletioncontainer.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_COMPLETION_CONTAINER_H__
-#define __GTK_SOURCE_COMPLETION_CONTAINER_H__
+#ifndef GTK_SOURCE_COMPLETION_CONTAINER_H
+#define GTK_SOURCE_COMPLETION_CONTAINER_H
 
 #include <gtk/gtk.h>
 #include "gtksourcetypes-private.h"
@@ -55,4 +55,4 @@ GtkSourceCompletionContainer *
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_COMPLETION_CONTAINER_H__ */
+#endif /* GTK_SOURCE_COMPLETION_CONTAINER_H */
diff --git a/gtksourceview/gtksourcecompletioncontext.h b/gtksourceview/gtksourcecompletioncontext.h
index 13699b4..90d064b 100644
--- a/gtksourceview/gtksourcecompletioncontext.h
+++ b/gtksourceview/gtksourcecompletioncontext.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_COMPLETION_CONTEXT_H__
-#define __GTK_SOURCE_COMPLETION_CONTEXT_H__
+#ifndef GTK_SOURCE_COMPLETION_CONTEXT_H
+#define GTK_SOURCE_COMPLETION_CONTEXT_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -98,4 +98,4 @@ void          _gtk_source_completion_context_cancel           (GtkSourceCompletionContext   
*cont
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_COMPLETION_CONTEXT_H__ */
+#endif /* GTK_SOURCE_COMPLETION_CONTEXT_H */
diff --git a/gtksourceview/gtksourcecompletioninfo.h b/gtksourceview/gtksourcecompletioninfo.h
index 17d3a87..9b2abae 100644
--- a/gtksourceview/gtksourcecompletioninfo.h
+++ b/gtksourceview/gtksourcecompletioninfo.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_COMPLETION_INFO_H__
-#define __GTK_SOURCE_COMPLETION_INFO_H__
+#ifndef GTK_SOURCE_COMPLETION_INFO_H
+#define GTK_SOURCE_COMPLETION_INFO_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -78,4 +78,4 @@ void           _gtk_source_completion_info_set_xoffset        (GtkSourceCompletionInfo 
*info,
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_COMPLETION_INFO_H__ */
+#endif /* GTK_SOURCE_COMPLETION_INFO_H */
diff --git a/gtksourceview/gtksourcecompletionitem.h b/gtksourceview/gtksourcecompletionitem.h
index cf85c93..b24001a 100644
--- a/gtksourceview/gtksourcecompletionitem.h
+++ b/gtksourceview/gtksourcecompletionitem.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_COMPLETION_ITEM_H__
-#define __GTK_SOURCE_COMPLETION_ITEM_H__
+#ifndef GTK_SOURCE_COMPLETION_ITEM_H
+#define GTK_SOURCE_COMPLETION_ITEM_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -70,4 +70,4 @@ GtkSourceCompletionItem *gtk_source_completion_item_new_from_stock    (const gchar
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_COMPLETION_ITEM_H__ */
+#endif /* GTK_SOURCE_COMPLETION_ITEM_H */
diff --git a/gtksourceview/gtksourcecompletionmodel.h b/gtksourceview/gtksourcecompletionmodel.h
index 76a666f..96f8dd5 100644
--- a/gtksourceview/gtksourcecompletionmodel.h
+++ b/gtksourceview/gtksourcecompletionmodel.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_COMPLETION_MODEL_H__
-#define __GTK_SOURCE_COMPLETION_MODEL_H__
+#ifndef GTK_SOURCE_COMPLETION_MODEL_H
+#define GTK_SOURCE_COMPLETION_MODEL_H
 
 #include <gtk/gtk.h>
 #include "gtksourcetypes.h"
@@ -127,4 +127,4 @@ gboolean gtk_source_completion_model_iter_equal                     
(GtkSourceCompletionModel    *
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_COMPLETION_MODEL_H__ */
+#endif /* GTK_SOURCE_COMPLETION_MODEL_H */
diff --git a/gtksourceview/gtksourcecompletionproposal.h b/gtksourceview/gtksourcecompletionproposal.h
index d498df4..ee40520 100644
--- a/gtksourceview/gtksourcecompletionproposal.h
+++ b/gtksourceview/gtksourcecompletionproposal.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_COMPLETION_PROPOSAL_H__
-#define __GTK_SOURCE_COMPLETION_PROPOSAL_H__
+#ifndef GTK_SOURCE_COMPLETION_PROPOSAL_H
+#define GTK_SOURCE_COMPLETION_PROPOSAL_H
 
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -120,4 +120,4 @@ gboolean             gtk_source_completion_proposal_equal           
(GtkSourceCompletionProposal *p
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_COMPLETION_PROPOSAL_H__ */
+#endif /* GTK_SOURCE_COMPLETION_PROPOSAL_H */
diff --git a/gtksourceview/gtksourcecompletionprovider.h b/gtksourceview/gtksourcecompletionprovider.h
index 5003adc..a2e79a3 100644
--- a/gtksourceview/gtksourcecompletionprovider.h
+++ b/gtksourceview/gtksourcecompletionprovider.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_COMPLETION_PROVIDER_H__
-#define __GTK_SOURCE_COMPLETION_PROVIDER_H__
+#ifndef GTK_SOURCE_COMPLETION_PROVIDER_H
+#define GTK_SOURCE_COMPLETION_PROVIDER_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcecompletioncontext.h>
@@ -160,4 +160,4 @@ gint                 gtk_source_completion_provider_get_priority    
(GtkSourceCompletionProvider
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_COMPLETION_PROVIDER_H__ */
+#endif /* GTK_SOURCE_COMPLETION_PROVIDER_H */
diff --git a/gtksourceview/gtksourcecontextengine.h b/gtksourceview/gtksourcecontextengine.h
index b12a5ca..2394ff3 100644
--- a/gtksourceview/gtksourcecontextengine.h
+++ b/gtksourceview/gtksourcecontextengine.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_CONTEXT_ENGINE_H__
-#define __GTK_SOURCE_CONTEXT_ENGINE_H__
+#ifndef GTK_SOURCE_CONTEXT_ENGINE_H
+#define GTK_SOURCE_CONTEXT_ENGINE_H
 
 #include "gtksourceengine.h"
 #include "gtksourcetypes.h"
@@ -142,4 +142,4 @@ void                         _gtk_source_context_data_set_escape_char       
(GtkSourceContextData    *data,
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_CONTEXT_ENGINE_H__ */
+#endif /* GTK_SOURCE_CONTEXT_ENGINE_H */
diff --git a/gtksourceview/gtksourceencoding-private.h b/gtksourceview/gtksourceencoding-private.h
index ad04361..b6e4620 100644
--- a/gtksourceview/gtksourceencoding-private.h
+++ b/gtksourceview/gtksourceencoding-private.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_ENCODING_PRIVATE_H__
-#define __GTK_SOURCE_ENCODING_PRIVATE_H__
+#ifndef GTK_SOURCE_ENCODING_PRIVATE_H
+#define GTK_SOURCE_ENCODING_PRIVATE_H
 
 #include <glib.h>
 #include "gtksourcetypes-private.h"
@@ -49,4 +49,4 @@ GSList *              _gtk_source_encoding_remove_duplicates          (GSList               
       *
 
 G_END_DECLS
 
-#endif  /* __GTK_SOURCE_ENCODING_PRIVATE_H__ */
+#endif  /* GTK_SOURCE_ENCODING_PRIVATE_H */
diff --git a/gtksourceview/gtksourceencoding.h b/gtksourceview/gtksourceencoding.h
index 5c892bc..73d8b1a 100644
--- a/gtksourceview/gtksourceencoding.h
+++ b/gtksourceview/gtksourceencoding.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_ENCODING_H__
-#define __GTK_SOURCE_ENCODING_H__
+#ifndef GTK_SOURCE_ENCODING_H
+#define GTK_SOURCE_ENCODING_H
 
 #include <glib.h>
 #include <glib-object.h>
@@ -68,4 +68,4 @@ void                   gtk_source_encoding_free                       (GtkSourceEncoding    
   *enc);
 
 G_END_DECLS
 
-#endif  /* __GTK_SOURCE_ENCODING_H__ */
+#endif  /* GTK_SOURCE_ENCODING_H */
diff --git a/gtksourceview/gtksourceengine.h b/gtksourceview/gtksourceengine.h
index 5751349..f382613 100644
--- a/gtksourceview/gtksourceengine.h
+++ b/gtksourceview/gtksourceengine.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_ENGINE_H__
-#define __GTK_SOURCE_ENGINE_H__
+#ifndef GTK_SOURCE_ENGINE_H
+#define GTK_SOURCE_ENGINE_H
 
 #include <gtk/gtk.h>
 #include "gtksourcetypes.h"
@@ -87,4 +87,4 @@ void        _gtk_source_engine_set_style_scheme       (GtkSourceEngine      *engine,
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_ENGINE_H__ */
+#endif /* GTK_SOURCE_ENGINE_H */
diff --git a/gtksourceview/gtksourcefile.h b/gtksourceview/gtksourcefile.h
index cac9781..9be712f 100644
--- a/gtksourceview/gtksourcefile.h
+++ b/gtksourceview/gtksourcefile.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_FILE_H__
-#define __GTK_SOURCE_FILE_H__
+#ifndef GTK_SOURCE_FILE_H
+#define GTK_SOURCE_FILE_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -147,4 +147,4 @@ void                 _gtk_source_file_set_readonly                  (GtkSourceFile *file,
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_FILE_H__ */
+#endif /* GTK_SOURCE_FILE_H */
diff --git a/gtksourceview/gtksourcefileloader.h b/gtksourceview/gtksourcefileloader.h
index a2848f2..3ff4851 100644
--- a/gtksourceview/gtksourcefileloader.h
+++ b/gtksourceview/gtksourcefileloader.h
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_FILE_LOADER_H__
-#define __GTK_SOURCE_FILE_LOADER_H__
+#ifndef GTK_SOURCE_FILE_LOADER_H
+#define GTK_SOURCE_FILE_LOADER_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -133,4 +133,4 @@ GtkSourceCompressionType gtk_source_file_loader_get_compression_type
 
 G_END_DECLS
 
-#endif  /* __GTK_SOURCE_FILE_LOADER_H__  */
+#endif  /* GTK_SOURCE_FILE_LOADER_H  */
diff --git a/gtksourceview/gtksourcefilesaver.h b/gtksourceview/gtksourcefilesaver.h
index f7f682e..c376c03 100644
--- a/gtksourceview/gtksourcefilesaver.h
+++ b/gtksourceview/gtksourcefilesaver.h
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_FILE_SAVER_H__
-#define __GTK_SOURCE_FILE_SAVER_H__
+#ifndef GTK_SOURCE_FILE_SAVER_H
+#define GTK_SOURCE_FILE_SAVER_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -161,4 +161,4 @@ gboolean             gtk_source_file_saver_save_finish      (GtkSourceFileSaver       
*saver,
 
 G_END_DECLS
 
-#endif  /* __GTK_SOURCE_FILE_SAVER_H__  */
+#endif  /* GTK_SOURCE_FILE_SAVER_H  */
diff --git a/gtksourceview/gtksourcegutter-private.h b/gtksourceview/gtksourcegutter-private.h
index e31131d..a9554f1 100644
--- a/gtksourceview/gtksourcegutter-private.h
+++ b/gtksourceview/gtksourcegutter-private.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_GUTTER_PRIVATE_H__
-#define __GTK_SOURCE_GUTTER_PRIVATE_H__
+#ifndef GTK_SOURCE_GUTTER_PRIVATE_H
+#define GTK_SOURCE_GUTTER_PRIVATE_H
 
 #include <gtk/gtk.h>
 #include "gtksourcetypes.h"
@@ -39,4 +39,4 @@ void                  gtk_source_gutter_draw          (GtkSourceGutter *gutter,
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_GUTTER_PRIVATE_H__ */
+#endif /* GTK_SOURCE_GUTTER_PRIVATE_H */
diff --git a/gtksourceview/gtksourcegutter.h b/gtksourceview/gtksourcegutter.h
index 0eb98a8..ce066bc 100644
--- a/gtksourceview/gtksourcegutter.h
+++ b/gtksourceview/gtksourcegutter.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_GUTTER_H__
-#define __GTK_SOURCE_GUTTER_H__
+#ifndef GTK_SOURCE_GUTTER_H
+#define GTK_SOURCE_GUTTER_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -90,4 +90,4 @@ GtkSourceGutterRenderer *
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_GUTTER_H__ */
+#endif /* GTK_SOURCE_GUTTER_H */
diff --git a/gtksourceview/gtksourcegutterrenderer-private.h b/gtksourceview/gtksourcegutterrenderer-private.h
index 4a3155e..6df017e 100644
--- a/gtksourceview/gtksourcegutterrenderer-private.h
+++ b/gtksourceview/gtksourcegutterrenderer-private.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_GUTTER_RENDERER_PRIVATE_H__
-#define __GTK_SOURCE_GUTTER_RENDERER_PRIVATE_H__
+#ifndef GTK_SOURCE_GUTTER_RENDERER_PRIVATE_H
+#define GTK_SOURCE_GUTTER_RENDERER_PRIVATE_H
 
 #include <gtk/gtk.h>
 #include "gtksourcetypes.h"
@@ -34,4 +34,4 @@ void _gtk_source_gutter_renderer_set_view         (GtkSourceGutterRenderer *rend
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_GUTTER_RENDERER_PRIVATE_H__ */
+#endif /* GTK_SOURCE_GUTTER_RENDERER_PRIVATE_H */
diff --git a/gtksourceview/gtksourcegutterrenderer.h b/gtksourceview/gtksourcegutterrenderer.h
index fb42189..51f63f5 100644
--- a/gtksourceview/gtksourcegutterrenderer.h
+++ b/gtksourceview/gtksourcegutterrenderer.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_GUTTER_RENDERER_H__
-#define __GTK_SOURCE_GUTTER_RENDERER_H__
+#ifndef GTK_SOURCE_GUTTER_RENDERER_H
+#define GTK_SOURCE_GUTTER_RENDERER_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -264,4 +264,4 @@ void     gtk_source_gutter_renderer_query_data      (GtkSourceGutterRenderer
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_GUTTER_RENDERER_H__ */
+#endif /* GTK_SOURCE_GUTTER_RENDERER_H */
diff --git a/gtksourceview/gtksourcegutterrendererlines.h b/gtksourceview/gtksourcegutterrendererlines.h
index e9ea223..70f50fd 100644
--- a/gtksourceview/gtksourcegutterrendererlines.h
+++ b/gtksourceview/gtksourcegutterrendererlines.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_GUTTER_RENDERER_LINES_H__
-#define __GTK_SOURCE_GUTTER_RENDERER_LINES_H__
+#ifndef GTK_SOURCE_GUTTER_RENDERER_LINES_H
+#define GTK_SOURCE_GUTTER_RENDERER_LINES_H
 
 #include <gtk/gtk.h>
 #include "gtksourcetypes.h"
@@ -66,4 +66,4 @@ GtkSourceGutterRenderer *gtk_source_gutter_renderer_lines_new (void);
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_GUTTER_RENDERER_LINES_H__ */
+#endif /* GTK_SOURCE_GUTTER_RENDERER_LINES_H */
diff --git a/gtksourceview/gtksourcegutterrenderermarks.h b/gtksourceview/gtksourcegutterrenderermarks.h
index 3ea1ee0..2cde147 100644
--- a/gtksourceview/gtksourcegutterrenderermarks.h
+++ b/gtksourceview/gtksourcegutterrenderermarks.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_GUTTER_RENDERER_MARKS_H__
-#define __GTK_SOURCE_GUTTER_RENDERER_MARKS_H__
+#ifndef GTK_SOURCE_GUTTER_RENDERER_MARKS_H
+#define GTK_SOURCE_GUTTER_RENDERER_MARKS_H
 
 #include <gtk/gtk.h>
 #include "gtksourcetypes.h"
@@ -57,4 +57,4 @@ GtkSourceGutterRenderer *gtk_source_gutter_renderer_marks_new (void);
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_GUTTER_RENDERER_MARKS_H__ */
+#endif /* GTK_SOURCE_GUTTER_RENDERER_MARKS_H */
diff --git a/gtksourceview/gtksourcegutterrendererpixbuf.h b/gtksourceview/gtksourcegutterrendererpixbuf.h
index ae3f2ba..5ee0f9c 100644
--- a/gtksourceview/gtksourcegutterrendererpixbuf.h
+++ b/gtksourceview/gtksourcegutterrendererpixbuf.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_GUTTER_RENDERER_PIXBUF_H__
-#define __GTK_SOURCE_GUTTER_RENDERER_PIXBUF_H__
+#ifndef GTK_SOURCE_GUTTER_RENDERER_PIXBUF_H
+#define GTK_SOURCE_GUTTER_RENDERER_PIXBUF_H
 
 #include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourcegutterrenderer.h>
@@ -92,4 +92,4 @@ const gchar *gtk_source_gutter_renderer_pixbuf_get_icon_name    (GtkSourceGutter
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_GUTTER_RENDERER_TEXT_H__ */
+#endif /* GTK_SOURCE_GUTTER_RENDERER_TEXT_H */
diff --git a/gtksourceview/gtksourcegutterrenderertext.h b/gtksourceview/gtksourcegutterrenderertext.h
index 3f8f88b..ff53bdd 100644
--- a/gtksourceview/gtksourcegutterrenderertext.h
+++ b/gtksourceview/gtksourcegutterrenderertext.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_GUTTER_RENDERER_TEXT_H__
-#define __GTK_SOURCE_GUTTER_RENDERER_TEXT_H__
+#ifndef GTK_SOURCE_GUTTER_RENDERER_TEXT_H
+#define GTK_SOURCE_GUTTER_RENDERER_TEXT_H
 
 #include <gtksourceview/gtksourcetypes.h>
 #include <gtksourceview/gtksourcegutterrenderer.h>
@@ -86,4 +86,4 @@ void gtk_source_gutter_renderer_text_measure_markup (GtkSourceGutterRendererText
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_GUTTER_RENDERER_TEXT_H__ */
+#endif /* GTK_SOURCE_GUTTER_RENDERER_TEXT_H */
diff --git a/gtksourceview/gtksourceiter.h b/gtksourceview/gtksourceiter.h
index 1509442..f7e0825 100644
--- a/gtksourceview/gtksourceiter.h
+++ b/gtksourceview/gtksourceiter.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_ITER_H__
-#define __GTK_SOURCE_ITER_H__
+#ifndef GTK_SOURCE_ITER_H
+#define GTK_SOURCE_ITER_H
 
 #include <gtk/gtk.h>
 #include "gtksourcetypes-private.h"
@@ -85,4 +85,4 @@ gboolean      _gtk_source_iter_inside_word                            (const GtkTextIter 
*iter);
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_ITER_H__ */
+#endif /* GTK_SOURCE_ITER_H */
diff --git a/gtksourceview/gtksourcelanguage-private.h b/gtksourceview/gtksourcelanguage-private.h
index 4775de4..d013eb4 100644
--- a/gtksourceview/gtksourcelanguage-private.h
+++ b/gtksourceview/gtksourcelanguage-private.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_LANGUAGE_PRIVATE_H__
-#define __GTK_SOURCE_LANGUAGE_PRIVATE_H__
+#ifndef GTK_SOURCE_LANGUAGE_PRIVATE_H
+#define GTK_SOURCE_LANGUAGE_PRIVATE_H
 
 #include <glib.h>
 #include "gtksourcecontextengine.h"
@@ -104,5 +104,5 @@ void                          _gtk_source_style_info_free                   
(GtkSourceStyleInfo       *info);
 
 G_END_DECLS
 
-#endif  /* __GTK_SOURCE_LANGUAGE_PRIVATE_H__ */
+#endif  /* GTK_SOURCE_LANGUAGE_PRIVATE_H */
 
diff --git a/gtksourceview/gtksourcelanguage.h b/gtksourceview/gtksourcelanguage.h
index df49c03..8b0d4b3 100644
--- a/gtksourceview/gtksourcelanguage.h
+++ b/gtksourceview/gtksourcelanguage.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_LANGUAGE_H__
-#define __GTK_SOURCE_LANGUAGE_H__
+#ifndef GTK_SOURCE_LANGUAGE_H
+#define GTK_SOURCE_LANGUAGE_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -92,5 +92,5 @@ const gchar   *gtk_source_language_get_style_fallback (GtkSourceLanguage *language
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_LANGUAGE_H__ */
+#endif /* GTK_SOURCE_LANGUAGE_H */
 
diff --git a/gtksourceview/gtksourcelanguagemanager.h b/gtksourceview/gtksourcelanguagemanager.h
index 3dbacba..a60c685 100644
--- a/gtksourceview/gtksourcelanguagemanager.h
+++ b/gtksourceview/gtksourcelanguagemanager.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_LANGUAGE_MANAGER_H__
-#define __GTK_SOURCE_LANGUAGE_MANAGER_H__
+#ifndef GTK_SOURCE_LANGUAGE_MANAGER_H
+#define GTK_SOURCE_LANGUAGE_MANAGER_H
 
 #include <gtksourceview/gtksourcetypes.h>
 
@@ -85,4 +85,4 @@ GtkSourceLanguage      *gtk_source_language_manager_guess_language            
(GtkSourceLangua
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_LANGUAGE_MANAGER_H__ */
+#endif /* GTK_SOURCE_LANGUAGE_MANAGER_H */
diff --git a/gtksourceview/gtksourcemap.h b/gtksourceview/gtksourcemap.h
index d534221..986479d 100644
--- a/gtksourceview/gtksourcemap.h
+++ b/gtksourceview/gtksourcemap.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_MAP_H__
-#define __GTK_SOURCE_MAP_H__
+#ifndef GTK_SOURCE_MAP_H
+#define GTK_SOURCE_MAP_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourceview.h>
@@ -65,4 +65,4 @@ GtkSourceView         *gtk_source_map_get_view        (GtkSourceMap  *map);
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_MAP_H__ */
+#endif /* GTK_SOURCE_MAP_H */
diff --git a/gtksourceview/gtksourcemark.h b/gtksourceview/gtksourcemark.h
index 9c1c728..1ef5a1c 100644
--- a/gtksourceview/gtksourcemark.h
+++ b/gtksourceview/gtksourcemark.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTKSOURCEMARK_H__
-#define __GTKSOURCEMARK_H__
+#ifndef GTKSOURCEMARK_H
+#define GTKSOURCEMARK_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -74,4 +74,4 @@ GtkSourceMark *gtk_source_mark_prev           (GtkSourceMark  *mark,
 
 G_END_DECLS
 
-#endif /* __GTKSOURCEMARK_H__ */
+#endif /* GTKSOURCEMARK_H */
diff --git a/gtksourceview/gtksourcemarkattributes.h b/gtksourceview/gtksourcemarkattributes.h
index 3e173fe..1783f64 100644
--- a/gtksourceview/gtksourcemarkattributes.h
+++ b/gtksourceview/gtksourcemarkattributes.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_MARK_ATTRIBUTES_H__
-#define __GTK_SOURCE_MARK_ATTRIBUTES_H__
+#ifndef GTK_SOURCE_MARK_ATTRIBUTES_H
+#define GTK_SOURCE_MARK_ATTRIBUTES_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -113,4 +113,4 @@ gchar           *gtk_source_mark_attributes_get_tooltip_markup  (GtkSourceMarkAt
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_MARK_ATTRIBUTES_H__ */
+#endif /* GTK_SOURCE_MARK_ATTRIBUTES_H */
diff --git a/gtksourceview/gtksourcemarkssequence.h b/gtksourceview/gtksourcemarkssequence.h
index 40cfb70..480154a 100644
--- a/gtksourceview/gtksourcemarkssequence.h
+++ b/gtksourceview/gtksourcemarkssequence.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_MARKS_SEQUENCE_H__
-#define __GTK_SOURCE_MARKS_SEQUENCE_H__
+#ifndef GTK_SOURCE_MARKS_SEQUENCE_H
+#define GTK_SOURCE_MARKS_SEQUENCE_H
 
 #include <gtk/gtk.h>
 #include "gtksourcetypes-private.h"
@@ -93,4 +93,4 @@ GSList                        *_gtk_source_marks_sequence_get_marks_in_range  
(GtkSourceMarksSequence
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_MARKS_SEQUENCE_H__ */
+#endif /* GTK_SOURCE_MARKS_SEQUENCE_H */
diff --git a/gtksourceview/gtksourcepixbufhelper.h b/gtksourceview/gtksourcepixbufhelper.h
index d8961bf..ff6aef9 100644
--- a/gtksourceview/gtksourcepixbufhelper.h
+++ b/gtksourceview/gtksourcepixbufhelper.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_PIXBUF_HELPER_H__
-#define __GTK_SOURCE_PIXBUF_HELPER_H__
+#ifndef GTK_SOURCE_PIXBUF_HELPER_H
+#define GTK_SOURCE_PIXBUF_HELPER_H
 
 #include <gtk/gtk.h>
 #include "gtksourcetypes-private.h"
@@ -64,5 +64,5 @@ GdkPixbuf *gtk_source_pixbuf_helper_render (GtkSourcePixbufHelper *helper,
                                             GtkWidget             *widget,
                                             gint                   size);
 
-#endif /* __GTK_SOURCE_PIXBUF_HELPER_H__ */
+#endif /* GTK_SOURCE_PIXBUF_HELPER_H */
 
diff --git a/gtksourceview/gtksourceprintcompositor.h b/gtksourceview/gtksourceprintcompositor.h
index d4f2ea1..2b475d0 100644
--- a/gtksourceview/gtksourceprintcompositor.h
+++ b/gtksourceview/gtksourceprintcompositor.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_PRINT_COMPOSITOR_H__
-#define __GTK_SOURCE_PRINT_COMPOSITOR_H__
+#ifndef GTK_SOURCE_PRINT_COMPOSITOR_H
+#define GTK_SOURCE_PRINT_COMPOSITOR_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -218,4 +218,4 @@ void                          gtk_source_print_compositor_draw_page         
(GtkSourcePrintCompositor *compo
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_PRINT_COMPOSITOR_H__ */
+#endif /* GTK_SOURCE_PRINT_COMPOSITOR_H */
diff --git a/gtksourceview/gtksourceregex.h b/gtksourceview/gtksourceregex.h
index 786128a..950ff22 100644
--- a/gtksourceview/gtksourceregex.h
+++ b/gtksourceview/gtksourceregex.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_REGEX_H__
-#define __GTK_SOURCE_REGEX_H__
+#ifndef GTK_SOURCE_REGEX_H
+#define GTK_SOURCE_REGEX_H
 
 #include <glib.h>
 #include "gtksourcetypes-private.h"
@@ -82,4 +82,4 @@ const gchar   *_gtk_source_regex_get_pattern  (GtkSourceRegex *regex);
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_REGEX_H__ */
+#endif /* GTK_SOURCE_REGEX_H */
diff --git a/gtksourceview/gtksourceregion.h b/gtksourceview/gtksourceregion.h
index 1a6e87b..d401c81 100644
--- a/gtksourceview/gtksourceregion.h
+++ b/gtksourceview/gtksourceregion.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_REGION_H__
-#define __GTK_SOURCE_REGION_H__
+#ifndef GTK_SOURCE_REGION_H
+#define GTK_SOURCE_REGION_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourceversion.h>
@@ -109,4 +109,4 @@ gchar *                     gtk_source_region_to_string             (GtkSourceRegion 
*region);
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_REGION_H__ */
+#endif /* GTK_SOURCE_REGION_H */
diff --git a/gtksourceview/gtksourcesearchcontext.h b/gtksourceview/gtksourcesearchcontext.h
index 0e8417f..67e14b1 100644
--- a/gtksourceview/gtksourcesearchcontext.h
+++ b/gtksourceview/gtksourcesearchcontext.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_SEARCH_CONTEXT_H__
-#define __GTK_SOURCE_SEARCH_CONTEXT_H__
+#ifndef GTK_SOURCE_SEARCH_CONTEXT_H
+#define GTK_SOURCE_SEARCH_CONTEXT_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -155,4 +155,4 @@ void                         _gtk_source_search_context_update_highlight            
(GtkSourceSearchContext  *s
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_SEARCH_CONTEXT_H__ */
+#endif /* GTK_SOURCE_SEARCH_CONTEXT_H */
diff --git a/gtksourceview/gtksourcesearchsettings.h b/gtksourceview/gtksourcesearchsettings.h
index f13e7f4..f026a2c 100644
--- a/gtksourceview/gtksourcesearchsettings.h
+++ b/gtksourceview/gtksourcesearchsettings.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_SEARCH_SETTINGS_H__
-#define __GTK_SOURCE_SEARCH_SETTINGS_H__
+#ifndef GTK_SOURCE_SEARCH_SETTINGS_H
+#define GTK_SOURCE_SEARCH_SETTINGS_H
 
 #include <glib-object.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -94,4 +94,4 @@ gboolean               gtk_source_search_settings_get_regex_enabled           
(GtkSourceSearchSetting
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_SEARCH_SETTINGS_H__ */
+#endif /* GTK_SOURCE_SEARCH_SETTINGS_H */
diff --git a/gtksourceview/gtksourcestyle-private.h b/gtksourceview/gtksourcestyle-private.h
index 1864648..15fefa3 100644
--- a/gtksourceview/gtksourcestyle-private.h
+++ b/gtksourceview/gtksourcestyle-private.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_STYLE_PRIVATE_H__
-#define __GTK_SOURCE_STYLE_PRIVATE_H__
+#ifndef GTK_SOURCE_STYLE_PRIVATE_H
+#define GTK_SOURCE_STYLE_PRIVATE_H
 
 #include "gtksourcestyle.h"
 #include <gtk/gtk.h>
@@ -74,4 +74,4 @@ void           _gtk_source_style_apply        (const GtkSourceStyle *style,
 
 G_END_DECLS
 
-#endif  /* __GTK_SOURCE_STYLE_PRIVATE_H__ */
+#endif  /* GTK_SOURCE_STYLE_PRIVATE_H */
diff --git a/gtksourceview/gtksourcestyle.h b/gtksourceview/gtksourcestyle.h
index f077954..50da352 100644
--- a/gtksourceview/gtksourcestyle.h
+++ b/gtksourceview/gtksourcestyle.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_STYLE_H__
-#define __GTK_SOURCE_STYLE_H__
+#ifndef GTK_SOURCE_STYLE_H
+#define GTK_SOURCE_STYLE_H
 
 #include <glib-object.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -44,4 +44,4 @@ GtkSourceStyle        *gtk_source_style_copy          (const GtkSourceStyle *style);
 
 G_END_DECLS
 
-#endif  /* __GTK_SOURCE_STYLE_H__ */
+#endif  /* GTK_SOURCE_STYLE_H */
diff --git a/gtksourceview/gtksourcestylescheme.h b/gtksourceview/gtksourcestylescheme.h
index f5a6dd1..193343a 100644
--- a/gtksourceview/gtksourcestylescheme.h
+++ b/gtksourceview/gtksourcestylescheme.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_STYLE_SCHEME_H__
-#define __GTK_SOURCE_STYLE_SCHEME_H__
+#ifndef GTK_SOURCE_STYLE_SCHEME_H
+#define GTK_SOURCE_STYLE_SCHEME_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -114,4 +114,4 @@ gboolean             _gtk_source_style_scheme_get_background_pattern_color  
(GtkSourceStyle
 
 G_END_DECLS
 
-#endif  /* __GTK_SOURCE_STYLE_SCHEME_H__ */
+#endif  /* GTK_SOURCE_STYLE_SCHEME_H */
diff --git a/gtksourceview/gtksourcestyleschemechooser.h b/gtksourceview/gtksourcestyleschemechooser.h
index cbfdfe3..092f1dc 100644
--- a/gtksourceview/gtksourcestyleschemechooser.h
+++ b/gtksourceview/gtksourcestyleschemechooser.h
@@ -18,8 +18,8 @@
  * along with GtkSourceView. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GTK_SOURCE_STYLE_SCHEME_CHOOSER_H__
-#define __GTK_SOURCE_STYLE_SCHEME_CHOOSER_H__
+#ifndef GTK_SOURCE_STYLE_SCHEME_CHOOSER_H
+#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_H
 
 #include <gtksourceview/gtksourcetypes.h>
 
@@ -59,4 +59,4 @@ void                      gtk_source_style_scheme_chooser_set_style_scheme
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_STYLE_SCHEME_CHOOSER_H__ */
+#endif /* GTK_SOURCE_STYLE_SCHEME_CHOOSER_H */
diff --git a/gtksourceview/gtksourcestyleschemechooserbutton.h 
b/gtksourceview/gtksourcestyleschemechooserbutton.h
index 942f767..5fad24a 100644
--- a/gtksourceview/gtksourcestyleschemechooserbutton.h
+++ b/gtksourceview/gtksourcestyleschemechooserbutton.h
@@ -19,8 +19,8 @@
  * along with GtkSourceView. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON_H__
-#define __GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON_H__
+#ifndef GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON_H
+#define GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -56,4 +56,4 @@ GtkWidget            *gtk_source_style_scheme_chooser_button_new
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON_H__ */
+#endif /* GTK_SOURCE_STYLE_SCHEME_CHOOSER_BUTTON_H */
diff --git a/gtksourceview/gtksourcestyleschememanager.h b/gtksourceview/gtksourcestyleschememanager.h
index 24b19cc..6b24709 100644
--- a/gtksourceview/gtksourcestyleschememanager.h
+++ b/gtksourceview/gtksourcestyleschememanager.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_STYLE_SCHEME_MANAGER_H__
-#define __GTK_SOURCE_STYLE_SCHEME_MANAGER_H__
+#ifndef GTK_SOURCE_STYLE_SCHEME_MANAGER_H
+#define GTK_SOURCE_STYLE_SCHEME_MANAGER_H
 
 #include <glib-object.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -93,4 +93,4 @@ GtkSourceStyleScheme  *gtk_source_style_scheme_manager_get_scheme             (GtkSourceStyl
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_STYLE_SCHEME_MANAGER_H__ */
+#endif /* GTK_SOURCE_STYLE_SCHEME_MANAGER_H */
diff --git a/gtksourceview/gtksourcetag-private.h b/gtksourceview/gtksourcetag-private.h
index 2fec6f5..41cf16f 100644
--- a/gtksourceview/gtksourcetag-private.h
+++ b/gtksourceview/gtksourcetag-private.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_TAG_PRIVATE_H__
-#define __GTK_SOURCE_TAG_PRIVATE_H__
+#ifndef GTK_SOURCE_TAG_PRIVATE_H
+#define GTK_SOURCE_TAG_PRIVATE_H
 
 #include <gtk/gtk.h>
 #include "gtksourcetypes.h"
@@ -33,4 +33,4 @@ gboolean _gtk_source_tag_effects_spaces (GtkSourceTag *tag);
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_TAG_PRIVATE_H__ */
+#endif /* GTK_SOURCE_TAG_PRIVATE_H */
diff --git a/gtksourceview/gtksourcetag.h b/gtksourceview/gtksourcetag.h
index a40c067..2070894 100644
--- a/gtksourceview/gtksourcetag.h
+++ b/gtksourceview/gtksourcetag.h
@@ -21,8 +21,8 @@
  * Author: Sébastien Wilmet
  */
 
-#ifndef __GTK_SOURCE_TAG_H__
-#define __GTK_SOURCE_TAG_H__
+#ifndef GTK_SOURCE_TAG_H
+#define GTK_SOURCE_TAG_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -48,4 +48,4 @@ GtkTextTag *  gtk_source_tag_new              (const gchar *name);
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_TAG_H__ */
+#endif /* GTK_SOURCE_TAG_H */
diff --git a/gtksourceview/gtksourcetypes-private.h b/gtksourceview/gtksourcetypes-private.h
index f1a7b90..283bfe0 100644
--- a/gtksourceview/gtksourcetypes-private.h
+++ b/gtksourceview/gtksourcetypes-private.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_TYPES_PRIVATE_H__
-#define __GTK_SOURCE_TYPES_PRIVATE_H__
+#ifndef GTK_SOURCE_TYPES_PRIVATE_H
+#define GTK_SOURCE_TYPES_PRIVATE_H
 
 #include <glib.h>
 
@@ -48,4 +48,4 @@ typedef struct _GtkSourceUndoManagerDefault   GtkSourceUndoManagerDefault;
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_TYPES_PRIVATE_H__ */
+#endif /* GTK_SOURCE_TYPES_PRIVATE_H */
diff --git a/gtksourceview/gtksourcetypes.h b/gtksourceview/gtksourcetypes.h
index ee7c84e..3038900 100644
--- a/gtksourceview/gtksourcetypes.h
+++ b/gtksourceview/gtksourcetypes.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_TYPES_H__
-#define __GTK_SOURCE_TYPES_H__
+#ifndef GTK_SOURCE_TYPES_H
+#define GTK_SOURCE_TYPES_H
 
 #include <gio/gio.h>
 #include <gtksourceview/gtksourceversion.h>
@@ -113,4 +113,4 @@ typedef enum
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_TYPES_H__ */
+#endif /* GTK_SOURCE_TYPES_H */
diff --git a/gtksourceview/gtksourceundomanager.h b/gtksourceview/gtksourceundomanager.h
index 2b6c6fe..e04d2b1 100644
--- a/gtksourceview/gtksourceundomanager.h
+++ b/gtksourceview/gtksourceundomanager.h
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_UNDO_MANAGER_H__
-#define __GTK_SOURCE_UNDO_MANAGER_H__
+#ifndef GTK_SOURCE_UNDO_MANAGER_H
+#define GTK_SOURCE_UNDO_MANAGER_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -85,4 +85,4 @@ void      gtk_source_undo_manager_can_redo_changed          (GtkSourceUndoManage
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_UNDO_MANAGER_H__ */
+#endif /* GTK_SOURCE_UNDO_MANAGER_H */
diff --git a/gtksourceview/gtksourceundomanagerdefault.h b/gtksourceview/gtksourceundomanagerdefault.h
index 9477d6e..6bf6993 100644
--- a/gtksourceview/gtksourceundomanagerdefault.h
+++ b/gtksourceview/gtksourceundomanagerdefault.h
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_UNDO_MANAGER_DEFAULT_H__
-#define __GTK_SOURCE_UNDO_MANAGER_DEFAULT_H__
+#ifndef GTK_SOURCE_UNDO_MANAGER_DEFAULT_H
+#define GTK_SOURCE_UNDO_MANAGER_DEFAULT_H
 
 #include <glib-object.h>
 #include "gtksourcetypes-private.h"
@@ -61,4 +61,4 @@ void gtk_source_undo_manager_default_set_max_undo_levels (GtkSourceUndoManagerDe
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_UNDO_MANAGER_DEFAULT_H__ */
+#endif /* GTK_SOURCE_UNDO_MANAGER_DEFAULT_H */
diff --git a/gtksourceview/gtksourceutils.h b/gtksourceview/gtksourceutils.h
index 02740cc..562e42f 100644
--- a/gtksourceview/gtksourceutils.h
+++ b/gtksourceview/gtksourceutils.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_UTILS_H__
-#define __GTK_SOURCE_UTILS_H__
+#ifndef GTK_SOURCE_UTILS_H
+#define GTK_SOURCE_UTILS_H
 
 #include <glib-object.h>
 #include <gtksourceview/gtksourceversion.h>
@@ -35,4 +35,4 @@ gchar         *gtk_source_utils_escape_search_text            (const gchar    *text);
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_UTILS_H__ */
+#endif /* GTK_SOURCE_UTILS_H */
diff --git a/gtksourceview/gtksourceversion.h.in b/gtksourceview/gtksourceversion.h.in
index 1368e31..4fd7ef6 100644
--- a/gtksourceview/gtksourceversion.h.in
+++ b/gtksourceview/gtksourceversion.h.in
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_VERSION_H__
-#define __GTK_SOURCE_VERSION_H__
+#ifndef GTK_SOURCE_VERSION_H
+#define GTK_SOURCE_VERSION_H
 
 #include <glib.h>
 
@@ -518,4 +518,4 @@ gboolean    gtk_source_check_version                (guint major,
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_VERSION_H__ */
+#endif /* GTK_SOURCE_VERSION_H */
diff --git a/gtksourceview/gtksourceview-i18n.h b/gtksourceview/gtksourceview-i18n.h
index 898a719..be402a2 100644
--- a/gtksourceview/gtksourceview-i18n.h
+++ b/gtksourceview/gtksourceview-i18n.h
@@ -23,8 +23,8 @@
  * Author: Tom Tromey <tromey creche cygnus com>
  */
 
-#ifndef __GTKSOURCEVIEW_18N_H__
-#define __GTKSOURCEVIEW_18N_H__ 1
+#ifndef GTKSOURCEVIEW_18N_H
+#define GTKSOURCEVIEW_18N_H 1
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -81,4 +81,4 @@ gchar *_gtksourceview_dgettext (const char *domain, const char *msgid) G_GNUC_FO
 
 G_END_DECLS
 
-#endif /* __GTKSOURCEVIEW_I18N_H__ */
+#endif /* GTKSOURCEVIEW_I18N_H */
diff --git a/gtksourceview/gtksourceview-utils.h b/gtksourceview/gtksourceview-utils.h
index 087d721..f99827b 100644
--- a/gtksourceview/gtksourceview-utils.h
+++ b/gtksourceview/gtksourceview-utils.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_VIEW_UTILS_H__
-#define __GTK_SOURCE_VIEW_UTILS_H__
+#ifndef GTK_SOURCE_VIEW_UTILS_H
+#define GTK_SOURCE_VIEW_UTILS_H
 
 #include <glib.h>
 #include <pango/pango.h>
@@ -44,4 +44,4 @@ gchar *_gtk_source_pango_font_description_to_css (const PangoFontDescription *fo
 
 G_END_DECLS
 
-#endif /* __GTK_SOURCE_VIEW_UTILS_H__ */
+#endif /* GTK_SOURCE_VIEW_UTILS_H */
diff --git a/gtksourceview/gtksourceview.h b/gtksourceview/gtksourceview.h
index d515a6c..6d1fb38 100644
--- a/gtksourceview/gtksourceview.h
+++ b/gtksourceview/gtksourceview.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GTK_SOURCE_VIEW_H__
-#define __GTK_SOURCE_VIEW_H__
+#ifndef GTK_SOURCE_VIEW_H
+#define GTK_SOURCE_VIEW_H
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksourcetypes.h>
@@ -279,4 +279,4 @@ GtkSourceBackgroundPatternType
 
 G_END_DECLS
 
-#endif /* end of __GTK_SOURCE_VIEW_H__ */
+#endif /* end of GTK_SOURCE_VIEW_H */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]