diff --git a/components/checker/CMakeLists.txt b/components/checker/CMakeLists.txt
index 33761dc98..1790ecc31 100644
--- a/components/checker/CMakeLists.txt
+++ b/components/checker/CMakeLists.txt
@@ -15,11 +15,11 @@
 # 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.th)
+mkclass_target(checkercomponent.ti checkercomponent.thpp)
 
 mkembedconfig_target(checker-type.conf checker-type.cpp)
 
-add_library(checker SHARED checkercomponent.cpp checkercomponent.th checker-type.cpp)
+add_library(checker SHARED checkercomponent.cpp checkercomponent.thpp checker-type.cpp)
 
 target_link_libraries(checker ${Boost_LIBRARIES} base config icinga remote)
 
diff --git a/components/checker/checkercomponent.cpp b/components/checker/checkercomponent.cpp
index 4bdf63928..c252fcf8f 100644
--- a/components/checker/checkercomponent.cpp
+++ b/components/checker/checkercomponent.cpp
@@ -17,17 +17,17 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "checker/checkercomponent.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/cib.h"
-#include "remote/apilistener.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/convert.h"
-#include "base/statsfunction.h"
+#include "checker/checkercomponent.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/cib.hpp"
+#include "remote/apilistener.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/convert.hpp"
+#include "base/statsfunction.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/components/checker/checkercomponent.h b/components/checker/checkercomponent.hpp
similarity index 95%
rename from components/checker/checkercomponent.h
rename to components/checker/checkercomponent.hpp
index dad34ab8b..7ed8b0745 100644
--- a/components/checker/checkercomponent.h
+++ b/components/checker/checkercomponent.hpp
@@ -20,11 +20,11 @@
 #ifndef CHECKERCOMPONENT_H
 #define CHECKERCOMPONENT_H
 
-#include "checker/checkercomponent.th"
-#include "icinga/service.h"
-#include "base/dynamicobject.h"
-#include "base/timer.h"
-#include "base/utility.h"
+#include "checker/checkercomponent.thpp"
+#include "icinga/service.hpp"
+#include "base/dynamicobject.hpp"
+#include "base/timer.hpp"
+#include "base/utility.hpp"
 #include <boost/thread/thread.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition_variable.hpp>
diff --git a/components/checker/checkercomponent.ti b/components/checker/checkercomponent.ti
index 38d38bd31..a65b963ed 100644
--- a/components/checker/checkercomponent.ti
+++ b/components/checker/checkercomponent.ti
@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/components/compat/CMakeLists.txt b/components/compat/CMakeLists.txt
index 6c69f0ee9..9e555ea61 100644
--- a/components/compat/CMakeLists.txt
+++ b/components/compat/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(checkresultreader.ti checkresultreader.th)
-mkclass_target(compatlogger.ti compatlogger.th)
-mkclass_target(externalcommandlistener.ti externalcommandlistener.th)
-mkclass_target(statusdatawriter.ti statusdatawriter.th)
+mkclass_target(checkresultreader.ti checkresultreader.thpp)
+mkclass_target(compatlogger.ti compatlogger.thpp)
+mkclass_target(externalcommandlistener.ti externalcommandlistener.thpp)
+mkclass_target(statusdatawriter.ti statusdatawriter.thpp)
 
 mkembedconfig_target(compat-type.conf compat-type.cpp)
 
-add_library(compat SHARED checkresultreader.cpp checkresultreader.th compatlogger.cpp compatlogger.th externalcommandlistener.cpp externalcommandlistener.th statusdatawriter.cpp statusdatawriter.th compat-type.cpp)
+add_library(compat SHARED checkresultreader.cpp checkresultreader.thpp compatlogger.cpp compatlogger.thpp externalcommandlistener.cpp externalcommandlistener.thpp statusdatawriter.cpp statusdatawriter.thpp compat-type.cpp)
 
 target_link_libraries(compat ${Boost_LIBRARIES} base config icinga)
 
diff --git a/components/compat/checkresultreader.cpp b/components/compat/checkresultreader.cpp
index 10eda7e3f..095b9b8dc 100644
--- a/components/compat/checkresultreader.cpp
+++ b/components/compat/checkresultreader.cpp
@@ -17,19 +17,19 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "compat/checkresultreader.h"
-#include "icinga/service.h"
-#include "icinga/pluginutility.h"
-#include "icinga/icingaapplication.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/convert.h"
-#include "base/application.h"
-#include "base/utility.h"
-#include "base/exception.h"
-#include "base/context.h"
-#include "base/statsfunction.h"
+#include "compat/checkresultreader.hpp"
+#include "icinga/service.hpp"
+#include "icinga/pluginutility.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/convert.hpp"
+#include "base/application.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
+#include "base/context.hpp"
+#include "base/statsfunction.hpp"
 #include <fstream>
 
 using namespace icinga;
diff --git a/components/compat/checkresultreader.h b/components/compat/checkresultreader.hpp
similarity index 96%
rename from components/compat/checkresultreader.h
rename to components/compat/checkresultreader.hpp
index 4b0adb973..83799794d 100644
--- a/components/compat/checkresultreader.h
+++ b/components/compat/checkresultreader.hpp
@@ -20,8 +20,8 @@
 #ifndef CHECKRESULTREADER_H
 #define CHECKRESULTREADER_H
 
-#include "compat/checkresultreader.th"
-#include "base/timer.h"
+#include "compat/checkresultreader.thpp"
+#include "base/timer.hpp"
 #include <fstream>
 
 namespace icinga
diff --git a/components/compat/checkresultreader.ti b/components/compat/checkresultreader.ti
index 6daee2df3..34ee62eca 100644
--- a/components/compat/checkresultreader.ti
+++ b/components/compat/checkresultreader.ti
@@ -1,5 +1,5 @@
-#include "base/dynamicobject.h"
-#include "base/application.h"
+#include "base/dynamicobject.hpp"
+#include "base/application.hpp"
 
 namespace icinga
 {
diff --git a/components/compat/compatlogger.cpp b/components/compat/compatlogger.cpp
index f5b3f73e5..d610af96e 100644
--- a/components/compat/compatlogger.cpp
+++ b/components/compat/compatlogger.cpp
@@ -17,24 +17,24 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "compat/compatlogger.h"
-#include "icinga/service.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/notification.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/externalcommandprocessor.h"
-#include "icinga/compatutility.h"
-#include "config/configcompilercontext.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/convert.h"
-#include "base/application.h"
-#include "base/utility.h"
-#include "base/scriptfunction.h"
-#include "base/statsfunction.h"
+#include "compat/compatlogger.hpp"
+#include "icinga/service.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/notification.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/externalcommandprocessor.hpp"
+#include "icinga/compatutility.hpp"
+#include "config/configcompilercontext.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/convert.hpp"
+#include "base/application.hpp"
+#include "base/utility.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/statsfunction.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 
diff --git a/components/compat/compatlogger.h b/components/compat/compatlogger.hpp
similarity index 97%
rename from components/compat/compatlogger.h
rename to components/compat/compatlogger.hpp
index 4311b4f60..05081b1c1 100644
--- a/components/compat/compatlogger.h
+++ b/components/compat/compatlogger.hpp
@@ -20,9 +20,9 @@
 #ifndef COMPATLOGGER_H
 #define COMPATLOGGER_H
 
-#include "compat/compatlogger.th"
-#include "icinga/service.h"
-#include "base/timer.h"
+#include "compat/compatlogger.thpp"
+#include "icinga/service.hpp"
+#include "base/timer.hpp"
 #include <fstream>
 
 namespace icinga
diff --git a/components/compat/compatlogger.ti b/components/compat/compatlogger.ti
index 957ec3f3c..ef94df27d 100644
--- a/components/compat/compatlogger.ti
+++ b/components/compat/compatlogger.ti
@@ -1,5 +1,5 @@
-#include "base/dynamicobject.h"
-#include "base/application.h"
+#include "base/dynamicobject.hpp"
+#include "base/application.hpp"
 
 namespace icinga
 {
diff --git a/components/compat/externalcommandlistener.cpp b/components/compat/externalcommandlistener.cpp
index c1c625321..8308281b1 100644
--- a/components/compat/externalcommandlistener.cpp
+++ b/components/compat/externalcommandlistener.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "compat/externalcommandlistener.h"
-#include "icinga/externalcommandprocessor.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/application.h"
-#include "base/statsfunction.h"
+#include "compat/externalcommandlistener.hpp"
+#include "icinga/externalcommandprocessor.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/application.hpp"
+#include "base/statsfunction.hpp"
 
 using namespace icinga;
 
diff --git a/components/compat/externalcommandlistener.h b/components/compat/externalcommandlistener.hpp
similarity index 94%
rename from components/compat/externalcommandlistener.h
rename to components/compat/externalcommandlistener.hpp
index ba3f07ec6..665b0272a 100644
--- a/components/compat/externalcommandlistener.h
+++ b/components/compat/externalcommandlistener.hpp
@@ -20,10 +20,10 @@
 #ifndef EXTERNALCOMMANDLISTENER_H
 #define EXTERNALCOMMANDLISTENER_H
 
-#include "compat/externalcommandlistener.th"
-#include "base/objectlock.h"
-#include "base/timer.h"
-#include "base/utility.h"
+#include "compat/externalcommandlistener.thpp"
+#include "base/objectlock.hpp"
+#include "base/timer.hpp"
+#include "base/utility.hpp"
 #include <boost/thread/thread.hpp>
 #include <iostream>
 
diff --git a/components/compat/externalcommandlistener.ti b/components/compat/externalcommandlistener.ti
index 70f9fd051..7ef94e73c 100644
--- a/components/compat/externalcommandlistener.ti
+++ b/components/compat/externalcommandlistener.ti
@@ -1,5 +1,5 @@
-#include "base/dynamicobject.h"
-#include "base/application.h"
+#include "base/dynamicobject.hpp"
+#include "base/application.hpp"
 
 namespace icinga
 {
diff --git a/components/compat/statusdatawriter.cpp b/components/compat/statusdatawriter.cpp
index 5fe3b3350..92e21fbde 100644
--- a/components/compat/statusdatawriter.cpp
+++ b/components/compat/statusdatawriter.cpp
@@ -17,25 +17,25 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "compat/statusdatawriter.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/cib.h"
-#include "icinga/hostgroup.h"
-#include "icinga/servicegroup.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/timeperiod.h"
-#include "icinga/notificationcommand.h"
-#include "icinga/compatutility.h"
-#include "icinga/dependency.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/application.h"
-#include "base/context.h"
-#include "base/statsfunction.h"
+#include "compat/statusdatawriter.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/cib.hpp"
+#include "icinga/hostgroup.hpp"
+#include "icinga/servicegroup.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/timeperiod.hpp"
+#include "icinga/notificationcommand.hpp"
+#include "icinga/compatutility.hpp"
+#include "icinga/dependency.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/application.hpp"
+#include "base/context.hpp"
+#include "base/statsfunction.hpp"
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/algorithm/string.hpp>
diff --git a/components/compat/statusdatawriter.h b/components/compat/statusdatawriter.hpp
similarity index 91%
rename from components/compat/statusdatawriter.h
rename to components/compat/statusdatawriter.hpp
index 4f179a016..9c8125bff 100644
--- a/components/compat/statusdatawriter.h
+++ b/components/compat/statusdatawriter.hpp
@@ -20,15 +20,15 @@
 #ifndef STATUSDATAWRITER_H
 #define STATUSDATAWRITER_H
 
-#include "compat/statusdatawriter.th"
-#include "icinga/customvarobject.h"
-#include "icinga/host.h"
-#include "icinga/service.h"
-#include "icinga/command.h"
-#include "icinga/compatutility.h"
-#include "base/objectlock.h"
-#include "base/timer.h"
-#include "base/utility.h"
+#include "compat/statusdatawriter.thpp"
+#include "icinga/customvarobject.hpp"
+#include "icinga/host.hpp"
+#include "icinga/service.hpp"
+#include "icinga/command.hpp"
+#include "icinga/compatutility.hpp"
+#include "base/objectlock.hpp"
+#include "base/timer.hpp"
+#include "base/utility.hpp"
 #include <boost/thread/thread.hpp>
 #include <iostream>
 
diff --git a/components/compat/statusdatawriter.ti b/components/compat/statusdatawriter.ti
index 2feee09eb..109068c92 100644
--- a/components/compat/statusdatawriter.ti
+++ b/components/compat/statusdatawriter.ti
@@ -1,5 +1,5 @@
-#include "base/dynamicobject.h"
-#include "base/application.h"
+#include "base/dynamicobject.hpp"
+#include "base/application.hpp"
 
 namespace icinga
 {
diff --git a/components/db_ido_mysql/CMakeLists.txt b/components/db_ido_mysql/CMakeLists.txt
index d048e707e..26687abc9 100644
--- a/components/db_ido_mysql/CMakeLists.txt
+++ b/components/db_ido_mysql/CMakeLists.txt
@@ -18,11 +18,11 @@
 find_package(MYSQL)
 
 if(MYSQL_FOUND)
-    mkclass_target(idomysqlconnection.ti idomysqlconnection.th)
+    mkclass_target(idomysqlconnection.ti idomysqlconnection.thpp)
 
     mkembedconfig_target(db_ido_mysql-type.conf db_ido_mysql-type.cpp)
 
-    add_library(db_ido_mysql SHARED idomysqlconnection.cpp idomysqlconnection.th db_ido_mysql-type.cpp)
+    add_library(db_ido_mysql SHARED idomysqlconnection.cpp idomysqlconnection.thpp db_ido_mysql-type.cpp)
 
     include_directories(${MYSQL_INCLUDE_DIR})
     target_link_libraries(db_ido_mysql ${Boost_LIBRARIES} ${MYSQL_LIBRARIES} base config icinga db_ido)
diff --git a/components/db_ido_mysql/idomysqlconnection.cpp b/components/db_ido_mysql/idomysqlconnection.cpp
index 7b3b18e90..b5e4009b9 100644
--- a/components/db_ido_mysql/idomysqlconnection.cpp
+++ b/components/db_ido_mysql/idomysqlconnection.cpp
@@ -17,17 +17,17 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/logger_fwd.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/application.h"
-#include "base/dynamictype.h"
-#include "base/exception.h"
-#include "base/statsfunction.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "db_ido_mysql/idomysqlconnection.h"
+#include "base/logger_fwd.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/application.hpp"
+#include "base/dynamictype.hpp"
+#include "base/exception.hpp"
+#include "base/statsfunction.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "db_ido_mysql/idomysqlconnection.hpp"
 #include <boost/tuple/tuple.hpp>
 #include <boost/foreach.hpp>
 
diff --git a/components/db_ido_mysql/idomysqlconnection.h b/components/db_ido_mysql/idomysqlconnection.hpp
similarity index 96%
rename from components/db_ido_mysql/idomysqlconnection.h
rename to components/db_ido_mysql/idomysqlconnection.hpp
index 26c03974c..7a784a817 100644
--- a/components/db_ido_mysql/idomysqlconnection.h
+++ b/components/db_ido_mysql/idomysqlconnection.hpp
@@ -20,10 +20,10 @@
 #ifndef IDOMYSQLCONNECTION_H
 #define IDOMYSQLCONNECTION_H
 
-#include "db_ido_mysql/idomysqlconnection.th"
-#include "base/array.h"
-#include "base/timer.h"
-#include "base/workqueue.h"
+#include "db_ido_mysql/idomysqlconnection.thpp"
+#include "base/array.hpp"
+#include "base/timer.hpp"
+#include "base/workqueue.hpp"
 #include <mysql.h>
 
 namespace icinga
diff --git a/components/db_ido_mysql/idomysqlconnection.ti b/components/db_ido_mysql/idomysqlconnection.ti
index d84f6e329..97b9490a8 100644
--- a/components/db_ido_mysql/idomysqlconnection.ti
+++ b/components/db_ido_mysql/idomysqlconnection.ti
@@ -1,4 +1,4 @@
-#include "db_ido/dbconnection.h"
+#include "db_ido/dbconnection.hpp"
 
 namespace icinga
 {
diff --git a/components/db_ido_pgsql/CMakeLists.txt b/components/db_ido_pgsql/CMakeLists.txt
index 94e7f90a5..2e50daa51 100644
--- a/components/db_ido_pgsql/CMakeLists.txt
+++ b/components/db_ido_pgsql/CMakeLists.txt
@@ -18,14 +18,14 @@
 find_package(PostgreSQL)
 
 if(PostgreSQL_FOUND)
-    mkclass_target(idopgsqlconnection.ti idopgsqlconnection.th)
+    mkclass_target(idopgsqlconnection.ti idopgsqlconnection.thpp)
 
     mkembedconfig_target(db_ido_pgsql-type.conf db_ido_pgsql-type.cpp)
 
     link_directories(${PostgreSQL_LIBRARY_DIRS})
     include_directories(${PostgreSQL_INCLUDE_DIRS})
 
-    add_library(db_ido_pgsql SHARED idopgsqlconnection.cpp idopgsqlconnection.th db_ido_pgsql-type.cpp)
+    add_library(db_ido_pgsql SHARED idopgsqlconnection.cpp idopgsqlconnection.thpp db_ido_pgsql-type.cpp)
 
     target_link_libraries(db_ido_pgsql ${Boost_LIBRARIES} ${PostgreSQL_LIBRARIES} base config icinga db_ido)
 
diff --git a/components/db_ido_pgsql/idopgsqlconnection.cpp b/components/db_ido_pgsql/idopgsqlconnection.cpp
index 064772d05..d55693f29 100644
--- a/components/db_ido_pgsql/idopgsqlconnection.cpp
+++ b/components/db_ido_pgsql/idopgsqlconnection.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/logger_fwd.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/application.h"
-#include "base/dynamictype.h"
-#include "base/exception.h"
-#include "base/context.h"
-#include "base/statsfunction.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "db_ido_pgsql/idopgsqlconnection.h"
+#include "base/logger_fwd.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/application.hpp"
+#include "base/dynamictype.hpp"
+#include "base/exception.hpp"
+#include "base/context.hpp"
+#include "base/statsfunction.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "db_ido_pgsql/idopgsqlconnection.hpp"
 #include <boost/tuple/tuple.hpp>
 #include <boost/foreach.hpp>
 
diff --git a/components/db_ido_pgsql/idopgsqlconnection.h b/components/db_ido_pgsql/idopgsqlconnection.hpp
similarity index 96%
rename from components/db_ido_pgsql/idopgsqlconnection.h
rename to components/db_ido_pgsql/idopgsqlconnection.hpp
index e0459d4cc..d1951d0f5 100644
--- a/components/db_ido_pgsql/idopgsqlconnection.h
+++ b/components/db_ido_pgsql/idopgsqlconnection.hpp
@@ -20,10 +20,10 @@
 #ifndef IDOPGSQLCONNECTION_H
 #define IDOPGSQLCONNECTION_H
 
-#include "db_ido_pgsql/idopgsqlconnection.th"
-#include "base/array.h"
-#include "base/timer.h"
-#include "base/workqueue.h"
+#include "db_ido_pgsql/idopgsqlconnection.thpp"
+#include "base/array.hpp"
+#include "base/timer.hpp"
+#include "base/workqueue.hpp"
 #include <libpq-fe.h>
 
 namespace icinga
diff --git a/components/db_ido_pgsql/idopgsqlconnection.ti b/components/db_ido_pgsql/idopgsqlconnection.ti
index 39f600945..46c9131b1 100644
--- a/components/db_ido_pgsql/idopgsqlconnection.ti
+++ b/components/db_ido_pgsql/idopgsqlconnection.ti
@@ -1,4 +1,4 @@
-#include "db_ido/dbconnection.h"
+#include "db_ido/dbconnection.hpp"
 
 namespace icinga
 {
diff --git a/components/demo/CMakeLists.txt b/components/demo/CMakeLists.txt
index d31377efa..5bd7b94f3 100644
--- a/components/demo/CMakeLists.txt
+++ b/components/demo/CMakeLists.txt
@@ -15,11 +15,11 @@
 # 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(demo.ti demo.th)
+mkclass_target(demo.ti demo.thpp)
 
 mkembedconfig_target(demo-type.conf demo-type.cpp)
 
-add_library(demo SHARED demo.cpp demo.th demo-type.cpp)
+add_library(demo SHARED demo.cpp demo.thpp demo-type.cpp)
 
 target_link_libraries(demo ${Boost_LIBRARIES} base config icinga remote)
 
diff --git a/components/demo/demo.cpp b/components/demo/demo.cpp
index 04f950e4f..d1f298624 100644
--- a/components/demo/demo.cpp
+++ b/components/demo/demo.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "demo/demo.h"
-#include "remote/apilistener.h"
-#include "remote/apifunction.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
+#include "demo/demo.hpp"
+#include "remote/apilistener.hpp"
+#include "remote/apifunction.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
 
 using namespace icinga;
 
diff --git a/components/demo/demo.h b/components/demo/demo.hpp
similarity index 95%
rename from components/demo/demo.h
rename to components/demo/demo.hpp
index f70e3f23e..7f4762e69 100644
--- a/components/demo/demo.h
+++ b/components/demo/demo.hpp
@@ -20,9 +20,9 @@
 #ifndef DEMO_H
 #define DEMO_H
 
-#include "demo/demo.th"
-#include "remote/messageorigin.h"
-#include "base/timer.h"
+#include "demo/demo.thpp"
+#include "remote/messageorigin.hpp"
+#include "base/timer.hpp"
 
 namespace icinga
 {
diff --git a/components/demo/demo.ti b/components/demo/demo.ti
index 71e14d487..623a09257 100644
--- a/components/demo/demo.ti
+++ b/components/demo/demo.ti
@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/components/livestatus/CMakeLists.txt b/components/livestatus/CMakeLists.txt
index e48b33103..f706a4356 100644
--- a/components/livestatus/CMakeLists.txt
+++ b/components/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(listener.ti listener.th)
+mkclass_target(listener.ti listener.thpp)
 
 mkembedconfig_target(livestatus-type.conf livestatus-type.cpp)
 
@@ -24,7 +24,7 @@ add_library(livestatus SHARED aggregator.cpp andfilter.cpp attributefilter.cpp
   commentstable.cpp contactgroupstable.cpp contactstable.cpp countaggregator.cpp
   downtimestable.cpp endpointstable.cpp filter.cpp historytable.cpp
   hostgroupstable.cpp hoststable.cpp invavgaggregator.cpp invsumaggregator.cpp
-  listener.cpp listener.th logutility.cpp logtable.cpp maxaggregator.cpp
+  listener.cpp listener.thpp logutility.cpp logtable.cpp maxaggregator.cpp
   minaggregator.cpp negatefilter.cpp orfilter.cpp query.cpp
   servicegroupstable.cpp servicestable.cpp statehisttable.cpp
   statustable.cpp stdaggregator.cpp sumaggregator.cpp table.cpp
diff --git a/components/livestatus/aggregator.cpp b/components/livestatus/aggregator.cpp
index 60a0dfa7b..c6021f1c6 100644
--- a/components/livestatus/aggregator.cpp
+++ b/components/livestatus/aggregator.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/aggregator.h"
+#include "livestatus/aggregator.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/aggregator.h b/components/livestatus/aggregator.hpp
similarity index 96%
rename from components/livestatus/aggregator.h
rename to components/livestatus/aggregator.hpp
index a1f4021c7..7c933b824 100644
--- a/components/livestatus/aggregator.h
+++ b/components/livestatus/aggregator.hpp
@@ -20,8 +20,8 @@
 #ifndef AGGREGATOR_H
 #define AGGREGATOR_H
 
-#include "livestatus/table.h"
-#include "livestatus/filter.h"
+#include "livestatus/table.hpp"
+#include "livestatus/filter.hpp"
 
 namespace icinga
 {
diff --git a/components/livestatus/andfilter.cpp b/components/livestatus/andfilter.cpp
index 955864672..4b654edde 100644
--- a/components/livestatus/andfilter.cpp
+++ b/components/livestatus/andfilter.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/andfilter.h"
+#include "livestatus/andfilter.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/components/livestatus/andfilter.h b/components/livestatus/andfilter.hpp
similarity index 97%
rename from components/livestatus/andfilter.h
rename to components/livestatus/andfilter.hpp
index 10c03f985..5b8a6b76f 100644
--- a/components/livestatus/andfilter.h
+++ b/components/livestatus/andfilter.hpp
@@ -20,7 +20,7 @@
 #ifndef ANDFILTER_H
 #define ANDFILTER_H
 
-#include "livestatus/combinerfilter.h"
+#include "livestatus/combinerfilter.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/attributefilter.cpp b/components/livestatus/attributefilter.cpp
index 5c2790d4a..03ace091b 100644
--- a/components/livestatus/attributefilter.cpp
+++ b/components/livestatus/attributefilter.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/attributefilter.h"
-#include "base/convert.h"
-#include "base/array.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
+#include "livestatus/attributefilter.hpp"
+#include "base/convert.hpp"
+#include "base/array.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 #include <boost/regex.hpp>
 
diff --git a/components/livestatus/attributefilter.h b/components/livestatus/attributefilter.hpp
similarity index 98%
rename from components/livestatus/attributefilter.h
rename to components/livestatus/attributefilter.hpp
index 42670a2e6..43d750bb3 100644
--- a/components/livestatus/attributefilter.h
+++ b/components/livestatus/attributefilter.hpp
@@ -20,7 +20,7 @@
 #ifndef ATTRIBUTEFILTER_H
 #define ATTRIBUTEFILTER_H
 
-#include "livestatus/filter.h"
+#include "livestatus/filter.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/avgaggregator.cpp b/components/livestatus/avgaggregator.cpp
index 7737204dc..295460ce0 100644
--- a/components/livestatus/avgaggregator.cpp
+++ b/components/livestatus/avgaggregator.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/avgaggregator.h"
+#include "livestatus/avgaggregator.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/avgaggregator.h b/components/livestatus/avgaggregator.hpp
similarity index 96%
rename from components/livestatus/avgaggregator.h
rename to components/livestatus/avgaggregator.hpp
index d6e788914..851a01796 100644
--- a/components/livestatus/avgaggregator.h
+++ b/components/livestatus/avgaggregator.hpp
@@ -20,8 +20,8 @@
 #ifndef AVGAGGREGATOR_H
 #define AVGAGGREGATOR_H
 
-#include "livestatus/table.h"
-#include "livestatus/aggregator.h"
+#include "livestatus/table.hpp"
+#include "livestatus/aggregator.hpp"
 
 namespace icinga
 {
diff --git a/components/livestatus/column.cpp b/components/livestatus/column.cpp
index 18c9d14f5..0a4845663 100644
--- a/components/livestatus/column.cpp
+++ b/components/livestatus/column.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/column.h"
+#include "livestatus/column.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/column.h b/components/livestatus/column.hpp
similarity index 98%
rename from components/livestatus/column.h
rename to components/livestatus/column.hpp
index aafb2143e..6bd3a814e 100644
--- a/components/livestatus/column.h
+++ b/components/livestatus/column.hpp
@@ -20,7 +20,7 @@
 #ifndef COLUMN_H
 #define COLUMN_H
 
-#include "base/value.h"
+#include "base/value.hpp"
 #include <boost/function.hpp>
 
 using namespace icinga;
diff --git a/components/livestatus/combinerfilter.cpp b/components/livestatus/combinerfilter.cpp
index 3755d699b..61b416120 100644
--- a/components/livestatus/combinerfilter.cpp
+++ b/components/livestatus/combinerfilter.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/combinerfilter.h"
+#include "livestatus/combinerfilter.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/combinerfilter.h b/components/livestatus/combinerfilter.hpp
similarity index 98%
rename from components/livestatus/combinerfilter.h
rename to components/livestatus/combinerfilter.hpp
index 52f791fb8..d962c36f2 100644
--- a/components/livestatus/combinerfilter.h
+++ b/components/livestatus/combinerfilter.hpp
@@ -20,7 +20,7 @@
 #ifndef COMBINERFILTER_H
 #define COMBINERFILTER_H
 
-#include "livestatus/filter.h"
+#include "livestatus/filter.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/commandstable.cpp b/components/livestatus/commandstable.cpp
index 459155e81..4a9ba851b 100644
--- a/components/livestatus/commandstable.cpp
+++ b/components/livestatus/commandstable.cpp
@@ -17,15 +17,15 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/commandstable.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/notificationcommand.h"
-#include "icinga/compatutility.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
+#include "livestatus/commandstable.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/notificationcommand.hpp"
+#include "icinga/compatutility.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/replace.hpp>
 
diff --git a/components/livestatus/commandstable.h b/components/livestatus/commandstable.hpp
similarity index 98%
rename from components/livestatus/commandstable.h
rename to components/livestatus/commandstable.hpp
index f31643baf..b4f4d0930 100644
--- a/components/livestatus/commandstable.h
+++ b/components/livestatus/commandstable.hpp
@@ -20,7 +20,7 @@
 #ifndef COMMANDSTABLE_H
 #define COMMANDSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/commentstable.cpp b/components/livestatus/commentstable.cpp
index 5ad4899e0..eaa89e8ee 100644
--- a/components/livestatus/commentstable.cpp
+++ b/components/livestatus/commentstable.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/commentstable.h"
-#include "livestatus/servicestable.h"
-#include "icinga/service.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
+#include "livestatus/commentstable.hpp"
+#include "livestatus/servicestable.hpp"
+#include "icinga/service.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
 #include <boost/tuple/tuple.hpp>
 #include <boost/foreach.hpp>
 
diff --git a/components/livestatus/commentstable.h b/components/livestatus/commentstable.hpp
similarity index 98%
rename from components/livestatus/commentstable.h
rename to components/livestatus/commentstable.hpp
index 309729f2d..3d2a9126f 100644
--- a/components/livestatus/commentstable.h
+++ b/components/livestatus/commentstable.hpp
@@ -20,7 +20,7 @@
 #ifndef COMMENTSTABLE_H
 #define COMMENTSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/contactgroupstable.cpp b/components/livestatus/contactgroupstable.cpp
index 374b7a8c3..51cc8c052 100644
--- a/components/livestatus/contactgroupstable.cpp
+++ b/components/livestatus/contactgroupstable.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/contactgroupstable.h"
-#include "icinga/usergroup.h"
-#include "base/dynamictype.h"
+#include "livestatus/contactgroupstable.hpp"
+#include "icinga/usergroup.hpp"
+#include "base/dynamictype.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/components/livestatus/contactgroupstable.h b/components/livestatus/contactgroupstable.hpp
similarity index 98%
rename from components/livestatus/contactgroupstable.h
rename to components/livestatus/contactgroupstable.hpp
index 98ab4302c..1e2334e53 100644
--- a/components/livestatus/contactgroupstable.h
+++ b/components/livestatus/contactgroupstable.hpp
@@ -20,7 +20,7 @@
 #ifndef CONTACTGROUPSTABLE_H
 #define CONTACTGROUPSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/contactstable.cpp b/components/livestatus/contactstable.cpp
index c8cf3e2ec..1c42f98a0 100644
--- a/components/livestatus/contactstable.cpp
+++ b/components/livestatus/contactstable.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/contactstable.h"
-#include "icinga/user.h"
-#include "icinga/timeperiod.h"
-#include "icinga/compatutility.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
+#include "livestatus/contactstable.hpp"
+#include "icinga/user.hpp"
+#include "icinga/timeperiod.hpp"
+#include "icinga/compatutility.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 
diff --git a/components/livestatus/contactstable.h b/components/livestatus/contactstable.hpp
similarity index 98%
rename from components/livestatus/contactstable.h
rename to components/livestatus/contactstable.hpp
index f96e1c5bf..3076d93e4 100644
--- a/components/livestatus/contactstable.h
+++ b/components/livestatus/contactstable.hpp
@@ -20,7 +20,7 @@
 #ifndef CONTACTSTABLE_H
 #define CONTACTSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/countaggregator.cpp b/components/livestatus/countaggregator.cpp
index e33886758..e28bd1fe5 100644
--- a/components/livestatus/countaggregator.cpp
+++ b/components/livestatus/countaggregator.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/countaggregator.h"
+#include "livestatus/countaggregator.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/countaggregator.h b/components/livestatus/countaggregator.hpp
similarity index 96%
rename from components/livestatus/countaggregator.h
rename to components/livestatus/countaggregator.hpp
index 003e19b84..61860962e 100644
--- a/components/livestatus/countaggregator.h
+++ b/components/livestatus/countaggregator.hpp
@@ -20,8 +20,8 @@
 #ifndef COUNTAGGREGATOR_H
 #define COUNTAGGREGATOR_H
 
-#include "livestatus/table.h"
-#include "livestatus/aggregator.h"
+#include "livestatus/table.hpp"
+#include "livestatus/aggregator.hpp"
 
 namespace icinga
 {
diff --git a/components/livestatus/downtimestable.cpp b/components/livestatus/downtimestable.cpp
index ccb01deca..8f259a44f 100644
--- a/components/livestatus/downtimestable.cpp
+++ b/components/livestatus/downtimestable.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/downtimestable.h"
-#include "livestatus/servicestable.h"
-#include "icinga/service.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
+#include "livestatus/downtimestable.hpp"
+#include "livestatus/servicestable.hpp"
+#include "icinga/service.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
 #include <boost/tuple/tuple.hpp>
 #include <boost/foreach.hpp>
 
diff --git a/components/livestatus/downtimestable.h b/components/livestatus/downtimestable.hpp
similarity index 98%
rename from components/livestatus/downtimestable.h
rename to components/livestatus/downtimestable.hpp
index cf0ddc822..38a1f8695 100644
--- a/components/livestatus/downtimestable.h
+++ b/components/livestatus/downtimestable.hpp
@@ -20,7 +20,7 @@
 #ifndef DOWNTIMESTABLE_H
 #define DOWNTIMESTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/endpointstable.cpp b/components/livestatus/endpointstable.cpp
index 74d7990e5..21258d7b8 100644
--- a/components/livestatus/endpointstable.cpp
+++ b/components/livestatus/endpointstable.cpp
@@ -17,15 +17,15 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/endpointstable.h"
-#include "icinga/host.h"
-#include "icinga/service.h"
-#include "icinga/icingaapplication.h"
-#include "remote/endpoint.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/utility.h"
+#include "livestatus/endpointstable.hpp"
+#include "icinga/host.hpp"
+#include "icinga/service.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "remote/endpoint.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
diff --git a/components/livestatus/endpointstable.h b/components/livestatus/endpointstable.hpp
similarity index 98%
rename from components/livestatus/endpointstable.h
rename to components/livestatus/endpointstable.hpp
index 8e2f50cb6..fa2ca2b73 100644
--- a/components/livestatus/endpointstable.h
+++ b/components/livestatus/endpointstable.hpp
@@ -20,7 +20,7 @@
 #ifndef ENDPOINTSTABLE_H
 #define ENDPOINTSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/filter.cpp b/components/livestatus/filter.cpp
index 129c088fb..cec49ca8b 100644
--- a/components/livestatus/filter.cpp
+++ b/components/livestatus/filter.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/filter.h"
+#include "livestatus/filter.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/filter.h b/components/livestatus/filter.hpp
similarity index 98%
rename from components/livestatus/filter.h
rename to components/livestatus/filter.hpp
index 30b344922..f8d9d1ed5 100644
--- a/components/livestatus/filter.h
+++ b/components/livestatus/filter.hpp
@@ -20,7 +20,7 @@
 #ifndef FILTER_H
 #define FILTER_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 namespace icinga
 {
diff --git a/components/livestatus/historytable.cpp b/components/livestatus/historytable.cpp
index 8c8270bae..769292bb5 100644
--- a/components/livestatus/historytable.cpp
+++ b/components/livestatus/historytable.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/historytable.h"
+#include "livestatus/historytable.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/historytable.h b/components/livestatus/historytable.hpp
similarity index 96%
rename from components/livestatus/historytable.h
rename to components/livestatus/historytable.hpp
index dcebb1a25..787139014 100644
--- a/components/livestatus/historytable.h
+++ b/components/livestatus/historytable.hpp
@@ -20,8 +20,8 @@
 #ifndef HISTORYTABLE_H
 #define HISTORYTABLE_H
 
-#include "livestatus/table.h"
-#include "base/dictionary.h"
+#include "livestatus/table.hpp"
+#include "base/dictionary.hpp"
 
 namespace icinga
 {
diff --git a/components/livestatus/hostgroupstable.cpp b/components/livestatus/hostgroupstable.cpp
index 2e0c4134f..d03a016bb 100644
--- a/components/livestatus/hostgroupstable.cpp
+++ b/components/livestatus/hostgroupstable.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/hostgroupstable.h"
-#include "icinga/hostgroup.h"
-#include "icinga/host.h"
-#include "icinga/service.h"
-#include "base/dynamictype.h"
+#include "livestatus/hostgroupstable.hpp"
+#include "icinga/hostgroup.hpp"
+#include "icinga/host.hpp"
+#include "icinga/service.hpp"
+#include "base/dynamictype.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/components/livestatus/hostgroupstable.h b/components/livestatus/hostgroupstable.hpp
similarity index 99%
rename from components/livestatus/hostgroupstable.h
rename to components/livestatus/hostgroupstable.hpp
index f8c28ca29..3cebe6d74 100644
--- a/components/livestatus/hostgroupstable.h
+++ b/components/livestatus/hostgroupstable.hpp
@@ -20,7 +20,7 @@
 #ifndef HOSTGROUPSTABLE_H
 #define HOSTGROUPSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/hoststable.cpp b/components/livestatus/hoststable.cpp
index b6e2091d8..797e8d8d3 100644
--- a/components/livestatus/hoststable.cpp
+++ b/components/livestatus/hoststable.cpp
@@ -17,19 +17,19 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/hoststable.h"
-#include "icinga/host.h"
-#include "icinga/service.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/timeperiod.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/compatutility.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/utility.h"
+#include "livestatus/hoststable.hpp"
+#include "icinga/host.hpp"
+#include "icinga/service.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/timeperiod.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/compatutility.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
diff --git a/components/livestatus/hoststable.h b/components/livestatus/hoststable.hpp
similarity index 99%
rename from components/livestatus/hoststable.h
rename to components/livestatus/hoststable.hpp
index dc5bddede..ed9b877f9 100644
--- a/components/livestatus/hoststable.h
+++ b/components/livestatus/hoststable.hpp
@@ -20,7 +20,7 @@
 #ifndef HOSTSTABLE_H
 #define HOSTSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/invavgaggregator.cpp b/components/livestatus/invavgaggregator.cpp
index 3bea562f3..cf66bedad 100644
--- a/components/livestatus/invavgaggregator.cpp
+++ b/components/livestatus/invavgaggregator.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/invavgaggregator.h"
+#include "livestatus/invavgaggregator.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/invavgaggregator.h b/components/livestatus/invavgaggregator.hpp
similarity index 96%
rename from components/livestatus/invavgaggregator.h
rename to components/livestatus/invavgaggregator.hpp
index a45461032..d85898483 100644
--- a/components/livestatus/invavgaggregator.h
+++ b/components/livestatus/invavgaggregator.hpp
@@ -20,8 +20,8 @@
 #ifndef INVAVGAGGREGATOR_H
 #define INVAVGAGGREGATOR_H
 
-#include "livestatus/table.h"
-#include "livestatus/aggregator.h"
+#include "livestatus/table.hpp"
+#include "livestatus/aggregator.hpp"
 
 namespace icinga
 {
diff --git a/components/livestatus/invsumaggregator.cpp b/components/livestatus/invsumaggregator.cpp
index 7e947d04e..40889b695 100644
--- a/components/livestatus/invsumaggregator.cpp
+++ b/components/livestatus/invsumaggregator.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/invsumaggregator.h"
+#include "livestatus/invsumaggregator.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/invsumaggregator.h b/components/livestatus/invsumaggregator.hpp
similarity index 96%
rename from components/livestatus/invsumaggregator.h
rename to components/livestatus/invsumaggregator.hpp
index e3950aa46..b15648bdc 100644
--- a/components/livestatus/invsumaggregator.h
+++ b/components/livestatus/invsumaggregator.hpp
@@ -20,8 +20,8 @@
 #ifndef INVSUMAGGREGATOR_H
 #define INVSUMAGGREGATOR_H
 
-#include "livestatus/table.h"
-#include "livestatus/aggregator.h"
+#include "livestatus/table.hpp"
+#include "livestatus/aggregator.hpp"
 
 namespace icinga
 {
diff --git a/components/livestatus/listener.cpp b/components/livestatus/listener.cpp
index cb8b4e36d..dfb8a1aed 100644
--- a/components/livestatus/listener.cpp
+++ b/components/livestatus/listener.cpp
@@ -17,20 +17,20 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/listener.h"
-#include "config/configcompilercontext.h"
-#include "base/utility.h"
-#include "base/objectlock.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/tcpsocket.h"
-#include "base/unixsocket.h"
-#include "base/networkstream.h"
-#include "base/application.h"
-#include "base/scriptfunction.h"
-#include "base/statsfunction.h"
-#include "base/convert.h"
+#include "livestatus/listener.hpp"
+#include "config/configcompilercontext.hpp"
+#include "base/utility.hpp"
+#include "base/objectlock.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/tcpsocket.hpp"
+#include "base/unixsocket.hpp"
+#include "base/networkstream.hpp"
+#include "base/application.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/statsfunction.hpp"
+#include "base/convert.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/listener.h b/components/livestatus/listener.hpp
similarity index 95%
rename from components/livestatus/listener.h
rename to components/livestatus/listener.hpp
index d157169c0..6a4080ef3 100644
--- a/components/livestatus/listener.h
+++ b/components/livestatus/listener.hpp
@@ -20,9 +20,9 @@
 #ifndef LIVESTATUSLISTENER_H
 #define LIVESTATUSLISTENER_H
 
-#include "livestatus/listener.th"
-#include "livestatus/query.h"
-#include "base/socket.h"
+#include "livestatus/listener.thpp"
+#include "livestatus/query.hpp"
+#include "base/socket.hpp"
 #include <boost/thread/thread.hpp>
 
 using namespace icinga;
diff --git a/components/livestatus/listener.ti b/components/livestatus/listener.ti
index c37981c2b..61d85b9e9 100644
--- a/components/livestatus/listener.ti
+++ b/components/livestatus/listener.ti
@@ -1,5 +1,5 @@
-#include "base/dynamicobject.h"
-#include "base/application.h"
+#include "base/dynamicobject.hpp"
+#include "base/application.hpp"
 
 namespace icinga
 {
diff --git a/components/livestatus/logtable.cpp b/components/livestatus/logtable.cpp
index a6e239937..179ad4e6d 100644
--- a/components/livestatus/logtable.cpp
+++ b/components/livestatus/logtable.cpp
@@ -17,25 +17,25 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/logtable.h"
-#include "livestatus/logutility.h"
-#include "livestatus/hoststable.h"
-#include "livestatus/servicestable.h"
-#include "livestatus/contactstable.h"
-#include "livestatus/commandstable.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/cib.h"
-#include "icinga/service.h"
-#include "icinga/host.h"
-#include "icinga/user.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/notificationcommand.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/logger_fwd.h"
-#include "base/application.h"
-#include "base/objectlock.h"
+#include "livestatus/logtable.hpp"
+#include "livestatus/logutility.hpp"
+#include "livestatus/hoststable.hpp"
+#include "livestatus/servicestable.hpp"
+#include "livestatus/contactstable.hpp"
+#include "livestatus/commandstable.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/cib.hpp"
+#include "icinga/service.hpp"
+#include "icinga/host.hpp"
+#include "icinga/user.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/notificationcommand.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/application.hpp"
+#include "base/objectlock.hpp"
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/algorithm/string.hpp>
diff --git a/components/livestatus/logtable.h b/components/livestatus/logtable.hpp
similarity index 98%
rename from components/livestatus/logtable.h
rename to components/livestatus/logtable.hpp
index 4a3bd74ae..63372f07c 100644
--- a/components/livestatus/logtable.h
+++ b/components/livestatus/logtable.hpp
@@ -20,7 +20,7 @@
 #ifndef LOGTABLE_H
 #define LOGTABLE_H
 
-#include "livestatus/historytable.h"
+#include "livestatus/historytable.hpp"
 #include <boost/thread/mutex.hpp>
 
 using namespace icinga;
diff --git a/components/livestatus/logutility.cpp b/components/livestatus/logutility.cpp
index d5113126c..f8b105923 100644
--- a/components/livestatus/logutility.cpp
+++ b/components/livestatus/logutility.cpp
@@ -17,16 +17,16 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/logutility.h"
-#include "icinga/service.h"
-#include "icinga/host.h"
-#include "icinga/user.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/notificationcommand.h"
-#include "base/utility.h"
-#include "base/convert.h"
-#include "base/logger_fwd.h"
+#include "livestatus/logutility.hpp"
+#include "icinga/service.hpp"
+#include "icinga/host.hpp"
+#include "icinga/user.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/notificationcommand.hpp"
+#include "base/utility.hpp"
+#include "base/convert.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/algorithm/string.hpp>
diff --git a/components/livestatus/logutility.h b/components/livestatus/logutility.hpp
similarity index 98%
rename from components/livestatus/logutility.h
rename to components/livestatus/logutility.hpp
index 153e43835..087073b3a 100644
--- a/components/livestatus/logutility.h
+++ b/components/livestatus/logutility.hpp
@@ -20,7 +20,7 @@
 #ifndef LOGUTILITY_H
 #define LOGUTILITY_H
 
-#include "livestatus/historytable.h"
+#include "livestatus/historytable.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/maxaggregator.cpp b/components/livestatus/maxaggregator.cpp
index 85fdbacde..bca6ab25a 100644
--- a/components/livestatus/maxaggregator.cpp
+++ b/components/livestatus/maxaggregator.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/maxaggregator.h"
+#include "livestatus/maxaggregator.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/maxaggregator.h b/components/livestatus/maxaggregator.hpp
similarity index 96%
rename from components/livestatus/maxaggregator.h
rename to components/livestatus/maxaggregator.hpp
index 546e74150..315874803 100644
--- a/components/livestatus/maxaggregator.h
+++ b/components/livestatus/maxaggregator.hpp
@@ -20,8 +20,8 @@
 #ifndef MAXAGGREGATOR_H
 #define MAXAGGREGATOR_H
 
-#include "livestatus/table.h"
-#include "livestatus/aggregator.h"
+#include "livestatus/table.hpp"
+#include "livestatus/aggregator.hpp"
 
 namespace icinga
 {
diff --git a/components/livestatus/minaggregator.cpp b/components/livestatus/minaggregator.cpp
index 123e563b2..4599005cf 100644
--- a/components/livestatus/minaggregator.cpp
+++ b/components/livestatus/minaggregator.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/minaggregator.h"
+#include "livestatus/minaggregator.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/minaggregator.h b/components/livestatus/minaggregator.hpp
similarity index 96%
rename from components/livestatus/minaggregator.h
rename to components/livestatus/minaggregator.hpp
index 48d8841f1..d1280e3c7 100644
--- a/components/livestatus/minaggregator.h
+++ b/components/livestatus/minaggregator.hpp
@@ -20,8 +20,8 @@
 #ifndef MINAGGREGATOR_H
 #define MINAGGREGATOR_H
 
-#include "livestatus/table.h"
-#include "livestatus/aggregator.h"
+#include "livestatus/table.hpp"
+#include "livestatus/aggregator.hpp"
 
 namespace icinga
 {
diff --git a/components/livestatus/negatefilter.cpp b/components/livestatus/negatefilter.cpp
index 483a95348..baba99dcb 100644
--- a/components/livestatus/negatefilter.cpp
+++ b/components/livestatus/negatefilter.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/negatefilter.h"
+#include "livestatus/negatefilter.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/negatefilter.h b/components/livestatus/negatefilter.hpp
similarity index 98%
rename from components/livestatus/negatefilter.h
rename to components/livestatus/negatefilter.hpp
index b3c6f11a3..742902bf8 100644
--- a/components/livestatus/negatefilter.h
+++ b/components/livestatus/negatefilter.hpp
@@ -20,7 +20,7 @@
 #ifndef NEGATEFILTER_H
 #define NEGATEFILTER_H
 
-#include "livestatus/filter.h"
+#include "livestatus/filter.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/orfilter.cpp b/components/livestatus/orfilter.cpp
index 4a657373f..459e83b76 100644
--- a/components/livestatus/orfilter.cpp
+++ b/components/livestatus/orfilter.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/orfilter.h"
+#include "livestatus/orfilter.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/components/livestatus/orfilter.h b/components/livestatus/orfilter.hpp
similarity index 97%
rename from components/livestatus/orfilter.h
rename to components/livestatus/orfilter.hpp
index cf451ccc8..6f5fcf3c0 100644
--- a/components/livestatus/orfilter.h
+++ b/components/livestatus/orfilter.hpp
@@ -20,7 +20,7 @@
 #ifndef ORFILTER_H
 #define ORFILTER_H
 
-#include "livestatus/combinerfilter.h"
+#include "livestatus/combinerfilter.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/query.cpp b/components/livestatus/query.cpp
index fdac9a7e0..d1aea90bb 100644
--- a/components/livestatus/query.cpp
+++ b/components/livestatus/query.cpp
@@ -17,27 +17,27 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/query.h"
-#include "livestatus/countaggregator.h"
-#include "livestatus/sumaggregator.h"
-#include "livestatus/minaggregator.h"
-#include "livestatus/maxaggregator.h"
-#include "livestatus/avgaggregator.h"
-#include "livestatus/stdaggregator.h"
-#include "livestatus/invsumaggregator.h"
-#include "livestatus/invavgaggregator.h"
-#include "livestatus/attributefilter.h"
-#include "livestatus/negatefilter.h"
-#include "livestatus/orfilter.h"
-#include "livestatus/andfilter.h"
-#include "icinga/externalcommandprocessor.h"
-#include "base/debug.h"
-#include "base/convert.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/utility.h"
-#include "base/serializer.h"
+#include "livestatus/query.hpp"
+#include "livestatus/countaggregator.hpp"
+#include "livestatus/sumaggregator.hpp"
+#include "livestatus/minaggregator.hpp"
+#include "livestatus/maxaggregator.hpp"
+#include "livestatus/avgaggregator.hpp"
+#include "livestatus/stdaggregator.hpp"
+#include "livestatus/invsumaggregator.hpp"
+#include "livestatus/invavgaggregator.hpp"
+#include "livestatus/attributefilter.hpp"
+#include "livestatus/negatefilter.hpp"
+#include "livestatus/orfilter.hpp"
+#include "livestatus/andfilter.hpp"
+#include "icinga/externalcommandprocessor.hpp"
+#include "base/debug.hpp"
+#include "base/convert.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/utility.hpp"
+#include "base/serializer.hpp"
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/split.hpp>
diff --git a/components/livestatus/query.h b/components/livestatus/query.hpp
similarity index 95%
rename from components/livestatus/query.h
rename to components/livestatus/query.hpp
index 348282d4f..a0f096e58 100644
--- a/components/livestatus/query.h
+++ b/components/livestatus/query.hpp
@@ -20,11 +20,11 @@
 #ifndef QUERY_H
 #define QUERY_H
 
-#include "livestatus/filter.h"
-#include "livestatus/aggregator.h"
-#include "base/object.h"
-#include "base/array.h"
-#include "base/stream.h"
+#include "livestatus/filter.hpp"
+#include "livestatus/aggregator.hpp"
+#include "base/object.hpp"
+#include "base/array.hpp"
+#include "base/stream.hpp"
 #include <deque>
 
 using namespace icinga;
diff --git a/components/livestatus/servicegroupstable.cpp b/components/livestatus/servicegroupstable.cpp
index 7f4a20afd..0db6f2167 100644
--- a/components/livestatus/servicegroupstable.cpp
+++ b/components/livestatus/servicegroupstable.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/servicegroupstable.h"
-#include "icinga/servicegroup.h"
-#include "base/dynamictype.h"
+#include "livestatus/servicegroupstable.hpp"
+#include "icinga/servicegroup.hpp"
+#include "base/dynamictype.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/components/livestatus/servicegroupstable.h b/components/livestatus/servicegroupstable.hpp
similarity index 98%
rename from components/livestatus/servicegroupstable.h
rename to components/livestatus/servicegroupstable.hpp
index fcb283f3d..88d6d6ed8 100644
--- a/components/livestatus/servicegroupstable.h
+++ b/components/livestatus/servicegroupstable.hpp
@@ -20,7 +20,7 @@
 #ifndef SERVICEGROUPSTABLE_H
 #define SERVICEGROUPSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/servicestable.cpp b/components/livestatus/servicestable.cpp
index e6533f59b..6ccfcde07 100644
--- a/components/livestatus/servicestable.cpp
+++ b/components/livestatus/servicestable.cpp
@@ -17,20 +17,20 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/servicestable.h"
-#include "livestatus/hoststable.h"
-#include "livestatus/endpointstable.h"
-#include "icinga/service.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/timeperiod.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/compatutility.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/utility.h"
+#include "livestatus/servicestable.hpp"
+#include "livestatus/hoststable.hpp"
+#include "livestatus/endpointstable.hpp"
+#include "icinga/service.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/timeperiod.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/compatutility.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/algorithm/string/replace.hpp>
diff --git a/components/livestatus/servicestable.h b/components/livestatus/servicestable.hpp
similarity index 99%
rename from components/livestatus/servicestable.h
rename to components/livestatus/servicestable.hpp
index 4662628bf..c3fe9174e 100644
--- a/components/livestatus/servicestable.h
+++ b/components/livestatus/servicestable.hpp
@@ -20,7 +20,7 @@
 #ifndef SERVICESTABLE_H
 #define SERVICESTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/statehisttable.cpp b/components/livestatus/statehisttable.cpp
index 9fb4cb79b..6efe76dde 100644
--- a/components/livestatus/statehisttable.cpp
+++ b/components/livestatus/statehisttable.cpp
@@ -17,25 +17,25 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/statehisttable.h"
-#include "livestatus/logutility.h"
-#include "livestatus/hoststable.h"
-#include "livestatus/servicestable.h"
-#include "livestatus/contactstable.h"
-#include "livestatus/commandstable.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/cib.h"
-#include "icinga/service.h"
-#include "icinga/host.h"
-#include "icinga/user.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/notificationcommand.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/logger_fwd.h"
-#include "base/application.h"
-#include "base/objectlock.h"
+#include "livestatus/statehisttable.hpp"
+#include "livestatus/logutility.hpp"
+#include "livestatus/hoststable.hpp"
+#include "livestatus/servicestable.hpp"
+#include "livestatus/contactstable.hpp"
+#include "livestatus/commandstable.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/cib.hpp"
+#include "icinga/service.hpp"
+#include "icinga/host.hpp"
+#include "icinga/user.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/notificationcommand.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/application.hpp"
+#include "base/objectlock.hpp"
 #include <boost/smart_ptr/make_shared.hpp>
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
diff --git a/components/livestatus/statehisttable.h b/components/livestatus/statehisttable.hpp
similarity index 98%
rename from components/livestatus/statehisttable.h
rename to components/livestatus/statehisttable.hpp
index 919d1d4e2..a0ad07113 100644
--- a/components/livestatus/statehisttable.h
+++ b/components/livestatus/statehisttable.hpp
@@ -20,8 +20,8 @@
 #ifndef STATEHISTTABLE_H
 #define STATEHISTTABLE_H
 
-#include "icinga/service.h"
-#include "livestatus/historytable.h"
+#include "icinga/service.hpp"
+#include "livestatus/historytable.hpp"
 #include <boost/thread/mutex.hpp>
 
 using namespace icinga;
diff --git a/components/livestatus/statustable.cpp b/components/livestatus/statustable.cpp
index f92ed524e..8ecec8ae5 100644
--- a/components/livestatus/statustable.cpp
+++ b/components/livestatus/statustable.cpp
@@ -17,15 +17,15 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/statustable.h"
-#include "livestatus/listener.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/cib.h"
-#include "icinga/host.h"
-#include "icinga/service.h"
-#include "base/dynamictype.h"
-#include "base/utility.h"
-#include "base/application.h"
+#include "livestatus/statustable.hpp"
+#include "livestatus/listener.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/cib.hpp"
+#include "icinga/host.hpp"
+#include "icinga/service.hpp"
+#include "base/dynamictype.hpp"
+#include "base/utility.hpp"
+#include "base/application.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/components/livestatus/statustable.h b/components/livestatus/statustable.hpp
similarity index 99%
rename from components/livestatus/statustable.h
rename to components/livestatus/statustable.hpp
index ac1b4550a..0d58b16ff 100644
--- a/components/livestatus/statustable.h
+++ b/components/livestatus/statustable.hpp
@@ -20,7 +20,7 @@
 #ifndef STATUSTABLE_H
 #define STATUSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/stdaggregator.cpp b/components/livestatus/stdaggregator.cpp
index 638ae415b..99f2826d1 100644
--- a/components/livestatus/stdaggregator.cpp
+++ b/components/livestatus/stdaggregator.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/stdaggregator.h"
+#include "livestatus/stdaggregator.hpp"
 #include <math.h>
 
 using namespace icinga;
diff --git a/components/livestatus/stdaggregator.h b/components/livestatus/stdaggregator.hpp
similarity index 96%
rename from components/livestatus/stdaggregator.h
rename to components/livestatus/stdaggregator.hpp
index 4d1a8858a..070bcca70 100644
--- a/components/livestatus/stdaggregator.h
+++ b/components/livestatus/stdaggregator.hpp
@@ -20,8 +20,8 @@
 #ifndef STDAGGREGATOR_H
 #define STDAGGREGATOR_H
 
-#include "livestatus/table.h"
-#include "livestatus/aggregator.h"
+#include "livestatus/table.hpp"
+#include "livestatus/aggregator.hpp"
 
 namespace icinga
 {
diff --git a/components/livestatus/sumaggregator.cpp b/components/livestatus/sumaggregator.cpp
index 40aef1ab9..a0a19b1be 100644
--- a/components/livestatus/sumaggregator.cpp
+++ b/components/livestatus/sumaggregator.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/sumaggregator.h"
+#include "livestatus/sumaggregator.hpp"
 
 using namespace icinga;
 
diff --git a/components/livestatus/sumaggregator.h b/components/livestatus/sumaggregator.hpp
similarity index 96%
rename from components/livestatus/sumaggregator.h
rename to components/livestatus/sumaggregator.hpp
index 88668805f..b5693a776 100644
--- a/components/livestatus/sumaggregator.h
+++ b/components/livestatus/sumaggregator.hpp
@@ -20,8 +20,8 @@
 #ifndef SUMAGGREGATOR_H
 #define SUMAGGREGATOR_H
 
-#include "livestatus/table.h"
-#include "livestatus/aggregator.h"
+#include "livestatus/table.hpp"
+#include "livestatus/aggregator.hpp"
 
 namespace icinga
 {
diff --git a/components/livestatus/table.cpp b/components/livestatus/table.cpp
index 4d56b5237..d6aa6fffe 100644
--- a/components/livestatus/table.cpp
+++ b/components/livestatus/table.cpp
@@ -17,24 +17,24 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/table.h"
-#include "livestatus/statustable.h"
-#include "livestatus/contactgroupstable.h"
-#include "livestatus/contactstable.h"
-#include "livestatus/hostgroupstable.h"
-#include "livestatus/hoststable.h"
-#include "livestatus/servicegroupstable.h"
-#include "livestatus/servicestable.h"
-#include "livestatus/commandstable.h"
-#include "livestatus/commentstable.h"
-#include "livestatus/downtimestable.h"
-#include "livestatus/endpointstable.h"
-#include "livestatus/timeperiodstable.h"
-#include "livestatus/logtable.h"
-#include "livestatus/statehisttable.h"
-#include "livestatus/filter.h"
-#include "base/array.h"
-#include "base/dictionary.h"
+#include "livestatus/table.hpp"
+#include "livestatus/statustable.hpp"
+#include "livestatus/contactgroupstable.hpp"
+#include "livestatus/contactstable.hpp"
+#include "livestatus/hostgroupstable.hpp"
+#include "livestatus/hoststable.hpp"
+#include "livestatus/servicegroupstable.hpp"
+#include "livestatus/servicestable.hpp"
+#include "livestatus/commandstable.hpp"
+#include "livestatus/commentstable.hpp"
+#include "livestatus/downtimestable.hpp"
+#include "livestatus/endpointstable.hpp"
+#include "livestatus/timeperiodstable.hpp"
+#include "livestatus/logtable.hpp"
+#include "livestatus/statehisttable.hpp"
+#include "livestatus/filter.hpp"
+#include "base/array.hpp"
+#include "base/dictionary.hpp"
 #include <boost/tuple/tuple.hpp>
 #include <boost/foreach.hpp>
 #include <boost/bind.hpp>
diff --git a/components/livestatus/table.h b/components/livestatus/table.hpp
similarity index 96%
rename from components/livestatus/table.h
rename to components/livestatus/table.hpp
index 1436fe7b1..3c92f0cfb 100644
--- a/components/livestatus/table.h
+++ b/components/livestatus/table.hpp
@@ -20,9 +20,9 @@
 #ifndef TABLE_H
 #define TABLE_H
 
-#include "livestatus/column.h"
-#include "base/object.h"
-#include "base/dictionary.h"
+#include "livestatus/column.hpp"
+#include "base/object.hpp"
+#include "base/dictionary.hpp"
 #include <vector>
 
 namespace icinga
diff --git a/components/livestatus/timeperiodstable.cpp b/components/livestatus/timeperiodstable.cpp
index 2b9c579dc..5675c10d4 100644
--- a/components/livestatus/timeperiodstable.cpp
+++ b/components/livestatus/timeperiodstable.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "livestatus/timeperiodstable.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/timeperiod.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/utility.h"
+#include "livestatus/timeperiodstable.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/timeperiod.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/replace.hpp>
 
diff --git a/components/livestatus/timeperiodstable.h b/components/livestatus/timeperiodstable.hpp
similarity index 98%
rename from components/livestatus/timeperiodstable.h
rename to components/livestatus/timeperiodstable.hpp
index cf48a74d6..cd6df9f21 100644
--- a/components/livestatus/timeperiodstable.h
+++ b/components/livestatus/timeperiodstable.hpp
@@ -20,7 +20,7 @@
 #ifndef TIMEPERIODSTABLE_H
 #define TIMEPERIODSTABLE_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 using namespace icinga;
 
diff --git a/components/notification/CMakeLists.txt b/components/notification/CMakeLists.txt
index 7d2ff0592..cff9f0505 100644
--- a/components/notification/CMakeLists.txt
+++ b/components/notification/CMakeLists.txt
@@ -15,11 +15,11 @@
 # 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.th)
+mkclass_target(notificationcomponent.ti notificationcomponent.thpp)
 
 mkembedconfig_target(notification-type.conf notification-type.cpp)
 
-add_library(notification SHARED notificationcomponent.cpp notificationcomponent.th notification-type.cpp)
+add_library(notification SHARED notificationcomponent.cpp notificationcomponent.thpp notification-type.cpp)
 
 target_link_libraries(notification ${Boost_LIBRARIES} base config icinga)
 
diff --git a/components/notification/notificationcomponent.cpp b/components/notification/notificationcomponent.cpp
index b818d749f..90a12b8cb 100644
--- a/components/notification/notificationcomponent.cpp
+++ b/components/notification/notificationcomponent.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "notification/notificationcomponent.h"
-#include "icinga/service.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/utility.h"
-#include "base/exception.h"
-#include "base/statsfunction.h"
+#include "notification/notificationcomponent.hpp"
+#include "icinga/service.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
+#include "base/statsfunction.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/components/notification/notificationcomponent.h b/components/notification/notificationcomponent.hpp
similarity index 93%
rename from components/notification/notificationcomponent.h
rename to components/notification/notificationcomponent.hpp
index d52243e8f..337fb4531 100644
--- a/components/notification/notificationcomponent.h
+++ b/components/notification/notificationcomponent.hpp
@@ -20,10 +20,10 @@
 #ifndef NOTIFICATIONCOMPONENT_H
 #define NOTIFICATIONCOMPONENT_H
 
-#include "notification/notificationcomponent.th"
-#include "icinga/service.h"
-#include "base/dynamicobject.h"
-#include "base/timer.h"
+#include "notification/notificationcomponent.thpp"
+#include "icinga/service.hpp"
+#include "base/dynamicobject.hpp"
+#include "base/timer.hpp"
 
 namespace icinga
 {
diff --git a/components/notification/notificationcomponent.ti b/components/notification/notificationcomponent.ti
index d19f1c2a6..1758f9537 100644
--- a/components/notification/notificationcomponent.ti
+++ b/components/notification/notificationcomponent.ti
@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/components/perfdata/CMakeLists.txt b/components/perfdata/CMakeLists.txt
index 51a14cf59..0914923cc 100644
--- a/components/perfdata/CMakeLists.txt
+++ b/components/perfdata/CMakeLists.txt
@@ -15,12 +15,12 @@
 # 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(graphitewriter.ti graphitewriter.th)
-mkclass_target(perfdatawriter.ti perfdatawriter.th)
+mkclass_target(graphitewriter.ti graphitewriter.thpp)
+mkclass_target(perfdatawriter.ti perfdatawriter.thpp)
 
 mkembedconfig_target(perfdata-type.conf perfdata-type.cpp)
 
-add_library(perfdata SHARED graphitewriter.cpp graphitewriter.th perfdatawriter.cpp perfdatawriter.th perfdata-type.cpp)
+add_library(perfdata SHARED graphitewriter.cpp graphitewriter.thpp perfdatawriter.cpp perfdatawriter.thpp perfdata-type.cpp)
 
 target_link_libraries(perfdata ${Boost_LIBRARIES} base config icinga)
 
diff --git a/components/perfdata/graphitewriter.cpp b/components/perfdata/graphitewriter.cpp
index 043d77d11..22250bfbf 100644
--- a/components/perfdata/graphitewriter.cpp
+++ b/components/perfdata/graphitewriter.cpp
@@ -17,23 +17,23 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "perfdata/graphitewriter.h"
-#include "icinga/service.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/compatutility.h"
-#include "icinga/perfdatavalue.h"
-#include "base/tcpsocket.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/application.h"
-#include "base/stream.h"
-#include "base/networkstream.h"
-#include "base/exception.h"
-#include "base/statsfunction.h"
+#include "perfdata/graphitewriter.hpp"
+#include "icinga/service.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/compatutility.hpp"
+#include "icinga/perfdatavalue.hpp"
+#include "base/tcpsocket.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/application.hpp"
+#include "base/stream.hpp"
+#include "base/networkstream.hpp"
+#include "base/exception.hpp"
+#include "base/statsfunction.hpp"
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/foreach.hpp>
diff --git a/components/perfdata/graphitewriter.h b/components/perfdata/graphitewriter.hpp
similarity index 93%
rename from components/perfdata/graphitewriter.h
rename to components/perfdata/graphitewriter.hpp
index 4b1bf30e8..d0e516f22 100644
--- a/components/perfdata/graphitewriter.h
+++ b/components/perfdata/graphitewriter.hpp
@@ -20,11 +20,11 @@
 #ifndef GRAPHITEWRITER_H
 #define GRAPHITEWRITER_H
 
-#include "perfdata/graphitewriter.th"
-#include "icinga/service.h"
-#include "base/dynamicobject.h"
-#include "base/tcpsocket.h"
-#include "base/timer.h"
+#include "perfdata/graphitewriter.thpp"
+#include "icinga/service.hpp"
+#include "base/dynamicobject.hpp"
+#include "base/tcpsocket.hpp"
+#include "base/timer.hpp"
 #include <fstream>
 
 namespace icinga
diff --git a/components/perfdata/graphitewriter.ti b/components/perfdata/graphitewriter.ti
index 379663fa6..29311b44c 100644
--- a/components/perfdata/graphitewriter.ti
+++ b/components/perfdata/graphitewriter.ti
@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/components/perfdata/perfdatawriter.cpp b/components/perfdata/perfdatawriter.cpp
index 81c8ae46b..9da2707ae 100644
--- a/components/perfdata/perfdatawriter.cpp
+++ b/components/perfdata/perfdatawriter.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "perfdata/perfdatawriter.h"
-#include "icinga/service.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/icingaapplication.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/context.h"
-#include "base/application.h"
-#include "base/statsfunction.h"
+#include "perfdata/perfdatawriter.hpp"
+#include "icinga/service.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/context.hpp"
+#include "base/application.hpp"
+#include "base/statsfunction.hpp"
 
 using namespace icinga;
 
diff --git a/components/perfdata/perfdatawriter.h b/components/perfdata/perfdatawriter.hpp
similarity index 94%
rename from components/perfdata/perfdatawriter.h
rename to components/perfdata/perfdatawriter.hpp
index cb66a0243..f22b63047 100644
--- a/components/perfdata/perfdatawriter.h
+++ b/components/perfdata/perfdatawriter.hpp
@@ -20,10 +20,10 @@
 #ifndef PERFDATAWRITER_H
 #define PERFDATAWRITER_H
 
-#include "perfdata/perfdatawriter.th"
-#include "icinga/service.h"
-#include "base/dynamicobject.h"
-#include "base/timer.h"
+#include "perfdata/perfdatawriter.thpp"
+#include "icinga/service.hpp"
+#include "base/dynamicobject.hpp"
+#include "base/timer.hpp"
 #include <fstream>
 
 namespace icinga
diff --git a/components/perfdata/perfdatawriter.ti b/components/perfdata/perfdatawriter.ti
index 95f9cfc39..8497a91db 100644
--- a/components/perfdata/perfdatawriter.ti
+++ b/components/perfdata/perfdatawriter.ti
@@ -1,5 +1,5 @@
-#include "base/dynamicobject.h"
-#include "base/application.h"
+#include "base/dynamicobject.hpp"
+#include "base/application.hpp"
 
 namespace icinga
 {
diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index 8f2020824..d557ce43a 100644
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -17,17 +17,17 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/configcompilercontext.h"
-#include "config/configcompiler.h"
-#include "config/configitembuilder.h"
-#include "base/application.h"
-#include "base/logger.h"
-#include "base/timer.h"
-#include "base/utility.h"
-#include "base/exception.h"
-#include "base/convert.h"
-#include "base/scriptvariable.h"
-#include "base/context.h"
+#include "config/configcompilercontext.hpp"
+#include "config/configcompiler.hpp"
+#include "config/configitembuilder.hpp"
+#include "base/application.hpp"
+#include "base/logger.hpp"
+#include "base/timer.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
+#include "base/convert.hpp"
+#include "base/scriptvariable.hpp"
+#include "base/context.hpp"
 #include "config.h"
 #include <boost/program_options.hpp>
 #include <boost/tuple/tuple.hpp>
diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt
index 6223f5c9e..4dbf4d2fe 100644
--- a/lib/base/CMakeLists.txt
+++ b/lib/base/CMakeLists.txt
@@ -15,22 +15,22 @@
 # 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.th)
-mkclass_target(dynamicobject.ti dynamicobject.th)
-mkclass_target(filelogger.ti filelogger.th)
-mkclass_target(logger.ti logger.th)
-mkclass_target(streamlogger.ti streamlogger.th)
-mkclass_target(sysloglogger.ti sysloglogger.th)
+mkclass_target(application.ti application.thpp)
+mkclass_target(dynamicobject.ti dynamicobject.thpp)
+mkclass_target(filelogger.ti filelogger.thpp)
+mkclass_target(logger.ti logger.thpp)
+mkclass_target(streamlogger.ti streamlogger.thpp)
+mkclass_target(sysloglogger.ti sysloglogger.thpp)
 
 add_library(base SHARED
-  application.cpp application.th array.cpp context.cpp
-  convert.cpp dictionary.cpp dynamicobject.cpp dynamicobject.th dynamictype.cpp
-  exception.cpp fifo.cpp filelogger.cpp filelogger.th logger.cpp logger.th
+  application.cpp application.thpp array.cpp context.cpp
+  convert.cpp dictionary.cpp dynamicobject.cpp dynamicobject.thpp dynamictype.cpp
+  exception.cpp fifo.cpp filelogger.cpp filelogger.thpp logger.cpp logger.thpp
   netstring.cpp networkstream.cpp object.cpp objectlock.cpp process.cpp
   qstring.cpp ringbuffer.cpp scriptfunction.cpp scriptfunctionwrapper.cpp
   scriptutils.cpp scriptvariable.cpp serializer.cpp socket.cpp stacktrace.cpp
-  statsfunction.cpp stdiostream.cpp stream.cpp streamlogger.cpp streamlogger.th
-  sysloglogger.cpp sysloglogger.th tcpsocket.cpp threadpool.cpp timer.cpp
+  statsfunction.cpp stdiostream.cpp stream.cpp streamlogger.cpp streamlogger.thpp
+  sysloglogger.cpp sysloglogger.thpp tcpsocket.cpp threadpool.cpp timer.cpp
   tlsstream.cpp tlsutility.cpp type.cpp unixsocket.cpp utility.cpp value.cpp
   value-operators.cpp workqueue.cpp
 )
diff --git a/lib/base/application.cpp b/lib/base/application.cpp
index 07d781ccd..92a154152 100644
--- a/lib/base/application.cpp
+++ b/lib/base/application.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/application.h"
-#include "base/stacktrace.h"
-#include "base/timer.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
-#include "base/debug.h"
-#include "base/type.h"
-#include "base/convert.h"
-#include "base/scriptvariable.h"
-#include "base/process.h"
+#include "base/application.hpp"
+#include "base/stacktrace.hpp"
+#include "base/timer.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
+#include "base/debug.hpp"
+#include "base/type.hpp"
+#include "base/convert.hpp"
+#include "base/scriptvariable.hpp"
+#include "base/process.hpp"
 #include "icinga-version.h"
 #include <sstream>
 #include <boost/algorithm/string/classification.hpp>
diff --git a/lib/base/application.h b/lib/base/application.hpp
similarity index 97%
rename from lib/base/application.h
rename to lib/base/application.hpp
index 7f3a4ca52..1a221ebec 100644
--- a/lib/base/application.h
+++ b/lib/base/application.hpp
@@ -20,11 +20,11 @@
 #ifndef APPLICATION_H
 #define APPLICATION_H
 
-#include "base/i2-base.h"
-#include "base/application.th"
-#include "base/threadpool.h"
-#include "base/utility.h"
-#include "base/logger_fwd.h"
+#include "base/i2-base.hpp"
+#include "base/application.thpp"
+#include "base/threadpool.hpp"
+#include "base/utility.hpp"
+#include "base/logger_fwd.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/application.ti b/lib/base/application.ti
index b66c638a1..fa28b3bdc 100644
--- a/lib/base/application.ti
+++ b/lib/base/application.ti
@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/array.cpp b/lib/base/array.cpp
index 1240e0a1f..924eaf279 100644
--- a/lib/base/array.cpp
+++ b/lib/base/array.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/array.h"
-#include "base/objectlock.h"
-#include "base/debug.h"
+#include "base/array.hpp"
+#include "base/objectlock.hpp"
+#include "base/debug.hpp"
 #include <cJSON.h>
 #include <boost/foreach.hpp>
 
diff --git a/lib/base/array.h b/lib/base/array.hpp
similarity index 98%
rename from lib/base/array.h
rename to lib/base/array.hpp
index 4bd8bd7c1..a74fbd238 100644
--- a/lib/base/array.h
+++ b/lib/base/array.hpp
@@ -20,8 +20,8 @@
 #ifndef ARRAY_H
 #define ARRAY_H
 
-#include "base/i2-base.h"
-#include "base/value.h"
+#include "base/i2-base.hpp"
+#include "base/value.hpp"
 #include <vector>
 
 namespace icinga
diff --git a/lib/base/context.cpp b/lib/base/context.cpp
index 95086ffec..dfb688a18 100644
--- a/lib/base/context.cpp
+++ b/lib/base/context.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/context.h"
+#include "base/context.hpp"
 #include <boost/thread/tss.hpp>
 #include <boost/foreach.hpp>
 
diff --git a/lib/base/context.h b/lib/base/context.hpp
similarity index 97%
rename from lib/base/context.h
rename to lib/base/context.hpp
index 8b2718129..c75849a6c 100644
--- a/lib/base/context.h
+++ b/lib/base/context.hpp
@@ -20,8 +20,8 @@
 #ifndef CONTEXT_H
 #define CONTEXT_H
 
-#include "base/i2-base.h"
-#include "base/qstring.h"
+#include "base/i2-base.hpp"
+#include "base/qstring.hpp"
 #include <list>
 
 namespace icinga
diff --git a/lib/base/convert.cpp b/lib/base/convert.cpp
index dbe8d8ed3..12a074e52 100644
--- a/lib/base/convert.cpp
+++ b/lib/base/convert.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/convert.h"
+#include "base/convert.hpp"
 #include <boost/lexical_cast.hpp>
 
 using namespace icinga;
diff --git a/lib/base/convert.h b/lib/base/convert.hpp
similarity index 97%
rename from lib/base/convert.h
rename to lib/base/convert.hpp
index a66e9b7ce..7d77abe93 100644
--- a/lib/base/convert.h
+++ b/lib/base/convert.hpp
@@ -20,8 +20,8 @@
 #ifndef CONVERT_H
 #define CONVERT_H
 
-#include "base/i2-base.h"
-#include "base/value.h"
+#include "base/i2-base.hpp"
+#include "base/value.hpp"
 #include <boost/lexical_cast.hpp>
 
 namespace icinga
diff --git a/lib/base/debug.h b/lib/base/debug.hpp
similarity index 99%
rename from lib/base/debug.h
rename to lib/base/debug.hpp
index 964c81d93..b1ede5649 100644
--- a/lib/base/debug.h
+++ b/lib/base/debug.hpp
@@ -20,7 +20,7 @@
 #ifndef DEBUG_H
 #define DEBUG_H
 
-#include "i2-base.h"
+#include "i2-base.hpp"
 
 #ifndef _DEBUG
 #	define ASSERT(expr) ((void)0)
diff --git a/lib/base/dictionary.cpp b/lib/base/dictionary.cpp
index 833480541..4362a13d7 100644
--- a/lib/base/dictionary.cpp
+++ b/lib/base/dictionary.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/dictionary.h"
-#include "base/objectlock.h"
-#include "base/debug.h"
+#include "base/dictionary.hpp"
+#include "base/objectlock.hpp"
+#include "base/debug.hpp"
 #include <cJSON.h>
 #include <boost/foreach.hpp>
 
diff --git a/lib/base/dictionary.h b/lib/base/dictionary.hpp
similarity index 97%
rename from lib/base/dictionary.h
rename to lib/base/dictionary.hpp
index 67f112112..e280d452f 100644
--- a/lib/base/dictionary.h
+++ b/lib/base/dictionary.hpp
@@ -20,9 +20,9 @@
 #ifndef DICTIONARY_H
 #define DICTIONARY_H
 
-#include "base/i2-base.h"
-#include "base/object.h"
-#include "base/value.h"
+#include "base/i2-base.hpp"
+#include "base/object.hpp"
+#include "base/value.hpp"
 #include <map>
 
 namespace icinga
diff --git a/lib/base/dynamicobject.cpp b/lib/base/dynamicobject.cpp
index d79a29a49..a5ae9c8ce 100644
--- a/lib/base/dynamicobject.cpp
+++ b/lib/base/dynamicobject.cpp
@@ -17,19 +17,19 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/dynamicobject.h"
-#include "base/dynamictype.h"
-#include "base/serializer.h"
-#include "base/netstring.h"
-#include "base/stdiostream.h"
-#include "base/debug.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/scriptfunction.h"
-#include "base/initialize.h"
-#include "base/scriptvariable.h"
-#include "base/workqueue.h"
+#include "base/dynamicobject.hpp"
+#include "base/dynamictype.hpp"
+#include "base/serializer.hpp"
+#include "base/netstring.hpp"
+#include "base/stdiostream.hpp"
+#include "base/debug.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/initialize.hpp"
+#include "base/scriptvariable.hpp"
+#include "base/workqueue.hpp"
 #include <fstream>
 #include <boost/foreach.hpp>
 #include <boost/exception/errinfo_api_function.hpp>
diff --git a/lib/base/dynamicobject.h b/lib/base/dynamicobject.hpp
similarity index 96%
rename from lib/base/dynamicobject.h
rename to lib/base/dynamicobject.hpp
index a57518208..d3be72a40 100644
--- a/lib/base/dynamicobject.h
+++ b/lib/base/dynamicobject.hpp
@@ -20,11 +20,11 @@
 #ifndef DYNAMICOBJECT_H
 #define DYNAMICOBJECT_H
 
-#include "base/i2-base.h"
-#include "base/dynamicobject.th"
-#include "base/object.h"
-#include "base/serializer.h"
-#include "base/dictionary.h"
+#include "base/i2-base.hpp"
+#include "base/dynamicobject.thpp"
+#include "base/object.hpp"
+#include "base/serializer.hpp"
+#include "base/dictionary.hpp"
 #include <boost/signals2.hpp>
 #include <map>
 
diff --git a/lib/base/dynamictype.cpp b/lib/base/dynamictype.cpp
index ceba1f8d9..219dfcc18 100644
--- a/lib/base/dynamictype.cpp
+++ b/lib/base/dynamictype.cpp
@@ -17,10 +17,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/dynamictype.h"
-#include "base/serializer.h"
-#include "base/debug.h"
-#include "base/objectlock.h"
+#include "base/dynamictype.hpp"
+#include "base/serializer.hpp"
+#include "base/debug.hpp"
+#include "base/objectlock.hpp"
 
 using namespace icinga;
 
diff --git a/lib/base/dynamictype.h b/lib/base/dynamictype.hpp
similarity index 97%
rename from lib/base/dynamictype.h
rename to lib/base/dynamictype.hpp
index 9675bbdf3..5a9927f45 100644
--- a/lib/base/dynamictype.h
+++ b/lib/base/dynamictype.hpp
@@ -20,10 +20,10 @@
 #ifndef DYNAMICTYPE_H
 #define DYNAMICTYPE_H
 
-#include "base/i2-base.h"
-#include "base/dynamicobject.h"
-#include "base/debug.h"
-#include "base/objectlock.h"
+#include "base/i2-base.hpp"
+#include "base/dynamicobject.hpp"
+#include "base/debug.hpp"
+#include "base/objectlock.hpp"
 #include <map>
 # include <boost/iterator/iterator_facade.hpp>
 
diff --git a/lib/base/exception.cpp b/lib/base/exception.cpp
index a262bbb97..c3da16cef 100644
--- a/lib/base/exception.cpp
+++ b/lib/base/exception.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/exception.h"
+#include "base/exception.hpp"
 #include <boost/thread/tss.hpp>
 
 #ifndef _MSC_VER
diff --git a/lib/base/exception.h b/lib/base/exception.hpp
similarity index 97%
rename from lib/base/exception.h
rename to lib/base/exception.hpp
index d7cccc8ac..4cd5bf06f 100644
--- a/lib/base/exception.h
+++ b/lib/base/exception.hpp
@@ -20,10 +20,10 @@
 #ifndef EXCEPTION_H
 #define EXCEPTION_H
 
-#include "base/i2-base.h"
-#include "base/qstring.h"
-#include "base/stacktrace.h"
-#include "base/context.h"
+#include "base/i2-base.hpp"
+#include "base/qstring.hpp"
+#include "base/stacktrace.hpp"
+#include "base/context.hpp"
 #include <sstream>
 #include <boost/exception/errinfo_api_function.hpp>
 #include <boost/exception/errinfo_errno.hpp>
diff --git a/lib/base/fifo.cpp b/lib/base/fifo.cpp
index 3365a6f87..c61e4a962 100644
--- a/lib/base/fifo.cpp
+++ b/lib/base/fifo.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/fifo.h"
+#include "base/fifo.hpp"
 
 using namespace icinga;
 
diff --git a/lib/base/fifo.h b/lib/base/fifo.hpp
similarity index 97%
rename from lib/base/fifo.h
rename to lib/base/fifo.hpp
index e32d35dba..5534e5e4f 100644
--- a/lib/base/fifo.h
+++ b/lib/base/fifo.hpp
@@ -20,8 +20,8 @@
 #ifndef FIFO_H
 #define FIFO_H
 
-#include "base/i2-base.h"
-#include "base/stream.h"
+#include "base/i2-base.hpp"
+#include "base/stream.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/filelogger.cpp b/lib/base/filelogger.cpp
index 193a7d7fc..123adeab7 100644
--- a/lib/base/filelogger.cpp
+++ b/lib/base/filelogger.cpp
@@ -17,10 +17,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/filelogger.h"
-#include "base/dynamictype.h"
-#include "base/statsfunction.h"
-#include "base/application.h"
+#include "base/filelogger.hpp"
+#include "base/dynamictype.hpp"
+#include "base/statsfunction.hpp"
+#include "base/application.hpp"
 #include <fstream>
 
 using namespace icinga;
diff --git a/lib/base/filelogger.h b/lib/base/filelogger.hpp
similarity index 96%
rename from lib/base/filelogger.h
rename to lib/base/filelogger.hpp
index a1244324c..bbf5ff056 100644
--- a/lib/base/filelogger.h
+++ b/lib/base/filelogger.hpp
@@ -20,8 +20,8 @@
 #ifndef FILELOGGER_H
 #define FILELOGGER_H
 
-#include "base/i2-base.h"
-#include "base/filelogger.th"
+#include "base/i2-base.hpp"
+#include "base/filelogger.thpp"
 
 namespace icinga
 {
diff --git a/lib/base/filelogger.ti b/lib/base/filelogger.ti
index 1392a9f9a..93b35001a 100644
--- a/lib/base/filelogger.ti
+++ b/lib/base/filelogger.ti
@@ -1,4 +1,4 @@
-#include "base/streamlogger.h"
+#include "base/streamlogger.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/i2-base.h b/lib/base/i2-base.hpp
similarity index 97%
rename from lib/base/i2-base.h
rename to lib/base/i2-base.hpp
index e2f74a041..3d5f5baf9 100644
--- a/lib/base/i2-base.h
+++ b/lib/base/i2-base.hpp
@@ -61,9 +61,9 @@
 #endif /* _MSC_VER */
 
 #ifdef _WIN32
-#	include "win32.h"
+#	include "base/win32.hpp"
 #else
-#	include "unix.h"
+#	include "base/unix.hpp"
 #endif
 
 #include <cstdlib>
@@ -83,7 +83,7 @@
 #	pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
-#include "visibility.h"
+#include "visibility.hpp"
 
 #ifdef I2_BASE_BUILD
 #	define I2_BASE_API I2_EXPORT
diff --git a/lib/base/initialize.h b/lib/base/initialize.hpp
similarity index 97%
rename from lib/base/initialize.h
rename to lib/base/initialize.hpp
index b0dfff905..ceb355450 100644
--- a/lib/base/initialize.h
+++ b/lib/base/initialize.hpp
@@ -20,8 +20,8 @@
 #ifndef INITIALIZE_H
 #define INITIALIZE_H
 
-#include "base/i2-base.h"
-#include "base/utility.h"
+#include "base/i2-base.hpp"
+#include "base/utility.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/logger.cpp b/lib/base/logger.cpp
index b92ca31ef..507f6902f 100644
--- a/lib/base/logger.cpp
+++ b/lib/base/logger.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/application.h"
-#include "base/streamlogger.h"
-#include "base/logger.h"
-#include "base/dynamictype.h"
-#include "base/utility.h"
-#include "base/objectlock.h"
-#include "base/context.h"
-#include "base/scriptvariable.h"
+#include "base/application.hpp"
+#include "base/streamlogger.hpp"
+#include "base/logger.hpp"
+#include "base/dynamictype.hpp"
+#include "base/utility.hpp"
+#include "base/objectlock.hpp"
+#include "base/context.hpp"
+#include "base/scriptvariable.hpp"
 #include <boost/foreach.hpp>
 #include <iostream>
 
diff --git a/lib/base/logger.h b/lib/base/logger.hpp
similarity index 97%
rename from lib/base/logger.h
rename to lib/base/logger.hpp
index d4bb3ec93..b18229547 100644
--- a/lib/base/logger.h
+++ b/lib/base/logger.hpp
@@ -20,9 +20,9 @@
 #ifndef LOGGER_H
 #define LOGGER_H
 
-#include "base/i2-base.h"
-#include "base/logger.th"
-#include "base/logger_fwd.h"
+#include "base/i2-base.hpp"
+#include "base/logger.thpp"
+#include "base/logger_fwd.hpp"
 #include <set>
 
 namespace icinga
diff --git a/lib/base/logger.ti b/lib/base/logger.ti
index fabf29ccf..1f25f5770 100644
--- a/lib/base/logger.ti
+++ b/lib/base/logger.ti
@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/logger_fwd.h b/lib/base/logger_fwd.hpp
similarity index 96%
rename from lib/base/logger_fwd.h
rename to lib/base/logger_fwd.hpp
index 25d22fc2c..3661e1f79 100644
--- a/lib/base/logger_fwd.h
+++ b/lib/base/logger_fwd.hpp
@@ -20,8 +20,8 @@
 #ifndef LOGGER_FWD_H
 #define LOGGER_FWD_H
 
-#include "base/i2-base.h"
-#include "base/qstring.h"
+#include "base/i2-base.hpp"
+#include "base/qstring.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/netstring.cpp b/lib/base/netstring.cpp
index 7314a8ea1..615048adc 100644
--- a/lib/base/netstring.cpp
+++ b/lib/base/netstring.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/netstring.h"
-#include "base/qstring.h"
-#include "base/debug.h"
+#include "base/netstring.hpp"
+#include "base/qstring.hpp"
+#include "base/debug.hpp"
 #include <sstream>
 
 using namespace icinga;
diff --git a/lib/base/netstring.h b/lib/base/netstring.hpp
similarity index 97%
rename from lib/base/netstring.h
rename to lib/base/netstring.hpp
index 54b96d46d..0ed294c92 100644
--- a/lib/base/netstring.h
+++ b/lib/base/netstring.hpp
@@ -20,8 +20,8 @@
 #ifndef NETSTRING_H
 #define NETSTRING_H
 
-#include "base/i2-base.h"
-#include "base/stream.h"
+#include "base/i2-base.hpp"
+#include "base/stream.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/networkstream.cpp b/lib/base/networkstream.cpp
index c74ea4271..6cb12c55d 100644
--- a/lib/base/networkstream.cpp
+++ b/lib/base/networkstream.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/networkstream.h"
+#include "base/networkstream.hpp"
 
 using namespace icinga;
 
diff --git a/lib/base/networkstream.h b/lib/base/networkstream.hpp
similarity index 95%
rename from lib/base/networkstream.h
rename to lib/base/networkstream.hpp
index 1fcc1af5c..aae07edf5 100644
--- a/lib/base/networkstream.h
+++ b/lib/base/networkstream.hpp
@@ -20,9 +20,9 @@
 #ifndef NETWORKSTREAM_H
 #define NETWORKSTREAM_H
 
-#include "base/i2-base.h"
-#include "base/stream.h"
-#include "base/socket.h"
+#include "base/i2-base.hpp"
+#include "base/stream.hpp"
+#include "base/socket.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/object.cpp b/lib/base/object.cpp
index e800175f6..713e51a77 100644
--- a/lib/base/object.cpp
+++ b/lib/base/object.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/object.h"
-#include "base/value.h"
+#include "base/object.hpp"
+#include "base/value.hpp"
 
 using namespace icinga;
 
diff --git a/lib/base/object.h b/lib/base/object.hpp
similarity index 98%
rename from lib/base/object.h
rename to lib/base/object.hpp
index c19fda884..c4832010a 100644
--- a/lib/base/object.h
+++ b/lib/base/object.hpp
@@ -20,8 +20,8 @@
 #ifndef OBJECT_H
 #define OBJECT_H
 
-#include "base/i2-base.h"
-#include "base/debug.h"
+#include "base/i2-base.hpp"
+#include "base/debug.hpp"
 #include <boost/thread/thread.hpp>
 
 #ifndef _DEBUG
diff --git a/lib/base/objectlock.cpp b/lib/base/objectlock.cpp
index d711f7ce5..d236bf75c 100644
--- a/lib/base/objectlock.cpp
+++ b/lib/base/objectlock.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/objectlock.h"
-#include "base/debug.h"
+#include "base/objectlock.hpp"
+#include "base/debug.hpp"
 
 using namespace icinga;
 
diff --git a/lib/base/objectlock.h b/lib/base/objectlock.hpp
similarity index 98%
rename from lib/base/objectlock.h
rename to lib/base/objectlock.hpp
index ec1bf25fc..4215f089a 100644
--- a/lib/base/objectlock.h
+++ b/lib/base/objectlock.hpp
@@ -20,7 +20,7 @@
 #ifndef OBJECTLOCK_H
 #define OBJECTLOCK_H
 
-#include "base/object.h"
+#include "base/object.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/process.cpp b/lib/base/process.cpp
index 230dce5f3..2ed95077b 100644
--- a/lib/base/process.cpp
+++ b/lib/base/process.cpp
@@ -17,16 +17,16 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/process.h"
-#include "base/exception.h"
-#include "base/convert.h"
-#include "base/array.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
-#include "base/initialize.h"
-#include "base/logger_fwd.h"
-#include "base/utility.h"
-#include "base/scriptvariable.h"
+#include "base/process.hpp"
+#include "base/exception.hpp"
+#include "base/convert.hpp"
+#include "base/array.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
+#include "base/initialize.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/utility.hpp"
+#include "base/scriptvariable.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/thread/once.hpp>
diff --git a/lib/base/process.h b/lib/base/process.hpp
similarity index 98%
rename from lib/base/process.h
rename to lib/base/process.hpp
index bd3e5ad80..e0f1806f6 100644
--- a/lib/base/process.h
+++ b/lib/base/process.hpp
@@ -20,8 +20,8 @@
 #ifndef PROCESS_H
 #define PROCESS_H
 
-#include "base/i2-base.h"
-#include "base/dictionary.h"
+#include "base/i2-base.hpp"
+#include "base/dictionary.hpp"
 #include <boost/function.hpp>
 #include <sstream>
 #include <deque>
diff --git a/lib/base/qstring.cpp b/lib/base/qstring.cpp
index 3d9ad3768..4d9b8bda2 100644
--- a/lib/base/qstring.cpp
+++ b/lib/base/qstring.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/qstring.h"
-#include "base/value.h"
+#include "base/qstring.hpp"
+#include "base/value.hpp"
 #include <boost/algorithm/string/trim.hpp>
 #include <ostream>
 
diff --git a/lib/base/qstring.h b/lib/base/qstring.hpp
similarity index 99%
rename from lib/base/qstring.h
rename to lib/base/qstring.hpp
index a54945d2c..bd02a52c6 100644
--- a/lib/base/qstring.h
+++ b/lib/base/qstring.hpp
@@ -20,7 +20,7 @@
 #ifndef STRING_H
 #define STRING_H
 
-#include "base/i2-base.h"
+#include "base/i2-base.hpp"
 #include <string.h>
 #include <functional>
 #include <string>
diff --git a/lib/base/registry.h b/lib/base/registry.hpp
similarity index 98%
rename from lib/base/registry.h
rename to lib/base/registry.hpp
index 9895e2b85..781c16605 100644
--- a/lib/base/registry.h
+++ b/lib/base/registry.hpp
@@ -20,8 +20,8 @@
 #ifndef REGISTRY_H
 #define REGISTRY_H
 
-#include "base/i2-base.h"
-#include "base/qstring.h"
+#include "base/i2-base.hpp"
+#include "base/qstring.hpp"
 #include <map>
 #include <boost/thread/mutex.hpp>
 #include <boost/signals2.hpp>
diff --git a/lib/base/ringbuffer.cpp b/lib/base/ringbuffer.cpp
index 2e19fbb91..d4854a2bd 100644
--- a/lib/base/ringbuffer.cpp
+++ b/lib/base/ringbuffer.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/ringbuffer.h"
-#include "base/objectlock.h"
+#include "base/ringbuffer.hpp"
+#include "base/objectlock.hpp"
 
 using namespace icinga;
 
diff --git a/lib/base/ringbuffer.h b/lib/base/ringbuffer.hpp
similarity index 97%
rename from lib/base/ringbuffer.h
rename to lib/base/ringbuffer.hpp
index c74544c97..cb8d96950 100644
--- a/lib/base/ringbuffer.h
+++ b/lib/base/ringbuffer.hpp
@@ -20,8 +20,8 @@
 #ifndef RINGBUFFER_H
 #define RINGBUFFER_H
 
-#include "base/i2-base.h"
-#include "base/object.h"
+#include "base/i2-base.hpp"
+#include "base/object.hpp"
 #include <vector>
 
 namespace icinga
diff --git a/lib/base/scriptfunction.cpp b/lib/base/scriptfunction.cpp
index 745969237..2852db422 100644
--- a/lib/base/scriptfunction.cpp
+++ b/lib/base/scriptfunction.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/scriptfunction.h"
-#include "base/scriptvariable.h"
+#include "base/scriptfunction.hpp"
+#include "base/scriptvariable.hpp"
 
 using namespace icinga;
 
diff --git a/lib/base/scriptfunction.h b/lib/base/scriptfunction.hpp
similarity index 96%
rename from lib/base/scriptfunction.h
rename to lib/base/scriptfunction.hpp
index ef8861ba5..aa50d7f7c 100644
--- a/lib/base/scriptfunction.h
+++ b/lib/base/scriptfunction.hpp
@@ -20,9 +20,9 @@
 #ifndef SCRIPTFUNCTION_H
 #define SCRIPTFUNCTION_H
 
-#include "base/i2-base.h"
-#include "base/value.h"
-#include "base/scriptfunctionwrapper.h"
+#include "base/i2-base.hpp"
+#include "base/value.hpp"
+#include "base/scriptfunctionwrapper.hpp"
 #include <vector>
 #include <boost/function.hpp>
 
diff --git a/lib/base/scriptfunctionwrapper.cpp b/lib/base/scriptfunctionwrapper.cpp
index d18a6a623..80e6590c6 100644
--- a/lib/base/scriptfunctionwrapper.cpp
+++ b/lib/base/scriptfunctionwrapper.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/scriptfunctionwrapper.h"
+#include "base/scriptfunctionwrapper.hpp"
 
 using namespace icinga;
 
diff --git a/lib/base/scriptfunctionwrapper.h b/lib/base/scriptfunctionwrapper.hpp
similarity index 99%
rename from lib/base/scriptfunctionwrapper.h
rename to lib/base/scriptfunctionwrapper.hpp
index 7704ae723..c250bdd7b 100644
--- a/lib/base/scriptfunctionwrapper.h
+++ b/lib/base/scriptfunctionwrapper.hpp
@@ -20,8 +20,8 @@
 #ifndef SCRIPTFUNCTIONWRAPPER_H
 #define SCRIPTFUNCTIONWRAPPER_H
 
-#include "base/i2-base.h"
-#include "base/value.h"
+#include "base/i2-base.hpp"
+#include "base/value.hpp"
 #include <vector>
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
diff --git a/lib/base/scriptutils.cpp b/lib/base/scriptutils.cpp
index b7f7fc83f..c925a0849 100644
--- a/lib/base/scriptutils.cpp
+++ b/lib/base/scriptutils.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/scriptutils.h"
-#include "base/scriptfunction.h"
-#include "base/utility.h"
-#include "base/convert.h"
-#include "base/array.h"
-#include "base/dictionary.h"
-#include "base/serializer.h"
-#include "base/logger_fwd.h"
+#include "base/scriptutils.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/utility.hpp"
+#include "base/convert.hpp"
+#include "base/array.hpp"
+#include "base/dictionary.hpp"
+#include "base/serializer.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 #include <boost/regex.hpp>
 #include <algorithm>
diff --git a/lib/base/scriptutils.h b/lib/base/scriptutils.hpp
similarity index 96%
rename from lib/base/scriptutils.h
rename to lib/base/scriptutils.hpp
index e4c190383..34579e80e 100644
--- a/lib/base/scriptutils.h
+++ b/lib/base/scriptutils.hpp
@@ -20,9 +20,9 @@
 #ifndef SCRIPTUTILS_H
 #define SCRIPTUTILS_H
 
-#include "base/i2-base.h"
-#include "base/qstring.h"
-#include "base/array.h"
+#include "base/i2-base.hpp"
+#include "base/qstring.hpp"
+#include "base/array.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/scriptvariable.cpp b/lib/base/scriptvariable.cpp
index 7cde7cf6d..55f0366dd 100644
--- a/lib/base/scriptvariable.cpp
+++ b/lib/base/scriptvariable.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/scriptvariable.h"
-#include "base/singleton.h"
+#include "base/scriptvariable.hpp"
+#include "base/singleton.hpp"
 
 using namespace icinga;
 
diff --git a/lib/base/scriptvariable.h b/lib/base/scriptvariable.hpp
similarity index 96%
rename from lib/base/scriptvariable.h
rename to lib/base/scriptvariable.hpp
index 977e133cb..5112afca9 100644
--- a/lib/base/scriptvariable.h
+++ b/lib/base/scriptvariable.hpp
@@ -20,9 +20,9 @@
 #ifndef SCRIPTVARIABLE_H
 #define SCRIPTVARIABLE_H
 
-#include "base/i2-base.h"
-#include "base/registry.h"
-#include "base/value.h"
+#include "base/i2-base.hpp"
+#include "base/registry.hpp"
+#include "base/value.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/serializer.cpp b/lib/base/serializer.cpp
index c4bd6d466..057aeedcd 100644
--- a/lib/base/serializer.cpp
+++ b/lib/base/serializer.cpp
@@ -17,10 +17,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/serializer.h"
-#include "base/type.h"
-#include "base/application.h"
-#include "base/objectlock.h"
+#include "base/serializer.hpp"
+#include "base/type.hpp"
+#include "base/application.hpp"
+#include "base/objectlock.hpp"
 #include <boost/foreach.hpp>
 #include <cJSON.h>
 
diff --git a/lib/base/serializer.h b/lib/base/serializer.hpp
similarity index 97%
rename from lib/base/serializer.h
rename to lib/base/serializer.hpp
index 87132648e..ce0f8cae2 100644
--- a/lib/base/serializer.h
+++ b/lib/base/serializer.hpp
@@ -20,8 +20,8 @@
 #ifndef SERIALIZER_H
 #define SERIALIZER_H
 
-#include "base/i2-base.h"
-#include "base/value.h"
+#include "base/i2-base.hpp"
+#include "base/value.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/singleton.h b/lib/base/singleton.hpp
similarity index 98%
rename from lib/base/singleton.h
rename to lib/base/singleton.hpp
index 811f6f5a7..7d80fdd15 100644
--- a/lib/base/singleton.h
+++ b/lib/base/singleton.hpp
@@ -20,7 +20,7 @@
 #ifndef SINGLETON_H
 #define SINGLETON_H
 
-#include "base/i2-base.h"
+#include "base/i2-base.hpp"
 #include <boost/thread/mutex.hpp>
 
 namespace icinga
diff --git a/lib/base/socket.cpp b/lib/base/socket.cpp
index 3ea9f8255..2246ba6e0 100644
--- a/lib/base/socket.cpp
+++ b/lib/base/socket.cpp
@@ -17,10 +17,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/socket.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
-#include "base/exception.h"
+#include "base/socket.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
 #include <sstream>
 #include <boost/exception/errinfo_api_function.hpp>
 #include <boost/exception/errinfo_errno.hpp>
diff --git a/lib/base/socket.h b/lib/base/socket.hpp
similarity index 97%
rename from lib/base/socket.h
rename to lib/base/socket.hpp
index f055ce521..7dc3dca78 100644
--- a/lib/base/socket.h
+++ b/lib/base/socket.hpp
@@ -20,8 +20,8 @@
 #ifndef SOCKET_H
 #define SOCKET_H
 
-#include "base/i2-base.h"
-#include "base/stream.h"
+#include "base/i2-base.hpp"
+#include "base/stream.hpp"
 #include <boost/thread/thread.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition_variable.hpp>
diff --git a/lib/base/stacktrace.cpp b/lib/base/stacktrace.cpp
index 99dba39bc..04d0d6517 100644
--- a/lib/base/stacktrace.cpp
+++ b/lib/base/stacktrace.cpp
@@ -17,10 +17,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/stacktrace.h"
-#include "base/qstring.h"
-#include "base/utility.h"
-#include "base/initialize.h"
+#include "base/stacktrace.hpp"
+#include "base/qstring.hpp"
+#include "base/utility.hpp"
+#include "base/initialize.hpp"
 
 #ifdef HAVE_BACKTRACE_SYMBOLS
 #	include <execinfo.h>
diff --git a/lib/base/stacktrace.h b/lib/base/stacktrace.hpp
similarity index 98%
rename from lib/base/stacktrace.h
rename to lib/base/stacktrace.hpp
index 8a634ef76..91d428f1d 100644
--- a/lib/base/stacktrace.h
+++ b/lib/base/stacktrace.hpp
@@ -20,7 +20,7 @@
 #ifndef STACKTRACE_H
 #define STACKTRACE_H
 
-#include "base/i2-base.h"
+#include "base/i2-base.hpp"
 #include <ostream>
 
 namespace icinga
diff --git a/lib/base/statsfunction.cpp b/lib/base/statsfunction.cpp
index bbaaf4448..cfaa50fc2 100644
--- a/lib/base/statsfunction.cpp
+++ b/lib/base/statsfunction.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/statsfunction.h"
-#include "base/registry.h"
-#include "base/singleton.h"
+#include "base/statsfunction.hpp"
+#include "base/registry.hpp"
+#include "base/singleton.hpp"
 
 using namespace icinga;
 
diff --git a/lib/base/statsfunction.h b/lib/base/statsfunction.hpp
similarity index 95%
rename from lib/base/statsfunction.h
rename to lib/base/statsfunction.hpp
index 2d0bfacaa..d38073a5a 100644
--- a/lib/base/statsfunction.h
+++ b/lib/base/statsfunction.hpp
@@ -20,10 +20,10 @@
 #ifndef STATSFUNCTION_H
 #define STATSFUNCTION_H
 
-#include "base/i2-base.h"
-#include "base/registry.h"
-#include "base/value.h"
-#include "base/dictionary.h"
+#include "base/i2-base.hpp"
+#include "base/registry.hpp"
+#include "base/value.hpp"
+#include "base/dictionary.hpp"
 #include <boost/function.hpp>
 
 namespace icinga
diff --git a/lib/base/stdiostream.cpp b/lib/base/stdiostream.cpp
index 7027dbfdb..097b12d28 100644
--- a/lib/base/stdiostream.cpp
+++ b/lib/base/stdiostream.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/stdiostream.h"
-#include "base/objectlock.h"
+#include "base/stdiostream.hpp"
+#include "base/objectlock.hpp"
 
 using namespace icinga;
 
diff --git a/lib/base/stdiostream.h b/lib/base/stdiostream.hpp
similarity index 97%
rename from lib/base/stdiostream.h
rename to lib/base/stdiostream.hpp
index fcff20987..b79fcceff 100644
--- a/lib/base/stdiostream.h
+++ b/lib/base/stdiostream.hpp
@@ -20,8 +20,8 @@
 #ifndef STDIOSTREAM_H
 #define STDIOSTREAM_H
 
-#include "base/i2-base.h"
-#include "base/stream.h"
+#include "base/i2-base.hpp"
+#include "base/stream.hpp"
 #include <iostream>
 
 namespace icinga {
diff --git a/lib/base/stream.cpp b/lib/base/stream.cpp
index a8436838a..827e6680e 100644
--- a/lib/base/stream.cpp
+++ b/lib/base/stream.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/stream.h"
-#include "base/qstring.h"
+#include "base/stream.hpp"
+#include "base/qstring.hpp"
 #include <boost/algorithm/string/trim.hpp>
 
 using namespace icinga;
diff --git a/lib/base/stream.h b/lib/base/stream.hpp
similarity index 98%
rename from lib/base/stream.h
rename to lib/base/stream.hpp
index 5b91c6459..2c8c76fc7 100644
--- a/lib/base/stream.h
+++ b/lib/base/stream.hpp
@@ -20,8 +20,8 @@
 #ifndef STREAM_H
 #define STREAM_H
 
-#include "base/i2-base.h"
-#include "base/object.h"
+#include "base/i2-base.hpp"
+#include "base/object.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/streamlogger.cpp b/lib/base/streamlogger.cpp
index 822e94a36..5ff650ffb 100644
--- a/lib/base/streamlogger.cpp
+++ b/lib/base/streamlogger.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/streamlogger.h"
-#include "base/utility.h"
-#include "base/objectlock.h"
+#include "base/streamlogger.hpp"
+#include "base/utility.hpp"
+#include "base/objectlock.hpp"
 #include <iostream>
 
 using namespace icinga;
diff --git a/lib/base/streamlogger.h b/lib/base/streamlogger.hpp
similarity index 96%
rename from lib/base/streamlogger.h
rename to lib/base/streamlogger.hpp
index 1d7246009..be854449c 100644
--- a/lib/base/streamlogger.h
+++ b/lib/base/streamlogger.hpp
@@ -20,9 +20,9 @@
 #ifndef STREAMLOGGER_H
 #define STREAMLOGGER_H
 
-#include "base/i2-base.h"
-#include "base/streamlogger.th"
-#include "base/timer.h"
+#include "base/i2-base.hpp"
+#include "base/streamlogger.thpp"
+#include "base/timer.hpp"
 #include <ostream>
 
 namespace icinga
diff --git a/lib/base/streamlogger.ti b/lib/base/streamlogger.ti
index 66779362c..7be9c0355 100644
--- a/lib/base/streamlogger.ti
+++ b/lib/base/streamlogger.ti
@@ -1,4 +1,4 @@
-#include "base/logger.h"
+#include "base/logger.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/sysloglogger.cpp b/lib/base/sysloglogger.cpp
index 4cd4433ce..b41ab7aa2 100644
--- a/lib/base/sysloglogger.cpp
+++ b/lib/base/sysloglogger.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/sysloglogger.h"
-#include "base/dynamictype.h"
-#include "base/statsfunction.h"
+#include "base/sysloglogger.hpp"
+#include "base/dynamictype.hpp"
+#include "base/statsfunction.hpp"
 
 #ifndef _WIN32
 using namespace icinga;
diff --git a/lib/base/sysloglogger.h b/lib/base/sysloglogger.hpp
similarity index 96%
rename from lib/base/sysloglogger.h
rename to lib/base/sysloglogger.hpp
index 7eaa942ef..38634f738 100644
--- a/lib/base/sysloglogger.h
+++ b/lib/base/sysloglogger.hpp
@@ -20,8 +20,8 @@
 #ifndef SYSLOGLOGGER_H
 #define SYSLOGLOGGER_H
 
-#include "base/i2-base.h"
-#include "base/sysloglogger.th"
+#include "base/i2-base.hpp"
+#include "base/sysloglogger.thpp"
 
 #ifndef _WIN32
 namespace icinga
diff --git a/lib/base/sysloglogger.ti b/lib/base/sysloglogger.ti
index 286e4fcdf..08272ccf1 100644
--- a/lib/base/sysloglogger.ti
+++ b/lib/base/sysloglogger.ti
@@ -1,4 +1,4 @@
-#include "base/logger.h"
+#include "base/logger.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/tcpsocket.cpp b/lib/base/tcpsocket.cpp
index 3463ec195..8ce5f575f 100644
--- a/lib/base/tcpsocket.cpp
+++ b/lib/base/tcpsocket.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/tcpsocket.h"
-#include "base/exception.h"
+#include "base/tcpsocket.hpp"
+#include "base/exception.hpp"
 #include <boost/exception/errinfo_api_function.hpp>
 #include <boost/exception/errinfo_errno.hpp>
 
diff --git a/lib/base/tcpsocket.h b/lib/base/tcpsocket.hpp
similarity index 97%
rename from lib/base/tcpsocket.h
rename to lib/base/tcpsocket.hpp
index d73bb874a..902874eaf 100644
--- a/lib/base/tcpsocket.h
+++ b/lib/base/tcpsocket.hpp
@@ -20,8 +20,8 @@
 #ifndef TCPSOCKET_H
 #define TCPSOCKET_H
 
-#include "base/i2-base.h"
-#include "base/socket.h"
+#include "base/i2-base.hpp"
+#include "base/socket.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/threadpool.cpp b/lib/base/threadpool.cpp
index d79ec2cb2..b2eb754bd 100644
--- a/lib/base/threadpool.cpp
+++ b/lib/base/threadpool.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/threadpool.h"
-#include "base/logger_fwd.h"
-#include "base/debug.h"
-#include "base/utility.h"
-#include "base/exception.h"
+#include "base/threadpool.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/debug.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
 #include <boost/bind.hpp>
 #include <iostream>
 
diff --git a/lib/base/threadpool.h b/lib/base/threadpool.hpp
similarity index 99%
rename from lib/base/threadpool.h
rename to lib/base/threadpool.hpp
index 04b4fb857..27d9e53d3 100644
--- a/lib/base/threadpool.h
+++ b/lib/base/threadpool.hpp
@@ -20,7 +20,7 @@
 #ifndef THREADPOOL_H
 #define THREADPOOL_H
 
-#include "base/i2-base.h"
+#include "base/i2-base.hpp"
 #include <boost/function.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/mutex.hpp>
diff --git a/lib/base/timer.cpp b/lib/base/timer.cpp
index 2d558ff05..1fac02c0f 100644
--- a/lib/base/timer.cpp
+++ b/lib/base/timer.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/timer.h"
-#include "base/debug.h"
-#include "base/utility.h"
+#include "base/timer.hpp"
+#include "base/debug.hpp"
+#include "base/utility.hpp"
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/thread/thread.hpp>
diff --git a/lib/base/timer.h b/lib/base/timer.hpp
similarity index 97%
rename from lib/base/timer.h
rename to lib/base/timer.hpp
index cb0a81320..394ecf69e 100644
--- a/lib/base/timer.h
+++ b/lib/base/timer.hpp
@@ -20,8 +20,8 @@
 #ifndef TIMER_H
 #define TIMER_H
 
-#include "base/i2-base.h"
-#include "base/object.h"
+#include "base/i2-base.hpp"
+#include "base/object.hpp"
 #include <boost/signals2.hpp>
 
 namespace icinga {
diff --git a/lib/base/tlsstream.cpp b/lib/base/tlsstream.cpp
index 0a68408e9..120f673b4 100644
--- a/lib/base/tlsstream.cpp
+++ b/lib/base/tlsstream.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/tlsstream.h"
-#include "base/utility.h"
-#include "base/exception.h"
+#include "base/tlsstream.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
 #include <boost/bind.hpp>
 
 using namespace icinga;
diff --git a/lib/base/tlsstream.h b/lib/base/tlsstream.hpp
similarity index 95%
rename from lib/base/tlsstream.h
rename to lib/base/tlsstream.hpp
index fc8f5c325..0d26656d0 100644
--- a/lib/base/tlsstream.h
+++ b/lib/base/tlsstream.hpp
@@ -20,10 +20,10 @@
 #ifndef TLSSTREAM_H
 #define TLSSTREAM_H
 
-#include "base/i2-base.h"
-#include "base/socket.h"
-#include "base/stream.h"
-#include "base/tlsutility.h"
+#include "base/i2-base.hpp"
+#include "base/socket.hpp"
+#include "base/stream.hpp"
+#include "base/tlsutility.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/tlsutility.cpp b/lib/base/tlsutility.cpp
index 50083ff53..d218974e3 100644
--- a/lib/base/tlsutility.cpp
+++ b/lib/base/tlsutility.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/tlsutility.h"
+#include "base/tlsutility.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/tlsutility.h b/lib/base/tlsutility.hpp
similarity index 96%
rename from lib/base/tlsutility.h
rename to lib/base/tlsutility.hpp
index 8dcfdb154..51ece2bf1 100644
--- a/lib/base/tlsutility.h
+++ b/lib/base/tlsutility.hpp
@@ -20,10 +20,10 @@
 #ifndef TLSUTILITY_H
 #define TLSUTILITY_H
 
-#include "base/i2-base.h"
-#include "base/object.h"
-#include "base/qstring.h"
-#include "base/exception.h"
+#include "base/i2-base.hpp"
+#include "base/object.hpp"
+#include "base/qstring.hpp"
+#include "base/exception.hpp"
 #include <openssl/ssl.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
diff --git a/lib/base/type.cpp b/lib/base/type.cpp
index 54a446747..7c1c027c3 100644
--- a/lib/base/type.cpp
+++ b/lib/base/type.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/type.h"
+#include "base/type.hpp"
 
 using namespace icinga;
 
diff --git a/lib/base/type.h b/lib/base/type.hpp
similarity index 96%
rename from lib/base/type.h
rename to lib/base/type.hpp
index 8d5b4de95..b4966c0a9 100644
--- a/lib/base/type.h
+++ b/lib/base/type.hpp
@@ -20,10 +20,10 @@
 #ifndef TYPE_H
 #define TYPE_H
 
-#include "base/i2-base.h"
-#include "base/qstring.h"
-#include "base/object.h"
-#include "base/initialize.h"
+#include "base/i2-base.hpp"
+#include "base/qstring.hpp"
+#include "base/object.hpp"
+#include "base/initialize.hpp"
 #include <boost/function.hpp>
 
 namespace icinga
diff --git a/lib/base/unix.h b/lib/base/unix.hpp
similarity index 100%
rename from lib/base/unix.h
rename to lib/base/unix.hpp
diff --git a/lib/base/unixsocket.cpp b/lib/base/unixsocket.cpp
index 20a06d8f5..41fdf1e13 100644
--- a/lib/base/unixsocket.cpp
+++ b/lib/base/unixsocket.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/unixsocket.h"
-#include "base/exception.h"
+#include "base/unixsocket.hpp"
+#include "base/exception.hpp"
 
 #ifndef _WIN32
 using namespace icinga;
diff --git a/lib/base/unixsocket.h b/lib/base/unixsocket.hpp
similarity index 98%
rename from lib/base/unixsocket.h
rename to lib/base/unixsocket.hpp
index 3407ecfbc..f72ac9a93 100644
--- a/lib/base/unixsocket.h
+++ b/lib/base/unixsocket.hpp
@@ -20,7 +20,7 @@
 #ifndef UNIXSOCKET_H
 #define UNIXSOCKET_H
 
-#include "base/socket.h"
+#include "base/socket.hpp"
 
 #ifndef _WIN32
 namespace icinga
diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp
index be1a91ca7..1017346c9 100644
--- a/lib/base/utility.cpp
+++ b/lib/base/utility.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/utility.h"
-#include "base/convert.h"
-#include "base/application.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
+#include "base/utility.hpp"
+#include "base/convert.hpp"
+#include "base/application.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
 #include <mmatch.h>
 #include <boost/lexical_cast.hpp>
 #include <boost/foreach.hpp>
diff --git a/lib/base/utility.h b/lib/base/utility.hpp
similarity index 98%
rename from lib/base/utility.h
rename to lib/base/utility.hpp
index 7217f2715..2db598313 100644
--- a/lib/base/utility.h
+++ b/lib/base/utility.hpp
@@ -20,8 +20,8 @@
 #ifndef UTILITY_H
 #define UTILITY_H
 
-#include "base/i2-base.h"
-#include "base/qstring.h"
+#include "base/i2-base.hpp"
+#include "base/qstring.hpp"
 #include <typeinfo>
 #include <boost/function.hpp>
 #include <boost/thread/tss.hpp>
diff --git a/lib/base/value-operators.cpp b/lib/base/value-operators.cpp
index 95852f301..72e72b981 100644
--- a/lib/base/value-operators.cpp
+++ b/lib/base/value-operators.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/value.h"
-#include "base/array.h"
-#include "base/dictionary.h"
-#include "base/utility.h"
-#include "base/objectlock.h"
+#include "base/value.hpp"
+#include "base/array.hpp"
+#include "base/dictionary.hpp"
+#include "base/utility.hpp"
+#include "base/objectlock.hpp"
 #include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 
diff --git a/lib/base/value.cpp b/lib/base/value.cpp
index dfdc15a16..b4d1984a6 100644
--- a/lib/base/value.cpp
+++ b/lib/base/value.cpp
@@ -17,10 +17,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/value.h"
-#include "base/array.h"
-#include "base/dictionary.h"
-#include "base/type.h"
+#include "base/value.hpp"
+#include "base/array.hpp"
+#include "base/dictionary.hpp"
+#include "base/type.hpp"
 #include <cJSON.h>
 
 using namespace icinga;
diff --git a/lib/base/value.h b/lib/base/value.hpp
similarity index 99%
rename from lib/base/value.h
rename to lib/base/value.hpp
index 27698c20e..c4fa837a6 100644
--- a/lib/base/value.h
+++ b/lib/base/value.hpp
@@ -20,8 +20,8 @@
 #ifndef VALUE_H
 #define VALUE_H
 
-#include "base/object.h"
-#include "base/qstring.h"
+#include "base/object.hpp"
+#include "base/qstring.hpp"
 #include <boost/variant/variant.hpp>
 #include <boost/variant/get.hpp>
 
diff --git a/lib/base/visibility.h b/lib/base/visibility.hpp
similarity index 100%
rename from lib/base/visibility.h
rename to lib/base/visibility.hpp
diff --git a/lib/base/win32.h b/lib/base/win32.hpp
similarity index 100%
rename from lib/base/win32.h
rename to lib/base/win32.hpp
diff --git a/lib/base/workqueue.cpp b/lib/base/workqueue.cpp
index 912a01e2a..43594c425 100644
--- a/lib/base/workqueue.cpp
+++ b/lib/base/workqueue.cpp
@@ -17,10 +17,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/workqueue.h"
-#include "base/utility.h"
-#include "base/logger_fwd.h"
-#include "base/convert.h"
+#include "base/workqueue.hpp"
+#include "base/utility.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/convert.hpp"
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 
diff --git a/lib/base/workqueue.h b/lib/base/workqueue.hpp
similarity index 98%
rename from lib/base/workqueue.h
rename to lib/base/workqueue.hpp
index 0013aa6ab..9970c945a 100644
--- a/lib/base/workqueue.h
+++ b/lib/base/workqueue.hpp
@@ -20,8 +20,8 @@
 #ifndef WORKQUEUE_H
 #define WORKQUEUE_H
 
-#include "base/i2-base.h"
-#include "base/timer.h"
+#include "base/i2-base.hpp"
+#include "base/timer.hpp"
 #include <deque>
 #include <boost/function.hpp>
 #include <boost/thread/thread.hpp>
diff --git a/lib/config/aexpression.cpp b/lib/config/aexpression.cpp
index 0fcfa8734..864c5552a 100644
--- a/lib/config/aexpression.cpp
+++ b/lib/config/aexpression.cpp
@@ -17,20 +17,20 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/aexpression.h"
-#include "config/configerror.h"
-#include "config/configitem.h"
-#include "config/configitembuilder.h"
-#include "config/applyrule.h"
-#include "config/objectrule.h"
-#include "base/array.h"
-#include "base/serializer.h"
-#include "base/scriptfunction.h"
-#include "base/scriptvariable.h"
-#include "base/utility.h"
-#include "base/objectlock.h"
-#include "base/object.h"
-#include "base/logger_fwd.h"
+#include "config/aexpression.hpp"
+#include "config/configerror.hpp"
+#include "config/configitem.hpp"
+#include "config/configitembuilder.hpp"
+#include "config/applyrule.hpp"
+#include "config/objectrule.hpp"
+#include "base/array.hpp"
+#include "base/serializer.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/scriptvariable.hpp"
+#include "base/utility.hpp"
+#include "base/objectlock.hpp"
+#include "base/object.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 #include <boost/exception_ptr.hpp>
 #include <boost/exception/errinfo_nested_exception.hpp>
diff --git a/lib/config/aexpression.h b/lib/config/aexpression.hpp
similarity index 97%
rename from lib/config/aexpression.h
rename to lib/config/aexpression.hpp
index 5ab2da859..1e659ac39 100644
--- a/lib/config/aexpression.h
+++ b/lib/config/aexpression.hpp
@@ -20,10 +20,10 @@
 #ifndef AEXPRESSION_H
 #define AEXPRESSION_H
 
-#include "config/i2-config.h"
-#include "config/debuginfo.h"
-#include "base/array.h"
-#include "base/dictionary.h"
+#include "config/i2-config.hpp"
+#include "config/debuginfo.hpp"
+#include "base/array.hpp"
+#include "base/dictionary.hpp"
 
 namespace icinga
 {
diff --git a/lib/config/applyrule.cpp b/lib/config/applyrule.cpp
index 590a10bbc..aa58963b8 100644
--- a/lib/config/applyrule.cpp
+++ b/lib/config/applyrule.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/applyrule.h"
-#include "base/logger_fwd.h"
+#include "config/applyrule.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 #include <set>
 
diff --git a/lib/config/applyrule.h b/lib/config/applyrule.hpp
similarity index 96%
rename from lib/config/applyrule.h
rename to lib/config/applyrule.hpp
index 2ad7388b7..b6fc6088c 100644
--- a/lib/config/applyrule.h
+++ b/lib/config/applyrule.hpp
@@ -20,9 +20,9 @@
 #ifndef APPLYRULE_H
 #define APPLYRULE_H
 
-#include "config/i2-config.h"
-#include "config/aexpression.h"
-#include "config/debuginfo.h"
+#include "config/i2-config.hpp"
+#include "config/aexpression.hpp"
+#include "config/debuginfo.hpp"
 #include <boost/function.hpp>
 
 namespace icinga
diff --git a/lib/config/config_lexer.ll b/lib/config/config_lexer.ll
index 7f9353f39..3f593f373 100644
--- a/lib/config/config_lexer.ll
+++ b/lib/config/config_lexer.ll
@@ -18,10 +18,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/configcompiler.h"
-#include "config/typerule.h"
-#include "config/configcompilercontext.h"
-#include "config/aexpression.h"
+#include "config/configcompiler.hpp"
+#include "config/typerule.hpp"
+#include "config/configcompilercontext.hpp"
+#include "config/aexpression.hpp"
 
 using namespace icinga;
 
diff --git a/lib/config/config_parser.yy b/lib/config/config_parser.yy
index 3f25ec95d..1fe2b756e 100644
--- a/lib/config/config_parser.yy
+++ b/lib/config/config_parser.yy
@@ -20,24 +20,24 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "i2-config.h"
-#include "config/configitembuilder.h"
-#include "config/configtype.h"
-#include "config/configcompiler.h"
-#include "config/configcompilercontext.h"
-#include "config/configerror.h"
-#include "config/typerule.h"
-#include "config/typerulelist.h"
-#include "config/aexpression.h"
-#include "config/applyrule.h"
-#include "config/objectrule.h"
-#include "config/aexpression.h"
-#include "base/value.h"
-#include "base/utility.h"
-#include "base/array.h"
-#include "base/scriptvariable.h"
-#include "base/exception.h"
-#include "base/dynamictype.h"
+#include "config/i2-config.hpp"
+#include "config/configitembuilder.hpp"
+#include "config/configtype.hpp"
+#include "config/configcompiler.hpp"
+#include "config/configcompilercontext.hpp"
+#include "config/configerror.hpp"
+#include "config/typerule.hpp"
+#include "config/typerulelist.hpp"
+#include "config/aexpression.hpp"
+#include "config/applyrule.hpp"
+#include "config/objectrule.hpp"
+#include "config/aexpression.hpp"
+#include "base/value.hpp"
+#include "base/utility.hpp"
+#include "base/array.hpp"
+#include "base/scriptvariable.hpp"
+#include "base/exception.hpp"
+#include "base/dynamictype.hpp"
 #include <sstream>
 #include <stack>
 #include <boost/foreach.hpp>
diff --git a/lib/config/configcompiler.cpp b/lib/config/configcompiler.cpp
index 7f1c70dda..d9e78d061 100644
--- a/lib/config/configcompiler.cpp
+++ b/lib/config/configcompiler.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/configcompiler.h"
-#include "config/configitem.h"
-#include "base/logger_fwd.h"
-#include "base/utility.h"
-#include "base/context.h"
-#include "base/exception.h"
+#include "config/configcompiler.hpp"
+#include "config/configitem.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/utility.hpp"
+#include "base/context.hpp"
+#include "base/exception.hpp"
 #include <fstream>
 #include <boost/foreach.hpp>
 
diff --git a/lib/config/configcompiler.h b/lib/config/configcompiler.hpp
similarity index 95%
rename from lib/config/configcompiler.h
rename to lib/config/configcompiler.hpp
index b9631dc38..69557b797 100644
--- a/lib/config/configcompiler.h
+++ b/lib/config/configcompiler.hpp
@@ -20,11 +20,11 @@
 #ifndef CONFIGCOMPILER_H
 #define CONFIGCOMPILER_H
 
-#include "config/i2-config.h"
-#include "config/debuginfo.h"
-#include "base/registry.h"
-#include "base/initialize.h"
-#include "base/singleton.h"
+#include "config/i2-config.hpp"
+#include "config/debuginfo.hpp"
+#include "base/registry.hpp"
+#include "base/initialize.hpp"
+#include "base/singleton.hpp"
 #include <iostream>
 #include <boost/function.hpp>
 
diff --git a/lib/config/configcompilercontext.cpp b/lib/config/configcompilercontext.cpp
index 5f09855c9..b20684e6b 100644
--- a/lib/config/configcompilercontext.cpp
+++ b/lib/config/configcompilercontext.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/configcompilercontext.h"
-#include "base/singleton.h"
+#include "config/configcompilercontext.hpp"
+#include "base/singleton.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/config/configcompilercontext.h b/lib/config/configcompilercontext.hpp
similarity index 97%
rename from lib/config/configcompilercontext.h
rename to lib/config/configcompilercontext.hpp
index 096df0e80..d4319f0f9 100644
--- a/lib/config/configcompilercontext.h
+++ b/lib/config/configcompilercontext.hpp
@@ -20,8 +20,8 @@
 #ifndef CONFIGCOMPILERCONTEXT_H
 #define CONFIGCOMPILERCONTEXT_H
 
-#include "config/i2-config.h"
-#include "config/debuginfo.h"
+#include "config/i2-config.hpp"
+#include "config/debuginfo.hpp"
 #include <boost/thread/mutex.hpp>
 #include <vector>
 
diff --git a/lib/config/configerror.cpp b/lib/config/configerror.cpp
index bae40acca..845f359b6 100644
--- a/lib/config/configerror.cpp
+++ b/lib/config/configerror.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/configerror.h"
+#include "config/configerror.hpp"
 #include <sstream>
 
 using namespace icinga;
diff --git a/lib/config/configerror.h b/lib/config/configerror.hpp
similarity index 95%
rename from lib/config/configerror.h
rename to lib/config/configerror.hpp
index c60725b99..dc085c00d 100644
--- a/lib/config/configerror.h
+++ b/lib/config/configerror.hpp
@@ -20,9 +20,9 @@
 #ifndef CONFIGERROR_H
 #define CONFIGERROR_H
 
-#include "config/i2-config.h"
-#include "config/debuginfo.h"
-#include "base/exception.h"
+#include "config/i2-config.hpp"
+#include "config/debuginfo.hpp"
+#include "base/exception.hpp"
 
 namespace icinga
 {
diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index d66aee262..3a3b15a04 100644
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -17,19 +17,19 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/configitem.h"
-#include "config/configcompilercontext.h"
-#include "config/applyrule.h"
-#include "config/objectrule.h"
-#include "config/configtype.h"
-#include "base/application.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/logger_fwd.h"
-#include "base/debug.h"
-#include "base/workqueue.h"
-#include "base/exception.h"
+#include "config/configitem.hpp"
+#include "config/configcompilercontext.hpp"
+#include "config/applyrule.hpp"
+#include "config/objectrule.hpp"
+#include "config/configtype.hpp"
+#include "base/application.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/debug.hpp"
+#include "base/workqueue.hpp"
+#include "base/exception.hpp"
 #include <sstream>
 #include <boost/foreach.hpp>
 
diff --git a/lib/config/configitem.h b/lib/config/configitem.hpp
similarity index 97%
rename from lib/config/configitem.h
rename to lib/config/configitem.hpp
index 4cd7acc4e..7c79cbb03 100644
--- a/lib/config/configitem.h
+++ b/lib/config/configitem.hpp
@@ -20,9 +20,9 @@
 #ifndef CONFIGITEM_H
 #define CONFIGITEM_H
 
-#include "config/i2-config.h"
-#include "config/aexpression.h"
-#include "base/dynamicobject.h"
+#include "config/i2-config.hpp"
+#include "config/aexpression.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/config/configitembuilder.cpp b/lib/config/configitembuilder.cpp
index f9713afde..6de15f19f 100644
--- a/lib/config/configitembuilder.cpp
+++ b/lib/config/configitembuilder.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/configitembuilder.h"
-#include "base/dynamictype.h"
+#include "config/configitembuilder.hpp"
+#include "base/dynamictype.hpp"
 #include <sstream>
 #include <boost/foreach.hpp>
 
diff --git a/lib/config/configitembuilder.h b/lib/config/configitembuilder.hpp
similarity index 95%
rename from lib/config/configitembuilder.h
rename to lib/config/configitembuilder.hpp
index afad84759..9c9a2a842 100644
--- a/lib/config/configitembuilder.h
+++ b/lib/config/configitembuilder.hpp
@@ -20,10 +20,10 @@
 #ifndef CONFIGITEMBUILDER_H
 #define CONFIGITEMBUILDER_H
 
-#include "config/debuginfo.h"
-#include "config/aexpression.h"
-#include "config/configitem.h"
-#include "base/object.h"
+#include "config/debuginfo.hpp"
+#include "config/aexpression.hpp"
+#include "config/configitem.hpp"
+#include "base/object.hpp"
 
 namespace icinga
 {
diff --git a/lib/config/configtype.cpp b/lib/config/configtype.cpp
index 1e3b065cc..3c15d09de 100644
--- a/lib/config/configtype.cpp
+++ b/lib/config/configtype.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/configtype.h"
-#include "config/configcompilercontext.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/singleton.h"
-#include "base/scriptfunction.h"
+#include "config/configtype.hpp"
+#include "config/configcompilercontext.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/singleton.hpp"
+#include "base/scriptfunction.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/config/configtype.h b/lib/config/configtype.hpp
similarity index 91%
rename from lib/config/configtype.h
rename to lib/config/configtype.hpp
index 020c3cda4..3b62d96db 100644
--- a/lib/config/configtype.h
+++ b/lib/config/configtype.hpp
@@ -20,12 +20,12 @@
 #ifndef CONFIGTYPE_H
 #define CONFIGTYPE_H
 
-#include "config/i2-config.h"
-#include "config/typerulelist.h"
-#include "config/typerule.h"
-#include "config/configitem.h"
-#include "base/array.h"
-#include "base/registry.h"
+#include "config/i2-config.hpp"
+#include "config/typerulelist.hpp"
+#include "config/typerule.hpp"
+#include "config/configitem.hpp"
+#include "base/array.hpp"
+#include "base/registry.hpp"
 
 namespace icinga
 {
diff --git a/lib/config/debuginfo.cpp b/lib/config/debuginfo.cpp
index 51775a00b..1fbbe8ba7 100644
--- a/lib/config/debuginfo.cpp
+++ b/lib/config/debuginfo.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/debuginfo.h"
-#include "base/convert.h"
+#include "config/debuginfo.hpp"
+#include "base/convert.hpp"
 #include <fstream>
 
 using namespace icinga;
diff --git a/lib/config/debuginfo.h b/lib/config/debuginfo.hpp
similarity index 97%
rename from lib/config/debuginfo.h
rename to lib/config/debuginfo.hpp
index 415f0bea7..84c97e74d 100644
--- a/lib/config/debuginfo.h
+++ b/lib/config/debuginfo.hpp
@@ -20,8 +20,8 @@
 #ifndef DEBUGINFO_H
 #define DEBUGINFO_H
 
-#include "config/i2-config.h"
-#include "base/qstring.h"
+#include "config/i2-config.hpp"
+#include "base/qstring.hpp"
 
 namespace icinga
 {
diff --git a/lib/config/i2-config.h b/lib/config/i2-config.hpp
similarity index 98%
rename from lib/config/i2-config.h
rename to lib/config/i2-config.hpp
index 9518b58c9..5c005ff49 100644
--- a/lib/config/i2-config.h
+++ b/lib/config/i2-config.hpp
@@ -28,7 +28,7 @@
  * at runtime.
  */
 
-#include "base/i2-base.h"
+#include "base/i2-base.hpp"
 
 #ifdef I2_CONFIG_BUILD
 #	define I2_CONFIG_API I2_EXPORT
diff --git a/lib/config/objectrule.cpp b/lib/config/objectrule.cpp
index 67a78153a..ace1ca8b7 100644
--- a/lib/config/objectrule.cpp
+++ b/lib/config/objectrule.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/objectrule.h"
+#include "config/objectrule.hpp"
 #include <boost/foreach.hpp>
 #include <set>
 
diff --git a/lib/config/objectrule.h b/lib/config/objectrule.hpp
similarity index 95%
rename from lib/config/objectrule.h
rename to lib/config/objectrule.hpp
index 530fd35bf..6098fb60a 100644
--- a/lib/config/objectrule.h
+++ b/lib/config/objectrule.hpp
@@ -20,10 +20,10 @@
 #ifndef OBJECTRULE_H
 #define OBJECTRULE_H
 
-#include "config/i2-config.h"
-#include "config/aexpression.h"
-#include "config/debuginfo.h"
-#include "base/dynamictype.h"
+#include "config/i2-config.hpp"
+#include "config/aexpression.hpp"
+#include "config/debuginfo.hpp"
+#include "base/dynamictype.hpp"
 
 namespace icinga
 {
diff --git a/lib/config/typerule.cpp b/lib/config/typerule.cpp
index 2cba290cc..fd33429a6 100644
--- a/lib/config/typerule.cpp
+++ b/lib/config/typerule.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/typerule.h"
-#include "config/configitem.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/dictionary.h"
-#include "base/array.h"
+#include "config/typerule.hpp"
+#include "config/configitem.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/dictionary.hpp"
+#include "base/array.hpp"
 
 using namespace icinga;
 
diff --git a/lib/config/typerule.h b/lib/config/typerule.hpp
similarity index 92%
rename from lib/config/typerule.h
rename to lib/config/typerule.hpp
index 481260aee..8a1ab737e 100644
--- a/lib/config/typerule.h
+++ b/lib/config/typerule.hpp
@@ -20,9 +20,9 @@
 #ifndef TYPERULE_H
 #define TYPERULE_H
 
-#include "config/i2-config.h"
-#include "config/typerulelist.h"
-#include "config/debuginfo.h"
+#include "config/i2-config.hpp"
+#include "config/typerulelist.hpp"
+#include "config/debuginfo.hpp"
 
 namespace icinga
 {
diff --git a/lib/config/typerulelist.cpp b/lib/config/typerulelist.cpp
index 45c6b57b3..9f48fbf15 100644
--- a/lib/config/typerulelist.cpp
+++ b/lib/config/typerulelist.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "config/typerulelist.h"
-#include "config/typerule.h"
+#include "config/typerulelist.hpp"
+#include "config/typerule.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/config/typerulelist.h b/lib/config/typerulelist.hpp
similarity index 94%
rename from lib/config/typerulelist.h
rename to lib/config/typerulelist.hpp
index f28c6501b..0c6a1504e 100644
--- a/lib/config/typerulelist.h
+++ b/lib/config/typerulelist.hpp
@@ -20,8 +20,8 @@
 #ifndef TYPERULELIST_H
 #define TYPERULELIST_H
 
-#include "config/i2-config.h"
-#include "base/value.h"
+#include "config/i2-config.hpp"
+#include "base/value.hpp"
 #include <vector>
 
 namespace icinga
diff --git a/lib/db_ido/CMakeLists.txt b/lib/db_ido/CMakeLists.txt
index 9b92fa8e6..43f7b6548 100644
--- a/lib/db_ido/CMakeLists.txt
+++ b/lib/db_ido/CMakeLists.txt
@@ -15,12 +15,12 @@
 # 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.th)
+mkclass_target(dbconnection.ti dbconnection.thpp)
 
 mkembedconfig_target(db_ido-type.conf db_ido-type.cpp)
 
 add_library(db_ido SHARED
-  commanddbobject.cpp dbconnection.cpp dbconnection.th dbconnection.th
+  commanddbobject.cpp dbconnection.cpp dbconnection.thpp dbconnection.thpp
   db_ido-type.cpp dbevents.cpp dbobject.cpp dbquery.cpp dbreference.cpp dbtype.cpp
   dbvalue.cpp endpointdbobject.cpp hostdbobject.cpp hostgroupdbobject.cpp
   servicedbobject.cpp servicegroupdbobject.cpp timeperioddbobject.cpp
diff --git a/lib/db_ido/commanddbobject.cpp b/lib/db_ido/commanddbobject.cpp
index 63e6ec941..eb4ba237f 100644
--- a/lib/db_ido/commanddbobject.cpp
+++ b/lib/db_ido/commanddbobject.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/commanddbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "icinga/command.h"
-#include "icinga/compatutility.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
+#include "db_ido/commanddbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "icinga/command.hpp"
+#include "icinga/compatutility.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/db_ido/commanddbobject.h b/lib/db_ido/commanddbobject.hpp
similarity index 96%
rename from lib/db_ido/commanddbobject.h
rename to lib/db_ido/commanddbobject.hpp
index 7e3816eda..ed6250c8c 100644
--- a/lib/db_ido/commanddbobject.h
+++ b/lib/db_ido/commanddbobject.hpp
@@ -20,8 +20,8 @@
 #ifndef COMMANDDBOBJECT_H
 #define COMMANDDBOBJECT_H
 
-#include "db_ido/dbobject.h"
-#include "base/dynamicobject.h"
+#include "db_ido/dbobject.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp
index 493733d97..751f56922 100644
--- a/lib/db_ido/dbconnection.cpp
+++ b/lib/db_ido/dbconnection.cpp
@@ -17,17 +17,17 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/dbconnection.h"
-#include "db_ido/dbvalue.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/host.h"
-#include "icinga/service.h"
-#include "base/dynamictype.h"
-#include "base/convert.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
-#include "base/initialize.h"
-#include "base/logger_fwd.h"
+#include "db_ido/dbconnection.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/host.hpp"
+#include "icinga/service.hpp"
+#include "base/dynamictype.hpp"
+#include "base/convert.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
+#include "base/initialize.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/db_ido/dbconnection.h b/lib/db_ido/dbconnection.hpp
similarity index 96%
rename from lib/db_ido/dbconnection.h
rename to lib/db_ido/dbconnection.hpp
index 110528004..1a0e14951 100644
--- a/lib/db_ido/dbconnection.h
+++ b/lib/db_ido/dbconnection.hpp
@@ -20,11 +20,11 @@
 #ifndef DBCONNECTION_H
 #define DBCONNECTION_H
 
-#include "db_ido/i2-db_ido.h"
-#include "db_ido/dbconnection.th"
-#include "db_ido/dbobject.h"
-#include "db_ido/dbquery.h"
-#include "base/timer.h"
+#include "db_ido/i2-db_ido.hpp"
+#include "db_ido/dbconnection.thpp"
+#include "db_ido/dbobject.hpp"
+#include "db_ido/dbquery.hpp"
+#include "base/timer.hpp"
 
 namespace icinga
 {
diff --git a/lib/db_ido/dbconnection.ti b/lib/db_ido/dbconnection.ti
index 4056deeb7..d71af8517 100644
--- a/lib/db_ido/dbconnection.ti
+++ b/lib/db_ido/dbconnection.ti
@@ -1,5 +1,5 @@
-#include "db_ido/dbquery.h"
-#include "base/dynamicobject.h"
+#include "db_ido/dbquery.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/db_ido/dbevents.cpp b/lib/db_ido/dbevents.cpp
index 189d600d6..a244cfffb 100644
--- a/lib/db_ido/dbevents.cpp
+++ b/lib/db_ido/dbevents.cpp
@@ -17,22 +17,22 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/dbevents.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "base/convert.h"
-#include "base/objectlock.h"
-#include "base/initialize.h"
-#include "base/dynamictype.h"
-#include "base/utility.h"
-#include "base/logger_fwd.h"
-#include "remote/endpoint.h"
-#include "icinga/notification.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/externalcommandprocessor.h"
-#include "icinga/compatutility.h"
-#include "icinga/icingaapplication.h"
+#include "db_ido/dbevents.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "base/convert.hpp"
+#include "base/objectlock.hpp"
+#include "base/initialize.hpp"
+#include "base/dynamictype.hpp"
+#include "base/utility.hpp"
+#include "base/logger_fwd.hpp"
+#include "remote/endpoint.hpp"
+#include "icinga/notification.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/externalcommandprocessor.hpp"
+#include "icinga/compatutility.hpp"
+#include "icinga/icingaapplication.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/join.hpp>
 
diff --git a/lib/db_ido/dbevents.h b/lib/db_ido/dbevents.hpp
similarity index 98%
rename from lib/db_ido/dbevents.h
rename to lib/db_ido/dbevents.hpp
index 6c55cd55a..f21e925de 100644
--- a/lib/db_ido/dbevents.h
+++ b/lib/db_ido/dbevents.hpp
@@ -20,9 +20,9 @@
 #ifndef DBEVENTS_H
 #define DBEVENTS_H
 
-#include "db_ido/dbobject.h"
-#include "base/dynamicobject.h"
-#include "icinga/service.h"
+#include "db_ido/dbobject.hpp"
+#include "base/dynamicobject.hpp"
+#include "icinga/service.hpp"
 
 namespace icinga
 {
diff --git a/lib/db_ido/dbobject.cpp b/lib/db_ido/dbobject.cpp
index fc66f3941..aa635b744 100644
--- a/lib/db_ido/dbobject.cpp
+++ b/lib/db_ido/dbobject.cpp
@@ -17,20 +17,20 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/dbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "icinga/customvarobject.h"
-#include "icinga/service.h"
-#include "icinga/compatutility.h"
-#include "remote/endpoint.h"
-#include "base/dynamicobject.h"
-#include "base/dynamictype.h"
-#include "base/convert.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
-#include "base/initialize.h"
-#include "base/logger_fwd.h"
+#include "db_ido/dbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "icinga/customvarobject.hpp"
+#include "icinga/service.hpp"
+#include "icinga/compatutility.hpp"
+#include "remote/endpoint.hpp"
+#include "base/dynamicobject.hpp"
+#include "base/dynamictype.hpp"
+#include "base/convert.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
+#include "base/initialize.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/db_ido/dbobject.h b/lib/db_ido/dbobject.hpp
similarity index 94%
rename from lib/db_ido/dbobject.h
rename to lib/db_ido/dbobject.hpp
index a4daf9764..80f85bbd2 100644
--- a/lib/db_ido/dbobject.h
+++ b/lib/db_ido/dbobject.hpp
@@ -20,12 +20,12 @@
 #ifndef DBOBJECT_H
 #define DBOBJECT_H
 
-#include "db_ido/i2-db_ido.h"
-#include "db_ido/dbreference.h"
-#include "db_ido/dbquery.h"
-#include "db_ido/dbtype.h"
-#include "icinga/customvarobject.h"
-#include "base/dynamicobject.h"
+#include "db_ido/i2-db_ido.hpp"
+#include "db_ido/dbreference.hpp"
+#include "db_ido/dbquery.hpp"
+#include "db_ido/dbtype.hpp"
+#include "icinga/customvarobject.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/db_ido/dbquery.cpp b/lib/db_ido/dbquery.cpp
index 5e5798baa..2ecccbf5c 100644
--- a/lib/db_ido/dbquery.cpp
+++ b/lib/db_ido/dbquery.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/dbquery.h"
-#include "base/initialize.h"
-#include "base/scriptvariable.h"
+#include "db_ido/dbquery.hpp"
+#include "base/initialize.hpp"
+#include "base/scriptvariable.hpp"
 
 using namespace icinga;
 
diff --git a/lib/db_ido/dbquery.h b/lib/db_ido/dbquery.hpp
similarity index 94%
rename from lib/db_ido/dbquery.h
rename to lib/db_ido/dbquery.hpp
index df5dc8146..4d5faa03a 100644
--- a/lib/db_ido/dbquery.h
+++ b/lib/db_ido/dbquery.hpp
@@ -20,10 +20,10 @@
 #ifndef DBQUERY_H
 #define DBQUERY_H
 
-#include "db_ido/i2-db_ido.h"
-#include "icinga/customvarobject.h"
-#include "base/dictionary.h"
-#include "base/dynamicobject.h"
+#include "db_ido/i2-db_ido.hpp"
+#include "icinga/customvarobject.hpp"
+#include "base/dictionary.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/db_ido/dbreference.cpp b/lib/db_ido/dbreference.cpp
index 00dfb502d..cc6ef31c9 100644
--- a/lib/db_ido/dbreference.cpp
+++ b/lib/db_ido/dbreference.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "dbreference.h"
+#include "dbreference.hpp"
 
 using namespace icinga;
 
diff --git a/lib/db_ido/dbreference.h b/lib/db_ido/dbreference.hpp
similarity index 98%
rename from lib/db_ido/dbreference.h
rename to lib/db_ido/dbreference.hpp
index b88125ce0..20166ef3a 100644
--- a/lib/db_ido/dbreference.h
+++ b/lib/db_ido/dbreference.hpp
@@ -20,7 +20,7 @@
 #ifndef DBREFERENCE_H
 #define DBREFERENCE_H
 
-#include "db_ido/i2-db_ido.h"
+#include "db_ido/i2-db_ido.hpp"
 
 namespace icinga
 {
diff --git a/lib/db_ido/dbtype.cpp b/lib/db_ido/dbtype.cpp
index 4521fec26..ca96498d7 100644
--- a/lib/db_ido/dbtype.cpp
+++ b/lib/db_ido/dbtype.cpp
@@ -17,10 +17,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/dbtype.h"
-#include "db_ido/dbconnection.h"
-#include "base/objectlock.h"
-#include "base/debug.h"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbconnection.hpp"
+#include "base/objectlock.hpp"
+#include "base/debug.hpp"
 #include <boost/thread/once.hpp>
 #include <boost/foreach.hpp>
 
diff --git a/lib/db_ido/dbtype.h b/lib/db_ido/dbtype.hpp
similarity index 97%
rename from lib/db_ido/dbtype.h
rename to lib/db_ido/dbtype.hpp
index 50ebe9e87..199a04b2c 100644
--- a/lib/db_ido/dbtype.h
+++ b/lib/db_ido/dbtype.hpp
@@ -20,10 +20,10 @@
 #ifndef DBTYPE_H
 #define DBTYPE_H
 
-#include "db_ido/i2-db_ido.h"
-#include "base/object.h"
-#include "base/registry.h"
-#include "base/singleton.h"
+#include "db_ido/i2-db_ido.hpp"
+#include "base/object.hpp"
+#include "base/registry.hpp"
+#include "base/singleton.hpp"
 #include <set>
 
 namespace icinga
diff --git a/lib/db_ido/dbvalue.cpp b/lib/db_ido/dbvalue.cpp
index a62f8cf82..a1b4242de 100644
--- a/lib/db_ido/dbvalue.cpp
+++ b/lib/db_ido/dbvalue.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/dbvalue.h"
+#include "db_ido/dbvalue.hpp"
 
 using namespace icinga;
 
diff --git a/lib/db_ido/dbvalue.h b/lib/db_ido/dbvalue.hpp
similarity index 96%
rename from lib/db_ido/dbvalue.h
rename to lib/db_ido/dbvalue.hpp
index c43181530..1c7e184ab 100644
--- a/lib/db_ido/dbvalue.h
+++ b/lib/db_ido/dbvalue.hpp
@@ -20,9 +20,9 @@
 #ifndef DBVALUE_H
 #define DBVALUE_H
 
-#include "db_ido/i2-db_ido.h"
-#include "base/object.h"
-#include "base/value.h"
+#include "db_ido/i2-db_ido.hpp"
+#include "base/object.hpp"
+#include "base/value.hpp"
 
 namespace icinga
 {
diff --git a/lib/db_ido/endpointdbobject.cpp b/lib/db_ido/endpointdbobject.cpp
index 13615fbbd..2f74fa9c8 100644
--- a/lib/db_ido/endpointdbobject.cpp
+++ b/lib/db_ido/endpointdbobject.cpp
@@ -17,16 +17,16 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/endpointdbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "icinga/icingaapplication.h"
-#include "base/objectlock.h"
-#include "base/initialize.h"
-#include "base/dynamictype.h"
-#include "base/utility.h"
-#include "base/convert.h"
-#include "base/logger_fwd.h"
+#include "db_ido/endpointdbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/objectlock.hpp"
+#include "base/initialize.hpp"
+#include "base/dynamictype.hpp"
+#include "base/utility.hpp"
+#include "base/convert.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/db_ido/endpointdbobject.h b/lib/db_ido/endpointdbobject.hpp
similarity index 95%
rename from lib/db_ido/endpointdbobject.h
rename to lib/db_ido/endpointdbobject.hpp
index e2cf45e48..d65665371 100644
--- a/lib/db_ido/endpointdbobject.h
+++ b/lib/db_ido/endpointdbobject.hpp
@@ -20,9 +20,9 @@
 #ifndef ENDPOINTDBOBJECT_H
 #define ENDPOINTDBOBJECT_H
 
-#include "db_ido/dbobject.h"
-#include "base/dynamicobject.h"
-#include "remote/endpoint.h"
+#include "db_ido/dbobject.hpp"
+#include "base/dynamicobject.hpp"
+#include "remote/endpoint.hpp"
 
 namespace icinga
 {
diff --git a/lib/db_ido/hostdbobject.cpp b/lib/db_ido/hostdbobject.cpp
index abb9fcdcc..db6070e54 100644
--- a/lib/db_ido/hostdbobject.cpp
+++ b/lib/db_ido/hostdbobject.cpp
@@ -17,20 +17,20 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/hostdbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "db_ido/dbevents.h"
-#include "icinga/host.h"
-#include "icinga/service.h"
-#include "icinga/notification.h"
-#include "icinga/dependency.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/compatutility.h"
-#include "base/convert.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
+#include "db_ido/hostdbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "db_ido/dbevents.hpp"
+#include "icinga/host.hpp"
+#include "icinga/service.hpp"
+#include "icinga/notification.hpp"
+#include "icinga/dependency.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/compatutility.hpp"
+#include "base/convert.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/db_ido/hostdbobject.h b/lib/db_ido/hostdbobject.hpp
similarity index 96%
rename from lib/db_ido/hostdbobject.h
rename to lib/db_ido/hostdbobject.hpp
index 1453913a3..aabf45401 100644
--- a/lib/db_ido/hostdbobject.h
+++ b/lib/db_ido/hostdbobject.hpp
@@ -20,8 +20,8 @@
 #ifndef HOSTDBOBJECT_H
 #define HOSTDBOBJECT_H
 
-#include "db_ido/dbobject.h"
-#include "base/dynamicobject.h"
+#include "db_ido/dbobject.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/db_ido/hostgroupdbobject.cpp b/lib/db_ido/hostgroupdbobject.cpp
index e569ff5d7..b99fa89b0 100644
--- a/lib/db_ido/hostgroupdbobject.cpp
+++ b/lib/db_ido/hostgroupdbobject.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/hostgroupdbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "base/objectlock.h"
-#include "base/initialize.h"
-#include "base/dynamictype.h"
+#include "db_ido/hostgroupdbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "base/objectlock.hpp"
+#include "base/initialize.hpp"
+#include "base/dynamictype.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/db_ido/hostgroupdbobject.h b/lib/db_ido/hostgroupdbobject.hpp
similarity index 95%
rename from lib/db_ido/hostgroupdbobject.h
rename to lib/db_ido/hostgroupdbobject.hpp
index 3661021fe..d9f4c6a2d 100644
--- a/lib/db_ido/hostgroupdbobject.h
+++ b/lib/db_ido/hostgroupdbobject.hpp
@@ -20,9 +20,9 @@
 #ifndef HOSTGROUPDBOBJECT_H
 #define HOSTGROUPDBOBJECT_H
 
-#include "db_ido/dbobject.h"
-#include "icinga/hostgroup.h"
-#include "base/dynamicobject.h"
+#include "db_ido/dbobject.hpp"
+#include "icinga/hostgroup.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/db_ido/i2-db_ido.h b/lib/db_ido/i2-db_ido.hpp
similarity index 98%
rename from lib/db_ido/i2-db_ido.h
rename to lib/db_ido/i2-db_ido.hpp
index 6d0deaaaa..76cde2088 100644
--- a/lib/db_ido/i2-db_ido.h
+++ b/lib/db_ido/i2-db_ido.hpp
@@ -26,7 +26,7 @@
  * The Icinga library implements database-agnostic IDO functionality.
  */
 
-#include "base/i2-base.h"
+#include "base/i2-base.hpp"
 
 #ifdef I2_DB_IDO_BUILD
 #	define I2_DB_IDO_API I2_EXPORT
diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp
index 660006f02..43d2d014c 100644
--- a/lib/db_ido/servicedbobject.cpp
+++ b/lib/db_ido/servicedbobject.cpp
@@ -17,24 +17,24 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/servicedbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "db_ido/dbevents.h"
-#include "icinga/notification.h"
-#include "icinga/dependency.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/externalcommandprocessor.h"
-#include "icinga/compatutility.h"
-#include "icinga/icingaapplication.h"
-#include "remote/endpoint.h"
-#include "base/convert.h"
-#include "base/objectlock.h"
-#include "base/initialize.h"
-#include "base/dynamictype.h"
-#include "base/utility.h"
-#include "base/logger_fwd.h"
+#include "db_ido/servicedbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "db_ido/dbevents.hpp"
+#include "icinga/notification.hpp"
+#include "icinga/dependency.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/externalcommandprocessor.hpp"
+#include "icinga/compatutility.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "remote/endpoint.hpp"
+#include "base/convert.hpp"
+#include "base/objectlock.hpp"
+#include "base/initialize.hpp"
+#include "base/dynamictype.hpp"
+#include "base/utility.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/join.hpp>
 
diff --git a/lib/db_ido/servicedbobject.h b/lib/db_ido/servicedbobject.hpp
similarity index 95%
rename from lib/db_ido/servicedbobject.h
rename to lib/db_ido/servicedbobject.hpp
index 67c4fc55b..c99d4a824 100644
--- a/lib/db_ido/servicedbobject.h
+++ b/lib/db_ido/servicedbobject.hpp
@@ -20,9 +20,9 @@
 #ifndef SERVICEDBOBJECT_H
 #define SERVICEDBOBJECT_H
 
-#include "db_ido/dbobject.h"
-#include "base/dynamicobject.h"
-#include "icinga/service.h"
+#include "db_ido/dbobject.hpp"
+#include "base/dynamicobject.hpp"
+#include "icinga/service.hpp"
 
 namespace icinga
 {
diff --git a/lib/db_ido/servicegroupdbobject.cpp b/lib/db_ido/servicegroupdbobject.cpp
index a119bcb34..b2cd0673f 100644
--- a/lib/db_ido/servicegroupdbobject.cpp
+++ b/lib/db_ido/servicegroupdbobject.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/servicegroupdbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "base/objectlock.h"
-#include "base/initialize.h"
+#include "db_ido/servicegroupdbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "base/objectlock.hpp"
+#include "base/initialize.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/db_ido/servicegroupdbobject.h b/lib/db_ido/servicegroupdbobject.hpp
similarity index 95%
rename from lib/db_ido/servicegroupdbobject.h
rename to lib/db_ido/servicegroupdbobject.hpp
index 4d0842831..dc79ef766 100644
--- a/lib/db_ido/servicegroupdbobject.h
+++ b/lib/db_ido/servicegroupdbobject.hpp
@@ -20,9 +20,9 @@
 #ifndef SERVICEGROUPDBOBJECT_H
 #define SERVICEGROUPDBOBJECT_H
 
-#include "db_ido/dbobject.h"
-#include "icinga/servicegroup.h"
-#include "base/dynamicobject.h"
+#include "db_ido/dbobject.hpp"
+#include "icinga/servicegroup.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/db_ido/timeperioddbobject.cpp b/lib/db_ido/timeperioddbobject.cpp
index ea8625f06..810b38a84 100644
--- a/lib/db_ido/timeperioddbobject.cpp
+++ b/lib/db_ido/timeperioddbobject.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/timeperioddbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "icinga/timeperiod.h"
-#include "icinga/legacytimeperiod.h"
-#include "base/utility.h"
-#include "base/exception.h"
-#include "base/objectlock.h"
+#include "db_ido/timeperioddbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "icinga/timeperiod.hpp"
+#include "icinga/legacytimeperiod.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
+#include "base/objectlock.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/db_ido/timeperioddbobject.h b/lib/db_ido/timeperioddbobject.hpp
similarity index 96%
rename from lib/db_ido/timeperioddbobject.h
rename to lib/db_ido/timeperioddbobject.hpp
index 173eeb576..b68eebe43 100644
--- a/lib/db_ido/timeperioddbobject.h
+++ b/lib/db_ido/timeperioddbobject.hpp
@@ -20,8 +20,8 @@
 #ifndef TIMEPERIODDBOBJECT_H
 #define TIMEPERIODDBOBJECT_H
 
-#include "db_ido/dbobject.h"
-#include "base/dynamicobject.h"
+#include "db_ido/dbobject.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/db_ido/userdbobject.cpp b/lib/db_ido/userdbobject.cpp
index bccff13c7..af31a661f 100644
--- a/lib/db_ido/userdbobject.cpp
+++ b/lib/db_ido/userdbobject.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/userdbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "icinga/user.h"
-#include "icinga/notification.h"
-#include "base/convert.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
+#include "db_ido/userdbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "icinga/user.hpp"
+#include "icinga/notification.hpp"
+#include "base/convert.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/db_ido/userdbobject.h b/lib/db_ido/userdbobject.hpp
similarity index 96%
rename from lib/db_ido/userdbobject.h
rename to lib/db_ido/userdbobject.hpp
index 84277241c..4156ee4e0 100644
--- a/lib/db_ido/userdbobject.h
+++ b/lib/db_ido/userdbobject.hpp
@@ -20,8 +20,8 @@
 #ifndef USERDBOBJECT_H
 #define USERDBOBJECT_H
 
-#include "db_ido/dbobject.h"
-#include "base/dynamicobject.h"
+#include "db_ido/dbobject.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/db_ido/usergroupdbobject.cpp b/lib/db_ido/usergroupdbobject.cpp
index 4bb22715a..7e993b076 100644
--- a/lib/db_ido/usergroupdbobject.cpp
+++ b/lib/db_ido/usergroupdbobject.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "db_ido/usergroupdbobject.h"
-#include "db_ido/dbtype.h"
-#include "db_ido/dbvalue.h"
-#include "base/objectlock.h"
-#include "base/initialize.h"
-#include "base/dynamictype.h"
+#include "db_ido/usergroupdbobject.hpp"
+#include "db_ido/dbtype.hpp"
+#include "db_ido/dbvalue.hpp"
+#include "base/objectlock.hpp"
+#include "base/initialize.hpp"
+#include "base/dynamictype.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/db_ido/usergroupdbobject.h b/lib/db_ido/usergroupdbobject.hpp
similarity index 95%
rename from lib/db_ido/usergroupdbobject.h
rename to lib/db_ido/usergroupdbobject.hpp
index 8ab4a8246..05e9ef2ba 100644
--- a/lib/db_ido/usergroupdbobject.h
+++ b/lib/db_ido/usergroupdbobject.hpp
@@ -20,9 +20,9 @@
 #ifndef USERGROUPDBOBJECT_H
 #define USERGROUPDBOBJECT_H
 
-#include "db_ido/dbobject.h"
-#include "icinga/usergroup.h"
-#include "base/dynamicobject.h"
+#include "db_ido/dbobject.hpp"
+#include "icinga/usergroup.hpp"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/hello/CMakeLists.txt b/lib/hello/CMakeLists.txt
index a062eb618..04dda7071 100644
--- a/lib/hello/CMakeLists.txt
+++ b/lib/hello/CMakeLists.txt
@@ -15,12 +15,12 @@
 # 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(hello.ti hello.th)
+mkclass_target(hello.ti hello.thpp)
 
 mkembedconfig_target(hello-type.conf hello-type.cpp)
 
 add_library(hello SHARED
-  hello.cpp hello.th hello-type.cpp
+  hello.cpp hello.thpp hello-type.cpp
 )
 
 target_link_libraries(hello ${Boost_LIBRARIES} base config)
diff --git a/lib/hello/hello.cpp b/lib/hello/hello.cpp
index 9c729baa9..fc4d23cfc 100644
--- a/lib/hello/hello.cpp
+++ b/lib/hello/hello.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "hello/hello.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
+#include "hello/hello.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
 
 using namespace icinga;
 
diff --git a/lib/hello/hello.h b/lib/hello/hello.hpp
similarity index 98%
rename from lib/hello/hello.h
rename to lib/hello/hello.hpp
index dc73eba6e..2283fe77f 100644
--- a/lib/hello/hello.h
+++ b/lib/hello/hello.hpp
@@ -20,7 +20,7 @@
 #ifndef HELLO_H
 #define HELLO_H
 
-#include "hello/hello.th"
+#include "hello/hello.thpp"
 
 namespace icinga
 {
diff --git a/lib/hello/hello.ti b/lib/hello/hello.ti
index f72265501..6bb8b8769 100644
--- a/lib/hello/hello.ti
+++ b/lib/hello/hello.ti
@@ -1,4 +1,4 @@
-#include "base/application.h"
+#include "base/application.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/CMakeLists.txt b/lib/icinga/CMakeLists.txt
index f3ef3906b..95363441f 100644
--- a/lib/icinga/CMakeLists.txt
+++ b/lib/icinga/CMakeLists.txt
@@ -15,43 +15,43 @@
 # 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.th)
-mkclass_target(checkcommand.ti checkcommand.th)
-mkclass_target(checkresult.ti checkresult.th)
-mkclass_target(command.ti command.th)
-mkclass_target(comment.ti comment.th)
-mkclass_target(dependency.ti dependency.th)
-mkclass_target(downtime.ti downtime.th)
-mkclass_target(eventcommand.ti eventcommand.th)
-mkclass_target(hostgroup.ti hostgroup.th)
-mkclass_target(host.ti host.th)
-mkclass_target(icingaapplication.ti icingaapplication.th)
-mkclass_target(customvarobject.ti customvarobject.th)
-mkclass_target(icingastatuswriter.ti icingastatuswriter.th)
-mkclass_target(notificationcommand.ti notificationcommand.th)
-mkclass_target(notification.ti notification.th)
-mkclass_target(perfdatavalue.ti perfdatavalue.th)
-mkclass_target(scheduleddowntime.ti scheduleddowntime.th)
-mkclass_target(servicegroup.ti servicegroup.th)
-mkclass_target(service.ti service.th)
-mkclass_target(timeperiod.ti timeperiod.th)
-mkclass_target(usergroup.ti usergroup.th)
-mkclass_target(user.ti user.th)
+mkclass_target(checkable.ti checkable.thpp)
+mkclass_target(checkcommand.ti checkcommand.thpp)
+mkclass_target(checkresult.ti checkresult.thpp)
+mkclass_target(command.ti command.thpp)
+mkclass_target(comment.ti comment.thpp)
+mkclass_target(dependency.ti dependency.thpp)
+mkclass_target(downtime.ti downtime.thpp)
+mkclass_target(eventcommand.ti eventcommand.thpp)
+mkclass_target(hostgroup.ti hostgroup.thpp)
+mkclass_target(host.ti host.thpp)
+mkclass_target(icingaapplication.ti icingaapplication.thpp)
+mkclass_target(customvarobject.ti customvarobject.thpp)
+mkclass_target(icingastatuswriter.ti icingastatuswriter.thpp)
+mkclass_target(notificationcommand.ti notificationcommand.thpp)
+mkclass_target(notification.ti notification.thpp)
+mkclass_target(perfdatavalue.ti perfdatavalue.thpp)
+mkclass_target(scheduleddowntime.ti scheduleddowntime.thpp)
+mkclass_target(servicegroup.ti servicegroup.thpp)
+mkclass_target(service.ti service.thpp)
+mkclass_target(timeperiod.ti timeperiod.thpp)
+mkclass_target(usergroup.ti usergroup.thpp)
+mkclass_target(user.ti user.thpp)
 
 mkembedconfig_target(icinga-type.conf icinga-type.cpp)
 
 add_library(icinga SHARED
-  api.cpp apievents.cpp checkable.cpp checkable.th checkable-dependency.cpp checkable-downtime.cpp checkable-event.cpp
-  checkable-flapping.cpp checkcommand.cpp checkcommand.th checkresult.cpp checkresult.th
-  cib.cpp command.cpp command.th comment.cpp comment.th compatutility.cpp dependency.cpp dependency.th
-  dependency-apply.cpp downtime.cpp downtime.th eventcommand.cpp eventcommand.th
-  externalcommandprocessor.cpp host.cpp host.th hostgroup.cpp hostgroup.th icingaapplication.cpp
-  icingaapplication.th customvarobject.cpp customvarobject.th icingastatuswriter.cpp icingastatuswriter.th
-  legacytimeperiod.cpp macroprocessor.cpp notificationcommand.cpp notificationcommand.th notification.cpp
-  notification.th notification-apply.cpp perfdatavalue.cpp perfdatavalue.th pluginutility.cpp scheduleddowntime.cpp
-  scheduleddowntime.th scheduleddowntime-apply.cpp service-apply.cpp checkable-check.cpp checkable-comment.cpp
-  service.cpp service.th servicegroup.cpp servicegroup.th checkable-notification.cpp timeperiod.cpp timeperiod.th
-  user.cpp user.th usergroup.cpp usergroup.th icinga-type.cpp
+  api.cpp apievents.cpp checkable.cpp checkable.thpp checkable-dependency.cpp checkable-downtime.cpp checkable-event.cpp
+  checkable-flapping.cpp checkcommand.cpp checkcommand.thpp checkresult.cpp checkresult.thpp
+  cib.cpp command.cpp command.thpp comment.cpp comment.thpp compatutility.cpp dependency.cpp dependency.thpp
+  dependency-apply.cpp downtime.cpp downtime.thpp eventcommand.cpp eventcommand.thpp
+  externalcommandprocessor.cpp host.cpp host.thpp hostgroup.cpp hostgroup.thpp icingaapplication.cpp
+  icingaapplication.thpp customvarobject.cpp customvarobject.thpp icingastatuswriter.cpp icingastatuswriter.thpp
+  legacytimeperiod.cpp macroprocessor.cpp notificationcommand.cpp notificationcommand.thpp notification.cpp
+  notification.thpp notification-apply.cpp perfdatavalue.cpp perfdatavalue.thpp pluginutility.cpp scheduleddowntime.cpp
+  scheduleddowntime.thpp scheduleddowntime-apply.cpp service-apply.cpp checkable-check.cpp checkable-comment.cpp
+  service.cpp service.thpp servicegroup.cpp servicegroup.thpp checkable-notification.cpp timeperiod.cpp timeperiod.thpp
+  user.cpp user.thpp usergroup.cpp usergroup.thpp icinga-type.cpp
 )
 
 target_link_libraries(icinga ${Boost_LIBRARIES} base config remote)
diff --git a/lib/icinga/api.cpp b/lib/icinga/api.cpp
index 57eb8656e..67cfdc466 100644
--- a/lib/icinga/api.cpp
+++ b/lib/icinga/api.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/api.h"
-#include "remote/apifunction.h"
-#include "base/logger_fwd.h"
+#include "icinga/api.hpp"
+#include "remote/apifunction.hpp"
+#include "base/logger_fwd.hpp"
 
 using namespace icinga;
 
diff --git a/lib/icinga/api.h b/lib/icinga/api.hpp
similarity index 94%
rename from lib/icinga/api.h
rename to lib/icinga/api.hpp
index 78f64ef06..c4b9ab109 100644
--- a/lib/icinga/api.h
+++ b/lib/icinga/api.hpp
@@ -20,9 +20,9 @@
 #ifndef API_H
 #define API_H
 
-#include "icinga/i2-icinga.h"
-#include "base/value.h"
-#include "base/dictionary.h"
+#include "icinga/i2-icinga.hpp"
+#include "base/value.hpp"
+#include "base/dictionary.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/apievents.cpp b/lib/icinga/apievents.cpp
index 37811a52f..3bbd2e27b 100644
--- a/lib/icinga/apievents.cpp
+++ b/lib/icinga/apievents.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/apievents.h"
-#include "icinga/service.h"
-#include "remote/apilistener.h"
-#include "remote/endpoint.h"
-#include "remote/messageorigin.h"
-#include "remote/zone.h"
-#include "remote/apifunction.h"
-#include "base/application.h"
-#include "base/dynamictype.h"
-#include "base/utility.h"
-#include "base/exception.h"
-#include "base/initialize.h"
+#include "icinga/apievents.hpp"
+#include "icinga/service.hpp"
+#include "remote/apilistener.hpp"
+#include "remote/endpoint.hpp"
+#include "remote/messageorigin.hpp"
+#include "remote/zone.hpp"
+#include "remote/apifunction.hpp"
+#include "base/application.hpp"
+#include "base/dynamictype.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
+#include "base/initialize.hpp"
 #include <fstream>
 
 using namespace icinga;
diff --git a/lib/icinga/apievents.h b/lib/icinga/apievents.hpp
similarity index 98%
rename from lib/icinga/apievents.h
rename to lib/icinga/apievents.hpp
index 3413dc841..5ebe217e8 100644
--- a/lib/icinga/apievents.h
+++ b/lib/icinga/apievents.hpp
@@ -20,8 +20,8 @@
 #ifndef APIEVENTS_H
 #define APIEVENTS_H
 
-#include "icinga/checkable.h"
-#include "icinga/host.h"
+#include "icinga/checkable.hpp"
+#include "icinga/host.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index e37050c03..714d1e225 100644
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/checkable.h"
-#include "icinga/service.h"
-#include "icinga/host.h"
-#include "icinga/checkcommand.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/cib.h"
-#include "remote/messageorigin.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/context.h"
+#include "icinga/checkable.hpp"
+#include "icinga/service.hpp"
+#include "icinga/host.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/cib.hpp"
+#include "remote/messageorigin.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/context.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/checkable-comment.cpp b/lib/icinga/checkable-comment.cpp
index bdd80957f..ba634b31e 100644
--- a/lib/icinga/checkable-comment.cpp
+++ b/lib/icinga/checkable-comment.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/service.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/timer.h"
-#include "base/utility.h"
-#include "base/logger_fwd.h"
+#include "icinga/service.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/timer.hpp"
+#include "base/utility.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/checkable-dependency.cpp b/lib/icinga/checkable-dependency.cpp
index d55340ddb..8bb541ef8 100644
--- a/lib/icinga/checkable-dependency.cpp
+++ b/lib/icinga/checkable-dependency.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/service.h"
-#include "icinga/dependency.h"
-#include "base/logger_fwd.h"
+#include "icinga/service.hpp"
+#include "icinga/dependency.hpp"
+#include "base/logger_fwd.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/checkable-downtime.cpp b/lib/icinga/checkable-downtime.cpp
index 086b64c61..492e805cf 100644
--- a/lib/icinga/checkable-downtime.cpp
+++ b/lib/icinga/checkable-downtime.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/service.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/timer.h"
-#include "base/utility.h"
-#include "base/convert.h"
+#include "icinga/service.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/timer.hpp"
+#include "base/utility.hpp"
+#include "base/convert.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/checkable-event.cpp b/lib/icinga/checkable-event.cpp
index 06d47d004..d52ebc170 100644
--- a/lib/icinga/checkable-event.cpp
+++ b/lib/icinga/checkable-event.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/checkable.h"
-#include "icinga/eventcommand.h"
-#include "icinga/icingaapplication.h"
-#include "base/logger_fwd.h"
-#include "base/context.h"
+#include "icinga/checkable.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/context.hpp"
 
 using namespace icinga;
 
diff --git a/lib/icinga/checkable-flapping.cpp b/lib/icinga/checkable-flapping.cpp
index 7bd6f47b4..34ecb7e6d 100644
--- a/lib/icinga/checkable-flapping.cpp
+++ b/lib/icinga/checkable-flapping.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/checkable.h"
-#include "icinga/icingaapplication.h"
-#include "base/utility.h"
+#include "icinga/checkable.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/utility.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/checkable-notification.cpp b/lib/icinga/checkable-notification.cpp
index f53d53ac7..5a2af26da 100644
--- a/lib/icinga/checkable-notification.cpp
+++ b/lib/icinga/checkable-notification.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/checkable.h"
-#include "icinga/icingaapplication.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/context.h"
-#include "base/convert.h"
+#include "icinga/checkable.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/context.hpp"
+#include "base/convert.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp
index f53f16553..ef1c99067 100644
--- a/lib/icinga/checkable.cpp
+++ b/lib/icinga/checkable.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/checkable.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
+#include "icinga/checkable.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
 #include <boost/foreach.hpp>
 #include <boost/bind/apply.hpp>
 
diff --git a/lib/icinga/checkable.h b/lib/icinga/checkable.hpp
similarity index 98%
rename from lib/icinga/checkable.h
rename to lib/icinga/checkable.hpp
index 86b404659..c2b2b7725 100644
--- a/lib/icinga/checkable.h
+++ b/lib/icinga/checkable.hpp
@@ -20,13 +20,13 @@
 #ifndef CHECKABLE_H
 #define CHECKABLE_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/checkable.th"
-#include "icinga/timeperiod.h"
-#include "icinga/notification.h"
-#include "icinga/comment.h"
-#include "icinga/downtime.h"
-#include "remote/messageorigin.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/checkable.thpp"
+#include "icinga/timeperiod.hpp"
+#include "icinga/notification.hpp"
+#include "icinga/comment.hpp"
+#include "icinga/downtime.hpp"
+#include "remote/messageorigin.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/checkable.ti b/lib/icinga/checkable.ti
index 778bc8a78..6193f23da 100644
--- a/lib/icinga/checkable.ti
+++ b/lib/icinga/checkable.ti
@@ -1,6 +1,6 @@
-#include "icinga/icingaapplication.h"
-#include "icinga/customvarobject.h"
-#include "base/array.h"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/customvarobject.hpp"
+#include "base/array.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/checkcommand.cpp b/lib/icinga/checkcommand.cpp
index 32630fef6..ff7728f06 100644
--- a/lib/icinga/checkcommand.cpp
+++ b/lib/icinga/checkcommand.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/checkcommand.h"
-#include "base/dynamictype.h"
+#include "icinga/checkcommand.hpp"
+#include "base/dynamictype.hpp"
 
 using namespace icinga;
 
diff --git a/lib/icinga/checkcommand.h b/lib/icinga/checkcommand.hpp
similarity index 96%
rename from lib/icinga/checkcommand.h
rename to lib/icinga/checkcommand.hpp
index 15cd69d6c..9b977ce15 100644
--- a/lib/icinga/checkcommand.h
+++ b/lib/icinga/checkcommand.hpp
@@ -20,8 +20,8 @@
 #ifndef CHECKCOMMAND_H
 #define CHECKCOMMAND_H
 
-#include "icinga/checkcommand.th"
-#include "icinga/checkable.h"
+#include "icinga/checkcommand.thpp"
+#include "icinga/checkable.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/checkcommand.ti b/lib/icinga/checkcommand.ti
index d0dda7212..bf2f03e5c 100644
--- a/lib/icinga/checkcommand.ti
+++ b/lib/icinga/checkcommand.ti
@@ -1,4 +1,4 @@
-#include "icinga/command.h"
+#include "icinga/command.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/checkresult.cpp b/lib/icinga/checkresult.cpp
index 098af8f2d..06846b09e 100644
--- a/lib/icinga/checkresult.cpp
+++ b/lib/icinga/checkresult.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/checkresult.h"
+#include "icinga/checkresult.hpp"
 
 using namespace icinga;
 
diff --git a/lib/icinga/checkresult.h b/lib/icinga/checkresult.hpp
similarity index 96%
rename from lib/icinga/checkresult.h
rename to lib/icinga/checkresult.hpp
index b0f595ac0..87f366260 100644
--- a/lib/icinga/checkresult.h
+++ b/lib/icinga/checkresult.hpp
@@ -20,8 +20,8 @@
 #ifndef CHECKRESULT_H
 #define CHECKRESULT_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/checkresult.th"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/checkresult.thpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/cib.cpp b/lib/icinga/cib.cpp
index cfbf53538..dcf7422e7 100644
--- a/lib/icinga/cib.cpp
+++ b/lib/icinga/cib.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/cib.h"
-#include "icinga/service.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
-#include "base/dynamictype.h"
-#include "base/statsfunction.h"
+#include "icinga/cib.hpp"
+#include "icinga/service.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
+#include "base/dynamictype.hpp"
+#include "base/statsfunction.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/cib.h b/lib/icinga/cib.hpp
similarity index 97%
rename from lib/icinga/cib.h
rename to lib/icinga/cib.hpp
index 39c3d6a5e..deadd4cf1 100644
--- a/lib/icinga/cib.h
+++ b/lib/icinga/cib.hpp
@@ -20,9 +20,9 @@
 #ifndef CIB_H
 #define CIB_H
 
-#include "icinga/i2-icinga.h"
-#include "base/ringbuffer.h"
-#include "base/dictionary.h"
+#include "icinga/i2-icinga.hpp"
+#include "base/ringbuffer.hpp"
+#include "base/dictionary.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/command.cpp b/lib/icinga/command.cpp
index e408dc0f2..51d24ddc8 100644
--- a/lib/icinga/command.cpp
+++ b/lib/icinga/command.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/command.h"
+#include "icinga/command.hpp"
 
 using namespace icinga;
 
diff --git a/lib/icinga/command.h b/lib/icinga/command.hpp
similarity index 94%
rename from lib/icinga/command.h
rename to lib/icinga/command.hpp
index 3b691e91d..83ad778c5 100644
--- a/lib/icinga/command.h
+++ b/lib/icinga/command.hpp
@@ -20,9 +20,9 @@
 #ifndef COMMAND_H
 #define COMMAND_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/command.th"
-#include "remote/messageorigin.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/command.thpp"
+#include "remote/messageorigin.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/command.ti b/lib/icinga/command.ti
index f04f826ef..06199a521 100644
--- a/lib/icinga/command.ti
+++ b/lib/icinga/command.ti
@@ -1,4 +1,4 @@
-#include "icinga/customvarobject.h"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/comment.cpp b/lib/icinga/comment.cpp
index 10fcc8904..4139ade11 100644
--- a/lib/icinga/comment.cpp
+++ b/lib/icinga/comment.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/comment.h"
-#include "base/utility.h"
-#include "base/dynamictype.h"
+#include "icinga/comment.hpp"
+#include "base/utility.hpp"
+#include "base/dynamictype.hpp"
 
 using namespace icinga;
 
diff --git a/lib/icinga/comment.h b/lib/icinga/comment.hpp
similarity index 96%
rename from lib/icinga/comment.h
rename to lib/icinga/comment.hpp
index 071769d0a..0b64d5ded 100644
--- a/lib/icinga/comment.h
+++ b/lib/icinga/comment.hpp
@@ -20,8 +20,8 @@
 #ifndef COMMENT_H
 #define COMMENT_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/comment.th"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/comment.thpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/compatutility.cpp b/lib/icinga/compatutility.cpp
index 87cc18361..6fa8700ff 100644
--- a/lib/icinga/compatutility.cpp
+++ b/lib/icinga/compatutility.cpp
@@ -17,15 +17,15 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/compatutility.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/pluginutility.h"
-#include "icinga/service.h"
-#include "base/utility.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
+#include "icinga/compatutility.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/pluginutility.hpp"
+#include "icinga/service.hpp"
+#include "base/utility.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/join.hpp>
diff --git a/lib/icinga/compatutility.h b/lib/icinga/compatutility.hpp
similarity index 97%
rename from lib/icinga/compatutility.h
rename to lib/icinga/compatutility.hpp
index 3589d95e6..4670334d0 100644
--- a/lib/icinga/compatutility.h
+++ b/lib/icinga/compatutility.hpp
@@ -20,12 +20,12 @@
 #ifndef COMPATUTILITY_H
 #define COMPATUTILITY_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/customvarobject.h"
-#include "icinga/host.h"
-#include "icinga/command.h"
-#include "base/dictionary.h"
-#include "base/array.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/customvarobject.hpp"
+#include "icinga/host.hpp"
+#include "icinga/command.hpp"
+#include "base/dictionary.hpp"
+#include "base/array.hpp"
 #include <vector>
 
 namespace icinga
diff --git a/lib/icinga/customvarobject.cpp b/lib/icinga/customvarobject.cpp
index ca4dbfb23..df0774ab2 100644
--- a/lib/icinga/customvarobject.cpp
+++ b/lib/icinga/customvarobject.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/customvarobject.h"
-#include "base/logger_fwd.h"
+#include "icinga/customvarobject.hpp"
+#include "base/logger_fwd.hpp"
 
 using namespace icinga;
 
diff --git a/lib/icinga/customvarobject.h b/lib/icinga/customvarobject.hpp
similarity index 95%
rename from lib/icinga/customvarobject.h
rename to lib/icinga/customvarobject.hpp
index 09b927b8e..d8903b239 100644
--- a/lib/icinga/customvarobject.h
+++ b/lib/icinga/customvarobject.hpp
@@ -20,10 +20,10 @@
 #ifndef CUSTOMVAROBJECT_H
 #define CUSTOMVAROBJECT_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/customvarobject.th"
-#include "base/dynamicobject.h"
-#include "remote/messageorigin.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/customvarobject.thpp"
+#include "base/dynamicobject.hpp"
+#include "remote/messageorigin.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/customvarobject.ti b/lib/icinga/customvarobject.ti
index cb14e50b1..b178de633 100644
--- a/lib/icinga/customvarobject.ti
+++ b/lib/icinga/customvarobject.ti
@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/dependency-apply.cpp b/lib/icinga/dependency-apply.cpp
index 2bff8334f..62a3e80b3 100644
--- a/lib/icinga/dependency-apply.cpp
+++ b/lib/icinga/dependency-apply.cpp
@@ -17,15 +17,15 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/dependency.h"
-#include "icinga/service.h"
-#include "config/configitembuilder.h"
-#include "config/applyrule.h"
-#include "base/initialize.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/context.h"
-#include "base/workqueue.h"
+#include "icinga/dependency.hpp"
+#include "icinga/service.hpp"
+#include "config/configitembuilder.hpp"
+#include "config/applyrule.hpp"
+#include "base/initialize.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/context.hpp"
+#include "base/workqueue.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/dependency.cpp b/lib/icinga/dependency.cpp
index 968f4cfb7..463743021 100644
--- a/lib/icinga/dependency.cpp
+++ b/lib/icinga/dependency.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/dependency.h"
-#include "icinga/service.h"
-#include "config/configcompilercontext.h"
-#include "base/logger_fwd.h"
-#include "base/scriptfunction.h"
+#include "icinga/dependency.hpp"
+#include "icinga/service.hpp"
+#include "config/configcompilercontext.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/scriptfunction.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/dependency.h b/lib/icinga/dependency.hpp
similarity index 96%
rename from lib/icinga/dependency.h
rename to lib/icinga/dependency.hpp
index 210d8c2e9..4d310c956 100644
--- a/lib/icinga/dependency.h
+++ b/lib/icinga/dependency.hpp
@@ -20,9 +20,9 @@
 #ifndef DEPENDENCY_H
 #define DEPENDENCY_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/dependency.th"
-#include "base/dictionary.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/dependency.thpp"
+#include "base/dictionary.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/dependency.ti b/lib/icinga/dependency.ti
index 0b21bb148..40de2aec8 100644
--- a/lib/icinga/dependency.ti
+++ b/lib/icinga/dependency.ti
@@ -1,5 +1,5 @@
-#include "icinga/customvarobject.h"
-#include "icinga/checkable.h"
+#include "icinga/customvarobject.hpp"
+#include "icinga/checkable.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/downtime.cpp b/lib/icinga/downtime.cpp
index f17af8f9f..4ba4577a6 100644
--- a/lib/icinga/downtime.cpp
+++ b/lib/icinga/downtime.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/downtime.h"
-#include "base/utility.h"
+#include "icinga/downtime.hpp"
+#include "base/utility.hpp"
 
 using namespace icinga;
 
diff --git a/lib/icinga/downtime.h b/lib/icinga/downtime.hpp
similarity index 96%
rename from lib/icinga/downtime.h
rename to lib/icinga/downtime.hpp
index f76384288..73fffd310 100644
--- a/lib/icinga/downtime.h
+++ b/lib/icinga/downtime.hpp
@@ -20,8 +20,8 @@
 #ifndef DOWNTIME_H
 #define DOWNTIME_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/downtime.th"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/downtime.thpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/eventcommand.cpp b/lib/icinga/eventcommand.cpp
index 8fd262842..2a0b92e7b 100644
--- a/lib/icinga/eventcommand.cpp
+++ b/lib/icinga/eventcommand.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/eventcommand.h"
+#include "icinga/eventcommand.hpp"
 
 using namespace icinga;
 
diff --git a/lib/icinga/eventcommand.h b/lib/icinga/eventcommand.hpp
similarity index 96%
rename from lib/icinga/eventcommand.h
rename to lib/icinga/eventcommand.hpp
index a1dedce80..6717928da 100644
--- a/lib/icinga/eventcommand.h
+++ b/lib/icinga/eventcommand.hpp
@@ -20,8 +20,8 @@
 #ifndef EVENTCOMMAND_H
 #define EVENTCOMMAND_H
 
-#include "icinga/eventcommand.th"
-#include "icinga/checkable.h"
+#include "icinga/eventcommand.thpp"
+#include "icinga/checkable.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/eventcommand.ti b/lib/icinga/eventcommand.ti
index 7a578b568..4bbca8a06 100644
--- a/lib/icinga/eventcommand.ti
+++ b/lib/icinga/eventcommand.ti
@@ -1,4 +1,4 @@
-#include "icinga/command.h"
+#include "icinga/command.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/externalcommandprocessor.cpp b/lib/icinga/externalcommandprocessor.cpp
index 1d4b13287..ebd283ff7 100644
--- a/lib/icinga/externalcommandprocessor.cpp
+++ b/lib/icinga/externalcommandprocessor.cpp
@@ -17,24 +17,24 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/externalcommandprocessor.h"
-#include "icinga/host.h"
-#include "icinga/service.h"
-#include "icinga/user.h"
-#include "icinga/hostgroup.h"
-#include "icinga/servicegroup.h"
-#include "icinga/pluginutility.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/checkcommand.h"
-#include "icinga/eventcommand.h"
-#include "icinga/notificationcommand.h"
-#include "remote/apifunction.h"
-#include "base/convert.h"
-#include "base/logger_fwd.h"
-#include "base/objectlock.h"
-#include "base/application.h"
-#include "base/utility.h"
-#include "base/exception.h"
+#include "icinga/externalcommandprocessor.hpp"
+#include "icinga/host.hpp"
+#include "icinga/service.hpp"
+#include "icinga/user.hpp"
+#include "icinga/hostgroup.hpp"
+#include "icinga/servicegroup.hpp"
+#include "icinga/pluginutility.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/notificationcommand.hpp"
+#include "remote/apifunction.hpp"
+#include "base/convert.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/objectlock.hpp"
+#include "base/application.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
 #include <fstream>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/foreach.hpp>
diff --git a/lib/icinga/externalcommandprocessor.h b/lib/icinga/externalcommandprocessor.hpp
similarity index 99%
rename from lib/icinga/externalcommandprocessor.h
rename to lib/icinga/externalcommandprocessor.hpp
index db995d518..309a02855 100644
--- a/lib/icinga/externalcommandprocessor.h
+++ b/lib/icinga/externalcommandprocessor.hpp
@@ -20,9 +20,9 @@
 #ifndef EXTERNALCOMMANDPROCESSOR_H
 #define EXTERNALCOMMANDPROCESSOR_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/command.h"
-#include "base/qstring.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/command.hpp"
+#include "base/qstring.hpp"
 #include <boost/function.hpp>
 #include <boost/signals2.hpp>
 #include <vector>
diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index fd7c9cd8e..52cdd7658 100644
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -17,15 +17,15 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/host.h"
-#include "icinga/service.h"
-#include "icinga/hostgroup.h"
-#include "icinga/pluginutility.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/debug.h"
-#include "base/serializer.h"
+#include "icinga/host.hpp"
+#include "icinga/service.hpp"
+#include "icinga/hostgroup.hpp"
+#include "icinga/pluginutility.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/debug.hpp"
+#include "base/serializer.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/host.h b/lib/icinga/host.hpp
similarity index 95%
rename from lib/icinga/host.h
rename to lib/icinga/host.hpp
index 469bb8a7e..1101cae3d 100644
--- a/lib/icinga/host.h
+++ b/lib/icinga/host.hpp
@@ -20,10 +20,10 @@
 #ifndef HOST_H
 #define HOST_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/host.th"
-#include "icinga/macroresolver.h"
-#include "icinga/checkresult.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/host.thpp"
+#include "icinga/macroresolver.hpp"
+#include "icinga/checkresult.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/host.ti b/lib/icinga/host.ti
index e3667c869..1b8edc2c4 100644
--- a/lib/icinga/host.ti
+++ b/lib/icinga/host.ti
@@ -1,5 +1,5 @@
-#include "icinga/checkable.h"
-#include "icinga/customvarobject.h"
+#include "icinga/checkable.hpp"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/hostgroup.cpp b/lib/icinga/hostgroup.cpp
index cada9e887..0274998bc 100644
--- a/lib/icinga/hostgroup.cpp
+++ b/lib/icinga/hostgroup.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/hostgroup.h"
-#include "config/objectrule.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/objectlock.h"
-#include "base/context.h"
-#include "base/workqueue.h"
+#include "icinga/hostgroup.hpp"
+#include "config/objectrule.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/objectlock.hpp"
+#include "base/context.hpp"
+#include "base/workqueue.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/hostgroup.h b/lib/icinga/hostgroup.hpp
similarity index 96%
rename from lib/icinga/hostgroup.h
rename to lib/icinga/hostgroup.hpp
index 0c7ea97fd..76cf9c759 100644
--- a/lib/icinga/hostgroup.h
+++ b/lib/icinga/hostgroup.hpp
@@ -20,9 +20,9 @@
 #ifndef HOSTGROUP_H
 #define HOSTGROUP_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/hostgroup.th"
-#include "icinga/host.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/hostgroup.thpp"
+#include "icinga/host.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/hostgroup.ti b/lib/icinga/hostgroup.ti
index 4aa89fc46..1656f85cc 100644
--- a/lib/icinga/hostgroup.ti
+++ b/lib/icinga/hostgroup.ti
@@ -1,4 +1,4 @@
-#include "icinga/customvarobject.h"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/i2-icinga.h b/lib/icinga/i2-icinga.hpp
similarity index 98%
rename from lib/icinga/i2-icinga.h
rename to lib/icinga/i2-icinga.hpp
index bf2d4c7b9..fdc096e37 100644
--- a/lib/icinga/i2-icinga.h
+++ b/lib/icinga/i2-icinga.hpp
@@ -27,7 +27,7 @@
  * common to all components (e.g. hosts, services, etc.).
  */
 
-#include "base/i2-base.h"
+#include "base/i2-base.hpp"
 
 #ifdef I2_ICINGA_BUILD
 #	define I2_ICINGA_API I2_EXPORT
diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp
index 67465206d..c55bc01a8 100644
--- a/lib/icinga/icingaapplication.cpp
+++ b/lib/icinga/icingaapplication.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/icingaapplication.h"
-#include "icinga/cib.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/debug.h"
-#include "base/utility.h"
-#include "base/timer.h"
-#include "base/scriptvariable.h"
-#include "base/initialize.h"
-#include "base/statsfunction.h"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/cib.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/debug.hpp"
+#include "base/utility.hpp"
+#include "base/timer.hpp"
+#include "base/scriptvariable.hpp"
+#include "base/initialize.hpp"
+#include "base/statsfunction.hpp"
 
 using namespace icinga;
 
diff --git a/lib/icinga/icingaapplication.h b/lib/icinga/icingaapplication.hpp
similarity index 96%
rename from lib/icinga/icingaapplication.h
rename to lib/icinga/icingaapplication.hpp
index cee4cbbac..00aa3e7c9 100644
--- a/lib/icinga/icingaapplication.h
+++ b/lib/icinga/icingaapplication.hpp
@@ -20,9 +20,9 @@
 #ifndef ICINGAAPPLICATION_H
 #define ICINGAAPPLICATION_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/icingaapplication.th"
-#include "icinga/macroresolver.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/icingaapplication.thpp"
+#include "icinga/macroresolver.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/icingaapplication.ti b/lib/icinga/icingaapplication.ti
index b2860752c..70b206ea2 100644
--- a/lib/icinga/icingaapplication.ti
+++ b/lib/icinga/icingaapplication.ti
@@ -1,4 +1,4 @@
-#include "base/application.h"
+#include "base/application.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/icingastatuswriter.cpp b/lib/icinga/icingastatuswriter.cpp
index 7d59e91ca..cabbd5b2b 100644
--- a/lib/icinga/icingastatuswriter.cpp
+++ b/lib/icinga/icingastatuswriter.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/icingastatuswriter.h"
-#include "icinga/cib.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/application.h"
-#include "base/statsfunction.h"
+#include "icinga/icingastatuswriter.hpp"
+#include "icinga/cib.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/application.hpp"
+#include "base/statsfunction.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <fstream>
diff --git a/lib/icinga/icingastatuswriter.h b/lib/icinga/icingastatuswriter.hpp
similarity index 96%
rename from lib/icinga/icingastatuswriter.h
rename to lib/icinga/icingastatuswriter.hpp
index 32ae31bc8..b60412abb 100644
--- a/lib/icinga/icingastatuswriter.h
+++ b/lib/icinga/icingastatuswriter.hpp
@@ -20,8 +20,8 @@
 #ifndef ICINGASTATUSWRITER_H
 #define ICINGASTATUSWRITER_H
 
-#include "icinga/icingastatuswriter.th"
-#include "base/timer.h"
+#include "icinga/icingastatuswriter.thpp"
+#include "base/timer.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/icingastatuswriter.ti b/lib/icinga/icingastatuswriter.ti
index fb397d747..191688891 100644
--- a/lib/icinga/icingastatuswriter.ti
+++ b/lib/icinga/icingastatuswriter.ti
@@ -1,5 +1,5 @@
-#include "icinga/customvarobject.h"
-#include "base/application.h"
+#include "icinga/customvarobject.hpp"
+#include "base/application.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/legacytimeperiod.cpp b/lib/icinga/legacytimeperiod.cpp
index e9256da47..469cbd09f 100644
--- a/lib/icinga/legacytimeperiod.cpp
+++ b/lib/icinga/legacytimeperiod.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/legacytimeperiod.h"
-#include "base/scriptfunction.h"
-#include "base/convert.h"
-#include "base/exception.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/debug.h"
-#include "base/utility.h"
+#include "icinga/legacytimeperiod.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/convert.hpp"
+#include "base/exception.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/debug.hpp"
+#include "base/utility.hpp"
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/foreach.hpp>
diff --git a/lib/icinga/legacytimeperiod.h b/lib/icinga/legacytimeperiod.hpp
similarity index 96%
rename from lib/icinga/legacytimeperiod.h
rename to lib/icinga/legacytimeperiod.hpp
index d33c2bc53..7c9265bd7 100644
--- a/lib/icinga/legacytimeperiod.h
+++ b/lib/icinga/legacytimeperiod.hpp
@@ -20,9 +20,9 @@
 #ifndef LEGACYTIMEPERIOD_H
 #define LEGACYTIMEPERIOD_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/timeperiod.h"
-#include "base/dictionary.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/timeperiod.hpp"
+#include "base/dictionary.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/macroprocessor.cpp b/lib/icinga/macroprocessor.cpp
index b77a3b014..667e44b18 100644
--- a/lib/icinga/macroprocessor.cpp
+++ b/lib/icinga/macroprocessor.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/macroprocessor.h"
-#include "icinga/macroresolver.h"
-#include "icinga/customvarobject.h"
-#include "base/array.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/context.h"
-#include "base/dynamicobject.h"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/macroresolver.hpp"
+#include "icinga/customvarobject.hpp"
+#include "base/array.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/context.hpp"
+#include "base/dynamicobject.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/join.hpp>
diff --git a/lib/icinga/macroprocessor.h b/lib/icinga/macroprocessor.hpp
similarity index 96%
rename from lib/icinga/macroprocessor.h
rename to lib/icinga/macroprocessor.hpp
index 19ebd960a..4fb27a9db 100644
--- a/lib/icinga/macroprocessor.h
+++ b/lib/icinga/macroprocessor.hpp
@@ -20,9 +20,9 @@
 #ifndef MACROPROCESSOR_H
 #define MACROPROCESSOR_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/checkable.h"
-#include "base/value.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/checkable.hpp"
+#include "base/value.hpp"
 #include <boost/function.hpp>
 #include <vector>
 
diff --git a/lib/icinga/macroresolver.h b/lib/icinga/macroresolver.hpp
similarity index 93%
rename from lib/icinga/macroresolver.h
rename to lib/icinga/macroresolver.hpp
index 8637d4bf9..6ad8a73ce 100644
--- a/lib/icinga/macroresolver.h
+++ b/lib/icinga/macroresolver.hpp
@@ -20,10 +20,10 @@
 #ifndef MACRORESOLVER_H
 #define MACRORESOLVER_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/checkresult.h"
-#include "base/dictionary.h"
-#include "base/qstring.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/checkresult.hpp"
+#include "base/dictionary.hpp"
+#include "base/qstring.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/notification-apply.cpp b/lib/icinga/notification-apply.cpp
index 317b8c0cd..ea04f9630 100644
--- a/lib/icinga/notification-apply.cpp
+++ b/lib/icinga/notification-apply.cpp
@@ -17,15 +17,15 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/notification.h"
-#include "icinga/service.h"
-#include "config/configitembuilder.h"
-#include "config/applyrule.h"
-#include "base/initialize.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/context.h"
-#include "base/workqueue.h"
+#include "icinga/notification.hpp"
+#include "icinga/service.hpp"
+#include "config/configitembuilder.hpp"
+#include "config/applyrule.hpp"
+#include "base/initialize.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/context.hpp"
+#include "base/workqueue.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp
index efadfbd63..d3d1615d9 100644
--- a/lib/icinga/notification.cpp
+++ b/lib/icinga/notification.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/notification.h"
-#include "icinga/notificationcommand.h"
-#include "icinga/service.h"
-#include "config/configcompilercontext.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/utility.h"
-#include "base/convert.h"
-#include "base/exception.h"
-#include "base/initialize.h"
-#include "base/scriptvariable.h"
-#include "base/scriptfunction.h"
+#include "icinga/notification.hpp"
+#include "icinga/notificationcommand.hpp"
+#include "icinga/service.hpp"
+#include "config/configcompilercontext.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/utility.hpp"
+#include "base/convert.hpp"
+#include "base/exception.hpp"
+#include "base/initialize.hpp"
+#include "base/scriptvariable.hpp"
+#include "base/scriptfunction.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/notification.h b/lib/icinga/notification.hpp
similarity index 94%
rename from lib/icinga/notification.h
rename to lib/icinga/notification.hpp
index 58db371b6..354f9d38b 100644
--- a/lib/icinga/notification.h
+++ b/lib/icinga/notification.hpp
@@ -20,14 +20,14 @@
 #ifndef NOTIFICATION_H
 #define NOTIFICATION_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/notification.th"
-#include "icinga/user.h"
-#include "icinga/usergroup.h"
-#include "icinga/timeperiod.h"
-#include "icinga/checkresult.h"
-#include "remote/messageorigin.h"
-#include "base/array.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/notification.thpp"
+#include "icinga/user.hpp"
+#include "icinga/usergroup.hpp"
+#include "icinga/timeperiod.hpp"
+#include "icinga/checkresult.hpp"
+#include "remote/messageorigin.hpp"
+#include "base/array.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/notification.ti b/lib/icinga/notification.ti
index 2565a9058..f73af49a4 100644
--- a/lib/icinga/notification.ti
+++ b/lib/icinga/notification.ti
@@ -1,4 +1,4 @@
-#include "icinga/customvarobject.h"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/notificationcommand.cpp b/lib/icinga/notificationcommand.cpp
index 2d39de252..ab00c30a6 100644
--- a/lib/icinga/notificationcommand.cpp
+++ b/lib/icinga/notificationcommand.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/notificationcommand.h"
+#include "icinga/notificationcommand.hpp"
 
 using namespace icinga;
 
diff --git a/lib/icinga/notificationcommand.h b/lib/icinga/notificationcommand.hpp
similarity index 96%
rename from lib/icinga/notificationcommand.h
rename to lib/icinga/notificationcommand.hpp
index e2c413180..361541f18 100644
--- a/lib/icinga/notificationcommand.h
+++ b/lib/icinga/notificationcommand.hpp
@@ -20,8 +20,8 @@
 #ifndef NOTIFICATIONCOMMAND_H
 #define NOTIFICATIONCOMMAND_H
 
-#include "icinga/notificationcommand.th"
-#include "icinga/notification.h"
+#include "icinga/notificationcommand.thpp"
+#include "icinga/notification.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/notificationcommand.ti b/lib/icinga/notificationcommand.ti
index 49475a0d5..9ae71e593 100644
--- a/lib/icinga/notificationcommand.ti
+++ b/lib/icinga/notificationcommand.ti
@@ -1,4 +1,4 @@
-#include "icinga/command.h"
+#include "icinga/command.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/perfdatavalue.cpp b/lib/icinga/perfdatavalue.cpp
index 0c8b9e300..194938070 100644
--- a/lib/icinga/perfdatavalue.cpp
+++ b/lib/icinga/perfdatavalue.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/perfdatavalue.h"
-#include "base/convert.h"
+#include "icinga/perfdatavalue.hpp"
+#include "base/convert.hpp"
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
diff --git a/lib/icinga/perfdatavalue.h b/lib/icinga/perfdatavalue.hpp
similarity index 96%
rename from lib/icinga/perfdatavalue.h
rename to lib/icinga/perfdatavalue.hpp
index 6f38a78cc..6d299e03c 100644
--- a/lib/icinga/perfdatavalue.h
+++ b/lib/icinga/perfdatavalue.hpp
@@ -20,8 +20,8 @@
 #ifndef PERFDATAVALUE_H
 #define PERFDATAVALUE_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/perfdatavalue.th"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/perfdatavalue.thpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/perfdatavalue.ti b/lib/icinga/perfdatavalue.ti
index c2911d9d9..0c6ad3702 100644
--- a/lib/icinga/perfdatavalue.ti
+++ b/lib/icinga/perfdatavalue.ti
@@ -1,4 +1,4 @@
-#include "icinga/customvarobject.h"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/pluginutility.cpp b/lib/icinga/pluginutility.cpp
index 4670f9eef..11628c763 100644
--- a/lib/icinga/pluginutility.cpp
+++ b/lib/icinga/pluginutility.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/pluginutility.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/perfdatavalue.h"
-#include "base/logger_fwd.h"
-#include "base/utility.h"
-#include "base/convert.h"
-#include "base/process.h"
-#include "base/objectlock.h"
+#include "icinga/pluginutility.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/perfdatavalue.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/utility.hpp"
+#include "base/convert.hpp"
+#include "base/process.hpp"
+#include "base/objectlock.hpp"
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/trim.hpp>
diff --git a/lib/icinga/pluginutility.h b/lib/icinga/pluginutility.hpp
similarity index 94%
rename from lib/icinga/pluginutility.h
rename to lib/icinga/pluginutility.hpp
index 060e22152..1e8d6785a 100644
--- a/lib/icinga/pluginutility.h
+++ b/lib/icinga/pluginutility.hpp
@@ -20,10 +20,10 @@
 #ifndef PLUGINUTILITY_H
 #define PLUGINUTILITY_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/checkable.h"
-#include "icinga/checkcommand.h"
-#include "icinga/macroprocessor.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/checkable.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/macroprocessor.hpp"
 #include <vector>
 
 namespace icinga
diff --git a/lib/icinga/scheduleddowntime-apply.cpp b/lib/icinga/scheduleddowntime-apply.cpp
index 1d05bf7a4..8cc98ad54 100644
--- a/lib/icinga/scheduleddowntime-apply.cpp
+++ b/lib/icinga/scheduleddowntime-apply.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/scheduleddowntime.h"
-#include "icinga/service.h"
-#include "config/configitembuilder.h"
-#include "config/applyrule.h"
-#include "base/initialize.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/context.h"
+#include "icinga/scheduleddowntime.hpp"
+#include "icinga/service.hpp"
+#include "config/configitembuilder.hpp"
+#include "config/applyrule.hpp"
+#include "base/initialize.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/context.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/scheduleddowntime.cpp b/lib/icinga/scheduleddowntime.cpp
index 2397846a8..db0746139 100644
--- a/lib/icinga/scheduleddowntime.cpp
+++ b/lib/icinga/scheduleddowntime.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/scheduleddowntime.h"
-#include "icinga/legacytimeperiod.h"
-#include "icinga/downtime.h"
-#include "icinga/service.h"
-#include "base/timer.h"
-#include "base/dynamictype.h"
-#include "base/initialize.h"
-#include "base/utility.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
+#include "icinga/scheduleddowntime.hpp"
+#include "icinga/legacytimeperiod.hpp"
+#include "icinga/downtime.hpp"
+#include "icinga/service.hpp"
+#include "base/timer.hpp"
+#include "base/dynamictype.hpp"
+#include "base/initialize.hpp"
+#include "base/utility.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/scheduleddowntime.h b/lib/icinga/scheduleddowntime.hpp
similarity index 95%
rename from lib/icinga/scheduleddowntime.h
rename to lib/icinga/scheduleddowntime.hpp
index b24a3cd3c..f34246a32 100644
--- a/lib/icinga/scheduleddowntime.h
+++ b/lib/icinga/scheduleddowntime.hpp
@@ -20,9 +20,9 @@
 #ifndef SCHEDULEDDOWNTIME_H
 #define SCHEDULEDDOWNTIME_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/scheduleddowntime.th"
-#include "icinga/checkable.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/scheduleddowntime.thpp"
+#include "icinga/checkable.hpp"
 #include <utility>
 
 namespace icinga
diff --git a/lib/icinga/scheduleddowntime.ti b/lib/icinga/scheduleddowntime.ti
index e5dafeacf..eead4fd5a 100644
--- a/lib/icinga/scheduleddowntime.ti
+++ b/lib/icinga/scheduleddowntime.ti
@@ -1,4 +1,4 @@
-#include "icinga/customvarobject.h"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/service-apply.cpp b/lib/icinga/service-apply.cpp
index 6a4f4569c..8a71e63df 100644
--- a/lib/icinga/service-apply.cpp
+++ b/lib/icinga/service-apply.cpp
@@ -17,14 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/service.h"
-#include "config/configitembuilder.h"
-#include "config/applyrule.h"
-#include "base/initialize.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/context.h"
-#include "base/workqueue.h"
+#include "icinga/service.hpp"
+#include "config/configitembuilder.hpp"
+#include "config/applyrule.hpp"
+#include "base/initialize.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/context.hpp"
+#include "base/workqueue.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index fda39ae77..fd12f735b 100644
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/service.h"
-#include "icinga/servicegroup.h"
-#include "icinga/pluginutility.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/utility.h"
+#include "icinga/service.hpp"
+#include "icinga/servicegroup.hpp"
+#include "icinga/pluginutility.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
 #include <boost/foreach.hpp>
 #include <boost/bind/apply.hpp>
 
diff --git a/lib/icinga/service.h b/lib/icinga/service.hpp
similarity index 95%
rename from lib/icinga/service.h
rename to lib/icinga/service.hpp
index 735615001..8219af067 100644
--- a/lib/icinga/service.h
+++ b/lib/icinga/service.hpp
@@ -20,10 +20,10 @@
 #ifndef SERVICE_H
 #define SERVICE_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/service.th"
-#include "icinga/macroresolver.h"
-#include "icinga/host.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/service.thpp"
+#include "icinga/macroresolver.hpp"
+#include "icinga/host.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/service.ti b/lib/icinga/service.ti
index 67e056e70..bef085fcf 100644
--- a/lib/icinga/service.ti
+++ b/lib/icinga/service.ti
@@ -1,7 +1,7 @@
-#include "icinga/checkable.h"
-#include "icinga/host.h"
-#include "icinga/icingaapplication.h"
-#include "icinga/customvarobject.h"
+#include "icinga/checkable.hpp"
+#include "icinga/host.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/servicegroup.cpp b/lib/icinga/servicegroup.cpp
index e1fd62c5a..ef44f4653 100644
--- a/lib/icinga/servicegroup.cpp
+++ b/lib/icinga/servicegroup.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/servicegroup.h"
-#include "config/objectrule.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/context.h"
-#include "base/workqueue.h"
+#include "icinga/servicegroup.hpp"
+#include "config/objectrule.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/context.hpp"
+#include "base/workqueue.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/servicegroup.h b/lib/icinga/servicegroup.hpp
similarity index 96%
rename from lib/icinga/servicegroup.h
rename to lib/icinga/servicegroup.hpp
index 82c7d5632..b025a137c 100644
--- a/lib/icinga/servicegroup.h
+++ b/lib/icinga/servicegroup.hpp
@@ -20,9 +20,9 @@
 #ifndef SERVICEGROUP_H
 #define SERVICEGROUP_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/servicegroup.th"
-#include "icinga/service.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/servicegroup.thpp"
+#include "icinga/service.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/servicegroup.ti b/lib/icinga/servicegroup.ti
index 722b3de59..f0ed6ea42 100644
--- a/lib/icinga/servicegroup.ti
+++ b/lib/icinga/servicegroup.ti
@@ -1,4 +1,4 @@
-#include "icinga/customvarobject.h"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/timeperiod.cpp b/lib/icinga/timeperiod.cpp
index e0cb6586c..53477b0e9 100644
--- a/lib/icinga/timeperiod.cpp
+++ b/lib/icinga/timeperiod.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/timeperiod.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/timer.h"
-#include "base/utility.h"
+#include "icinga/timeperiod.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/timer.hpp"
+#include "base/utility.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/timeperiod.h b/lib/icinga/timeperiod.hpp
similarity index 97%
rename from lib/icinga/timeperiod.h
rename to lib/icinga/timeperiod.hpp
index 9ea8a970e..3e6d2a5da 100644
--- a/lib/icinga/timeperiod.h
+++ b/lib/icinga/timeperiod.hpp
@@ -20,8 +20,8 @@
 #ifndef TIMEPERIOD_H
 #define TIMEPERIOD_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/timeperiod.th"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/timeperiod.thpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/timeperiod.ti b/lib/icinga/timeperiod.ti
index dc826b26a..a9cae8379 100644
--- a/lib/icinga/timeperiod.ti
+++ b/lib/icinga/timeperiod.ti
@@ -1,4 +1,4 @@
-#include "icinga/customvarobject.h"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/user.cpp b/lib/icinga/user.cpp
index 5a96faae9..c7f5020d0 100644
--- a/lib/icinga/user.cpp
+++ b/lib/icinga/user.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/user.h"
-#include "icinga/notification.h"
-#include "icinga/usergroup.h"
-#include "config/configcompilercontext.h"
-#include "base/scriptfunction.h"
-#include "base/objectlock.h"
+#include "icinga/user.hpp"
+#include "icinga/notification.hpp"
+#include "icinga/usergroup.hpp"
+#include "config/configcompilercontext.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/objectlock.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/user.h b/lib/icinga/user.hpp
similarity index 94%
rename from lib/icinga/user.h
rename to lib/icinga/user.hpp
index 9a0a816f4..af64c4bac 100644
--- a/lib/icinga/user.h
+++ b/lib/icinga/user.hpp
@@ -20,10 +20,10 @@
 #ifndef USER_H
 #define USER_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/user.th"
-#include "icinga/timeperiod.h"
-#include "remote/messageorigin.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/user.thpp"
+#include "icinga/timeperiod.hpp"
+#include "remote/messageorigin.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/user.ti b/lib/icinga/user.ti
index cb2ddf0ad..649e9fda2 100644
--- a/lib/icinga/user.ti
+++ b/lib/icinga/user.ti
@@ -1,5 +1,5 @@
-#include "icinga/customvarobject.h"
-#include "base/array.h"
+#include "icinga/customvarobject.hpp"
+#include "base/array.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/usergroup.cpp b/lib/icinga/usergroup.cpp
index c5d31dac7..fa085f597 100644
--- a/lib/icinga/usergroup.cpp
+++ b/lib/icinga/usergroup.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/usergroup.h"
-#include "config/objectrule.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/context.h"
-#include "base/workqueue.h"
+#include "icinga/usergroup.hpp"
+#include "config/objectrule.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/context.hpp"
+#include "base/workqueue.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/icinga/usergroup.h b/lib/icinga/usergroup.hpp
similarity index 96%
rename from lib/icinga/usergroup.h
rename to lib/icinga/usergroup.hpp
index 96a4aabf8..9e9d6c1ed 100644
--- a/lib/icinga/usergroup.h
+++ b/lib/icinga/usergroup.hpp
@@ -20,9 +20,9 @@
 #ifndef USERGROUP_H
 #define USERGROUP_H
 
-#include "icinga/i2-icinga.h"
-#include "icinga/usergroup.th"
-#include "icinga/user.h"
+#include "icinga/i2-icinga.hpp"
+#include "icinga/usergroup.thpp"
+#include "icinga/user.hpp"
 
 namespace icinga
 {
diff --git a/lib/icinga/usergroup.ti b/lib/icinga/usergroup.ti
index ba0967de0..202ff92de 100644
--- a/lib/icinga/usergroup.ti
+++ b/lib/icinga/usergroup.ti
@@ -1,4 +1,4 @@
-#include "icinga/customvarobject.h"
+#include "icinga/customvarobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/methods/castfuncs.cpp b/lib/methods/castfuncs.cpp
index c4c7a7aa1..a925edd9b 100644
--- a/lib/methods/castfuncs.cpp
+++ b/lib/methods/castfuncs.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/castfuncs.h"
-#include "base/scriptfunction.h"
+#include "methods/castfuncs.hpp"
+#include "base/scriptfunction.hpp"
 
 using namespace icinga;
 
diff --git a/lib/methods/castfuncs.h b/lib/methods/castfuncs.hpp
similarity index 96%
rename from lib/methods/castfuncs.h
rename to lib/methods/castfuncs.hpp
index cd3ea4c9d..37e4eb2b6 100644
--- a/lib/methods/castfuncs.h
+++ b/lib/methods/castfuncs.hpp
@@ -20,8 +20,8 @@
 #ifndef CASTFUNCS_H
 #define CASTFUNCS_H
 
-#include "methods/i2-methods.h"
-#include "base/qstring.h"
+#include "methods/i2-methods.hpp"
+#include "base/qstring.hpp"
 
 namespace icinga
 {
diff --git a/lib/methods/clrchecktask.cpp b/lib/methods/clrchecktask.cpp
index 9d6178446..b65eb9c8e 100644
--- a/lib/methods/clrchecktask.cpp
+++ b/lib/methods/clrchecktask.cpp
@@ -17,16 +17,16 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/clrchecktask.h"
-#include "icinga/pluginutility.h"
-#include "icinga/checkcommand.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/icingaapplication.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/scriptfunction.h"
-#include "base/utility.h"
-#include "base/process.h"
+#include "methods/clrchecktask.hpp"
+#include "icinga/pluginutility.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/utility.hpp"
+#include "base/process.hpp"
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/foreach.hpp>
diff --git a/lib/methods/clrchecktask.h b/lib/methods/clrchecktask.hpp
similarity index 95%
rename from lib/methods/clrchecktask.h
rename to lib/methods/clrchecktask.hpp
index 28f35f549..5448030c6 100644
--- a/lib/methods/clrchecktask.h
+++ b/lib/methods/clrchecktask.hpp
@@ -20,9 +20,9 @@
 #ifndef CLRCHECKTASK_H
 #define CLRCHECKTASK_H
 
-#include "methods/i2-methods.h"
-#include "base/process.h"
-#include "icinga/service.h"
+#include "methods/i2-methods.hpp"
+#include "base/process.hpp"
+#include "icinga/service.hpp"
 
 namespace icinga
 {
diff --git a/lib/methods/clusterchecktask.cpp b/lib/methods/clusterchecktask.cpp
index ff69a40df..96a512649 100644
--- a/lib/methods/clusterchecktask.cpp
+++ b/lib/methods/clusterchecktask.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/clusterchecktask.h"
-#include "remote/apilistener.h"
-#include "remote/endpoint.h"
-#include "icinga/cib.h"
-#include "icinga/service.h"
-#include "icinga/icingaapplication.h"
-#include "base/application.h"
-#include "base/objectlock.h"
-#include "base/convert.h"
-#include "base/utility.h"
-#include "base/scriptfunction.h"
-#include "base/dynamictype.h"
+#include "methods/clusterchecktask.hpp"
+#include "remote/apilistener.hpp"
+#include "remote/endpoint.hpp"
+#include "icinga/cib.hpp"
+#include "icinga/service.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/application.hpp"
+#include "base/objectlock.hpp"
+#include "base/convert.hpp"
+#include "base/utility.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/dynamictype.hpp"
 #include <boost/algorithm/string/join.hpp>
 #include <boost/foreach.hpp>
 
diff --git a/lib/methods/clusterchecktask.h b/lib/methods/clusterchecktask.hpp
similarity index 98%
rename from lib/methods/clusterchecktask.h
rename to lib/methods/clusterchecktask.hpp
index 0c2872e5a..9ca3b3780 100644
--- a/lib/methods/clusterchecktask.h
+++ b/lib/methods/clusterchecktask.hpp
@@ -20,7 +20,7 @@
 #ifndef CLUSTERCHECKTASK_H
 #define CLUSTERCHECKTASK_H
 
-#include "icinga/service.h"
+#include "icinga/service.hpp"
 
 namespace icinga
 {
diff --git a/lib/methods/i2-methods.h b/lib/methods/i2-methods.hpp
similarity index 98%
rename from lib/methods/i2-methods.h
rename to lib/methods/i2-methods.hpp
index 72f37b3de..68761ddb6 100644
--- a/lib/methods/i2-methods.h
+++ b/lib/methods/i2-methods.hpp
@@ -27,7 +27,7 @@
  * handlers, etc.).
  */
 
-#include "base/i2-base.h"
+#include "base/i2-base.hpp"
 
 #ifdef I2_METHODS_BUILD
 #	define I2_METHODS_API I2_EXPORT
diff --git a/lib/methods/icingachecktask.cpp b/lib/methods/icingachecktask.cpp
index d5045ce57..4b941caa6 100644
--- a/lib/methods/icingachecktask.cpp
+++ b/lib/methods/icingachecktask.cpp
@@ -17,15 +17,15 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/icingachecktask.h"
-#include "icinga/cib.h"
-#include "icinga/service.h"
-#include "icinga/icingaapplication.h"
-#include "base/application.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
-#include "base/scriptfunction.h"
-#include "base/dynamictype.h"
+#include "methods/icingachecktask.hpp"
+#include "icinga/cib.hpp"
+#include "icinga/service.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/application.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/dynamictype.hpp"
 
 using namespace icinga;
 
diff --git a/lib/methods/icingachecktask.h b/lib/methods/icingachecktask.hpp
similarity index 96%
rename from lib/methods/icingachecktask.h
rename to lib/methods/icingachecktask.hpp
index 64aa6fbd1..b3c1d2bcf 100644
--- a/lib/methods/icingachecktask.h
+++ b/lib/methods/icingachecktask.hpp
@@ -20,8 +20,8 @@
 #ifndef ICINGACHECKTASK_H
 #define ICINGACHECKTASK_H
 
-#include "methods/i2-methods.h"
-#include "icinga/service.h"
+#include "methods/i2-methods.hpp"
+#include "icinga/service.hpp"
 
 namespace icinga
 {
diff --git a/lib/methods/nullchecktask.cpp b/lib/methods/nullchecktask.cpp
index ad9a13384..0f25559f7 100644
--- a/lib/methods/nullchecktask.cpp
+++ b/lib/methods/nullchecktask.cpp
@@ -20,11 +20,11 @@
 #ifndef _WIN32
 #	include <stdlib.h>
 #endif /* _WIN32 */
-#include "methods/nullchecktask.h"
-#include "base/utility.h"
-#include "base/convert.h"
-#include "base/scriptfunction.h"
-#include "base/logger_fwd.h"
+#include "methods/nullchecktask.hpp"
+#include "base/utility.hpp"
+#include "base/convert.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/logger_fwd.hpp"
 
 using namespace icinga;
 
diff --git a/lib/methods/nullchecktask.h b/lib/methods/nullchecktask.hpp
similarity index 95%
rename from lib/methods/nullchecktask.h
rename to lib/methods/nullchecktask.hpp
index 9f5e104df..6587e71e2 100644
--- a/lib/methods/nullchecktask.h
+++ b/lib/methods/nullchecktask.hpp
@@ -20,9 +20,9 @@
 #ifndef NULLCHECKTASK_H
 #define NULLCHECKTASK_H
 
-#include "methods/i2-methods.h"
-#include "icinga/service.h"
-#include "base/dictionary.h"
+#include "methods/i2-methods.hpp"
+#include "icinga/service.hpp"
+#include "base/dictionary.hpp"
 
 namespace icinga
 {
diff --git a/lib/methods/nulleventtask.cpp b/lib/methods/nulleventtask.cpp
index 68e00ac73..39dfaf854 100644
--- a/lib/methods/nulleventtask.cpp
+++ b/lib/methods/nulleventtask.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/nulleventtask.h"
-#include "base/scriptfunction.h"
-#include "base/logger_fwd.h"
+#include "methods/nulleventtask.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/logger_fwd.hpp"
 
 using namespace icinga;
 
diff --git a/lib/methods/nulleventtask.h b/lib/methods/nulleventtask.hpp
similarity index 94%
rename from lib/methods/nulleventtask.h
rename to lib/methods/nulleventtask.hpp
index 286ae140f..cc9320104 100644
--- a/lib/methods/nulleventtask.h
+++ b/lib/methods/nulleventtask.hpp
@@ -20,9 +20,9 @@
 #ifndef NULLEVENTTASK_H
 #define NULLEVENTTASK_H
 
-#include "methods/i2-methods.h"
-#include "icinga/service.h"
-#include "base/dictionary.h"
+#include "methods/i2-methods.hpp"
+#include "icinga/service.hpp"
+#include "base/dictionary.hpp"
 
 namespace icinga
 {
diff --git a/lib/methods/pluginchecktask.cpp b/lib/methods/pluginchecktask.cpp
index 0908adfe5..7ba0c6496 100644
--- a/lib/methods/pluginchecktask.cpp
+++ b/lib/methods/pluginchecktask.cpp
@@ -17,16 +17,16 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/pluginchecktask.h"
-#include "icinga/pluginutility.h"
-#include "icinga/checkcommand.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/icingaapplication.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/scriptfunction.h"
-#include "base/utility.h"
-#include "base/process.h"
+#include "methods/pluginchecktask.hpp"
+#include "icinga/pluginutility.hpp"
+#include "icinga/checkcommand.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/utility.hpp"
+#include "base/process.hpp"
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/foreach.hpp>
diff --git a/lib/methods/pluginchecktask.h b/lib/methods/pluginchecktask.hpp
similarity index 95%
rename from lib/methods/pluginchecktask.h
rename to lib/methods/pluginchecktask.hpp
index 0527983f3..f92e33a66 100644
--- a/lib/methods/pluginchecktask.h
+++ b/lib/methods/pluginchecktask.hpp
@@ -20,9 +20,9 @@
 #ifndef PLUGINCHECKTASK_H
 #define PLUGINCHECKTASK_H
 
-#include "methods/i2-methods.h"
-#include "base/process.h"
-#include "icinga/service.h"
+#include "methods/i2-methods.hpp"
+#include "base/process.hpp"
+#include "icinga/service.hpp"
 
 namespace icinga
 {
diff --git a/lib/methods/plugineventtask.cpp b/lib/methods/plugineventtask.cpp
index 7773e04b3..033616c1f 100644
--- a/lib/methods/plugineventtask.cpp
+++ b/lib/methods/plugineventtask.cpp
@@ -17,16 +17,16 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/plugineventtask.h"
-#include "icinga/eventcommand.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/pluginutility.h"
-#include "icinga/icingaapplication.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/scriptfunction.h"
-#include "base/utility.h"
-#include "base/process.h"
+#include "methods/plugineventtask.hpp"
+#include "icinga/eventcommand.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/pluginutility.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/utility.hpp"
+#include "base/process.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/methods/plugineventtask.h b/lib/methods/plugineventtask.hpp
similarity index 96%
rename from lib/methods/plugineventtask.h
rename to lib/methods/plugineventtask.hpp
index ae9f5b3ec..ce57021b0 100644
--- a/lib/methods/plugineventtask.h
+++ b/lib/methods/plugineventtask.hpp
@@ -20,8 +20,8 @@
 #ifndef PLUGINEVENTTASK_H
 #define PLUGINEVENTTASK_H
 
-#include "methods/i2-methods.h"
-#include "icinga/service.h"
+#include "methods/i2-methods.hpp"
+#include "icinga/service.hpp"
 
 namespace icinga
 {
diff --git a/lib/methods/pluginnotificationtask.cpp b/lib/methods/pluginnotificationtask.cpp
index 996c2c5ee..6e25ccd71 100644
--- a/lib/methods/pluginnotificationtask.cpp
+++ b/lib/methods/pluginnotificationtask.cpp
@@ -17,17 +17,17 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/pluginnotificationtask.h"
-#include "icinga/notification.h"
-#include "icinga/notificationcommand.h"
-#include "icinga/pluginutility.h"
-#include "icinga/service.h"
-#include "icinga/macroprocessor.h"
-#include "icinga/icingaapplication.h"
-#include "base/scriptfunction.h"
-#include "base/logger_fwd.h"
-#include "base/utility.h"
-#include "base/process.h"
+#include "methods/pluginnotificationtask.hpp"
+#include "icinga/notification.hpp"
+#include "icinga/notificationcommand.hpp"
+#include "icinga/pluginutility.hpp"
+#include "icinga/service.hpp"
+#include "icinga/macroprocessor.hpp"
+#include "icinga/icingaapplication.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/utility.hpp"
+#include "base/process.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/methods/pluginnotificationtask.h b/lib/methods/pluginnotificationtask.hpp
similarity index 94%
rename from lib/methods/pluginnotificationtask.h
rename to lib/methods/pluginnotificationtask.hpp
index 20e1d4819..a7e843d19 100644
--- a/lib/methods/pluginnotificationtask.h
+++ b/lib/methods/pluginnotificationtask.hpp
@@ -20,10 +20,10 @@
 #ifndef PLUGINNOTIFICATIONTASK_H
 #define PLUGINNOTIFICATIONTASK_H
 
-#include "methods/i2-methods.h"
-#include "icinga/notification.h"
-#include "icinga/service.h"
-#include "base/process.h"
+#include "methods/i2-methods.hpp"
+#include "icinga/notification.hpp"
+#include "icinga/service.hpp"
+#include "base/process.hpp"
 
 namespace icinga
 {
diff --git a/lib/methods/randomchecktask.cpp b/lib/methods/randomchecktask.cpp
index a8ad402bc..1ea4d3c7e 100644
--- a/lib/methods/randomchecktask.cpp
+++ b/lib/methods/randomchecktask.cpp
@@ -20,12 +20,12 @@
 #ifndef _WIN32
 #	include <stdlib.h>
 #endif /* _WIN32 */
-#include "icinga/icingaapplication.h"
-#include "methods/randomchecktask.h"
-#include "base/utility.h"
-#include "base/convert.h"
-#include "base/scriptfunction.h"
-#include "base/logger_fwd.h"
+#include "icinga/icingaapplication.hpp"
+#include "methods/randomchecktask.hpp"
+#include "base/utility.hpp"
+#include "base/convert.hpp"
+#include "base/scriptfunction.hpp"
+#include "base/logger_fwd.hpp"
 
 using namespace icinga;
 
diff --git a/lib/methods/randomchecktask.h b/lib/methods/randomchecktask.hpp
similarity index 96%
rename from lib/methods/randomchecktask.h
rename to lib/methods/randomchecktask.hpp
index e26c06817..d026bf7fe 100644
--- a/lib/methods/randomchecktask.h
+++ b/lib/methods/randomchecktask.hpp
@@ -20,8 +20,8 @@
 #ifndef RANDOMCHECKTASK_H
 #define RANDOMCHECKTASK_H
 
-#include "icinga/service.h"
-#include "base/dictionary.h"
+#include "icinga/service.hpp"
+#include "base/dictionary.hpp"
 
 namespace icinga
 {
diff --git a/lib/methods/timeperiodtask.cpp b/lib/methods/timeperiodtask.cpp
index 139f4716a..7a21c0dab 100644
--- a/lib/methods/timeperiodtask.cpp
+++ b/lib/methods/timeperiodtask.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/timeperiodtask.h"
-#include "base/scriptfunction.h"
+#include "methods/timeperiodtask.hpp"
+#include "base/scriptfunction.hpp"
 
 using namespace icinga;
 
diff --git a/lib/methods/timeperiodtask.h b/lib/methods/timeperiodtask.hpp
similarity index 98%
rename from lib/methods/timeperiodtask.h
rename to lib/methods/timeperiodtask.hpp
index 3334e52bd..1cc1e46a7 100644
--- a/lib/methods/timeperiodtask.h
+++ b/lib/methods/timeperiodtask.hpp
@@ -20,7 +20,7 @@
 #ifndef TIMEPERIODTASK_H
 #define TIMEPERIODTASK_H
 
-#include "icinga/timeperiod.h"
+#include "icinga/timeperiod.hpp"
 
 namespace icinga
 {
diff --git a/lib/remote/CMakeLists.txt b/lib/remote/CMakeLists.txt
index f2c1ff0c3..5bff6e4da 100644
--- a/lib/remote/CMakeLists.txt
+++ b/lib/remote/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(apilistener.ti apilistener.th)
-mkclass_target(endpoint.ti endpoint.th)
-mkclass_target(zone.ti zone.th)
+mkclass_target(apilistener.ti apilistener.thpp)
+mkclass_target(endpoint.ti endpoint.thpp)
+mkclass_target(zone.ti zone.thpp)
 
 mkembedconfig_target(remote-type.conf remote-type.cpp)
 
 add_library(remote SHARED
   apiclient.cpp apifunction.cpp apilistener.cpp apilistener-sync.cpp
-  apilistener.th authority.cpp endpoint.cpp endpoint.th jsonrpc.cpp
-  messageorigin.cpp remote-type.cpp zone.cpp zone.th
+  apilistener.thpp authority.cpp endpoint.cpp endpoint.thpp jsonrpc.cpp
+  messageorigin.cpp remote-type.cpp zone.cpp zone.thpp
 )
 
 include_directories(${Boost_INCLUDE_DIRS})
diff --git a/lib/remote/apiclient.cpp b/lib/remote/apiclient.cpp
index 8ab7a63de..a3b518b1c 100644
--- a/lib/remote/apiclient.cpp
+++ b/lib/remote/apiclient.cpp
@@ -17,16 +17,16 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "remote/apiclient.h"
-#include "remote/apilistener.h"
-#include "remote/apifunction.h"
-#include "remote/jsonrpc.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/utility.h"
-#include "base/logger_fwd.h"
-#include "base/exception.h"
-#include "base/initialize.h"
+#include "remote/apiclient.hpp"
+#include "remote/apilistener.hpp"
+#include "remote/apifunction.hpp"
+#include "remote/jsonrpc.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/utility.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/exception.hpp"
+#include "base/initialize.hpp"
 
 using namespace icinga;
 
diff --git a/lib/remote/apiclient.h b/lib/remote/apiclient.hpp
similarity index 95%
rename from lib/remote/apiclient.h
rename to lib/remote/apiclient.hpp
index 9180574dd..3809f85ca 100644
--- a/lib/remote/apiclient.h
+++ b/lib/remote/apiclient.hpp
@@ -20,10 +20,10 @@
 #ifndef APICLIENT_H
 #define APICLIENT_H
 
-#include "remote/endpoint.h"
-#include "base/stream.h"
-#include "base/timer.h"
-#include "remote/i2-remote.h"
+#include "remote/endpoint.hpp"
+#include "base/stream.hpp"
+#include "base/timer.hpp"
+#include "remote/i2-remote.hpp"
 
 namespace icinga
 {
diff --git a/lib/remote/apifunction.cpp b/lib/remote/apifunction.cpp
index 9e15f7eff..bbb6fa4fc 100644
--- a/lib/remote/apifunction.cpp
+++ b/lib/remote/apifunction.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "remote/apifunction.h"
-#include "base/singleton.h"
+#include "remote/apifunction.hpp"
+#include "base/singleton.hpp"
 
 using namespace icinga;
 
diff --git a/lib/remote/apifunction.h b/lib/remote/apifunction.hpp
similarity index 94%
rename from lib/remote/apifunction.h
rename to lib/remote/apifunction.hpp
index 46ec2a5a6..72da522d4 100644
--- a/lib/remote/apifunction.h
+++ b/lib/remote/apifunction.hpp
@@ -20,11 +20,11 @@
 #ifndef APIFUNCTION_H
 #define APIFUNCTION_H
 
-#include "remote/i2-remote.h"
-#include "remote/messageorigin.h"
-#include "base/registry.h"
-#include "base/value.h"
-#include "base/dictionary.h"
+#include "remote/i2-remote.hpp"
+#include "remote/messageorigin.hpp"
+#include "base/registry.hpp"
+#include "base/value.hpp"
+#include "base/dictionary.hpp"
 #include <vector>
 #include <boost/function.hpp>
 
diff --git a/lib/remote/apilistener-sync.cpp b/lib/remote/apilistener-sync.cpp
index 1251938c1..6d0a89599 100644
--- a/lib/remote/apilistener-sync.cpp
+++ b/lib/remote/apilistener-sync.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "remote/apilistener.h"
-#include "remote/apifunction.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/convert.h"
+#include "remote/apilistener.hpp"
+#include "remote/apifunction.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/convert.hpp"
 #include <boost/foreach.hpp>
 #include <fstream>
 
diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index 24d231918..c6816ab7b 100644
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -17,18 +17,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "remote/apilistener.h"
-#include "remote/apiclient.h"
-#include "remote/endpoint.h"
-#include "base/convert.h"
-#include "base/netstring.h"
-#include "base/dynamictype.h"
-#include "base/logger_fwd.h"
-#include "base/objectlock.h"
-#include "base/stdiostream.h"
-#include "base/application.h"
-#include "base/context.h"
-#include "base/statsfunction.h"
+#include "remote/apilistener.hpp"
+#include "remote/apiclient.hpp"
+#include "remote/endpoint.hpp"
+#include "base/convert.hpp"
+#include "base/netstring.hpp"
+#include "base/dynamictype.hpp"
+#include "base/logger_fwd.hpp"
+#include "base/objectlock.hpp"
+#include "base/stdiostream.hpp"
+#include "base/application.hpp"
+#include "base/context.hpp"
+#include "base/statsfunction.hpp"
 #include <fstream>
 
 using namespace icinga;
diff --git a/lib/remote/apilistener.h b/lib/remote/apilistener.hpp
similarity index 93%
rename from lib/remote/apilistener.h
rename to lib/remote/apilistener.hpp
index 95638bb2e..5cd0c0411 100644
--- a/lib/remote/apilistener.h
+++ b/lib/remote/apilistener.hpp
@@ -20,15 +20,15 @@
 #ifndef APILISTENER_H
 #define APILISTENER_H
 
-#include "remote/apilistener.th"
-#include "remote/apiclient.h"
-#include "remote/endpoint.h"
-#include "remote/messageorigin.h"
-#include "base/dynamicobject.h"
-#include "base/timer.h"
-#include "base/workqueue.h"
-#include "base/tcpsocket.h"
-#include "base/tlsstream.h"
+#include "remote/apilistener.thpp"
+#include "remote/apiclient.hpp"
+#include "remote/endpoint.hpp"
+#include "remote/messageorigin.hpp"
+#include "base/dynamicobject.hpp"
+#include "base/timer.hpp"
+#include "base/workqueue.hpp"
+#include "base/tcpsocket.hpp"
+#include "base/tlsstream.hpp"
 #include <set>
 
 namespace icinga
diff --git a/lib/remote/apilistener.ti b/lib/remote/apilistener.ti
index be7cd6b15..75a3e1195 100644
--- a/lib/remote/apilistener.ti
+++ b/lib/remote/apilistener.ti
@@ -1,5 +1,5 @@
-#include "base/dynamicobject.h"
-#include "base/application.h"
+#include "base/dynamicobject.hpp"
+#include "base/application.hpp"
 
 namespace icinga
 {
diff --git a/lib/remote/authority.cpp b/lib/remote/authority.cpp
index 8ea187527..a9aa49c5e 100644
--- a/lib/remote/authority.cpp
+++ b/lib/remote/authority.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "remote/zone.h"
-#include "remote/apilistener.h"
-#include "base/dynamictype.h"
-#include "base/utility.h"
-#include "base/initialize.h"
-#include "base/timer.h"
+#include "remote/zone.hpp"
+#include "remote/apilistener.hpp"
+#include "base/dynamictype.hpp"
+#include "base/utility.hpp"
+#include "base/initialize.hpp"
+#include "base/timer.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/remote/endpoint.cpp b/lib/remote/endpoint.cpp
index 535516b7c..eb50fcec1 100644
--- a/lib/remote/endpoint.cpp
+++ b/lib/remote/endpoint.cpp
@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "remote/endpoint.h"
-#include "remote/apilistener.h"
-#include "remote/apiclient.h"
-#include "remote/zone.h"
-#include "base/dynamictype.h"
-#include "base/utility.h"
-#include "base/exception.h"
+#include "remote/endpoint.hpp"
+#include "remote/apilistener.hpp"
+#include "remote/apiclient.hpp"
+#include "remote/zone.hpp"
+#include "base/dynamictype.hpp"
+#include "base/utility.hpp"
+#include "base/exception.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/remote/endpoint.h b/lib/remote/endpoint.hpp
similarity index 97%
rename from lib/remote/endpoint.h
rename to lib/remote/endpoint.hpp
index eecec73bf..d732600ba 100644
--- a/lib/remote/endpoint.h
+++ b/lib/remote/endpoint.hpp
@@ -20,8 +20,8 @@
 #ifndef ENDPOINT_H
 #define ENDPOINT_H
 
-#include "remote/i2-remote.h"
-#include "remote/endpoint.th"
+#include "remote/i2-remote.hpp"
+#include "remote/endpoint.thpp"
 #include <set>
 
 namespace icinga
diff --git a/lib/remote/endpoint.ti b/lib/remote/endpoint.ti
index 6e1a521d8..dc0a9029e 100644
--- a/lib/remote/endpoint.ti
+++ b/lib/remote/endpoint.ti
@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/lib/remote/i2-remote.h b/lib/remote/i2-remote.hpp
similarity index 98%
rename from lib/remote/i2-remote.h
rename to lib/remote/i2-remote.hpp
index 045d89476..b9b16c7cc 100644
--- a/lib/remote/i2-remote.h
+++ b/lib/remote/i2-remote.hpp
@@ -26,7 +26,7 @@
  * The Icinga library implements remote cluster functionality.
  */
 
-#include "base/i2-base.h"
+#include "base/i2-base.hpp"
 
 #ifdef I2_REMOTE_BUILD
 #	define I2_REMOTE_API I2_EXPORT
diff --git a/lib/remote/jsonrpc.cpp b/lib/remote/jsonrpc.cpp
index 55f844d4d..1ee32d703 100644
--- a/lib/remote/jsonrpc.cpp
+++ b/lib/remote/jsonrpc.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "remote/jsonrpc.h"
-#include "base/netstring.h"
-#include "base/serializer.h"
+#include "remote/jsonrpc.hpp"
+#include "base/netstring.hpp"
+#include "base/serializer.hpp"
 //#include <iostream>
 
 using namespace icinga;
diff --git a/lib/remote/jsonrpc.h b/lib/remote/jsonrpc.hpp
similarity index 95%
rename from lib/remote/jsonrpc.h
rename to lib/remote/jsonrpc.hpp
index 47782356a..b37455ada 100644
--- a/lib/remote/jsonrpc.h
+++ b/lib/remote/jsonrpc.hpp
@@ -20,9 +20,9 @@
 #ifndef JSONRPC_H
 #define JSONRPC_H
 
-#include "base/stream.h"
-#include "base/dictionary.h"
-#include "remote/i2-remote.h"
+#include "base/stream.hpp"
+#include "base/dictionary.hpp"
+#include "remote/i2-remote.hpp"
 
 namespace icinga
 {
diff --git a/lib/remote/messageorigin.cpp b/lib/remote/messageorigin.cpp
index e6a02bf97..7295df4e4 100644
--- a/lib/remote/messageorigin.cpp
+++ b/lib/remote/messageorigin.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "remote/messageorigin.h"
+#include "remote/messageorigin.hpp"
 
 using namespace icinga;
 
diff --git a/lib/remote/messageorigin.h b/lib/remote/messageorigin.hpp
similarity index 96%
rename from lib/remote/messageorigin.h
rename to lib/remote/messageorigin.hpp
index e3ab71358..1337560a4 100644
--- a/lib/remote/messageorigin.h
+++ b/lib/remote/messageorigin.hpp
@@ -20,8 +20,8 @@
 #ifndef MESSAGEORIGIN_H
 #define MESSAGEORIGIN_H
 
-#include "remote/zone.h"
-#include "remote/apiclient.h"
+#include "remote/zone.hpp"
+#include "remote/apiclient.hpp"
 
 namespace icinga
 {
diff --git a/lib/remote/zone.cpp b/lib/remote/zone.cpp
index c7fd93510..ac73307c3 100644
--- a/lib/remote/zone.cpp
+++ b/lib/remote/zone.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "remote/zone.h"
+#include "remote/zone.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
diff --git a/lib/remote/zone.h b/lib/remote/zone.hpp
similarity index 95%
rename from lib/remote/zone.h
rename to lib/remote/zone.hpp
index b7222e0a6..7b484bdaf 100644
--- a/lib/remote/zone.h
+++ b/lib/remote/zone.hpp
@@ -20,9 +20,9 @@
 #ifndef ZONE_H
 #define ZONE_H
 
-#include "remote/i2-remote.h"
-#include "remote/zone.th"
-#include "remote/endpoint.h"
+#include "remote/i2-remote.hpp"
+#include "remote/zone.thpp"
+#include "remote/endpoint.hpp"
 
 namespace icinga
 {
diff --git a/lib/remote/zone.ti b/lib/remote/zone.ti
index 7c1b152ad..d2f3433f0 100644
--- a/lib/remote/zone.ti
+++ b/lib/remote/zone.ti
@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {
diff --git a/test/base-array.cpp b/test/base-array.cpp
index 2640fa4d7..da84eebdd 100644
--- a/test/base-array.cpp
+++ b/test/base-array.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/array.h"
-#include "base/objectlock.h"
-#include "base/serializer.h"
+#include "base/array.hpp"
+#include "base/objectlock.hpp"
+#include "base/serializer.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
 
diff --git a/test/base-convert.cpp b/test/base-convert.cpp
index 40ed1b747..7aaecf836 100644
--- a/test/base-convert.cpp
+++ b/test/base-convert.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/convert.h"
-#include "base/object.h"
+#include "base/convert.hpp"
+#include "base/object.hpp"
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
diff --git a/test/base-dictionary.cpp b/test/base-dictionary.cpp
index 81d754612..eed1229c6 100644
--- a/test/base-dictionary.cpp
+++ b/test/base-dictionary.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/dictionary.h"
-#include "base/objectlock.h"
-#include "base/serializer.h"
+#include "base/dictionary.hpp"
+#include "base/objectlock.hpp"
+#include "base/serializer.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
diff --git a/test/base-fifo.cpp b/test/base-fifo.cpp
index 5997af2de..abe88b1c8 100644
--- a/test/base-fifo.cpp
+++ b/test/base-fifo.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/fifo.h"
-#include "base/objectlock.h"
+#include "base/fifo.hpp"
+#include "base/objectlock.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
 
diff --git a/test/base-match.cpp b/test/base-match.cpp
index b6f25f8b1..796ad45ab 100644
--- a/test/base-match.cpp
+++ b/test/base-match.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/utility.h"
+#include "base/utility.hpp"
 #include <boost/test/unit_test.hpp>
 
 using namespace icinga;
diff --git a/test/base-netstring.cpp b/test/base-netstring.cpp
index e5cd70ecc..21c5d386f 100644
--- a/test/base-netstring.cpp
+++ b/test/base-netstring.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/netstring.h"
-#include "base/fifo.h"
-#include "base/qstring.h"
+#include "base/netstring.hpp"
+#include "base/fifo.hpp"
+#include "base/qstring.hpp"
 #include <boost/test/unit_test.hpp>
 
 using namespace icinga;
diff --git a/test/base-object.cpp b/test/base-object.cpp
index 2db4c8fbe..8be052703 100644
--- a/test/base-object.cpp
+++ b/test/base-object.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/object.h"
-#include "base/value.h"
+#include "base/object.hpp"
+#include "base/value.hpp"
 #include <boost/test/unit_test.hpp>
 
 using namespace icinga;
diff --git a/test/base-serialize.cpp b/test/base-serialize.cpp
index d483c97c0..1e9b86985 100644
--- a/test/base-serialize.cpp
+++ b/test/base-serialize.cpp
@@ -17,12 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/perfdatavalue.h"
-#include "base/dictionary.h"
-#include "base/objectlock.h"
-#include "base/serializer.h"
-#include "base/array.h"
-#include "base/dictionary.h"
+#include "icinga/perfdatavalue.hpp"
+#include "base/dictionary.hpp"
+#include "base/objectlock.hpp"
+#include "base/serializer.hpp"
+#include "base/array.hpp"
+#include "base/dictionary.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
diff --git a/test/base-shellescape.cpp b/test/base-shellescape.cpp
index d05790e5e..0b55983bb 100644
--- a/test/base-shellescape.cpp
+++ b/test/base-shellescape.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/utility.h"
+#include "base/utility.hpp"
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
diff --git a/test/base-stacktrace.cpp b/test/base-stacktrace.cpp
index c5c48b3f5..d26ce9b82 100644
--- a/test/base-stacktrace.cpp
+++ b/test/base-stacktrace.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/stacktrace.h"
+#include "base/stacktrace.hpp"
 #include <boost/test/unit_test.hpp>
 
 using namespace icinga;
diff --git a/test/base-stream.cpp b/test/base-stream.cpp
index 71fa6408f..76e70c2f4 100644
--- a/test/base-stream.cpp
+++ b/test/base-stream.cpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/stdiostream.h"
-#include "base/qstring.h"
+#include "base/stdiostream.hpp"
+#include "base/qstring.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
 #include <sstream>
diff --git a/test/base-string.cpp b/test/base-string.cpp
index 569ec139c..02563e35c 100644
--- a/test/base-string.cpp
+++ b/test/base-string.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/qstring.h"
+#include "base/qstring.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
 
diff --git a/test/base-timer.cpp b/test/base-timer.cpp
index 1dfaa19f4..d7b1380c7 100644
--- a/test/base-timer.cpp
+++ b/test/base-timer.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/timer.h"
-#include "base/utility.h"
-#include "base/application.h"
+#include "base/timer.hpp"
+#include "base/utility.hpp"
+#include "base/application.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
 
diff --git a/test/base-type.cpp b/test/base-type.cpp
index a8263b788..8a4ee5e31 100644
--- a/test/base-type.cpp
+++ b/test/base-type.cpp
@@ -17,11 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/perfdatavalue.h"
-#include "base/dictionary.h"
-#include "base/objectlock.h"
-#include "base/application.h"
-#include "base/type.h"
+#include "icinga/perfdatavalue.hpp"
+#include "base/dictionary.hpp"
+#include "base/objectlock.hpp"
+#include "base/application.hpp"
+#include "base/type.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
diff --git a/test/base-value.cpp b/test/base-value.cpp
index 83817abca..eda394f0b 100644
--- a/test/base-value.cpp
+++ b/test/base-value.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/value.h"
+#include "base/value.hpp"
 #include <boost/test/unit_test.hpp>
 
 using namespace icinga;
diff --git a/test/icinga-perfdata.cpp b/test/icinga-perfdata.cpp
index e9be44fdd..acca81a00 100644
--- a/test/icinga-perfdata.cpp
+++ b/test/icinga-perfdata.cpp
@@ -17,7 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/pluginutility.cpp"
+#include "icinga/perfdatavalue.hpp"
+#include "icinga/pluginutility.hpp"
 #include <boost/test/unit_test.hpp>
 
 using namespace icinga;
diff --git a/test/test.cpp b/test/test.cpp
index f4520e7dc..af024d66e 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -20,7 +20,7 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE icinga2_test
 
-#include "base/application.h"
+#include "base/application.hpp"
 #include <BoostTestTargetConfig.h>
 
 using namespace icinga;
diff --git a/third-party/cJSON/cJSON.h b/third-party/cJSON/cJSON.h
index d9e5b7956..5d0555aff 100644
--- a/third-party/cJSON/cJSON.h
+++ b/third-party/cJSON/cJSON.h
@@ -23,7 +23,7 @@
 #ifndef cJSON__h
 #define cJSON__h
 
-#include "base/visibility.h"
+#include "base/visibility.hpp"
 
 #ifdef I2_CJSON_BUILD
 #	define I2_CJSON_API I2_EXPORT
diff --git a/third-party/execvpe/execvpe.h b/third-party/execvpe/execvpe.h
index b3c23b0fc..1593171fd 100644
--- a/third-party/execvpe/execvpe.h
+++ b/third-party/execvpe/execvpe.h
@@ -20,7 +20,7 @@
 #ifndef EXECVPE_H
 #define EXECVPE_H
 
-#include "base/visibility.h"
+#include "base/visibility.hpp"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/third-party/mmatch/mmatch.h b/third-party/mmatch/mmatch.h
index 526bab657..940220391 100644
--- a/third-party/mmatch/mmatch.h
+++ b/third-party/mmatch/mmatch.h
@@ -1,7 +1,7 @@
 #ifndef MMATCH_H
 #define MMATCH_H
 
-#include "base/visibility.h"
+#include "base/visibility.hpp"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/tools/mkclass/CMakeLists.txt b/tools/mkclass/CMakeLists.txt
index 5c9736be4..f58742b4d 100644
--- a/tools/mkclass/CMakeLists.txt
+++ b/tools/mkclass/CMakeLists.txt
@@ -24,7 +24,7 @@ add_flex_bison_dependency(class_lexer class_parser)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
-add_executable(mkclass mkclass.cpp classcompiler.cpp classcompiler.h ${FLEX_class_lexer_OUTPUTS} ${BISON_class_parser_OUTPUTS})
+add_executable(mkclass mkclass.cpp classcompiler.cpp classcompiler.hpp ${FLEX_class_lexer_OUTPUTS} ${BISON_class_parser_OUTPUTS})
 
 set_target_properties (
   mkclass PROPERTIES
diff --git a/tools/mkclass/class_lexer.ll b/tools/mkclass/class_lexer.ll
index ab95b26b1..1f7ec2000 100644
--- a/tools/mkclass/class_lexer.ll
+++ b/tools/mkclass/class_lexer.ll
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "classcompiler.h"
+#include "classcompiler.hpp"
 
 using namespace icinga;
 
diff --git a/tools/mkclass/class_parser.yy b/tools/mkclass/class_parser.yy
index cb530dd25..a9180f012 100644
--- a/tools/mkclass/class_parser.yy
+++ b/tools/mkclass/class_parser.yy
@@ -18,9 +18,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
- #include "classcompiler.h"
- #include <iostream>
- #include <vector>
+#include "classcompiler.hpp"
+#include <iostream>
+#include <vector>
 
 using namespace icinga;
 
diff --git a/tools/mkclass/classcompiler.cpp b/tools/mkclass/classcompiler.cpp
index 7363b8985..f67a951ba 100644
--- a/tools/mkclass/classcompiler.cpp
+++ b/tools/mkclass/classcompiler.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "classcompiler.h"
+#include "classcompiler.hpp"
 #include <iostream>
 #include <fstream>
 #include <stdexcept>
@@ -486,13 +486,13 @@ void ClassCompiler::CompileStream(const std::string& path, std::istream *stream)
 {
 	stream->exceptions(std::istream::badbit);
 
-	std::cout << "#include \"base/object.h\"" << std::endl
-			  << "#include \"base/type.h\"" << std::endl
-			  << "#include \"base/debug.h\"" << std::endl
-			  << "#include \"base/value.h\"" << std::endl
-			  << "#include \"base/array.h\"" << std::endl
-			  << "#include \"base/dictionary.h\"" << std::endl
-			  << "#include \"base/utility.h\"" << std::endl << std::endl
+	std::cout << "#include \"base/object.hpp\"" << std::endl
+			  << "#include \"base/type.hpp\"" << std::endl
+			  << "#include \"base/debug.hpp\"" << std::endl
+			  << "#include \"base/value.hpp\"" << std::endl
+			  << "#include \"base/array.hpp\"" << std::endl
+			  << "#include \"base/dictionary.hpp\"" << std::endl
+			  << "#include \"base/utility.hpp\"" << std::endl << std::endl
 			  << "#ifdef _MSC_VER" << std::endl
 			  << "#pragma warning( push )" << std::endl
 			  << "#pragma warning( disable : 4244 )" << std::endl
diff --git a/tools/mkclass/classcompiler.h b/tools/mkclass/classcompiler.hpp
similarity index 100%
rename from tools/mkclass/classcompiler.h
rename to tools/mkclass/classcompiler.hpp
diff --git a/tools/mkclass/mkclass.cpp b/tools/mkclass/mkclass.cpp
index 5e9f9664f..24666f61f 100644
--- a/tools/mkclass/mkclass.cpp
+++ b/tools/mkclass/mkclass.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "classcompiler.h"
+#include "classcompiler.hpp"
 #include <iostream>
 
 using namespace icinga;
diff --git a/tools/mkembedconfig/mkembedconfig.c b/tools/mkembedconfig/mkembedconfig.c
index fafa2065a..ddf27a286 100644
--- a/tools/mkembedconfig/mkembedconfig.c
+++ b/tools/mkembedconfig/mkembedconfig.c
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
 
 	fprintf(outfp, "/* This file has been automatically generated\n"
 	    "   from the input file \"%s\". */\n\n", argv[1]);
-	fputs("#include \"config/configcompiler.h\"\n\nstatic const char g_ConfigFragment[] = {\n", outfp);
+	fputs("#include \"config/configcompiler.hpp\"\n\nstatic const char g_ConfigFragment[] = {\n", outfp);
 	fputc('\t', outfp);
 
 	cols = 0;