diff --git a/lib/config/configwriter.hpp b/lib/config/configwriter.hpp
index e27af011c..325ee53cd 100644
--- a/lib/config/configwriter.hpp
+++ b/lib/config/configwriter.hpp
@@ -34,7 +34,8 @@ namespace icinga
  *
  * @ingroup config
  */
-class I2_CONFIG_API ConfigWriter : public Object {
+class I2_CONFIG_API ConfigWriter : public Object
+{
 public:
 	DECLARE_PTR_TYPEDEFS(ConfigWriter);
 
diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp
index 93a811af8..9071f81e5 100644
--- a/lib/db_ido_mysql/idomysqlconnection.cpp
+++ b/lib/db_ido_mysql/idomysqlconnection.cpp
@@ -20,7 +20,6 @@
 #include "db_ido_mysql/idomysqlconnection.hpp"
 #include "db_ido_mysql/idomysqlconnection.tcpp"
 #include "icinga/perfdatavalue.hpp"
-#include "icinga/perfdatavalue.tcpp"
 #include "db_ido/dbtype.hpp"
 #include "db_ido/dbvalue.hpp"
 #include "base/logger.hpp"
diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp
index e7b827f32..77d330dcf 100644
--- a/lib/icinga/icingaapplication.cpp
+++ b/lib/icinga/icingaapplication.cpp
@@ -20,7 +20,8 @@
 #include "icinga/icingaapplication.hpp"
 #include "icinga/icingaapplication.tcpp"
 #include "icinga/cib.hpp"
-#include "config/configwriter.cpp"
+#include "config/configwriter.hpp"
+#include "config/configcompiler.hpp"
 #include "base/configtype.hpp"
 #include "base/logger.hpp"
 #include "base/objectlock.hpp"