diff --git a/components/cluster/CMakeLists.txt b/components/cluster/CMakeLists.txt
index 133605b15..8695356de 100644
--- a/components/cluster/CMakeLists.txt
+++ b/components/cluster/CMakeLists.txt
@@ -20,7 +20,10 @@ mkclass_target(endpoint.ti endpoint.th)
 
 mkembedconfig_target(cluster-type.conf cluster-type.cpp)
 
-add_library(cluster SHARED clusterlistener.cpp clusterlistener.th endpoint.cpp endpoint.th jsonrpc.cpp cluster-type.cpp)
+add_library(cluster SHARED
+  clusterchecktask.cpp clusterlistener.cpp clusterlistener.th
+  endpoint.cpp endpoint.th jsonrpc.cpp cluster-type.cpp
+)
 
 target_link_libraries(cluster ${Boost_LIBRARIES} base config icinga)
 
diff --git a/lib/methods/clusterchecktask.cpp b/components/cluster/clusterchecktask.cpp
similarity index 99%
rename from lib/methods/clusterchecktask.cpp
rename to components/cluster/clusterchecktask.cpp
index 2d72a7037..43c57315e 100644
--- a/lib/methods/clusterchecktask.cpp
+++ b/components/cluster/clusterchecktask.cpp
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "methods/clusterchecktask.h"
+#include "cluster/clusterchecktask.h"
 #include "cluster/endpoint.h"
 #include "cluster/clusterlistener.h"
 #include "icinga/cib.h"
diff --git a/lib/methods/clusterchecktask.h b/components/cluster/clusterchecktask.h
similarity index 96%
rename from lib/methods/clusterchecktask.h
rename to components/cluster/clusterchecktask.h
index fe31cdbaf..30fc6842d 100644
--- a/lib/methods/clusterchecktask.h
+++ b/components/cluster/clusterchecktask.h
@@ -20,7 +20,6 @@
 #ifndef CLUSTERCHECKTASK_H
 #define CLUSTERCHECKTASK_H
 
-#include "methods/i2-methods.h"
 #include "icinga/service.h"
 
 namespace icinga
@@ -31,7 +30,7 @@ namespace icinga
  *
  * @ingroup methods
  */
-class I2_METHODS_API ClusterCheckTask
+class ClusterCheckTask
 {
 public:
 	static CheckResult::Ptr ScriptFunc(const Service::Ptr& service);
diff --git a/lib/methods/CMakeLists.txt b/lib/methods/CMakeLists.txt
index 816dcdfd2..f7ba6942b 100644
--- a/lib/methods/CMakeLists.txt
+++ b/lib/methods/CMakeLists.txt
@@ -16,12 +16,12 @@
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 add_library(methods SHARED
-  clusterchecktask.cpp icingachecktask.cpp nullchecktask.cpp nulleventtask.cpp
+  icingachecktask.cpp nullchecktask.cpp nulleventtask.cpp
   pluginchecktask.cpp plugineventtask.cpp pluginnotificationtask.cpp
   randomchecktask.cpp timeperiodtask.cpp
 )
 
-target_link_libraries(methods ${Boost_LIBRARIES} base config icinga cluster)
+target_link_libraries(methods ${Boost_LIBRARIES} base config icinga)
 
 set_target_properties (
   methods PROPERTIES