diff --git a/GPU/GPUTracking/DataTypes/CalibdEdxTrackTopologyPol.cxx b/GPU/GPUTracking/DataTypes/CalibdEdxTrackTopologyPol.cxx
index 47a6e4cff72df..4e093da5d2cf6 100644
--- a/GPU/GPUTracking/DataTypes/CalibdEdxTrackTopologyPol.cxx
+++ b/GPU/GPUTracking/DataTypes/CalibdEdxTrackTopologyPol.cxx
@@ -9,7 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#ifndef GPUCA_NO_VC
 #include "Rtypes.h"
+#endif
 #include "CalibdEdxTrackTopologyPol.h"
 
 #include <cstddef>
diff --git a/GPU/GPUTracking/Debug/GPUROOTDump.h b/GPU/GPUTracking/Debug/GPUROOTDump.h
index 407076c98b4be..f8f8950a06ae0 100644
--- a/GPU/GPUTracking/Debug/GPUROOTDump.h
+++ b/GPU/GPUTracking/Debug/GPUROOTDump.h
@@ -20,11 +20,13 @@
 #include "GPUROOTDumpCore.h"
 #include <TTree.h>
 #include <TNtuple.h>
-#include <memory>
-#include <stdexcept>
 #else
 class TNtuple;
 #endif
+#ifndef GPUCA_GPUCODE
+#include <memory>
+#include <stdexcept>
+#endif
 
 namespace o2
 {