Remove redundant includes

The program deheader was used to create a list of redundant headers:
https://gitlab.com/esr/deheader

This change was necessary in the deheader python file:
command = maker

This script was run:

if [  $(echo $CFLAGS | grep -c "Werror-implicit-function-declaration" )
-ne 1 ]
then
	export CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
fi

rm -r build
meson setup build
ninja -C build

for file in "$@"
do
	filename=${file##*/}
	filestem=${filename%.*}

	$HOME/bin/deheader/deheader -m 'ninja -C build'  -i
"$filestem.h"  "$file" # include -r for final run

	touch "$file"
done

diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc
index 448e982..6706262 100644 (file)
--- a/src/advanced-exif.cc
+++ b/src/advanced-exif.cc
@@ -23,7 +23,6 @@
 #include "advanced-exif.h"
 
 #include "exif.h"
-#include "metadata.h"
 #include "filedata.h"
 #include "history-list.h"
 #include "layout-util.h"
@@ -32,11 +31,6 @@
 #include "window.h"
 #include "dnd.h"
 
-/** @FIXME not needed when bar-exif.cc is improved */
-#include "bar-exif.h"
-
-#include <math.h>
-
 #define ADVANCED_EXIF_DATA_COLUMN_WIDTH 200
 
 /*

diff --git a/src/bar-exif.cc b/src/bar-exif.cc
index 4e16e50..c021a78 100644 (file)
--- a/src/bar-exif.cc
+++ b/src/bar-exif.cc
@@ -25,8 +25,6 @@
 #include "exif.h"
 #include "metadata.h"
 #include "filedata.h"
-#include "history-list.h"
-#include "misc.h"
 #include "ui-misc.h"
 #include "ui-menu.h"
 #include "bar.h"
@@ -35,9 +33,6 @@
 #include "ui-utildlg.h"
 #include "layout.h"
 
-
-#include <math.h>
-
 #define MIN_HEIGHT 25
 /*
  *-------------------------------------------------------------------

diff --git a/src/bar-histogram.cc b/src/bar-histogram.cc
index b72f7b9..10a98fc 100644 (file)
--- a/src/bar-histogram.cc
+++ b/src/bar-histogram.cc
@@ -23,9 +23,7 @@
 #include "bar-histogram.h"
 
 #include "bar.h"
-#include "metadata.h"
 #include "filedata.h"
-#include "menu.h"
 #include "ui-menu.h"
 #include "ui-misc.h"
 #include "histogram.h"

diff --git a/src/bar-keywords.cc b/src/bar-keywords.cc
index dea2956..68df055 100644 (file)
--- a/src/bar-keywords.cc
+++ b/src/bar-keywords.cc
@@ -19,19 +19,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <glib/gprintf.h>
-
 #include "main.h"
 #include "bar-keywords.h"
 
 #include "filedata.h"
-#include "history-list.h"
 #include "metadata.h"
-#include "misc.h"
 #include "ui-fileops.h"
 #include "ui-misc.h"
 #include "ui-utildlg.h"
-#include "utilops.h"
 #include "bar.h"
 #include "ui-menu.h"
 #include "rcfile.h"

diff --git a/src/bar-sort.cc b/src/bar-sort.cc
index 22c1a22..c02a62b 100644 (file)
--- a/src/bar-sort.cc
+++ b/src/bar-sort.cc
@@ -32,7 +32,6 @@
 #include "editors.h"
 #include "ui-bookmark.h"
 #include "ui-fileops.h"
-#include "ui-menu.h"
 #include "ui-misc.h"
 #include "rcfile.h"
 #include "window.h"

diff --git a/src/bar.cc b/src/bar.cc
index 968d16d..e3b6577 100644 (file)
--- a/src/bar.cc
+++ b/src/bar.cc
@@ -22,24 +22,12 @@
 #include "main.h"
 #include "bar.h"
 
+#include "bar-histogram.h"
 #include "filedata.h"
-#include "history-list.h"
 #include "metadata.h"
-#include "misc.h"
-#include "ui-fileops.h"
-#include "ui-misc.h"
-#include "ui-utildlg.h"
-
-#include "ui-menu.h"
-#include "bar-comment.h"
-#include "bar-keywords.h"
-#include "bar-exif.h"
-#include "bar-histogram.h"
-#include "histogram.h"
 #include "rcfile.h"
-#include "bar-gps.h"
-
-#include <gdk/gdkkeysyms.h>
+#include "ui-menu.h"
+#include "ui-misc.h"
 
 typedef struct _KnownPanes KnownPanes;
 struct _KnownPanes

diff --git a/src/cache-loader.cc b/src/cache-loader.cc
index f30e7f3..097b99c 100644 (file)
--- a/src/cache-loader.cc
+++ b/src/cache-loader.cc
@@ -21,12 +21,9 @@
 
 #include "main.h"
 #include "cache-loader.h"
-#include "cache.h"
 
 #include "filedata.h"
-#include "exif.h"
 #include "metadata.h"
-#include "md5-util.h"
 #include "ui-fileops.h"
 
 

diff --git a/src/cache-maint.cc b/src/cache-maint.cc
index 21b93b5..0451bcc 100644 (file)
--- a/src/cache-maint.cc
+++ b/src/cache-maint.cc
@@ -22,7 +22,6 @@
 #include "main.h"
 #include "cache-maint.h"
 
-#include "cache.h"
 #include "cache-loader.h"
 #include "filedata.h"
 #include "layout.h"

diff --git a/src/cache.cc b/src/cache.cc
index babe009..187431c 100644 (file)
--- a/src/cache.cc
+++ b/src/cache.cc
@@ -28,7 +28,6 @@
 #include "ui-fileops.h"
 
 #include <utime.h>
-#include <errno.h>
 
 
 /**

diff --git a/src/cellrenderericon.cc b/src/cellrenderericon.cc
index a87d74e..40585ec 100644 (file)
--- a/src/cellrenderericon.cc
+++ b/src/cellrenderericon.cc
@@ -17,12 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <stdlib.h>
-#include <gtk/gtk.h> /* To define GTK_CHECK_VERSION */
 #include "main.h"
 #include "cellrenderericon.h"
-#include "intl.h"
-
 
 #define FIXED_ICON_SIZE_MAX 512
 

diff --git a/src/collect-dlg.cc b/src/collect-dlg.cc
index 0e25934..ad9edb3 100644 (file)
--- a/src/collect-dlg.cc
+++ b/src/collect-dlg.cc
@@ -26,9 +26,6 @@
 #include "collect-io.h"
 #include "utilops.h"
 #include "ui-fileops.h"
-#include "ui-tabcomp.h"
-#include "ui-utildlg.h"
-
 
 enum {
        DIALOG_SAVE,

diff --git a/src/collect-io.cc b/src/collect-io.cc
index 44f3c0c..b6b211b 100644 (file)
--- a/src/collect-io.cc
+++ b/src/collect-io.cc
@@ -25,7 +25,6 @@
 #include "collect.h"
 #include "filedata.h"
 #include "layout-util.h"
-#include "misc.h"
 #include "secure-save.h"
 #include "thumb.h"
 #include "ui-fileops.h"

diff --git a/src/collect-table.cc b/src/collect-table.cc
index cbb012b..fc846f4 100644 (file)
--- a/src/collect-table.cc
+++ b/src/collect-table.cc
@@ -27,7 +27,6 @@
 #include "collect-io.h"
 #include "dnd.h"
 #include "dupe.h"
-#include "editors.h"
 #include "filedata.h"
 #include "img-view.h"
 #include "layout.h"
@@ -47,8 +46,6 @@
 #define MARKER_WIDTH 26
 #define MARKER_HEIGHT 32
 
-#include <gdk/gdkkeysyms.h> /* for keyboard values */
-
 /* between these, the icon width is increased by thumb_max_width / 2 */
 #define THUMB_MIN_ICON_WIDTH 128
 #define THUMB_MAX_ICON_WIDTH 150

diff --git a/src/collect.cc b/src/collect.cc
index 8097b94..0b8d923 100644 (file)
--- a/src/collect.cc
+++ b/src/collect.cc
@@ -25,10 +25,8 @@
 #include "collect-dlg.h"
 #include "collect-io.h"
 #include "collect-table.h"
-#include "editors.h"
 #include "filedata.h"
 #include "img-view.h"
-#include "layout.h"
 #include "layout-image.h"
 #include "layout-util.h"
 #include "misc.h"
@@ -39,9 +37,6 @@
 #include "utilops.h"
 #include "window.h"
 
-#include <gdk/gdkkeysyms.h> /* for keyboard values */
-
-
 #define COLLECT_DEF_WIDTH 440
 #define COLLECT_DEF_HEIGHT 450
 

diff --git a/src/compat.cc b/src/compat.cc
index a4d2da9..fd8ecfb 100644 (file)
--- a/src/compat.cc
+++ b/src/compat.cc
@@ -18,7 +18,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "main.h"
 #include "compat.h"
 
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */

diff --git a/src/debug.cc b/src/debug.cc
index 1581bdb..3ec5678 100644 (file)
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -24,7 +24,6 @@
 #include "logwindow.h"
 #include "ui-fileops.h"
 
-#include <glib/gprintf.h>
 #include <regex.h>
 
 /*

diff --git a/src/desktop-file.cc b/src/desktop-file.cc
index aaebaf3..27a8151 100644 (file)
--- a/src/desktop-file.cc
+++ b/src/desktop-file.cc
@@ -23,11 +23,8 @@
 #include "desktop-file.h"
 
 #include "editors.h"
-#include "filedata.h"
-#include "misc.h"
 #include "ui-misc.h"
 #include "ui-fileops.h"
-#include "ui-utildlg.h"
 #include "pixbuf-util.h"
 #include "window.h"
 #include "utilops.h"

diff --git a/src/dnd.cc b/src/dnd.cc
index dae198a..ed7766c 100644 (file)
--- a/src/dnd.cc
+++ b/src/dnd.cc
@@ -22,9 +22,6 @@
 #include "main.h"
 #include "dnd.h"
 
-#include "collect.h"
-#include "image.h"
-#include "ui-fileops.h"
 #include "pixbuf-util.h"
 
 

diff --git a/src/dupe.cc b/src/dupe.cc
index 5dc07bf..9eac1cd 100644 (file)
--- a/src/dupe.cc
+++ b/src/dupe.cc
@@ -25,15 +25,12 @@
 #include "dupe.h"
 
 #include "cache.h"
-#include "collect.h"
 #include "collect-table.h"
 #include "dnd.h"
-#include "editors.h"
 #include "filedata.h"
 #include "history-list.h"
 #include "image-load.h"
 #include "img-view.h"
-#include "layout.h"
 #include "layout-image.h"
 #include "layout-util.h"
 #include "md5-util.h"
@@ -50,9 +47,6 @@
 #include "utilops.h"
 #include "window.h"
 
-#include <gdk/gdkkeysyms.h> /* for keyboard values */
-
-
 #include <math.h>
 
 

diff --git a/src/editors.cc b/src/editors.cc
index 475abdf..38fd69e 100644 (file)
--- a/src/editors.cc
+++ b/src/editors.cc
@@ -24,16 +24,11 @@
 
 #include "filedata.h"
 #include "filefilter.h"
-#include "misc.h"
 #include "pixbuf-util.h"
 #include "ui-fileops.h"
 #include "ui-spinner.h"
-#include "ui-utildlg.h"
 #include "utilops.h"
 
-#include <errno.h>
-
-
 #define EDITOR_WINDOW_WIDTH 500
 #define EDITOR_WINDOW_HEIGHT 300
 

diff --git a/src/exif-common.cc b/src/exif-common.cc
index 4a937c8..950958c 100644 (file)
--- a/src/exif-common.cc
+++ b/src/exif-common.cc
@@ -21,13 +21,7 @@
 
 #define _XOPEN_SOURCE
 
-#include <stdio.h>
 #include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
 #include <math.h>
 
 #ifdef HAVE_LCMS
@@ -40,17 +34,10 @@
 #endif
 #endif
 
-#include <glib.h>
-
-#include "intl.h"
-
 #include "main.h"
 #include "exif.h"
 
-#include "filedata.h"
-#include "filefilter.h"
 #include "filecache.h"
-#include "format-raw.h"
 #include "glua.h"
 #include "ui-fileops.h"
 #include "cache.h"

diff --git a/src/filedata.cc b/src/filedata.cc
index 2571965..be263b0 100644 (file)
--- a/src/filedata.cc
+++ b/src/filedata.cc
@@ -34,7 +34,6 @@
 #include "exif.h"
 #include "misc.h"
 
-#include <errno.h>
 #include <grp.h>
 
 #ifdef DEBUG_FILEDATA

diff --git a/src/filefilter.cc b/src/filefilter.cc
index 07a32af..13e2ab1 100644 (file)
--- a/src/filefilter.cc
+++ b/src/filefilter.cc
@@ -23,9 +23,6 @@
 #include "filefilter.h"
 
 #include "cache.h"
-#include "misc.h"
-#include "secure-save.h"
-#include "thumb-standard.h"
 #include "ui-fileops.h"
 #include "rcfile.h"
 

diff --git a/src/fullscreen.cc b/src/fullscreen.cc
index c80621f..d70b56a 100644 (file)
--- a/src/fullscreen.cc
+++ b/src/fullscreen.cc
@@ -25,7 +25,6 @@
 #include "image.h"
 #include "misc.h"
 #include "ui-fileops.h"
-#include "ui-menu.h"
 #include "ui-misc.h"
 #include "window.h"
 #include "image-load.h"

diff --git a/src/image.cc b/src/image.cc
index f95c924..9c494d5 100644 (file)
--- a/src/image.cc
+++ b/src/image.cc
@@ -22,23 +22,17 @@
 #include "main.h"
 #include "image.h"
 
-
-#include "collect.h"
 #include "collect-table.h"
 #include "color-man.h"
 #include "exif.h"
 #include "metadata.h"
-#include "histogram.h"
 #include "history-list.h"
 #include "image-load.h"
-#include "image-overlay.h"
 #include "layout.h"
 #include "layout-image.h"
 #include "pixbuf-renderer.h"
 #include "pixbuf-util.h"
 #include "ui-fileops.h"
-
-#include "filedata.h"
 #include "filecache.h"
 
 #include <math.h>

diff --git a/src/img-view.cc b/src/img-view.cc
index 2997b1d..60b209a 100644 (file)
--- a/src/img-view.cc
+++ b/src/img-view.cc
@@ -31,13 +31,10 @@
 #include "image.h"
 #include "image-load.h"
 #include "image-overlay.h"
-#include "layout.h"
-#include "layout-image.h"
 #include "layout-util.h"
 #include "menu.h"
 #include "misc.h"
 #include "pixbuf-util.h"
-#include "pixbuf-renderer.h"
 #include "print.h"
 #include "slideshow.h"
 #include "ui-fileops.h"
@@ -46,9 +43,6 @@
 #include "utilops.h"
 #include "window.h"
 
-#include <gdk/gdkkeysyms.h> /* for keyboard values */
-
-
 typedef struct _ViewWindow ViewWindow;
 struct _ViewWindow
 {

diff --git a/src/layout-config.cc b/src/layout-config.cc
index 477702f..a3619ee 100644 (file)
--- a/src/layout-config.cc
+++ b/src/layout-config.cc
@@ -22,9 +22,6 @@
 #include "main.h"
 #include "layout-config.h"
 
-
-#include "layout.h"
-
 #include "ui-misc.h"
 
 

diff --git a/src/layout-image.cc b/src/layout-image.cc
index 6f01644..2d29ecd 100644 (file)
--- a/src/layout-image.cc
+++ b/src/layout-image.cc
@@ -23,7 +23,6 @@
 #include "layout-image.h"
 
 #include "collect.h"
-#include "color-man.h"
 #include "dnd.h"
 #include "editors.h"
 #include "exif.h"
@@ -33,7 +32,6 @@
 #include "image.h"
 #include "image-overlay.h"
 #include "img-view.h"
-#include "layout.h"
 #include "layout-util.h"
 #include "menu.h"
 #include "metadata.h"
@@ -47,8 +45,6 @@
 #include "utilops.h"
 #include "view-file.h"
 
-#include <gdk/gdkkeysyms.h> /* for keyboard values */
-
 #define FILE_COLUMN_POINTER 0
 
 static GtkWidget *layout_image_pop_menu(LayoutWindow *lw);

diff --git a/src/layout-util.cc b/src/layout-util.cc
index 571eca8..99adce0 100644 (file)
--- a/src/layout-util.cc
+++ b/src/layout-util.cc
@@ -29,11 +29,9 @@
 #include "cache-maint.h"
 #include "collect.h"
 #include "collect-dlg.h"
-#include "compat.h"
 #include "color-man.h"
 #include "dupe.h"
 #include "editors.h"
-#include "filedata.h"
 #include "history-list.h"
 #include "image.h"
 #include "image-overlay.h"
@@ -53,7 +51,6 @@
 #include "ui-fileops.h"
 #include "ui-menu.h"
 #include "ui-misc.h"
-#include "ui-tabcomp.h"
 #include "utilops.h"
 #include "view-dir.h"
 #include "view-file.h"
@@ -62,7 +59,6 @@
 #include "desktop-file.h"
 
 #include <sys/wait.h>
-#include <gdk/gdkkeysyms.h> /* for keyboard values */
 #include "keymap-template.h"
 
 #define MENU_EDIT_ACTION_OFFSET 16

diff --git a/src/layout.cc b/src/layout.cc
index d3ce129..203981d 100644 (file)
--- a/src/layout.cc
+++ b/src/layout.cc
@@ -22,9 +22,7 @@
 #include "main.h"
 #include "layout.h"
 
-#include "color-man.h"
 #include "filedata.h"
-#include "histogram.h"
 #include "history-list.h"
 #include "image.h"
 #include "image-overlay.h"
@@ -33,7 +31,6 @@
 #include "layout-util.h"
 #include "logwindow.h"
 #include "menu.h"
-#include "pixbuf-renderer.h"
 #include "pixbuf-util.h"
 #include "utilops.h"
 #include "view-dir.h"

diff --git a/src/logwindow.cc b/src/logwindow.cc
index f418846..183380e 100644 (file)
--- a/src/logwindow.cc
+++ b/src/logwindow.cc
@@ -22,13 +22,9 @@
 #include "logwindow.h"
 
 #include "misc.h"
-#include "secure-save.h"
 #include "ui-misc.h"
 #include "window.h"
 
-#include <gdk/gdkkeysyms.h>
-
-
 typedef struct _LogWindow LogWindow;
 
 struct _LogWindow

diff --git a/src/main.cc b/src/main.cc
index 5b0ae62..2126294 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -19,12 +19,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <gdk/gdkkeysyms.h> /* for keyboard values */
-
 #include <signal.h>
 #include <sys/mman.h>
 
-#include <math.h>
 #ifdef G_OS_UNIX
 #include <pwd.h>
 #endif
@@ -39,23 +36,18 @@
 #include "filefilter.h"
 #include "history-list.h"
 #include "image.h"
-#include "image-overlay.h"
 #include "img-view.h"
-#include "layout.h"
 #include "layout-image.h"
 #include "layout-util.h"
 #include "misc.h"
-#include "options.h"
 #include "rcfile.h"
 #include "remote.h"
 #include "secure-save.h"
-#include "similar.h"
 #include "ui-fileops.h"
 #include "ui-utildlg.h"
 #include "cache-maint.h"
 #include "thumb.h"
 #include "metadata.h"
-#include "editors.h"
 #include "exif.h"
 #include "histogram.h"
 #include "pixbuf-util.h"
@@ -1464,6 +1456,19 @@ gint main(gint argc, gchar *argv[])
                g_signal_connect(default_settings, "notify::gtk-theme-name", G_CALLBACK(theme_change_cb), NULL);
                set_theme_bg_color();
                }
+#ifdef HAVE_RAW
+DEBUG_0("HAVE_RAW    "    );
+#else
+
+DEBUG_0("not have raw     "    );
+#endif
+#ifndef HAVE_RAW
+DEBUG_0("ggggg  "   );
+#else
+DEBUG_0("not ggg     "    );
+#endif
+
+
 
        DEBUG_1("%s main: gtk_main", get_exec_time());
        gtk_main();

diff --git a/src/menu.cc b/src/menu.cc
index d4e1413..1f266d3 100644 (file)
--- a/src/menu.cc
+++ b/src/menu.cc
@@ -22,21 +22,11 @@
 #include "main.h"
 #include "menu.h"
 
-#include "cache-maint.h"
-#include "collect.h"
-#include "collect-dlg.h"
 #include "collect-io.h"
 #include "collect-table.h"
-#include "dupe.h"
 #include "editors.h"
-#include "filedata.h"
-#include "img-view.h"
 #include "pixbuf-util.h"
-#include "preferences.h"
-#include "slideshow.h"
-#include "utilops.h"
 #include "ui-fileops.h"
-#include "ui-tabcomp.h"
 #include "ui-menu.h"
 
 static GtkWidget *real_submenu_add_alter(GtkWidget *menu, GCallback func, gpointer data,

diff --git a/src/metadata.cc b/src/metadata.cc
index 4701d33..e172d76 100644 (file)
--- a/src/metadata.cc
+++ b/src/metadata.cc
@@ -30,9 +30,7 @@
 #include "misc.h"
 #include "secure-save.h"
 #include "ui-fileops.h"
-#include "ui-misc.h"
 #include "utilops.h"
-#include "filefilter.h"
 #include "layout-util.h"
 #include "rcfile.h"
 

diff --git a/src/misc.cc b/src/misc.cc
index 9d877ff..8031969 100644 (file)
--- a/src/misc.cc
+++ b/src/misc.cc
@@ -20,11 +20,10 @@
 
 #include "main.h"
 #include "misc.h"
+
 #include "ui-fileops.h"
 
-#include <errno.h>
 #include <langinfo.h>
-#include <locale.h>
 
 gdouble get_zoom_increment(void)
 {

diff --git a/src/options.cc b/src/options.cc
index 6d963ea..b4020c6 100644 (file)
--- a/src/options.cc
+++ b/src/options.cc
@@ -20,9 +20,6 @@
 #include "main.h"
 #include "options.h"
 
-#include "bar-exif.h"
-#include "editors.h"
-#include "filefilter.h"
 #include "histogram.h" /* HCHAN_RGB */
 #include "image-overlay.h" /* OSD_SHOW_NOTHING */
 #include "layout.h"
@@ -30,7 +27,6 @@
 #include "rcfile.h"
 #include "ui-bookmark.h"
 #include "ui-fileops.h"
-#include "window.h"
 
 ConfOptions *options;
 CommandLine *command_line;

diff --git a/src/pan-view/pan-calendar.cc b/src/pan-view/pan-calendar.cc
index 6aeef9d..7f1213c 100644 (file)
--- a/src/pan-view/pan-calendar.cc
+++ b/src/pan-view/pan-calendar.cc
@@ -21,7 +21,6 @@
 
 #include "pan-calendar.h"
 
-#include <glib/gprintf.h>
 #include <math.h>
 
 #include "misc.h"

diff --git a/src/pan-view/pan-view-filter.cc b/src/pan-view/pan-view-filter.cc
index 61e2905..4130845 100644 (file)
--- a/src/pan-view/pan-view-filter.cc
+++ b/src/pan-view/pan-view-filter.cc
@@ -21,10 +21,7 @@
 
 #include "pan-view-filter.h"
 
-#include "image.h"
 #include "metadata.h"
-#include "pan-item.h"
-#include "pan-util.h"
 #include "pan-view.h"
 #include "ui-fileops.h"
 #include "ui-tabcomp.h"

diff --git a/src/pan-view/pan-view-search.cc b/src/pan-view/pan-view-search.cc
index de89c7d..fb20b92 100644 (file)
--- a/src/pan-view/pan-view-search.cc
+++ b/src/pan-view/pan-view-search.cc
@@ -23,7 +23,6 @@
 
 #include "image.h"
 #include "pan-calendar.h"
-#include "pan-item.h"
 #include "pan-util.h"
 #include "pan-view.h"
 #include "ui-tabcomp.h"

diff --git a/src/pan-view/pan-view.cc b/src/pan-view/pan-view.cc
index 0c57320..3fd102b 100644 (file)
--- a/src/pan-view/pan-view.cc
+++ b/src/pan-view/pan-view.cc
@@ -21,41 +21,33 @@
 
 #include "pan-view.h"
 
-#include "main.h"
 #include "bar-exif.h"
 #include "dnd.h"
 #include "editors.h"
 #include "exif.h"
 #include "fullscreen.h"
-#include "history-list.h"
 #include "image.h"
 #include "img-view.h"
 #include "layout-util.h"
 #include "menu.h"
 #include "metadata.h"
-#include "misc.h"
 #include "pan-calendar.h"
 #include "pan-folder.h"
 #include "pan-grid.h"
-#include "pan-item.h"
 #include "pan-timeline.h"
 #include "pan-util.h"
 #include "pan-view-filter.h"
 #include "pan-view-search.h"
-#include "pixbuf-renderer.h"
 #include "pixbuf-util.h"
 #include "thumb.h"
 #include "ui-fileops.h"
 #include "ui-menu.h"
 #include "ui-misc.h"
 #include "ui-tabcomp.h"
-#include "ui-utildlg.h"
 #include "uri-utils.h"
 #include "utilops.h"
 #include "window.h"
 
-#include <gdk/gdkkeysyms.h> /* for keyboard values */
-
 #include <math.h>
 
 

diff --git a/src/pixbuf-renderer.cc b/src/pixbuf-renderer.cc
index 592661d..d8d9b4a 100644 (file)
--- a/src/pixbuf-renderer.cc
+++ b/src/pixbuf-renderer.cc
@@ -19,19 +19,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 
 #include "main.h"
 #include "pixbuf-renderer.h"
-#include "renderer-tiles.h"
-
-#include "intl.h"
-#include "layout.h"
 
-#include <gtk/gtk.h>
+#include "renderer-tiles.h"
 
 /* comment this out if not using this from within Geeqie
  * defining GQ_BUILD does these things:

diff --git a/src/preferences.cc b/src/preferences.cc
index 22519d7..f3a994d 100644 (file)
--- a/src/preferences.cc
+++ b/src/preferences.cc
@@ -22,13 +22,9 @@
 #include "main.h"
 #include "preferences.h"
 
-#include "bar-exif.h"
 #include "bar-keywords.h"
 #include "cache.h"
-#include "cache-maint.h"
-#include "dnd.h"
 #include "editors.h"
-#include "exif.h"
 #include "filedata.h"
 #include "filefilter.h"
 #include "fullscreen.h"
@@ -36,7 +32,6 @@
 #include "image-overlay.h"
 #include "color-man.h"
 #include "img-view.h"
-#include "layout-config.h"
 #include "layout-util.h"
 #include "metadata.h"
 #include "misc.h"
@@ -51,7 +46,6 @@
 #include "ui-misc.h"
 #include "ui-spinner.h"
 #include "ui-tabcomp.h"
-#include "ui-utildlg.h"
 #include "window.h"
 #include "zonedetect.h"
 

diff --git a/src/rcfile.cc b/src/rcfile.cc
index f0805d7..9cdbdce 100644 (file)
--- a/src/rcfile.cc
+++ b/src/rcfile.cc
@@ -19,9 +19,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <glib/gstdio.h>
-#include <errno.h>
-
 #include "main.h"
 #include "rcfile.h"
 
@@ -34,12 +31,10 @@
 #include "bar-sort.h"
 #include "editors.h"
 #include "filefilter.h"
-#include "misc.h"
 #include "pixbuf-renderer.h"
 #include "secure-save.h"
 #include "slideshow.h"
 #include "ui-fileops.h"
-#include "layout.h"
 #include "layout-util.h"
 #include "bar.h"
 #include "metadata.h"

diff --git a/src/remote.cc b/src/remote.cc
index 9fe5663..f123510 100644 (file)
--- a/src/remote.cc
+++ b/src/remote.cc
@@ -30,7 +30,6 @@
 #include "filefilter.h"
 #include "image.h"
 #include "img-view.h"
-#include "layout.h"
 #include "layout-image.h"
 #include "layout-util.h"
 #include "misc.h"
@@ -43,7 +42,6 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <signal.h>
-#include <errno.h>
 
 #include "glua.h"
 

diff --git a/src/renderer-tiles.cc b/src/renderer-tiles.cc
index 68f7019..c8c61a8 100644 (file)
--- a/src/renderer-tiles.cc
+++ b/src/renderer-tiles.cc
@@ -19,21 +19,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 
 #include "main.h"
-#include "pixbuf-renderer.h"
 #include "renderer-tiles.h"
 
-#include "intl.h"
-#include "layout.h"
-
-#include <gtk/gtk.h>
-
-
 /* comment this out if not using this from within Geeqie
  * defining GQ_BUILD does these things:
  *   - Sets the shift-click scroller pixbuf to a nice icon instead of a black box

diff --git a/src/search-and-run.cc b/src/search-and-run.cc
index 52a6b8b..cfdefe9 100644 (file)
--- a/src/search-and-run.cc
+++ b/src/search-and-run.cc
@@ -18,12 +18,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <gdk/gdkkeysyms.h>
-
 #include "main.h"
 #include "search-and-run.h"
 
-#include "layout-util.h"
 #include "ui-misc.h"
 #include "window.h"
 

diff --git a/src/search.cc b/src/search.cc
index 01df376..0d8e3b2 100644 (file)
--- a/src/search.cc
+++ b/src/search.cc
@@ -23,7 +23,6 @@
 #include "search.h"
 
 #include "cache.h"
-#include "collect.h"
 #include "collect-table.h"
 #include "dnd.h"
 #include "dupe.h"
@@ -31,7 +30,6 @@
 #include "filedata.h"
 #include "image-load.h"
 #include "img-view.h"
-#include "layout.h"
 #include "layout-util.h"
 #include "math.h"
 #include "menu.h"
@@ -52,9 +50,6 @@
 #include "window.h"
 #include "bar-keywords.h"
 
-#include <gdk/gdkkeysyms.h> /* for keyboard values */
-
-
 #define DEF_SEARCH_WIDTH  700
 #define DEF_SEARCH_HEIGHT 650
 

diff --git a/src/secure-save.cc b/src/secure-save.cc
index bcd26ea..a0248d6 100644 (file)
--- a/src/secure-save.cc
+++ b/src/secure-save.cc
@@ -20,8 +20,6 @@
 
 #include "main.h"
 #include <glib/gprintf.h>
-#include <glib/gstdio.h>
-#include <errno.h>
 #include <utime.h>
 
 #include "secure-save.h"

diff --git a/src/slideshow.cc b/src/slideshow.cc
index 468822d..d863785 100644 (file)
--- a/src/slideshow.cc
+++ b/src/slideshow.cc
@@ -24,11 +24,8 @@
 #include "image.h"
 #include "slideshow.h"
 #include "filedata.h"
-
 #include "layout.h"
 #include "layout-image.h"
-#include "ui-fileops.h"
-
 
 static void slideshow_timer_stop(SlideShowData *ss);
 

diff --git a/src/toolbar.cc b/src/toolbar.cc
index 21954ec..5c37a39 100644 (file)
--- a/src/toolbar.cc
+++ b/src/toolbar.cc
@@ -22,7 +22,6 @@
 #include "main.h"
 #include "toolbar.h"
 
-#include "collect.h"
 #include "layout-util.h"
 #include "ui-fileops.h"
 #include "ui-misc.h"

diff --git a/src/trash.cc b/src/trash.cc
index 083dbcb..eaa31fc 100644 (file)
--- a/src/trash.cc
+++ b/src/trash.cc
@@ -26,8 +26,6 @@
 #include "editors.h"
 #include "filedata.h"
 #include "ui-fileops.h"
-#include "ui-misc.h"
-
 
 /*
  *--------------------------------------------------------------------------

diff --git a/src/ui-bookmark.cc b/src/ui-bookmark.cc
index 6cd0940..4fce135 100644 (file)
--- a/src/ui-bookmark.cc
+++ b/src/ui-bookmark.cc
@@ -19,23 +19,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <config.h>
-#include "intl.h"
-
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
-#include <gdk/gdkkeysyms.h> /* for key values */
-
 #include "main.h"
+#include "ui-bookmark.h"
 
-#include "filedata.h"
 #include "history-list.h"
-
-#include "ui-bookmark.h"
 #include "ui-fileops.h"
 #include "ui-menu.h"
 #include "ui-misc.h"

diff --git a/src/ui-fileops.cc b/src/ui-fileops.cc
index 7983f68..9fd4f86 100644 (file)
--- a/src/ui-fileops.cc
+++ b/src/ui-fileops.cc
@@ -19,26 +19,16 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <config.h>
-
-#include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/param.h>
-#include <dirent.h>
 #include <utime.h>
 
-#include <glib.h>
-#include <gtk/gtk.h>   /* for locale warning dialog */
-
 #include "main.h"
 #include "ui-fileops.h"
 
-#include "ui-utildlg.h"        /* for locale warning dialog */
 #include "md5-util.h"
-
 #include "filefilter.h"
 #include "layout.h"
 #include "utilops.h"

diff --git a/src/ui-help.cc b/src/ui-help.cc
index cedaa96..9b96cbb 100644 (file)
--- a/src/ui-help.cc
+++ b/src/ui-help.cc
@@ -19,15 +19,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <config.h>
-#include "intl.h"
-
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include "main.h"
 #include "ui-help.h"
 

diff --git a/src/ui-menu.cc b/src/ui-menu.cc
index f47115a..8b8c381 100644 (file)
--- a/src/ui-menu.cc
+++ b/src/ui-menu.cc
@@ -19,15 +19,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <config.h>
-#include "intl.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
-
 #include "main.h"
 #include "layout.h"
 #include "ui-menu.h"

diff --git a/src/ui-misc.cc b/src/ui-misc.cc
index ff913d5..1da8601 100644 (file)
--- a/src/ui-misc.cc
+++ b/src/ui-misc.cc
@@ -19,16 +19,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <config.h>
-#include "intl.h"
-
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
 #include "main.h"
 #include "ui-misc.h"
 

diff --git a/src/ui-pathsel.cc b/src/ui-pathsel.cc
index 433f209..20e8273 100644 (file)
--- a/src/ui-pathsel.cc
+++ b/src/ui-pathsel.cc
@@ -19,23 +19,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <config.h>
-#include "intl.h"
-
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include <dirent.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <gtk/gtk.h>
-
-#include <gdk/gdkkeysyms.h> /* for key values */
-
 #include "main.h"
 #include "ui-pathsel.h"
 
@@ -43,7 +32,6 @@
 #include "ui-fileops.h"
 #include "ui-menu.h"
 #include "ui-misc.h"
-#include "ui-utildlg.h"
 #include "ui-tabcomp.h"
 #include "ui-tree-edit.h"
 #include "uri-utils.h"

diff --git a/src/ui-spinner.cc b/src/ui-spinner.cc
index 2cdde95..16b9bde 100644 (file)
--- a/src/ui-spinner.cc
+++ b/src/ui-spinner.cc
@@ -19,15 +19,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <config.h>
-#include "intl.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
-
 #include "main.h"
 #include "ui-spinner.h"
 

diff --git a/src/ui-tabcomp.cc b/src/ui-tabcomp.cc
index cfcb4a7..920e081 100644 (file)
--- a/src/ui-tabcomp.cc
+++ b/src/ui-tabcomp.cc
@@ -19,20 +19,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <config.h>
-#include "intl.h"
-
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/types.h>
 #include <dirent.h>
 
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
 #include "main.h"
 #include "ui-tabcomp.h"
 
@@ -42,9 +32,6 @@
 #include "ui-spinner.h"
 #include "ui-utildlg.h"
 
-#include <gdk/gdkkeysyms.h> /* for key values */
-
-
 /* define this to enable a pop-up menu that shows possible matches
  * #define TAB_COMPLETION_ENABLE_POPUP_MENU
  */

diff --git a/src/ui-tree-edit.cc b/src/ui-tree-edit.cc
index 69c8b54..9bb4fcf 100644 (file)
--- a/src/ui-tree-edit.cc
+++ b/src/ui-tree-edit.cc
@@ -19,18 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <config.h>
-#include "intl.h"
-
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
-#include "compat.h"
-
 #include "main.h"
 #include "ui-tree-edit.h"
 

diff --git a/src/ui-utildlg.cc b/src/ui-utildlg.cc
index 2c13b5e..944cb4c 100644 (file)
--- a/src/ui-utildlg.cc
+++ b/src/ui-utildlg.cc
@@ -19,16 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <config.h>
-#include "intl.h"
-
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
-#include <gtk/gtk.h>
-
-#include <gdk/gdkkeysyms.h> /* for keyboard values */
 
 #include "main.h"
 #include "ui-utildlg.h"

diff --git a/src/utilops.cc b/src/utilops.cc
index 1619142..eb25e19 100644 (file)
--- a/src/utilops.cc
+++ b/src/utilops.cc
@@ -23,21 +23,14 @@
 #include "utilops.h"
 
 #include "cache.h"
-#include "cache-maint.h"
-#include "collect.h"
-#include "dupe.h"
 #include "filedata.h"
 #include "filefilter.h"
 #include "image.h"
-#include "img-view.h"
-#include "layout.h"
-#include "search.h"
 #include "thumb-standard.h"
 #include "trash.h"
 #include "ui-bookmark.h"
 #include "ui-fileops.h"
 #include "ui-misc.h"
-#include "ui-tabcomp.h"
 #include "editors.h"
 #include "metadata.h"
 #include "exif.h"

diff --git a/src/view-dir-list.cc b/src/view-dir-list.cc
index 0439475..7295c87 100644 (file)
--- a/src/view-dir-list.cc
+++ b/src/view-dir-list.cc
@@ -22,21 +22,11 @@
 #include "main.h"
 #include "view-dir-list.h"
 
-#include "dnd.h"
-#include "dupe.h"
 #include "filedata.h"
-#include "layout.h"
-#include "layout-image.h"
-#include "layout-util.h"
-#include "utilops.h"
 #include "ui-fileops.h"
-#include "ui-menu.h"
 #include "ui-tree-edit.h"
 #include "view-dir.h"
 
-#include <gdk/gdkkeysyms.h> /* for keyboard values */
-
-
 #define VDLIST(_vd_) ((ViewDirInfoList *)(_vd_->info))
 
 

diff --git a/src/view-dir-tree.cc b/src/view-dir-tree.cc
index 99ce762..d4b42e7 100644 (file)
--- a/src/view-dir-tree.cc
+++ b/src/view-dir-tree.cc
@@ -22,22 +22,11 @@
 #include "main.h"
 #include "view-dir-tree.h"
 
-
-#include "dnd.h"
-#include "dupe.h"
 #include "filedata.h"
-#include "layout.h"
-#include "layout-image.h"
-#include "layout-util.h"
-#include "utilops.h"
 #include "ui-fileops.h"
-#include "ui-menu.h"
 #include "ui-tree-edit.h"
 #include "view-dir.h"
 
-#include <gdk/gdkkeysyms.h> /* for keyboard values */
-
-
 #define VDTREE(_vd_) ((ViewDirInfoTree *)(_vd_->info))
 
 

diff --git a/src/view-dir.cc b/src/view-dir.cc
index e4ba7ea..9a25d76 100644 (file)
--- a/src/view-dir.cc
+++ b/src/view-dir.cc
@@ -28,7 +28,6 @@
 #include "layout-image.h"
 #include "layout-util.h"
 #include "menu.h"
-#include "pixbuf-util.h"
 #include "ui-fileops.h"
 #include "ui-tree-edit.h"
 #include "ui-menu.h"

diff --git a/src/view-file/view-file-icon.cc b/src/view-file/view-file-icon.cc
index 0d790e8..ab5c269 100644 (file)
--- a/src/view-file/view-file-icon.cc
+++ b/src/view-file/view-file-icon.cc
@@ -22,32 +22,20 @@
 #include "main.h"
 #include "view-file-icon.h"
 
-#include "bar.h"
 #include "cellrenderericon.h"
 #include "collect.h"
-#include "collect-io.h"
-#include "collect-table.h"
 #include "dnd.h"
-#include "editors.h"
 #include "img-view.h"
-#include "filedata.h"
-#include "layout.h"
 #include "layout-image.h"
-#include "menu.h"
 #include "metadata.h"
 #include "misc.h"
-#include "thumb.h"
 #include "utilops.h"
 #include "ui-fileops.h"
-#include "ui-menu.h"
 #include "ui-misc.h"
 #include "ui-tree-edit.h"
 #include "uri-utils.h"
 #include "view-file.h"
 
-#include <gdk/gdkkeysyms.h> /* for keyboard values */
-
-
 /* between these, the icon width is increased by thumb_max_width / 2 */
 #define THUMB_MIN_ICON_WIDTH 128
 #define THUMB_MAX_ICON_WIDTH 160

diff --git a/src/view-file/view-file-list.cc b/src/view-file/view-file-list.cc
index 04871a9..8b446e5 100644 (file)
--- a/src/view-file/view-file-list.cc
+++ b/src/view-file/view-file-list.cc
@@ -22,29 +22,20 @@
 #include "main.h"
 #include "view-file-list.h"
 
-#include "bar.h"
-#include "cache-maint.h"
 #include "collect.h"
 #include "dnd.h"
-#include "editors.h"
 #include "img-view.h"
 #include "layout.h"
 #include "layout-image.h"
-#include "menu.h"
 #include "metadata.h"
 #include "misc.h"
-#include "thumb.h"
 #include "utilops.h"
 #include "ui-fileops.h"
-#include "ui-menu.h"
 #include "ui-misc.h"
 #include "ui-tree-edit.h"
 #include "uri-utils.h"
 #include "view-file.h"
 
-
-#include <gdk/gdkkeysyms.h> /* for keyboard values */
-
 /* Index to tree store */
 enum {
        FILE_COLUMN_POINTER = 0,

diff --git a/src/view-file/view-file.cc b/src/view-file/view-file.cc
index 8e91a91..0304603 100644 (file)
--- a/src/view-file/view-file.cc
+++ b/src/view-file/view-file.cc
@@ -22,9 +22,6 @@
 #include "view-file.h"
 
 #include "dupe.h"
-#include "collect.h"
-#include "collect-table.h"
-#include "editors.h"
 #include "history-list.h"
 #include "layout.h"
 #include "menu.h"

diff --git a/src/zonedetect.cc b/src/zonedetect.cc
index fe5e400..2d659bc 100644 (file)
--- a/src/zonedetect.cc
+++ b/src/zonedetect.cc
@@ -26,9 +26,6 @@
  */
 
 #include <assert.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>