diff --git a/image_analysis/MXAnalysisAfterFPGA.h b/image_analysis/MXAnalysisAfterFPGA.h
index 262f60235..1028f1f66 100644
--- a/image_analysis/MXAnalysisAfterFPGA.h
+++ b/image_analysis/MXAnalysisAfterFPGA.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include "../common/DiffractionExperiment.h"
-#include "indexing/IndexerThreadPool.h"
 #include "spot_finding/StrongPixelSet.h"
 #include "azint/AzIntEngineCPU.h"
 #include "IndexAndRefine.h"
diff --git a/receiver/CMakeLists.txt b/receiver/CMakeLists.txt
index 5e4f4a787..8304e5c35 100644
--- a/receiver/CMakeLists.txt
+++ b/receiver/CMakeLists.txt
@@ -24,4 +24,4 @@ ADD_LIBRARY(JFJochReceiver STATIC
         JFJochReceiver.cpp
         JFJochReceiver.h)
 
-TARGET_LINK_LIBRARIES(JFJochReceiver ImagePusher JFJochImagePuller JFJochImageAnalysis JFJochAcquisitionDevice JFJochCommon JFJochHLSSimulation JFJochPreview JFJochRugnux JFJochModelWriter)
+TARGET_LINK_LIBRARIES(JFJochReceiver ImagePusher JFJochImagePuller JFJochImageAnalysis JFJochAcquisitionDevice JFJochCommon JFJochPreview JFJochRugnux JFJochModelWriter)
diff --git a/receiver/JFJochReceiver.cpp b/receiver/JFJochReceiver.cpp
index 4be32b99c..1257ed53a 100644
--- a/receiver/JFJochReceiver.cpp
+++ b/receiver/JFJochReceiver.cpp
@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include "JFJochReceiver.h"
-#include "../common/CUDAWrapper.h"
 #include "../common/time_utc.h"
-#include "JFJochCompressor.h"
 #include "../frame_serialize/CBORStream2Serializer.h"
 
 JFJochReceiver::JFJochReceiver(const DiffractionExperiment &in_experiment,
diff --git a/receiver/JFJochReceiver.h b/receiver/JFJochReceiver.h
index 166e364bc..ae1343eda 100644
--- a/receiver/JFJochReceiver.h
+++ b/receiver/JFJochReceiver.h
@@ -10,12 +10,10 @@
 #include "../common/DiffractionExperiment.h"
 #include "../image_analysis/spot_finding/SpotFindingSettings.h"
 #include "JFJochReceiverOutput.h"
-#include "../image_puller/ZMQImagePuller.h"
 #include "../common/ImageBuffer.h"
 #include "../image_pusher/ImagePusher.h"
 #include "../preview/ZMQPreviewSocket.h"
 #include "../preview/ZMQMetadataSocket.h"
-#include "../preview/PreviewImage.h"
 #include "../common/JFJochReceiverPlots.h"
 #include "LossyFilter.h"
 #include "../common/MovingAverage.h"
diff --git a/receiver/JFJochReceiverFPGA.h b/receiver/JFJochReceiverFPGA.h
index 32f1d99ef..f712c0934 100644
--- a/receiver/JFJochReceiverFPGA.h
+++ b/receiver/JFJochReceiverFPGA.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <condition_variable>
 #include <atomic>
 #include <future>
 #include <latch>
@@ -21,15 +20,12 @@
 #include "../common/ImageBuffer.h"
 #include "../common/PixelMask.h"
 
-#include "../image_analysis/spot_finding/StrongPixelSet.h"
 #include "../common/AzimuthalIntegrationMapping.h"
 #include "../common/AzimuthalIntegrationProfile.h"
 
 #include "../jungfrau/JFCalibration.h"
 #include "../common/ADUHistogram.h"
-#include "../common/Plot.h"
 #include "../common/JFJochReceiverPlots.h"
-#include "../preview/PreviewImage.h"
 #include "LossyFilter.h"
 #include "JFJochReceiverCurrentStatus.h"
 #include "../preview/ZMQPreviewSocket.h"
diff --git a/receiver/JFJochReceiverLite.cpp b/receiver/JFJochReceiverLite.cpp
index 3594b3927..a85098e85 100644
--- a/receiver/JFJochReceiverLite.cpp
+++ b/receiver/JFJochReceiverLite.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include "JFJochReceiverLite.h"
-#include "../image_analysis/indexing/IndexerFactory.h"
 #include "../common/CUDAWrapper.h"
 
 JFJochReceiverLite::JFJochReceiverLite(const DiffractionExperiment &in_experiment,
diff --git a/receiver/JFJochReceiverService.h b/receiver/JFJochReceiverService.h
index b981e1d12..d48dda7bb 100644
--- a/receiver/JFJochReceiverService.h
+++ b/receiver/JFJochReceiverService.h
@@ -10,6 +10,8 @@
 
 #include "JFJochReceiver.h"
 #include "FPGAImagePuller.h"
+#include "../preview/PreviewImage.h"
+#include "../image_puller/ZMQImagePuller.h"
 #include "../acquisition_device/AcquisitionDeviceGroup.h"
 
 #include "../preview/ZMQMetadataSocket.h"
diff --git a/receiver/JFJochReceiverTest.cpp b/receiver/JFJochReceiverTest.cpp
index afbe755ba..e3e28e68b 100644
--- a/receiver/JFJochReceiverTest.cpp
+++ b/receiver/JFJochReceiverTest.cpp
@@ -3,7 +3,6 @@
 
 #include "JFJochReceiverTest.h"
 #include "JFJochReceiverService.h"
-#include "../image_pusher/ZMQStream2Pusher.h"
 #include "../image_pusher/TestImagePusher.h"
 
 #define STORAGE_CELL_FOR_TEST 11
diff --git a/receiver/StillsGPUAnalysis.cpp b/receiver/StillsGPUAnalysis.cpp
index f7b240a0b..1552acb19 100644
--- a/receiver/StillsGPUAnalysis.cpp
+++ b/receiver/StillsGPUAnalysis.cpp
@@ -10,7 +10,6 @@
 #include "../image_analysis/MXAnalysisWithoutFPGA.h"
 #include "../image_analysis/WriteReflections.h"
 #include "../rugnux/RugnuxDefaults.h"
-#include "../frame_serialize/CBORStream2Serializer.h"
 #include "../writer/RugnuxResultBlocks.h"
 #include "RugnuxStructure.h"