*/
#include "main.h"
-#include "layout_util.h"
+#include "layout-util.h"
-#include "advanced_exif.h"
-#include "bar_sort.h"
+#include "advanced-exif.h"
+#include "bar-sort.h"
#include "bar.h"
-#include "bar_keywords.h"
-#include "cache_maint.h"
+#include "bar-keywords.h"
+#include "cache-maint.h"
#include "collect.h"
#include "collect-dlg.h"
#include "compat.h"
#include "dupe.h"
#include "editors.h"
#include "filedata.h"
-#include "history_list.h"
+#include "history-list.h"
#include "image.h"
#include "image-overlay.h"
#include "histogram.h"
#include "img-view.h"
-#include "layout_image.h"
+#include "layout-image.h"
#include "logwindow.h"
#include "misc.h"
#include "pan-view.h"
-#include "pixbuf_util.h"
+#include "pixbuf-util.h"
#include "preferences.h"
#include "print.h"
#include "rcfile.h"
#include "search.h"
-#include "search_and_run.h"
+#include "search-and-run.h"
#include "slideshow.h"
-#include "ui_fileops.h"
-#include "ui_menu.h"
-#include "ui_misc.h"
-#include "ui_tabcomp.h"
+#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"
+#include "view-dir.h"
+#include "view-file.h"
#include "window.h"
#include "metadata.h"
-#include "desktop_file.h"
+#include "desktop-file.h"
#include <sys/wait.h>
#include <gdk/gdkkeysyms.h> /* for keyboard values */
-#include "keymap_template.h"
+#include "keymap-template.h"
#define MENU_EDIT_ACTION_OFFSET 16
#define FILE_COLUMN_POINTER 0