diff --git a/core/base/inc/RtypesImp.h b/core/base/inc/RtypesImp.h
index 58f536f4f0049..e14f61a1dcf75 100644
--- a/core/base/inc/RtypesImp.h
+++ b/core/base/inc/RtypesImp.h
@@ -44,9 +44,6 @@ inline void operator delete(void*, ROOT::Internal::TOperatorNewHelper*) { }
 
 // The STL GenerateInitInstance are not unique and hence are declared static
 // (not accessible outside the dictionary and not linker error for duplicate)
-#if defined(__CINT__)
-#define RootStlStreamer(name,STREAMER)
-#else
 #define RootStlStreamer(name,STREAMER)                               \
 namespace ROOT {                                                     \
    static TGenericClassInfo *GenerateInitInstance(const name*);      \
@@ -54,8 +51,6 @@ namespace ROOT {                                                     \
            GenerateInitInstance((name*)0x0)->SetStreamer(STREAMER);  \
    R__UseDummy(_R__UNIQUE_(R__dummyStreamer));                       \
 }
-#endif
-
 
 #if defined(__cplusplus)
 /* Helper class to avoid compiler warning about casting function pointer
diff --git a/core/base/src/TApplication.cxx b/core/base/src/TApplication.cxx
index 2ca1a5ae50c61..239718ac51d09 100644
--- a/core/base/src/TApplication.cxx
+++ b/core/base/src/TApplication.cxx
@@ -1809,12 +1809,12 @@ Longptr_t TApplication::ExecuteFile(const char *file, Int_t *error, Bool_t keep)
       while (s && (*s == ' ' || *s == '\t')) s++;   // strip-off leading blanks
 
       // very simple minded pre-processor parsing, only works in case macro file
-      // starts with "#ifndef __CINT__". In that case everything till next
-      // "#else" or "#endif" will be skipped.
+      // starts with "#ifndef __CLING__" (__CINT__ for backward compatibility).
+      // In that case everything till next "#else" or "#endif" will be skipped.
       if (*s == '#') {
          char *cs = Compress(currentline);
-         if (strstr(cs, "#ifndef__CINT__") ||
-             strstr(cs, "#if!defined(__CINT__)"))
+         if (strstr(cs, "#ifndef__CLING__") || strstr(cs, "#ifndef__CINT__") ||
+             strstr(cs, "#if!defined(__CLING__)") || strstr(cs, "#if!defined(__CINT__)"))
             ifndefc = 1;
          else if (ifndefc && (strstr(cs, "#ifdef") || strstr(cs, "#ifndef") ||
                   strstr(cs, "#ifdefined") || strstr(cs, "#if!defined")))
diff --git a/core/base/src/TSystem.cxx b/core/base/src/TSystem.cxx
index a425a460b82ff..ff4206b2e5102 100644
--- a/core/base/src/TSystem.cxx
+++ b/core/base/src/TSystem.cxx
@@ -3455,7 +3455,7 @@ int TSystem::CompileMacro(const char *filename, Option_t *opt,
    linkdefFile << "// File Automatically generated by the ROOT Script Compiler "
                << std::endl;
    linkdefFile << std::endl;
-   linkdefFile << "#ifdef __CINT__" << std::endl;
+   linkdefFile << "#ifdef __CLING__" << std::endl;
    linkdefFile << std::endl;
    linkdefFile << "#pragma link C++ nestedclasses;" << std::endl;
    linkdefFile << "#pragma link C++ nestedtypedefs;" << std::endl;
diff --git a/core/clingutils/CMakeLists.txt b/core/clingutils/CMakeLists.txt
index 2a74a10eb0703..6d2d893d5a8c1 100644
--- a/core/clingutils/CMakeLists.txt
+++ b/core/clingutils/CMakeLists.txt
@@ -77,7 +77,6 @@ foreach(dict ${stldicts})
                                 LINKDEF src/${dict}Linkdef.h
                                 DICTIONARY_OPTIONS --noIncludePaths
                                 DEPENDENCIES Core)
-  target_include_directories(${dict}Dict PRIVATE ${CMAKE_SOURCE_DIR}/interpreter/cling/include/cling/cint)
 endforeach()
 
 set(CLANG_RESOURCE_DIR_STEM)
@@ -185,12 +184,6 @@ foreach(file ${custom_modulemaps}
   install(FILES ${CMAKE_BINARY_DIR}/etc/cling/${dest_file} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/cling/${path})
 endforeach()
 
-foreach(file  multimap  multiset)
-  list(APPEND copy_commands COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/interpreter/cling/include/cling/cint/${file} ${CMAKE_BINARY_DIR}/etc/cling/cint/${file})
-  list(APPEND files_to_copy ${CMAKE_SOURCE_DIR}/interpreter/cling/include/cling/cint/${file})
-  install(FILES ${CMAKE_SOURCE_DIR}/interpreter/cling/include/cling/cint/${file} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/cling/cint)
-endforeach()
-
 set(stamp_file ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/LLVMRES.stamp)
 if(MSVC)
   add_custom_command(OUTPUT ${stamp_file}
diff --git a/core/dictgen/src/rootcling_impl.cxx b/core/dictgen/src/rootcling_impl.cxx
index 99942be55d0b1..0b389eeaf7dde 100644
--- a/core/dictgen/src/rootcling_impl.cxx
+++ b/core/dictgen/src/rootcling_impl.cxx
@@ -1840,7 +1840,7 @@ void CallWriteStreamer(const ROOT::TMetaUtils::AnnotatedRecordDecl &cl,
 void GenerateLinkdef(llvm::cl::list<std::string> &InputFiles,
                      std::string &code_for_parser)
 {
-   code_for_parser += "#ifdef __CINT__\n\n";
+   code_for_parser += "#ifdef __CLING__\n\n";
    code_for_parser += "#pragma link off all globals;\n";
    code_for_parser += "#pragma link off all classes;\n";
    code_for_parser += "#pragma link off all functions;\n\n";
@@ -4274,8 +4274,8 @@ int RootClingMain(int argc,
    // Data is in 'outputFile', therefore in the same scope.
    llvm::StringRef moduleName;
    std::string vfsArg;
-   // Adding -fmodules to the args will break lexing with __CINT__ defined,
-   // and we actually do lex with __CINT__ and reuse this variable later,
+   // Adding -fmodules to the args will break lexing with __CLING__ defined,
+   // and we actually do lex with __CLING__ and reuse this variable later,
    // we have to copy it now.
    auto clingArgsInterpreter = clingArgs;
 
@@ -4486,8 +4486,8 @@ int RootClingMain(int argc,
    TClassEdit::Init(&helper);
 
    // flags used only for the pragma parser:
-   clingArgs.push_back("-D__CINT__");
-   clingArgs.push_back("-D__MAKECINT__");
+   clingArgs.push_back("-D__CINT__"); // backward compatibility. Now __CLING__ should be used instead
+   clingArgs.push_back("-D__MAKECINT__"); // backward compatibility. Now __ROOTCLING__ should used instead
 
    AddPlatformDefines(clingArgs);
 
@@ -4750,8 +4750,7 @@ int RootClingMain(int argc,
       // interpPragmaSource and we still need to process it.
 
       LinkdefReader ldefr(interp, constructorTypes);
-      clingArgs.push_back("-Ietc/cling/cint"); // For multiset and multimap
-
+      
       if (!ldefr.Parse(selectionRules, interpPragmaSource, clingArgs,
                        llvmResourceDir.c_str())) {
          ROOT::TMetaUtils::Error(nullptr, "Parsing #pragma failed %s\n", linkdefFilename.c_str());
diff --git a/gui/gui/inc/TGTextViewStream.h b/gui/gui/inc/TGTextViewStream.h
index a8573947be1b2..a4a40f508dcd8 100644
--- a/gui/gui/inc/TGTextViewStream.h
+++ b/gui/gui/inc/TGTextViewStream.h
@@ -17,9 +17,6 @@
 #include <streambuf>
 #include <iostream>
 
-#if defined (R__WIN32) && defined (__MAKECINT__)
-typedef basic_streambuf<char, char_traits<char> > streambuf;
-#endif
 
 class TGTextViewStreamBuf : public std::streambuf
 {
diff --git a/interpreter/cling/include/cling/cint/multimap b/interpreter/cling/include/cling/cint/multimap
deleted file mode 100644
index 18c86d00346ce..0000000000000
--- a/interpreter/cling/include/cling/cint/multimap
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef __CINT__
-#include <map>
-#else
-#error "This header (multimap) is only expected to be used when emulating CINT"
-#endif
diff --git a/interpreter/cling/include/cling/cint/multiset b/interpreter/cling/include/cling/cint/multiset
deleted file mode 100644
index caf66b12dcff4..0000000000000
--- a/interpreter/cling/include/cling/cint/multiset
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef __CINT__
-#include <set>
-#else
-#error "This header (multiset) is only expected to be used when emulating CINT"
-#endif
diff --git a/io/io/src/TFile.cxx b/io/io/src/TFile.cxx
index eb6fcc3f5ab6d..cf572ca9da599 100644
--- a/io/io/src/TFile.cxx
+++ b/io/io/src/TFile.cxx
@@ -3050,7 +3050,7 @@ void TFile::MakeProject(const char *dirname, const char * /*classes*/,
       fprintf(fp,"<lcgdict>\n");
       fprintf(fp,"\n");
    } else {
-      fprintf(fp,"#ifdef __CINT__\n");
+      fprintf(fp,"#ifdef __CLING__\n");
       fprintf(fp,"\n");
    }
 
