Fix include-what-you-use warnings

[geeqie.git] / src / bar-gps.cc

diff --git a/src/bar-gps.cc b/src/bar-gps.cc
index b17e006..dc6781a 100644 (file)
--- a/src/bar-gps.cc
+++ b/src/bar-gps.cc
@@ -21,11 +21,23 @@
 
 #include <config.h>
 
-#ifdef HAVE_LIBCHAMPLAIN
-#ifdef HAVE_LIBCHAMPLAIN_GTK
+#if HAVE_LIBCHAMPLAIN
+#if HAVE_LIBCHAMPLAIN_GTK
 
 #include "bar-gps.h"
 
+#include <cstring>
+
+#include <cairo.h>
+#include <champlain-gtk/champlain-gtk.h>
+#include <champlain/champlain.h>
+#include <clutter-gtk/clutter-gtk.h>
+#include <clutter/clutter.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdk.h>
+#include <glib-object.h>
+#include <pango/pango.h>
+
 #include "bar.h"
 #include "compat.h"
 #include "debug.h"
@@ -33,19 +45,15 @@
 #include "intl.h"
 #include "layout.h"
 #include "main-defines.h"
-#include "menu.h"
 #include "metadata.h"
 #include "misc.h"
 #include "rcfile.h"
 #include "thumb.h"
+#include "typedefs.h"
 #include "ui-menu.h"
 #include "ui-utildlg.h"
 #include "uri-utils.h"
 
-#include <champlain-gtk/champlain-gtk.h>
-#include <champlain/champlain.h>
-#include <clutter-gtk/clutter-gtk.h>
-
 #define MARKER_COLOUR 0x00, 0x00, 0xff, 0xff
 #define TEXT_COLOUR 0x00, 0x00, 0x00, 0xff
 #define THUMB_COLOUR 0xff, 0xff, 0xff, 0xff
@@ -866,7 +874,7 @@ static void bar_pane_gps_map_centreing(PaneGPSData *pgd)
        g_string_free(message, TRUE);
 }
 
-#ifdef HAVE_GTK4
+#if HAVE_GTK4
 static gboolean bar_pane_gps_map_keypress_cb(GtkWidget *, GdkEventButton *bevent, gpointer data)
 {
 /* @FIXME GTK4 stub */
@@ -971,7 +979,7 @@ GtkWidget *bar_pane_gps_new(const gchar *id, const gchar *title, const gchar *ma
        gtk_container_add(GTK_CONTAINER(frame), vbox);
 
        status = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0);
-#ifdef HAVE_GTK4
+#if HAVE_GTK4
        slider = gtk_scale_button_new(1, 17, 1, slider_icons);
 #else
        slider = gtk_scale_button_new(GTK_ICON_SIZE_SMALL_TOOLBAR, 1, 17, 1, slider_icons);
@@ -1152,7 +1160,7 @@ void bar_pane_gps_update_from_config(GtkWidget *pane, const gchar **attribute_na
        bar_update_expander(pane);
 }
 
-#endif
-#endif
+#endif // HAVE_LIBCHAMPLAIN_GTK
+#endif // HAVE_LIBCHAMPLAIN
 
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */