Include debug.h from main.h since debug macros may be used anywhere in the code.

diff --git a/src/bar_info.c b/src/bar_info.c
index 01c0e75..288d5b2 100644 (file)
--- a/src/bar_info.c
+++ b/src/bar_info.c
@@ -17,7 +17,6 @@
 #include "bar_info.h"
 
 #include "cache.h"
-#include "debug.h"
 #include "filedata.h"
 #include "info.h"
 #include "secure_save.h"

diff --git a/src/cache.c b/src/cache.c
index b9ed88e..2595480 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -13,7 +13,6 @@
 #include "main.h"
 #include "cache.h"
 
-#include "debug.h"
 #include "md5-util.h"
 #include "secure_save.h"
 #include "ui_fileops.h"

diff --git a/src/cache_maint.c b/src/cache_maint.c
index f6bcb6d..53154ea 100644 (file)
--- a/src/cache_maint.c
+++ b/src/cache_maint.c
@@ -14,7 +14,6 @@
 #include "cache_maint.h"
 
 #include "cache.h"
-#include "debug.h"
 #include "filedata.h"
 #include "thumb.h"
 #include "thumb_standard.h"

diff --git a/src/collect-io.c b/src/collect-io.c
index 4e2f66d..5cc3c0c 100644 (file)
--- a/src/collect-io.c
+++ b/src/collect-io.c
@@ -15,7 +15,6 @@
 #include "collect-io.h"
 
 #include "collect.h"
-#include "debug.h"
 #include "filedata.h"
 #include "layout_util.h"
 #include "rcfile.h"

diff --git a/src/collect-table.c b/src/collect-table.c
index cc4c11f..8884214 100644 (file)
--- a/src/collect-table.c
+++ b/src/collect-table.c
@@ -17,7 +17,6 @@
 #include "cellrenderericon.h"
 #include "collect-dlg.h"
 #include "collect-io.h"
-#include "debug.h"
 #include "dnd.h"
 #include "dupe.h"
 #include "editors.h"

diff --git a/src/collect.c b/src/collect.c
index 46b1e8a..1ae962d 100644 (file)
--- a/src/collect.c
+++ b/src/collect.c
@@ -17,7 +17,6 @@
 #include "collect-dlg.h"
 #include "collect-io.h"
 #include "collect-table.h"
-#include "debug.h"
 #include "editors.h"
 #include "filedata.h"
 #include "img-view.h"

diff --git a/src/color-man.c b/src/color-man.c
index 1119395..ff8b372 100644 (file)
--- a/src/color-man.c
+++ b/src/color-man.c
@@ -14,7 +14,6 @@
 #include "main.h"
 #include "color-man.h"
 
-#include "debug.h"
 #include "image.h"
 #include "ui_fileops.h"
 

diff --git a/src/debug.c b/src/debug.c
index 92aa2f0..d20495d 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -10,7 +10,6 @@
  */
 
 #include "main.h"
-#include "debug.h"
 
 #ifdef DEBUG
 

diff --git a/src/dupe.c b/src/dupe.c
index 4942d17..4090db0 100644 (file)
--- a/src/dupe.c
+++ b/src/dupe.c
@@ -17,7 +17,6 @@
 #include "cache.h"
 #include "collect.h"
 #include "collect-table.h"
-#include "debug.h"
 #include "dnd.h"
 #include "editors.h"
 #include "filedata.h"

diff --git a/src/editors.c b/src/editors.c
index c602535..020ce12 100644 (file)
--- a/src/editors.c
+++ b/src/editors.c
@@ -14,7 +14,6 @@
 #include "main.h"
 #include "editors.h"
 
-#include "debug.h"
 #include "filedata.h"
 #include "filefilter.h"
 #include "utilops.h"

diff --git a/src/exif-common.c b/src/exif-common.c
index 8697467..33f6aba 100644 (file)
--- a/src/exif-common.c
+++ b/src/exif-common.c
@@ -35,7 +35,6 @@
 #include "main.h"
 #include "exif.h"
 
-#include "debug.h"
 #include "filedata.h"
 #include "filefilter.h"
 #include "format_raw.h"

diff --git a/src/filedata.c b/src/filedata.c
index 8de267c..d867e74 100644 (file)
--- a/src/filedata.c
+++ b/src/filedata.c
@@ -16,7 +16,6 @@
 
 #include "filefilter.h"
 #include "cache.h"
-#include "debug.h"
 #include "rcfile.h"
 #include "secure_save.h"
 #include "thumb_standard.h"

diff --git a/src/filefilter.c b/src/filefilter.c
index 9311727..67e3bfd 100644 (file)
--- a/src/filefilter.c
+++ b/src/filefilter.c
@@ -15,7 +15,6 @@
 #include "filefilter.h"
 
 #include "cache.h"
-#include "debug.h"
 #include "rcfile.h"
 #include "secure_save.h"
 #include "thumb_standard.h"