diff --git a/io/io/src/TMakeProject.cxx b/io/io/src/TMakeProject.cxx
index dcec5cdff56e0..8021ae49f7a15 100644
--- a/io/io/src/TMakeProject.cxx
+++ b/io/io/src/TMakeProject.cxx
@@ -295,7 +295,7 @@ UInt_t TMakeProject::GenerateClassPrefix(FILE *fp, const char *clname, Bool_t to
          if (implementEmptyClass==1) {
             if (strchr(fullname, ':') == 0) {
                // yes this is too aggressive, this needs to be fixed properly by moving the #pragma out of band.
-               fprintf(fp, "#ifdef __MAKECINT__\n#pragma link C++ class %s+;\n#endif\n", fullname);
+               fprintf(fp, "#ifdef __ROOTCLING__\n#pragma link C++ class %s+;\n#endif\n", fullname);
             }
             fprintf(fp, "#endif\n");
          }
@@ -588,7 +588,7 @@ UInt_t TMakeProject::GenerateIncludeForTemplate(FILE *fp, const char *clname, ch
             TClass *paircl = TClass::GetClass(what.Data());
             if (paircl == 0 || !paircl->HasInterpreterInfo()) {
                AddUniqueStatement(
-                  fp, TString::Format("#ifdef __MAKECINT__\n#pragma link C++ class %s+;\n#endif\n", what.Data()),
+                  fp, TString::Format("#ifdef __ROOTCLING__\n#pragma link C++ class %s+;\n#endif\n", what.Data()),
                   inclist);
             }
          }
@@ -634,7 +634,7 @@ void TMakeProject::GeneratePostDeclaration(FILE *fp, const TVirtualStreamerInfo
             // Only ask for it if needed.
             TClass *paircl = TClass::GetClass(what.Data());
             if (paircl == 0 || !paircl->HasInterpreterInfo()) {
-               AddUniqueStatement(fp, TString::Format("#ifdef __MAKECINT__\n#pragma link C++ class %s+;\n#endif\n",what.Data()), inclist);
+               AddUniqueStatement(fp, TString::Format("#ifdef __ROOTCLING__\n#pragma link C++ class %s+;\n#endif\n",what.Data()), inclist);
             }
          }
       }
