diff --git a/tree/treeplayer/CMakeLists.txt b/tree/treeplayer/CMakeLists.txt
index 658783b5179cbfcb5bd7f07de6cfdf0f86950444..04b08bf8eda33494376612b801344d38c1677c58 100644
--- a/tree/treeplayer/CMakeLists.txt
+++ b/tree/treeplayer/CMakeLists.txt
@@ -11,6 +11,17 @@ list(REMOVE_ITEM dictHeaders ${CMAKE_SOURCE_DIR}/tree/treeplayer/inc/TBranchProx
 
 ROOT_GLOB_SOURCES(sources src/*.cxx)
 
+if(MSVC)
+  list(REMOVE_ITEM dictHeaders ${CMAKE_SOURCE_DIR}/tree/treeplayer/inc/TMPWorkerTree.h)
+  list(REMOVE_ITEM dictHeaders ${CMAKE_CURRENT_SOURCE_DIR}/inc/ROOT/TTreeProcessorMT.h)
+  list(REMOVE_ITEM dictHeaders ${CMAKE_CURRENT_SOURCE_DIR}/inc/ROOT/TProcessExecutor.hxx)
+  list(REMOVE_ITEM dictHeaders ${CMAKE_CURRENT_SOURCE_DIR}/inc/ROOT/TTreeProcessorMP.hxx)
+  list(REMOVE_ITEM sources ${CMAKE_SOURCE_DIR}/tree/treeplayer/src/TMPWorkerTree.cxx)
+  list(REMOVE_ITEM sources ${CMAKE_SOURCE_DIR}/tree/treeplayer/src/TTreeProcessorMP.cxx)
+else()
+  set(TREEPLAYER_DEPENDENCIES MultiProc Imt)
+endif()
+
 if(NOT imt)
   list(REMOVE_ITEM dictHeaders ${CMAKE_CURRENT_SOURCE_DIR}/inc/ROOT/TTreeProcessorMT.h)
   list(REMOVE_ITEM sources ${CMAKE_CURRENT_SOURCE_DIR}/src/TTreeProcessorMT.cxx)
@@ -23,7 +34,8 @@ ROOT_STANDARD_LIBRARY_PACKAGE(TreePlayer
                               SOURCES ${sources}
                               DICTIONARY_OPTIONS "-writeEmptyRootPCM"
                               LIBRARIES ${TBB_LIBRARIES}
-                              DEPENDENCIES Tree Graf3d Graf Hist Gpad RIO MathCore MultiProc Imt)
+                              DEPENDENCIES Tree Graf3d Graf Hist Gpad RIO MathCore
+                              ${TREEPLAYER_DEPENDENCIES})
 
 #---Extra rules-------------------------------------------------------
 if(APPLE)
diff --git a/tree/treeplayer/inc/ROOT/TDFInterface.hxx b/tree/treeplayer/inc/ROOT/TDFInterface.hxx
index 2aeca81bc0ae4871c2e752e3eb203a30139e195d..ed69e804599aa9d99dbe1fe5618cfaf861fa37ad 100644
--- a/tree/treeplayer/inc/ROOT/TDFInterface.hxx
+++ b/tree/treeplayer/inc/ROOT/TDFInterface.hxx
@@ -294,7 +294,7 @@ class TInterface {
    using TRangeBase = TDFDetail::TRangeBase;
    using TCustomColumnBase = TDFDetail::TCustomColumnBase;
    using TLoopManager = TDFDetail::TLoopManager;
-   friend std::string cling::printValue(ROOT::Experimental::TDataFrame *tdf); // For a nice printing at the prompt
+   friend std::string cling::printValue(TDataFrame *tdf); // For a nice printing at the prompt
    template <typename T>
    friend class TInterface;