diff --git a/src/format_raw.c b/src/format_raw.c
index a21e75b..702797e 100644 (file)
--- a/src/format_raw.c
+++ b/src/format_raw.c
@@ -31,7 +31,6 @@
 #include "main.h"
 #include "format_raw.h"
 
-#include "debug.h"
 #include "format_canon.h"
 #include "format_fuji.h"
 #include "format_nikon.h"

diff --git a/src/fullscreen.c b/src/fullscreen.c
index c3ef629..f3d2ca4 100644 (file)
--- a/src/fullscreen.c
+++ b/src/fullscreen.c
@@ -14,7 +14,6 @@
 #include "main.h"
 #include "fullscreen.h"
 
-#include "debug.h"
 #include "image.h"
 #include "ui_fileops.h"
 #include "ui_menu.h"

diff --git a/src/image-load.c b/src/image-load.c
index 848b4c3..c30f2dd 100644 (file)
--- a/src/image-load.c
+++ b/src/image-load.c
@@ -14,7 +14,6 @@
 #include "main.h"
 #include "image-load.h"
 
-#include "debug.h"
 #include "exif.h"
 #include "filedata.h"
 #include "ui_fileops.h"

diff --git a/src/image-overlay.c b/src/image-overlay.c
index 9bc14cb..863ab95 100644 (file)
--- a/src/image-overlay.c
+++ b/src/image-overlay.c
@@ -15,7 +15,6 @@
 
 #include "bar_info.h"
 #include "collect.h"
-#include "debug.h"
 #include "exif.h"
 #include "filedata.h"
 #include "histogram.h"

diff --git a/src/image.c b/src/image.c
index dc9cb20..1b589fd 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -17,7 +17,6 @@
 
 #include "collect.h"
 #include "color-man.h"
-#include "debug.h"
 #include "exif.h"
 #include "histogram.h"
 #include "image-load.h"

diff --git a/src/layout.c b/src/layout.c
index b215272..d1154bd 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -14,7 +14,6 @@
 #include "layout.h"
 
 #include "color-man.h"
-#include "debug.h"
 #include "filedata.h"
 #include "histogram.h"
 #include "image.h"

diff --git a/src/layout_image.c b/src/layout_image.c
index 5861c56..97633ca 100644 (file)
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -15,7 +15,6 @@
 
 #include "collect.h"
 #include "dnd.h"
-#include "debug.h"
 #include "editors.h"
 #include "filedata.h"
 #include "fullscreen.h"

diff --git a/src/lirc.c b/src/lirc.c
index 9b91de6..be44746 100644 (file)
--- a/src/lirc.c
+++ b/src/lirc.c
@@ -3,7 +3,6 @@
 #ifdef HAVE_LIRC
 #include <lirc/lirc_client.h>
 #include "layout_image.h"
-#include "debug.h"
 
 gint lirc_fd = -1;
 struct lirc_config *config = NULL;

diff --git a/src/main.c b/src/main.c
index 8bcbeb8..3394555 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -16,7 +16,6 @@
 #include "cache.h"
 #include "collect.h"
 #include "collect-io.h"
-#include "debug.h"
 #include "dnd.h"
 #include "editors.h"
 #include "filedata.h"

diff --git a/src/main.h b/src/main.h
index a424a8a..e855bc0 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -26,6 +26,7 @@
 
 #include "intl.h"
 
