diff --git about.h about.h
index 80d0486..70c0911 100644
--- about.h
+++ about.h
@@ -21,7 +21,7 @@
 using namespace std;
 #line 1 "about.h++"
 #include "version.h"
-#include "ui-about.h"
+#include "ui_ui-about.h"
 
 void doAbout(int pg);
 extern const char* authors;
diff --git beatgraph-analyzer.h beatgraph-analyzer.h
index 756fe9f..3f9c31c 100644
--- beatgraph-analyzer.h
+++ beatgraph-analyzer.h
@@ -22,7 +22,7 @@ using namespace std;
 #line 1 "beatgraph-analyzer.h++"
 #include <Qt/qpainter.h>
 #include "common.h"
-#include "ui-beatgraph.h"
+#include "ui_ui-beatgraph.h"
 
 typedef unsigned char compressed;
 typedef float4 uncompressed;
diff --git bpm-analyzer.h bpm-analyzer.h
index afc490b..9809425 100644
--- bpm-analyzer.h
+++ bpm-analyzer.h
@@ -24,7 +24,7 @@ using namespace std;
 #include <qstring.h>
 #include "bpmplay.h"
 #include "analyzer.h"
-#include "ui-bpmcounter.h"
+#include "ui_ui-bpmcounter.h"
 
 typedef float8 fft_type;
 class Player;
diff --git bpmdj-pref.h bpmdj-pref.h
index 1f55e6f..4a171e9 100644
--- bpmdj-pref.h
+++ bpmdj-pref.h
@@ -20,8 +20,8 @@
 #define __loaded__bpmdj_pref_h__
 using namespace std;
 #line 1 "bpmdj-pref.h++"
-#include "ui-bpmdj-pref.h"
-#include "ui-installremotes.h"
+#include "ui_ui-bpmdj-pref.h"
+#include "ui_ui-installremotes.h"
 
 class Ui_InstallRemotes;
 
diff --git bpmdj.cpp bpmdj.cpp
index 2293eba..7c7a4d9 100644
--- bpmdj.cpp
+++ bpmdj.cpp
@@ -32,14 +32,14 @@ using namespace std;
 #include <qmessagebox.h>
 #include <qimage.h>
 #include "bpmdj.h"
-#include "ui-setupwizard.h"
+#include "ui_ui-setupwizard.h"
 #include "selector.h"
 #include "history.h"
 #include "index-reader.h"
 #include "version.h"
 #include "dirscanner.h"
 #include "scripts.h"
-#include "ui-loader.h"
+#include "ui_ui-loader.h"
 #include "tags.h"
 #include "qsong.h"
 #include "magic.h"
diff --git capacity-widget.h capacity-widget.h
index 44f8817..6e8e9bb 100644
--- capacity-widget.h
+++ capacity-widget.h
@@ -20,7 +20,7 @@
 #define __loaded__capacity_widget_h__
 using namespace std;
 #line 1 "capacity-widget.h++"
-#include "ui-capacity.h"
+#include "ui_ui-capacity.h"
 class CapacityWidget: 
   public Ui::CapacityWidget, 
   public QWidget
diff --git log-viewer.h log-viewer.h
index cebf0ea..f373268 100644
--- log-viewer.h
+++ log-viewer.h
@@ -20,7 +20,7 @@
 #define __loaded__log_viewer_h__
 using namespace std;
 #line 1 "log-viewer.h++"
-#include "ui-logs.h"
+#include "ui_ui-logs.h"
 #include "dirscanner.h"
 
 class LogViewer:
diff --git metric-widget.h metric-widget.h
index eaa7134..347e3ba 100644
--- metric-widget.h
+++ metric-widget.h
@@ -21,7 +21,7 @@
 using namespace std;
 #line 1 "metric-widget.h++"
 #include <qwidget.h>
-#include "ui-metrics.h"
+#include "ui_ui-metrics.h"
 
 class MetricWidget:
   public QWidget, 
diff --git music-scanner.h music-scanner.h
index 3fefa8c..4321cbc 100644
--- music-scanner.h
+++ music-scanner.h
@@ -20,7 +20,7 @@
 #define __loaded__music_scanner_h__
 using namespace std;
 #line 1 "music-scanner.h++"
-#include "ui-importing.h"
+#include "ui_ui-importing.h"
 #include "selector.h"
 #include "dirscanner.h"
 
