Rename C++ header files.

Fixes #6291

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)
 

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;

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>

components/checker/checkercomponent.ti

@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

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)
 

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;

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

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
 {

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>
 

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

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
 {

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;
 

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>
 

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
 {

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>

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>
 

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
 {

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)

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>
 

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

components/db_ido_mysql/idomysqlconnection.ti

@@ -1,4 +1,4 @@
-#include "db_ido/dbconnection.h"
+#include "db_ido/dbconnection.hpp"
 
 namespace icinga
 {

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)
 

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>
 

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

components/db_ido_pgsql/idopgsqlconnection.ti

@@ -1,4 +1,4 @@
-#include "db_ido/dbconnection.h"
+#include "db_ido/dbconnection.hpp"
 
 namespace icinga
 {

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)
 

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;
 

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
 {

components/demo/demo.ti

@@ -1,4 +1,4 @@
-#include "base/dynamicobject.h"
+#include "base/dynamicobject.hpp"
 
 namespace icinga
 {

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

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;
 

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
 {

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;

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;
 

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>
 

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;
 

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;
 

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
 {

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;
 

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;

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;
 

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;
 

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>
 

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;
 

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>
 

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;
 

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;

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;
 

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>
 

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;
 

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;
 

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
 {

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>
 

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;
 

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>

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;
 

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;
 

components/livestatus/filter.hpp

@@ -20,7 +20,7 @@
 #ifndef FILTER_H
 #define FILTER_H
 
-#include "livestatus/table.h"
+#include "livestatus/table.hpp"
 
 namespace icinga
 {

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;
 

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
 {

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;

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;
 

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>

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;
 

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;
 

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
 {

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;
 

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
 {

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;
 

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;

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
 {

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>

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;

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>

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;
 

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;
 

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
 {

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;
 

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
 {

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;
 

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;
 

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;

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;
 

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>

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;

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;

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;
 

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>

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;
 

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>

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;

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;

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;
 

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;

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
 {

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;
 

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
 {

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>

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

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>