#include "image-load.h"
#include "image-overlay.h"
#include "layout.h"
-#include "layout_image.h"
-#include "layout_util.h"
+#include "layout-image.h"
+#include "layout-util.h"
#include "menu.h"
#include "misc.h"
-#include "pixbuf_util.h"
+#include "pixbuf-util.h"
#include "pixbuf-renderer.h"
#include "print.h"
#include "slideshow.h"
-#include "ui_fileops.h"
-#include "ui_menu.h"
-#include "uri_utils.h"
+#include "ui-fileops.h"
+#include "ui-menu.h"
+#include "uri-utils.h"
#include "utilops.h"
#include "window.h"