diff --git a/libsrc/hyperion/CMakeLists.txt b/libsrc/hyperion/CMakeLists.txt
index a967aece..c0f50db6 100644
--- a/libsrc/hyperion/CMakeLists.txt
+++ b/libsrc/hyperion/CMakeLists.txt
@@ -58,10 +58,8 @@ add_library(hyperion
 )
 
 target_link_libraries(hyperion
-	kodivideochecker
 	blackborder
 	hyperion-utils
 	leddevice
-	effectengine
 	${QT_LIBRARIES}
 )
diff --git a/src/hyperion-aml/CMakeLists.txt b/src/hyperion-aml/CMakeLists.txt
index 0ee29a3d..3dd46958 100644
--- a/src/hyperion-aml/CMakeLists.txt
+++ b/src/hyperion-aml/CMakeLists.txt
@@ -30,7 +30,8 @@ add_executable(${PROJECT_NAME}
 )
 
 target_link_libraries(${PROJECT_NAME}
-    commandline
+	effectengine
+	commandline
 	blackborder
 	hyperion-utils
 	protoserver
diff --git a/src/hyperion-dispmanx/CMakeLists.txt b/src/hyperion-dispmanx/CMakeLists.txt
index fb4c14f7..4ae32152 100644
--- a/src/hyperion-dispmanx/CMakeLists.txt
+++ b/src/hyperion-dispmanx/CMakeLists.txt
@@ -31,7 +31,8 @@ add_executable( ${PROJECT_NAME}
 )
 
 target_link_libraries( ${PROJECT_NAME}
-    commandline
+	effectengine
+	commandline
 	blackborder
 	hyperion-utils
 	protoserver
diff --git a/src/hyperion-framebuffer/CMakeLists.txt b/src/hyperion-framebuffer/CMakeLists.txt
index 1eb67eef..fca79442 100644
--- a/src/hyperion-framebuffer/CMakeLists.txt
+++ b/src/hyperion-framebuffer/CMakeLists.txt
@@ -30,7 +30,8 @@ add_executable( ${PROJECT_NAME}
 )
 
 target_link_libraries( ${PROJECT_NAME}
-    commandline
+	effectengine
+	commandline
 	blackborder
 	hyperion-utils
 	protoserver
diff --git a/src/hyperion-osx/CMakeLists.txt b/src/hyperion-osx/CMakeLists.txt
index c5fe2695..d52e252d 100644
--- a/src/hyperion-osx/CMakeLists.txt
+++ b/src/hyperion-osx/CMakeLists.txt
@@ -30,7 +30,8 @@ add_executable( ${PROJECT_NAME}
 )
 
 target_link_libraries( ${PROJECT_NAME}
-    commandline
+	effectengine
+	commandline
 	blackborder
 	hyperion-utils
 	protoserver
diff --git a/src/hyperion-remote/CMakeLists.txt b/src/hyperion-remote/CMakeLists.txt
index 4c4cc227..828612ea 100644
--- a/src/hyperion-remote/CMakeLists.txt
+++ b/src/hyperion-remote/CMakeLists.txt
@@ -26,7 +26,8 @@ add_executable(${PROJECT_NAME}
 	${hyperion-remote_SOURCES})
 
 target_link_libraries(${PROJECT_NAME}
-    commandline
+	effectengine
+	commandline
 	jsoncpp
 	${QT_LIBRARIES})
 
diff --git a/src/hyperion-v4l2/CMakeLists.txt b/src/hyperion-v4l2/CMakeLists.txt
index 188bef90..820cf423 100644
--- a/src/hyperion-v4l2/CMakeLists.txt
+++ b/src/hyperion-v4l2/CMakeLists.txt
@@ -32,8 +32,9 @@ add_executable(${PROJECT_NAME}
 )
 
 target_link_libraries(${PROJECT_NAME}
+	effectengine
 	v4l2-grabber
-    commandline
+	commandline
 	blackborder
 	hyperion-utils
 	protoserver
diff --git a/src/hyperion-x11/CMakeLists.txt b/src/hyperion-x11/CMakeLists.txt
index 4fc86c25..f8b4844b 100644
--- a/src/hyperion-x11/CMakeLists.txt
+++ b/src/hyperion-x11/CMakeLists.txt
@@ -31,6 +31,7 @@ add_executable(${PROJECT_NAME}
 )
 
 target_link_libraries(${PROJECT_NAME}
+	effectengine
 	blackborder
 	commandline
 	hyperion-utils
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 577b7487..bb7e95ea 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -4,7 +4,7 @@ include_directories(../libsrc)
 if(ENABLE_SPIDEV)
 	# Add the simple test executable 'TestSpi'
 	add_executable(test_spi TestSpi.cpp)
-	target_link_libraries(test_spi hyperion)
+	target_link_libraries(test_spi hyperion effectengine)
 
 	add_executable(spidev_test spidev_test.c)
 
@@ -14,7 +14,9 @@ endif(ENABLE_SPIDEV)
 add_executable(test_configfile
 		TestConfigFile.cpp)
 target_link_libraries(test_configfile
-		hyperion)
+		hyperion
+		effectengine
+		)
 
 add_executable(test_ImageRgb
 		TestRgbImage.cpp)
@@ -24,24 +26,32 @@ target_link_libraries(test_ImageRgb
 add_executable(test_colortransform
 	TestColorTransform.cpp)
 target_link_libraries(test_colortransform
-	hyperion)
+	hyperion
+	effectengine
+)
 
 add_executable(test_image2ledsmap
 		TestImage2LedsMap.cpp)
 target_link_libraries(test_image2ledsmap
-		hyperion)
+		hyperion
+		effectengine
+		)
 
 if (ENABLE_DISPMANX)
 	add_subdirectory(dispmanx2png)
 endif (ENABLE_DISPMANX)
 
 add_executable(test_blackborderdetector TestBlackBorderDetector.cpp)
-target_link_libraries(test_blackborderdetector hyperion)
+target_link_libraries(test_blackborderdetector
+		effectengine
+ hyperion)
 
 add_executable(test_blackborderprocessor
 		TestBlackBorderProcessor.cpp)
 target_link_libraries(test_blackborderprocessor
-		hyperion)
+		hyperion
+		effectengine
+)
 
 add_executable(test_qregexp TestQRegExp.cpp)
 target_link_libraries(test_qregexp