diff --git a/components/checker/Makefile.am b/components/checker/Makefile.am
index 202754518..9f1dfab99 100644
--- a/components/checker/Makefile.am
+++ b/components/checker/Makefile.am
@@ -6,6 +6,8 @@ pkglib_LTLIBRARIES = \
 BUILT_SOURCES = \
 	checkercomponent.th
 
+nodist_libchecker_la_SOURCES = $(BUILT_SOURCES)
+
 CLEANFILES = \
 	checker-type.cpp
 
@@ -13,12 +15,12 @@ CLEANFILES = \
 	$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 .ti.th: $(top_builddir)/tools/mkclass/mkclass
-	$(top_builddir)/tools/mkclass/mkclass $< > $@
+	$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
 
 libchecker_la_SOURCES = \
 	checkercomponent.cpp \
 	checkercomponent.h \
-	checkercomponent.th \
+	checkercomponent.ti \
 	checker-type.conf
 
 libchecker_la_CPPFLAGS = \
diff --git a/components/cluster/Makefile.am b/components/cluster/Makefile.am
index 08dbb881e..b7225e998 100644
--- a/components/cluster/Makefile.am
+++ b/components/cluster/Makefile.am
@@ -7,6 +7,8 @@ BUILT_SOURCES = \
 	clusterlistener.th \
 	endpoint.th
 
+nodist_libcluster_la_SOURCES = $(BUILT_SOURCES)
+
 CLEANFILES = \
 	cluster-type.cpp
 
@@ -14,7 +16,7 @@ CLEANFILES = \
 	$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 .ti.th: $(top_builddir)/tools/mkclass/mkclass
-	$(top_builddir)/tools/mkclass/mkclass $< > $@
+	$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
 
 libcluster_la_SOURCES = \
 	clusterlistener.cpp \
diff --git a/components/compat/Makefile.am b/components/compat/Makefile.am
index 9a1f6dc13..9a0a781c4 100644
--- a/components/compat/Makefile.am
+++ b/components/compat/Makefile.am
@@ -9,6 +9,8 @@ BUILT_SOURCES = \
 	statusdatawriter.th \
 	compatlogger.th
 
+nodist_libcompat_la_SOURCES = $(BUILT_SOURCES)
+
 CLEANFILES = \
 	compat-type.cpp
 
@@ -16,21 +18,21 @@ CLEANFILES = \
 	$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 .ti.th: $(top_builddir)/tools/mkclass/mkclass
-	$(top_builddir)/tools/mkclass/mkclass $< > $@
+	$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
 
 libcompat_la_SOURCES = \
 	checkresultreader.cpp \
 	checkresultreader.h \
-	checkresultreader.th \
+	checkresultreader.ti \
 	externalcommandlistener.cpp \
 	externalcommandlistener.h \
-	externalcommandlistener.th \
+	externalcommandlistener.ti \
 	statusdatawriter.cpp \
 	statusdatawriter.h \
-	statusdatawriter.th \
+	statusdatawriter.ti \
 	compatlogger.cpp \
 	compatlogger.h \
-	compatlogger.th \
+	compatlogger.ti \
 	compat-type.conf
 
 libcompat_la_CPPFLAGS = \
diff --git a/components/db_ido_mysql/Makefile.am b/components/db_ido_mysql/Makefile.am
index a43e3db88..2eb9e2f76 100644
--- a/components/db_ido_mysql/Makefile.am
+++ b/components/db_ido_mysql/Makefile.am
@@ -11,6 +11,8 @@ pkglib_LTLIBRARIES = \
 BUILT_SOURCES = \
 	idomysqlconnection.th
 
+nodist_libdb_ido_mysql_la_SOURCES = $(BUILT_SOURCES)
+
 CLEANFILES = \
 	db_ido_mysql-type.cpp
 
@@ -18,7 +20,7 @@ CLEANFILES = \
 	$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 .ti.th: $(top_builddir)/tools/mkclass/mkclass
-	$(top_builddir)/tools/mkclass/mkclass $< > $@
+	$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
 
 libdb_ido_mysql_la_SOURCES = \
 	db_ido_mysql-type.conf \
diff --git a/components/demo/Makefile.am b/components/demo/Makefile.am
index 2d94d831f..f9d520540 100644
--- a/components/demo/Makefile.am
+++ b/components/demo/Makefile.am
@@ -6,6 +6,8 @@ pkglib_LTLIBRARIES = \
 BUILT_SOURCES = \
 	demo.th
 
+nodist_libdemo_SOURCES = $(BUILT_SOURCES)
+
 CLEANFILES = \
 	demo-type.cpp
 
@@ -13,7 +15,7 @@ CLEANFILES = \
 	$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 .ti.th: $(top_builddir)/tools/mkclass/mkclass
-	$(top_builddir)/tools/mkclass/mkclass $< > $@
+	$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
 
 libdemo_la_SOURCES = \
 	demo.cpp \
