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 a39cc12806b40..f165073e6e552 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 35fb754a32be5..aabafc5d0f5f8 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/roottest/cling/const/constissue.C b/roottest/cling/const/constissue.C
index 55fadf0209225..1bcec0e47ecec 100644
--- a/roottest/cling/const/constissue.C
+++ b/roottest/cling/const/constissue.C
@@ -1,6 +1,6 @@
 int get_histogram(char const* , char const* ){return 0; }
 template<class T> void get_histogram(T const & t, char const * name);
-#ifdef __CINT__
+#ifdef __CLING__
 // Can't remember what this is actually testing but it should not do
 // any harm anyway!
 #pragma link C++ function get_histogram;
@@ -16,8 +16,8 @@ class TriggerCharacterizer {
   trigger_counting_map m_map;
 };
 
-#ifdef __CINT__
+//#ifdef __CLING__
 //#pragma link C++ class TriggerCharacterizer::trigger_counting_map;
-#endif
+//#endif
 
 void constissue() {}
diff --git a/roottest/cling/dict/algebra3 b/roottest/cling/dict/algebra3
index 3c571cc64843a..2af76036f8ff3 100644
--- a/roottest/cling/dict/algebra3
+++ b/roottest/cling/dict/algebra3
@@ -18,7 +18,6 @@
 
 namespace aux {
 
-#ifndef __CINT__
   using std::size_t;
   using std::complex;
   using std::istream;
@@ -32,7 +31,6 @@ namespace aux {
   using std::sin;
 //  using std::conj;
   using std::norm;
-#endif /* __CINT__ */
 
   /* ****************** algebra3.h begins here ****************** */
 
@@ -710,7 +708,6 @@ namespace aux {
   //  Implementation
   //
 
-#ifndef __CINT__
 
   /****************************************************************
    *                                                               *
@@ -1999,7 +1996,6 @@ namespace aux {
 		     ((_Tp)0), ((_Tp)0), ((_Tp)1), ((_Tp)0),
 		     ((_Tp)0), ((_Tp)0), ((_Tp)1) / d, ((_Tp)0)); }
 
-#endif /* __CINT__ */
 
   /* ******************* algebra3.h ends here ******************* */
 
@@ -2041,7 +2037,6 @@ namespace aux {
   template<typename _Tp> mat3<_Tp> ExtractRotation(const mat4<_Tp>& pose); // extract rotation matrix from transformation matrix
   template<typename _Tp> typename rtti<_Tp>::value_type PointToPlane(const vec3<_Tp>& point, const vec4<_Tp>& plane); // unsigned distance from a point to a plane (3D)
 
-#ifndef __CINT__
 
   //
   //	rotation2D -- convert 2x2 rotation matrix to 3x3
@@ -2176,7 +2171,6 @@ namespace aux {
     return dist;
   }
 
-#endif /* __CINT__ */
 
 #ifdef fmin
 #undef fmin                 // allow as function names
diff --git a/roottest/cling/dict/operators_dict.h b/roottest/cling/dict/operators_dict.h
index 2b003f8c48625..620df483e61db 100644
--- a/roottest/cling/dict/operators_dict.h
+++ b/roottest/cling/dict/operators_dict.h
@@ -1,6 +1,6 @@
 #include "operators.h"
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class myiterator;
 #pragma link C++ operators myiterator;
 #endif
@@ -12,14 +12,14 @@ namespace enclosing {
    #include "operators.h"
 }
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class enclosing::myiterator;
 #pragma link C++ operators enclosing::myiterator;
 #endif
 #endif
 
 #include <vector>
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vector<myiterator>;
 #pragma link C++ class vector<myiterator>::const_iterator;
 #pragma link C++ class vector<myiterator>::iterator;
diff --git a/roottest/cling/dict/runalgebra.C b/roottest/cling/dict/runalgebra.C
index 511917504a3d2..6b4d47b6336dc 100644
--- a/roottest/cling/dict/runalgebra.C
+++ b/roottest/cling/dict/runalgebra.C
@@ -19,7 +19,7 @@ void runalgebra (void) { /* Dummy ROOT initialization routine */ }
 
 #include "RConfigure.h"
 
-#if defined(__MAKECINT__) || defined(__ALGEBRA3_CXX_DEBUG__)
+#if defined(__ROOTCLING__) || defined(__ALGEBRA3_CXX_DEBUG__)
 
 #ifdef __FIX_MAKROSCHROTT__
 #undef __FIX_MAKROSCHROTT__
@@ -37,11 +37,11 @@ void runalgebra (void) { /* Dummy ROOT initialization routine */ }
 
 
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ namespace aux;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -49,7 +49,7 @@ void runalgebra (void) { /* Dummy ROOT initialization routine */ }
 
 
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ enum aux::EAxisXYZW;
 #pragma link C++ enum aux::EAxis1234;
@@ -57,7 +57,7 @@ void runalgebra (void) { /* Dummy ROOT initialization routine */ }
 #pragma link C++ enum aux::EColorRGB;
 #pragma link C++ enum aux::EPhongADSS;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -71,11 +71,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< long double >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -89,11 +89,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::vec2< long double > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -107,11 +107,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::vec2< long double >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -152,11 +152,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::vec3< long double > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -170,11 +170,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::vec3< long double >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -215,11 +215,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::vec4< long double > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -233,11 +233,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::vec4< long double >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -276,11 +276,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::mat2< long double > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -294,11 +294,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::mat2< long double >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -335,11 +335,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::mat3< long double > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -353,11 +353,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::mat3< long double >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -394,11 +394,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::mat4< long double > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -412,11 +412,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::mat4< long double >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -521,11 +521,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< float >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -539,11 +539,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::vec2< float > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -557,11 +557,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::vec2< float >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -602,11 +602,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::vec3< float > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -620,11 +620,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::vec3< float >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -665,11 +665,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::vec4< float > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -683,11 +683,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::vec4< float >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -726,11 +726,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::mat2< float > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -744,11 +744,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::mat2< float >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -785,11 +785,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::mat3< float > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -803,11 +803,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::mat3< float >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -844,11 +844,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::mat4< float > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -862,11 +862,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::mat4< float >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -971,11 +971,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< double >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -989,11 +989,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::vec2< double > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -1007,11 +1007,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::vec2< double >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -1052,11 +1052,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::vec3< double > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -1070,11 +1070,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::vec3< double >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -1115,11 +1115,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::vec4< double > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -1133,11 +1133,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::vec4< double >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -1176,11 +1176,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::mat2< double > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -1194,11 +1194,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::mat2< double >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -1235,11 +1235,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::mat3< double > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -1253,11 +1253,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::mat3< double >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -1294,11 +1294,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::mat4< double > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -1312,11 +1312,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::mat4< double >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -1421,11 +1421,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< complex<float> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -1439,11 +1439,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::vec2< complex<float> > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -1457,11 +1457,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::vec2< complex<float> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -1502,11 +1502,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::vec3< complex<float> > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -1520,11 +1520,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::vec3< complex<float> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -1565,11 +1565,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::vec4< complex<float> > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -1583,11 +1583,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::vec4< complex<float> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -1626,11 +1626,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::mat2< complex<float> > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -1644,11 +1644,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::mat2< complex<float> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -1685,11 +1685,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::mat3< complex<float> > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -1703,11 +1703,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::mat3< complex<float> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -1744,11 +1744,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::mat4< complex<float> > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -1762,11 +1762,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::mat4< complex<float> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -1871,11 +1871,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< complex<double> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -1889,11 +1889,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::vec2< complex<double> > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -1907,11 +1907,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::vec2< complex<double> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -1952,11 +1952,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::vec3< complex<double> > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -1970,11 +1970,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::vec3< complex<double> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -2015,11 +2015,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::vec4< complex<double> > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -2033,11 +2033,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::vec4< complex<double> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -2076,11 +2076,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::mat2< complex<double> > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -2094,11 +2094,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::mat2< complex<double> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -2135,11 +2135,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::mat3< complex<double> > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -2153,11 +2153,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::mat3< complex<double> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -2194,11 +2194,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::mat4< complex<double> > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -2212,11 +2212,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::mat4< complex<double> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -2321,11 +2321,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< complex<long double> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -2339,11 +2339,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::vec2< complex<long double> > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -2357,11 +2357,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::vec2< complex<long double> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -2402,11 +2402,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::vec3< complex<long double> > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -2420,11 +2420,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::vec3< complex<long double> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -2465,11 +2465,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::vec4< complex<long double> > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -2483,11 +2483,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::vec4< complex<long double> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -2526,11 +2526,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::mat2< complex<long double> > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -2544,11 +2544,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::mat2< complex<long double> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -2585,11 +2585,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::mat3< complex<long double> > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -2603,11 +2603,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::mat3< complex<long double> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -2644,11 +2644,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::rtti< aux::mat4< complex<long double> > >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 
 
@@ -2662,11 +2662,11 @@ namespace aux {
 
 } /* namespace aux */
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class aux::mat4< complex<long double> >+;
 
-#endif /* __MAKECINT__ */
+#endif /* __ROOTCLING__ */
 
 namespace aux {
 
@@ -2761,7 +2761,7 @@ namespace aux {
 
 
 
-#endif /* __MAKECINT__ || __ALGEBRA3_CXX_DEBUG__ */
+#endif /* __ROOTCLING__ || __ALGEBRA3_CXX_DEBUG__ */
 
 #endif /* __ALGEBRA3_CXX__ */
 
diff --git a/roottest/cling/dict/runoperators.C b/roottest/cling/dict/runoperators.C
index 2c304a22fa7b3..ef19f840f90cc 100644
--- a/roottest/cling/dict/runoperators.C
+++ b/roottest/cling/dict/runoperators.C
@@ -1,4 +1,4 @@
-#if defined(__CINT__) && !defined(__MAKECINT__)
+#if defined(__CLING__) && !defined(__ROOTCLING__) && !defined(ClingWorkAroundMissingSmartInclude)
 #include "operators_dict.h+"
 #else 
 #include "operators.h"
diff --git a/roottest/cling/function/CMakeLists.txt b/roottest/cling/function/CMakeLists.txt
index 25ace5799f0ae..1f93af213dfbd 100644
--- a/roottest/cling/function/CMakeLists.txt
+++ b/roottest/cling/function/CMakeLists.txt
@@ -7,7 +7,6 @@ ROOTTEST_ADD_TEST(runoverloadResolution
 ROOTTEST_ADD_TEST(rundefaultParams
                   MACRO rundefaultParams.C
                   OUTREF defaultParams.ref
-                  WILLFAIL
                   LABELS roottest regression cling)
 
 ROOTTEST_ADD_TEST(execrefDefaultParams
diff --git a/roottest/cling/function/Params.h b/roottest/cling/function/Params.h
index c19ffab7cbcb8..4a8005596748d 100644
--- a/roottest/cling/function/Params.h
+++ b/roottest/cling/function/Params.h
@@ -1,3 +1,6 @@
+#ifndef PARAMS_H
+#define PARAMS_H
+
 int gCountingCalls = 0;
 
 class Base {
@@ -6,7 +9,7 @@ class Base {
    virtual ~Base(){};
    virtual void FunctionX(int b=0, int c=5) {printf("%s: Base::FunctionX(int b=%d, int c=%d)\n", fMode, b, c);}
 
-   void CINTCannotHandleDefaultArgThatsNotYetParsed(int a = GetCountingCalls()) {};
+   void CINTCannotHandleDefaultArgThatsNotYetParsed(int a = GetCountingCalls()) {(void)a; };
    static int GetCountingCalls() {return ++fgCountingCalls;}
    virtual void FunctionY(int arg0 = ++gCountingCalls, float arg1 = Base::GetCountingCalls() ) {
       printf("%s: Base::FunctionY(int arg0=%d, float arg1=%d.)\n", fMode, arg0, (int)arg1);}
@@ -22,7 +25,9 @@ class Derived: public Base {
  public:
    Derived(const char* mode = ""): Base(mode){};
    virtual ~Derived(){};
-   virtual void FunctionX(int b=1, int c=6) {printf("%s: Derived::FunctionX(int b=%d, int c=%d)\n", fMode, b, c);}
-   virtual void FunctionY(int arg0 = ++gCountingCalls, float arg1 = Base::GetCountingCalls() ) {
+   void FunctionX(int b=1, int c=6) override {printf("%s: Derived::FunctionX(int b=%d, int c=%d)\n", fMode, b, c);}
+   void FunctionY(int arg0 = ++gCountingCalls, float arg1 = Base::GetCountingCalls() ) override {
       printf("%s: Derived::FunctionY(int arg0=%d, float arg1=%d.)\n", fMode, arg0, (int)arg1);}
 };
+
+#endif
diff --git a/roottest/cling/function/refFunction.C b/roottest/cling/function/refFunction.C
index 3f69388b31883..ade4ed880867f 100644
--- a/roottest/cling/function/refFunction.C
+++ b/roottest/cling/function/refFunction.C
@@ -1,4 +1,4 @@
-#if defined(__MAKECINT__) || !defined(__CINT__)
+#if defined(__ROOTCLING__) || !defined(__CLING__)
 #include "refClasses.cxx"
 #endif
 
diff --git a/roottest/cling/function/staticfunc.C b/roottest/cling/function/staticfunc.C
index 2c361b0f416c1..ab9d1b6660377 100644
--- a/roottest/cling/function/staticfunc.C
+++ b/roottest/cling/function/staticfunc.C
@@ -1,4 +1,4 @@
-#ifndef __CINT__
+#ifndef __CLING__
 #include "TString.h"
 #include "Riostream.h"
 #include <TLorentzVector.h>
diff --git a/roottest/cling/function/testDefaultParams.C b/roottest/cling/function/testDefaultParams.C
index cc2769447d7ae..b1f3f4879a283 100644
--- a/roottest/cling/function/testDefaultParams.C
+++ b/roottest/cling/function/testDefaultParams.C
@@ -1,6 +1,4 @@
-#ifndef __CINT__
 #include "Params.h"
-#endif
 
 void testDefaultParams(const char* mode) {
    // One object of type Base and one of type derived
diff --git a/roottest/cling/functionTemplate/MyClassReferenceUse_linkdef.h b/roottest/cling/functionTemplate/MyClassReferenceUse_linkdef.h
index 32db18ab244e1..6237547727c6e 100644
--- a/roottest/cling/functionTemplate/MyClassReferenceUse_linkdef.h
+++ b/roottest/cling/functionTemplate/MyClassReferenceUse_linkdef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all functions;
diff --git a/roottest/cling/functionTemplate/t_rflx_wrap.cxx b/roottest/cling/functionTemplate/t_rflx_wrap.cxx
index 1c445b83a5cd1..09858caa71d1f 100644
--- a/roottest/cling/functionTemplate/t_rflx_wrap.cxx
+++ b/roottest/cling/functionTemplate/t_rflx_wrap.cxx
@@ -1,4 +1,4 @@
-#ifndef __CINT__
+#ifndef __CLING__
 #include "t_rflx.cpp"
 #endif
 
diff --git a/roottest/cling/longtemplate/CrashLinkDef.hh b/roottest/cling/longtemplate/CrashLinkDef.hh
index a1162b8f54526..443c24a91654a 100644
--- a/roottest/cling/longtemplate/CrashLinkDef.hh
+++ b/roottest/cling/longtemplate/CrashLinkDef.hh
@@ -1,7 +1,7 @@
 //std::vector<std::pair<Name::Sk,float> > ss;
 //Name::Sk sk;
 //std::vector<float > vssb;
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/cling/operator/ConversionOp.h b/roottest/cling/operator/ConversionOp.h
index b63244edb2198..6efc719d4b20b 100644
--- a/roottest/cling/operator/ConversionOp.h
+++ b/roottest/cling/operator/ConversionOp.h
@@ -69,7 +69,7 @@ class D {
    A<T>& operator/(A<T> &a) {printf("D::op /(A<T>)\n"); return a;}
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class A<B>+;
 #pragma link C++ class A<float>+;
 #pragma link C++ class A<int>+;
diff --git a/roottest/cling/operator/equal.C b/roottest/cling/operator/equal.C
index bcf01122328f4..546d48586e98a 100644
--- a/roottest/cling/operator/equal.C
+++ b/roottest/cling/operator/equal.C
@@ -56,15 +56,19 @@ public:
 class withHiddenRef : public top {
    withHiddenRef &operator=(const withHiddenRef&); // intentionally NOT implemented
    int a;
-#ifndef __CINT__
+#ifdef __CLING__
+public:
+   withHiddenRef(int &) {};
+#else
    const int &ref;
    int &ref2;
-#endif
 public:
    withHiddenRef(int &p) : ref(p),ref2(p) {};
+#endif
+
 };
 
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link C++ class withHiddenRef-;
 #endif
 
diff --git a/roottest/cling/other/assertBaseMembers.C b/roottest/cling/other/assertBaseMembers.C
index d9f5530633d4a..79555dd345494 100644
--- a/roottest/cling/other/assertBaseMembers.C
+++ b/roottest/cling/other/assertBaseMembers.C
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 // GCC and clang disagree with CINT, i.e. CINT fails for those.
 # define HIDEKNOWNFAILURES
 #endif
diff --git a/roottest/cling/other/fileClose.C b/roottest/cling/other/fileClose.C
index 63ceeaa9d6e0c..6331b9b1f4414 100644
--- a/roottest/cling/other/fileClose.C
+++ b/roottest/cling/other/fileClose.C
@@ -1,4 +1,4 @@
 #include "TROOT.h"
-#ifndef __CINT__
+#ifndef __CLING__
 static int x = (gROOT->ProcessLine("#define XYZ 21",&x),0);
 #endif
diff --git a/roottest/cling/other/runStaticDataMember.C b/roottest/cling/other/runStaticDataMember.C
index 13ab9a426f4c6..692f15b172d00 100644
--- a/roottest/cling/other/runStaticDataMember.C
+++ b/roottest/cling/other/runStaticDataMember.C
@@ -32,10 +32,10 @@ void runStaticDataMember()
    B b;
 }
 
-#ifndef __MAKECINT__
+#ifndef __ROOTCLING__
 int main()
 {
    runStaticDataMember();
    return 0;
 }
-#endif // __MAKECINT__
+#endif // __ROOTCLING__
diff --git a/roottest/cling/parsing/multiScope.C b/roottest/cling/parsing/multiScope.C
index 4c197ab6fc244..696f73348e78d 100644
--- a/roottest/cling/parsing/multiScope.C
+++ b/roottest/cling/parsing/multiScope.C
@@ -15,6 +15,6 @@ namespace ns1 {
    }
 }
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class ns1::ns2::ns3::SomeClass+;
 #endif
diff --git a/roottest/cling/parsing/operatorLessThanTemplate.C b/roottest/cling/parsing/operatorLessThanTemplate.C
index bb37e48d628e9..a37049dd1042d 100644
--- a/roottest/cling/parsing/operatorLessThanTemplate.C
+++ b/roottest/cling/parsing/operatorLessThanTemplate.C
@@ -195,7 +195,7 @@ namespace genie {
 
 
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ namespace genie;
 #pragma link C++ class genie::ConfigPool;
@@ -209,4 +209,4 @@ namespace genie {
 #pragma link C++ class genie::RegistryItem<genie__Wrapper<double> >+; // wont work because the friend parsing does not handle scope in  template param
 #pragma link C++ class genie::RegistryItemI;
 
-#endif // __MAKECINT__
+#endif // __ROOTCLING__
diff --git a/roottest/cling/parsing/ptrconst.C b/roottest/cling/parsing/ptrconst.C
index f96ee923edc86..23f70b4cbf4ba 100644
--- a/roottest/cling/parsing/ptrconst.C
+++ b/roottest/cling/parsing/ptrconst.C
@@ -6,7 +6,7 @@ public:
    Object * const &front() const {return mTo;}
    Object *mTo;
 };
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class myClass;
 #endif
 
diff --git a/roottest/cling/parsing/semicolon.C b/roottest/cling/parsing/semicolon.C
index 65ce8c609ffdf..4ff8126a3084f 100644
--- a/roottest/cling/parsing/semicolon.C
+++ b/roottest/cling/parsing/semicolon.C
@@ -3,7 +3,7 @@ void semicolon(const char *string = "/star/simu/simu/jwebb/11-12-2010-pp500-pile
   cout << string << endl;
 }
 
-#if !defined(__CINT__) && !defined(__CLING__)
+#if !defined(__CLING__)
 int main(int /* argc */, char **argv) {
   semicolon(argv[1]);
   return 0;
diff --git a/roottest/cling/reflex/runTools.C b/roottest/cling/reflex/runTools.C
index 9d37821576a15..d9de45a28e8ae 100644
--- a/roottest/cling/reflex/runTools.C
+++ b/roottest/cling/reflex/runTools.C
@@ -1,4 +1,4 @@
-#ifndef __CINT__
+#ifndef __CLING__
 #include "Reflex/Tools.h"
 #endif
 
diff --git a/roottest/cling/specialobj/calib.h b/roottest/cling/specialobj/calib.h
index 1325cf8f1e1af..5dde06e43842d 100644
--- a/roottest/cling/specialobj/calib.h
+++ b/roottest/cling/specialobj/calib.h
@@ -20,7 +20,7 @@ class RTCalib : public TNamed {
 
   ClassDef(RTCalib,1) // container and calculator of the RT calibrations
 };
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class pair<string,T0Result*>+;
 #pragma link C++ class map<string,T0Result*>+;
 #endif
diff --git a/roottest/cling/stl/default/VectorSort.C b/roottest/cling/stl/default/VectorSort.C
index 517d84e860cbb..d220f36fe47c1 100644
--- a/roottest/cling/stl/default/VectorSort.C
+++ b/roottest/cling/stl/default/VectorSort.C
@@ -1,5 +1,5 @@
 // autoloading fails! so we need to include <vector>:
-#if !defined(__CINT__) || 1
+#if !defined(__CLING__) || 1
 #include <vector> // loads the cintdlls
 #include <algorithm>
 #include "TROOT.h"
diff --git a/roottest/cling/stl/default/mylist.C b/roottest/cling/stl/default/mylist.C
index 9efa106a2366c..80a3845729356 100644
--- a/roottest/cling/stl/default/mylist.C
+++ b/roottest/cling/stl/default/mylist.C
@@ -10,7 +10,7 @@ template<class Star> class StarList : public list <Star*> {
 
 typedef list<BaseStar*> blist;
 
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link C++ nestedclass;
 #pragma link C++ nestedtypedef;
 #pragma link C++ class BaseStar;
diff --git a/roottest/cling/stl/map/LinkDef.h b/roottest/cling/stl/map/LinkDef.h
index ff348c98799db..0c948c6f96753 100644
--- a/roottest/cling/stl/map/LinkDef.h
+++ b/roottest/cling/stl/map/LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link C++ class test+;
 #endif
 
diff --git a/roottest/cling/stl/map/MyClass.h b/roottest/cling/stl/map/MyClass.h
index 1795c0405443d..2dbe3dc900e54 100644
--- a/roottest/cling/stl/map/MyClass.h
+++ b/roottest/cling/stl/map/MyClass.h
@@ -16,7 +16,7 @@ class MyClass{
 };
 
 
-#if defined(__MAKECINT__)
+#if defined(__ROOTCLING__)
 #pragma link C++ class MyClass;
 #endif
 
diff --git a/roottest/cling/stl/map/stringMapLoad.cxx b/roottest/cling/stl/map/stringMapLoad.cxx
index 54d171f120624..ccae83a298287 100644
--- a/roottest/cling/stl/map/stringMapLoad.cxx
+++ b/roottest/cling/stl/map/stringMapLoad.cxx
@@ -2,6 +2,6 @@
 #include <string>
 namespace std {} using namespace std;
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class map<string,double>;
 #endif
diff --git a/roottest/cling/template/Singleton.h b/roottest/cling/template/Singleton.h
index e419a0a7d9ef4..ecec27eef7bce 100644
--- a/roottest/cling/template/Singleton.h
+++ b/roottest/cling/template/Singleton.h
@@ -28,7 +28,7 @@ class Singleton
 // If this isn't hidden from rootcint, the build fails
 template <class T> Singleton<T>* Singleton<T>::instance = 0;
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class Singleton<int>;
 #pragma link C++ class Singleton<double>;
 #endif
diff --git a/roottest/cling/template/constructor.hh b/roottest/cling/template/constructor.hh
index 1bfb571b85a59..8312c2627af9f 100644
--- a/roottest/cling/template/constructor.hh
+++ b/roottest/cling/template/constructor.hh
@@ -12,7 +12,7 @@ private:
   T mData;
 };
 
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/cling/template/forward.C b/roottest/cling/template/forward.C
index d39ff22fc0e95..72a8822d30631 100644
--- a/roottest/cling/template/forward.C
+++ b/roottest/cling/template/forward.C
@@ -14,7 +14,7 @@ private:
    TYPE val;
    */
     typedef            TYPE                              value_type ;
-#ifndef __CINT__
+#ifndef __CLING__
     typedef            ::ValueVector<value_type>         self_type ;
     typedef  typename  std::vector<value_type>           collection_type ;
 #else
diff --git a/roottest/cling/template/longlong.C b/roottest/cling/template/longlong.C
index 7288d58b97867..f3b60e2edb287 100644
--- a/roottest/cling/template/longlong.C
+++ b/roottest/cling/template/longlong.C
@@ -7,7 +7,7 @@ private:
    ClassDef(Parameter,1);
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class Parameter<Long64_t>+;
 #pragma link C++ class Parameter<ULong64_t>+;
 #pragma link C++ class Parameter<long long>+;
diff --git a/roottest/cling/template/masterLinkDef.h b/roottest/cling/template/masterLinkDef.h
index 1512a8a435ee2..35f856e881790 100644
--- a/roottest/cling/template/masterLinkDef.h
+++ b/roottest/cling/template/masterLinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/cling/template/nesting.C b/roottest/cling/template/nesting.C
index f492e3d4e3420..4463ce7b2b467 100644
--- a/roottest/cling/template/nesting.C
+++ b/roottest/cling/template/nesting.C
@@ -3,7 +3,7 @@ class A {};
 template <class T> class B{};
 template <class T> class C {};
 
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link C++ class A+;
 #pragma link C++ class B<A*>+;
 #pragma link C++ class C<B<A*>*>+;
diff --git a/roottest/cling/template/separateDict/MasterLinkDef.hh b/roottest/cling/template/separateDict/MasterLinkDef.hh
index 7f2d530a72220..613f17efb0d96 100644
--- a/roottest/cling/template/separateDict/MasterLinkDef.hh
+++ b/roottest/cling/template/separateDict/MasterLinkDef.hh
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/cling/template/separateDict/Slave1LinkDef.hh b/roottest/cling/template/separateDict/Slave1LinkDef.hh
index 33d0b1e676ed8..0ec8d253d3742 100644
--- a/roottest/cling/template/separateDict/Slave1LinkDef.hh
+++ b/roottest/cling/template/separateDict/Slave1LinkDef.hh
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/cling/template/separateDict/Slave2LinkDef.hh b/roottest/cling/template/separateDict/Slave2LinkDef.hh
index e683e7de55f05..a39d36b57a3d4 100644
--- a/roottest/cling/template/separateDict/Slave2LinkDef.hh
+++ b/roottest/cling/template/separateDict/Slave2LinkDef.hh
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/cling/template/separateDictNamespace/MasterLinkDef.hh b/roottest/cling/template/separateDictNamespace/MasterLinkDef.hh
index 8b2e360d7ffad..cd6cc8752ca1b 100644
--- a/roottest/cling/template/separateDictNamespace/MasterLinkDef.hh
+++ b/roottest/cling/template/separateDictNamespace/MasterLinkDef.hh
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/cling/template/separateDictNamespace/Slave1LinkDef.hh b/roottest/cling/template/separateDictNamespace/Slave1LinkDef.hh
index 90eb1c8b349de..34937f34f181f 100644
--- a/roottest/cling/template/separateDictNamespace/Slave1LinkDef.hh
+++ b/roottest/cling/template/separateDictNamespace/Slave1LinkDef.hh
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/cling/template/separateDictNamespace/Slave2LinkDef.hh b/roottest/cling/template/separateDictNamespace/Slave2LinkDef.hh
index 6b41850d99132..382d9dfa9f04b 100644
--- a/roottest/cling/template/separateDictNamespace/Slave2LinkDef.hh
+++ b/roottest/cling/template/separateDictNamespace/Slave2LinkDef.hh
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/cling/template/slaveLinkDef.h b/roottest/cling/template/slaveLinkDef.h
index a40e4ae656cd1..d6719af3bb719 100644
--- a/roottest/cling/template/slaveLinkDef.h
+++ b/roottest/cling/template/slaveLinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/cling/template/smalltest.C b/roottest/cling/template/smalltest.C
index 76da95a88aca9..62910f33c5a9d 100644
--- a/roottest/cling/template/smalltest.C
+++ b/roottest/cling/template/smalltest.C
@@ -13,7 +13,7 @@ template <class T> Buffer& operator>>(Buffer &buf, Array<T> *&obj) {
   fprintf(stderr,"Array operator>>\n");
   return buf;
 }
-#elif defined(__CINT__)
+#elif defined(__CLING__)
 template <class Tmpl> Buffer &operator>>(Buffer &buf, Tmpl *&obj) {
   fprintf(stderr,"Generic operator>>\n");
   return buf;
diff --git a/roottest/cling/template/templatefriend.cxx b/roottest/cling/template/templatefriend.cxx
index 35cabdf781e50..5de13fbec3cc1 100755
--- a/roottest/cling/template/templatefriend.cxx
+++ b/roottest/cling/template/templatefriend.cxx
@@ -24,7 +24,7 @@ class my_shared_ptr
   // reference counting mechanism
    void PF(const char* func) {
       std::string clname;
-#if defined(__CINT__) || defined(_MSC_VER)
+#if defined(__CLING__) || defined(_MSC_VER)
       clname = T::ClassName();
 #else
       clname = __PRETTY_FUNCTION__;
@@ -54,7 +54,7 @@ class my_shared_ptr
   };
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class my_shared_ptr<Parent>+;
 #pragma link C++ class my_shared_ptr<Child>+;
 #endif
@@ -69,7 +69,7 @@ int templatefriend()
   return 0;
 }
 
-#ifndef __MAKECINT__
+#ifndef __ROOTCLING__
 int main() { return templatefriend(); }
 #endif
 
diff --git a/roottest/cling/template/typedef/cmspb_orig.C b/roottest/cling/template/typedef/cmspb_orig.C
index 88eed39b2c5a0..e6bd84b625a1e 100644
--- a/roottest/cling/template/typedef/cmspb_orig.C
+++ b/roottest/cling/template/typedef/cmspb_orig.C
@@ -472,7 +472,7 @@ typedef string cstring;
 # 13 "/home/wmtan/root/cint/stl/_string" 2
 
 
-// __MAKECINT__// __MAKECINT__
+// __ROOTCLING__// __ROOTCLING__
 # 63 "/home/wmtan/root/cint/stl/_string"
 
 
@@ -3269,7 +3269,7 @@ void G__list_memfunc(char *classname) {
 
 /* of G__TYPEINFO_H */
 
-/* __CINT__ */
+/* __CLING__ */
 # 2 "/home/wmtan/root/cint/include/typeinfo" 2
 
 }
diff --git a/roottest/cling/template/typenameTest.C b/roottest/cling/template/typenameTest.C
index 997fa85eee3d4..28773fab87852 100644
--- a/roottest/cling/template/typenameTest.C
+++ b/roottest/cling/template/typenameTest.C
@@ -23,7 +23,7 @@ template <class Config> class DecayDataT {
    
    };
 
-#ifdef __CINT__
+#ifdef __CLING__
 // This was necessary to work around a bug in 
 // the lookup code that prevented the class to use itself
 // to instantiate templates.
@@ -52,7 +52,7 @@ class  DefaultConfig {
    };
 
 ////// File alinkdef.h
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link C++ nestedclasses;
 #pragma link C++ nestedtypedefs;
diff --git a/roottest/cling/templateMembers/constructor.C b/roottest/cling/templateMembers/constructor.C
index 0d7d065577b06..58d224e97d062 100644
--- a/roottest/cling/templateMembers/constructor.C
+++ b/roottest/cling/templateMembers/constructor.C
@@ -19,7 +19,7 @@ struct A {
   template <class U>
    A(const U&) { 
       cout << "c'tor taking " << 
-#if defined(__CINT__) || defined(_MSC_VER)
+#if defined(_MSC_VER)
       nameof((U*)0)
 #else
       PF2cl(__PRETTY_FUNCTION__)
@@ -30,7 +30,7 @@ struct A {
   template <class U>
    void doit(const U&) { 
       cout << "doit taking " << 
-#if defined(__CINT__) || defined(_MSC_VER)
+#if defined(_MSC_VER)
       nameof((U*)0)
 #else
       PF2cl(__PRETTY_FUNCTION__)
@@ -40,7 +40,7 @@ struct A {
 
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class A+;
 #pragma link C++ class TemplateArgument+;
 #pragma link C++ function A::A(const TemplateArgument&);
diff --git a/roottest/cling/templateMembers/duplicate.C b/roottest/cling/templateMembers/duplicate.C
index 1898de3a6b8b7..0c79835f69602 100644
--- a/roottest/cling/templateMembers/duplicate.C
+++ b/roottest/cling/templateMembers/duplicate.C
@@ -38,7 +38,7 @@ public:
    template <class THType> THType *grab2(const char*) { return 0; };
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #pragma link C++ class HistMan;
 #pragma link C++ function HistMan::Book<TH1D>(const char*, const char*, int, Axis_t, Axis_t, const char*);
diff --git a/roottest/cling/templateMembers/operator.C b/roottest/cling/templateMembers/operator.C
index 5e56677d05bd6..def3e743c03ea 100644
--- a/roottest/cling/templateMembers/operator.C
+++ b/roottest/cling/templateMembers/operator.C
@@ -1,4 +1,4 @@
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 
 #endif
 
@@ -31,7 +31,7 @@ namespace edm {
    
 } // namespace edm
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ namespace edm; 
 #endif
 
diff --git a/roottest/cling/templateMembers/operatorEqual.C b/roottest/cling/templateMembers/operatorEqual.C
index 1b509b1ff9f28..d99883d4976c8 100644
--- a/roottest/cling/templateMembers/operatorEqual.C
+++ b/roottest/cling/templateMembers/operatorEqual.C
@@ -6,7 +6,7 @@ public:
     template<class X> StThreeVector<T>&  operator+= (const StThreeVector<X>&) { return *this; };
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class StThreeVector+;
 #pragma link C++ function StThreeVector<double>::func(float);
 #pragma link C++ function StThreeVector<double>::operator+=(const StThreeVector<float>&);
diff --git a/roottest/cling/templateMembers/runoperatorEqual.C b/roottest/cling/templateMembers/runoperatorEqual.C
index ec6bccdb60080..53fb4c83e862b 100644
--- a/roottest/cling/templateMembers/runoperatorEqual.C
+++ b/roottest/cling/templateMembers/runoperatorEqual.C
@@ -1,9 +1,5 @@
 {
 gSystem->Setenv("LINES","-1");
 gROOT->ProcessLine(".L operatorEqual.C+");
-#ifdef __CINT__
-gROOT->ProcessLine(".class StThreeVector");
-#else
 gROOT->ProcessLine(".Class StThreeVector<>");
-#endif
 }
diff --git a/roottest/cling/templateMembers/templateMembers.C b/roottest/cling/templateMembers/templateMembers.C
index ffb7dc620b903..7a9cf7bd20a58 100644
--- a/roottest/cling/templateMembers/templateMembers.C
+++ b/roottest/cling/templateMembers/templateMembers.C
@@ -1,4 +1,4 @@
 #include "templateMembersClasses.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #include "templateMembersLinkdef.h"
 #endif
diff --git a/roottest/cling/templateMembers/templateMembersClasses.h b/roottest/cling/templateMembers/templateMembersClasses.h
index 720d76ef6c069..b2c3d154de336 100644
--- a/roottest/cling/templateMembers/templateMembersClasses.h
+++ b/roottest/cling/templateMembers/templateMembersClasses.h
@@ -5,7 +5,7 @@
 
 using namespace std;
 
-#if defined(_MSC_VER) && !defined(__CINT__)
+#if defined(_MSC_VER) && !defined(__CLING__)
 #define SHOW std::cout << __FUNCSIG__ << std::endl;
 #define SHOWMEM std::cout << "Mem: "; SHOW
 #else
diff --git a/roottest/cling/typedef/func.C b/roottest/cling/typedef/func.C
index 21eca0dbe8319..e063ef611c940 100644
--- a/roottest/cling/typedef/func.C
+++ b/roottest/cling/typedef/func.C
@@ -12,7 +12,7 @@ typedef void (funcval)(int);
 // wrinting the prototype 'void val(int)'.
 extern funcval val; 
 
-#ifdef __CINT__
+#ifdef __CLING__
 funcptr ptr = func;
 #else
 funcptr ptr(func);
diff --git a/roottest/cling/typedef_global/LinkDef.h b/roottest/cling/typedef_global/LinkDef.h
index 8b7f2a6811db3..f1719c49507b5 100644
--- a/roottest/cling/typedef_global/LinkDef.h
+++ b/roottest/cling/typedef_global/LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link off all    globals;
 #pragma link off all    classes;
 #pragma link off all    functions;
diff --git a/roottest/python/cpp/Template.C b/roottest/python/cpp/Template.C
index a661a65afc3f1..c01c467939548 100644
--- a/roottest/python/cpp/Template.C
+++ b/roottest/python/cpp/Template.C
@@ -29,7 +29,7 @@ namespace MyNamespace {
    T MyTemplatedFunctionNamespace(T t) { return t; }
 };
 
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link C++ class MyTemplatedClass< vector< float > >;
 #pragma link C++ function MyTemplatedFunction< int >( int );
 #pragma link C++ function MyTemplatedFunction< double >( double );
@@ -103,6 +103,6 @@ template long MyTemplatedMethodClass::GetSizeOL< float >( const float& );
 typedef std::vector< double > MyDoubleVector_t;
 template long MyTemplatedMethodClass::GetSize< MyDoubleVector_t >();
 
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link C++ class MyTemplatedMethodClass;
 #endif
diff --git a/roottest/python/pickle/PickleTypes.C b/roottest/python/pickle/PickleTypes.C
index ad76f5e0c3c07..79df2dd90e855 100644
--- a/roottest/python/pickle/PickleTypes.C
+++ b/roottest/python/pickle/PickleTypes.C
@@ -10,7 +10,7 @@
 #include <vector>
 
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 using namespace std;
 #pragma link C++ class vector< vector< float > >;
 #pragma link C++ class vector< vector< float > >::iterator;
diff --git a/roottest/python/regression/LoKiNamespace.C b/roottest/python/regression/LoKiNamespace.C
index 621bcc28132e7..4efaf57a7cee3 100644
--- a/roottest/python/regression/LoKiNamespace.C
+++ b/roottest/python/regression/LoKiNamespace.C
@@ -11,7 +11,7 @@ namespace LoKi {
 
 } // namespace Loki
 
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link C++ class LoKi::Constant< const LHCb::Particle* >;
 #pragma link C++ class LoKi::BooleanConstant< const LHCb::Particle* >;
 #endif
diff --git a/roottest/python/stl/StlTypes.C b/roottest/python/stl/StlTypes.C
index efa32b791dc4c..edef078ba55cc 100644
--- a/roottest/python/stl/StlTypes.C
+++ b/roottest/python/stl/StlTypes.C
@@ -91,7 +91,7 @@ namespace {
    std::list< JustAClass >    jl1;
 }
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 using namespace std;  // instead of std:: to make cint7 happy
 #pragma link C++ class vector< JustAClass >-;
 #pragma link C++ class vector< JustAClass >::iterator-;
diff --git a/roottest/python/ttree/TTreeTypes.C b/roottest/python/ttree/TTreeTypes.C
index c1ee7d3417bf6..b3d03ef0eeff2 100644
--- a/roottest/python/ttree/TTreeTypes.C
+++ b/roottest/python/ttree/TTreeTypes.C
@@ -11,7 +11,7 @@
 #include "TH1D.h"
 #include "TTree.h"
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class std::vector< vector< float > >;
 #pragma link C++ class std::vector< vector< float > >::iterator;
 #pragma link C++ class std::vector< vector< float > >::const_iterator;
diff --git a/roottest/root/aclic/misc/assertmyfun.cxx b/roottest/root/aclic/misc/assertmyfun.cxx
index 67107726fe26e..28b6349d6a898 100644
--- a/roottest/root/aclic/misc/assertmyfun.cxx
+++ b/roottest/root/aclic/misc/assertmyfun.cxx
@@ -9,7 +9,7 @@ class MyFCN: public ROOT::Fit::Chi2Function{
     ~MyFCN(){}
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class MyFCN-;
 #endif
 
diff --git a/roottest/root/collection/runTExMap.C b/roottest/root/collection/runTExMap.C
index 1c41a1c4d6017..416c4487e1bc0 100644
--- a/roottest/root/collection/runTExMap.C
+++ b/roottest/root/collection/runTExMap.C
@@ -1,4 +1,4 @@
-#ifndef __CINT__
+#ifndef __CLING__
 
 #include "TExMap.h"
 #include "Riostream.h"
diff --git a/roottest/root/collection/runTMap.C b/roottest/root/collection/runTMap.C
index 47166789bd779..1cc6aaa3a39d9 100644
--- a/roottest/root/collection/runTMap.C
+++ b/roottest/root/collection/runTMap.C
@@ -1,6 +1,6 @@
 // Test object (key,value) ownership behaviour of TMap.
 
-#if !defined(__CINT__) || defined(__MAKECINT__)
+#if !defined(__CLING__) || defined(__ROOTCLING__)
 #include "TObjString.h"
 #include "TMap.h"
 #include "TObjectSpy.h"
diff --git a/roottest/root/collection/runtbits.C b/roottest/root/collection/runtbits.C
index 0eee3410532cb..e0d3ce5518d21 100644
--- a/roottest/root/collection/runtbits.C
+++ b/roottest/root/collection/runtbits.C
@@ -2,7 +2,7 @@
 #include "Riostream.h"
 #include "TRandom.h"
 
-#ifndef __CINT__
+#ifndef __CLING__
 #include <bitset>
 using namespace std;
 #endif
diff --git a/roottest/root/fit/linear/runstoring.C b/roottest/root/fit/linear/runstoring.C
index 12c790524af66..8eb5724f813b2 100644
--- a/roottest/root/fit/linear/runstoring.C
+++ b/roottest/root/fit/linear/runstoring.C
@@ -6,9 +6,6 @@
 
 void writefitter()
 {
-#ifdef __CINT__
-   G__SetCatchException(0);  
-#endif
    Int_t npoints = 100;
    Int_t ndim = 3;
    TFormula *f = new TFormula("f", "x[0]++x[1]++x[2]");
@@ -43,9 +40,6 @@ void writefitter()
 
 void readfitter()
 {
-#ifdef __CINT__
-   // G__SetCatchException(0);
-#endif
    TVectorD vect;  
    TFile *f = TFile::Open("linfitter.root");
    if (!f) return;
@@ -102,9 +96,6 @@ void readfitter()
 
 void writeformula()
 {
-#ifdef __CINT__
-   G__SetCatchException(0);  
-#endif
    TFormula *f = new TFormula("ffffff", "x[0]++x[1]++x[2]");
 
     TFile *file = TFile::Open("formula.root", "RECREATE");
diff --git a/roottest/root/io/ForeignCArray/LinkDef.h b/roottest/root/io/ForeignCArray/LinkDef.h
index 0ce87d4386cae..7dae9d12b56e3 100644
--- a/roottest/root/io/ForeignCArray/LinkDef.h
+++ b/roottest/root/io/ForeignCArray/LinkDef.h
@@ -1,5 +1,5 @@
 
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/abstractclass/LinkDef.h b/roottest/root/io/abstractclass/LinkDef.h
index 12682c3c6ffc0..e5d628d82af7f 100644
--- a/roottest/root/io/abstractclass/LinkDef.h
+++ b/roottest/root/io/abstractclass/LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/abstractclass/abstractInVector.C b/roottest/root/io/abstractclass/abstractInVector.C
index ebbeb5e4fd8a0..b3570b02b19d2 100644
--- a/roottest/root/io/abstractclass/abstractInVector.C
+++ b/roottest/root/io/abstractclass/abstractInVector.C
@@ -80,7 +80,7 @@ bool abstractInVector() {
    return false;
 }
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class SimuModule+;
 #pragma link C++ class Module+;
 #pragma link C++ class SimuModuleFactory+;
diff --git a/roottest/root/io/alloc/customLoader.C b/roottest/root/io/alloc/customLoader.C
index 0b210b45938be..61435bafcaa7a 100644
--- a/roottest/root/io/alloc/customLoader.C
+++ b/roottest/root/io/alloc/customLoader.C
@@ -1,4 +1,4 @@
 #include "customConstructor.C"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #include "linkdef.h"
 #endif
diff --git a/roottest/root/io/arrayobject/fooLinkdef.h b/roottest/root/io/arrayobject/fooLinkdef.h
index b1147a750cccd..d3afcc91345e7 100644
--- a/roottest/root/io/arrayobject/fooLinkdef.h
+++ b/roottest/root/io/arrayobject/fooLinkdef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/arrayobject/main.C b/roottest/root/io/arrayobject/main.C
index b46effa526076..598597fa5ba82 100644
--- a/roottest/root/io/arrayobject/main.C
+++ b/roottest/root/io/arrayobject/main.C
@@ -130,7 +130,7 @@ int run() {
 
 }
 
-#ifndef __CINT__
+#ifndef __CLING__
 int
 main()
 {
diff --git a/roottest/root/io/bigevent/EventLinkDef.h b/roottest/root/io/bigevent/EventLinkDef.h
index e71db4fc6795d..eaa9ea3ce0175 100644
--- a/roottest/root/io/bigevent/EventLinkDef.h
+++ b/roottest/root/io/bigevent/EventLinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 //#ppragma link off all globals;
 //#ppragma link off all classes;
diff --git a/roottest/root/io/bill01/LinkDef.h b/roottest/root/io/bill01/LinkDef.h
index e51e03b23d8b8..1fbe8e75fc0c5 100644
--- a/roottest/root/io/bill01/LinkDef.h
+++ b/roottest/root/io/bill01/LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/bill02/LinkDef.h b/roottest/root/io/bill02/LinkDef.h
index 8c59bac56e210..f16d26882125d 100644
--- a/roottest/root/io/bill02/LinkDef.h
+++ b/roottest/root/io/bill02/LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/buffer/runownership.C b/roottest/root/io/buffer/runownership.C
index 3ab002375caad..397ab5e77aba2 100644
--- a/roottest/root/io/buffer/runownership.C
+++ b/roottest/root/io/buffer/runownership.C
@@ -3,7 +3,6 @@
 #include "TString.h"
 #include <exception>
 
-#ifndef __CINT__
 class myexception
    {
    public:
@@ -15,7 +14,6 @@ class myexception
          return fMsg.Data();
       }
    };
-#endif
 
 void NonDefaultErrorHandler(Int_t level, Bool_t abort_bool, const char *location, const char *msg)
 {
diff --git a/roottest/root/io/clones/RtObjLinkDef.h b/roottest/root/io/clones/RtObjLinkDef.h
index d9abedbba248e..e6c26bd0fee88 100644
--- a/roottest/root/io/clones/RtObjLinkDef.h
+++ b/roottest/root/io/clones/RtObjLinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/constmembers/LinkDef.h b/roottest/root/io/constmembers/LinkDef.h
index 401a8ed7f2e74..e7f67dd1f836c 100644
--- a/roottest/root/io/constmembers/LinkDef.h
+++ b/roottest/root/io/constmembers/LinkDef.h
@@ -1,5 +1,5 @@
 //LinkDef.h
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/constmembers/oldLinkDef.h b/roottest/root/io/constmembers/oldLinkDef.h
index 3263b2b772650..e71bbb77baa3d 100644
--- a/roottest/root/io/constmembers/oldLinkDef.h
+++ b/roottest/root/io/constmembers/oldLinkDef.h
@@ -1,5 +1,5 @@
 //LinkDef.h
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/customCollection/execWriteCustomCollection.cxx b/roottest/root/io/customCollection/execWriteCustomCollection.cxx
index a3e9003614c70..74689cb60ebd4 100644
--- a/roottest/root/io/customCollection/execWriteCustomCollection.cxx
+++ b/roottest/root/io/customCollection/execWriteCustomCollection.cxx
@@ -61,7 +61,7 @@ class DataVectorConcrete {
 typedef DataVectorTmplt<Content> DataVector;
 
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class DataVectorTmplt<Content>+;
 #pragma link C++ class vector<Content>+;
 #pragma link C++ class DataVector+;
diff --git a/roottest/root/io/customStreamer/header.C b/roottest/root/io/customStreamer/header.C
index bbafbebee7b4c..3fb713dda8e10 100644
--- a/roottest/root/io/customStreamer/header.C
+++ b/roottest/root/io/customStreamer/header.C
@@ -1,11 +1,11 @@
 #include "header.h"
 #include "Rtypes.h"
 
-#ifndef __CINT__
+#ifndef __CLING__
 RootClassVersion(Hard2Stream,2);
 #endif
 
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link C++ class Hard2Stream-;
 #endif
 
diff --git a/roottest/root/io/customStreamer/header.h b/roottest/root/io/customStreamer/header.h
index 7ead7012b8841..f9b0df83e7a64 100644
--- a/roottest/root/io/customStreamer/header.h
+++ b/roottest/root/io/customStreamer/header.h
@@ -2,9 +2,7 @@
 #include "TClass.h"
 class Hard2Stream {
 private:
-#ifndef __CINT__
    double val;
-#endif
 public:
    Hard2Stream() : val(-1) {};
    Hard2Stream(double v) : val(v) {};
diff --git a/roottest/root/io/datamodelevolution/00/DataModelV1.h b/roottest/root/io/datamodelevolution/00/DataModelV1.h
index abffbef2dbd04..ebd64191f3c68 100644
--- a/roottest/root/io/datamodelevolution/00/DataModelV1.h
+++ b/roottest/root/io/datamodelevolution/00/DataModelV1.h
@@ -95,7 +95,7 @@ class Container {
 };
 
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ options=version(8) class ACache+;
 #pragma link C++ options=version(2) class Container+;
 #pragma link C++ class Unversioned+;
diff --git a/roottest/root/io/datamodelevolution/00/DataModelV2.h b/roottest/root/io/datamodelevolution/00/DataModelV2.h
index b5d978a5280a0..f2b45df7283ac 100644
--- a/roottest/root/io/datamodelevolution/00/DataModelV2.h
+++ b/roottest/root/io/datamodelevolution/00/DataModelV2.h
@@ -49,7 +49,7 @@ class Container {
    ACache a;
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ options=version(9) class ACache+;
 #pragma read sourceClass="ACache" targetClass="ACache" source="int x; int y; char c"  version="[8]" target="z" include="TMath.h,math.h" \
    code="{ z = onfile.x*1000 + onfile.y*10; }"
diff --git a/roottest/root/io/datamodelevolution/00/DataModelV3.h b/roottest/root/io/datamodelevolution/00/DataModelV3.h
index b164e8a99c1d3..2ab7aad2b56a1 100755
--- a/roottest/root/io/datamodelevolution/00/DataModelV3.h
+++ b/roottest/root/io/datamodelevolution/00/DataModelV3.h
@@ -46,7 +46,7 @@ class Container {
 };
 
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++  options=version(2) class Axis+;
 #pragma read sourceClass="ACache" targetClass="Axis" source="int x; int y;"  version="[8]" target="z" \
    code="{ z = onfile.x*1000 + onfile.y*10; }"
diff --git a/roottest/root/io/datamodelevolution/01/DataModelV1LinkDef.h b/roottest/root/io/datamodelevolution/01/DataModelV1LinkDef.h
index 5ba3e38a0fc91..11420331b57a8 100644
--- a/roottest/root/io/datamodelevolution/01/DataModelV1LinkDef.h
+++ b/roottest/root/io/datamodelevolution/01/DataModelV1LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/datamodelevolution/01/DataModelV2LinkDef.h b/roottest/root/io/datamodelevolution/01/DataModelV2LinkDef.h
index 6d7b54a0d44ed..d37fb6ccb1bb6 100644
--- a/roottest/root/io/datamodelevolution/01/DataModelV2LinkDef.h
+++ b/roottest/root/io/datamodelevolution/01/DataModelV2LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/datamodelevolution/cms-00/DataModelV1LinkDef.h b/roottest/root/io/datamodelevolution/cms-00/DataModelV1LinkDef.h
index 00ea20588b8ef..22540cddd71d8 100644
--- a/roottest/root/io/datamodelevolution/cms-00/DataModelV1LinkDef.h
+++ b/roottest/root/io/datamodelevolution/cms-00/DataModelV1LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/datamodelevolution/cms-00/DataModelV2LinkDef.h b/roottest/root/io/datamodelevolution/cms-00/DataModelV2LinkDef.h
index cfe6feb33cbdf..252f20308dc4a 100644
--- a/roottest/root/io/datamodelevolution/cms-00/DataModelV2LinkDef.h
+++ b/roottest/root/io/datamodelevolution/cms-00/DataModelV2LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/datamodelevolution/cms-00/classloader.cxx b/roottest/root/io/datamodelevolution/cms-00/classloader.cxx
index af36fd5f44e19..b0085180ae270 100644
--- a/roottest/root/io/datamodelevolution/cms-00/classloader.cxx
+++ b/roottest/root/io/datamodelevolution/cms-00/classloader.cxx
@@ -7,7 +7,7 @@
 //        Author     : M.Frank
 //====================================================================
 
-#ifndef __CINT__
+#ifndef __CLING__
 #include "Cintex/Cintex.h"
 #endif
 #include "Reflex/Reflex.h"
@@ -21,7 +21,7 @@
 #include "TDataMember.h"
 
 #include "TCollectionProxyFactory.h"
-#ifndef __CINT__
+#ifndef __CLING__
 #include "Api.h"
 #endif
 
@@ -45,7 +45,7 @@ void patchClass(TClass* cl, TypeH& ) {
 #include <utility>
 #include <vector>
 
-#ifndef __CINT__
+#ifndef __CLING__
 namespace ROOT { namespace Cintex  {
   bool IsSTLinternal(const std::string& nam);
   bool IsSTL(const std::string& nam);
diff --git a/roottest/root/io/datamodelevolution/cms-00/execReadRename1.cxx b/roottest/root/io/datamodelevolution/cms-00/execReadRename1.cxx
index d89535fc59080..0fc81cb2c8414 100644
--- a/roottest/root/io/datamodelevolution/cms-00/execReadRename1.cxx
+++ b/roottest/root/io/datamodelevolution/cms-00/execReadRename1.cxx
@@ -16,7 +16,7 @@ class Flow {
    ClassDefNV(Flow,4);
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma read sourceClass="Flow" targetClass="Flow" version="[2]" source="float charged" target="sumCharged" code="{ sumCharged = onfile.charged; }"
 #pragma read sourceClass="Flow" targetClass="Flow" version="[2]" source="float neutral" target="sumNeutral" code="{ sumNeutral = onfile.neutral; }"
 #endif
diff --git a/roottest/root/io/datamodelevolution/cms-00/execReadRename2.cxx b/roottest/root/io/datamodelevolution/cms-00/execReadRename2.cxx
index 57464f944a0c5..da351b154fd1d 100644
--- a/roottest/root/io/datamodelevolution/cms-00/execReadRename2.cxx
+++ b/roottest/root/io/datamodelevolution/cms-00/execReadRename2.cxx
@@ -18,7 +18,7 @@ class Flow {
    ClassDefNV(Flow,3);
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma read sourceClass="Flow" targetClass="Flow" version="[2]" source="float charged" target="sumCharged" code="{ sumCharged = onfile.charged; }"
 #endif
 
diff --git a/roottest/root/io/datamodelevolution/common/Demangler.h b/roottest/root/io/datamodelevolution/common/Demangler.h
index fc00108aee284..17f6c600cf686 100644
--- a/roottest/root/io/datamodelevolution/common/Demangler.h
+++ b/roottest/root/io/datamodelevolution/common/Demangler.h
@@ -11,7 +11,7 @@
 #include <typeinfo>
 #include <string>
 
-#if !defined(_WIN32) && !defined(__CINT__)
+#if !defined(_WIN32)
 #include <cxxabi.h>
 #endif
 
diff --git a/roottest/root/io/datamodelevolution/misc/MyClass_linkdef.h b/roottest/root/io/datamodelevolution/misc/MyClass_linkdef.h
index 1b25fbe030b0c..837882399e553 100644
--- a/roottest/root/io/datamodelevolution/misc/MyClass_linkdef.h
+++ b/roottest/root/io/datamodelevolution/misc/MyClass_linkdef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/roottest/root/io/datamodelevolution/misc/OrderClass_v1.h b/roottest/root/io/datamodelevolution/misc/OrderClass_v1.h
index 253ca289da444..16f409f725d2d 100644
--- a/roottest/root/io/datamodelevolution/misc/OrderClass_v1.h
+++ b/roottest/root/io/datamodelevolution/misc/OrderClass_v1.h
@@ -23,7 +23,7 @@ class MyClass : public TObject
    ClassDefOverride(MyClass, 1)
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class MyClass+;
 #endif
 
diff --git a/roottest/root/io/datamodelevolution/misc/OrderClass_v2.h b/roottest/root/io/datamodelevolution/misc/OrderClass_v2.h
index 9e6d5a8f8fb97..d6dc51b66a5c3 100644
--- a/roottest/root/io/datamodelevolution/misc/OrderClass_v2.h
+++ b/roottest/root/io/datamodelevolution/misc/OrderClass_v2.h
@@ -21,7 +21,7 @@ class MyClass : public TObject
    ClassDefOverride(MyClass, 2)
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class MyClass+;
 
 #pragma read sourceClass="MyClass" version="[1]" source="int ver" \
diff --git a/roottest/root/io/datamodelevolution/misc/arrayRulesLinkDef.h b/roottest/root/io/datamodelevolution/misc/arrayRulesLinkDef.h
index 8f37ffe48abcf..5ae8e0e094a4e 100644
--- a/roottest/root/io/datamodelevolution/misc/arrayRulesLinkDef.h
+++ b/roottest/root/io/datamodelevolution/misc/arrayRulesLinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class MyClass+;
 #pragma read sourceClass="MyClass" targetClass="MyClass" source="" target="fCaches" code="{ newObj->fCaches[0] = 1; }"
 #pragma read sourceClass="MyClass" targetClass="MyClass" source="float fOldCaches[3]" target="fCaches"  code="{ newObj->fCaches[0] = onfile.fOldCaches[0]; }"
diff --git a/roottest/root/io/datamodelevolution/stl/libcond.patch b/roottest/root/io/datamodelevolution/stl/libcond.patch
index 9cea66f1298b5..92b1ef3265042 100644
--- a/roottest/root/io/datamodelevolution/stl/libcond.patch
+++ b/roottest/root/io/datamodelevolution/stl/libcond.patch
@@ -11,7 +11,7 @@
   #include "Riostream.h"
   #include <map>
   #include "HepGeom__Transform3D.h"
-  #ifdef __MAKECINT__
+  #ifdef __ROOTCLING__
   #pragma link C++ class pair<string,HepGeom::Transform3D >+;
 + #pragma link C++ class Eigen+;
 + #pragma link C++ class pair<string,Eigen>+;
diff --git a/roottest/root/io/datamodelevolution/stl/libcond/DetCondKeyTrans.h b/roottest/root/io/datamodelevolution/stl/libcond/DetCondKeyTrans.h
index d60a050dbd238..f942ae77e5a97 100644
--- a/roottest/root/io/datamodelevolution/stl/libcond/DetCondKeyTrans.h
+++ b/roottest/root/io/datamodelevolution/stl/libcond/DetCondKeyTrans.h
@@ -13,7 +13,7 @@ class Eigen {};
 #include "Riostream.h"
 #include <map>
 #include "HepGeom__Transform3D.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class pair<string,HepGeom::Transform3D >+;
 #pragma link C++ class Eigen+;
 #pragma link C++ class pair<string,Eigen>+;
diff --git a/roottest/root/io/datamodelevolution/stl/libcond/libcondLinkDef.h b/roottest/root/io/datamodelevolution/stl/libcond/libcondLinkDef.h
index ce80d0f4a3adc..069aa34b25945 100644
--- a/roottest/root/io/datamodelevolution/stl/libcond/libcondLinkDef.h
+++ b/roottest/root/io/datamodelevolution/stl/libcond/libcondLinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link C++ class DetCondKeyTrans+;
 #pragma link C++ class HepGeom::Transform3D+;
diff --git a/roottest/root/io/datamodelevolution/stl/readFile.C b/roottest/root/io/datamodelevolution/stl/readFile.C
index a8ed4d374fbf6..10e17fd3ef4cb 100644
--- a/roottest/root/io/datamodelevolution/stl/readFile.C
+++ b/roottest/root/io/datamodelevolution/stl/readFile.C
@@ -37,7 +37,7 @@ public:
 typedef Track Values;
 #endif
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma read sourceClass="Values" targetClass="Track";
 #pragma link C++ class vector<Track>+;
 #pragma read sourceClass="Holder" targetClass="listHolder";
diff --git a/roottest/root/io/datamodelevolution/stl/writeFile.C b/roottest/root/io/datamodelevolution/stl/writeFile.C
index 2ba907260f8d3..28d6a82db4acd 100644
--- a/roottest/root/io/datamodelevolution/stl/writeFile.C
+++ b/roottest/root/io/datamodelevolution/stl/writeFile.C
@@ -71,7 +71,7 @@ void Print(const std::map<key,value> &fMap) {
    }
 }
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma read sourceClass="Holder" targetClass="listHolder";
 #endif
 
diff --git a/roottest/root/io/double32/other.C b/roottest/root/io/double32/other.C
index 0a5f0dd1ede2c..de94c0646e812 100644
--- a/roottest/root/io/double32/other.C
+++ b/roottest/root/io/double32/other.C
@@ -1,6 +1,6 @@
 #include "runtemplate32.h"
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class MyVector<double>+;
 #endif
 
diff --git a/roottest/root/io/double32/runtemplate32.C b/roottest/root/io/double32/runtemplate32.C
index 457834c8cf1c4..c6e5558ab1658 100644
--- a/roottest/root/io/double32/runtemplate32.C
+++ b/roottest/root/io/double32/runtemplate32.C
@@ -1,7 +1,7 @@
 #include "runtemplate32.h"
 #include "longExample.h"
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class WithDouble+;
 #pragma link C++ class MyVector<Double32_t>+;
 #pragma link C++ class MyVector<float>+;
diff --git a/roottest/root/io/emulated/abstract.h b/roottest/root/io/emulated/abstract.h
index cdabbad5d30aa..4ec3ab430b7e8 100644
--- a/roottest/root/io/emulated/abstract.h
+++ b/roottest/root/io/emulated/abstract.h
@@ -13,7 +13,7 @@ class Abstract {
    virtual void Action() = 0;
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class Abstract+;
 #endif
 
diff --git a/roottest/root/io/emulated/classes.h b/roottest/root/io/emulated/classes.h
index 87fca8559acdc..7e22cfac6043f 100644
--- a/roottest/root/io/emulated/classes.h
+++ b/roottest/root/io/emulated/classes.h
@@ -143,7 +143,7 @@ class Holder {
    ClassDef(Holder,2);
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vector<TopLevel*>;
 #endif
 
diff --git a/roottest/root/io/emulated/marker.h b/roottest/root/io/emulated/marker.h
index bd75698750b27..1a95008e0ab66 100644
--- a/roottest/root/io/emulated/marker.h
+++ b/roottest/root/io/emulated/marker.h
@@ -25,7 +25,7 @@ class Marker
    ClassDef(Marker,2);
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class Marker+;
 #endif
 
diff --git a/roottest/root/io/emulated/write.C b/roottest/root/io/emulated/write.C
index 752aa085e5bec..571c512bb5730 100644
--- a/roottest/root/io/emulated/write.C
+++ b/roottest/root/io/emulated/write.C
@@ -1,4 +1,4 @@
-#if defined(__CLING__) && !defined(__MAKECINT__) && !defined(ClingWorkAroundMissingSmartInclude)
+#if defined(__CLING__) && !defined(__ROOTCLING__) && !defined(ClingWorkAroundMissingSmartInclude)
 #include "classes.h+"
 #else
 #include "classes.h"
diff --git a/roottest/root/io/evolution/ClassConvNew.cxx b/roottest/root/io/evolution/ClassConvNew.cxx
index e26dd8f2a909b..b0504946391e5 100644
--- a/roottest/root/io/evolution/ClassConvNew.cxx
+++ b/roottest/root/io/evolution/ClassConvNew.cxx
@@ -1,6 +1,6 @@
 #define VERSION 2
 #include "ClassConv.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ namespace MyLib;
 #pragma link C++ class MyLib::Inside+;
 #pragma link C++ class TopLevel+;
diff --git a/roottest/root/io/evolution/ClassConvOld.cxx b/roottest/root/io/evolution/ClassConvOld.cxx
index d12298c346d18..f2b6f9f927feb 100644
--- a/roottest/root/io/evolution/ClassConvOld.cxx
+++ b/roottest/root/io/evolution/ClassConvOld.cxx
@@ -1,6 +1,6 @@
 #define VERSION 1
 #include "ClassConv.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class Inside+;
 #pragma link C++ class TopLevel+;
 #pragma link C++ class Typedefed+;
diff --git a/roottest/root/io/evolution/ClassConvOther.cxx b/roottest/root/io/evolution/ClassConvOther.cxx
index b4678af293175..3a743e6fda009 100644
--- a/roottest/root/io/evolution/ClassConvOther.cxx
+++ b/roottest/root/io/evolution/ClassConvOther.cxx
@@ -1,6 +1,6 @@
 #define VERSION 3
 #include "ClassConv.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ namespace OtherLib;
 #pragma link C++ class OtherLib::Inside+;
 #pragma link C++ class TopLevel+;
diff --git a/roottest/root/io/evolution/MyClass.C b/roottest/root/io/evolution/MyClass.C
index e49b36e62b631..b73ff8952b1f2 100644
--- a/roottest/root/io/evolution/MyClass.C
+++ b/roottest/root/io/evolution/MyClass.C
@@ -1,5 +1,5 @@
 #define VERSION 2
 #include "MyClass.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class MyClass+;
 #endif
diff --git a/roottest/root/io/evolution/array/MyClass.cxx b/roottest/root/io/evolution/array/MyClass.cxx
index 354c66bc73d6c..7fc3d5ba690c3 100644
--- a/roottest/root/io/evolution/array/MyClass.cxx
+++ b/roottest/root/io/evolution/array/MyClass.cxx
@@ -84,6 +84,6 @@ void MyClass::SetArray(Int_t* array){
 }
 #endif
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class MyClass+;
 #endif
diff --git a/roottest/root/io/evolution/array/MyClassOld.cxx b/roottest/root/io/evolution/array/MyClassOld.cxx
index 5c94c01a68f71..7d70d7d7a7f28 100644
--- a/roottest/root/io/evolution/array/MyClassOld.cxx
+++ b/roottest/root/io/evolution/array/MyClassOld.cxx
@@ -1,7 +1,7 @@
 #define MYCLASS 2
 #include "MyClass.cxx"
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 // to be included only if compiling the new version of the class
 #pragma read sourceClass="MyClass" targetClass="MyClass" \
 source="Int_t farray[5]" version="[1]" target="fentries, farrayPointer" targetType="Int_t*, Int_t" \
diff --git a/roottest/root/io/evolution/numerical_conversions/float16.h b/roottest/root/io/evolution/numerical_conversions/float16.h
index 1e70efd49f930..56298017d3ec1 100644
--- a/roottest/root/io/evolution/numerical_conversions/float16.h
+++ b/roottest/root/io/evolution/numerical_conversions/float16.h
@@ -230,7 +230,7 @@ bool readfile(const char *filename, Bool_t checkValue = kTRUE)
    }
 }
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class myclass+;
 #pragma link C++ function readfile;
 #pragma link C++ function write;
diff --git a/roottest/root/io/evolution/pragma_read/v1/AliAODForwardMultLinkDef.h b/roottest/root/io/evolution/pragma_read/v1/AliAODForwardMultLinkDef.h
index bd28a132ca173..3ebce32293ddc 100644
--- a/roottest/root/io/evolution/pragma_read/v1/AliAODForwardMultLinkDef.h
+++ b/roottest/root/io/evolution/pragma_read/v1/AliAODForwardMultLinkDef.h
@@ -1,4 +1,4 @@
-#if !defined( __MAKECINT__ ) && !defined(__CLING__)
+#if !defined( __ROOTCLING__ ) && !defined(__CLING__)
 # error Not for compilation
 #else
 
diff --git a/roottest/root/io/evolution/pragma_read/v2/AliAODForwardMultLinkDef.h b/roottest/root/io/evolution/pragma_read/v2/AliAODForwardMultLinkDef.h
index e3595d5640fba..ca9c5c426958b 100644
--- a/roottest/root/io/evolution/pragma_read/v2/AliAODForwardMultLinkDef.h
+++ b/roottest/root/io/evolution/pragma_read/v2/AliAODForwardMultLinkDef.h
@@ -1,4 +1,4 @@
-#if !defined( __MAKECINT__ ) && !defined(__CLING__)
+#if !defined( __ROOTCLING__ ) && !defined(__CLING__)
 # error Not for compilation
 #else
 
diff --git a/roottest/root/io/evolution/stl_conversions/maptovector.h b/roottest/root/io/evolution/stl_conversions/maptovector.h
index ad41bffa0fa6a..1527ac8dbc149 100644
--- a/roottest/root/io/evolution/stl_conversions/maptovector.h
+++ b/roottest/root/io/evolution/stl_conversions/maptovector.h
@@ -120,7 +120,7 @@ bool readfile(const char *filename, Bool_t checkValue = kTRUE)
    }
 }
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class myclass+;
 // #pragma link C++ class pair<int,double>+;
 #pragma link C++ function readfile;
diff --git a/roottest/root/io/evolution/typedefWrite.C b/roottest/root/io/evolution/typedefWrite.C
index 66e4b7059ffb1..4b470b1c379b5 100644
--- a/roottest/root/io/evolution/typedefWrite.C
+++ b/roottest/root/io/evolution/typedefWrite.C
@@ -9,7 +9,7 @@ typedef list<UHTDecay> DecayListType;
 class UHTTimeFitter : public TObject{
  public:
 
-#if defined(__CINT__) && 0
+#if defined(__CLING__) && 0
   list<UHTDecay> decayList;
 #else
   DecayListType decayList;
diff --git a/roottest/root/io/evolution/versions/myclass.h b/roottest/root/io/evolution/versions/myclass.h
index 341a04bccaf57..5a8dbced4ddd2 100644
--- a/roottest/root/io/evolution/versions/myclass.h
+++ b/roottest/root/io/evolution/versions/myclass.h
@@ -23,7 +23,7 @@ class MyClass {
 
 #include "TFile.h"
 
-#ifndef __CINT__
+#ifndef __CLING__
 #if VERSION==3
 RootClassVersion(MyClass,3)
 #endif
diff --git a/roottest/root/io/evolution/versions/veclong64.h b/roottest/root/io/evolution/versions/veclong64.h
index 4ea99e118b096..585765a6fae95 100644
--- a/roottest/root/io/evolution/versions/veclong64.h
+++ b/roottest/root/io/evolution/versions/veclong64.h
@@ -58,7 +58,7 @@ int write_what(const char * /* version */) {
    return writefile();
 }
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class MyClass+;
 #pragma link C++ function writefile;
 #pragma link C++ function readfile;
diff --git a/roottest/root/io/heritstl/classes.C b/roottest/root/io/heritstl/classes.C
index 28a090dc072da..509308f86e7d5 100644
--- a/roottest/root/io/heritstl/classes.C
+++ b/roottest/root/io/heritstl/classes.C
@@ -64,6 +64,3 @@ void testing() {
    f->Close();
 }
 
-#ifndef __CINT__
-#endif
-
diff --git a/roottest/root/io/heritstl/minostest_linkdef.h b/roottest/root/io/heritstl/minostest_linkdef.h
index 5807374a3eb6b..8b098bb33303b 100644
--- a/roottest/root/io/heritstl/minostest_linkdef.h
+++ b/roottest/root/io/heritstl/minostest_linkdef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link C++ class vector<SEIdAltLItem>+;
 #pragma link C++ class SEIdAltL+;
diff --git a/roottest/root/io/namespacedict/Header.h b/roottest/root/io/namespacedict/Header.h
index 673b80fb1f074..34f53240fc8a1 100644
--- a/roottest/root/io/namespacedict/Header.h
+++ b/roottest/root/io/namespacedict/Header.h
@@ -12,11 +12,11 @@ namespace A {
       Class2();
       virtual ~Class2();
    public:
-#ifdef WIN32
-      ClassDef(Class2,1) //
-#else
-      ClassDef(A::Class2<T>,1) //
-#endif
+#ifdef WIN32
+      ClassDef(Class2,1) //
+#else
+      ClassDef(A::Class2<T>,1) //
+#endif
    };
    
 }
@@ -24,13 +24,13 @@ namespace A {
 namespace B {
    class Class3 : public A::Class2<A::Class1>
    {
-#ifdef WIN32
-	   ClassDef(Class3,1) //
-#else
-	   ClassDef(B::Class3,1) //
+#ifdef WIN32
+	   ClassDef(Class3,1) //
+#else
+	   ClassDef(B::Class3,1) //
 #endif
    };
 };
 
-TBuffer &operator>>(TBuffer &,A::Class2<A::Class1> *&);
-TBuffer &operator<<(TBuffer &,A::Class2<A::Class1> *);
+TBuffer &operator>>(TBuffer &,A::Class2<A::Class1> *&);
+TBuffer &operator<<(TBuffer &,A::Class2<A::Class1> *);
diff --git a/roottest/root/io/namespacedict/Linkdef.h b/roottest/root/io/namespacedict/Linkdef.h
index 230ac92a3ac9f..429deee87735c 100644
--- a/roottest/root/io/namespacedict/Linkdef.h
+++ b/roottest/root/io/namespacedict/Linkdef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/namespacedict/TeleLinkdef.h b/roottest/root/io/namespacedict/TeleLinkdef.h
index cc9d5b77f2150..e4ec7cd2521d4 100644
--- a/roottest/root/io/namespacedict/TeleLinkdef.h
+++ b/roottest/root/io/namespacedict/TeleLinkdef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/newClassDef/current/InheritMultilinkdef.h b/roottest/root/io/newClassDef/current/InheritMultilinkdef.h
index 58fd1baf0ccb7..ce6f24b2ebd68 100644
--- a/roottest/root/io/newClassDef/current/InheritMultilinkdef.h
+++ b/roottest/root/io/newClassDef/current/InheritMultilinkdef.h
@@ -1,6 +1,6 @@
 // File Automatically generated by the ROOT Script Compiler
 
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/newClassDef/current/namespace.C b/roottest/root/io/newClassDef/current/namespace.C
index a002364a44264..0c1b61190dd18 100644
--- a/roottest/root/io/newClassDef/current/namespace.C
+++ b/roottest/root/io/newClassDef/current/namespace.C
@@ -1,7 +1,7 @@
 #include "namespace.h"
 #include "TBufferFile.h"
 
-#ifndef __CINT__
+#ifndef __CLING__
 //namespace MySpace {
      //}
 #endif
diff --git a/roottest/root/io/newClassDef/current/namespacelinkdef.h b/roottest/root/io/newClassDef/current/namespacelinkdef.h
index 78a59b3ba9b1d..1b8463c554aa2 100644
--- a/roottest/root/io/newClassDef/current/namespacelinkdef.h
+++ b/roottest/root/io/newClassDef/current/namespacelinkdef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/newClassDef/current/templatelinkdef.h b/roottest/root/io/newClassDef/current/templatelinkdef.h
index 694569b84192a..aae4c3208db87 100644
--- a/roottest/root/io/newClassDef/current/templatelinkdef.h
+++ b/roottest/root/io/newClassDef/current/templatelinkdef.h
@@ -1,6 +1,6 @@
 // File Automatically generated by the ROOT Script Compiler 
 
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/newClassDef/new.noclassdef/namespace.C b/roottest/root/io/newClassDef/new.noclassdef/namespace.C
index 9e77d645a38d7..4a53d94ca4835 100644
--- a/roottest/root/io/newClassDef/new.noclassdef/namespace.C
+++ b/roottest/root/io/newClassDef/new.noclassdef/namespace.C
@@ -2,7 +2,7 @@
 
 #include "TBufferFile.h"
 
-#ifndef __CINT__
+#ifndef __CLING__
 namespace MySpace {
 }
 #endif
diff --git a/roottest/root/io/newClassDef/new.noclassdef/namespacelinkdef.h b/roottest/root/io/newClassDef/new.noclassdef/namespacelinkdef.h
index 78a59b3ba9b1d..1b8463c554aa2 100644
--- a/roottest/root/io/newClassDef/new.noclassdef/namespacelinkdef.h
+++ b/roottest/root/io/newClassDef/new.noclassdef/namespacelinkdef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/newClassDef/new.noclassdef/nstemplatelinkdef.h b/roottest/root/io/newClassDef/new.noclassdef/nstemplatelinkdef.h
index eb7c31463503f..91a59da597b7d 100644
--- a/roottest/root/io/newClassDef/new.noclassdef/nstemplatelinkdef.h
+++ b/roottest/root/io/newClassDef/new.noclassdef/nstemplatelinkdef.h
@@ -1,6 +1,6 @@
 // File Automatically generated by the ROOT Script Compiler 
 
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/newClassDef/new.noclassdef/templatelinkdef.h b/roottest/root/io/newClassDef/new.noclassdef/templatelinkdef.h
index 00ccba207f187..c676497718844 100644
--- a/roottest/root/io/newClassDef/new.noclassdef/templatelinkdef.h
+++ b/roottest/root/io/newClassDef/new.noclassdef/templatelinkdef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/newClassDef/new/InheritMultilinkdef.h b/roottest/root/io/newClassDef/new/InheritMultilinkdef.h
index 5fa827c7fa06b..094ff066f7d1e 100644
--- a/roottest/root/io/newClassDef/new/InheritMultilinkdef.h
+++ b/roottest/root/io/newClassDef/new/InheritMultilinkdef.h
@@ -1,6 +1,6 @@
 // File Automatically generated by the ROOT Script Compiler
 
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/newClassDef/new/namespace.C b/roottest/root/io/newClassDef/new/namespace.C
index 82e74d8841918..0a7aa06108844 100644
--- a/roottest/root/io/newClassDef/new/namespace.C
+++ b/roottest/root/io/newClassDef/new/namespace.C
@@ -1,7 +1,7 @@
 #include "namespace.h"
 #include "TBufferFile.h"
 
-#ifndef __CINT__
+#ifndef __CLING__
 //namespace MySpace {
      //}
 #endif
diff --git a/roottest/root/io/newClassDef/new/namespacelinkdef.h b/roottest/root/io/newClassDef/new/namespacelinkdef.h
index 78a59b3ba9b1d..1b8463c554aa2 100644
--- a/roottest/root/io/newClassDef/new/namespacelinkdef.h
+++ b/roottest/root/io/newClassDef/new/namespacelinkdef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/newClassDef/new/nstemplatelinkdef.h b/roottest/root/io/newClassDef/new/nstemplatelinkdef.h
index eb7c31463503f..91a59da597b7d 100644
--- a/roottest/root/io/newClassDef/new/nstemplatelinkdef.h
+++ b/roottest/root/io/newClassDef/new/nstemplatelinkdef.h
@@ -1,6 +1,6 @@
 // File Automatically generated by the ROOT Script Compiler 
 
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/newClassDef/new/templatelinkdef.h b/roottest/root/io/newClassDef/new/templatelinkdef.h
index 72ca2bfcc0c4d..bd2d4bdf7e651 100644
--- a/roottest/root/io/newClassDef/new/templatelinkdef.h
+++ b/roottest/root/io/newClassDef/new/templatelinkdef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/newClassDef/noclassdef/LinkDef.h b/roottest/root/io/newClassDef/noclassdef/LinkDef.h
index c647c94dfdc05..331658c9eba79 100644
--- a/roottest/root/io/newClassDef/noclassdef/LinkDef.h
+++ b/roottest/root/io/newClassDef/noclassdef/LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/newstl/MemberWise.h b/roottest/root/io/newstl/MemberWise.h
index 813dcc594a0d6..dfa7c3274c159 100644
--- a/roottest/root/io/newstl/MemberWise.h
+++ b/roottest/root/io/newstl/MemberWise.h
@@ -150,7 +150,7 @@ class Holder {
    std::vector<NeverWritten> fAlwaysEmpty;
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class Member-;
 #pragma link C++ class Content+;
 #pragma link C++ class Holder+;
diff --git a/roottest/root/io/newstl/TestHelpers.C b/roottest/root/io/newstl/TestHelpers.C
index 398b7a6b7d37e..a53f7fc911869 100644
--- a/roottest/root/io/newstl/TestHelpers.C
+++ b/roottest/root/io/newstl/TestHelpers.C
@@ -68,7 +68,7 @@ void fillListOfDir(TList &l) {
    }
 }
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ function DebugTest;
 //#pragma link C++ class pair<float,int>+;
 //#pragma link C++ class pair<std::string,double>+;'
diff --git a/roottest/root/io/newstl/contHolder.h b/roottest/root/io/newstl/contHolder.h
index 9a92785f59e78..97a16e5125f80 100644
--- a/roottest/root/io/newstl/contHolder.h
+++ b/roottest/root/io/newstl/contHolder.h
@@ -1,4 +1,4 @@
-#if !defined(__CINT__) || defined(__MAKECINT__)
+#if !defined(__CLING__) || defined(__ROOTCLING__)
 #include "TClass.h"
 #include "TError.h"
 #include "TObject.h"
diff --git a/roottest/root/io/newstl/dequeHolder.C b/roottest/root/io/newstl/dequeHolder.C
index 33071826a9458..f405691cf775b 100644
--- a/roottest/root/io/newstl/dequeHolder.C
+++ b/roottest/root/io/newstl/dequeHolder.C
@@ -1,5 +1,5 @@
 #include "dequeHolder.h"
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class dequeHolder+;
 #endif
diff --git a/roottest/root/io/newstl/execStlPtrLeak.cxx b/roottest/root/io/newstl/execStlPtrLeak.cxx
index 8a723cc6a5ed8..4677ef5e93fd8 100644
--- a/roottest/root/io/newstl/execStlPtrLeak.cxx
+++ b/roottest/root/io/newstl/execStlPtrLeak.cxx
@@ -21,7 +21,7 @@ class MyClass {
 Int_t MyClass::fCounter = 0;
 Int_t MyClass::fTotal = 0;
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vector<MyClass*>;
 #pragma link C++ class vector<vector<MyClass*> > ;
 #pragma link C++ class vector<vector<MyClass*> *> ;
diff --git a/roottest/root/io/newstl/gmapHolder.h b/roottest/root/io/newstl/gmapHolder.h
index 1f22454b43758..58e2d3128ded0 100644
--- a/roottest/root/io/newstl/gmapHolder.h
+++ b/roottest/root/io/newstl/gmapHolder.h
@@ -1,4 +1,4 @@
-#if !defined(__CINT__) || defined(__MAKECINT__)
+#if !defined(__CLING__) || defined(__ROOTCLING__)
 #include "TClass.h"
 #include "TError.h"
 #include "TObject.h"
diff --git a/roottest/root/io/newstl/gsetHolder.h b/roottest/root/io/newstl/gsetHolder.h
index 5b1cff806dd84..b4dada935c695 100644
--- a/roottest/root/io/newstl/gsetHolder.h
+++ b/roottest/root/io/newstl/gsetHolder.h
@@ -1,4 +1,4 @@
-#if !defined(__CINT__) || defined(__MAKECINT__)
+#if !defined(__CLING__) || defined(__ROOTCLING__)
 #include "TClass.h"
 #include "TError.h"
 #include "TObject.h"
diff --git a/roottest/root/io/newstl/listHolder.C b/roottest/root/io/newstl/listHolder.C
index 149a16e72c712..c292d55b5e1f6 100644
--- a/roottest/root/io/newstl/listHolder.C
+++ b/roottest/root/io/newstl/listHolder.C
@@ -1,5 +1,5 @@
 #include "listHolder.h"
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class listHolder+;
 #endif
diff --git a/roottest/root/io/newstl/mapHolder.C b/roottest/root/io/newstl/mapHolder.C
index 6b07c7b1a86f9..0bcf2d7772cfe 100644
--- a/roottest/root/io/newstl/mapHolder.C
+++ b/roottest/root/io/newstl/mapHolder.C
@@ -1,5 +1,5 @@
 #include "mapHolder.h"
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class mapHolder+;
 #endif
diff --git a/roottest/root/io/newstl/multimapHolder.C b/roottest/root/io/newstl/multimapHolder.C
index c2241b503daea..7a916b3d9ab82 100644
--- a/roottest/root/io/newstl/multimapHolder.C
+++ b/roottest/root/io/newstl/multimapHolder.C
@@ -1,5 +1,5 @@
 #include "multimapHolder.h"
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class multimapHolder+;
 #endif
diff --git a/roottest/root/io/newstl/multisetHolder.C b/roottest/root/io/newstl/multisetHolder.C
index 5591a07c76456..9d36c62a17bc4 100644
--- a/roottest/root/io/newstl/multisetHolder.C
+++ b/roottest/root/io/newstl/multisetHolder.C
@@ -1,5 +1,5 @@
 #include "multisetHolder.h"
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class multisetHolder+;
 #endif
diff --git a/roottest/root/io/newstl/runbase.C b/roottest/root/io/newstl/runbase.C
index b0c217cb8be2a..e774d508ecd31 100755
--- a/roottest/root/io/newstl/runbase.C
+++ b/roottest/root/io/newstl/runbase.C
@@ -59,7 +59,7 @@ private:
 }; 
 
 
-#ifdef __CINT__
+#ifdef __CLING__
 // pragma link C++ class std::map<int, int>;
 #endif
 
diff --git a/roottest/root/io/newstl/rvecHolder.C b/roottest/root/io/newstl/rvecHolder.C
index abbe3e104060d..33c1258ae216e 100644
--- a/roottest/root/io/newstl/rvecHolder.C
+++ b/roottest/root/io/newstl/rvecHolder.C
@@ -1,6 +1,6 @@
 #include "rvecHolder.h"
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class rvecHolder+;
 #endif
 
diff --git a/roottest/root/io/newstl/sample_bx_classes.C b/roottest/root/io/newstl/sample_bx_classes.C
index 848adbfd00f3c..53a9029b84335 100755
--- a/roottest/root/io/newstl/sample_bx_classes.C
+++ b/roottest/root/io/newstl/sample_bx_classes.C
@@ -21,7 +21,7 @@ class BxLabenCluster: public TObject {
 
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class std::vector<BxLabenCluster>+;
 #pragma link C++ class std::vector<float>;
 #endif 
diff --git a/roottest/root/io/newstl/setHolder.C b/roottest/root/io/newstl/setHolder.C
index 792b993f569c5..d945f86cc266d 100644
--- a/roottest/root/io/newstl/setHolder.C
+++ b/roottest/root/io/newstl/setHolder.C
@@ -1,5 +1,5 @@
 #include "setHolder.h"
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class setHolder+;
 #endif
diff --git a/roottest/root/io/newstl/vectorHolder.C b/roottest/root/io/newstl/vectorHolder.C
index 1914e84d8cc4d..bef5105fa42bd 100644
--- a/roottest/root/io/newstl/vectorHolder.C
+++ b/roottest/root/io/newstl/vectorHolder.C
@@ -1,6 +1,6 @@
 #include "vectorHolder.h"
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vectorHolder+;
 #endif
 
diff --git a/roottest/root/io/newstl/withstd.cxx b/roottest/root/io/newstl/withstd.cxx
index 765e9e506a118..58bf3f1ef9f46 100644
--- a/roottest/root/io/newstl/withstd.cxx
+++ b/roottest/root/io/newstl/withstd.cxx
@@ -5,7 +5,7 @@
 
 template <class T> class something {};
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class something<std::string>;
 #endif
 
diff --git a/roottest/root/io/perf/simple/listMWclass.C b/roottest/root/io/perf/simple/listMWclass.C
index 7fbe489cf3df6..6f30030967eec 100644
--- a/roottest/root/io/perf/simple/listMWclass.C
+++ b/roottest/root/io/perf/simple/listMWclass.C
@@ -43,7 +43,7 @@ public:
 
 #include "TBufferFile.h"
 #include "TClass.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class list<simple>+;
 #endif
 
diff --git a/roottest/root/io/perf/simple/listMWtclass.C b/roottest/root/io/perf/simple/listMWtclass.C
index 80ed4cc8e5c4b..278e9bc22e70d 100644
--- a/roottest/root/io/perf/simple/listMWtclass.C
+++ b/roottest/root/io/perf/simple/listMWtclass.C
@@ -43,7 +43,7 @@ public:
 
 #include "TBufferFile.h"
 #include "TClass.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class list<simple>+;
 #endif
 
diff --git a/roottest/root/io/perf/simple/listOWclass.C b/roottest/root/io/perf/simple/listOWclass.C
index dbca416f60771..6a59645a3ef8e 100644
--- a/roottest/root/io/perf/simple/listOWclass.C
+++ b/roottest/root/io/perf/simple/listOWclass.C
@@ -43,7 +43,7 @@ public:
 
 #include "TBufferFile.h"
 #include "TClass.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class list<simple>+;
 #endif
 
diff --git a/roottest/root/io/perf/simple/listOWtclass.C b/roottest/root/io/perf/simple/listOWtclass.C
index 956a4780c0d52..a4ed1810bdf0c 100644
--- a/roottest/root/io/perf/simple/listOWtclass.C
+++ b/roottest/root/io/perf/simple/listOWtclass.C
@@ -43,7 +43,7 @@ public:
 
 #include "TBufferFile.h"
 #include "TClass.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class list<simple>+;
 #endif
 
diff --git a/roottest/root/io/perf/simple/setMWclass.C b/roottest/root/io/perf/simple/setMWclass.C
index 8e6bdf1ac3e86..7895c74a8046d 100644
--- a/roottest/root/io/perf/simple/setMWclass.C
+++ b/roottest/root/io/perf/simple/setMWclass.C
@@ -43,7 +43,7 @@ public:
 
 #include "TBufferFile.h"
 #include "TClass.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class set<simple>+;
 #endif
 
diff --git a/roottest/root/io/perf/simple/vectorMWclass.C b/roottest/root/io/perf/simple/vectorMWclass.C
index a9976e923158c..095de346f8e86 100644
--- a/roottest/root/io/perf/simple/vectorMWclass.C
+++ b/roottest/root/io/perf/simple/vectorMWclass.C
@@ -40,7 +40,7 @@ public:
 #include "TBufferFile.h"
 #include "TClass.h"
 #include <vector> 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vector<simple>+;
 #endif
 
diff --git a/roottest/root/io/perf/simple/vectorMWtclass.C b/roottest/root/io/perf/simple/vectorMWtclass.C
index 5283b9827e819..02aa8fed3719c 100644
--- a/roottest/root/io/perf/simple/vectorMWtclass.C
+++ b/roottest/root/io/perf/simple/vectorMWtclass.C
@@ -40,7 +40,7 @@ public:
 #include "TBufferFile.h"
 #include "TClass.h"
 #include <vector> 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vector<simple>+;
 #endif
 
diff --git a/roottest/root/io/perf/simple/vectorMWthit.C b/roottest/root/io/perf/simple/vectorMWthit.C
index e2bde9264ecf2..dcbf3843b4c7d 100644
--- a/roottest/root/io/perf/simple/vectorMWthit.C
+++ b/roottest/root/io/perf/simple/vectorMWthit.C
@@ -98,7 +98,7 @@ public:
 #include "TBufferFile.h"
 #include "TClass.h"
 #include <vector> 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vector<THit>+;
 #endif
 
diff --git a/roottest/root/io/perf/simple/vectorOWclass.C b/roottest/root/io/perf/simple/vectorOWclass.C
index ff7ff3cd452fb..30db80e414406 100644
--- a/roottest/root/io/perf/simple/vectorOWclass.C
+++ b/roottest/root/io/perf/simple/vectorOWclass.C
@@ -40,7 +40,7 @@ public:
 #include "TBufferFile.h"
 #include "TClass.h"
 #include <vector> 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vector<simple>+;
 #endif
 
diff --git a/roottest/root/io/perf/simple/vectorOWtclass.C b/roottest/root/io/perf/simple/vectorOWtclass.C
index 12324d27feed0..72308375b7b4e 100644
--- a/roottest/root/io/perf/simple/vectorOWtclass.C
+++ b/roottest/root/io/perf/simple/vectorOWtclass.C
@@ -40,7 +40,7 @@ public:
 #include "TBufferFile.h"
 #include "TClass.h"
 #include <vector> 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vector<simple>+;
 #endif
 
diff --git a/roottest/root/io/perf/simple/vectorint.C b/roottest/root/io/perf/simple/vectorint.C
index d7c20d9e670e8..6ec30dcd967e5 100644
--- a/roottest/root/io/perf/simple/vectorint.C
+++ b/roottest/root/io/perf/simple/vectorint.C
@@ -8,7 +8,7 @@
 #include "TBufferFile.h"
 #include "TClass.h"
 #include <vector> 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 // #pragma link C++ class vector<int>+;
 #endif
 
diff --git a/roottest/root/io/perf/simple/vectorintInside.C b/roottest/root/io/perf/simple/vectorintInside.C
index 0218ed91ecda8..1b5943bcaa9ba 100644
--- a/roottest/root/io/perf/simple/vectorintInside.C
+++ b/roottest/root/io/perf/simple/vectorintInside.C
@@ -15,7 +15,7 @@ public:
 #include "TBufferFile.h"
 #include "TClass.h"
 #include <vector> 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 // #pragma link C++ class vector<int>+;
 #endif
 
diff --git a/roottest/root/io/perf/simple/vectorptrtclass.C b/roottest/root/io/perf/simple/vectorptrtclass.C
index 2c10fa8f4079b..7a90f00436b55 100644
--- a/roottest/root/io/perf/simple/vectorptrtclass.C
+++ b/roottest/root/io/perf/simple/vectorptrtclass.C
@@ -35,7 +35,7 @@ public:
 #include <vector> 
 #include "TVirtualCollectionProxy.h"
 #include "TStreamerInfo.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vector<simple*>+;
 #endif
 
diff --git a/roottest/root/io/perf/simple/vectorsptrtclass.C b/roottest/root/io/perf/simple/vectorsptrtclass.C
index 0d0d6445b721a..3970bc75ab1f2 100644
--- a/roottest/root/io/perf/simple/vectorsptrtclass.C
+++ b/roottest/root/io/perf/simple/vectorsptrtclass.C
@@ -38,7 +38,7 @@ public:
 #include "TStreamerInfoActions.h"
 #include "TVirtualCollectionIterators.h"
 #include "Riostream.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vector<simple*>+;
 #endif
 
diff --git a/roottest/root/io/perf/simple/vectortclass.C b/roottest/root/io/perf/simple/vectortclass.C
index 15b36d4d8aa8a..24335fceb8323 100644
--- a/roottest/root/io/perf/simple/vectortclass.C
+++ b/roottest/root/io/perf/simple/vectortclass.C
@@ -34,7 +34,7 @@ public:
 #include "TBufferFile.h"
 #include "TClass.h"
 #include <vector> 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vector<simple>+;
 #endif
 
diff --git a/roottest/root/io/prefetching/atlasFlushed/INav4MomAssocs_p2.h b/roottest/root/io/prefetching/atlasFlushed/INav4MomAssocs_p2.h
index e10fca77e756c..15ed8afa24c24 100644
--- a/roottest/root/io/prefetching/atlasFlushed/INav4MomAssocs_p2.h
+++ b/roottest/root/io/prefetching/atlasFlushed/INav4MomAssocs_p2.h
@@ -33,7 +33,7 @@ class INav4MomAssocs_p2 {
    virtual ~INav4MomAssocs_p2();
 
 };
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class pair<ElementLink_p2<unsigned int>,vector<ElementLink_p2<unsigned int> > >+;
 #endif
 #endif
diff --git a/roottest/root/io/prefetching/atlasFlushed/TrigInDetTrackTruth_p1.h b/roottest/root/io/prefetching/atlasFlushed/TrigInDetTrackTruth_p1.h
index 14670d72a3c82..17a3417c1f46d 100644
--- a/roottest/root/io/prefetching/atlasFlushed/TrigInDetTrackTruth_p1.h
+++ b/roottest/root/io/prefetching/atlasFlushed/TrigInDetTrackTruth_p1.h
@@ -33,7 +33,7 @@ class TrigInDetTrackTruth_p1 {
    virtual ~TrigInDetTrackTruth_p1();
 
 };
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class pair<unsigned int,unsigned int>+;
 #endif
 #endif
diff --git a/roottest/root/io/prefetching/atlasFlushed/atlasFlushedLinkDef.h b/roottest/root/io/prefetching/atlasFlushed/atlasFlushedLinkDef.h
index 2fccc70b3d08c..3774e14fb8d4f 100644
--- a/roottest/root/io/prefetching/atlasFlushed/atlasFlushedLinkDef.h
+++ b/roottest/root/io/prefetching/atlasFlushed/atlasFlushedLinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link C++ class TPCnvTokenList_p1+;
 #pragma link C++ class Trk::TrackCollection_p1+;
diff --git a/roottest/root/io/references/MasterLinkDef.hh b/roottest/root/io/references/MasterLinkDef.hh
index 39a88523e8448..6e1feb20b85f5 100644
--- a/roottest/root/io/references/MasterLinkDef.hh
+++ b/roottest/root/io/references/MasterLinkDef.hh
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/rootcint/cltestLinkdef.h b/roottest/root/io/rootcint/cltestLinkdef.h
index 944f880af60dd..76b22b64a66ca 100644
--- a/roottest/root/io/rootcint/cltestLinkdef.h
+++ b/roottest/root/io/rootcint/cltestLinkdef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/rootcint/constMember.h b/roottest/root/io/rootcint/constMember.h
index d5e63a58fe2c3..9062ed279079b 100644
--- a/roottest/root/io/rootcint/constMember.h
+++ b/roottest/root/io/rootcint/constMember.h
@@ -36,7 +36,7 @@ ClassDef(A,1)
 
 // and b.h:-
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class A+;
 #pragma link C++ class B+;
 #endif
diff --git a/roottest/root/io/rootcint/doubleconst/LinkDef.h b/roottest/root/io/rootcint/doubleconst/LinkDef.h
index 08a0aea5818ac..9cdeed79c383e 100644
--- a/roottest/root/io/rootcint/doubleconst/LinkDef.h
+++ b/roottest/root/io/rootcint/doubleconst/LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/rootcint/sigbug/LinkDef.h b/roottest/root/io/rootcint/sigbug/LinkDef.h
index 84d87166db9b7..2ac40c0e1ad71 100644
--- a/roottest/root/io/rootcint/sigbug/LinkDef.h
+++ b/roottest/root/io/rootcint/sigbug/LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/rootcint/stl/map1.C b/roottest/root/io/rootcint/stl/map1.C
index a61bf27a69e08..b42b1bbac2d22 100644
--- a/roottest/root/io/rootcint/stl/map1.C
+++ b/roottest/root/io/rootcint/stl/map1.C
@@ -10,7 +10,7 @@ public:
   map_type map_;
 };
 
-#ifdef __CINT__
+#ifdef __CLING__
 
 //#pragma link C++ class StoragePolicy+;
 #pragma link C++ class StoragePolicy<int>+;
diff --git a/roottest/root/io/rootcint/stl/map2.C b/roottest/root/io/rootcint/stl/map2.C
index 30c1fccd4d90e..c8e535c7860f2 100644
--- a/roottest/root/io/rootcint/stl/map2.C
+++ b/roottest/root/io/rootcint/stl/map2.C
@@ -27,7 +27,7 @@ class Track : public STLMapStoragePolicy<int>
 
   ClassDef(Track,1);
 };
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link C++ class Track+;
 #pragma link C++ class STLMapStoragePolicy<int>+;
diff --git a/roottest/root/io/rootcint/stl/test0LinkDef.h b/roottest/root/io/rootcint/stl/test0LinkDef.h
index 6b1848e1d2808..1cd007c5d8b8b 100644
--- a/roottest/root/io/rootcint/stl/test0LinkDef.h
+++ b/roottest/root/io/rootcint/stl/test0LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/rootcint/stl/test1LinkDef.h b/roottest/root/io/rootcint/stl/test1LinkDef.h
index cd1a2bbee1ad1..72418131d0687 100644
--- a/roottest/root/io/rootcint/stl/test1LinkDef.h
+++ b/roottest/root/io/rootcint/stl/test1LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/rootcint/stl/test2LinkDef.h b/roottest/root/io/rootcint/stl/test2LinkDef.h
index a27bfa34f6636..9f3ea72a592fb 100644
--- a/roottest/root/io/rootcint/stl/test2LinkDef.h
+++ b/roottest/root/io/rootcint/stl/test2LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/rootcint/templateKeyword.C b/roottest/root/io/rootcint/templateKeyword.C
index 0f6dd508debcf..a68cb548024aa 100644
--- a/roottest/root/io/rootcint/templateKeyword.C
+++ b/roottest/root/io/rootcint/templateKeyword.C
@@ -65,7 +65,7 @@ public:
 
 
 
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/rootcint/testLinkDef.h b/roottest/root/io/rootcint/testLinkDef.h
index 6c7171f38b389..c386fbf742669 100644
--- a/roottest/root/io/rootcint/testLinkDef.h
+++ b/roottest/root/io/rootcint/testLinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/rootcint/weirdpair_LinkDef.h b/roottest/root/io/rootcint/weirdpair_LinkDef.h
index ae759dbc3877e..02cd3fa266e6c 100644
--- a/roottest/root/io/rootcint/weirdpair_LinkDef.h
+++ b/roottest/root/io/rootcint/weirdpair_LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/io/set/set_problem.cxx b/roottest/root/io/set/set_problem.cxx
index 342195e7f0fa5..80db678593d3b 100644
--- a/roottest/root/io/set/set_problem.cxx
+++ b/roottest/root/io/set/set_problem.cxx
@@ -25,7 +25,7 @@ int run() {
    return 0;
 }
 
-#ifndef __CINT__
+#ifndef __CLING__
 int main()
 {
 return run();
diff --git a/roottest/root/io/set/set_problem.h b/roottest/root/io/set/set_problem.h
index 344ef292ae289..cce201b3b3520 100644
--- a/roottest/root/io/set/set_problem.h
+++ b/roottest/root/io/set/set_problem.h
@@ -32,7 +32,7 @@ class SetProblem : public TNamed
 
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ typedef set_t;
 #pragma link C++ class SetProblem+;
 #endif
diff --git a/roottest/root/io/tmpifile/JetEventLinkDef.h b/roottest/root/io/tmpifile/JetEventLinkDef.h
index 8ed260106f8ef..ee3e27c28db83 100644
--- a/roottest/root/io/tmpifile/JetEventLinkDef.h
+++ b/roottest/root/io/tmpifile/JetEventLinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/roottest/root/io/transient/execNew.cxx b/roottest/root/io/transient/execNew.cxx
index 3f3e27037c48d..69c655a852dd0 100644
--- a/roottest/root/io/transient/execNew.cxx
+++ b/roottest/root/io/transient/execNew.cxx
@@ -36,7 +36,7 @@ void execNew() {
    read();
 }
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma read sourceClass="MyClass" targetClass="MyClass" source="int fOld" \
          version="[1-]" target="fOld" \
          code="{ fOld = onfile.fOld; }"
diff --git a/roottest/root/io/vararyobj/runvaryingArrayNoClassDefRead_linkdef.h b/roottest/root/io/vararyobj/runvaryingArrayNoClassDefRead_linkdef.h
index 1fedf549fae42..9c6dbcbd2d6d2 100644
--- a/roottest/root/io/vararyobj/runvaryingArrayNoClassDefRead_linkdef.h
+++ b/roottest/root/io/vararyobj/runvaryingArrayNoClassDefRead_linkdef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link C++ class B+;
 #pragma link C++ class A+;
diff --git a/roottest/root/io/vararyobj/runvaryingArrayNoClassDefWrite_linkdef.h b/roottest/root/io/vararyobj/runvaryingArrayNoClassDefWrite_linkdef.h
index 1fedf549fae42..9c6dbcbd2d6d2 100644
--- a/roottest/root/io/vararyobj/runvaryingArrayNoClassDefWrite_linkdef.h
+++ b/roottest/root/io/vararyobj/runvaryingArrayNoClassDefWrite_linkdef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link C++ class B+;
 #pragma link C++ class A+;
diff --git a/roottest/root/io/vararyobj/runvaryingArrayRead_51508_linkdef.h b/roottest/root/io/vararyobj/runvaryingArrayRead_51508_linkdef.h
index 1fedf549fae42..9c6dbcbd2d6d2 100644
--- a/roottest/root/io/vararyobj/runvaryingArrayRead_51508_linkdef.h
+++ b/roottest/root/io/vararyobj/runvaryingArrayRead_51508_linkdef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link C++ class B+;
 #pragma link C++ class A+;
diff --git a/roottest/root/io/vararyobj/runvaryingArrayRead_linkdef.h b/roottest/root/io/vararyobj/runvaryingArrayRead_linkdef.h
index 1fedf549fae42..9c6dbcbd2d6d2 100644
--- a/roottest/root/io/vararyobj/runvaryingArrayRead_linkdef.h
+++ b/roottest/root/io/vararyobj/runvaryingArrayRead_linkdef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link C++ class B+;
 #pragma link C++ class A+;
diff --git a/roottest/root/io/vararyobj/runvaryingArrayWrite_linkdef.h b/roottest/root/io/vararyobj/runvaryingArrayWrite_linkdef.h
index 1fedf549fae42..9c6dbcbd2d6d2 100644
--- a/roottest/root/io/vararyobj/runvaryingArrayWrite_linkdef.h
+++ b/roottest/root/io/vararyobj/runvaryingArrayWrite_linkdef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link C++ class B+;
 #pragma link C++ class A+;
diff --git a/roottest/root/meta/MakeProject/stl_makeproject_test_linkdef.h b/roottest/root/meta/MakeProject/stl_makeproject_test_linkdef.h
index a93ba72a2fadf..11dc94fc98fb2 100644
--- a/roottest/root/meta/MakeProject/stl_makeproject_test_linkdef.h
+++ b/roottest/root/meta/MakeProject/stl_makeproject_test_linkdef.h
@@ -1,5 +1,5 @@
 
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/meta/WrapSimple.h b/roottest/root/meta/WrapSimple.h
index 4921818691b71..ce58f2f5b2b39 100644
--- a/roottest/root/meta/WrapSimple.h
+++ b/roottest/root/meta/WrapSimple.h
@@ -1,5 +1,5 @@
 #include "Simple.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 //#pragma link C++ namespace AddSpace;
 #pragma link C++ class AddSpace::Simple+;
 #endif
diff --git a/roottest/root/meta/evolution/data.h b/roottest/root/meta/evolution/data.h
index 3899e84985ff9..ba0f9f1e22a3a 100644
--- a/roottest/root/meta/evolution/data.h
+++ b/roottest/root/meta/evolution/data.h
@@ -78,7 +78,7 @@ class data {
 #error missing case
 #endif
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class data+;
 #pragma link C++ class Tdata+;
 #endif
diff --git a/roottest/root/meta/evolution/version5/execNestedColl.cxx b/roottest/root/meta/evolution/version5/execNestedColl.cxx
index 2fb423921f28d..5e8f7e90a1e18 100644
--- a/roottest/root/meta/evolution/version5/execNestedColl.cxx
+++ b/roottest/root/meta/evolution/version5/execNestedColl.cxx
@@ -47,7 +47,7 @@ namespace HepExp {
 
 //typedef HepExp::Inner Alias;
 
-//#ifdef __MAKECINT__
+//#ifdef __ROOTCLING__
 //  #pragma read sourceClass="Alias" targetClass="HepExp::Inner";
 //#endif
 
diff --git a/roottest/root/meta/execnamespaceconflict.C b/roottest/root/meta/execnamespaceconflict.C
index b45a78ca35bed..2571c02051db1 100644
--- a/roottest/root/meta/execnamespaceconflict.C
+++ b/roottest/root/meta/execnamespaceconflict.C
@@ -7,7 +7,7 @@ namespace Test {
   };
 }
 
-#if defined(__MAKECINT__)
+#if defined(__ROOTCLING__)
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/roottest/root/meta/genreflex/MyClass_v2_selection.xml b/roottest/root/meta/genreflex/MyClass_v2_selection.xml
index 74b25e8858c93..af70ff8bbbc18 100644
--- a/roottest/root/meta/genreflex/MyClass_v2_selection.xml
+++ b/roottest/root/meta/genreflex/MyClass_v2_selection.xml
@@ -27,7 +27,7 @@
 <!--
 The rule for a linkdef:
 
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/roottest/root/meta/genreflex/iorules/DataModelV2genreflex.h b/roottest/root/meta/genreflex/iorules/DataModelV2genreflex.h
index 31c6acea70570..8ce5b56e37039 100644
--- a/roottest/root/meta/genreflex/iorules/DataModelV2genreflex.h
+++ b/roottest/root/meta/genreflex/iorules/DataModelV2genreflex.h
@@ -49,7 +49,7 @@ class Container {
    ACache a;
 };
 /*
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ options=version(9) class ACache+;
 #pragma read sourceClass="ACache" targetClass="ACache" source="int x; int y; char c"  version="[8]" target="z" include="TMath.h,math.h" \
    code="{ z = onfile.x*1000 + onfile.y*10; }"
diff --git a/roottest/root/meta/genreflex/privateClassSelection_LinkDef.h b/roottest/root/meta/genreflex/privateClassSelection_LinkDef.h
index e48fe393fe081..87f56b8bee475 100644
--- a/roottest/root/meta/genreflex/privateClassSelection_LinkDef.h
+++ b/roottest/root/meta/genreflex/privateClassSelection_LinkDef.h
@@ -1,6 +1,6 @@
 // File Automatically generated by the ROOT Script Compiler 
 
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link C++ nestedclasses;
 #pragma link C++ nestedtypedefs;
diff --git a/roottest/root/meta/method/offset/methodtestLinkDef.hh b/roottest/root/meta/method/offset/methodtestLinkDef.hh
index 2eeb9d953401b..c69377ae6264f 100644
--- a/roottest/root/meta/method/offset/methodtestLinkDef.hh
+++ b/roottest/root/meta/method/offset/methodtestLinkDef.hh
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/roottest/root/meta/missingInfo.C b/roottest/root/meta/missingInfo.C
index a90e861cb5a92..124f33a0e42f5 100644
--- a/roottest/root/meta/missingInfo.C
+++ b/roottest/root/meta/missingInfo.C
@@ -1,6 +1,6 @@
 class TopLevel { public: virtual ~TopLevel() {} };
 class BottomOne : public TopLevel {};
-#ifndef __CINT__
+#ifndef __CLING__
 #ifndef __CLING__
 class BottomMissing : public TopLevel {};
 #endif
diff --git a/roottest/root/meta/pragmasTestLinkDef.h b/roottest/root/meta/pragmasTestLinkDef.h
index 2e76325b6b29e..8595407fd90a3 100644
--- a/roottest/root/meta/pragmasTestLinkDef.h
+++ b/roottest/root/meta/pragmasTestLinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link off all global;
 #pragma link off all class;
 #pragma link off all function;
diff --git a/roottest/root/meta/rootcling/NestedClassOff.LinkDef.h b/roottest/root/meta/rootcling/NestedClassOff.LinkDef.h
index 56796216db453..f2a316315c7a3 100644
--- a/roottest/root/meta/rootcling/NestedClassOff.LinkDef.h
+++ b/roottest/root/meta/rootcling/NestedClassOff.LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
@@ -14,4 +14,4 @@
 #pragma link C++ typedef FdUtil::Fd::PixelNumberRec;
 #pragma link C++ typedef FdUtil::Fd::PixelNumber;
 
-#endif // __CINT__
+#endif // __CLING__
diff --git a/roottest/root/meta/rootmap/spaces.C b/roottest/root/meta/rootmap/spaces.C
index b24920d7de889..8ffc1a87735f3 100644
--- a/roottest/root/meta/rootmap/spaces.C
+++ b/roottest/root/meta/rootmap/spaces.C
@@ -4,7 +4,7 @@ template <class T> class A {
   T a;
 };
 
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link C++ class A<int>;
 #pragma link C++ class A<unsigned int>;
 #endif
diff --git a/roottest/root/meta/tclass/class1.cxx b/roottest/root/meta/tclass/class1.cxx
index 91a8f860c1da2..599dc1901bf21 100644
--- a/roottest/root/meta/tclass/class1.cxx
+++ b/roottest/root/meta/tclass/class1.cxx
@@ -1,6 +1,6 @@
 #include "class1.h"
 
-//#ifndef __MAKECINT__
+//#ifndef __ROOTCLING__
 class1::class1(int i, int j):
   m_i(i),
   m_j(j){};
diff --git a/roottest/root/meta/tclass/regression/execROOT_6277.cxx b/roottest/root/meta/tclass/regression/execROOT_6277.cxx
index 4707e652b3e46..37729b91e48fd 100644
--- a/roottest/root/meta/tclass/regression/execROOT_6277.cxx
+++ b/roottest/root/meta/tclass/regression/execROOT_6277.cxx
@@ -80,6 +80,6 @@ int execROOT_6277()
 }
 
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class UserClass+;
 #endif
diff --git a/roottest/root/meta/tclass/runclassref.C b/roottest/root/meta/tclass/runclassref.C
index 356df1cc7df45..e34d7e5491057 100644
--- a/roottest/root/meta/tclass/runclassref.C
+++ b/roottest/root/meta/tclass/runclassref.C
@@ -7,7 +7,7 @@
    bool success = true;
 
    TClassRef clref("MyClass");
-#ifdef __CINT__
+#ifdef __CLING__
    TClass *cl = clref.GetClass(); // CINT does not properly handle operator Cast
 #else
    TClass *cl = clref;
@@ -17,7 +17,7 @@
       cout << "Error: Ref to unknown class MyClass points to something (" << (void*)cl << ")\n";
    }
    TFile *f = TFile::Open("myclass.root");
-#ifdef __CINT__
+#ifdef __CLING__
    cl = clref.GetClass(); // CINT does not properly handle operrator Cast
 #else
    cl = clref;
@@ -31,7 +31,7 @@
    }
    TClass *cl2;
    gROOT->ProcessLine(".L RunMyClass.C+");
-#ifdef __CINT__
+#ifdef __CLING__
    cl2 = clref.GetClass(); // CINT does not properly handle operrator Cast
 #else
    cl2 = clref;
diff --git a/roottest/root/meta/tclass/runpairs.C b/roottest/root/meta/tclass/runpairs.C
index cd21476a598c5..3e79dd39b18c9 100644
--- a/roottest/root/meta/tclass/runpairs.C
+++ b/roottest/root/meta/tclass/runpairs.C
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 
 #include <vector>
@@ -57,7 +57,7 @@ public:
    int get() { return val1*sizeof(val2)*val3.size()*val4.size(); }
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class std::vector<std::pair<Char_t, UChar_t> >+;
 #pragma link C++ class std::pair<Char_t, UChar_t>+;
 #pragma link C++ class regular+;
diff --git a/roottest/root/meta/tclass/tempParse.C b/roottest/root/meta/tclass/tempParse.C
index c1c0335886942..2cfd18ed521d8 100755
--- a/roottest/root/meta/tclass/tempParse.C
+++ b/roottest/root/meta/tclass/tempParse.C
@@ -16,7 +16,7 @@ private:
   T m_value;   
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class SimpleProperty<std::string>;
 #endif
 
diff --git a/roottest/root/tree/addresses/Embedded_LinkDef.h b/roottest/root/tree/addresses/Embedded_LinkDef.h
index c6a8096246210..166e72eb3fcbe 100644
--- a/roottest/root/tree/addresses/Embedded_LinkDef.h
+++ b/roottest/root/tree/addresses/Embedded_LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/tree/addresses/JansEvent.C b/roottest/root/tree/addresses/JansEvent.C
index 6e02067674f9b..90c96c793877d 100644
--- a/roottest/root/tree/addresses/JansEvent.C
+++ b/roottest/root/tree/addresses/JansEvent.C
@@ -224,7 +224,7 @@ void testJan() {
 
 
 
-#if defined(__MAKECINT__)
+#if defined(__ROOTCLING__)
 #pragma link C++ class CandidateParameters;
 #pragma link C++ class CandParametersMC;
 #pragma link C++ class LambdaParameters;
diff --git a/roottest/root/tree/addresses/JansEvent.h b/roottest/root/tree/addresses/JansEvent.h
index 61828877164b9..c70b184f8e0ff 100644
--- a/roottest/root/tree/addresses/JansEvent.h
+++ b/roottest/root/tree/addresses/JansEvent.h
@@ -201,7 +201,7 @@ struct JansEventHeader : public TObject
 struct JansEvent : public TObject
 {
 //WLAV: commented out the following three lines:
-//#if !defined(__CINT__)
+//#if !defined(__CLING__)
 //    typedef GClonesArray<B_Parameters> B_List;
 //#else
     typedef TClonesArray B_List;
diff --git a/roottest/root/tree/addresses/LinkDef.h b/roottest/root/tree/addresses/LinkDef.h
index 4773810b0753f..2c3e01fd18b25 100644
--- a/roottest/root/tree/addresses/LinkDef.h
+++ b/roottest/root/tree/addresses/LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/tree/addresses/assert_tread.cxx b/roottest/root/tree/addresses/assert_tread.cxx
index 2e6655fb9a3b8..0621694fc1055 100644
--- a/roottest/root/tree/addresses/assert_tread.cxx
+++ b/roottest/root/tree/addresses/assert_tread.cxx
@@ -7,7 +7,7 @@
 #include <iostream>
 #include <cassert>
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class mytypes::FirstBase+;
 #pragma link C++ class mytypes::OtherBase+;
 #pragma link C++ class mytypes::Trajectory+;
diff --git a/roottest/root/tree/addresses/assert_twrite.cxx b/roottest/root/tree/addresses/assert_twrite.cxx
index 08e0ddae25915..1a69b7145847f 100644
--- a/roottest/root/tree/addresses/assert_twrite.cxx
+++ b/roottest/root/tree/addresses/assert_twrite.cxx
@@ -5,7 +5,7 @@
 #include "mytypes.h"
 
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class mytypes::FirstBase+;
 #pragma link C++ class mytypes::OtherBase+;
 #pragma link C++ class mytypes::Trajectory+;
diff --git a/roottest/root/tree/addresses/converterIssues/ExtHit/ExtHitLinkDef.h b/roottest/root/tree/addresses/converterIssues/ExtHit/ExtHitLinkDef.h
index 3ca6a45b05a79..de819b74e924f 100644
--- a/roottest/root/tree/addresses/converterIssues/ExtHit/ExtHitLinkDef.h
+++ b/roottest/root/tree/addresses/converterIssues/ExtHit/ExtHitLinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link C++ class Belle2::RelationsInterface<TObject>+;
 #pragma link C++ class Belle2::ExtHit+;
diff --git a/roottest/root/tree/addresses/converterIssues/selection_LinkDef.h b/roottest/root/tree/addresses/converterIssues/selection_LinkDef.h
index 587a0d53b865e..efcea37b63177 100644
--- a/roottest/root/tree/addresses/converterIssues/selection_LinkDef.h
+++ b/roottest/root/tree/addresses/converterIssues/selection_LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 //#pragma link C++ class EventFormat_p1+;
 #pragma link C++ class edm::EventFormatElement+;
 #pragma link C++ class edm::EventFormat+;
diff --git a/roottest/root/tree/addresses/converterIssues/selection_p1_LinkDef.h b/roottest/root/tree/addresses/converterIssues/selection_p1_LinkDef.h
index 9cc6652310f0e..b7660d4574026 100644
--- a/roottest/root/tree/addresses/converterIssues/selection_p1_LinkDef.h
+++ b/roottest/root/tree/addresses/converterIssues/selection_p1_LinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class EventFormat_p1+;
 #pragma link C++ class edm::EventFormatElement+;
 // #pragma link C++ class edm::EventFormat+;
diff --git a/roottest/root/tree/addresses/header.h b/roottest/root/tree/addresses/header.h
index f350a4d103bf8..b6c67e92ee7a9 100644
--- a/roottest/root/tree/addresses/header.h
+++ b/roottest/root/tree/addresses/header.h
@@ -49,7 +49,7 @@ class SubSTreeEvent: public STreeEvent {
   ClassDefOverride(SubSTreeEvent,1) //event encapsulated in a tree
 }; // STreeEvent
 
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/tree/addresses/inherit.C b/roottest/root/tree/addresses/inherit.C
index 887857ff926e0..7b76e739401ee 100644
--- a/roottest/root/tree/addresses/inherit.C
+++ b/roottest/root/tree/addresses/inherit.C
@@ -59,7 +59,7 @@ public:
 
 
 // begin of code - STreeEventLinkDef.h
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link C++ class TopTrack+;
 #pragma link C++ class BottomTrack+;
diff --git a/roottest/root/tree/addresses/relationsLinkdef.h b/roottest/root/tree/addresses/relationsLinkdef.h
index 2e62eaa9bd904..1a04507d0dba2 100644
--- a/roottest/root/tree/addresses/relationsLinkdef.h
+++ b/roottest/root/tree/addresses/relationsLinkdef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/tree/addresses/runbaseString.C b/roottest/root/tree/addresses/runbaseString.C
index bfe3a406f456e..43dbbb278fcd7 100644
--- a/roottest/root/tree/addresses/runbaseString.C
+++ b/roottest/root/tree/addresses/runbaseString.C
@@ -1,7 +1,7 @@
 #include "TFile.h"
 #include "TTree.h"
 
-#if !defined(__CINT__) || defined(__MAKECINT__)
+#if !defined(__CLING__) || defined(__ROOTCLING__)
 #include "runbaseString.h"
 #endif
 
diff --git a/roottest/root/tree/addresses/runmemleak.C b/roottest/root/tree/addresses/runmemleak.C
index c581d8c8f5eff..d86bba9d0d0e4 100644
--- a/roottest/root/tree/addresses/runmemleak.C
+++ b/roottest/root/tree/addresses/runmemleak.C
@@ -1,4 +1,4 @@
-#if !defined(__CINT__) || defined(__MAKECINT__)
+#if !defined(__CLING__) || defined(__ROOTCLING__)
 #include <TFile.h>
 #include <TTree.h>
 #include <TBranch.h>
diff --git a/roottest/root/tree/addresses/userClass.C b/roottest/root/tree/addresses/userClass.C
index 75079830aaec4..e83e278e252d5 100644
--- a/roottest/root/tree/addresses/userClass.C
+++ b/roottest/root/tree/addresses/userClass.C
@@ -14,7 +14,7 @@ public:
 // Expose this to the interpreter, even if the library already pulled
 // this header (with __ROOTCLING__ and thus without BottomMissing) into
 // the interpreter.
-#if !defined(__MAKECINT__) && !defined(__ROOTCLING__)
+#if !defined(__ROOTCLING__)
 class BottomMissing : public TopLevel {
 public:
    int c;
diff --git a/roottest/root/tree/evolution/MyClass.h b/roottest/root/tree/evolution/MyClass.h
index 36b222304ab42..d6d46552efcd3 100644
--- a/roottest/root/tree/evolution/MyClass.h
+++ b/roottest/root/tree/evolution/MyClass.h
@@ -101,7 +101,7 @@ class TopLevel {
 #endif
 
 #undef TopLevel
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #ifdef WITHCLASSDEF
 #pragma link C++ class TopLevelCl+;
 #else
diff --git a/roottest/root/tree/evolution/Simple.h b/roottest/root/tree/evolution/Simple.h
index 1dd44219386bc..6d9a41a437690 100644
--- a/roottest/root/tree/evolution/Simple.h
+++ b/roottest/root/tree/evolution/Simple.h
@@ -4,7 +4,7 @@ class Content {
 public:
    int fValues;
 };
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class Content+;
 #endif
 
diff --git a/roottest/root/tree/evolution/SimpleOne.C b/roottest/root/tree/evolution/SimpleOne.C
index 0a83f8c55dab4..67f57dfbcab86 100644
--- a/roottest/root/tree/evolution/SimpleOne.C
+++ b/roottest/root/tree/evolution/SimpleOne.C
@@ -1,6 +1,6 @@
 #define VERSION 1
 #include "Simple.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class Simple+;
 #endif
 
diff --git a/roottest/root/tree/evolution/SimpleTwo.C b/roottest/root/tree/evolution/SimpleTwo.C
index 4dd7d0f9d22c0..159f11c40ab76 100644
--- a/roottest/root/tree/evolution/SimpleTwo.C
+++ b/roottest/root/tree/evolution/SimpleTwo.C
@@ -1,5 +1,5 @@
 #define VERSION 2
 #include "Simple.h"
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class Simple+;
 #endif
diff --git a/roottest/root/tree/evolution/cloning.h b/roottest/root/tree/evolution/cloning.h
index f9745ca3f0214..172c3df589e32 100644
--- a/roottest/root/tree/evolution/cloning.h
+++ b/roottest/root/tree/evolution/cloning.h
@@ -13,6 +13,6 @@ class cloning {
 #endif
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class cloning+;
 #endif
diff --git a/roottest/root/tree/evolution/colClass1.h b/roottest/root/tree/evolution/colClass1.h
index e03f4e7d03db9..20aebf8108996 100644
--- a/roottest/root/tree/evolution/colClass1.h
+++ b/roottest/root/tree/evolution/colClass1.h
@@ -45,7 +45,7 @@ class colClass {
    ClassDef(colClass,2);
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class MoreNested+;
 #pragma link C++ class Nested+;
 #pragma link C++ class Inside+;
diff --git a/roottest/root/tree/evolution/colClass2.h b/roottest/root/tree/evolution/colClass2.h
index 540a338bd19f9..083d2601222cf 100644
--- a/roottest/root/tree/evolution/colClass2.h
+++ b/roottest/root/tree/evolution/colClass2.h
@@ -44,7 +44,7 @@ class colClass {
    ClassDef(colClass,3);
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class MoreNested+;
 #pragma link C++ class Nested+;
 #pragma link C++ class Inside+;
diff --git a/roottest/root/tree/evolution/myclass1.h b/roottest/root/tree/evolution/myclass1.h
index a6390c84ee00a..bf8cc53ee6686 100644
--- a/roottest/root/tree/evolution/myclass1.h
+++ b/roottest/root/tree/evolution/myclass1.h
@@ -72,6 +72,6 @@ class myclass: public TNamed
    ClassDefOverride(myclass,1)
 }; 
 
-#ifdef __MAKECINT__ 
+#ifdef __ROOTCLING__ 
 #pragma link C++ class myclass+; 
 #endif
diff --git a/roottest/root/tree/evolution/myclass2.h b/roottest/root/tree/evolution/myclass2.h
index 2aa83bc491fd8..c18f94ded994a 100644
--- a/roottest/root/tree/evolution/myclass2.h
+++ b/roottest/root/tree/evolution/myclass2.h
@@ -72,6 +72,6 @@ class myclass: public TNamed
    ClassDefOverride(myclass,2)
 }; 
 
-#ifdef __MAKECINT__ 
+#ifdef __ROOTCLING__ 
 #pragma link C++ class myclass+; 
 #endif
diff --git a/roottest/root/tree/interpreted/macroFriends2.C b/roottest/root/tree/interpreted/macroFriends2.C
index e19113f43793b..302a0594b9733 100644
--- a/roottest/root/tree/interpreted/macroFriends2.C
+++ b/roottest/root/tree/interpreted/macroFriends2.C
@@ -37,7 +37,7 @@ class MyClass: public TNamed {
       void GetTree();
       void GetTreeZ();
 
-#if !defined (__CINT__) || defined (__MAKECINT__)
+#if !defined (__CLING__) || defined (__ROOTCLING__)
       ClassDefOverride(MyClass,1) //MyClass
 #endif
 };
@@ -59,14 +59,12 @@ class MyData {
       Int_t    GetID() const {return fID;}
       Double_t GetX()  const {return fX;}
 
-#if !defined (__CINT__) || defined (__MAKECINT__)
+#if !defined (__CLING__) || defined (__ROOTCLING__)
       ClassDef(MyData,1) //MyData
 #endif
 };
 
 
-#if !defined (__CINT__) || defined (__MAKECINT__)
-#endif
 
 //______________________________________________________________________________
 MyClass::MyClass(const char *name, const char *title)
diff --git a/roottest/root/tree/selector/execGetSelector.C b/roottest/root/tree/selector/execGetSelector.C
index 2b37f077ebebf..76179ec3c4ebe 100644
--- a/roottest/root/tree/selector/execGetSelector.C
+++ b/roottest/root/tree/selector/execGetSelector.C
@@ -4,9 +4,7 @@
 #include "TSelector.h"
 #include "TError.h"
 
-#ifndef __CINT__
 #include "emptysel.h"
-#endif
 
 void execGetSelector(string infilename = "Event1.root", int nevents = 10)
 {
diff --git a/roottest/root/tree/selector/selabort.h b/roottest/root/tree/selector/selabort.h
index e451071e0ef56..533dd5f2efeb6 100644
--- a/roottest/root/tree/selector/selabort.h
+++ b/roottest/root/tree/selector/selabort.h
@@ -14,7 +14,7 @@
 #include <TFile.h>
 #include <TSelector.h>
 #include <TRef.h>
-#ifndef __CINT__
+#ifndef __CLING__
 #include <Riostream.h>
 #endif
 #include <cstdio>
diff --git a/roottest/root/tree/selectorreader/SampleClasses.h b/roottest/root/tree/selectorreader/SampleClasses.h
index 85cba74a772f0..17ac0af37179a 100644
--- a/roottest/root/tree/selectorreader/SampleClasses.h
+++ b/roottest/root/tree/selectorreader/SampleClasses.h
@@ -6,7 +6,7 @@
 #include "TClonesArray.h"
 #include <vector>
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vector<EventData>+;
 #pragma link C++ class vector<Particle>+;
 #pragma link C++ class vector<ClassWithArray>+;
diff --git a/roottest/root/tree/stl/runmixing.C b/roottest/root/tree/stl/runmixing.C
index 209303ae7f9c9..63c9644927041 100644
--- a/roottest/root/tree/stl/runmixing.C
+++ b/roottest/root/tree/stl/runmixing.C
@@ -3,16 +3,16 @@
 
 namespace std {}; using namespace std;
 
-#if defined(__CINT__) && !defined(__MAKECINT__)
+#if defined(__CLING__) && !defined(__ROOTCLING__) && !defined(ClingWorkAroundMissingSmartInclude)
 #include "MyClass.h+"
 #else
 #include "MyClass.h"
 #endif
 
-#if defined(__MAKECINT__) && !defined(R__ACLIC_ROOTMAP)
+#if defined(__ROOTCLING__) && !defined(R__ACLIC_ROOTMAP)
 #pragma link C++ class MyClass+;
 #endif
-#if defined(__MAKECINT__) && defined(VECTOR_DICT)
+#if defined(__ROOTCLING__) && defined(VECTOR_DICT)
 #pragma link C++ class vector<MyClass>;
 #endif
 
diff --git a/roottest/root/tree/stl/runsimple.C b/roottest/root/tree/stl/runsimple.C
index 7358e07cab821..492f7fa2dfb7f 100644
--- a/roottest/root/tree/stl/runsimple.C
+++ b/roottest/root/tree/stl/runsimple.C
@@ -4,7 +4,7 @@
 #include <vector>
 #include <iostream>
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 //#pragma link C++ class pair<int,long>+;
 #pragma link C++ class vector<pair<int,long> >+;
 #endif
diff --git a/roottest/root/treeformula/array/DataLinkDef.h b/roottest/root/treeformula/array/DataLinkDef.h
index 8c846c4c6e03b..f07c47f764286 100644
--- a/roottest/root/treeformula/array/DataLinkDef.h
+++ b/roottest/root/treeformula/array/DataLinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/roottest/root/treeformula/array/NtpLib.C b/roottest/root/treeformula/array/NtpLib.C
index 8784ed8e347ab..0e91ba135eca9 100644
--- a/roottest/root/treeformula/array/NtpLib.C
+++ b/roottest/root/treeformula/array/NtpLib.C
@@ -1,7 +1,7 @@
 #include "FillNtp.cxx"
 #include "NtpRecord.cxx"
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class NtpShower+;
 #pragma link C++ class NtpEvent+;
 #pragma link C++ class NtpRecord+;
diff --git a/roottest/root/treeformula/array/ScanString.C b/roottest/root/treeformula/array/ScanString.C
index e1cd82a4448d1..eea7a9889a913 100644
--- a/roottest/root/treeformula/array/ScanString.C
+++ b/roottest/root/treeformula/array/ScanString.C
@@ -27,7 +27,7 @@ void ScanString() {
    t->Scan("tops.i:tops.title.fData","");
 }
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vector<ScanStringClass>;
 #endif
 
diff --git a/roottest/root/treeformula/array/nonsplit.C b/roottest/root/treeformula/array/nonsplit.C
index cfeb97576c195..03f19c6ba88af 100644
--- a/roottest/root/treeformula/array/nonsplit.C
+++ b/roottest/root/treeformula/array/nonsplit.C
@@ -2,7 +2,7 @@
 #include "TTree.h"
 #include <vector>
 
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link C++ class std::vector<std::vector<int> >+;
 #endif
 
diff --git a/roottest/root/treeformula/array/runvectorOfvector.C b/roottest/root/treeformula/array/runvectorOfvector.C
index 3f1a938ea0991..a91f82dbcd2d5 100644
--- a/roottest/root/treeformula/array/runvectorOfvector.C
+++ b/roottest/root/treeformula/array/runvectorOfvector.C
@@ -6,9 +6,7 @@ typedef std::vector<unsigned int> subUCollection;
 typedef std::vector<subUCollection> Ucollection;
 typedef std::vector<int> subCollection;
 typedef std::vector<subCollection> collection;
-#ifndef __CINT__
 typedef std::vector<collection> third;
-#endif
 
 // classZ.vector<vector<int> >      -> 4, t->Draw("vec.fVec1");t->Draw("vec.fVecPtr");
 // vector<classX.vector<classY> > > -> 5, t->Draw("vec.fVec2");
diff --git a/roottest/root/treeformula/array/twodimvar.C b/roottest/root/treeformula/array/twodimvar.C
index b734ef7a32ac0..e988d521a0c59 100644
--- a/roottest/root/treeformula/array/twodimvar.C
+++ b/roottest/root/treeformula/array/twodimvar.C
@@ -1,9 +1,5 @@
 #include "twodimvar.h"
 
-#if !defined(__CINT__)
-#endif
-
-
 A::A() {
   a=0;
   for(int k=0;k<3;k++) {
diff --git a/roottest/root/treeformula/evolution/myclass1.h b/roottest/root/treeformula/evolution/myclass1.h
index ffc21c798eb3c..5cd8aad8e5187 100644
--- a/roottest/root/treeformula/evolution/myclass1.h
+++ b/roottest/root/treeformula/evolution/myclass1.h
@@ -11,7 +11,7 @@ class myclass: public TNamed
   ClassDefOverride(myclass,1); 
 }; 
 
-#ifdef __MAKECINT__ 
+#ifdef __ROOTCLING__ 
 #pragma link C++ class myclass+; 
 #endif
 
diff --git a/roottest/root/treeformula/evolution/myclass2.h b/roottest/root/treeformula/evolution/myclass2.h
index d87a1fe7b2fc3..b1026179c498e 100644
--- a/roottest/root/treeformula/evolution/myclass2.h
+++ b/roottest/root/treeformula/evolution/myclass2.h
@@ -12,7 +12,7 @@ class myclass: public TNamed
   ClassDefOverride(myclass,2); 
 }; 
 
-#ifdef __MAKECINT__ 
+#ifdef __ROOTCLING__ 
 #pragma link C++ class myclass+; 
 #endif
 
diff --git a/roottest/root/treeformula/function/A.C b/roottest/root/treeformula/function/A.C
index bd3104b3c59e8..be29b35552ab5 100644
--- a/roottest/root/treeformula/function/A.C
+++ b/roottest/root/treeformula/function/A.C
@@ -1,9 +1,5 @@
 #include "A.h"
 
-#if !defined(__CINT__)
-#endif
-
-
 A::A() {
   ;
 }
diff --git a/roottest/root/treeformula/function/ALinkDef.h b/roottest/root/treeformula/function/ALinkDef.h
index ce8cca1bfd72d..bad2fe5c5ec28 100644
--- a/roottest/root/treeformula/function/ALinkDef.h
+++ b/roottest/root/treeformula/function/ALinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link C++ class A+;
 
 
diff --git a/roottest/root/treeformula/function/B.C b/roottest/root/treeformula/function/B.C
index ca9fcee0ebca7..3cb50e5da297f 100644
--- a/roottest/root/treeformula/function/B.C
+++ b/roottest/root/treeformula/function/B.C
@@ -1,6 +1,6 @@
 #include "B.h"
 
-#if !defined(__CINT__)
+#if !defined(__CLING__)
 #endif
 
 
diff --git a/roottest/root/treeformula/function/BLinkDef.h b/roottest/root/treeformula/function/BLinkDef.h
index f21e2a8c6daec..8ba52c6301eaf 100644
--- a/roottest/root/treeformula/function/BLinkDef.h
+++ b/roottest/root/treeformula/function/BLinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link C++ class B+;
 #pragma link C++ class vector<A>;
 
diff --git a/roottest/root/treeformula/function/MyClass.h b/roottest/root/treeformula/function/MyClass.h
index ef40e1b755735..5f742df517c49 100644
--- a/roottest/root/treeformula/function/MyClass.h
+++ b/roottest/root/treeformula/function/MyClass.h
@@ -30,7 +30,7 @@ class MyClass : public TObject {
 #endif
 
 
-#ifdef __CINT__
+#ifdef __CLING__
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/roottest/root/treeformula/function/lista.C b/roottest/root/treeformula/function/lista.C
index d6dafc0beb1a9..cf262a67c9c33 100644
--- a/roottest/root/treeformula/function/lista.C
+++ b/roottest/root/treeformula/function/lista.C
@@ -32,7 +32,7 @@ private:
   ClassDefOverride(TPlate,1); // a plate
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class TStrip+;
 #pragma link C++ class TPlate+;
 #endif
diff --git a/roottest/root/treeformula/parse/EventTcaMember.h b/roottest/root/treeformula/parse/EventTcaMember.h
index b031a8f86cf37..dc89104636b33 100644
--- a/roottest/root/treeformula/parse/EventTcaMember.h
+++ b/roottest/root/treeformula/parse/EventTcaMember.h
@@ -25,10 +25,10 @@ class EventTcaMember : public TObject
    ClassDefOverride(EventTcaMember, 1)
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class Track+;
 #pragma link C++ class EventTcaMember+;
-#endif // __MAKECINT__
+#endif // __ROOTCLING__
    
 #endif // ! _EVENT_TCA_MEMBER_H
 
diff --git a/roottest/root/treeformula/parse/runbase.C b/roottest/root/treeformula/parse/runbase.C
index d743de35931ff..2f4e2294bb4ef 100755
--- a/roottest/root/treeformula/parse/runbase.C
+++ b/roottest/root/treeformula/parse/runbase.C
@@ -1,6 +1,6 @@
 #include "ClassDefinitions.C"
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class QRawPulseR+;
 #pragma link C++ class QRawTriggerPulseR+;
 #pragma link C++ class QRawEventR+;
diff --git a/roottest/root/treeformula/perf/tform.C b/roottest/root/treeformula/perf/tform.C
index 09b7043ca029c..00faf5567d286 100644
--- a/roottest/root/treeformula/perf/tform.C
+++ b/roottest/root/treeformula/perf/tform.C
@@ -23,7 +23,7 @@ void tform(int formula, int iter) {
       
 }
 
-#ifndef __CINT__
+#ifndef __CLING__
 int main(int argc,char**argv) {
 
    if (argc!=3) {
diff --git a/roottest/root/treeformula/references/EventLinkDef.h b/roottest/root/treeformula/references/EventLinkDef.h
index 2b68587a195ea..03179cf9ad448 100644
--- a/roottest/root/treeformula/references/EventLinkDef.h
+++ b/roottest/root/treeformula/references/EventLinkDef.h
@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link C++ nestedclasses;
 #pragma link C++ nestedtypedef;
diff --git a/roottest/root/treeformula/stl/mapvector.C b/roottest/root/treeformula/stl/mapvector.C
index 72a0f21c97c72..98a7e19df02d1 100644
--- a/roottest/root/treeformula/stl/mapvector.C
+++ b/roottest/root/treeformula/stl/mapvector.C
@@ -14,7 +14,7 @@ public:
    }
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class pair<int,std::vector<int> >+;
 #endif
 
diff --git a/roottest/root/treeformula/string/runstring.C b/roottest/root/treeformula/string/runstring.C
index d7787b25a1baa..ecd4c8f0698e3 100644
--- a/roottest/root/treeformula/string/runstring.C
+++ b/roottest/root/treeformula/string/runstring.C
@@ -36,7 +36,7 @@ public:
       
 
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vector<string>+;
 #endif
 
diff --git a/roottest/root/treeformula/sync/loadcode.C b/roottest/root/treeformula/sync/loadcode.C
index cf43ffd8ec00d..205e177aa361a 100644
--- a/roottest/root/treeformula/sync/loadcode.C
+++ b/roottest/root/treeformula/sync/loadcode.C
@@ -149,7 +149,7 @@ void jetwrite(const char* ofname="jetclass.root", Int_t num=5)
 //------------------------ jetclass_linkdef.h ------------------------------
 
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class Jet+;
 #pragma link C++ class Event+;
 #endif
diff --git a/roottest/root/treeproxy/stlvec/analyze.h b/roottest/root/treeproxy/stlvec/analyze.h
index c79dc36d0be8e..15c7bef994177 100644
--- a/roottest/root/treeproxy/stlvec/analyze.h
+++ b/roottest/root/treeproxy/stlvec/analyze.h
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <fstream>
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vector<TLorentzVector>+; 
 #endif 
 
diff --git a/roottest/root/treeproxy/stlvec/cutting.h b/roottest/root/treeproxy/stlvec/cutting.h
index c79dc36d0be8e..15c7bef994177 100644
--- a/roottest/root/treeproxy/stlvec/cutting.h
+++ b/roottest/root/treeproxy/stlvec/cutting.h
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <fstream>
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vector<TLorentzVector>+; 
 #endif 
 
diff --git a/roottest/root/treeproxy/vectorint/runvectorint.C b/roottest/root/treeproxy/vectorint/runvectorint.C
index 9a3258ebb580b..541260fd10159 100644
--- a/roottest/root/treeproxy/vectorint/runvectorint.C
+++ b/roottest/root/treeproxy/vectorint/runvectorint.C
@@ -15,7 +15,7 @@ public:
    ClassDefOverride(Track,1);
 };
 
-#ifdef __MAKECINT__
+#ifdef __ROOTCLING__
 #pragma link C++ class vector<vector<double> >+;
 //NOTYET #pragma link C++ class vector<vector<vector<double> > >+;
 #pragma link C++ class Track+;
diff --git a/test/TestVectors.cxx b/test/TestVectors.cxx
index 88e7d88b0fdde..a1c6ea9713412 100644
--- a/test/TestVectors.cxx
+++ b/test/TestVectors.cxx
@@ -1,7 +1,7 @@
 // @(#)root/test:$Id$
 // Author: Peter Malzacher   19/06/99
 
-#ifndef __CINT__
+#ifndef __CLING__
 #include <Riostream.h>
 #include <TMath.h>
 #include <TVector3.h>
diff --git a/test/dt_MakeRef.C b/test/dt_MakeRef.C
index e3afe851da68e..2052d10fc4ea7 100644
--- a/test/dt_MakeRef.C
+++ b/test/dt_MakeRef.C
@@ -7,7 +7,7 @@
 #include "TH2.h"
 #include "TSystem.h"
 
-#ifndef __CINT__
+#ifndef __CLING__
 #include "Event.h"
 #endif
 
diff --git a/test/hsimple.cxx b/test/hsimple.cxx
index 566bde29525f6..e6d345df243cf 100644
--- a/test/hsimple.cxx
+++ b/test/hsimple.cxx
@@ -16,7 +16,7 @@
 
 int hsimple();
 
-#ifndef __CINT__
+#ifndef __CLING__
 #include "TFile.h"
 #include "TH1.h"
 #include "TH2.h"
diff --git a/test/minexam.cxx b/test/minexam.cxx
index d922c03124804..6347fae3161c4 100644
--- a/test/minexam.cxx
+++ b/test/minexam.cxx
@@ -23,7 +23,7 @@
 void fcnk0(int &npar, double *gin, double &f, double *x, int iflag);
 int minexam();
 
-#ifndef __CINT__
+#ifndef __CLING__
 #include "TVirtualFitter.h"
 #include "TMath.h"
 #include "TStopwatch.h"
diff --git a/test/stress.cxx b/test/stress.cxx
index 4db3b572c5b7a..8741a54de4b43 100644
--- a/test/stress.cxx
+++ b/test/stress.cxx
@@ -68,7 +68,7 @@
 //******************************************************************
 //
 //_____________________________batch only_____________________
-#ifndef __CINT__
+#ifndef __CLING__
 
 #include <cstdlib>
 #include <TROOT.h>
@@ -221,7 +221,7 @@ void stress(Int_t nevent, Int_t style = 1,
    Float_t mbtot1 = mbin1+mbout1;
    printf("stress    : Compr I/O =%7.1f Mbytes, I =%7.1f, O =%6.1f\n",mbtot1,mbin1,mbout1);
    gBenchmark->Print("stress");
-#ifndef __CINT__
+#ifndef __CLING__
    Float_t cp_brun_30   = 12.73;
    Float_t cp_brun_1000 = 61.88;
 #else
diff --git a/test/stressEntryList.cxx b/test/stressEntryList.cxx
index a08f24dc2772c..8fd7fb38285d9 100644
--- a/test/stressEntryList.cxx
+++ b/test/stressEntryList.cxx
@@ -672,7 +672,7 @@ Int_t stressEntryList(Int_t nentries, Int_t nfiles)
    return retval;
 }
 //_____________________________batch only_____________________
-#ifndef __CINT__
+#ifndef __CLING__
 
 int main(int argc, char *argv[])
 {
diff --git a/test/stressFit.cxx b/test/stressFit.cxx
index 80bbd0200f29c..c52997a7c0234 100644
--- a/test/stressFit.cxx
+++ b/test/stressFit.cxx
@@ -659,7 +659,7 @@ Int_t stressFit(const char *type, const char *algo, Int_t N)
 
   printf("******************************************************************\n");
   gBenchmark->Print("stressFit");
-#ifdef __CINT__
+#ifdef __CLING__
   Double_t reftime = 86.34; //macbrun interpreted
 #else
   Double_t reftime = 12.07; //macbrun compiled
@@ -675,7 +675,7 @@ Int_t stressFit(const char *type, const char *algo, Int_t N)
 }
 
 //_____________________________batch only_____________________
-#ifndef __CINT__
+#ifndef __CLING__
 
 int main(int argc,const char *argv[])
 {
diff --git a/test/stressGeometry.cxx b/test/stressGeometry.cxx
index 7fb6bf97e7887..253bc8574e974 100644
--- a/test/stressGeometry.cxx
+++ b/test/stressGeometry.cxx
@@ -57,7 +57,7 @@
 Double_t tpstot = 0;
 Double_t tpsref = 112.1; //time including the generation of the ref files
 Bool_t testfailed = kFALSE;
-#ifndef __CINT__
+#ifndef __CLING__
 void stressGeometry(const char*, Bool_t, Bool_t);
 
 int main(int argc, char **argv)
diff --git a/test/stressIOPlugins.cxx b/test/stressIOPlugins.cxx
index c391e26616334..8aa64734a0ffb 100644
--- a/test/stressIOPlugins.cxx
+++ b/test/stressIOPlugins.cxx
@@ -53,7 +53,7 @@
 //         : filename with a url query in Add...................... OK
 // ****************************************************************************
 //_____________________________batch only_____________________
-#ifndef __CINT__
+#ifndef __CLING__
 
 #include <cstdlib>
 #include <snprintf.h>
diff --git a/test/stressInterpreter.cxx b/test/stressInterpreter.cxx
index 2b220fe049dd5..b1437bd793cf3 100644
--- a/test/stressInterpreter.cxx
+++ b/test/stressInterpreter.cxx
@@ -440,7 +440,7 @@ bool stressInterpreter(Int_t ntimes = 10, const char* runTests = 0, const char*
    return !stress.run(ntimes, runTests);
 }
 
-#if !defined(__CINT__) && !defined(__CLING__)
+#if !defined(__CLING__) && !defined(__CLING__)
 // If compiled: interpret! (by default)
 
 int main(int argc, char **argv)
diff --git a/test/stressLinear.cxx b/test/stressLinear.cxx
index 71846f53ac276..270950876c261 100644
--- a/test/stressLinear.cxx
+++ b/test/stressLinear.cxx
@@ -179,7 +179,7 @@ void   stress_backward_io          ();
 void   cleanup                     ();
 
 //_____________________________batch only_____________________
-#ifndef __CINT__
+#ifndef __CLING__
 
 int main(int argc,const char *argv[])
 {
@@ -234,7 +234,7 @@ void stressLinear(Int_t maxSizeReq,Int_t verbose)
     mstress_binary_ebe_op(maxSize/2,maxSize);
     mstress_transposition(maxSize);
     mstress_special_creation(maxSize);
-#ifndef __CINT__
+#ifndef __CLING__
     mstress_matrix_promises(maxSize);
 #endif
     mstress_norms(maxSize,maxSize/2);
@@ -462,7 +462,7 @@ void mstress_matrix_fill(Int_t rsize,Int_t csize)
   if (gVerbose)
     std::cout << "Creating m  with Apply function..." << std::endl;
   TMatrixD m(-1,rsize-2,1,csize);
-#ifndef __CINT__
+#ifndef __CLING__
   FillMatrix f(m);
   m.Apply(f);
 #else
@@ -736,7 +736,7 @@ void mstress_element_op(Int_t rsize,Int_t csize)
   if (gVerbose)
     std::cout << "\nCheck out to see that sin^2(x) + cos^2(x) = 1" << std::endl;
   {
-#ifndef __CINT__
+#ifndef __CLING__
     FillMatrix f(m);
     m.Apply(f);
 #else
@@ -747,7 +747,7 @@ void mstress_element_op(Int_t rsize,Int_t csize)
   }
   m1 = m;
   {
-#ifndef __CINT__
+#ifndef __CLING__
     ApplyFunction s(&TMath::Sin);
     ApplyFunction c(&TMath::Cos);
     m.Apply(s);
@@ -936,7 +936,7 @@ class MakeHilbert : public TElementPosActionD {
   MakeHilbert() { }
 };
 
-#if !defined (__CINT__) || defined (__MAKECINT__)
+#if !defined (__CLING__) || defined (__ROOTCLING__)
 class TestUnit : public TElementPosActionD {
   mutable Int_t fIsUnit;
   void Operation(Double_t &element) const override
@@ -971,7 +971,7 @@ void mstress_special_creation(Int_t dim)
     TMatrixD m1(TMatrixD::kZero,m);
     ok &= ( !(m == m1) ) ? kTRUE : kFALSE;
     ok &= ( m != 0 ) ? kTRUE : kFALSE;
-#ifndef __CINT__
+#ifndef __CLING__
     MakeHilbert mh;
     m1.Apply(mh);
 #else
@@ -999,7 +999,7 @@ void mstress_special_creation(Int_t dim)
     if (gVerbose)
       std::cout << "test creating unit matrices" << std::endl;
     TMatrixD m(dim,dim);
-#ifndef __CINT__
+#ifndef __CLING__
     {
       TestUnit test_unit;
       m.Apply(test_unit);
@@ -1009,7 +1009,7 @@ void mstress_special_creation(Int_t dim)
     ok &= ( !is_indeed_unit(m) ) ? kTRUE : kFALSE;
 #endif
     m.UnitMatrix();
-#ifndef __CINT__
+#ifndef __CLING__
     {
       TestUnit test_unit;
        m.Apply(test_unit);
@@ -1020,7 +1020,7 @@ void mstress_special_creation(Int_t dim)
 #endif
     m.ResizeTo(dim-1,dim);
     TMatrixD m2(TMatrixD::kUnit,m);
-#ifndef __CINT__
+#ifndef __CLING__
     {
       TestUnit test_unit;
       m2.Apply(test_unit);
@@ -1031,7 +1031,7 @@ void mstress_special_creation(Int_t dim)
 #endif
     m.ResizeTo(dim,dim-2);
     m.UnitMatrix();
-#ifndef __CINT__
+#ifndef __CLING__
     {
       TestUnit test_unit;
       m.Apply(test_unit);
@@ -1081,7 +1081,7 @@ void mstress_special_creation(Int_t dim)
   StatusPrint(6,"Haar/Hilbert Matrix",ok);
 }
 
-#ifndef __CINT__
+#ifndef __CLING__
 //
 //------------------------------------------------------------------------
 //           Test matrix promises
@@ -1535,7 +1535,7 @@ void mstress_mm_multiplications()
       ok &= VerifyMatrixIdentity(mm1,mm2,verbose,epsilon);
     }
 
-#ifndef __CINT__
+#ifndef __CLING__
     if (nr >= Int_t(1.0e+5/msize/msize)) {
 #else
     if (nr >= Int_t(1.0e+3/msize/msize)) {
@@ -1879,7 +1879,7 @@ void mstress_vm_multiplications()
       ok &= VerifyMatrixIdentity(mvb,mvm,verbose,epsilon);
     }
 
-#ifndef __CINT__
+#ifndef __CLING__
     if (nr >= Int_t(1.0e+5/msize/msize)) {
 #else
     if (nr >= Int_t(1.0e+3/msize/msize)) {
@@ -2009,7 +2009,7 @@ void mstress_inversion()
       ok &= VerifyMatrixIdentity(mmi,unit,verbose,epsilon);
     }
 
-#ifndef __CINT__
+#ifndef __CLING__
     if (nr >= Int_t(1.0e+5/msize/msize)) {
 #else
     if (nr >= Int_t(1.0e+3/msize/msize)) {
@@ -2870,7 +2870,7 @@ void spstress_mm_multiplications()
       ok &= VerifyMatrixIdentity(m,mp3,verbose,epsilon);
     }
 
-#ifndef __CINT__
+#ifndef __CLING__
     if (nr >= Int_t(1.0e+5/msize/msize)) {
 #else
     if (nr >= Int_t(1.0e+3/msize/msize)) {
@@ -3002,7 +3002,7 @@ void spstress_vm_multiplications()
       ok &= VerifyMatrixIdentity(mvb,mvm,verbose,epsilon);
     }
 
-#ifndef __CINT__
+#ifndef __CLING__
     if (nr >= Int_t(1.0e+5/msize/msize)) {
 #else
     if (nr >= Int_t(1.0e+3/msize/msize)) {
@@ -3379,7 +3379,7 @@ void vstress_element_op(Int_t vsize)
       std::cout << "\nCheck out to see that sin^2(x) + cos^2(x) = 1" << std::endl;
     for (Int_t i = v.GetLwb(); i <= v.GetUpb(); i++)
       v(i) = 2*TMath::Pi()/v.GetNoElements()*i;
-#ifndef __CINT__
+#ifndef __CLING__
     SinAction s;
     v.Apply(s);
     CosAction c(v.GetNoElements());
@@ -3400,7 +3400,7 @@ void vstress_element_op(Int_t vsize)
 
   if (gVerbose)
     std::cout << "\nVerify constructor with initialization" << std::endl;
-#ifndef __CINT__
+#ifndef __CLING__
   TVectorD vi(0,4,0.0,1.0,2.0,3.0,4.0,"END");
 #else
   Double_t vval[] = {0.0,1.0,2.0,3.0,4.0};
@@ -3887,7 +3887,7 @@ Bool_t test_svd_expansion(const TMatrixD &A)
   return ok;
 }
 
-#ifndef __CINT__
+#ifndef __CLING__
 // Make a matrix from an array (read it row-by-row)
 class MakeMatrix : public TMatrixDLazy {
   const Double_t *array;
@@ -4122,7 +4122,7 @@ void astress_lineqn()
         ok &= VerifyVectorValue(b1,1.0,verbose,msize*EPSILON);
     }
 
-#ifndef __CINT__
+#ifndef __CLING__
     if (nr >= Int_t(1.0e+5/msize/msize)) {
 #else
     if (nr >= Int_t(1.0e+3/msize/msize)) {
@@ -4162,7 +4162,7 @@ void astress_pseudo()
 
   // Allocate and fill matrix A
   enum {nrows = 4, ncols = 3};
-#ifndef __CINT__
+#ifndef __CLING__
   const Double_t A_data [nrows*ncols] =
 #else
   const Double_t A_data [12] =
diff --git a/test/stressMathCore.cxx b/test/stressMathCore.cxx
index 1e09ac34f64f3..ccc417e5bff50 100644
--- a/test/stressMathCore.cxx
+++ b/test/stressMathCore.cxx
@@ -16,7 +16,7 @@
 //           VecTrackD which contains an std::vector<TrackD>
 //
 //
-// the program cun run only in compiled mode.
+// the program can run only in compiled mode.
 // To run outside ROOT do:
 //
 //    > cd $ROOTSYS/test
@@ -52,9 +52,6 @@
 //
 
 
-#ifndef __CINT__
-
-
 #include "Math/DistFuncMathCore.h"
 //#define USE_MATHMORE
 #ifdef USE_MATHMORE
@@ -92,9 +89,6 @@ R__ADD_INCLUDE_PATH($ROOTSYS/test)
 
 using namespace ROOT::Math;
 
-#endif
-
-
 //#define DEBUG
 
 bool debug = true;  // print out reason of test failures
@@ -154,7 +148,6 @@ int compare( std::string name, double v1, double v2, double scale = 2.0) {
    return iret;
 }
 
-#ifndef __CINT__
 
 
 // trait class  for distinguishing the number of parameters for the various functions
@@ -1524,27 +1517,12 @@ int testCompositeObj(int ngen) {
 }
 
 
-#endif // endif ifndef __CINT__
 
 
 int stressMathCore(double nscale = 1) {
 
    int iret = 0;
 
-#ifdef __CINT__
-   std::cout << "Test must be run in compile mode - use ACLIC to compile!!" << std::endl;
-
-
-   gSystem->Load("libMathCore");
-   gSystem->Load("libTree");
-   gROOT->ProcessLine(".L stressMathCore.cxx++");
-   return stressMathCore();
-#endif
-//    iret |= gSystem->Load("libMathCore");
-//    iret |= gSystem->Load("libMathMore");
-//    if (iret !=0) return iret;
-
-
    TBenchmark bm;
    bm.Start("stressMathCore");
 
diff --git a/test/stressMathMore.cxx b/test/stressMathMore.cxx
index 8669f08469e3a..fc12092c47ea9 100644
--- a/test/stressMathMore.cxx
+++ b/test/stressMathMore.cxx
@@ -43,7 +43,7 @@ using namespace ROOT::Math;
 
 
 
-#ifdef __CINT__
+#ifdef __CLING__
 #define INF 1.7E308
 #else
 #define INF std::numeric_limits<double>::infinity()
@@ -554,7 +554,7 @@ int stressMathMore(double nscale = 1) {
 
    int iret = 0;
 
-#ifdef __CINT__
+#ifdef __CLING__
    std::cout << "Test must be run in compile mode - please use ACLIC !!" << std::endl;
    return 0;
 #endif
diff --git a/test/stressShapes.cxx b/test/stressShapes.cxx
index e6265a8b52665..a46c75e5d30b1 100644
--- a/test/stressShapes.cxx
+++ b/test/stressShapes.cxx
@@ -1,5 +1,5 @@
 // Author : Mihaela Gheata   12-01-03
-#ifndef __CINT__
+#ifndef __CLING__
 #include <TRandom3.h>
 #include <TROOT.h>
 #include <snprintf.h>
@@ -177,7 +177,7 @@ void stressShapes()
 //  - generate 10000 random directions and propagate from the center
 //    of each volume -> compute total step length to exit current shape
 
-#ifdef __CINT__
+#ifdef __CLING__
    gSystem->Load("libGeom");
 #endif
 
diff --git a/test/stressSpectrum.cxx b/test/stressSpectrum.cxx
index f055fd01aed24..c7616f3119611 100644
--- a/test/stressSpectrum.cxx
+++ b/test/stressSpectrum.cxx
@@ -269,7 +269,7 @@ void stressSpectrum(Int_t ntimes=100) {
    printf("****************************************************************************\n");
 }
 
-#ifndef __CINT__
+#ifndef __CLING__
 
 int main(int argc, char **argv)
 {
diff --git a/test/tcollex.cxx b/test/tcollex.cxx
index 919c41be98993..1d75c205bdf95 100644
--- a/test/tcollex.cxx
+++ b/test/tcollex.cxx
@@ -390,7 +390,7 @@ int tcollex() {
    return 0;
 }
 
-#ifndef __CINT__
+#ifndef __CLING__
 int main() {
    return tcollex();
 }
diff --git a/test/vmatrix.cxx b/test/vmatrix.cxx
index 2accd882fd0f6..e40432ee616db 100644
--- a/test/vmatrix.cxx
+++ b/test/vmatrix.cxx
@@ -28,7 +28,7 @@
 //////////////////////////////////////////////////////////////////////////
 
 //_____________________________batch only_____________________
-#ifndef __CINT__
+#ifndef __CLING__
 
 #include <iostream>
 #include "snprintf.h"
@@ -105,7 +105,7 @@ void stress_matrix(Int_t verbose=0)
   stress_binary_ebe_op(10,20);
   stress_transposition(20);
   stress_special_creation(20);
-#ifndef __CINT__
+#ifndef __CLING__
   stress_matrix_promises(20);
 #endif
   stress_norms(40,20);
@@ -255,7 +255,7 @@ void stress_matrix_fill(Int_t rsize,Int_t csize)
   if (gVerbose)
     std::cout << "Creating m  with Apply function..." << std::endl;
   TMatrixD m(-1,rsize-2,1,csize);
-#ifndef __CINT__
+#ifndef __CLING__
   FillMatrix f(m);
   m.Apply(f);
 #else
@@ -504,7 +504,7 @@ void stress_element_op(Int_t rsize,Int_t csize)
   if (gVerbose)
     std::cout << "\nCheck out to see that sin^2(x) + cos^2(x) = 1" << std::endl;
   {
-#ifndef __CINT__
+#ifndef __CLING__
     FillMatrix f(m);
     m.Apply(f);
 #else
@@ -515,7 +515,7 @@ void stress_element_op(Int_t rsize,Int_t csize)
   }
   m1 = m;
   {
-#ifndef __CINT__
+#ifndef __CLING__
     ApplyFunction s(&TMath::Sin);
     ApplyFunction c(&TMath::Cos);
     m.Apply(s);
@@ -704,7 +704,7 @@ class MakeHilbert : public TElementPosActionD {
   MakeHilbert() { }
 };
 
-#ifndef __CINT__
+#ifndef __CLING__
 class TestUnit : public TElementPosActionD {
   mutable Int_t fIsUnit;
   void Operation(Double_t &element) const override
@@ -740,7 +740,7 @@ void stress_special_creation(Int_t dim)
     TMatrixD m1(TMatrixD::kZero,m);
     ok &= ( !(m == m1) ) ? kTRUE : kFALSE;
     ok &= ( m != 0 ) ? kTRUE : kFALSE;
-#ifndef __CINT__
+#ifndef __CLING__
     MakeHilbert mh;
     m1.Apply(mh);
 #else
@@ -768,7 +768,7 @@ void stress_special_creation(Int_t dim)
     if (gVerbose)
       std::cout << "test creating unit matrices" << std::endl;
     TMatrixD m(dim,dim);
-#ifndef __CINT__
+#ifndef __CLING__
     {
       TestUnit test_unit;
       m.Apply(test_unit);
@@ -778,7 +778,7 @@ void stress_special_creation(Int_t dim)
     ok &= ( !is_indeed_unit(m) ) ? kTRUE : kFALSE;
 #endif
     m.UnitMatrix();
-#ifndef __CINT__
+#ifndef __CLING__
     {
       TestUnit test_unit;
        m.Apply(test_unit);
@@ -789,7 +789,7 @@ void stress_special_creation(Int_t dim)
 #endif
     m.ResizeTo(dim-1,dim);
     TMatrixD m2(TMatrixD::kUnit,m);
-#ifndef __CINT__
+#ifndef __CLING__
     {
       TestUnit test_unit;
       m2.Apply(test_unit);
@@ -800,7 +800,7 @@ void stress_special_creation(Int_t dim)
 #endif
     m.ResizeTo(dim,dim-2);
     m.UnitMatrix();
-#ifndef __CINT__
+#ifndef __CLING__
     {
       TestUnit test_unit;
       m.Apply(test_unit);
diff --git a/test/vvector.cxx b/test/vvector.cxx
index ca8dd44302c91..b83e13db080fe 100644
--- a/test/vvector.cxx
+++ b/test/vvector.cxx
@@ -20,7 +20,7 @@
 //////////////////////////////////////////////////////////////////////////
 
 //_____________________________batch only_____________________
-#ifndef __CINT__
+#ifndef __CLING__
 
 #include "TFile.h"
 #include <iostream>
@@ -298,7 +298,7 @@ void stress_element_op(Int_t vsize)
       std::cout << "\nCheck out to see that sin^2(x) + cos^2(x) = 1" << std::endl;
     for (Int_t i = v.GetLwb(); i <= v.GetUpb(); i++)
       v(i) = 2*TMath::Pi()/v.GetNoElements()*i;
-#ifndef __CINT__
+#ifndef __CLING__
     SinAction s;
     v.Apply(s);
     CosAction c(v.GetNoElements());
@@ -319,7 +319,7 @@ void stress_element_op(Int_t vsize)
 
   if (gVerbose)
     std::cout << "\nVerify constructor with initialization" << std::endl;
-#ifndef __CINT__
+#ifndef __CLING__
   TVectorD vi(0,4,0.0,1.0,2.0,3.0,4.0,"END");
 #else
   Double_t vval[] = {0.0,1.0,2.0,3.0,4.0};
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;
diff --git a/tutorials/math/mathcoreVectorFloatIO.C b/tutorials/math/mathcoreVectorFloatIO.C
index 47dcee5b091c9..3e24266e0ae12 100644
--- a/tutorials/math/mathcoreVectorFloatIO.C
+++ b/tutorials/math/mathcoreVectorFloatIO.C
@@ -36,7 +36,7 @@
 // No need to force dictionary generation
 // You need to run ACLIC with old ROOT version
 // and uncomment these lines below
-// #ifdef __MAKECINT__
+// #ifdef __ROOTCLING__
 // #pragma link C++ class ROOT::Math::PxPyPzE4D<float>+;
 // #pragma link C++ class ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<float> >+;
 // #pragma link C++ typedef ROOT::Math::XYZTVectorF;
@@ -102,7 +102,7 @@ void read() {
 
 void runIt() {
 
-#if defined(__CINT__) && !defined(__MAKECINT__)
+#if defined(__CLING__) && !defined(__ROOTCLING__)
    gSystem->Load("libMathCore");
    gSystem->Load("libPhysics");
    using namespace ROOT::Math ;
@@ -117,7 +117,7 @@ void runIt() {
 }
 
 void mathcoreVectorFloatIO() {
-#if defined(__CINT__) && !defined(__MAKECINT__)
+#if defined(__CLING__) && !defined(__ROOTCLING__)
    gSystem->Load("libMathCore");
    gSystem->Load("libPhysics");
    using namespace ROOT::Math ;
diff --git a/tutorials/math/quadp/portfolio.C b/tutorials/math/quadp/portfolio.C
index 9cf3bb4751307..57b67511d909a 100644
--- a/tutorials/math/quadp/portfolio.C
+++ b/tutorials/math/quadp/portfolio.C
@@ -191,7 +191,7 @@ TArrayF &StockReturn(TFile *f,const TString &name,Int_t sDay,Int_t eDay)
   return *r;
 }
 
-#ifndef __MAKECINT__
+#ifndef __ROOTCLING__
 //---------------------------------------------------------------------------
 TVectorD OptimalInvest(Double_t riskFactor,TVectorD r,TMatrixDSym Covar)
 {
diff --git a/tutorials/visualisation/eve/SplitGLView.C b/tutorials/visualisation/eve/SplitGLView.C
index 4e15b2927c2ef..f529f36ea17e6 100644
--- a/tutorials/visualisation/eve/SplitGLView.C
+++ b/tutorials/visualisation/eve/SplitGLView.C
@@ -1376,7 +1376,7 @@ void SplitGLView::UpdateSummary()
    }
 }
 
-#ifdef __CINT__
+#ifdef __CLING__
 void SplitGLView()
 {
    printf("This script is used via ACLiC by the macro \"alice_esd_split.C\"\n");
diff --git a/tutorials/visualisation/gl/viewer3DLocal.C b/tutorials/visualisation/gl/viewer3DLocal.C
index 4cd72fd3124ef..6675bd7314ada 100644
--- a/tutorials/visualisation/gl/viewer3DLocal.C
+++ b/tutorials/visualisation/gl/viewer3DLocal.C
@@ -16,7 +16,7 @@
 /// code, this script must also be compiled to work correctly.
 ///
 /// ~~~{.cpp}
-/// #if defined(__CINT__) && !defined(__MAKECINT__)
+/// #if defined(__CLING__) && !defined(__ROOTCLING__)
 /// {
 ///    gSystem->CompileMacro("viewer3DLocal.C");
 ///    viewer3DLocal();