diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt
index 48332ee69..905d638b8 100644
--- a/lib/base/CMakeLists.txt
+++ b/lib/base/CMakeLists.txt
@@ -15,42 +15,42 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(application.ti application.tcpp application.thpp)
-mkclass_target(configobject.ti configobject.tcpp configobject.thpp)
-mkclass_target(datetime.ti datetime.tcpp datetime.thpp)
-mkclass_target(filelogger.ti filelogger.tcpp filelogger.thpp)
-mkclass_target(function.ti function.tcpp function.thpp)
-mkclass_target(logger.ti logger.tcpp logger.thpp)
-mkclass_target(perfdatavalue.ti perfdatavalue.tcpp perfdatavalue.thpp)
-mkclass_target(streamlogger.ti streamlogger.tcpp streamlogger.thpp)
-mkclass_target(sysloglogger.ti sysloglogger.tcpp sysloglogger.thpp)
+mkclass_target(application.ti application-ti.cpp application-ti.hpp)
+mkclass_target(configobject.ti configobject-ti.cpp configobject-ti.hpp)
+mkclass_target(datetime.ti datetime-ti.cpp datetime-ti.hpp)
+mkclass_target(filelogger.ti filelogger-ti.cpp filelogger-ti.hpp)
+mkclass_target(function.ti function-ti.cpp function-ti.hpp)
+mkclass_target(logger.ti logger-ti.cpp logger-ti.hpp)
+mkclass_target(perfdatavalue.ti perfdatavalue-ti.cpp perfdatavalue-ti.hpp)
+mkclass_target(streamlogger.ti streamlogger-ti.cpp streamlogger-ti.hpp)
+mkclass_target(sysloglogger.ti sysloglogger-ti.cpp sysloglogger-ti.hpp)
 
 set(base_SOURCES
   i2-base.hpp
-  application.cpp application.hpp application.thpp application-version.cpp
+  application.cpp application.hpp application-ti.hpp application-version.cpp
   array.cpp array.hpp array-script.cpp
   base64.cpp base64.hpp
   boolean.cpp boolean.hpp boolean-script.cpp
-  configobject.cpp configobject.hpp configobject.thpp configobject-script.cpp
+  configobject.cpp configobject.hpp configobject-ti.hpp configobject-script.cpp
   configtype.cpp configtype.hpp
   configwriter.cpp configwriter.hpp
   console.cpp console.hpp
   context.cpp context.hpp
   convert.cpp convert.hpp
-  datetime.cpp datetime.hpp datetime.thpp datetime-script.cpp
+  datetime.cpp datetime.hpp datetime-ti.hpp datetime-script.cpp
   debug.hpp
   debuginfo.cpp debuginfo.hpp
   dependencygraph.cpp dependencygraph.hpp
   dictionary.cpp dictionary.hpp dictionary-script.cpp
   exception.cpp exception.hpp
   fifo.cpp fifo.hpp
-  filelogger.cpp filelogger.hpp filelogger.thpp
-  function.cpp function.hpp function.thpp function-script.cpp functionwrapper.hpp
+  filelogger.cpp filelogger.hpp filelogger-ti.hpp
+  function.cpp function.hpp function-ti.hpp function-script.cpp functionwrapper.hpp
   initialize.cpp initialize.hpp
   json.cpp json.hpp json-script.cpp
   library.cpp library.hpp
   loader.cpp loader.hpp
-  logger.cpp logger.hpp logger.thpp
+  logger.cpp logger.hpp logger-ti.hpp
   math-script.cpp
   netstring.cpp netstring.hpp
   networkstream.cpp networkstream.hpp
@@ -58,7 +58,7 @@ set(base_SOURCES
   object.cpp object.hpp object-script.cpp
   objectlock.cpp objectlock.hpp
   objecttype.cpp objecttype.hpp
-  perfdatavalue.cpp perfdatavalue.hpp perfdatavalue.thpp
+  perfdatavalue.cpp perfdatavalue.hpp perfdatavalue-ti.hpp
   primitivetype.cpp primitivetype.hpp
   process.cpp process.hpp
   registry.hpp
@@ -74,9 +74,9 @@ set(base_SOURCES
   statsfunction.hpp
   stdiostream.cpp stdiostream.hpp
   stream.cpp stream.hpp
-  streamlogger.cpp streamlogger.hpp streamlogger.thpp
+  streamlogger.cpp streamlogger.hpp streamlogger-ti.hpp
   string.cpp string.hpp string-script.cpp
-  sysloglogger.cpp sysloglogger.hpp sysloglogger.thpp
+  sysloglogger.cpp sysloglogger.hpp sysloglogger-ti.hpp
   tcpsocket.cpp tcpsocket.hpp
   threadpool.cpp threadpool.hpp
   timer.cpp timer.hpp
diff --git a/lib/base/application.cpp b/lib/base/application.cpp
index e1717522c..a2b7918dc 100644
--- a/lib/base/application.cpp
+++ b/lib/base/application.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "base/application.hpp"
-#include "base/application.tcpp"
+#include "base/application-ti.cpp"
 #include "base/stacktrace.hpp"
 #include "base/timer.hpp"
 #include "base/logger.hpp"
diff --git a/lib/base/application.hpp b/lib/base/application.hpp
index 429d06aba..1a16f7c9d 100644
--- a/lib/base/application.hpp
+++ b/lib/base/application.hpp
@@ -21,7 +21,7 @@
 #define APPLICATION_H
 
 #include "base/i2-base.hpp"
-#include "base/application.thpp"
+#include "base/application-ti.hpp"
 #include "base/threadpool.hpp"
 #include "base/utility.hpp"
 #include "base/logger.hpp"
diff --git a/lib/base/configobject.cpp b/lib/base/configobject.cpp
index 8fe176b31..5958497df 100644
--- a/lib/base/configobject.cpp
+++ b/lib/base/configobject.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "base/configobject.hpp"
-#include "base/configobject.tcpp"
+#include "base/configobject-ti.cpp"
 #include "base/configtype.hpp"
 #include "base/serializer.hpp"
 #include "base/netstring.hpp"
diff --git a/lib/base/configobject.hpp b/lib/base/configobject.hpp
index 013f603dd..9afadac90 100644
--- a/lib/base/configobject.hpp
+++ b/lib/base/configobject.hpp
@@ -21,7 +21,7 @@
 #define CONFIGOBJECT_H
 
 #include "base/i2-base.hpp"
-#include "base/configobject.thpp"
+#include "base/configobject-ti.hpp"
 #include "base/object.hpp"
 #include "base/type.hpp"
 #include "base/dictionary.hpp"
diff --git a/lib/base/datetime.cpp b/lib/base/datetime.cpp
index a043aa24e..808312269 100644
--- a/lib/base/datetime.cpp
+++ b/lib/base/datetime.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "base/datetime.hpp"
-#include "base/datetime.tcpp"
+#include "base/datetime-ti.cpp"
 #include "base/utility.hpp"
 #include "base/primitivetype.hpp"
 
diff --git a/lib/base/datetime.hpp b/lib/base/datetime.hpp
index 7ac84dcfa..54821b3a7 100644
--- a/lib/base/datetime.hpp
+++ b/lib/base/datetime.hpp
@@ -21,7 +21,7 @@
 #define DATETIME_H
 
 #include "base/i2-base.hpp"
-#include "base/datetime.thpp"
+#include "base/datetime-ti.hpp"
 #include "base/value.hpp"
 #include <vector>
 
diff --git a/lib/base/filelogger.cpp b/lib/base/filelogger.cpp
index b1c8b0ad1..5ae739d2e 100644
--- a/lib/base/filelogger.cpp
+++ b/lib/base/filelogger.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "base/filelogger.hpp"
-#include "base/filelogger.tcpp"
+#include "base/filelogger-ti.cpp"
 #include "base/configtype.hpp"
 #include "base/statsfunction.hpp"
 #include "base/application.hpp"
diff --git a/lib/base/filelogger.hpp b/lib/base/filelogger.hpp
index d4a5dc5ec..8c9a8eee9 100644
--- a/lib/base/filelogger.hpp
+++ b/lib/base/filelogger.hpp
@@ -21,7 +21,7 @@
 #define FILELOGGER_H
 
 #include "base/i2-base.hpp"
-#include "base/filelogger.thpp"
+#include "base/filelogger-ti.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/function.cpp b/lib/base/function.cpp
index 13bf1d075..6fec96208 100644
--- a/lib/base/function.cpp
+++ b/lib/base/function.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "base/function.hpp"
-#include "base/function.tcpp"
+#include "base/function-ti.cpp"
 #include "base/array.hpp"
 #include "base/scriptframe.hpp"
 
diff --git a/lib/base/function.hpp b/lib/base/function.hpp
index b607fea14..dd08df6ff 100644
--- a/lib/base/function.hpp
+++ b/lib/base/function.hpp
@@ -21,7 +21,7 @@
 #define SCRIPTFUNCTION_H
 
 #include "base/i2-base.hpp"
-#include "base/function.thpp"
+#include "base/function-ti.hpp"
 #include "base/value.hpp"
 #include "base/functionwrapper.hpp"
 #include "base/scriptglobal.hpp"
diff --git a/lib/base/logger.cpp b/lib/base/logger.cpp
index 9425a7fd1..1ff1d14c4 100644
--- a/lib/base/logger.cpp
+++ b/lib/base/logger.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "base/logger.hpp"
-#include "base/logger.tcpp"
+#include "base/logger-ti.cpp"
 #include "base/application.hpp"
 #include "base/streamlogger.hpp"
 #include "base/configtype.hpp"
diff --git a/lib/base/logger.hpp b/lib/base/logger.hpp
index 40f4b455d..d77252e88 100644
--- a/lib/base/logger.hpp
+++ b/lib/base/logger.hpp
@@ -21,7 +21,7 @@
 #define LOGGER_H
 
 #include "base/i2-base.hpp"
-#include "base/logger.thpp"
+#include "base/logger-ti.hpp"
 #include <set>
 #include <sstream>
 
diff --git a/lib/base/perfdatavalue.cpp b/lib/base/perfdatavalue.cpp
index 407f757f7..2dfdac57b 100644
--- a/lib/base/perfdatavalue.cpp
+++ b/lib/base/perfdatavalue.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "base/perfdatavalue.hpp"
-#include "base/perfdatavalue.tcpp"
+#include "base/perfdatavalue-ti.cpp"
 #include "base/convert.hpp"
 #include "base/exception.hpp"
 #include "base/logger.hpp"
diff --git a/lib/base/perfdatavalue.hpp b/lib/base/perfdatavalue.hpp
index d79af942c..a72d267be 100644
--- a/lib/base/perfdatavalue.hpp
+++ b/lib/base/perfdatavalue.hpp
@@ -21,7 +21,7 @@
 #define PERFDATAVALUE_H
 
 #include "base/i2-base.hpp"
-#include "base/perfdatavalue.thpp"
+#include "base/perfdatavalue-ti.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/streamlogger.cpp b/lib/base/streamlogger.cpp
index c92fbccbb..fa93d740b 100644
--- a/lib/base/streamlogger.cpp
+++ b/lib/base/streamlogger.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "base/streamlogger.hpp"
-#include "base/streamlogger.tcpp"
+#include "base/streamlogger-ti.cpp"
 #include "base/utility.hpp"
 #include "base/objectlock.hpp"
 #include "base/console.hpp"
diff --git a/lib/base/streamlogger.hpp b/lib/base/streamlogger.hpp
index 6376610e7..3c6e6faf6 100644
--- a/lib/base/streamlogger.hpp
+++ b/lib/base/streamlogger.hpp
@@ -21,7 +21,7 @@
 #define STREAMLOGGER_H
 
 #include "base/i2-base.hpp"
-#include "base/streamlogger.thpp"
+#include "base/streamlogger-ti.hpp"
 #include "base/timer.hpp"
 #include <ostream>
 
diff --git a/lib/base/sysloglogger.cpp b/lib/base/sysloglogger.cpp
index e7e17a92f..b5d735a80 100644
--- a/lib/base/sysloglogger.cpp
+++ b/lib/base/sysloglogger.cpp
@@ -19,9 +19,9 @@
 
 #ifndef _WIN32
 #include "base/sysloglogger.hpp"
+#include "base/sysloglogger-ti.cpp"
 #include "base/configtype.hpp"
 #include "base/statsfunction.hpp"
-#include "base/sysloglogger.tcpp"
 
 using namespace icinga;
 
diff --git a/lib/base/sysloglogger.hpp b/lib/base/sysloglogger.hpp
index e81ffe700..8718a21d0 100644
--- a/lib/base/sysloglogger.hpp
+++ b/lib/base/sysloglogger.hpp
@@ -22,7 +22,7 @@
 
 #ifndef _WIN32
 #include "base/i2-base.hpp"
-#include "base/sysloglogger.thpp"
+#include "base/sysloglogger-ti.hpp"
 
 namespace icinga
 {
diff --git a/lib/checker/CMakeLists.txt b/lib/checker/CMakeLists.txt
index f2a9f156c..78d4eb186 100644
--- a/lib/checker/CMakeLists.txt
+++ b/lib/checker/CMakeLists.txt
@@ -15,10 +15,10 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(checkercomponent.ti checkercomponent.tcpp checkercomponent.thpp)
+mkclass_target(checkercomponent.ti checkercomponent-ti.cpp checkercomponent-ti.hpp)
 
 set(checker_SOURCES
-  checkercomponent.cpp checkercomponent.hpp checkercomponent.thpp
+  checkercomponent.cpp checkercomponent.hpp checkercomponent-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)
diff --git a/lib/checker/checkercomponent.cpp b/lib/checker/checkercomponent.cpp
index f2027e9ea..12e43b73c 100644
--- a/lib/checker/checkercomponent.cpp
+++ b/lib/checker/checkercomponent.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "checker/checkercomponent.hpp"
-#include "checker/checkercomponent.tcpp"
+#include "checker/checkercomponent-ti.cpp"
 #include "icinga/icingaapplication.hpp"
 #include "icinga/cib.hpp"
 #include "remote/apilistener.hpp"
diff --git a/lib/checker/checkercomponent.hpp b/lib/checker/checkercomponent.hpp
index fd67b9445..601bb58b2 100644
--- a/lib/checker/checkercomponent.hpp
+++ b/lib/checker/checkercomponent.hpp
@@ -20,7 +20,7 @@
 #ifndef CHECKERCOMPONENT_H
 #define CHECKERCOMPONENT_H
 
-#include "checker/checkercomponent.thpp"
+#include "checker/checkercomponent-ti.hpp"
 #include "icinga/service.hpp"
 #include "base/configobject.hpp"
 #include "base/timer.hpp"
diff --git a/lib/compat/CMakeLists.txt b/lib/compat/CMakeLists.txt
index 5dd249689..939a9f388 100644
--- a/lib/compat/CMakeLists.txt
+++ b/lib/compat/CMakeLists.txt
@@ -15,16 +15,16 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(checkresultreader.ti checkresultreader.tcpp checkresultreader.thpp)
-mkclass_target(compatlogger.ti compatlogger.tcpp compatlogger.thpp)
-mkclass_target(externalcommandlistener.ti externalcommandlistener.tcpp externalcommandlistener.thpp)
-mkclass_target(statusdatawriter.ti statusdatawriter.tcpp statusdatawriter.thpp)
+mkclass_target(checkresultreader.ti checkresultreader-ti.cpp checkresultreader-ti.hpp)
+mkclass_target(compatlogger.ti compatlogger-ti.cpp compatlogger-ti.hpp)
+mkclass_target(externalcommandlistener.ti externalcommandlistener-ti.cpp externalcommandlistener-ti.hpp)
+mkclass_target(statusdatawriter.ti statusdatawriter-ti.cpp statusdatawriter-ti.hpp)
 
 set(compat_SOURCES
-  checkresultreader.cpp checkresultreader.hpp checkresultreader.thpp
-  compatlogger.cpp compatlogger.hpp compatlogger.thpp
-  externalcommandlistener.cpp externalcommandlistener.hpp externalcommandlistener.thpp
-  statusdatawriter.cpp statusdatawriter.hpp statusdatawriter.thpp
+  checkresultreader.cpp checkresultreader.hpp checkresultreader-ti.hpp
+  compatlogger.cpp compatlogger.hpp compatlogger-ti.hpp
+  externalcommandlistener.cpp externalcommandlistener.hpp externalcommandlistener-ti.hpp
+  statusdatawriter.cpp statusdatawriter.hpp statusdatawriter-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)
diff --git a/lib/compat/checkresultreader.cpp b/lib/compat/checkresultreader.cpp
index 01e35dbd8..557b9037d 100644
--- a/lib/compat/checkresultreader.cpp
+++ b/lib/compat/checkresultreader.cpp
@@ -19,7 +19,7 @@
 
 #include "icinga/compatutility.hpp"
 #include "compat/checkresultreader.hpp"
-#include "compat/checkresultreader.tcpp"
+#include "compat/checkresultreader-ti.cpp"
 #include "icinga/service.hpp"
 #include "icinga/pluginutility.hpp"
 #include "icinga/icingaapplication.hpp"
diff --git a/lib/compat/checkresultreader.hpp b/lib/compat/checkresultreader.hpp
index 2885e3fc4..445f8354c 100644
--- a/lib/compat/checkresultreader.hpp
+++ b/lib/compat/checkresultreader.hpp
@@ -20,7 +20,7 @@
 #ifndef CHECKRESULTREADER_H
 #define CHECKRESULTREADER_H
 
-#include "compat/checkresultreader.thpp"
+#include "compat/checkresultreader-ti.hpp"
 #include "base/timer.hpp"
 #include <fstream>
 
diff --git a/lib/compat/compatlogger.cpp b/lib/compat/compatlogger.cpp
index 58b97af69..29990a8ea 100644
--- a/lib/compat/compatlogger.cpp
+++ b/lib/compat/compatlogger.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "compat/compatlogger.hpp"
-#include "compat/compatlogger.tcpp"
+#include "compat/compatlogger-ti.cpp"
 #include "icinga/service.hpp"
 #include "icinga/checkcommand.hpp"
 #include "icinga/eventcommand.hpp"
diff --git a/lib/compat/compatlogger.hpp b/lib/compat/compatlogger.hpp
index 1665b19ab..fecab1f99 100644
--- a/lib/compat/compatlogger.hpp
+++ b/lib/compat/compatlogger.hpp
@@ -20,7 +20,7 @@
 #ifndef COMPATLOGGER_H
 #define COMPATLOGGER_H
 
-#include "compat/compatlogger.thpp"
+#include "compat/compatlogger-ti.hpp"
 #include "icinga/service.hpp"
 #include "base/timer.hpp"
 #include <fstream>
diff --git a/lib/compat/externalcommandlistener.cpp b/lib/compat/externalcommandlistener.cpp
index 5843bfd32..bb9402c79 100644
--- a/lib/compat/externalcommandlistener.cpp
+++ b/lib/compat/externalcommandlistener.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "compat/externalcommandlistener.hpp"
-#include "compat/externalcommandlistener.tcpp"
+#include "compat/externalcommandlistener-ti.cpp"
 #include "icinga/externalcommandprocessor.hpp"
 #include "base/configtype.hpp"
 #include "base/logger.hpp"
diff --git a/lib/compat/externalcommandlistener.hpp b/lib/compat/externalcommandlistener.hpp
index 3510cd995..a2adc47ef 100644
--- a/lib/compat/externalcommandlistener.hpp
+++ b/lib/compat/externalcommandlistener.hpp
@@ -20,7 +20,7 @@
 #ifndef EXTERNALCOMMANDLISTENER_H
 #define EXTERNALCOMMANDLISTENER_H
 
-#include "compat/externalcommandlistener.thpp"
+#include "compat/externalcommandlistener-ti.hpp"
 #include "base/objectlock.hpp"
 #include "base/timer.hpp"
 #include "base/utility.hpp"
diff --git a/lib/compat/statusdatawriter.cpp b/lib/compat/statusdatawriter.cpp
index 90b8ef131..dd3ef3296 100644
--- a/lib/compat/statusdatawriter.cpp
+++ b/lib/compat/statusdatawriter.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "compat/statusdatawriter.hpp"
-#include "compat/statusdatawriter.tcpp"
+#include "compat/statusdatawriter-ti.cpp"
 #include "icinga/icingaapplication.hpp"
 #include "icinga/cib.hpp"
 #include "icinga/hostgroup.hpp"
diff --git a/lib/compat/statusdatawriter.hpp b/lib/compat/statusdatawriter.hpp
index 5dd68427f..b8fb71d33 100644
--- a/lib/compat/statusdatawriter.hpp
+++ b/lib/compat/statusdatawriter.hpp
@@ -20,7 +20,7 @@
 #ifndef STATUSDATAWRITER_H
 #define STATUSDATAWRITER_H
 
-#include "compat/statusdatawriter.thpp"
+#include "compat/statusdatawriter-ti.hpp"
 #include "icinga/customvarobject.hpp"
 #include "icinga/host.hpp"
 #include "icinga/service.hpp"
diff --git a/lib/db_ido/CMakeLists.txt b/lib/db_ido/CMakeLists.txt
index b8f49fb28..b55184f2a 100644
--- a/lib/db_ido/CMakeLists.txt
+++ b/lib/db_ido/CMakeLists.txt
@@ -15,14 +15,14 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(dbconnection.ti dbconnection.tcpp dbconnection.thpp)
+mkclass_target(dbconnection.ti dbconnection-ti.cpp dbconnection-ti.hpp)
 
 mkembedconfig_target(db_ido-itl.conf db_ido-itl.cpp)
 
 set(db_ido_SOURCES
   i2-db_ido.hpp db_ido-itl.cpp
   commanddbobject.cpp commanddbobject.hpp
-  dbconnection.cpp dbconnection.hpp dbconnection.thpp
+  dbconnection.cpp dbconnection.hpp dbconnection-ti.hpp
   dbevents.cpp dbevents.hpp
   dbobject.cpp dbobject.hpp
   dbquery.cpp dbquery.hpp
diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp
index 79d058614..30f602d56 100644
--- a/lib/db_ido/dbconnection.cpp
+++ b/lib/db_ido/dbconnection.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "db_ido/dbconnection.hpp"
-#include "db_ido/dbconnection.tcpp"
+#include "db_ido/dbconnection-ti.cpp"
 #include "db_ido/dbvalue.hpp"
 #include "icinga/icingaapplication.hpp"
 #include "icinga/host.hpp"
diff --git a/lib/db_ido/dbconnection.hpp b/lib/db_ido/dbconnection.hpp
index e1eb50633..20ea9324f 100644
--- a/lib/db_ido/dbconnection.hpp
+++ b/lib/db_ido/dbconnection.hpp
@@ -21,7 +21,7 @@
 #define DBCONNECTION_H
 
 #include "db_ido/i2-db_ido.hpp"
-#include "db_ido/dbconnection.thpp"
+#include "db_ido/dbconnection-ti.hpp"
 #include "db_ido/dbobject.hpp"
 #include "db_ido/dbquery.hpp"
 #include "base/timer.hpp"
diff --git a/lib/db_ido_mysql/CMakeLists.txt b/lib/db_ido_mysql/CMakeLists.txt
index aedc19ddf..50eef55c3 100644
--- a/lib/db_ido_mysql/CMakeLists.txt
+++ b/lib/db_ido_mysql/CMakeLists.txt
@@ -15,10 +15,10 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(idomysqlconnection.ti idomysqlconnection.tcpp idomysqlconnection.thpp)
+mkclass_target(idomysqlconnection.ti idomysqlconnection-ti.cpp idomysqlconnection-ti.hpp)
 
 set(db_ido_mysql_SOURCES
-  idomysqlconnection.cpp idomysqlconnection.hpp idomysqlconnection.thpp
+  idomysqlconnection.cpp idomysqlconnection.hpp idomysqlconnection-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)
diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp
index 70e019685..9c8fd7b41 100644
--- a/lib/db_ido_mysql/idomysqlconnection.cpp
+++ b/lib/db_ido_mysql/idomysqlconnection.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "db_ido_mysql/idomysqlconnection.hpp"
-#include "db_ido_mysql/idomysqlconnection.tcpp"
+#include "db_ido_mysql/idomysqlconnection-ti.cpp"
 #include "db_ido/dbtype.hpp"
 #include "db_ido/dbvalue.hpp"
 #include "base/logger.hpp"
diff --git a/lib/db_ido_mysql/idomysqlconnection.hpp b/lib/db_ido_mysql/idomysqlconnection.hpp
index fa2383cd4..0a13bb73a 100644
--- a/lib/db_ido_mysql/idomysqlconnection.hpp
+++ b/lib/db_ido_mysql/idomysqlconnection.hpp
@@ -20,7 +20,7 @@
 #ifndef IDOMYSQLCONNECTION_H
 #define IDOMYSQLCONNECTION_H
 
-#include "db_ido_mysql/idomysqlconnection.thpp"
+#include "db_ido_mysql/idomysqlconnection-ti.hpp"
 #include "mysql_shim/mysqlinterface.hpp"
 #include "base/array.hpp"
 #include "base/timer.hpp"
diff --git a/lib/db_ido_pgsql/CMakeLists.txt b/lib/db_ido_pgsql/CMakeLists.txt
index de7121da1..9cc900472 100644
--- a/lib/db_ido_pgsql/CMakeLists.txt
+++ b/lib/db_ido_pgsql/CMakeLists.txt
@@ -15,10 +15,10 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(idopgsqlconnection.ti idopgsqlconnection.tcpp idopgsqlconnection.thpp)
+mkclass_target(idopgsqlconnection.ti idopgsqlconnection-ti.cpp idopgsqlconnection-ti.hpp)
 
 set(db_ido_pgsql_SOURCES
-  idopgsqlconnection.cpp idopgsqlconnection.hpp idopgsqlconnection.thpp
+  idopgsqlconnection.cpp idopgsqlconnection.hpp idopgsqlconnection-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)
diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp
index d9483e785..6bb4ee7ee 100644
--- a/lib/db_ido_pgsql/idopgsqlconnection.cpp
+++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "db_ido_pgsql/idopgsqlconnection.hpp"
-#include "db_ido_pgsql/idopgsqlconnection.tcpp"
+#include "db_ido_pgsql/idopgsqlconnection-ti.cpp"
 #include "db_ido/dbtype.hpp"
 #include "db_ido/dbvalue.hpp"
 #include "base/logger.hpp"
diff --git a/lib/db_ido_pgsql/idopgsqlconnection.hpp b/lib/db_ido_pgsql/idopgsqlconnection.hpp
index b00a4b707..3b1dc2649 100644
--- a/lib/db_ido_pgsql/idopgsqlconnection.hpp
+++ b/lib/db_ido_pgsql/idopgsqlconnection.hpp
@@ -20,7 +20,7 @@
 #ifndef IDOPGSQLCONNECTION_H
 #define IDOPGSQLCONNECTION_H
 
-#include "db_ido_pgsql/idopgsqlconnection.thpp"
+#include "db_ido_pgsql/idopgsqlconnection-ti.hpp"
 #include "pgsql_shim/pgsqlinterface.hpp"
 #include "base/array.hpp"
 #include "base/timer.hpp"
diff --git a/lib/icinga/CMakeLists.txt b/lib/icinga/CMakeLists.txt
index 25a1f0fe6..d3e126af3 100644
--- a/lib/icinga/CMakeLists.txt
+++ b/lib/icinga/CMakeLists.txt
@@ -15,26 +15,26 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(checkable.ti checkable.tcpp checkable.thpp)
-mkclass_target(checkcommand.ti checkcommand.tcpp checkcommand.thpp)
-mkclass_target(checkresult.ti checkresult.tcpp checkresult.thpp)
-mkclass_target(command.ti command.tcpp command.thpp)
-mkclass_target(comment.ti comment.tcpp comment.thpp)
-mkclass_target(dependency.ti dependency.tcpp dependency.thpp)
-mkclass_target(downtime.ti downtime.tcpp downtime.thpp)
-mkclass_target(eventcommand.ti eventcommand.tcpp eventcommand.thpp)
-mkclass_target(hostgroup.ti hostgroup.tcpp hostgroup.thpp)
-mkclass_target(host.ti host.tcpp host.thpp)
-mkclass_target(icingaapplication.ti icingaapplication.tcpp icingaapplication.thpp)
-mkclass_target(customvarobject.ti customvarobject.tcpp customvarobject.thpp)
-mkclass_target(notificationcommand.ti notificationcommand.tcpp notificationcommand.thpp)
-mkclass_target(notification.ti notification.tcpp notification.thpp)
-mkclass_target(scheduleddowntime.ti scheduleddowntime.tcpp scheduleddowntime.thpp)
-mkclass_target(servicegroup.ti servicegroup.tcpp servicegroup.thpp)
-mkclass_target(service.ti service.tcpp service.thpp)
-mkclass_target(timeperiod.ti timeperiod.tcpp timeperiod.thpp)
-mkclass_target(usergroup.ti usergroup.tcpp usergroup.thpp)
-mkclass_target(user.ti user.tcpp user.thpp)
+mkclass_target(checkable.ti checkable-ti.cpp checkable-ti.hpp)
+mkclass_target(checkcommand.ti checkcommand-ti.cpp checkcommand-ti.hpp)
+mkclass_target(checkresult.ti checkresult-ti.cpp checkresult-ti.hpp)
+mkclass_target(command.ti command-ti.cpp command-ti.hpp)
+mkclass_target(comment.ti comment-ti.cpp comment-ti.hpp)
+mkclass_target(dependency.ti dependency-ti.cpp dependency-ti.hpp)
+mkclass_target(downtime.ti downtime-ti.cpp downtime-ti.hpp)
+mkclass_target(eventcommand.ti eventcommand-ti.cpp eventcommand-ti.hpp)
+mkclass_target(hostgroup.ti hostgroup-ti.cpp hostgroup-ti.hpp)
+mkclass_target(host.ti host-ti.cpp host-ti.hpp)
+mkclass_target(icingaapplication.ti icingaapplication-ti.cpp icingaapplication-ti.hpp)
+mkclass_target(customvarobject.ti customvarobject-ti.cpp customvarobject-ti.hpp)
+mkclass_target(notificationcommand.ti notificationcommand-ti.cpp notificationcommand-ti.hpp)
+mkclass_target(notification.ti notification-ti.cpp notification-ti.hpp)
+mkclass_target(scheduleddowntime.ti scheduleddowntime-ti.cpp scheduleddowntime-ti.hpp)
+mkclass_target(servicegroup.ti servicegroup-ti.cpp servicegroup-ti.hpp)
+mkclass_target(service.ti service-ti.cpp service-ti.hpp)
+mkclass_target(timeperiod.ti timeperiod-ti.cpp timeperiod-ti.hpp)
+mkclass_target(usergroup.ti usergroup-ti.cpp usergroup-ti.hpp)
+mkclass_target(user.ti user-ti.cpp user-ti.hpp)
 
 mkembedconfig_target(icinga-itl.conf icinga-itl.cpp)
 
@@ -42,38 +42,38 @@ set(icinga_SOURCES
   i2-icinga.hpp icinga-itl.cpp
   apiactions.cpp apiactions.hpp
   apievents.cpp apievents.hpp
-  checkable.cpp checkable.hpp checkable.thpp
+  checkable.cpp checkable.hpp checkable-ti.hpp
   checkable-check.cpp checkable-comment.cpp checkable-dependency.cpp
   checkable-downtime.cpp checkable-event.cpp checkable-flapping.cpp
   checkable-notification.cpp checkable-script.cpp
-  checkcommand.cpp checkcommand.hpp checkcommand.thpp
-  checkresult.cpp checkresult.hpp checkresult.thpp
+  checkcommand.cpp checkcommand.hpp checkcommand-ti.hpp
+  checkresult.cpp checkresult.hpp checkresult-ti.hpp
   cib.cpp cib.hpp
   clusterevents.cpp clusterevents.hpp
-  command.cpp command.hpp command.thpp
-  comment.cpp comment.hpp comment.thpp
+  command.cpp command.hpp command-ti.hpp
+  comment.cpp comment.hpp comment-ti.hpp
   compatutility.cpp compatutility.hpp
-  customvarobject.cpp customvarobject.hpp customvarobject.thpp
-  dependency.cpp dependency.hpp dependency.thpp dependency-apply.cpp
-  downtime.cpp downtime.hpp downtime.thpp
-  eventcommand.cpp eventcommand.hpp eventcommand.thpp
+  customvarobject.cpp customvarobject.hpp customvarobject-ti.hpp
+  dependency.cpp dependency.hpp dependency-ti.hpp dependency-apply.cpp
+  downtime.cpp downtime.hpp downtime-ti.hpp
+  eventcommand.cpp eventcommand.hpp eventcommand-ti.hpp
   externalcommandprocessor.cpp externalcommandprocessor.hpp
-  host.cpp host.hpp host.thpp
-  hostgroup.cpp hostgroup.hpp hostgroup.thpp
-  icingaapplication.cpp icingaapplication.hpp icingaapplication.thpp
+  host.cpp host.hpp host-ti.hpp
+  hostgroup.cpp hostgroup.hpp hostgroup-ti.hpp
+  icingaapplication.cpp icingaapplication.hpp icingaapplication-ti.hpp
   legacytimeperiod.cpp legacytimeperiod.hpp
   macroprocessor.cpp macroprocessor.hpp
   macroresolver.hpp
-  notification.cpp notification.hpp notification.thpp notification-apply.cpp
-  notificationcommand.cpp notificationcommand.hpp notificationcommand.thpp
+  notification.cpp notification.hpp notification-ti.hpp notification-apply.cpp
+  notificationcommand.cpp notificationcommand.hpp notificationcommand-ti.hpp
   objectutils.cpp objectutils.hpp
   pluginutility.cpp pluginutility.hpp
-  scheduleddowntime.cpp scheduleddowntime.hpp scheduleddowntime.thpp scheduleddowntime-apply.cpp
-  service.cpp service.hpp service.thpp service-apply.cpp
-  servicegroup.cpp servicegroup.hpp servicegroup.thpp
-  timeperiod.cpp timeperiod.hpp timeperiod.thpp
-  user.cpp user.hpp user.thpp
-  usergroup.cpp usergroup.hpp usergroup.thpp
+  scheduleddowntime.cpp scheduleddowntime.hpp scheduleddowntime-ti.hpp scheduleddowntime-apply.cpp
+  service.cpp service.hpp service-ti.hpp service-apply.cpp
+  servicegroup.cpp servicegroup.hpp servicegroup-ti.hpp
+  timeperiod.cpp timeperiod.hpp timeperiod-ti.hpp
+  user.cpp user.hpp user-ti.hpp
+  usergroup.cpp usergroup.hpp usergroup-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)
diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp
index 9b66eb240..69af2c581 100644
--- a/lib/icinga/checkable.cpp
+++ b/lib/icinga/checkable.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/checkable.hpp"
-#include "icinga/checkable.tcpp"
+#include "icinga/checkable-ti.cpp"
 #include "icinga/host.hpp"
 #include "icinga/service.hpp"
 #include "base/objectlock.hpp"
diff --git a/lib/icinga/checkable.hpp b/lib/icinga/checkable.hpp
index 107def55f..24582389d 100644
--- a/lib/icinga/checkable.hpp
+++ b/lib/icinga/checkable.hpp
@@ -21,7 +21,7 @@
 #define CHECKABLE_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/checkable.thpp"
+#include "icinga/checkable-ti.hpp"
 #include "icinga/timeperiod.hpp"
 #include "icinga/notification.hpp"
 #include "icinga/comment.hpp"
diff --git a/lib/icinga/checkcommand.cpp b/lib/icinga/checkcommand.cpp
index 5d9da103a..e32af3220 100644
--- a/lib/icinga/checkcommand.cpp
+++ b/lib/icinga/checkcommand.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/checkcommand.hpp"
-#include "icinga/checkcommand.tcpp"
+#include "icinga/checkcommand-ti.cpp"
 #include "base/configtype.hpp"
 
 using namespace icinga;
diff --git a/lib/icinga/checkcommand.hpp b/lib/icinga/checkcommand.hpp
index 84c89fe82..471d6c2a1 100644
--- a/lib/icinga/checkcommand.hpp
+++ b/lib/icinga/checkcommand.hpp
@@ -20,7 +20,7 @@
 #ifndef CHECKCOMMAND_H
 #define CHECKCOMMAND_H
 
-#include "icinga/checkcommand.thpp"
+#include "icinga/checkcommand-ti.hpp"
 #include "icinga/checkable.hpp"
 
 namespace icinga
diff --git a/lib/icinga/checkresult.cpp b/lib/icinga/checkresult.cpp
index cbbab12dc..52b1bb5e3 100644
--- a/lib/icinga/checkresult.cpp
+++ b/lib/icinga/checkresult.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/checkresult.hpp"
-#include "icinga/checkresult.tcpp"
+#include "icinga/checkresult-ti.cpp"
 #include "base/scriptglobal.hpp"
 
 using namespace icinga;
diff --git a/lib/icinga/checkresult.hpp b/lib/icinga/checkresult.hpp
index 7ac615fc7..245b4ba32 100644
--- a/lib/icinga/checkresult.hpp
+++ b/lib/icinga/checkresult.hpp
@@ -21,7 +21,7 @@
 #define CHECKRESULT_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/checkresult.thpp"
+#include "icinga/checkresult-ti.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/command.cpp b/lib/icinga/command.cpp
index 9eec7e697..628ed301a 100644
--- a/lib/icinga/command.cpp
+++ b/lib/icinga/command.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/command.hpp"
-#include "icinga/command.tcpp"
+#include "icinga/command-ti.cpp"
 #include "icinga/macroprocessor.hpp"
 #include "base/exception.hpp"
 #include "base/objectlock.hpp"
diff --git a/lib/icinga/command.hpp b/lib/icinga/command.hpp
index 82d6aceaf..fa1aa5c03 100644
--- a/lib/icinga/command.hpp
+++ b/lib/icinga/command.hpp
@@ -21,7 +21,7 @@
 #define COMMAND_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/command.thpp"
+#include "icinga/command-ti.hpp"
 #include "remote/messageorigin.hpp"
 
 namespace icinga
diff --git a/lib/icinga/comment.cpp b/lib/icinga/comment.cpp
index 77cc448a7..2eb8c4f6d 100644
--- a/lib/icinga/comment.cpp
+++ b/lib/icinga/comment.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/comment.hpp"
-#include "icinga/comment.tcpp"
+#include "icinga/comment-ti.cpp"
 #include "icinga/host.hpp"
 #include "remote/configobjectutility.hpp"
 #include "base/utility.hpp"
diff --git a/lib/icinga/comment.hpp b/lib/icinga/comment.hpp
index d8cb2a91e..d031b66de 100644
--- a/lib/icinga/comment.hpp
+++ b/lib/icinga/comment.hpp
@@ -21,8 +21,8 @@
 #define COMMENT_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/comment.thpp"
-#include "icinga/checkable.thpp"
+#include "icinga/comment-ti.hpp"
+#include "icinga/checkable-ti.hpp"
 #include "remote/messageorigin.hpp"
 
 namespace icinga
diff --git a/lib/icinga/customvarobject.cpp b/lib/icinga/customvarobject.cpp
index 16d31df66..2055dbd78 100644
--- a/lib/icinga/customvarobject.cpp
+++ b/lib/icinga/customvarobject.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/customvarobject.hpp"
-#include "icinga/customvarobject.tcpp"
+#include "icinga/customvarobject-ti.cpp"
 #include "icinga/macroprocessor.hpp"
 #include "base/logger.hpp"
 #include "base/function.hpp"
diff --git a/lib/icinga/customvarobject.hpp b/lib/icinga/customvarobject.hpp
index dbb14531e..84328bd7b 100644
--- a/lib/icinga/customvarobject.hpp
+++ b/lib/icinga/customvarobject.hpp
@@ -21,7 +21,7 @@
 #define CUSTOMVAROBJECT_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/customvarobject.thpp"
+#include "icinga/customvarobject-ti.hpp"
 #include "base/configobject.hpp"
 #include "remote/messageorigin.hpp"
 
diff --git a/lib/icinga/dependency.cpp b/lib/icinga/dependency.cpp
index 6e02cfd40..1c81efdc2 100644
--- a/lib/icinga/dependency.cpp
+++ b/lib/icinga/dependency.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/dependency.hpp"
-#include "icinga/dependency.tcpp"
+#include "icinga/dependency-ti.cpp"
 #include "icinga/service.hpp"
 #include "base/logger.hpp"
 #include "base/exception.hpp"
diff --git a/lib/icinga/dependency.hpp b/lib/icinga/dependency.hpp
index 820e0efb4..b9db395c3 100644
--- a/lib/icinga/dependency.hpp
+++ b/lib/icinga/dependency.hpp
@@ -21,7 +21,7 @@
 #define DEPENDENCY_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/dependency.thpp"
+#include "icinga/dependency-ti.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/downtime.cpp b/lib/icinga/downtime.cpp
index 7428332d0..3b0403b60 100644
--- a/lib/icinga/downtime.cpp
+++ b/lib/icinga/downtime.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/downtime.hpp"
-#include "icinga/downtime.tcpp"
+#include "icinga/downtime-ti.cpp"
 #include "icinga/host.hpp"
 #include "icinga/scheduleddowntime.hpp"
 #include "remote/configobjectutility.hpp"
diff --git a/lib/icinga/downtime.hpp b/lib/icinga/downtime.hpp
index 5149762b1..6d4ba0a21 100644
--- a/lib/icinga/downtime.hpp
+++ b/lib/icinga/downtime.hpp
@@ -21,8 +21,8 @@
 #define DOWNTIME_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/downtime.thpp"
-#include "icinga/checkable.thpp"
+#include "icinga/downtime-ti.hpp"
+#include "icinga/checkable-ti.hpp"
 #include "remote/messageorigin.hpp"
 
 namespace icinga
diff --git a/lib/icinga/eventcommand.cpp b/lib/icinga/eventcommand.cpp
index 769d6f585..a2a1cdc79 100644
--- a/lib/icinga/eventcommand.cpp
+++ b/lib/icinga/eventcommand.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/eventcommand.hpp"
-#include "icinga/eventcommand.tcpp"
+#include "icinga/eventcommand-ti.cpp"
 
 using namespace icinga;
 
diff --git a/lib/icinga/eventcommand.hpp b/lib/icinga/eventcommand.hpp
index 38a5610c4..d971976a1 100644
--- a/lib/icinga/eventcommand.hpp
+++ b/lib/icinga/eventcommand.hpp
@@ -20,7 +20,7 @@
 #ifndef EVENTCOMMAND_H
 #define EVENTCOMMAND_H
 
-#include "icinga/eventcommand.thpp"
+#include "icinga/eventcommand-ti.hpp"
 #include "icinga/checkable.hpp"
 
 namespace icinga
diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index dc0832243..89c4131e6 100644
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/host.hpp"
-#include "icinga/host.tcpp"
+#include "icinga/host-ti.cpp"
 #include "icinga/service.hpp"
 #include "icinga/hostgroup.hpp"
 #include "icinga/pluginutility.hpp"
diff --git a/lib/icinga/host.hpp b/lib/icinga/host.hpp
index a4969e866..cbd49d1db 100644
--- a/lib/icinga/host.hpp
+++ b/lib/icinga/host.hpp
@@ -21,7 +21,7 @@
 #define HOST_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/host.thpp"
+#include "icinga/host-ti.hpp"
 #include "icinga/macroresolver.hpp"
 #include "icinga/checkresult.hpp"
 
diff --git a/lib/icinga/hostgroup.cpp b/lib/icinga/hostgroup.cpp
index e1419530a..da0e7b9ad 100644
--- a/lib/icinga/hostgroup.cpp
+++ b/lib/icinga/hostgroup.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/hostgroup.hpp"
-#include "icinga/hostgroup.tcpp"
+#include "icinga/hostgroup-ti.cpp"
 #include "config/objectrule.hpp"
 #include "config/configitem.hpp"
 #include "base/configtype.hpp"
diff --git a/lib/icinga/hostgroup.hpp b/lib/icinga/hostgroup.hpp
index 146b9fa4a..fb2564620 100644
--- a/lib/icinga/hostgroup.hpp
+++ b/lib/icinga/hostgroup.hpp
@@ -21,7 +21,7 @@
 #define HOSTGROUP_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/hostgroup.thpp"
+#include "icinga/hostgroup-ti.hpp"
 #include "icinga/host.hpp"
 
 namespace icinga
diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp
index 90e623a92..cbec96b8d 100644
--- a/lib/icinga/icingaapplication.cpp
+++ b/lib/icinga/icingaapplication.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/icingaapplication.hpp"
-#include "icinga/icingaapplication.tcpp"
+#include "icinga/icingaapplication-ti.cpp"
 #include "icinga/cib.hpp"
 #include "icinga/macroprocessor.hpp"
 #include "config/configcompiler.hpp"
diff --git a/lib/icinga/icingaapplication.hpp b/lib/icinga/icingaapplication.hpp
index b5b1b951b..51216a02c 100644
--- a/lib/icinga/icingaapplication.hpp
+++ b/lib/icinga/icingaapplication.hpp
@@ -21,7 +21,7 @@
 #define ICINGAAPPLICATION_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/icingaapplication.thpp"
+#include "icinga/icingaapplication-ti.hpp"
 #include "icinga/macroresolver.hpp"
 
 namespace icinga
diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp
index 8771f4240..b2f9fb6a2 100644
--- a/lib/icinga/notification.cpp
+++ b/lib/icinga/notification.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/notification.hpp"
-#include "icinga/notification.tcpp"
+#include "icinga/notification-ti.cpp"
 #include "icinga/notificationcommand.hpp"
 #include "icinga/service.hpp"
 #include "remote/apilistener.hpp"
diff --git a/lib/icinga/notification.hpp b/lib/icinga/notification.hpp
index 27b78f531..47dd9d52d 100644
--- a/lib/icinga/notification.hpp
+++ b/lib/icinga/notification.hpp
@@ -21,8 +21,8 @@
 #define NOTIFICATION_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/notification.thpp"
-#include "icinga/checkable.thpp"
+#include "icinga/notification-ti.hpp"
+#include "icinga/checkable-ti.hpp"
 #include "icinga/user.hpp"
 #include "icinga/usergroup.hpp"
 #include "icinga/timeperiod.hpp"
diff --git a/lib/icinga/notificationcommand.cpp b/lib/icinga/notificationcommand.cpp
index d9e94f294..46dc7c086 100644
--- a/lib/icinga/notificationcommand.cpp
+++ b/lib/icinga/notificationcommand.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/notificationcommand.hpp"
-#include "icinga/notificationcommand.tcpp"
+#include "icinga/notificationcommand-ti.cpp"
 
 using namespace icinga;
 
diff --git a/lib/icinga/notificationcommand.hpp b/lib/icinga/notificationcommand.hpp
index d1c604b6c..10079250e 100644
--- a/lib/icinga/notificationcommand.hpp
+++ b/lib/icinga/notificationcommand.hpp
@@ -20,7 +20,7 @@
 #ifndef NOTIFICATIONCOMMAND_H
 #define NOTIFICATIONCOMMAND_H
 
-#include "icinga/notificationcommand.thpp"
+#include "icinga/notificationcommand-ti.hpp"
 #include "icinga/notification.hpp"
 
 namespace icinga
diff --git a/lib/icinga/scheduleddowntime.cpp b/lib/icinga/scheduleddowntime.cpp
index 6c702946e..53c036c78 100644
--- a/lib/icinga/scheduleddowntime.cpp
+++ b/lib/icinga/scheduleddowntime.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/scheduleddowntime.hpp"
-#include "icinga/scheduleddowntime.tcpp"
+#include "icinga/scheduleddowntime-ti.cpp"
 #include "icinga/legacytimeperiod.hpp"
 #include "icinga/downtime.hpp"
 #include "icinga/service.hpp"
diff --git a/lib/icinga/scheduleddowntime.hpp b/lib/icinga/scheduleddowntime.hpp
index 9e5751e41..86138fa04 100644
--- a/lib/icinga/scheduleddowntime.hpp
+++ b/lib/icinga/scheduleddowntime.hpp
@@ -21,7 +21,7 @@
 #define SCHEDULEDDOWNTIME_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/scheduleddowntime.thpp"
+#include "icinga/scheduleddowntime-ti.hpp"
 #include "icinga/checkable.hpp"
 
 namespace icinga
diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index e6ca785f2..c1e0149e5 100644
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/service.hpp"
-#include "icinga/service.tcpp"
+#include "icinga/service-ti.cpp"
 #include "icinga/servicegroup.hpp"
 #include "icinga/scheduleddowntime.hpp"
 #include "icinga/pluginutility.hpp"
diff --git a/lib/icinga/service.hpp b/lib/icinga/service.hpp
index 39952a2b1..8fb45d684 100644
--- a/lib/icinga/service.hpp
+++ b/lib/icinga/service.hpp
@@ -21,7 +21,7 @@
 #define SERVICE_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/service.thpp"
+#include "icinga/service-ti.hpp"
 #include "icinga/macroresolver.hpp"
 #include "icinga/host.hpp"
 #include <tuple>
diff --git a/lib/icinga/servicegroup.cpp b/lib/icinga/servicegroup.cpp
index 879e5156c..555113259 100644
--- a/lib/icinga/servicegroup.cpp
+++ b/lib/icinga/servicegroup.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/servicegroup.hpp"
-#include "icinga/servicegroup.tcpp"
+#include "icinga/servicegroup-ti.cpp"
 #include "config/objectrule.hpp"
 #include "config/configitem.hpp"
 #include "base/configtype.hpp"
diff --git a/lib/icinga/servicegroup.hpp b/lib/icinga/servicegroup.hpp
index dc87028c2..9a8d49a7b 100644
--- a/lib/icinga/servicegroup.hpp
+++ b/lib/icinga/servicegroup.hpp
@@ -21,7 +21,7 @@
 #define SERVICEGROUP_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/servicegroup.thpp"
+#include "icinga/servicegroup-ti.hpp"
 #include "icinga/service.hpp"
 
 namespace icinga
diff --git a/lib/icinga/timeperiod.cpp b/lib/icinga/timeperiod.cpp
index 4953c3ebb..97183223e 100644
--- a/lib/icinga/timeperiod.cpp
+++ b/lib/icinga/timeperiod.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/timeperiod.hpp"
-#include "icinga/timeperiod.tcpp"
+#include "icinga/timeperiod-ti.cpp"
 #include "icinga/legacytimeperiod.hpp"
 #include "base/configtype.hpp"
 #include "base/objectlock.hpp"
diff --git a/lib/icinga/timeperiod.hpp b/lib/icinga/timeperiod.hpp
index fe1c7d651..a641d40cb 100644
--- a/lib/icinga/timeperiod.hpp
+++ b/lib/icinga/timeperiod.hpp
@@ -21,7 +21,7 @@
 #define TIMEPERIOD_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/timeperiod.thpp"
+#include "icinga/timeperiod-ti.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/user.cpp b/lib/icinga/user.cpp
index 7059c8438..2d72d7373 100644
--- a/lib/icinga/user.cpp
+++ b/lib/icinga/user.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/user.hpp"
-#include "icinga/user.tcpp"
+#include "icinga/user-ti.cpp"
 #include "icinga/usergroup.hpp"
 #include "icinga/notification.hpp"
 #include "icinga/usergroup.hpp"
diff --git a/lib/icinga/user.hpp b/lib/icinga/user.hpp
index 28e0b8bcb..57a007799 100644
--- a/lib/icinga/user.hpp
+++ b/lib/icinga/user.hpp
@@ -21,7 +21,7 @@
 #define USER_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/user.thpp"
+#include "icinga/user-ti.hpp"
 #include "icinga/timeperiod.hpp"
 #include "remote/messageorigin.hpp"
 
diff --git a/lib/icinga/usergroup.cpp b/lib/icinga/usergroup.cpp
index 4741ed024..db8706729 100644
--- a/lib/icinga/usergroup.cpp
+++ b/lib/icinga/usergroup.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "icinga/usergroup.hpp"
-#include "icinga/usergroup.tcpp"
+#include "icinga/usergroup-ti.cpp"
 #include "config/objectrule.hpp"
 #include "config/configitem.hpp"
 #include "base/configtype.hpp"
diff --git a/lib/icinga/usergroup.hpp b/lib/icinga/usergroup.hpp
index a212ab3d3..9bf02a4e8 100644
--- a/lib/icinga/usergroup.hpp
+++ b/lib/icinga/usergroup.hpp
@@ -21,7 +21,7 @@
 #define USERGROUP_H
 
 #include "icinga/i2-icinga.hpp"
-#include "icinga/usergroup.thpp"
+#include "icinga/usergroup-ti.hpp"
 #include "icinga/user.hpp"
 
 namespace icinga
diff --git a/lib/livestatus/CMakeLists.txt b/lib/livestatus/CMakeLists.txt
index e2a0d98f7..8d2494b17 100644
--- a/lib/livestatus/CMakeLists.txt
+++ b/lib/livestatus/CMakeLists.txt
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(livestatuslistener.ti livestatuslistener.tcpp livestatuslistener.thpp)
+mkclass_target(livestatuslistener.ti livestatuslistener-ti.cpp livestatuslistener-ti.hpp)
 
 set(livestatus_SOURCES
   i2-livestatus.hpp
@@ -38,7 +38,7 @@ set(livestatus_SOURCES
   hoststable.cpp hoststable.hpp
   invavgaggregator.cpp invavgaggregator.hpp
   invsumaggregator.cpp invsumaggregator.hpp
-  livestatuslistener.cpp livestatuslistener.hpp livestatuslistener.thpp
+  livestatuslistener.cpp livestatuslistener.hpp livestatuslistener-ti.hpp
   livestatuslogutility.cpp livestatuslogutility.hpp
   livestatusquery.cpp livestatusquery.hpp
   logtable.cpp logtable.hpp
diff --git a/lib/livestatus/livestatuslistener.cpp b/lib/livestatus/livestatuslistener.cpp
index 1f7944a39..31cdebf4c 100644
--- a/lib/livestatus/livestatuslistener.cpp
+++ b/lib/livestatus/livestatuslistener.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "livestatus/livestatuslistener.hpp"
-#include "livestatus/livestatuslistener.tcpp"
+#include "livestatus/livestatuslistener-ti.cpp"
 #include "base/utility.hpp"
 #include "base/perfdatavalue.hpp"
 #include "base/objectlock.hpp"
diff --git a/lib/livestatus/livestatuslistener.hpp b/lib/livestatus/livestatuslistener.hpp
index 3292a3eb8..56fd96c65 100644
--- a/lib/livestatus/livestatuslistener.hpp
+++ b/lib/livestatus/livestatuslistener.hpp
@@ -21,7 +21,7 @@
 #define LIVESTATUSLISTENER_H
 
 #include "livestatus/i2-livestatus.hpp"
-#include "livestatus/livestatuslistener.thpp"
+#include "livestatus/livestatuslistener-ti.hpp"
 #include "livestatus/livestatusquery.hpp"
 #include "base/socket.hpp"
 #include <thread>
diff --git a/lib/notification/CMakeLists.txt b/lib/notification/CMakeLists.txt
index cf1a6d0ce..04288727e 100644
--- a/lib/notification/CMakeLists.txt
+++ b/lib/notification/CMakeLists.txt
@@ -15,10 +15,10 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(notificationcomponent.ti notificationcomponent.tcpp notificationcomponent.thpp)
+mkclass_target(notificationcomponent.ti notificationcomponent-ti.cpp notificationcomponent-ti.hpp)
 
 set(notification_SOURCES
-  notificationcomponent.cpp notificationcomponent.hpp notificationcomponent.thpp
+  notificationcomponent.cpp notificationcomponent.hpp notificationcomponent-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)
diff --git a/lib/notification/notificationcomponent.cpp b/lib/notification/notificationcomponent.cpp
index 3f9a83956..ccc14c1de 100644
--- a/lib/notification/notificationcomponent.cpp
+++ b/lib/notification/notificationcomponent.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "notification/notificationcomponent.hpp"
-#include "notification/notificationcomponent.tcpp"
+#include "notification/notificationcomponent-ti.cpp"
 #include "icinga/service.hpp"
 #include "icinga/icingaapplication.hpp"
 #include "base/configtype.hpp"
diff --git a/lib/notification/notificationcomponent.hpp b/lib/notification/notificationcomponent.hpp
index ed7d270d3..39bb220f2 100644
--- a/lib/notification/notificationcomponent.hpp
+++ b/lib/notification/notificationcomponent.hpp
@@ -20,7 +20,7 @@
 #ifndef NOTIFICATIONCOMPONENT_H
 #define NOTIFICATIONCOMPONENT_H
 
-#include "notification/notificationcomponent.thpp"
+#include "notification/notificationcomponent-ti.hpp"
 #include "icinga/service.hpp"
 #include "base/configobject.hpp"
 #include "base/timer.hpp"
diff --git a/lib/perfdata/CMakeLists.txt b/lib/perfdata/CMakeLists.txt
index 2072c3ddb..12b851ac2 100644
--- a/lib/perfdata/CMakeLists.txt
+++ b/lib/perfdata/CMakeLists.txt
@@ -15,20 +15,20 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(gelfwriter.ti gelfwriter.tcpp gelfwriter.thpp)
-mkclass_target(graphitewriter.ti graphitewriter.tcpp graphitewriter.thpp)
-mkclass_target(influxdbwriter.ti influxdbwriter.tcpp influxdbwriter.thpp)
-mkclass_target(elasticsearchwriter.ti elasticsearchwriter.tcpp elasticsearchwriter.thpp)
-mkclass_target(opentsdbwriter.ti opentsdbwriter.tcpp opentsdbwriter.thpp)
-mkclass_target(perfdatawriter.ti perfdatawriter.tcpp perfdatawriter.thpp)
+mkclass_target(gelfwriter.ti gelfwriter-ti.cpp gelfwriter-ti.hpp)
+mkclass_target(graphitewriter.ti graphitewriter-ti.cpp graphitewriter-ti.hpp)
+mkclass_target(influxdbwriter.ti influxdbwriter-ti.cpp influxdbwriter-ti.hpp)
+mkclass_target(elasticsearchwriter.ti elasticsearchwriter-ti.cpp elasticsearchwriter-ti.hpp)
+mkclass_target(opentsdbwriter.ti opentsdbwriter-ti.cpp opentsdbwriter-ti.hpp)
+mkclass_target(perfdatawriter.ti perfdatawriter-ti.cpp perfdatawriter-ti.hpp)
 
 set(perfdata_SOURCES
-  elasticsearchwriter.cpp elasticsearchwriter.hpp elasticsearchwriter.thpp
-  gelfwriter.cpp gelfwriter.hpp gelfwriter.thpp
-  graphitewriter.cpp graphitewriter.hpp graphitewriter.thpp
-  influxdbwriter.cpp influxdbwriter.hpp influxdbwriter.thpp
-  opentsdbwriter.cpp opentsdbwriter.hpp opentsdbwriter.thpp
-  perfdatawriter.cpp perfdatawriter.hpp perfdatawriter.thpp
+  elasticsearchwriter.cpp elasticsearchwriter.hpp elasticsearchwriter-ti.hpp
+  gelfwriter.cpp gelfwriter.hpp gelfwriter-ti.hpp
+  graphitewriter.cpp graphitewriter.hpp graphitewriter-ti.hpp
+  influxdbwriter.cpp influxdbwriter.hpp influxdbwriter-ti.hpp
+  opentsdbwriter.cpp opentsdbwriter.hpp opentsdbwriter-ti.hpp
+  perfdatawriter.cpp perfdatawriter.hpp perfdatawriter-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)
diff --git a/lib/perfdata/elasticsearchwriter.cpp b/lib/perfdata/elasticsearchwriter.cpp
index 708e90670..d27aec227 100644
--- a/lib/perfdata/elasticsearchwriter.cpp
+++ b/lib/perfdata/elasticsearchwriter.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "perfdata/elasticsearchwriter.hpp"
-#include "perfdata/elasticsearchwriter.tcpp"
+#include "perfdata/elasticsearchwriter-ti.cpp"
 #include "remote/url.hpp"
 #include "remote/httprequest.hpp"
 #include "remote/httpresponse.hpp"
diff --git a/lib/perfdata/elasticsearchwriter.hpp b/lib/perfdata/elasticsearchwriter.hpp
index a1732ee84..e28ad4a7c 100644
--- a/lib/perfdata/elasticsearchwriter.hpp
+++ b/lib/perfdata/elasticsearchwriter.hpp
@@ -20,7 +20,7 @@
 #ifndef ELASTICSEARCHWRITER_H
 #define ELASTICSEARCHWRITER_H
 
-#include "perfdata/elasticsearchwriter.thpp"
+#include "perfdata/elasticsearchwriter-ti.hpp"
 #include "icinga/service.hpp"
 #include "base/configobject.hpp"
 #include "base/workqueue.hpp"
diff --git a/lib/perfdata/gelfwriter.cpp b/lib/perfdata/gelfwriter.cpp
index 060da2c80..ca9008127 100644
--- a/lib/perfdata/gelfwriter.cpp
+++ b/lib/perfdata/gelfwriter.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "perfdata/gelfwriter.hpp"
-#include "perfdata/gelfwriter.tcpp"
+#include "perfdata/gelfwriter-ti.cpp"
 #include "icinga/service.hpp"
 #include "icinga/notification.hpp"
 #include "icinga/checkcommand.hpp"
diff --git a/lib/perfdata/gelfwriter.hpp b/lib/perfdata/gelfwriter.hpp
index 0576ede1b..0948ecdd7 100644
--- a/lib/perfdata/gelfwriter.hpp
+++ b/lib/perfdata/gelfwriter.hpp
@@ -20,7 +20,7 @@
 #ifndef GELFWRITER_H
 #define GELFWRITER_H
 
-#include "perfdata/gelfwriter.thpp"
+#include "perfdata/gelfwriter-ti.hpp"
 #include "icinga/service.hpp"
 #include "base/configobject.hpp"
 #include "base/tcpsocket.hpp"
diff --git a/lib/perfdata/graphitewriter.cpp b/lib/perfdata/graphitewriter.cpp
index 320c146fe..bc2d64005 100644
--- a/lib/perfdata/graphitewriter.cpp
+++ b/lib/perfdata/graphitewriter.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "perfdata/graphitewriter.hpp"
-#include "perfdata/graphitewriter.tcpp"
+#include "perfdata/graphitewriter-ti.cpp"
 #include "icinga/service.hpp"
 #include "icinga/macroprocessor.hpp"
 #include "icinga/icingaapplication.hpp"
diff --git a/lib/perfdata/graphitewriter.hpp b/lib/perfdata/graphitewriter.hpp
index 05bc8bb43..86a517f96 100644
--- a/lib/perfdata/graphitewriter.hpp
+++ b/lib/perfdata/graphitewriter.hpp
@@ -20,7 +20,7 @@
 #ifndef GRAPHITEWRITER_H
 #define GRAPHITEWRITER_H
 
-#include "perfdata/graphitewriter.thpp"
+#include "perfdata/graphitewriter-ti.hpp"
 #include "icinga/service.hpp"
 #include "base/configobject.hpp"
 #include "base/tcpsocket.hpp"
diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp
index a16536474..4708d28ad 100644
--- a/lib/perfdata/influxdbwriter.cpp
+++ b/lib/perfdata/influxdbwriter.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "perfdata/influxdbwriter.hpp"
-#include "perfdata/influxdbwriter.tcpp"
+#include "perfdata/influxdbwriter-ti.cpp"
 #include "remote/url.hpp"
 #include "remote/httprequest.hpp"
 #include "remote/httpresponse.hpp"
diff --git a/lib/perfdata/influxdbwriter.hpp b/lib/perfdata/influxdbwriter.hpp
index 323d1f911..4d3e8037a 100644
--- a/lib/perfdata/influxdbwriter.hpp
+++ b/lib/perfdata/influxdbwriter.hpp
@@ -20,7 +20,7 @@
 #ifndef INFLUXDBWRITER_H
 #define INFLUXDBWRITER_H
 
-#include "perfdata/influxdbwriter.thpp"
+#include "perfdata/influxdbwriter-ti.hpp"
 #include "icinga/service.hpp"
 #include "base/configobject.hpp"
 #include "base/tcpsocket.hpp"
diff --git a/lib/perfdata/opentsdbwriter.cpp b/lib/perfdata/opentsdbwriter.cpp
index 056da7822..8d1c6ab89 100644
--- a/lib/perfdata/opentsdbwriter.cpp
+++ b/lib/perfdata/opentsdbwriter.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "perfdata/opentsdbwriter.hpp"
-#include "perfdata/opentsdbwriter.tcpp"
+#include "perfdata/opentsdbwriter-ti.cpp"
 #include "icinga/service.hpp"
 #include "icinga/macroprocessor.hpp"
 #include "icinga/icingaapplication.hpp"
diff --git a/lib/perfdata/opentsdbwriter.hpp b/lib/perfdata/opentsdbwriter.hpp
index 5862a479a..f368918e6 100644
--- a/lib/perfdata/opentsdbwriter.hpp
+++ b/lib/perfdata/opentsdbwriter.hpp
@@ -20,7 +20,7 @@
 #ifndef OPENTSDBWRITER_H
 #define OPENTSDBWRITER_H
 
-#include "perfdata/opentsdbwriter.thpp"
+#include "perfdata/opentsdbwriter-ti.hpp"
 #include "icinga/service.hpp"
 #include "base/configobject.hpp"
 #include "base/tcpsocket.hpp"
diff --git a/lib/perfdata/perfdatawriter.cpp b/lib/perfdata/perfdatawriter.cpp
index 79d0108d7..0d2f979be 100644
--- a/lib/perfdata/perfdatawriter.cpp
+++ b/lib/perfdata/perfdatawriter.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "perfdata/perfdatawriter.hpp"
-#include "perfdata/perfdatawriter.tcpp"
+#include "perfdata/perfdatawriter-ti.cpp"
 #include "icinga/service.hpp"
 #include "icinga/macroprocessor.hpp"
 #include "icinga/icingaapplication.hpp"
diff --git a/lib/perfdata/perfdatawriter.hpp b/lib/perfdata/perfdatawriter.hpp
index 098fb8454..3e0306950 100644
--- a/lib/perfdata/perfdatawriter.hpp
+++ b/lib/perfdata/perfdatawriter.hpp
@@ -20,7 +20,7 @@
 #ifndef PERFDATAWRITER_H
 #define PERFDATAWRITER_H
 
-#include "perfdata/perfdatawriter.thpp"
+#include "perfdata/perfdatawriter-ti.hpp"
 #include "icinga/service.hpp"
 #include "base/configobject.hpp"
 #include "base/timer.hpp"
diff --git a/lib/remote/CMakeLists.txt b/lib/remote/CMakeLists.txt
index 6877143a7..cf89d5538 100644
--- a/lib/remote/CMakeLists.txt
+++ b/lib/remote/CMakeLists.txt
@@ -15,10 +15,10 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-mkclass_target(apilistener.ti apilistener.tcpp apilistener.thpp)
-mkclass_target(apiuser.ti apiuser.tcpp apiuser.thpp)
-mkclass_target(endpoint.ti endpoint.tcpp endpoint.thpp)
-mkclass_target(zone.ti zone.tcpp zone.thpp)
+mkclass_target(apilistener.ti apilistener-ti.cpp apilistener-ti.hpp)
+mkclass_target(apiuser.ti apiuser-ti.cpp apiuser-ti.hpp)
+mkclass_target(endpoint.ti endpoint-ti.cpp endpoint-ti.hpp)
+mkclass_target(zone.ti zone-ti.cpp zone-ti.hpp)
 
 set(remote_SOURCES
   i2-remote.hpp
@@ -26,8 +26,8 @@ set(remote_SOURCES
   apiaction.cpp apiaction.hpp
   apiclient.cpp apiclient.hpp
   apifunction.cpp apifunction.hpp
-  apilistener.cpp apilistener.hpp apilistener.thpp apilistener-configsync.cpp apilistener-filesync.cpp
-  apiuser.cpp apiuser.hpp apiuser.thpp
+  apilistener.cpp apilistener.hpp apilistener-ti.hpp apilistener-configsync.cpp apilistener-filesync.cpp
+  apiuser.cpp apiuser.hpp apiuser-ti.hpp
   authority.cpp
   configfileshandler.cpp configfileshandler.hpp
   configobjectutility.cpp configobjectutility.hpp
@@ -37,7 +37,7 @@ set(remote_SOURCES
   consolehandler.cpp consolehandler.hpp
   createobjecthandler.cpp createobjecthandler.hpp
   deleteobjecthandler.cpp deleteobjecthandler.hpp
-  endpoint.cpp endpoint.hpp endpoint.thpp
+  endpoint.cpp endpoint.hpp endpoint-ti.hpp
   eventqueue.cpp eventqueue.hpp
   eventshandler.cpp eventshandler.hpp
   filterutility.cpp filterutility.hpp
@@ -60,7 +60,7 @@ set(remote_SOURCES
   typequeryhandler.cpp typequeryhandler.hpp
   url.cpp url.hpp url-characters.hpp
   variablequeryhandler.cpp variablequeryhandler.hpp
-  zone.cpp zone.hpp zone.thpp
+  zone.cpp zone.hpp zone-ti.hpp
 )
 
 if(ICINGA2_UNITY_BUILD)
diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index 527036e0a..251aff791 100644
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "remote/apilistener.hpp"
-#include "remote/apilistener.tcpp"
+#include "remote/apilistener-ti.cpp"
 #include "remote/jsonrpcconnection.hpp"
 #include "remote/endpoint.hpp"
 #include "remote/jsonrpc.hpp"
diff --git a/lib/remote/apilistener.hpp b/lib/remote/apilistener.hpp
index ecd1b38cb..eb195f5b5 100644
--- a/lib/remote/apilistener.hpp
+++ b/lib/remote/apilistener.hpp
@@ -20,7 +20,7 @@
 #ifndef APILISTENER_H
 #define APILISTENER_H
 
-#include "remote/apilistener.thpp"
+#include "remote/apilistener-ti.hpp"
 #include "remote/jsonrpcconnection.hpp"
 #include "remote/httpserverconnection.hpp"
 #include "remote/endpoint.hpp"
diff --git a/lib/remote/apiuser.cpp b/lib/remote/apiuser.cpp
index e2c7960e4..183291af3 100644
--- a/lib/remote/apiuser.cpp
+++ b/lib/remote/apiuser.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "remote/apiuser.hpp"
-#include "remote/apiuser.tcpp"
+#include "remote/apiuser-ti.cpp"
 #include "base/configtype.hpp"
 
 using namespace icinga;
diff --git a/lib/remote/apiuser.hpp b/lib/remote/apiuser.hpp
index 1a8f8b661..755273bf4 100644
--- a/lib/remote/apiuser.hpp
+++ b/lib/remote/apiuser.hpp
@@ -21,7 +21,7 @@
 #define APIUSER_H
 
 #include "remote/i2-remote.hpp"
-#include "remote/apiuser.thpp"
+#include "remote/apiuser-ti.hpp"
 
 namespace icinga
 {
diff --git a/lib/remote/endpoint.cpp b/lib/remote/endpoint.cpp
index a354edbf0..2b2fb655b 100644
--- a/lib/remote/endpoint.cpp
+++ b/lib/remote/endpoint.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "remote/endpoint.hpp"
-#include "remote/endpoint.tcpp"
+#include "remote/endpoint-ti.cpp"
 #include "remote/apilistener.hpp"
 #include "remote/jsonrpcconnection.hpp"
 #include "remote/zone.hpp"
diff --git a/lib/remote/endpoint.hpp b/lib/remote/endpoint.hpp
index 254492ebc..41aea0270 100644
--- a/lib/remote/endpoint.hpp
+++ b/lib/remote/endpoint.hpp
@@ -21,7 +21,7 @@
 #define ENDPOINT_H
 
 #include "remote/i2-remote.hpp"
-#include "remote/endpoint.thpp"
+#include "remote/endpoint-ti.hpp"
 #include "base/ringbuffer.hpp"
 #include <set>
 
diff --git a/lib/remote/zone.cpp b/lib/remote/zone.cpp
index acfff3c5a..ea6e007bd 100644
--- a/lib/remote/zone.cpp
+++ b/lib/remote/zone.cpp
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 #include "remote/zone.hpp"
-#include "remote/zone.tcpp"
+#include "remote/zone-ti.cpp"
 #include "remote/jsonrpcconnection.hpp"
 #include "base/objectlock.hpp"
 #include "base/logger.hpp"
diff --git a/lib/remote/zone.hpp b/lib/remote/zone.hpp
index 158847de6..6193dc026 100644
--- a/lib/remote/zone.hpp
+++ b/lib/remote/zone.hpp
@@ -21,7 +21,7 @@
 #define ZONE_H
 
 #include "remote/i2-remote.hpp"
-#include "remote/zone.thpp"
+#include "remote/zone-ti.hpp"
 #include "remote/endpoint.hpp"
 
 namespace icinga