#include "filedata.h"
#include "img-view.h"
#include "layout.h"
-#include "layout_image.h"
+#include "layout-image.h"
#include "menu.h"
#include "metadata.h"
-#include "pixbuf_util.h"
+#include "pixbuf-util.h"
#include "print.h"
#include "utilops.h"
-#include "ui_fileops.h"
-#include "ui_menu.h"
-#include "ui_tree_edit.h"
-#include "uri_utils.h"
-#include "view_file.h"
+#include "ui-fileops.h"
+#include "ui-menu.h"
+#include "ui-tree-edit.h"
+#include "uri-utils.h"
+#include "view-file.h"
#include "icons/marker.xpm"
#define MARKER_WIDTH 26