diff --git a/math/genvector/inc/Math/GenVector/Cartesian2D.h b/math/genvector/inc/Math/GenVector/Cartesian2D.h
index 97b619752a946..cd565a551eae2 100644
--- a/math/genvector/inc/Math/GenVector/Cartesian2D.h
+++ b/math/genvector/inc/Math/GenVector/Cartesian2D.h
@@ -174,7 +174,7 @@ public :
 
 
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -200,7 +200,7 @@ public :
 } // end namespace ROOT
 
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 // need to put here setter methods to resolve nasty cyclical dependencies
 // I need to include other coordinate systems only when Cartesian is already defined
 // since they depend on it
diff --git a/math/genvector/inc/Math/GenVector/Cartesian3D.h b/math/genvector/inc/Math/GenVector/Cartesian3D.h
index 57a3216897c2f..57a1a01404651 100644
--- a/math/genvector/inc/Math/GenVector/Cartesian3D.h
+++ b/math/genvector/inc/Math/GenVector/Cartesian3D.h
@@ -203,7 +203,7 @@ public :
 
 
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -232,7 +232,7 @@ public :
 } // end namespace ROOT
 
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 // need to put here setter methods to resolve nasty cyclical dependencies
 // I need to include other coordinate systems only when Cartesian is already defined
 // since they depend on it
