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 53425a41691df..abaa1e0d25c3b 100644
--- a/roottest/root/io/newstl/TestHelpers.C
+++ b/roottest/root/io/newstl/TestHelpers.C
@@ -65,7 +65,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 bd3e1250572de..d1345fa6e6bac 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 66ed645a687c3..04830d5a65888 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 3b56cc8e50b31..a95e672ed2f78 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 d6f5338eb6823..97bcc6b1afaab 100644
--- a/roottest/root/io/newstl/runbase.C
+++ b/roottest/root/io/newstl/runbase.C
@@ -60,7 +60,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 a6b6cf17db605..6a0e8c6232836 100644
--- a/roottest/root/io/newstl/sample_bx_classes.C
+++ b/roottest/root/io/newstl/sample_bx_classes.C
@@ -22,7 +22,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+;