#include "collect-io.h"
#include "filedata.h"
#include "filefilter.h"
-#include "history_list.h"
+#include "history-list.h"
#include "image.h"
#include "image-overlay.h"
#include "img-view.h"
#include "layout.h"
-#include "layout_image.h"
-#include "layout_util.h"
+#include "layout-image.h"
+#include "layout-util.h"
#include "misc.h"
#include "options.h"
#include "rcfile.h"
#include "remote.h"
-#include "secure_save.h"
+#include "secure-save.h"
#include "similar.h"
-#include "ui_fileops.h"
-#include "ui_utildlg.h"
-#include "cache_maint.h"
+#include "ui-fileops.h"
+#include "ui-utildlg.h"
+#include "cache-maint.h"
#include "thumb.h"
#include "metadata.h"
#include "editors.h"
#include "exif.h"
#include "histogram.h"
-#include "pixbuf_util.h"
+#include "pixbuf-util.h"
#include "glua.h"
#include "whereami.h"