diff --git a/math/genvector/inc/Math/GenVector/Cylindrical3D.h b/math/genvector/inc/Math/GenVector/Cylindrical3D.h
index bf13d8e001909..240f33666d6f9 100644
--- a/math/genvector/inc/Math/GenVector/Cylindrical3D.h
+++ b/math/genvector/inc/Math/GenVector/Cylindrical3D.h
@@ -200,7 +200,7 @@ public :
 
    // (none)
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -231,7 +231,7 @@ public :
 
 #include "Math/GenVector/Cartesian3D.h"
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #include "Math/GenVector/GenVector_exception.h"
 #include "Math/GenVector/CylindricalEta3D.h"
 #include "Math/GenVector/Polar3D.h"
@@ -246,7 +246,7 @@ void Cylindrical3D<T>::SetXYZ(Scalar xx, Scalar yy, Scalar zz) {
    *this = Cartesian3D<Scalar>(xx, yy, zz);
 }
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
 
   // ====== Set member functions for coordinates in other systems =======
diff --git a/math/genvector/inc/Math/GenVector/CylindricalEta3D.h b/math/genvector/inc/Math/GenVector/CylindricalEta3D.h
index a524d1b716b69..e39e06ba5aa87 100644
--- a/math/genvector/inc/Math/GenVector/CylindricalEta3D.h
+++ b/math/genvector/inc/Math/GenVector/CylindricalEta3D.h
@@ -237,7 +237,7 @@ public :
 
    // (none)
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -269,7 +269,7 @@ public :
 
 #include "Math/GenVector/Cartesian3D.h"
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #include "Math/GenVector/GenVector_exception.h"
 #include "Math/GenVector/Polar3D.h"
 #endif
@@ -283,7 +283,7 @@ void CylindricalEta3D<T>::SetXYZ(Scalar xx, Scalar yy, Scalar zz) {
    *this = Cartesian3D<Scalar>(xx, yy, zz);
 }
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
 
      // ====== Set member functions for coordinates in other systems =======
diff --git a/math/genvector/inc/Math/GenVector/Polar2D.h b/math/genvector/inc/Math/GenVector/Polar2D.h
index 89bcee01e9e4a..bf1ccf32efca8 100644
--- a/math/genvector/inc/Math/GenVector/Polar2D.h
+++ b/math/genvector/inc/Math/GenVector/Polar2D.h
@@ -183,7 +183,7 @@ public :
 
    // (none)
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -208,7 +208,7 @@ public :
 
 #include "Math/GenVector/Cartesian2D.h"
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #include "Math/GenVector/GenVector_exception.h"
 #endif
 
@@ -222,7 +222,7 @@ void Polar2D<T>::SetXY(Scalar a, Scalar b) {
 }
 
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
 
 // ====== Set member functions for coordinates in other systems =======
