#include "main.h"
#include "preferences.h"
-#include "bar_exif.h"
-#include "bar_keywords.h"
+#include "bar-exif.h"
+#include "bar-keywords.h"
#include "cache.h"
-#include "cache_maint.h"
+#include "cache-maint.h"
#include "dnd.h"
#include "editors.h"
#include "exif.h"
#include "image-overlay.h"
#include "color-man.h"
#include "img-view.h"
-#include "layout_config.h"
-#include "layout_util.h"
+#include "layout-config.h"
+#include "layout-util.h"
#include "metadata.h"
#include "misc.h"
#include "osd.h"
-#include "pixbuf_util.h"
+#include "pixbuf-util.h"
#include "rcfile.h"
#include "slideshow.h"
#include "toolbar.h"
#include "trash.h"
#include "utilops.h"
-#include "ui_fileops.h"
-#include "ui_misc.h"
-#include "ui_spinner.h"
-#include "ui_tabcomp.h"
-#include "ui_utildlg.h"
+#include "ui-fileops.h"
+#include "ui-misc.h"
+#include "ui-spinner.h"
+#include "ui-tabcomp.h"
+#include "ui-utildlg.h"
#include "window.h"
#include "zonedetect.h"