Merge branch 'friemann/krifa75-pragma-once' into 'master'

Replace include guards with #pragma once

See merge request GNOME/eog!136

47 files changed, 48 insertions, 189 deletions

diff --git a/plugins/fullscreen/eog-fullscreen-plugin.h b/plugins/fullscreen/eog-fullscreen-plugin.h
index 422e2019..b8b380b8 100644
--- a/plugins/fullscreen/eog-fullscreen-plugin.h
+++ b/plugins/fullscreen/eog-fullscreen-plugin.h
@@ -19,8 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_FULLSCREEN_PLUGIN_H__
-#define __EOG_FULLSCREEN_PLUGIN_H__
+#pragma once
 
 #include <glib.h>
 #include <glib-object.h>
@@ -77,5 +76,3 @@ GType	eog_fullscreen_plugin_get_type		(void) G_GNUC_CONST;
 G_MODULE_EXPORT void peas_register_types (PeasObjectModule *module);
 
 G_END_DECLS
-
-#endif /* __EOG_FULLSCREEN_PLUGIN_H__ */
diff --git a/plugins/reload/eog-reload-plugin.h b/plugins/reload/eog-reload-plugin.h
index 6dd90972..fe30973d 100644
--- a/plugins/reload/eog-reload-plugin.h
+++ b/plugins/reload/eog-reload-plugin.h
@@ -19,8 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_RELOAD_PLUGIN_H__
-#define __EOG_RELOAD_PLUGIN_H__
+#pragma once
 
 #include <glib.h>
 #include <glib-object.h>
@@ -76,5 +75,3 @@ GType	eog_reload_plugin_get_type		(void) G_GNUC_CONST;
 G_MODULE_EXPORT void peas_register_types (PeasObjectModule *module);
 
 G_END_DECLS
-
-#endif /* __EOG_RELOAD_PLUGIN_H__ */
diff --git a/src/eog-application-activatable.h b/src/eog-application-activatable.h
index 7c517c24..5a91be07 100644
--- a/src/eog-application-activatable.h
+++ b/src/eog-application-activatable.h
@@ -24,8 +24,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_APPLICATION_ACTIVATABLE_H__
-#define __EOG_APPLICATION_ACTIVATABLE_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -48,4 +47,3 @@ void	eog_application_activatable_activate     (EogApplicationActivatable *activa
 void	eog_application_activatable_deactivate   (EogApplicationActivatable *activatable);
 
 G_END_DECLS
-#endif /* __EOG_APPLICATION_ACTIVATABLE_H__ */
diff --git a/src/eog-application-internal.h b/src/eog-application-internal.h
index 2806faa0..7e7f6430 100644
--- a/src/eog-application-internal.h
+++ b/src/eog-application-internal.h
@@ -22,17 +22,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_APPLICATION_INTERNAL_H__
-#define __EOG_APPLICATION_INTERNAL_H__
-
 #include <glib.h>
 #include <glib-object.h>
+#pragma once
 
 #include <libpeas/peas-extension-set.h>
 
 #include "eog-application.h"
 #include "eog-plugin-engine.h"
-#include "eog-window.h"
 
 G_BEGIN_DECLS
 
