diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index 04846de..c4ecb68 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -25,14 +25,25 @@ thunar_built_sources =							\
 	thunar-marshal.c						\
 	thunar-marshal.h
 
+thunar_generated_sources =						\
+	thunar-abstract-icon-view-ui.h					\
+	thunar-details-view-ui.h					\
+	thunar-launcher-ui.h						\
+	thunar-location-buttons-ui.h					\
+	thunar-shortcuts-pane-ui.h					\
+	thunar-renamer-dialog-ui.h					\
+	thunar-standard-view-ui.h					\
+	thunar-thumbnail-frame.c					\
+	thunar-window-ui.h
+
 thunar_SOURCES =							\
 	$(thunar_include_HEADERS)					\
 	$(thunar_built_sources)						\
+	$(thunar_generated_sources)					\
 	$(thunar_dbus_sources)						\
 	main.c								\
 	thunar-abstract-dialog.c					\
 	thunar-abstract-dialog.h					\
-	thunar-abstract-icon-view-ui.h					\
 	thunar-abstract-icon-view.c					\
 	thunar-abstract-icon-view.h					\
 	thunar-application.c						\
@@ -59,7 +70,6 @@ thunar_SOURCES =							\
 	thunar-create-dialog.h						\
 	thunar-deep-count-job.h						\
 	thunar-deep-count-job.c						\
-	thunar-details-view-ui.h					\
 	thunar-details-view.c						\
 	thunar-details-view.h						\
 	thunar-dialogs.c						\
@@ -114,7 +124,6 @@ thunar_SOURCES =							\
 	thunar-job.h							\
 	thunar-launcher.c						\
 	thunar-launcher.h						\
-	thunar-launcher-ui.h						\
 	thunar-list-model.c						\
 	thunar-list-model.h						\
 	thunar-location-bar.c						\
@@ -123,7 +132,6 @@ thunar_SOURCES =							\
 	thunar-location-button.h					\
 	thunar-location-buttons.c					\
 	thunar-location-buttons.h					\
-	thunar-location-buttons-ui.h					\
 	thunar-location-dialog.c					\
 	thunar-location-dialog.h					\
 	thunar-location-entry.c						\
@@ -153,7 +161,6 @@ thunar_SOURCES =							\
 	thunar-properties-dialog.h					\
 	thunar-renamer-dialog.c						\
 	thunar-renamer-dialog.h						\
-	thunar-renamer-dialog-ui.h					\
 	thunar-renamer-model.c						\
 	thunar-renamer-model.h						\
 	thunar-renamer-pair.c						\
@@ -170,7 +177,6 @@ thunar_SOURCES =							\
 	thunar-shortcuts-model.h					\
 	thunar-shortcuts-pane.c						\
 	thunar-shortcuts-pane.h						\
-	thunar-shortcuts-pane-ui.h					\
 	thunar-shortcuts-view.c						\
 	thunar-shortcuts-view.h						\
 	thunar-side-pane.c						\
@@ -181,7 +187,6 @@ thunar_SOURCES =							\
 	thunar-size-label.h						\
 	thunar-standard-view.c						\
 	thunar-standard-view.h						\
-	thunar-standard-view-ui.h					\
 	thunar-statusbar.c						\
 	thunar-statusbar.h						\
 	thunar-stock.c							\
@@ -194,7 +199,6 @@ thunar_SOURCES =							\
 	thunar-thumbnail-cache.h					\
 	thunar-thumbnailer.c						\
 	thunar-thumbnailer.h						\
-	thunar-thumbnail-frame.c					\
 	thunar-thumbnail-frame.h					\
 	thunar-transfer-job.c						\
 	thunar-transfer-job.h						\
@@ -213,8 +217,7 @@ thunar_SOURCES =							\
 	thunar-view.c							\
 	thunar-view.h							\
 	thunar-window.c							\
-	thunar-window.h							\
-	thunar-window-ui.h
+	thunar-window.h
 
 thunar_CFLAGS =								\
 	$(EXO_CFLAGS)							\
@@ -301,28 +304,12 @@ CLEANFILES =								\
 
 DISTCLEANFILES +=							\
 	$(thunar_built_sources)						\
-	stamp-thunar-marshal.h						\
-	thunar-abstract-icon-view-ui.h					\
-	thunar-details-view-ui.h					\
-	thunar-launcher-ui.h						\
-	thunar-location-buttons-ui.h					\
-	thunar-shortcuts-pane-ui.h					\
-	thunar-renamer-dialog-ui.h					\
-	thunar-standard-view-ui.h					\
-	thunar-thumbnail-frame.c					\
-	thunar-window-ui.h
+	$(thunar_generated_sources)					\
+	stamp-thunar-marshal.h
 
 BUILT_SOURCES =								\
 	$(thunar_built_sources)						\
-	thunar-abstract-icon-view-ui.h					\
-	thunar-details-view-ui.h					\
-	thunar-launcher-ui.h						\
-	thunar-location-buttons-ui.h					\
-	thunar-shortcuts-pane-ui.h					\
-	thunar-renamer-dialog-ui.h					\
-	thunar-standard-view-ui.h					\
-	thunar-thumbnail-frame.c					\
-	thunar-window-ui.h
+	$(thunar_generated_sources)
 
 if HAVE_DBUS
 thunar-dbus-service-infos.h: $(srcdir)/thunar-dbus-service-infos.xml Makefile
@@ -345,7 +332,7 @@ thunar-thumbnail-cache-proxy.h: $(srcdir)/thunar-thumbnail-cache-dbus.xml Makefi
 	)
 endif
 
-thunar-thumbnail-frame.c: $(srcdir)/thunar-thumbnail-frame.png Makefile
+thunar-thumbnail-frame.c: Makefile $(srcdir)/thunar-thumbnail-frame.png
 	$(AM_V_GEN) (echo "#include <thunar/thunar-thumbnail-frame.h>" && gdk-pixbuf-csource --extern --raw --stream --name=thunar_thumbnail_frame $(srcdir)/thunar-thumbnail-frame.png) > thunar-thumbnail-frame.c
 
 thunar-abstract-icon-view-ui.h: Makefile $(srcdir)/thunar-abstract-icon-view-ui.xml