diff --git a/CMakeLists.txt b/CMakeLists.txt
index cffdedb7..649734ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -208,7 +208,6 @@ IF (JFJOCH_VIEWER_ONLY)
     ADD_SUBDIRECTORY(common)
     ADD_SUBDIRECTORY(gemmi_gph)
     ADD_SUBDIRECTORY(frame_serialize)
-    ADD_SUBDIRECTORY(image_puller)
     ADD_SUBDIRECTORY(preview)
     ADD_SUBDIRECTORY(writer)
     ADD_SUBDIRECTORY(image_analysis)
diff --git a/image_puller/CMakeLists.txt b/image_puller/CMakeLists.txt
index 24d01ab1..2ac60e68 100644
--- a/image_puller/CMakeLists.txt
+++ b/image_puller/CMakeLists.txt
@@ -5,4 +5,4 @@ ADD_LIBRARY(JFJochImagePuller ZMQImagePuller.cpp ZMQImagePuller.h
         TestImagePuller.h
         TCPImagePuller.cpp
         TCPImagePuller.h)
-TARGET_LINK_LIBRARIES(JFJochImagePuller JFJochCommon JFJochZMQ JFJochLogger)
+TARGET_LINK_LIBRARIES(JFJochImagePuller JFJochCommon JFJochZMQ JFJochLogger CBORStream2FrameSerialize)
diff --git a/viewer/CMakeLists.txt b/viewer/CMakeLists.txt
index b7f0a20e..20690708 100644
--- a/viewer/CMakeLists.txt
+++ b/viewer/CMakeLists.txt
@@ -98,7 +98,9 @@ ADD_EXECUTABLE(jfjoch_viewer jfjoch_viewer.cpp JFJochViewerWindow.cpp JFJochView
 
 TARGET_LINK_LIBRARIES(jfjoch_viewer Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Charts Qt6::Concurrent
         Qt6::OpenGL Qt6::OpenGLWidgets
-        JFJochReader JFJochLogger JFJochCommon JFJochWriter JFJochImageAnalysis)
+        JFJochReader JFJochLogger JFJochCommon JFJochWriter JFJochImageAnalysis
+        fftw3f)
+
 INSTALL(TARGETS jfjoch_viewer RUNTIME COMPONENT viewer)
 
 IF(JFJOCH_VIEWER_DBUS)
@@ -132,5 +134,3 @@ ELSEIF(APPLE)
 ELSE()
     qt_import_plugins(jfjoch_viewer INCLUDE Qt::QXcbIntegrationPlugin)
 ENDIF()
-
-TARGET_LINK_LIBRARIES(jfjoch_viewer fftw3f)
\ No newline at end of file