@@ -52,5 +49,3 @@ void              eog_application_screensaver_enable  (EogApplication *applicati
 void              eog_application_screensaver_disable (EogApplication *application);
 
 G_END_DECLS
-
-#endif /* __EOG_APPLICATION_INTERNAL_H__ */
diff --git a/src/eog-application.h b/src/eog-application.h
index d8009f93..c63d17e7 100644
--- a/src/eog-application.h
+++ b/src/eog-application.h
@@ -22,8 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_APPLICATION_H__
-#define __EOG_APPLICATION_H__
+#pragma once
 
 
 #include <glib.h>
@@ -58,7 +57,6 @@ struct _EogApplicationClass {
 };
 
 GType	          eog_application_get_type	      (void) G_GNUC_CONST;
-
 EogApplication   *eog_application_get_instance        (void);
 
 gboolean          eog_application_open_window         (EogApplication   *application,
@@ -87,5 +85,3 @@ gboolean          eog_application_open_uris           (EogApplication *applicati
 gboolean          eog_application_close_all_windows   (EogApplication *application);
 
 G_END_DECLS
-
-#endif /* __EOG_APPLICATION_H__ */
diff --git a/src/eog-clipboard-handler.h b/src/eog-clipboard-handler.h
index e2d5cfb7..fb0b0441 100644
--- a/src/eog-clipboard-handler.h
+++ b/src/eog-clipboard-handler.h
@@ -21,8 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_CLIPBOARD_HANDLER_H__
-#define __EOG_CLIPBOARD_HANDLER_H__
+#pragma once
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -60,4 +59,3 @@ void eog_clipboard_handler_copy_to_clipboard (EogClipboardHandler *handler,
 					      GtkClipboard *clipboard);
 
 G_END_DECLS
-#endif /* __EOG_CLIPBOARD_HANDLER_H__ */
diff --git a/src/eog-close-confirmation-dialog.h b/src/eog-close-confirmation-dialog.h
index e809a326..6bb0e12a 100644
--- a/src/eog-close-confirmation-dialog.h
+++ b/src/eog-close-confirmation-dialog.h
@@ -23,8 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_CLOSE_CONFIRMATION_DIALOG_H__
-#define __EOG_CLOSE_CONFIRMATION_DIALOG_H__
+#pragma once
 
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -93,5 +92,3 @@ GList		*eog_close_confirmation_dialog_get_selected_images	(EogCloseConfirmationD
 G_GNUC_INTERNAL
 void		 eog_close_confirmation_dialog_set_sensitive		(EogCloseConfirmationDialog *dlg, gboolean value);
 
-#endif /* __EOG_CLOSE_CONFIRMATION_DIALOG_H__ */
-
diff --git a/src/eog-config-keys.h b/src/eog-config-keys.h
index aa977339..252a3292 100644
--- a/src/eog-config-keys.h
+++ b/src/eog-config-keys.h
@@ -23,8 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_CONFIG_KEYS_H__
-#define __EOG_CONFIG_KEYS_H__
+#pragma once
 
 #define EOG_CONF_DOMAIN				"org.gnome.eog"
 #define EOG_CONF_FULLSCREEN			EOG_CONF_DOMAIN".fullscreen"
@@ -66,5 +65,3 @@
 #define EOG_CONF_UI_FILECHOOSER_XDG_FALLBACK	"filechooser-xdg-fallback"
 
 #define EOG_CONF_PLUGINS_ACTIVE_PLUGINS         "active-plugins"
-
-#endif /* __EOG_CONFIG_KEYS_H__ */
diff --git a/src/eog-debug.h b/src/eog-debug.h
index a6a1405c..15a94dca 100644
--- a/src/eog-debug.h
+++ b/src/eog-debug.h
@@ -25,8 +25,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_DEBUG_H__
-#define __EOG_DEBUG_H__
+#pragma once
 
 #include <glib.h>
 
@@ -73,5 +72,3 @@ void   eog_debug_message     (EogDebug    section,
 			      gint               line,
 			      const gchar       *function,
 			      const gchar       *format, ...) G_GNUC_PRINTF(5, 6);
-
-#endif /* __EOG_DEBUG_H__ */
diff --git a/src/eog-details-dialog.h b/src/eog-details-dialog.h
index 680f3b42..3c0bea71 100644
--- a/src/eog-details-dialog.h
+++ b/src/eog-details-dialog.h
@@ -20,8 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_DETAILS_DIALOG_H__
-#define __EOG_DETAILS_DIALOG_H__
+#pragma once
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -69,4 +68,3 @@ void	    eog_details_dialog_update  	(EogDetailsDialog     *details_dialog,
 G_END_DECLS
 
 #endif /* defined(HAVE_EXIF) || defined(HAVE_EXEMPI) */
-#endif /* __EOG_DETAILS_DIALOG_H__ */
diff --git a/src/eog-enum-types.h.template b/src/eog-enum-types.h.template
index c63c78ce..bc3c195a 100644
--- a/src/eog-enum-types.h.template
+++ b/src/eog-enum-types.h.template
@@ -1,6 +1,5 @@
 /*** BEGIN file-header ***/
-#ifndef __EOG_ENUM_TYPES_H__
-#define __EOG_ENUM_TYPES_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -21,7 +20,5 @@ GType @enum_name@_get_type	(void) G_GNUC_CONST;
 
 /*** BEGIN file-tail ***/
 G_END_DECLS
-
-#endif /* __EOG_ENUM_TYPES_H__ */
 /*** END file-tail ***/
 
diff --git a/src/eog-enums.h b/src/eog-enums.h
index 6e5001ac..9a72f3d3 100644
--- a/src/eog-enums.h
+++ b/src/eog-enums.h
@@ -19,8 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_ENUMS__
-#define __EOG_ENUMS__
+#pragma once
 
 typedef enum {
 	EOG_IMAGE_DATA_IMAGE     = 1 << 0,
@@ -34,4 +33,3 @@ typedef enum {
 			     EOG_IMAGE_DATA_EXIF |      \
 			     EOG_IMAGE_DATA_XMP)
 
-#endif
diff --git a/src/eog-error-message-area.h b/src/eog-error-message-area.h
index bd642d99..c7a20d4c 100644
--- a/src/eog-error-message-area.h
+++ b/src/eog-error-message-area.h
@@ -22,8 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_ERROR_MESSAGE_AREA__
-#define __EOG_ERROR_MESSAGE_AREA__
+#pragma once
 
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -60,5 +59,3 @@ GtkWidget   *eog_no_images_error_message_area_new    (GFile *file);
 
 G_GNUC_INTERNAL
 GtkWidget   *eog_multipage_error_message_area_new    (void);
-
-#endif /* __EOG_ERROR_MESSAGE_AREA__ */
diff --git a/src/eog-exif-util.h b/src/eog-exif-util.h
index 5f54a8bc..fdb8ef9f 100644
--- a/src/eog-exif-util.h
+++ b/src/eog-exif-util.h
@@ -24,8 +24,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_EXIF_UTIL_H__
-#define __EOG_EXIF_UTIL_H__
+#pragma once
 
 #include <glib.h>
 #include <glib-object.h>
@@ -59,5 +58,3 @@ ExifData    *eog_exif_data_copy                  (ExifData *data);
 void         eog_exif_data_free                  (ExifData *data);
 
 G_END_DECLS
-
-#endif /* __EOG_EXIF_UTIL_H__ */
diff --git a/src/eog-file-chooser.h b/src/eog-file-chooser.h
index a25f6b77..e77f78f1 100644
--- a/src/eog-file-chooser.h
+++ b/src/eog-file-chooser.h
@@ -14,8 +14,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef _EOG_FILE_CHOOSER_H_
-#define _EOG_FILE_CHOOSER_H_
+#pragma once
 
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -55,5 +54,3 @@ GdkPixbufFormat	*eog_file_chooser_get_format	(EogFileChooser *chooser);
 
 
 G_END_DECLS
-
-#endif /* _EOG_FILE_CHOOSER_H_ */
diff --git a/src/eog-image-jpeg.h b/src/eog-image-jpeg.h
index 7e8d9164..a68bdfca 100644
--- a/src/eog-image-jpeg.h
+++ b/src/eog-image-jpeg.h
@@ -1,5 +1,4 @@
-#ifndef _EOG_IMAGE_JPEG_H_
-#define _EOG_IMAGE_JPEG_H_
+#pragma once
 
 #ifdef HAVE_JPEG
 
@@ -18,5 +17,3 @@ gboolean eog_image_jpeg_save_file (EogImage *image, const char *file,
 				   EogImageSaveInfo *source, EogImageSaveInfo *target,
 				   GError **error);
 #endif
-
-#endif /* _EOG_IMAGE_JPEG_H_ */
diff --git a/src/eog-image-private.h b/src/eog-image-private.h
index 1fc00fd3..d953c6af 100644
--- a/src/eog-image-private.h
+++ b/src/eog-image-private.h
@@ -19,8 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_IMAGE_PRIVATE_H__
-#define __EOG_IMAGE_PRIVATE_H__
+#pragma once
 
 #include "eog-image.h"
 
@@ -100,5 +99,3 @@ struct _EogImagePrivate {
 };
 
 G_END_DECLS
-
-#endif /* __EOG_IMAGE_PRIVATE_H__ */
diff --git a/src/eog-image-save-info.h b/src/eog-image-save-info.h
index 33d6b27c..3498cd6d 100644
--- a/src/eog-image-save-info.h
+++ b/src/eog-image-save-info.h
@@ -1,5 +1,4 @@
-#ifndef _EOG_IMAGE_SAVE_INFO_H_
-#define _EOG_IMAGE_SAVE_INFO_H_
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -53,5 +52,3 @@ EogImageSaveInfo *eog_image_save_info_new_from_file    (GFile           *file,
 							GdkPixbufFormat *format);
 
 G_END_DECLS
-
-#endif /* _EOG_IMAGE_SAVE_INFO_H_ */
diff --git a/src/eog-image.h b/src/eog-image.h
index 45e7f939..9b95f204 100644
--- a/src/eog-image.h
+++ b/src/eog-image.h
@@ -19,8 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_IMAGE_H__
-#define __EOG_IMAGE_H__
+#pragma once
 
 #include "eog-jobs.h"
 #include "eog-window.h"
@@ -224,5 +223,3 @@ gboolean          eog_image_is_file_writable         (EogImage *img);
 gboolean          eog_image_is_multipaged            (EogImage *img);
 
 G_END_DECLS
-
-#endif /* __EOG_IMAGE_H__ */
diff --git a/src/eog-job-scheduler.h b/src/eog-job-scheduler.h
index b959ec1e..7d0098b8 100644
--- a/src/eog-job-scheduler.h
+++ b/src/eog-job-scheduler.h
@@ -22,8 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_JOB_SCHEDULER_H__
-#define __EOG_JOB_SCHEDULER_H__
+#pragma once
 
 #include "eog-jobs.h"
 
@@ -45,5 +44,3 @@ void eog_job_scheduler_add_job_with_priority (EogJob         *job,
 					      EogJobPriority  priority);
 
 G_END_DECLS
-
-#endif /* __EOG_JOB_SCHEDULER_H__ */
diff --git a/src/eog-jobs.h b/src/eog-jobs.h
index 6dbce099..6de7563f 100644
--- a/src/eog-jobs.h
+++ b/src/eog-jobs.h
@@ -22,8 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_JOBS_H__
-#define __EOG_JOBS_H__
+#pragma once
 
 #include "eog-enums.h"
 #include "eog-image.h"
@@ -296,5 +295,3 @@ EogJob  *eog_job_transform_new      (GList           *images,
 				     EogTransform    *transform);
 
 G_END_DECLS
-
-#endif /* __EOG_JOBS_H__ */
diff --git a/src/eog-list-store.h b/src/eog-list-store.h
index 06b5c638..91e80463 100644
--- a/src/eog-list-store.h
+++ b/src/eog-list-store.h
@@ -21,8 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef EOG_LIST_STORE_H
-#define EOG_LIST_STORE_H
+#pragma once
 
 #include <gtk/gtk.h>
 #include <glib-object.h>
@@ -111,5 +110,3 @@ void            eog_list_store_thumbnail_refresh     (EogListStore *store,
 						      GtkTreeIter *iter);
 
 G_END_DECLS
-
-#endif
diff --git a/src/eog-metadata-details.h b/src/eog-metadata-details.h
index abaecef1..d384fe2b 100644
--- a/src/eog-metadata-details.h
+++ b/src/eog-metadata-details.h
@@ -19,8 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_METADATA_DETAILS__
-#define __EOG_METADATA_DETAILS__
+#pragma once
 
 
 
@@ -74,5 +73,3 @@ void                eog_metadata_details_xmp_update  (EogMetadataDetails *view,
 #endif
 
 G_END_DECLS
-
-#endif /* __EOG_METADATA_DETAILS__ */
diff --git a/src/eog-metadata-reader-jpg.h b/src/eog-metadata-reader-jpg.h
index 7a849234..54665596 100644
--- a/src/eog-metadata-reader-jpg.h
+++ b/src/eog-metadata-reader-jpg.h
@@ -21,8 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef _EOG_METADATA_READER_JPG_H_
-#define _EOG_METADATA_READER_JPG_H_
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -51,5 +50,3 @@ G_GNUC_INTERNAL
 GType		      eog_metadata_reader_jpg_get_type	(void) G_GNUC_CONST;
 
 G_END_DECLS
-
-#endif /* _EOG_METADATA_READER_JPG_H_ */
diff --git a/src/eog-metadata-reader-png.h b/src/eog-metadata-reader-png.h
index 8832c2fc..dcea1ede 100644
--- a/src/eog-metadata-reader-png.h
+++ b/src/eog-metadata-reader-png.h
@@ -21,8 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef _EOG_METADATA_READER_PNG_H_
-#define _EOG_METADATA_READER_PNG_H_
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -51,5 +50,3 @@ G_GNUC_INTERNAL
 GType		      eog_metadata_reader_png_get_type	(void) G_GNUC_CONST;
 
 G_END_DECLS
-
-#endif /* _EOG_METADATA_READER_PNG_H_ */
diff --git a/src/eog-metadata-reader.h b/src/eog-metadata-reader.h
index f1cd9e4a..b55800f8 100644
--- a/src/eog-metadata-reader.h
+++ b/src/eog-metadata-reader.h
@@ -19,8 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef _EOG_METADATA_READER_H_
-#define _EOG_METADATA_READER_H_
+#pragma once
 
 #include <glib-object.h>
 #ifdef HAVE_EXIF
@@ -101,5 +100,3 @@ cmsHPROFILE          eog_metadata_reader_get_icc_profile (EogMetadataReader *sel
 #endif
 
 G_END_DECLS
-
-#endif /* _EOG_METADATA_READER_H_ */
diff --git a/src/eog-metadata-sidebar.h b/src/eog-metadata-sidebar.h
index dc56711f..beed6883 100644
--- a/src/eog-metadata-sidebar.h
+++ b/src/eog-metadata-sidebar.h
@@ -21,8 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef EOG_METADATA_SIDEBAR_H
-#define EOG_METADATA_SIDEBAR_H
+#pragma once
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -59,5 +58,3 @@ G_GNUC_INTERNAL
 GtkWidget* eog_metadata_sidebar_new (EogWindow *window);
 
 G_END_DECLS
-
-#endif /* EOG_METADATA_SIDEBAR_H */
diff --git a/src/eog-pixbuf-util.h b/src/eog-pixbuf-util.h
index 54f28200..5483ba85 100644
--- a/src/eog-pixbuf-util.h
+++ b/src/eog-pixbuf-util.h
@@ -1,5 +1,4 @@
-#ifndef _EOG_PIXBUF_UTIL_H_
-#define _EOG_PIXBUF_UTIL_H_
+#pragma once
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gio/gio.h>
@@ -15,6 +14,3 @@ GdkPixbufFormat* eog_pixbuf_get_format (GFile *file);
 
 G_GNUC_INTERNAL
 char*            eog_pixbuf_get_common_suffix (GdkPixbufFormat *format);
-
-#endif /* _EOG_PIXBUF_UTIL_H_ */
-
diff --git a/src/eog-plugin-engine.h b/src/eog-plugin-engine.h
index 1e041a1c..59ab2615 100644
--- a/src/eog-plugin-engine.h
+++ b/src/eog-plugin-engine.h
@@ -22,8 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_PLUGIN_ENGINE_H__
-#define __EOG_PLUGIN_ENGINE_H__
+#pragma once
 
 #include <libpeas/peas-engine.h>
 #include <glib.h>
@@ -58,5 +57,3 @@ G_GNUC_INTERNAL
 EogPluginEngine* eog_plugin_engine_new (void);
 
 G_END_DECLS
-
-#endif  /* __EOG_PLUGIN_ENGINE_H__ */
diff --git a/src/eog-preferences-dialog.h b/src/eog-preferences-dialog.h
index 91bfa9da..6d0d490c 100644
--- a/src/eog-preferences-dialog.h
+++ b/src/eog-preferences-dialog.h
@@ -19,8 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_PREFERENCES_DIALOG_H__
-#define __EOG_PREFERENCES_DIALOG_H__
+#pragma once
 
 #include "eog-image.h"
 #include "eog-thumb-view.h"
@@ -59,5 +58,3 @@ G_GNUC_INTERNAL
 GtkWidget  *eog_preferences_dialog_get_instance	  (GtkWindow   *parent);
 
 G_END_DECLS
-
-#endif /* __EOG_PREFERENCES_DIALOG_H__ */
diff --git a/src/eog-print-image-setup.h b/src/eog-print-image-setup.h
index 1d74d780..cb993ff1 100644
--- a/src/eog-print-image-setup.h
+++ b/src/eog-print-image-setup.h
@@ -19,10 +19,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "eog-image.h"
+#pragma once
 
-#ifndef EOG_PRINT_IMAGE_SETUP_H
-#define EOG_PRINT_IMAGE_SETUP_H
+#include "eog-image.h"
 
 G_BEGIN_DECLS
 
@@ -68,5 +67,3 @@ void              eog_print_image_setup_update      (GtkPrintOperation *operatio
 						     gpointer           user_data);
 
 G_END_DECLS
-
-#endif /* EOG_PRINT_IMAGE_SETUP_H */
diff --git a/src/eog-print-preview.h b/src/eog-print-preview.h
index 51651a94..4b30815b 100644
--- a/src/eog-print-preview.h
+++ b/src/eog-print-preview.h
@@ -19,8 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef _EOG_PRINT_PREVIEW_H_
-#define _EOG_PRINT_PREVIEW_H_
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -86,5 +85,3 @@ G_GNUC_INTERNAL
 gfloat       eog_print_preview_get_scale           (EogPrintPreview *preview);
 
 G_END_DECLS
-
-#endif /* _EOG_PRINT_PREVIEW_H_ */
diff --git a/src/eog-print.h b/src/eog-print.h
index 1e98a031..2887fb59 100644
--- a/src/eog-print.h
+++ b/src/eog-print.h
@@ -19,8 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_PRINT_H__
-#define __EOG_PRINT_H__
+#pragma once
 
 #include "eog-image.h"
 #include <gtk/gtk.h>
@@ -45,5 +44,3 @@ G_GNUC_INTERNAL
 void                  eog_print_set_print_settings (GtkPrintSettings *print_settings);
 
 G_END_DECLS
-
-#endif /* __EOG_PRINT_H__ */
diff --git a/src/eog-remote-presenter.h b/src/eog-remote-presenter.h
index 6c4e9c56..8ac12b8c 100644
--- a/src/eog-remote-presenter.h
+++ b/src/eog-remote-presenter.h
@@ -19,8 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_REMOTE_PRESENTER_H__
-#define __EOG_REMOTE_PRESENTER_H__
+#pragma once
 
 #include "eog-image.h"
 #include "eog-thumb-view.h"
@@ -62,5 +61,3 @@ GtkWidget  *eog_remote_presenter_new		(GtkWindow               *parent,
 void	    eog_remote_presenter_update  	(EogRemotePresenter     *prop,
                                                  EogImage                *image);
 G_END_DECLS
-
-#endif /* __EOG_REMOTE_PRESENTER_H__ */
diff --git a/src/eog-save-as-dialog-helper.h b/src/eog-save-as-dialog-helper.h
index 85d0b264..d135752e 100644
--- a/src/eog-save-as-dialog-helper.h
+++ b/src/eog-save-as-dialog-helper.h
@@ -1,5 +1,4 @@
-#ifndef _EOG_SAVE_AS_DIALOG_HELPER_H_
-#define _EOG_SAVE_AS_DIALOG_HELPER_H_
+#pragma once
 
 #include <gtk/gtk.h>
 #include <gio/gio.h>
@@ -16,5 +15,3 @@ EogURIConverter* eog_save_as_dialog_get_converter (GtkWidget *dlg);
 
 
 G_END_DECLS
-
-#endif /* _EOG_SAVE_DIALOG_HELPER_H_ */
diff --git a/src/eog-session.h b/src/eog-session.h
index 1855b394..450fbb44 100644
--- a/src/eog-session.h
+++ b/src/eog-session.h
@@ -23,8 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_SESSION_H__
-#define __EOG_SESSION_H__
+#pragma once
 
 #include "eog-application.h"
 
@@ -42,5 +41,3 @@ G_GNUC_INTERNAL
 gboolean 	eog_session_load 		(void);
 
 G_END_DECLS
-
-#endif /* __EOG_SESSION_H__ */
diff --git a/src/eog-sidebar.h b/src/eog-sidebar.h
index 099d9c83..94b12d88 100644
--- a/src/eog-sidebar.h
+++ b/src/eog-sidebar.h
@@ -23,8 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_SIDEBAR_H__
-#define __EOG_SIDEBAR_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -81,6 +80,3 @@ gboolean   eog_sidebar_is_empty     (EogSidebar  *eog_sidebar);
 
 G_END_DECLS
 
-#endif /* __EOG_SIDEBAR_H__ */
-
-
diff --git a/src/eog-thumb-nav.h b/src/eog-thumb-nav.h
index 5dce498e..ee175274 100644
--- a/src/eog-thumb-nav.h
+++ b/src/eog-thumb-nav.h
@@ -19,8 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_THUMB_NAV_H__
-#define __EOG_THUMB_NAV_H__
+#pragma once
 
 #include "eog-thumb-view.h"
 
@@ -76,4 +75,3 @@ void             eog_thumb_nav_set_mode          (EogThumbNav       *nav,
 
 G_END_DECLS
 
-#endif /* __EOG_THUMB_NAV_H__ */
diff --git a/src/eog-thumb-view.h b/src/eog-thumb-view.h
index a194246a..ae478e23 100644
--- a/src/eog-thumb-view.h
+++ b/src/eog-thumb-view.h
@@ -19,8 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef EOG_THUMB_VIEW_H
-#define EOG_THUMB_VIEW_H
+#pragma once
 
 #include "eog-image.h"
 #include "eog-list-store.h"
@@ -83,5 +82,3 @@ void        eog_thumb_view_set_thumbnail_popup      (EogThumbView *thumbview,
 						     GtkMenu      *menu);
 
 G_END_DECLS
-
-#endif /* EOG_THUMB_VIEW_H */
diff --git a/src/eog-thumbnail.h b/src/eog-thumbnail.h
index 5d4fb301..9c213ca4 100644
--- a/src/eog-thumbnail.h
+++ b/src/eog-thumbnail.h
@@ -22,8 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef _EOG_THUMBNAIL_H_
-#define _EOG_THUMBNAIL_H_
+#pragma once
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include "eog-image.h"
@@ -44,5 +43,3 @@ GdkPixbuf*    eog_thumbnail_load        (EogImage *image,
 #define EOG_THUMBNAIL_ORIGINAL_HEIGHT "eog-thumbnail-orig-height"
 
 G_END_DECLS
-
-#endif /* _EOG_THUMBNAIL_H_ */
diff --git a/src/eog-transform.h b/src/eog-transform.h
index 94c4222e..55f23348 100644
--- a/src/eog-transform.h
+++ b/src/eog-transform.h
@@ -1,5 +1,4 @@
-#ifndef _EOG_TRANSFORM_H_
-#define _EOG_TRANSFORM_H_
+#pragma once
 
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -70,6 +69,3 @@ gboolean         eog_transform_get_affine (EogTransform *trans, cairo_matrix_t *
 
 G_END_DECLS
 
-#endif /* _EOG_TRANSFORM_H_ */
-
-
diff --git a/src/eog-uri-converter.h b/src/eog-uri-converter.h
index a1881528..4dd74a2a 100644
--- a/src/eog-uri-converter.h
+++ b/src/eog-uri-converter.h
@@ -1,5 +1,4 @@
-#ifndef _EOG_URI_CONVERTER_H_
-#define _EOG_URI_CONVERTER_H_
+#pragma once
 
 #include <glib-object.h>
 #include "eog-image.h"
@@ -95,5 +94,3 @@ G_GNUC_INTERNAL
 void                eog_uri_converter_print_list (EogURIConverter *conv);
 
 G_END_DECLS
-
-#endif /* _EOG_URI_CONVERTER_H_ */
diff --git a/src/eog-util.h b/src/eog-util.h
index ee77d5ad..c4a72e8d 100644
--- a/src/eog-util.h
+++ b/src/eog-util.h
@@ -22,8 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_UTIL_H__
-#define __EOG_UTIL_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -85,5 +84,3 @@ void     eog_util_set_wallpaper_with_portal     (GFile *file,
 #endif
 
 G_END_DECLS
-
-#endif /* __EOG_UTIL_H__ */
diff --git a/src/eog-window-activatable.h b/src/eog-window-activatable.h
index 6bdc0247..a2957f37 100644
--- a/src/eog-window-activatable.h
+++ b/src/eog-window-activatable.h
@@ -24,8 +24,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_WINDOW_ACTIVATABLE_H__
-#define __EOG_WINDOW_ACTIVATABLE_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -48,4 +47,3 @@ void	eog_window_activatable_activate	    (EogWindowActivatable *activatable);
 void	eog_window_activatable_deactivate   (EogWindowActivatable *activatable);
 
 G_END_DECLS
-#endif /* __EOG_WINDOW_ACTIVATABLE_H__ */
diff --git a/src/eog-window.h b/src/eog-window.h
index 1370a52e..c9b42757 100644
--- a/src/eog-window.h
+++ b/src/eog-window.h
@@ -25,8 +25,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef __EOG_WINDOW_H__
-#define __EOG_WINDOW_H__
+#pragma once
 
 #include "eog-list-store.h"
 #include "eog-image.h"
@@ -137,5 +136,3 @@ void          eog_window_show_preferences_dialog (EogWindow *window);
 void          eog_window_close          (EogWindow *window);
 
 G_END_DECLS
-
-#endif
diff --git a/src/eog-zoom-entry.h b/src/eog-zoom-entry.h
index a4ff7169..8f538216 100644
--- a/src/eog-zoom-entry.h
+++ b/src/eog-zoom-entry.h
@@ -23,8 +23,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-#ifndef EOG_ZOOM_ENTRY_H
-#define EOG_ZOOM_ENTRY_H
+#pragma once
 
 #include <glib.h>
 #include <glib-object.h>
@@ -37,5 +36,3 @@
 G_DECLARE_FINAL_TYPE(EogZoomEntry, eog_zoom_entry, EOG, ZOOM_ENTRY, GtkBox);
 
 GtkWidget* eog_zoom_entry_new (EogScrollView *view, GMenu *menu);
-
-#endif /* EOG_ZOOM_ENTRY_H */
diff --git a/src/zoom.h b/src/zoom.h
index d082e4b1..b7d1f8e6 100644
--- a/src/zoom.h
+++ b/src/zoom.h
@@ -19,8 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef ZOOM_H
-#define ZOOM_H
+#pragma once
 
 #include <glib.h>
 
@@ -34,5 +33,3 @@ G_GNUC_INTERNAL
 double zoom_fit_scale (guint dest_width, guint dest_height,
 		       guint src_width, guint src_height,
 		       gboolean upscale_smaller);
-
-#endif