diff --git player.h player.h
index 7e4b215..cc5efb2 100644
--- player.h
+++ player.h
@@ -23,7 +23,7 @@ using namespace std;
 #include <Qt/qnamespace.h>
 #include <Qt/qtimer.h>
 #include <QtGui/qpushbutton.h>
-#include "ui-player.h"
+#include "ui_ui-player.h"
 #include "player-core.h"
 
 class BpmAnalyzerDialog;
diff --git renamer.h renamer.h
index d9f19e5..87edef8 100644
--- renamer.h
+++ renamer.h
@@ -23,7 +23,7 @@ using namespace std;
 #include <qlistview.h>
 #include <qwidget.h>
 #include "dirscanner.h"
-#include "ui-renamer.h"
+#include "ui_ui-renamer.h"
 #include "song.h"
 
 class RenamerChangesFilename
diff --git rhythm-analyzer.h rhythm-analyzer.h
index 185d445..480b16f 100644
--- rhythm-analyzer.h
+++ rhythm-analyzer.h
@@ -20,7 +20,7 @@
 #define __loaded__rhythm_analyzer_h__
 using namespace std;
 #line 1 "rhythm-analyzer.h++"
-#include "ui-rhythm.h"
+#include "ui_ui-rhythm.h"
 #include "analyzer.h"
 #include "types.h"
 #include "spectrum-type.h"
diff --git selector.cpp selector.cpp
index 09c18d6..f735898 100644
--- selector.cpp
+++ selector.cpp
@@ -72,7 +72,7 @@ using namespace std;
 #include <libgen.h>
 #include "music-scanner.h"
 #include "about.h"
-#include "ui-album.h"
+#include "ui_ui-album.h"
 #include "qsong.h"
 #include "version.h"
 #include "song-metric.h"
@@ -81,17 +81,17 @@ using namespace std;
 #include "cluster.h"
 #include "queuedsong.h"
 #include "historysong.h"
-#include "ui-bpmmerge.h"
+#include "ui_ui-bpmmerge.h"
 #include "edit-distance.h"
 #include "index-reader.h"
 #include "scripts.h"
 #include "spectrum-type.h"
 #include "tags.h"
 #include "common.h"
-#include "ui-freq-mapping.h"
+#include "ui_ui-freq-mapping.h"
 #include "memory.h"
 #include "statistics.h"
-#include "ui-clustering.h"
+#include "ui_ui-clustering.h"
 #include "history.h"
 #include "log-viewer.h"
 #include <qaction.h>
diff --git selector.h selector.h
index e3b1843..eddf8f1 100644
--- selector.h
+++ selector.h
@@ -33,12 +33,12 @@ using namespace std;
 #include "config.h"
 #include "database.h"
 #include "albumitem.h"
-#include "ui-freq-mapping.h"
+#include "ui_ui-freq-mapping.h"
 #include "players-manager.h"
 #include "spectrum-pca.h"
 #include "analyzers-manager.h"
 #include "do-fragment.h"
-#include "ui-selector.h"
+#include "ui_ui-selector.h"
 
 class QProgressBar;
 class QSong;
diff --git song-information.h song-information.h
index 5e0ba0d..2897600 100644
--- song-information.h
+++ song-information.h
@@ -21,7 +21,7 @@
 using namespace std;
 #line 1 "song-information.h++"
 #include "capacity.h"
-#include "ui-song-information.h"
+#include "ui_ui-song-information.h"
 
 class Index;
 class SongInformation: public QWidget, public Ui::SongInformation
diff --git spectrum-analyzer.h spectrum-analyzer.h
index e3a27c3..05d1630 100644
--- spectrum-analyzer.h
+++ spectrum-analyzer.h
@@ -20,7 +20,7 @@
 #define __loaded__spectrum_analyzer_h__
 using namespace std;
 #line 1 "spectrum-analyzer.h++"
-#include "ui-spectrum.h"
+#include "ui_ui-spectrum.h"
 #include "analyzer.h"
 
 class SpectrumAnalyzer : 
diff --git statistics.h statistics.h
index 1cd987b..fea0cb1 100644
--- statistics.h
+++ statistics.h
@@ -24,7 +24,7 @@ using namespace std;
 #include "common.h"
 #include "signals.h"
 #include "files.h"
-#include "ui-stats.h"
+#include "ui_ui-stats.h"
 
 class DataBase;
 class Song;