diff --git a/math/genvector/inc/Math/GenVector/Polar3D.h b/math/genvector/inc/Math/GenVector/Polar3D.h
index d2cf8a150f936..6a980295ff1e6 100644
--- a/math/genvector/inc/Math/GenVector/Polar3D.h
+++ b/math/genvector/inc/Math/GenVector/Polar3D.h
@@ -201,7 +201,7 @@ public :
 
    // (none)
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -233,7 +233,7 @@ public :
 
 #include "Math/GenVector/Cartesian3D.h"
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #include "Math/GenVector/GenVector_exception.h"
 #include "Math/GenVector/CylindricalEta3D.h"
 #endif
@@ -248,7 +248,7 @@ void Polar3D<T>::SetXYZ(Scalar xx, Scalar yy, Scalar zz) {
    *this = Cartesian3D<Scalar>(xx, yy, zz);
 }
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
   // ====== Set member functions for coordinates in other systems =======
 
diff --git a/math/genvector/inc/Math/GenVector/PtEtaPhiE4D.h b/math/genvector/inc/Math/GenVector/PtEtaPhiE4D.h
index 0a405a72b0089..539e8cf0e5a01 100644
--- a/math/genvector/inc/Math/GenVector/PtEtaPhiE4D.h
+++ b/math/genvector/inc/Math/GenVector/PtEtaPhiE4D.h
@@ -327,7 +327,7 @@ public :
 
 
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -356,7 +356,7 @@ public :
 
 // move implementations here to avoid circle dependencies
 #include "Math/GenVector/PxPyPzE4D.h"
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 #include "Math/GenVector/PtEtaPhiM4D.h"
 #endif
 
@@ -370,7 +370,7 @@ inline void PtEtaPhiE4D<ScalarType>::SetPxPyPzE(Scalar px, Scalar py, Scalar pz,
 }
 
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
   // ====== Set member functions for coordinates in other systems =======
 
diff --git a/math/genvector/inc/Math/GenVector/PtEtaPhiM4D.h b/math/genvector/inc/Math/GenVector/PtEtaPhiM4D.h
index 67a65b071c03c..8b274a000c45c 100644
--- a/math/genvector/inc/Math/GenVector/PtEtaPhiM4D.h
+++ b/math/genvector/inc/Math/GenVector/PtEtaPhiM4D.h
@@ -345,7 +345,7 @@ public :
    Scalar t() const { return E(); }
 
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -389,7 +389,7 @@ inline void PtEtaPhiM4D<ScalarType>::SetPxPyPzE(Scalar px, Scalar py, Scalar pz,
 }
 
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
   // ====== Set member functions for coordinates in other systems =======
 
diff --git a/math/genvector/inc/Math/GenVector/PxPyPzE4D.h b/math/genvector/inc/Math/GenVector/PxPyPzE4D.h
index 51b563e52b830..9db3c601f12fa 100644
--- a/math/genvector/inc/Math/GenVector/PxPyPzE4D.h
+++ b/math/genvector/inc/Math/GenVector/PxPyPzE4D.h
@@ -302,7 +302,7 @@ public :
 
 
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -333,7 +333,7 @@ public :
 
 
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 // move implementations here to avoid circle dependencies
 
 #include "Math/GenVector/PtEtaPhiE4D.h"
diff --git a/math/genvector/inc/Math/GenVector/PxPyPzM4D.h b/math/genvector/inc/Math/GenVector/PxPyPzM4D.h
index 74fb429ef50e2..bc390a8355354 100644
--- a/math/genvector/inc/Math/GenVector/PxPyPzM4D.h
+++ b/math/genvector/inc/Math/GenVector/PxPyPzM4D.h
@@ -319,7 +319,7 @@ public :
 
 
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
    // ====== Set member functions for coordinates in other systems =======
 
@@ -376,7 +376,7 @@ inline void PxPyPzM4D<ScalarType>::SetPxPyPzE(Scalar px, Scalar py, Scalar pz, S
 }
 
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
   // ====== Set member functions for coordinates in other systems =======
 
