#include "bar.h"
#include "filedata.h"
-#include "history_list.h"
+#include "history-list.h"
#include "metadata.h"
#include "misc.h"
-#include "ui_fileops.h"
-#include "ui_misc.h"
-#include "ui_utildlg.h"
-
-#include "ui_menu.h"
-#include "bar_comment.h"
-#include "bar_keywords.h"
-#include "bar_exif.h"
-#include "bar_histogram.h"
+#include "ui-fileops.h"
+#include "ui-misc.h"
+#include "ui-utildlg.h"
+
+#include "ui-menu.h"
+#include "bar-comment.h"
+#include "bar-keywords.h"
+#include "bar-exif.h"
+#include "bar-histogram.h"
#include "histogram.h"
#include "rcfile.h"
-#include "bar_gps.h"
+#include "bar-gps.h"
#include <gdk/gdkkeysyms.h>