diff --git a/components/livestatus/Makefile.am b/components/livestatus/Makefile.am
index e62482f7a..8defcd04d 100644
--- a/components/livestatus/Makefile.am
+++ b/components/livestatus/Makefile.am
@@ -6,6 +6,8 @@ pkglib_LTLIBRARIES = \
 BUILT_SOURCES = \
 	listener.th
 
+nodist_liblivestatus_la_SOURCES = $(BUILT_SOURCES)
+
 CLEANFILES = \
 	livestatus-type.cpp
 
@@ -13,7 +15,7 @@ CLEANFILES = \
 	$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 .ti.th: $(top_builddir)/tools/mkclass/mkclass
-	$(top_builddir)/tools/mkclass/mkclass $< > $@
+	$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
 
 liblivestatus_la_SOURCES = \
 	aggregator.cpp \
diff --git a/components/notification/Makefile.am b/components/notification/Makefile.am
index 5132b6699..223b1ecb6 100644
--- a/components/notification/Makefile.am
+++ b/components/notification/Makefile.am
@@ -6,6 +6,8 @@ pkglib_LTLIBRARIES = \
 BUILT_SOURCES = \
 	notificationcomponent.th
 
+nodist_libnotification_la_SOURCES = $(BUILT_SOURCES)
+
 CLEANFILES = \
 	notification-type.cpp
 
@@ -13,7 +15,7 @@ CLEANFILES = \
 	$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 .ti.th: $(top_builddir)/tools/mkclass/mkclass
-	$(top_builddir)/tools/mkclass/mkclass $< > $@
+	$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
 
 libnotification_la_SOURCES = \
 	notificationcomponent.cpp \
diff --git a/components/perfdata/Makefile.am b/components/perfdata/Makefile.am
index aeb073e99..5f4a4da05 100644
--- a/components/perfdata/Makefile.am
+++ b/components/perfdata/Makefile.am
@@ -8,6 +8,8 @@ BUILT_SOURCES = \
 	graphitewriter.th \
 	perfdatawriter.th
 
+nodist_libperfdata_la_SOURCES = $(BUILT_SOURCES)
+
 CLEANFILES = \
 	perfdata-type.cpp
 
@@ -15,7 +17,7 @@ CLEANFILES = \
 	$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 .ti.th: $(top_builddir)/tools/mkclass/mkclass
-	$(top_builddir)/tools/mkclass/mkclass $< > $@
+	$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
 
 libperfdata_la_SOURCES =  \
 	graphitewriter.cpp \
@@ -23,7 +25,7 @@ libperfdata_la_SOURCES =  \
 	graphitewriter.ti \
 	perfdatawriter.cpp \
 	perfdatawriter.h \
-	perfdatawriter.th \
+	perfdatawriter.ti \
 	perfdata-type.conf
 
 libperfdata_la_CPPFLAGS = \
diff --git a/lib/base/Makefile.am b/lib/base/Makefile.am
index 80d08278e..04e09b61e 100644
--- a/lib/base/Makefile.am
+++ b/lib/base/Makefile.am
@@ -14,8 +14,10 @@ BUILT_SOURCES = \
 	streamlogger.th \
 	sysloglogger.th
 
+nodist_libbase_la_SOURCES = $(BUILT_SOURCES)
+
 .ti.th: $(top_builddir)/tools/mkclass/mkclass
-	$(top_builddir)/tools/mkclass/mkclass $< > $@
+	$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
 
 libbase_la_SOURCES =  \
 	application.cpp \
diff --git a/lib/db_ido/Makefile.am b/lib/db_ido/Makefile.am
index f192a9d9d..1e94b3d84 100644
--- a/lib/db_ido/Makefile.am
+++ b/lib/db_ido/Makefile.am
@@ -13,7 +13,7 @@ CLEANFILES = \
 	$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 .ti.th: $(top_builddir)/tools/mkclass/mkclass
-	$(top_builddir)/tools/mkclass/mkclass $< > $@
+	$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
 
 libdb_ido_la_SOURCES = \
 	commanddbobject.cpp \
diff --git a/lib/icinga/Makefile.am b/lib/icinga/Makefile.am
index 63a072eeb..c14eadf86 100644
--- a/lib/icinga/Makefile.am
+++ b/lib/icinga/Makefile.am
@@ -20,6 +20,8 @@ BUILT_SOURCES = \
 	user.th \
 	usergroup.th
 
+nodist_libicinga_SOURCES = $(BUILT_SOURCES)
+
 CLEANFILES = \
 	icinga-type.cpp
 
@@ -27,7 +29,7 @@ CLEANFILES = \
 	$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 .ti.th: $(top_builddir)/tools/mkclass/mkclass
-	$(top_builddir)/tools/mkclass/mkclass $< > $@
+	$(top_builddir)/tools/mkclass/mkclass $< > $@.tmp && mv $@.tmp $@
 
 libicinga_la_SOURCES =  \
 	api.cpp \