diff --git a/math/genvector/inc/Math/GenVector/Transform3D.h b/math/genvector/inc/Math/GenVector/Transform3D.h
index 40ff9adb142e5..3c90667691462 100644
--- a/math/genvector/inc/Math/GenVector/Transform3D.h
+++ b/math/genvector/inc/Math/GenVector/Transform3D.h
@@ -215,9 +215,6 @@ class Transform3D {
    */
    explicit constexpr Transform3D(const Translation3D<T> &t) { AssignFrom(t.Vect()); }
 
-   //#if !defined(__MAKECINT__) && !defined(G__DICTIONARY)  // this is ambiguous with double * , double *
-
-
 #ifdef OLD_VERSION
    /**
       Construct from a translation (using any type of DisplacementVector )
diff --git a/math/mathcore/inc/Math/ParamFunctor.h b/math/mathcore/inc/Math/ParamFunctor.h
index 5c2ddacc5b16a..68d460e07278c 100644
--- a/math/mathcore/inc/Math/ParamFunctor.h
+++ b/math/mathcore/inc/Math/ParamFunctor.h
@@ -142,7 +142,7 @@ private :
 };
 
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 // needed since CINT initialize it with TRootIOCtor
 //class TRootIOCtor;
 template<class ParentFunctor>
diff --git a/math/mathcore/inc/Math/TDataPoint.h b/math/mathcore/inc/Math/TDataPoint.h
index 9a5ad69c4985a..cb0767f2e1f0f 100644
--- a/math/mathcore/inc/Math/TDataPoint.h
+++ b/math/mathcore/inc/Math/TDataPoint.h
@@ -50,7 +50,7 @@ class TDataPoint {
       for (UInt_t k = 0; k < K; ++k)
          m_vCoordinates[k] = 0;
    }
-#ifndef __MAKECINT__
+#ifndef __ROOTCLING__
    /// constructor initialising the data point from an array
    ///
    /// Input: pData   - array with kDimension coordinates
diff --git a/math/mathmore/inc/Math/GSLRootFinder.h b/math/mathmore/inc/Math/GSLRootFinder.h
index fae2848762208..0cb7cb52583ed 100644
--- a/math/mathmore/inc/Math/GSLRootFinder.h
+++ b/math/mathmore/inc/Math/GSLRootFinder.h
@@ -82,7 +82,7 @@ namespace Math {
     GSLRootFinder(GSLRootFinder &&) = delete;
     GSLRootFinder &operator=(GSLRootFinder &&) = delete;
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
     bool SetFunction( const IGradFunction & , double ) override {
        std::cerr <<"GSLRootFinder - Error : this method must be used with a Root Finder algorithm using derivatives" << std::endl;
        return false;
diff --git a/math/mathmore/inc/Math/GSLRootFinderDeriv.h b/math/mathmore/inc/Math/GSLRootFinderDeriv.h
index 19b532fe9e363..7a25f61285d68 100644
--- a/math/mathmore/inc/Math/GSLRootFinderDeriv.h
+++ b/math/mathmore/inc/Math/GSLRootFinderDeriv.h
@@ -83,7 +83,7 @@ class GSLRootFinderDeriv: public IRootFinderMethod {
    GSLRootFinderDeriv(GSLRootFinderDeriv &&) = delete;
    GSLRootFinderDeriv &operator=(GSLRootFinderDeriv &&) = delete;
 
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
    bool SetFunction( const IGenFunction & , double , double ) override {
       std::cerr <<"GSLRootFinderDeriv - Error : Algorithm requirs derivatives" << std::endl;
       return false;
diff --git a/math/mathmore/inc/Math/LinkDef.h b/math/mathmore/inc/Math/LinkDef.h
index b6f60f89bcd0e..f3b5281e94486 100644
--- a/math/mathmore/inc/Math/LinkDef.h
+++ b/math/mathmore/inc/Math/LinkDef.h
@@ -107,4 +107,4 @@
 #pragma link C++ class ROOT::Math::GSLMultiRootFinder+;
 #pragma link C++ typedef ROOT::Math::MultiRootFinder;
 
-#endif //__CINT__
+#endif //__CLING__
diff --git a/math/minuit2/test/testUserFunc.cxx b/math/minuit2/test/testUserFunc.cxx
index 7a84038d1e909..af500dd10922a 100644
--- a/math/minuit2/test/testUserFunc.cxx
+++ b/math/minuit2/test/testUserFunc.cxx
@@ -54,7 +54,7 @@ void testUserFunc(std::string type = "Minuit2", int n = 1000)
    h1->Draw();
 }
 
-#ifndef __CINT__
+#ifndef __CLING__
 int main(int argc, char **argv)
 {
    if (argc > 1) {
@@ -67,7 +67,7 @@ int main(int argc, char **argv)
 }
 #endif
 
-//#ifndef __CINT__
+//#ifndef __CLING__
 // int main() {
 //  testUserFunc( );
 //}
diff --git a/math/smatrix/inc/Math/StaticCheck.h b/math/smatrix/inc/Math/StaticCheck.h
index cfa11b8c633ad..17ed660c56fa2 100644
--- a/math/smatrix/inc/Math/StaticCheck.h
+++ b/math/smatrix/inc/Math/StaticCheck.h
@@ -24,7 +24,7 @@
 
 
 // case of dictionary generator
-#if defined(__MAKECINT__) || defined(G__DICTIONARY)
+#if defined(__ROOTCLING__) || defined(G__DICTIONARY)
 
 #include "Math/MConfig.h"
 #include <iostream>
diff --git a/roofit/roofitcore/test/stressRooFit.cxx b/roofit/roofitcore/test/stressRooFit.cxx
index b3b7144ce1fd4..7160de42e5053 100644
--- a/roofit/roofitcore/test/stressRooFit.cxx
+++ b/roofit/roofitcore/test/stressRooFit.cxx
@@ -215,7 +215,7 @@ int stressRooFit(const char *refFile, bool writeRef, int doVerbose, int oneTest,
 
    printf("******************************************************************\n");
    gBenchmark->Print("StressFit");
-#ifdef __CINT__
+#ifdef __CLING__
    Double_t reftime = 186.34; // pcbrun4 interpreted
 #else
    Double_t reftime = 93.59; // pcbrun4 compiled
@@ -241,7 +241,7 @@ int stressRooFit(const char *refFile, bool writeRef, int doVerbose, int oneTest,
 }
 
 //_____________________________batch only_____________________
-#ifndef __CINT__
+#ifndef __CLING__
 
 int main(int argc, const char *argv[])
 {
diff --git a/roofit/roostats/test/stressRooStats.cxx b/roofit/roostats/test/stressRooStats.cxx
index 98a1267ce9d5a..9a1ea868241e0 100644
--- a/roofit/roostats/test/stressRooStats.cxx
+++ b/roofit/roostats/test/stressRooStats.cxx
@@ -255,7 +255,7 @@ int stressRooStats(const char *refFile, bool writeRef, int verbose, bool allTest
 
    std::cout << setw(lineWidth) << setfill('*') << "" << std::endl;
    gBenchmark->Print("stressRooStats");
-#ifdef __CINT__
+#ifdef __CLING__
    Double_t reftime = 186.34; // pcbrun4 interpreted
 #else
    Double_t reftime = 93.59; // pcbrun4 compiled
@@ -297,7 +297,7 @@ int stressRooStats(const char *refFile, bool writeRef, int verbose, bool allTest
 }
 
 //_____________________________batch only_____________________
-#ifndef __CINT__
+#ifndef __CLING__
 
 int main(int argc, const char *argv[])
 {
diff --git a/tree/treeplayer/src/TTreeProxyGenerator.cxx b/tree/treeplayer/src/TTreeProxyGenerator.cxx
index 06987cfa00a76..8f3f65f7be2ef 100644
--- a/tree/treeplayer/src/TTreeProxyGenerator.cxx
+++ b/tree/treeplayer/src/TTreeProxyGenerator.cxx
@@ -1880,7 +1880,7 @@ namespace Internal {
       fprintf(hf,"#endif\n");
       fprintf(hf,"\n\n");
 
-      fprintf(hf,"#ifdef __MAKECINT__\n");
+      fprintf(hf,"#ifdef __ROOTCLING__\n");
       if (fListOfClasses.LastIndex()>=0) {
          TBranchProxyClassDescriptor *clp;
          next = &fListOfClasses;