+
 /*
  *-------------------------------------
  * Standard library includes
@@ -112,6 +113,7 @@
                                "%formatted.Camera:40%|%formatted.Flash%"
 
 #include "typedefs.h"
+#include "debug.h"
 #include "options.h"
 
 /*

diff --git a/src/pan-calendar.c b/src/pan-calendar.c
index dec9e59..b3488e5 100644 (file)
--- a/src/pan-calendar.c
+++ b/src/pan-calendar.c
@@ -14,7 +14,6 @@
 #include "main.h"
 #include "pan-types.h"
 
-#include "debug.h"
 
 #include <math.h>
 

diff --git a/src/pan-view.c b/src/pan-view.c
index 0e6dc03..9f404eb 100644 (file)
--- a/src/pan-view.c
+++ b/src/pan-view.c
@@ -16,7 +16,6 @@
 
 #include "bar_exif.h"
 #include "dnd.h"
-#include "debug.h"
 #include "editors.h"
 #include "exif.h"
 #include "fullscreen.h"

diff --git a/src/pixbuf-renderer.c b/src/pixbuf-renderer.c
index c16ab7d..a9c6e32 100644 (file)
--- a/src/pixbuf-renderer.c
+++ b/src/pixbuf-renderer.c
@@ -31,7 +31,6 @@
 #include "main.h"
 #include "pixbuf_util.h"
 
-#include "debug.h"
 #endif
 
 

diff --git a/src/preferences.c b/src/preferences.c
index 418ca66..f8e8a0a 100644 (file)
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -16,7 +16,6 @@
 
 #include "bar_exif.h"
 #include "cache_maint.h"
-#include "debug.h"
 #include "editors.h"
 #include "exif.h"
 #include "filedata.h"

diff --git a/src/print.c b/src/print.c
index 39bb8e8..102f0f4 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -14,7 +14,6 @@
 #include "main.h"
 #include "print.h"
 
-#include "debug.h"
 #include "filedata.h"
 #include "image.h"
 #include "image-load.h"

diff --git a/src/remote.c b/src/remote.c
index ebfa8b9..db44460 100644 (file)
--- a/src/remote.c
+++ b/src/remote.c
@@ -15,7 +15,6 @@
 #include "remote.h"
 
 #include "collect.h"
-#include "debug.h"
 #include "filedata.h"
 #include "img-view.h"
 #include "layout.h"

diff --git a/src/secure_save.c b/src/secure_save.c
index b9f6ed7..3a72d80 100644 (file)
--- a/src/secure_save.c
+++ b/src/secure_save.c
@@ -16,7 +16,6 @@
 #include "main.h"
 #include "secure_save.h"
 
-#include "debug.h"
 
 /* ABOUT SECURE SAVE */
 /* This code was borrowed from the ELinks project (http://elinks.cz)

diff --git a/src/thumb.c b/src/thumb.c
index 795a1b9..a2a992b 100644 (file)
--- a/src/thumb.c
+++ b/src/thumb.c
@@ -15,7 +15,6 @@
 #include "thumb.h"
 
 #include "cache.h"
-#include "debug.h"
 #include "image-load.h"
 #include "filedata.h"
 #include "pixbuf_util.h"

diff --git a/src/thumb_standard.c b/src/thumb_standard.c
index 7ddd222..0026854 100644 (file)
--- a/src/thumb_standard.c
+++ b/src/thumb_standard.c
@@ -15,7 +15,6 @@
 #include "thumb_standard.h"
 
 #include "cache.h"     /* for cache_ensure_dir_exists */
-#include "debug.h"
 #include "image-load.h"
 #include "md5-util.h"
 #include "pixbuf_util.h"

diff --git a/src/trash.c b/src/trash.c
index 9171f6d..557d619 100644 (file)
--- a/src/trash.c
+++ b/src/trash.c
@@ -16,7 +16,6 @@
 #include "utilops.h"
 
 
-#include "debug.h"
 #include "filedata.h"
 #include "ui_fileops.h"
 #include "ui_misc.h"

diff --git a/src/ui_bookmark.c b/src/ui_bookmark.c
index f8559e8..0586896 100644 (file)
--- a/src/ui_bookmark.c
+++ b/src/ui_bookmark.c
@@ -26,7 +26,6 @@
 #include "main.h"
 #include "filedata.h"
 
-#include "debug.h"
 #include "secure_save.h"
 #include "ui_bookmark.h"
 #include "ui_fileops.h"

diff --git a/src/ui_fileops.c b/src/ui_fileops.c
index 4b9f1b9..ba3f0e3 100644 (file)
--- a/src/ui_fileops.c
+++ b/src/ui_fileops.c
@@ -29,7 +29,6 @@
 #include "main.h"
 #include "ui_fileops.h"
 
-#include "debug.h"
 #include "ui_utildlg.h"        /* for locale warning dialog */
 
 /*

diff --git a/src/utilops.c b/src/utilops.c
index e7614e4..774dbab 100644 (file)
--- a/src/utilops.c
+++ b/src/utilops.c
@@ -18,7 +18,6 @@
 #include "cache.h"
 #include "cache_maint.h"
 #include "collect.h"
-#include "debug.h"
 #include "dupe.h"
 #include "filedata.h"
 #include "filefilter.h"

diff --git a/src/view_file.c b/src/view_file.c
index 7c4316e..ec31587 100644 (file)
--- a/src/view_file.c
+++ b/src/view_file.c
@@ -12,7 +12,6 @@
 #include "main.h"
 #include "view_file.h"
 
-#include "debug.h"
 #include "editors.h"
 #include "info.h"
 #include "layout.h"

diff --git a/src/view_file_icon.c b/src/view_file_icon.c
index d1376d7..9a62986 100644 (file)
--- a/src/view_file_icon.c
+++ b/src/view_file_icon.c
@@ -17,7 +17,6 @@
 #include "collect.h"
 #include "collect-io.h"
 #include "collect-table.h"
-#include "debug.h"
 #include "dnd.h"
 #include "editors.h"
 #include "img-view.h"

diff --git a/src/view_file_list.c b/src/view_file_list.c
index e4e4df9..d791dbd 100644 (file)
--- a/src/view_file_list.c
+++ b/src/view_file_list.c
@@ -14,7 +14,6 @@
 #include "view_file_list.h"
 
 #include "cache_maint.h"
-#include "debug.h"
 #include "dnd.h"
 #include "editors.h"
 #include "img-view.h"

diff --git a/src/window.c b/src/window.c
index b4e16c0..f4dbd9c 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -12,7 +12,6 @@
 #include "main.h"
 #include "window.h"
 
-#include "debug.h"
 #include "pixbuf_util.h"
 #include "ui_fileops.h"
 #include "ui_help.h"