#include "image-load.h"
#include "img-view.h"
#include "layout.h"
-#include "layout_util.h"
+#include "layout-util.h"
#include "math.h"
#include "menu.h"
#include "metadata.h"
#include "misc.h"
-#include "pixbuf_util.h"
+#include "pixbuf-util.h"
#include "print.h"
#include "thumb.h"
-#include "ui_bookmark.h"
-#include "ui_fileops.h"
-#include "ui_menu.h"
-#include "ui_misc.h"
-#include "ui_spinner.h"
-#include "ui_tabcomp.h"
-#include "ui_tree_edit.h"
-#include "uri_utils.h"
+#include "ui-bookmark.h"
+#include "ui-fileops.h"
+#include "ui-menu.h"
+#include "ui-misc.h"
+#include "ui-spinner.h"
+#include "ui-tabcomp.h"
+#include "ui-tree-edit.h"
+#include "uri-utils.h"
#include "utilops.h"
#include "window.h"
-#include "bar_keywords.h"
+#include "bar-keywords.h"
#include <gdk/gdkkeysyms.h> /* for keyboard values */