diff --git a/GPU/GPUTracking/Debug/GPUTPCClusterFilter.cxx b/GPU/GPUTracking/Debug/GPUTPCClusterFilter.cxx
index cdd0e4879f949..e513162aad87c 100644
--- a/GPU/GPUTracking/Debug/GPUTPCClusterFilter.cxx
+++ b/GPU/GPUTracking/Debug/GPUTPCClusterFilter.cxx
@@ -13,6 +13,7 @@
 /// \author David Rohr
 
 #include "GPUTPCClusterFilter.h"
+#ifdef GPUCA_HAVE_O2HEADERS
 #include "DataFormatsTPC/ClusterNative.h"
 
 using namespace o2::gpu;
@@ -29,3 +30,4 @@ bool GPUTPCClusterFilter::filter(uint32_t sector, uint32_t row, o2::tpc::Cluster
   // Note that this function might be called multiple times for the same cluster, in which case the final modified cl reference goes into the output clusters.
   return true;
 }
+#endif
diff --git a/GPU/GPUTracking/Global/GPUChainTrackingDebugAndProfiling.cxx b/GPU/GPUTracking/Global/GPUChainTrackingDebugAndProfiling.cxx
index 7d4a3420995ad..1b959cac94fd0 100644
--- a/GPU/GPUTracking/Global/GPUChainTrackingDebugAndProfiling.cxx
+++ b/GPU/GPUTracking/Global/GPUChainTrackingDebugAndProfiling.cxx
@@ -301,6 +301,7 @@ void GPUChainTracking::SanityCheck()
 
 void GPUChainTracking::RunTPCClusterFilter(o2::tpc::ClusterNativeAccess* clusters, std::function<o2::tpc::ClusterNative*(size_t)> allocator, bool applyClusterCuts)
 {
+#ifdef GPUCA_HAVE_O2HEADERS
   GPUTPCClusterFilter clusterFilter(*clusters);
   o2::tpc::ClusterNative* outputBuffer = nullptr;
   for (int32_t iPhase = 0; iPhase < 2; iPhase++) {
@@ -337,4 +338,5 @@ void GPUChainTracking::RunTPCClusterFilter(o2::tpc::ClusterNativeAccess* cluster
       outputBuffer = allocator(countTotal);
     }
   }
+#endif
 }
diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCTrackerComponent.cxx b/GPU/GPUTracking/SliceTracker/GPUTPCTrackerComponent.cxx
index 581e2926365f4..4539cf334bddd 100644
--- a/GPU/GPUTracking/SliceTracker/GPUTPCTrackerComponent.cxx
+++ b/GPU/GPUTracking/SliceTracker/GPUTPCTrackerComponent.cxx
@@ -374,7 +374,7 @@ int32_t GPUTPCTrackerComponent::ConfigureSlices()
   GPUSettingsProcessing devProc;
 
   grp.solenoidBzNominalGPU = fSolenoidBz;
-  grp.continuousMaxTimeBin = 0; // triggered events
+  grp.grpContinuousMaxTimeBin = 0; // triggered events
   if (mNeighboursSearchArea > 0) {
     rec.tpc.neighboursSearchArea = mNeighboursSearchArea;
   }
diff --git a/GPU/TPCFastTransformation/NDPiecewisePolynomials.h b/GPU/TPCFastTransformation/NDPiecewisePolynomials.h
index 596c915950948..77001acf851e8 100644
--- a/GPU/TPCFastTransformation/NDPiecewisePolynomials.h
+++ b/GPU/TPCFastTransformation/NDPiecewisePolynomials.h
@@ -22,6 +22,7 @@
 
 #if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE)
 #include <vector>
+#include <functional>
 #endif
 
 class TFile;