diff --git a/Common/Utils/CMakeLists.txt b/Common/Utils/CMakeLists.txt
index 18f2aa7c1b6ed..def743d11791c 100644
--- a/Common/Utils/CMakeLists.txt
+++ b/Common/Utils/CMakeLists.txt
@@ -26,7 +26,7 @@ o2_add_library(CommonUtils
                        src/DebugStreamer.cxx
                        src/DLLoaderBase.cxx
                PUBLIC_LINK_LIBRARIES ROOT::Hist ROOT::Tree Boost::iostreams O2::CommonDataFormat O2::Headers
-                                     FairLogger::FairLogger O2::MathUtils TBB::tbb)
+                                     FairLogger::FairLogger O2::MathUtils TBB::tbb O2::GPUCommon)
 
 o2_target_root_dictionary(CommonUtils
                           HEADERS include/CommonUtils/TreeStream.h
diff --git a/Common/Utils/include/CommonUtils/StringUtils.h b/Common/Utils/include/CommonUtils/StringUtils.h
index c68e441d5b1c4..710632fc7dbfe 100644
--- a/Common/Utils/include/CommonUtils/StringUtils.h
+++ b/Common/Utils/include/CommonUtils/StringUtils.h
@@ -20,8 +20,7 @@
 #include <sstream>
 #include <vector>
 #include <algorithm>
-#include <fmt/format.h>
-#include <Rtypes.h>
+#include "GPUCommonRtypes.h"
 
 namespace o2
 {
diff --git a/Common/Utils/src/StringUtils.cxx b/Common/Utils/src/StringUtils.cxx
index 4c0dd30ae6211..687225d069ed2 100644
--- a/Common/Utils/src/StringUtils.cxx
+++ b/Common/Utils/src/StringUtils.cxx
@@ -12,7 +12,10 @@
 #include "CommonUtils/StringUtils.h"
 #include <cstdlib>
 #include <filesystem>
+#ifndef GPUCA_STANDALONE
 #include <TGrid.h>
+#include <fmt/format.h>
+#endif
 #include <unistd.h>
 
 using namespace o2::utils;
@@ -77,6 +80,7 @@ std::string Str::getFullPath(const std::string_view p)
   return std::filesystem::canonical(std::string{p}).string();
 }
 
+#ifndef GPUCA_STANDALONE
 std::string Str::rectifyDirectory(const std::string_view p)
 {
   std::string dir(p);
@@ -104,6 +108,7 @@ std::string Str::rectifyDirectory(const std::string_view p)
   }
   return dir;
 }
+#endif
 
 // Create unique non-existing path name starting with prefix. Loose equivalent of boost::filesystem::unique_path()
 // The prefix can be either existing directory or just a string to add in front of the random part
diff --git a/GPU/GPUTracking/DataTypes/CalibdEdxTrackTopologyPol.cxx b/GPU/GPUTracking/DataTypes/CalibdEdxTrackTopologyPol.cxx
index 4e093da5d2cf6..1f6d6709e0ab0 100644
--- a/GPU/GPUTracking/DataTypes/CalibdEdxTrackTopologyPol.cxx
+++ b/GPU/GPUTracking/DataTypes/CalibdEdxTrackTopologyPol.cxx
@@ -9,16 +9,14 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#ifndef GPUCA_NO_VC
+#ifndef GPUCA_STANDALONE
 #include "Rtypes.h"
+#include "TFile.h"
 #endif
 #include "CalibdEdxTrackTopologyPol.h"
 
 #include <cstddef>
 #include <string_view>
-#if !defined(GPUCA_STANDALONE)
-#include "TFile.h"
-#endif
 
 using namespace o2::tpc;