diff --git a/core/base/inc/TAttMarker.h b/core/base/inc/TAttMarker.h
index 5fb30e7a181d5..25be4cba81211 100644
--- a/core/base/inc/TAttMarker.h
+++ b/core/base/inc/TAttMarker.h
@@ -53,7 +53,25 @@ class TAttMarker {
    ClassDef(TAttMarker,3);  //Marker attributes
 };
 
-   enum EMarkerStyle {kDot=1, kPlus, kStar, kCircle=4, kMultiply=5,
+   enum EMarkerStyle {kDot=1,
+// clang++ (-Wshadow) complains about shadowing TMatrixT::EMatrixCreatorsOp2 or TParameter::EStatusBits. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+                      kPlus,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+                      kStar, kCircle=4,
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+                      kMultiply=5,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
                       kFullDotSmall=6, kFullDotMedium=7, kFullDotLarge=8,
                       kFullCircle=20, kFullSquare=21, kFullTriangleUp=22,
                       kFullTriangleDown=23, kOpenCircle=24, kOpenSquare=25,
diff --git a/core/base/inc/TBuffer3D.h b/core/base/inc/TBuffer3D.h
index f32517e1ca505..8c3b50715041c 100644
--- a/core/base/inc/TBuffer3D.h
+++ b/core/base/inc/TBuffer3D.h
@@ -46,7 +46,16 @@ class TBuffer3D : public TObject
    static void IncCSLevel();
    static UInt_t DecCSLevel();
 
-   enum ESection { kNone            = BIT(0),
+   enum ESection {
+// clang++ (-Wshadow) complains about shadowing GuiTypes.h kNone. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+                   kNone            = BIT(0),
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
                    kCore            = BIT(1),
                    kBoundingBox     = BIT(2),
                    kShapeSpecific   = BIT(3),
diff --git a/core/base/inc/TBuffer3DTypes.h b/core/base/inc/TBuffer3DTypes.h
index f045d3ce5d222..f203b0be31356 100644
--- a/core/base/inc/TBuffer3DTypes.h
+++ b/core/base/inc/TBuffer3DTypes.h
@@ -23,8 +23,16 @@ class TBuffer3DTypes {
                             //                     g3d              geom
    enum EType { kGeneric,   // TBuffer3D           Rest             Rest
                 kComposite, // TBuffer3D                            TGetCompositeShape
+// clang++ (-Wshadow) complains about shadowing Buttons.h EEditMode. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
                 kLine,      // TBuffer3D           TPolyLine3D
                 kMarker,    // TBuffer3D           TPolyMarker3D
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
                 kSphere,    // TBuffer3DSphere     TSPHE            TGeoSphere
                 kTube,      // TBuffer3DTube                        TGeoTube
                 kTubeSeg,   // TBuffer3DTubeSeg                     TGeoTubeSeg
diff --git a/core/base/inc/TMemberInspector.h b/core/base/inc/TMemberInspector.h
index b6e4979944a29..6698d93f2a2c6 100644
--- a/core/base/inc/TMemberInspector.h
+++ b/core/base/inc/TMemberInspector.h
@@ -31,7 +31,15 @@ class TClass;
 class TMemberInspector {
 public:
    enum EObjectPointerState {
+// clang++ (-Wshadow) complains about shadowing TError.h kUnset. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kUnset, // No Inspect() call has been seen yet.
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kNoObjectGiven, // No object was given to the initial Inspect() call.
       kValidObjectGiven // The address points to an actual object.
    };
diff --git a/core/base/inc/TParameter.h b/core/base/inc/TParameter.h
index b5d99998173cb..f171051b9cf33 100644
--- a/core/base/inc/TParameter.h
+++ b/core/base/inc/TParameter.h
@@ -36,12 +36,21 @@ class TParameter : public TObject {
 
 public:
    // Defines options / status while merging:
-   enum EStatusBits { kMultiply   = BIT(16),    // Use multiplication
-                      kMax        = BIT(17),    // Take max value
-                      kMin        = BIT(18),    // Take min value
-                      kFirst      = BIT(19),    // Take the first value
-                      kLast       = BIT(20),    // Take the last value
-                      kIsConst    = BIT(21)     // Set if all values are equal
+   enum EStatusBits {
+// clang++ (-Wshadow) complains about shadowing TMatrixT::EMatrixCreatorsOp2. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kMultiply   = BIT(16),    // Use multiplication
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kMax        = BIT(17),    // Take max value
+      kMin        = BIT(18),    // Take min value
+      kFirst      = BIT(19),    // Take the first value
+      kLast       = BIT(20),    // Take the last value
+      kIsConst    = BIT(21)     // Set if all values are equal
    };
 
 private:
diff --git a/core/base/inc/TSystem.h b/core/base/inc/TSystem.h
index 8ce174ee3f922..e601d64eec1e1 100644
--- a/core/base/inc/TSystem.h
+++ b/core/base/inc/TSystem.h
@@ -84,7 +84,15 @@ enum ELogFacility {
 
 enum EFpeMask {
    kNoneMask         = 0x00,
+// clang++ (-Wshadow) complains about shadowing TSocket::ESocketErrors. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
    kInvalid          = 0x01,  // Invalid argument
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
    kDivByZero        = 0x02,  // Division by zero
    kOverflow         = 0x04,  // Overflow
    kUnderflow        = 0x08,  // Underflow
@@ -240,7 +248,15 @@ enum ESockOptions {
 };
 
 enum ESendRecvOptions {
+// clang++ (-Wshadow) complains about shadowing EAclicMode::kDefault. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
    kDefault,           // default option (= 0)
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
    kOob,               // send or receive out-of-band data
    kPeek,              // peek at incoming message (receive only)
    kDontBlock          // send/recv as much data as possible without blocking
@@ -276,7 +292,17 @@ class TProcessEventTimer : public TTimer {
 class TSystem : public TNamed {
 
 public:
-   enum EAclicMode { kDefault, kDebug, kOpt };
+   enum EAclicMode {
+// clang++ (-Wshadow) complains about shadowing ESendRecvOptions::kDefault. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kDefault,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kDebug, kOpt };
    enum EAclicProperties {
       kFlatBuildDir = BIT(0)           // If set and a BuildDir is selected, then do not created sub-directories
    };
diff --git a/core/base/inc/TVirtualPadPainter.h b/core/base/inc/TVirtualPadPainter.h
index c26a07b05570e..a1155d503d988 100644
--- a/core/base/inc/TVirtualPadPainter.h
+++ b/core/base/inc/TVirtualPadPainter.h
@@ -19,7 +19,17 @@ class TVirtualPad;
 class TVirtualPadPainter {
 public:
    enum EBoxMode  {kHollow, kFilled};
-   enum ETextMode {kClear,  kOpaque};
+   enum ETextMode {
+// clang++ (-Wshadow) complains about shadowing Getline.h EGetLineMode. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kClear,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kOpaque};
 
    virtual ~TVirtualPadPainter();
 
diff --git a/core/meta/inc/TEnum.h b/core/meta/inc/TEnum.h
index 266a929a4e8af..33b32c9122b3a 100644
--- a/core/meta/inc/TEnum.h
+++ b/core/meta/inc/TEnum.h
@@ -46,7 +46,16 @@ class TEnum : public TDictionary {
 
 public:
 
-   enum ESearchAction {kNone                 = 0,
+   enum ESearchAction {
+// clang++ (-Wshadow) complains about shadowing GuiTypes.h kNone. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+                       kNone                 = 0,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
                        kAutoload             = 1,
                        kInterpLookup         = 2,
                        kALoadAndInterpLookup = 3
diff --git a/core/meta/inc/TProtoClass.h b/core/meta/inc/TProtoClass.h
index d126333ce048a..48437860e87b7 100644
--- a/core/meta/inc/TProtoClass.h
+++ b/core/meta/inc/TProtoClass.h
@@ -47,7 +47,15 @@ class TProtoClass: public TNamed {
       enum EStatusFlags {
          kIsObject    = BIT(0),    // member is object
          kIsTransient = BIT(1),    // data member is transient
+// clang++ (-Wshadow) complains about shadowing TDictionary::EProperty. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
          kIsPointer   = BIT(2),    // data member is a pointer
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
          kBitMask     = 0x000000ff
       };
 
diff --git a/core/meta/inc/TVirtualStreamerInfo.h b/core/meta/inc/TVirtualStreamerInfo.h
index 1ddcc9812dd9b..46e1dabc561cf 100644
--- a/core/meta/inc/TVirtualStreamerInfo.h
+++ b/core/meta/inc/TVirtualStreamerInfo.h
@@ -74,7 +74,15 @@ class TVirtualStreamerInfo : public TNamed {
       kIgnoreTObjectStreamer = BIT(13),  // eventhough BIT(13) is taken up by TObject (to preserve forward compatibility)
       kRecovered             = BIT(14),
       kNeedCheck             = BIT(15),
+// clang++ (-Wshadow) complains about shadowing TDictionary::EProperty. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kIsCompiled            = BIT(16),
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kBuildOldUsed          = BIT(17),
       kBuildRunning          = BIT(18)
    };
@@ -114,11 +122,29 @@ class TVirtualStreamerInfo : public TNamed {
    /// | kUnsupportedConversion | The member type onfile and in memory can not be converted |
    /// | kUnset      | default value |
    enum EReadWrite {
-      kBase        =  0,  kOffsetL = 20,  kOffsetP = 40,  kCounter =  6,  kCharStar = 7,
+      kBase        =  0,  kOffsetL = 20,  kOffsetP = 40,
       kChar        =  1,  kShort   =  2,  kInt     =  3,  kLong    =  4,  kFloat    = 5,
+// clang++ (-Wshadow) complains about shadowing TDataType::EDataType. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kCounter =  6, kCharStar = 7,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kDouble      =  8,  kDouble32=  9,
       kLegacyChar  = 10, /// Equal to TDataType's kchar
-      kUChar       = 11,  kUShort  = 12,  kUInt    = 13,  kULong   = 14,  kBits     = 15,
+      kUChar       = 11,  kUShort  = 12,  kUInt    = 13,  kULong   = 14,
+// clang++ (-Wshadow) complains about shadowing TDataType::EDataType. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kBits     = 15,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kLong64      = 16,  kULong64 = 17,  kBool    = 18,  kFloat16 = 19,
       kObject      = 61,  kAny     = 62,  kObjectp = 63,  kObjectP = 64,  kTString  = 65,
       kTObject     = 66,  kTNamed  = 67,  kAnyp    = 68,  kAnyP    = 69,  kAnyPnoVT = 70,
@@ -136,7 +162,15 @@ class TVirtualStreamerInfo : public TNamed {
       kMissing     = 99999,
       kNoType      = -1,   /// Type corresponding to a 'missing' data member (with kMissing offset)
       kUnsupportedConversion = -2,
+// clang++ (-Wshadow) complains about shadowing Terror.h kUnset. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kUnset       = -3
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
    };
    // clang-format off
 
diff --git a/graf2d/gpad/inc/TControlBarButton.h b/graf2d/gpad/inc/TControlBarButton.h
index 7449446db124e..88a324e8e4f87 100644
--- a/graf2d/gpad/inc/TControlBarButton.h
+++ b/graf2d/gpad/inc/TControlBarButton.h
@@ -21,7 +21,17 @@ class TControlBarButton : public TNamed {
    TString  fAction;     ///< action to be executed
 
 public:
-   enum { kButton = 1, kDrawnButton, kSeparator };
+   enum {
+// clang++ (-Wshadow) complains about shadowing Buttons.h EEditMode. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kButton = 1,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kDrawnButton, kSeparator };
 
    TControlBarButton();
    TControlBarButton(const char *label, const char *action="", const char *hint="", const char *type="button");
diff --git a/graf2d/graf/inc/TCandle.h b/graf2d/graf/inc/TCandle.h
index 5a6c927d06600..b85a33b941e37 100644
--- a/graf2d/graf/inc/TCandle.h
+++ b/graf2d/graf/inc/TCandle.h
@@ -29,7 +29,15 @@ class TCandle : public TAttLine, public TAttFill, public TAttMarker {
    //Candle Option
    enum CandleOption: long {
       kNoOption           = 0,
+// clang++ (-Wshadow) complains about shadowing Buttons.h EEditMode. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kBox                = 1,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kMedianLine         = 10,
       kMedianNotched      = 20,
       kMedianCircle       = 30,
diff --git a/graf2d/x11ttf/inc/TGX11TTF.h b/graf2d/x11ttf/inc/TGX11TTF.h
index b1ee8a664e455..45884270b8954 100644
--- a/graf2d/x11ttf/inc/TGX11TTF.h
+++ b/graf2d/x11ttf/inc/TGX11TTF.h
@@ -27,8 +27,19 @@ class TXftFontHash;
 class TGX11TTF : public TGX11 {
 
 private:
-   enum EAlign { kNone, kTLeft, kTCenter, kTRight, kMLeft, kMCenter, kMRight,
-                        kBLeft, kBCenter, kBRight };
+   enum EAlign {
+// clang++ (-Wshadow) complains about shadowing GuiTypes.h kNone. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kNone,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
+      kTLeft, kTCenter, kTRight, kMLeft, kMCenter, kMRight,
+      kBLeft, kBCenter, kBRight };
 
    FT_Vector   fAlign;                 ///< alignment vector
 #ifdef R__HAS_XFT
diff --git a/graf3d/eve/inc/TEveCalo.h b/graf3d/eve/inc/TEveCalo.h
index 9a16346195c81..bb6fdc4ea122e 100644
--- a/graf3d/eve/inc/TEveCalo.h
+++ b/graf3d/eve/inc/TEveCalo.h
@@ -255,7 +255,17 @@ class TEveCaloLego : public TEveCaloViz
 public:
    enum EProjection_e { kAuto, k3D, k2D };
    enum E2DMode_e     { kValColor, kValSize, kValSizeOutline };
-   enum EBoxMode_e    { kNone, kFrontBack, kBack};
+   enum EBoxMode_e    {
+// clang++ (-Wshadow) complains about shadowing GuiTypes.h kNone. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kNone,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kFrontBack, kBack};
 
 private:
    TEveCaloLego(const TEveCaloLego&) = delete;
diff --git a/graf3d/eve/inc/TEveElement.h b/graf3d/eve/inc/TEveElement.h
index b15c00ca57490..a9621868a1c09 100644
--- a/graf3d/eve/inc/TEveElement.h
+++ b/graf3d/eve/inc/TEveElement.h
@@ -327,7 +327,15 @@ class TEveElement
 
    enum EDestruct
    {
+// clang++ (-Wshadow) complains about shadowing GuiTypes.h kNone. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kNone,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kStandard,
       kAnnihilate
    };
diff --git a/graf3d/gl/inc/TGLAnnotation.h b/graf3d/gl/inc/TGLAnnotation.h
index 636c521a4d901..0e894ba128efa 100644
--- a/graf3d/gl/inc/TGLAnnotation.h
+++ b/graf3d/gl/inc/TGLAnnotation.h
@@ -29,7 +29,25 @@ class TGLAnnotation : public TGLOverlayElement
    TGLAnnotation& operator=(const TGLAnnotation&) = delete;
 
 protected:
-   enum EDrag        { kMove, kResize, kNone };
+   enum EDrag        {
+// clang++ (-Wshadow) complains about shadowing GuiTypes.h ECursor or kNone. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kMove,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kResize,
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kNone };
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
    enum ENameStack   { kMoveID, kEditID, kDeleteID, kResizeID };
 
    void MakeEditor();
diff --git a/graf3d/gl/inc/TGLBoxPainter.h b/graf3d/gl/inc/TGLBoxPainter.h
index e3ba456e59536..371f093dcd074 100644
--- a/graf3d/gl/inc/TGLBoxPainter.h
+++ b/graf3d/gl/inc/TGLBoxPainter.h
@@ -36,7 +36,15 @@ class TGLBoxPainter : public TGLPlotPainter {
    TGLTH3Slice fXOYSlice;
 
    enum EBoxType {
+// clang++ (-Wshadow) complains about shadowing Buttons.h EEditMode. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kBox, //boxes, sizes are proportional to bin content
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kBox1 //spheres, not boxes
    };
 
diff --git a/graf3d/gl/inc/TGLManipSet.h b/graf3d/gl/inc/TGLManipSet.h
index 352e5c5805c53..26077029ec776 100644
--- a/graf3d/gl/inc/TGLManipSet.h
+++ b/graf3d/gl/inc/TGLManipSet.h
@@ -21,7 +21,17 @@ class TGLManipSet : public TGLOverlayElement,
                     public TGLPShapeRef
 {
 public:
-   enum EManip { kTrans, kScale, kRotate, kEndType };
+   enum EManip { kTrans, kScale,
+// clang++ (-Wshadow) complains about shadowing GuiTypes.h ECursor. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kRotate,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kEndType };
 
 private:
    TGLManipSet(const TGLManipSet&) = delete;
diff --git a/graf3d/gl/inc/TGLSelectRecord.h b/graf3d/gl/inc/TGLSelectRecord.h
index d7044db5d9c19..704242e9c9cbb 100644
--- a/graf3d/gl/inc/TGLSelectRecord.h
+++ b/graf3d/gl/inc/TGLSelectRecord.h
@@ -74,7 +74,17 @@ class TGLSelectRecordBase
 class TGLSelectRecord : public TGLSelectRecordBase
 {
 public:
-   enum ESecSelResult { kNone, kEnteringSelection, kLeavingSelection, kModifyingInternalSelection };
+   enum ESecSelResult {
+// clang++ (-Wshadow) complains about shadowing GuiTypes.h kNone. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kNone,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kEnteringSelection, kLeavingSelection, kModifyingInternalSelection };
 
 protected:
    // Secondary data (scene dependent) - use
diff --git a/graf3d/gl/inc/TGLTF3Painter.h b/graf3d/gl/inc/TGLTF3Painter.h
index cfaadaa5d839c..a5bb1005776c0 100644
--- a/graf3d/gl/inc/TGLTF3Painter.h
+++ b/graf3d/gl/inc/TGLTF3Painter.h
@@ -29,7 +29,15 @@ Draw TF3 using marching cubes.
 class TGLTF3Painter : public TGLPlotPainter {
 private:
    enum ETF3Style {
+// clang++ (-Wshadow) complains about shadowing TSystem::EAclicMode. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kDefault,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kMaple0,
       kMaple1,
       kMaple2
diff --git a/graf3d/gl/inc/TGLTH3Composition.h b/graf3d/gl/inc/TGLTH3Composition.h
index 574cd0a66fd2e..e7681ddb88d2d 100644
--- a/graf3d/gl/inc/TGLTH3Composition.h
+++ b/graf3d/gl/inc/TGLTH3Composition.h
@@ -30,7 +30,15 @@ class TGLTH3Composition : public TH3C {
    TGLTH3Composition();//I need it only because of explicit private copy ctor.
 
    enum ETH3BinShape {
+// clang++ (-Wshadow) complains about shadowing Buttons.h EEditMode. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kBox,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kSphere
    };
 
diff --git a/graf3d/x3d/inc/TViewerX3D.h b/graf3d/x3d/inc/TViewerX3D.h
index 61dd9d4900995..49ebc8d7574b4 100644
--- a/graf3d/x3d/inc/TViewerX3D.h
+++ b/graf3d/x3d/inc/TViewerX3D.h
@@ -56,7 +56,17 @@ friend class TX3DContainer;
    Int_t           fYPos;               // viewer Y position
    TVirtualPad    *fPad;                // pad we are attached to
    Bool_t          fBuildingScene;      // Rebuilding 3D scene
-   enum EPass { kSize, kDraw };         // Multi-pass build : size then draw
+   enum EPass {
+// clang++ (-Wshadow) complains about shadowing TSctructNode::EScalingType. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kSize,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kDraw };         // Multi-pass build : size then draw
    EPass           fPass;
 
    void     CreateViewer(const char *name);
diff --git a/gui/gui/inc/TGFrame.h b/gui/gui/inc/TGFrame.h
index a9f2e6350cf98..2631fea14a8c0 100644
--- a/gui/gui/inc/TGFrame.h
+++ b/gui/gui/inc/TGFrame.h
@@ -510,8 +510,16 @@ class TGTransientFrame : public TGMainFrame {
    TGTransientFrame(const TGWindow *p = nullptr, const TGWindow *main = nullptr, UInt_t w = 1, UInt_t h = 1,
                     UInt_t options = kVerticalFrame);
 
-   enum EPlacement { kCenter, kLeft, kRight, kTop, kBottom, kTopLeft, kTopRight,
-                     kBottomLeft, kBottomRight };
+   enum EPlacement { kCenter, kLeft, kRight, kTop, kBottom,
+// clang++ (-Wshadow) complains about shadowing ECursor enum (GuiTypes.h). Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+                     kTopLeft, kTopRight, kBottomLeft, kBottomRight };
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
    virtual void    CenterOnParent(Bool_t croot = kTRUE, EPlacement pos = kCenter);
    const TGWindow *GetMain() const { return fMain; }
    void    SavePrimitive(std::ostream &out, Option_t *option = "") override;
diff --git a/gui/gui/inc/TGImageMap.h b/gui/gui/inc/TGImageMap.h
index bd6cd5716642f..5d30e9b591160 100644
--- a/gui/gui/inc/TGImageMap.h
+++ b/gui/gui/inc/TGImageMap.h
@@ -33,7 +33,16 @@ class TGRegion : public TObject {
    TGRegion CopyRegion() const;
 
 public:
-   enum ERegionType { kRectangle, kEllipse };
+   enum ERegionType { kRectangle,
+// clang++ (-Wshadow) complains about shadowing Buttons.h EEditMode. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kEllipse };
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 
    TGRegion();
    TGRegion(Int_t x, Int_t y, UInt_t w, UInt_t h, ERegionType = kRectangle);
diff --git a/gui/gui/inc/TGListTree.h b/gui/gui/inc/TGListTree.h
index d2d2837e8df2a..35db51269012d 100644
--- a/gui/gui/inc/TGListTree.h
+++ b/gui/gui/inc/TGListTree.h
@@ -199,7 +199,15 @@ class TGListTree : public TGContainer {
 public:
    //---- color markup mode of tree items
    enum EColorMarkupMode {
+// clang++ (-Wshadow) complains about shadowing TSystem::EAclicMode. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kDefault        = 0,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kColorUnderline = BIT(0),
       kColorBox       = BIT(1)
    };
diff --git a/gui/gui/inc/TGSpeedo.h b/gui/gui/inc/TGSpeedo.h
index f407be182f3f3..5d12414d430b9 100644
--- a/gui/gui/inc/TGSpeedo.h
+++ b/gui/gui/inc/TGSpeedo.h
@@ -22,7 +22,16 @@
 class TGSpeedo : public TGFrame, public TGWidget {
 
 public:
-   enum EGlowColor { kNoglow, kGreen, kOrange, kRed };
+   enum EGlowColor { kNoglow,
+// clang++ (-Wshadow) complains about shadowing Rtypes.h EColor. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kGreen, kOrange, kRed };
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 
 protected:
    TImage          *fImage;               ///< image used as background
diff --git a/gui/webgui6/inc/TWebSnapshot.h b/gui/webgui6/inc/TWebSnapshot.h
index cfa7178b7cf2b..b4ec84cfcecf3 100644
--- a/gui/webgui6/inc/TWebSnapshot.h
+++ b/gui/webgui6/inc/TWebSnapshot.h
@@ -31,7 +31,15 @@ class TWebSnapshot : public TObject {
 public:
 
    enum {
-     kNone = 0,        ///< dummy
+// clang++ (-Wshadow) complains about shadowing GuiTypes.h kNone. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kNone = 0,        ///< dummy
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
      kObject = 1,      ///< object itself
      kSVG = 2,         ///< list of SVG primitives
      kSubPad = 3,      ///< subpad
diff --git a/io/io/inc/TFile.h b/io/io/inc/TFile.h
index 5460e47384a41..b09968c8f8951 100644
--- a/io/io/inc/TFile.h
+++ b/io/io/inc/TFile.h
@@ -278,7 +278,17 @@ class TFile : public TDirectoryFile {
    enum ERelativeTo { kBeg = 0, kCur = 1, kEnd = 2 };
    enum { kStartBigFile  = 2000000000 };
    /// File type
-   enum EFileType { kDefault = 0, kLocal = 1, kNet = 2, kWeb = 3, kFile = 4, kMerge = 5 };
+   enum EFileType {
+// clang++ (-Wshadow) complains about shadowing TSystem::EAclicMode::kDefault. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kDefault = 0,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kLocal = 1, kNet = 2, kWeb = 3, kFile = 4, kMerge = 5 };
 
    TFile();
    TFile(const char *fname, Option_t *option="", const char *ftitle="", Int_t compress = ROOT::RCompressionSetting::EDefaults::kUseCompiledDefault);
diff --git a/math/matrix/inc/TDecompBase.h b/math/matrix/inc/TDecompBase.h
index 7b9f7440da336..42f82fda8c6ca 100644
--- a/math/matrix/inc/TDecompBase.h
+++ b/math/matrix/inc/TDecompBase.h
@@ -47,7 +47,15 @@ protected :
    virtual const TMatrixDBase &GetDecompMatrix() const = 0;
 
    enum EMatrixDecompStat {
+// clang++ (-Wshadow) complains about shadowing Getline.h EGetLineMode. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kInit       = BIT(14),
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kPatternSet = BIT(15),
       kValuesSet  = BIT(16),
       kMatrixSet  = BIT(17),
diff --git a/math/matrix/inc/TMatrixT.h b/math/matrix/inc/TMatrixT.h
index b174cf50cbd75..b03f8b8301982 100644
--- a/math/matrix/inc/TMatrixT.h
+++ b/math/matrix/inc/TMatrixT.h
@@ -57,7 +57,17 @@ template<class Element> class TMatrixT : public TMatrixTBase<Element> {
 
    enum {kWorkMax = 100};
    enum EMatrixCreatorsOp1 { kZero,kUnit,kTransposed,kInverted,kAtA };
-   enum EMatrixCreatorsOp2 { kMult,kTransposeMult,kInvMult,kMultTranspose,kPlus,kMinus };
+   enum EMatrixCreatorsOp2 { kMult,kTransposeMult,kInvMult,kMultTranspose,
+// clang++ (-Wshadow) complains about shadowing TAttMarker::EMarkerStyle. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kPlus,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kMinus };
 
    TMatrixT(): fDataStack(), fElements(nullptr) { }
    TMatrixT(Int_t nrows,Int_t ncols);
diff --git a/math/matrix/inc/TMatrixTSparse.h b/math/matrix/inc/TMatrixTSparse.h
index e5fd9a7b6f9b9..3622e67fbb908 100644
--- a/math/matrix/inc/TMatrixTSparse.h
+++ b/math/matrix/inc/TMatrixTSparse.h
@@ -78,7 +78,17 @@ template<class Element> class TMatrixTSparse : public TMatrixTBase<Element> {
 public:
 
    enum EMatrixCreatorsOp1 { kZero,kUnit,kTransposed,kAtA };
-   enum EMatrixCreatorsOp2 { kMult,kMultTranspose,kPlus,kMinus };
+   enum EMatrixCreatorsOp2 { kMult,kMultTranspose,
+// clang++ (-Wshadow) complains about shadowing TAttMarker::EMarkerStyle. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kPlus,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kMinus };
 
    TMatrixTSparse() { fElements = nullptr; fRowIndex = nullptr; fColIndex = nullptr; }
    TMatrixTSparse(Int_t nrows,Int_t ncols);
diff --git a/math/matrix/inc/TMatrixTSym.h b/math/matrix/inc/TMatrixTSym.h
index 55490eaa99976..0b2b60dccadc8 100644
--- a/math/matrix/inc/TMatrixTSym.h
+++ b/math/matrix/inc/TMatrixTSym.h
@@ -51,7 +51,17 @@ template<class Element> class TMatrixTSym : public TMatrixTBase<Element> {
 
    enum {kWorkMax = 100}; // size of work array
    enum EMatrixCreatorsOp1 { kZero,kUnit,kTransposed,kInverted,kAtA };
-   enum EMatrixCreatorsOp2 { kPlus,kMinus };
+   enum EMatrixCreatorsOp2 {
+// clang++ (-Wshadow) complains about shadowing TAttMarker::EMarkerStyle. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kPlus,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kMinus };
 
    TMatrixTSym() { fElements = nullptr; }
    explicit TMatrixTSym(Int_t nrows);
diff --git a/math/quadp/inc/TQpSolverBase.h b/math/quadp/inc/TQpSolverBase.h
index cfd2c2a6a9af0..6178ff0713d3a 100644
--- a/math/quadp/inc/TQpSolverBase.h
+++ b/math/quadp/inc/TQpSolverBase.h
@@ -66,7 +66,15 @@ enum ETerminationCode
    kNOT_FINISHED,
    kMAX_ITS_EXCEEDED,
    kINFEASIBLE,
+// clang++ (-Wshadow) complains about shadowing TTreeDrawArgsParser::EOutputType. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
    kUNKNOWN
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 };
 
 class TQpSolverBase : public TObject
diff --git a/net/auth/inc/TAuthenticate.h b/net/auth/inc/TAuthenticate.h
index 9199f278e44c8..0c656a833408c 100644
--- a/net/auth/inc/TAuthenticate.h
+++ b/net/auth/inc/TAuthenticate.h
@@ -56,7 +56,17 @@ friend class TRootSecContext;
 friend class TSocket;
 
 public:
-   enum ESecurity { kClear, kUnsupported, kKrb5, kGlobus, kSSH, kRfio }; // type of authentication
+   enum ESecurity {
+// clang++ (-Wshadow) complains about shadowing EGetLineMode. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kClear,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kUnsupported, kKrb5, kGlobus, kSSH, kRfio }; // type of authentication
 
 private:
    TString      fDetails;     // logon details (method dependent ...)
diff --git a/net/net/inc/TGridJobStatus.h b/net/net/inc/TGridJobStatus.h
index 90f61c1dd6626..6140503f59aed 100644
--- a/net/net/inc/TGridJobStatus.h
+++ b/net/net/inc/TGridJobStatus.h
@@ -27,7 +27,17 @@ class TGridJobStatus : public TNamed {
 
 public:
    // Subset of Grid job states for common GetStatus function
-   enum EGridJobStatus { kUNKNOWN, kWAITING, kRUNNING, kABORTED, kFAIL, kDONE };
+   enum EGridJobStatus {
+// clang++ (-Wshadow) complains about shadowing TQpSolverBase::ETerminationCode. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+         kUNKNOWN,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kWAITING, kRUNNING, kABORTED, kFAIL, kDONE };
 
   TGridJobStatus() { }
   virtual ~TGridJobStatus() { }
diff --git a/net/net/inc/TSocket.h b/net/net/inc/TSocket.h
index d79ac9b25579e..1018774598e61 100644
--- a/net/net/inc/TSocket.h
+++ b/net/net/inc/TSocket.h
@@ -51,7 +51,15 @@ friend class TServerSocket;
 
 protected:
    enum ESocketErrors {
-     kInvalid = -1,
+// clang++ (-Wshadow) complains about shadowing TSystem::EFpeMask. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kInvalid = -1,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
      kInvalidStillInList = -2
    };
    TInetAddress  fAddress;        // remote internet address and port #
diff --git a/roofit/roofitcore/inc/RooDataHist.h b/roofit/roofitcore/inc/RooDataHist.h
index f1c7bced05e79..9c29eaf3b9a23 100644
--- a/roofit/roofitcore/inc/RooDataHist.h
+++ b/roofit/roofitcore/inc/RooDataHist.h
@@ -261,7 +261,17 @@ class RooDataHist : public RooAbsData, public RooDirItem {
   std::vector<std::unique_ptr<const RooAbsBinning>> _lvbins ; ///<! List of used binnings associated with lvalues
   mutable std::vector<std::vector<double> > _binbounds;     ///<! list of bin bounds per dimension
 
-  enum CacheSumState_t{kInvalid = 0, kNoBinCorrection = 1, kCorrectForBinSize = 2, kInverseBinCorr = 3};
+  enum CacheSumState_t{
+// clang++ (-Wshadow) complains about shadowing TSystem::EFpeMask. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kInvalid = 0,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+     kNoBinCorrection = 1, kCorrectForBinSize = 2, kInverseBinCorr = 3};
   mutable Int_t _cache_sum_valid{kInvalid}; ///<! Is cache sum valid? Needs to be Int_t instead of CacheSumState_t for subclasses.
   mutable double _cache_sum{0.};          ///<! Cache for sum of entries ;
 
diff --git a/tree/tree/inc/TBranch.h b/tree/tree/inc/TBranch.h
index e88a6cf596e1a..d1522ab7a123b 100644
--- a/tree/tree/inc/TBranch.h
+++ b/tree/tree/inc/TBranch.h
@@ -103,11 +103,19 @@ class TBranch : public TNamed, public TAttFill {
 
    /// TBranch status bits
    enum EStatusBits {
+// clang++ (-Wshadow) does not like this shadowing. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kDoNotProcess = ::kDoNotProcess, ///< Active bit for branches
       kIsClone      = ::kIsClone,      ///< To indicate a TBranchClones
       kBranchObject = ::kBranchObject, ///< Branch is a TObject*
       kBranchAny    = ::kBranchAny,    ///< Branch is an object*
-      // kMapObject    = kBranchObject | kBranchAny;
+      // kMapObject    = ::kMapObject;  ///< kBranchObject | kBranchAny;
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kAutoDelete   = BIT(15),
 
       kDoNotUseBufferMap = BIT(22)     ///< If set, at least one of the entry in the branch will use the buffer's map of classname and objects.
diff --git a/tree/tree/inc/TTree.h b/tree/tree/inc/TTree.h
index 7609529df00fe..c470e787275f1 100644
--- a/tree/tree/inc/TTree.h
+++ b/tree/tree/inc/TTree.h
@@ -252,7 +252,15 @@ class TTree : public TNamed, public TAttLine, public TAttFill, public TAttMarker
       kGetFriendAlias       = BIT(7),
       kGetLeaf              = BIT(8),
       kLoadTree             = BIT(9),
+// clang++ (-Wshadow) complains about shadowing kPrint in TError.h. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kPrint                = BIT(10),
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kRemoveFriend         = BIT(11),
       kSetBranchStatus      = BIT(12),
       kResetBranchAddresses = BIT(13)
diff --git a/tree/tree/inc/TTreeCloner.h b/tree/tree/inc/TTreeCloner.h
index ad611e926a9cb..0d90afbb3fe1a 100644
--- a/tree/tree/inc/TTreeCloner.h
+++ b/tree/tree/inc/TTreeCloner.h
@@ -60,7 +60,15 @@ class TTreeCloner {
    TFileCacheRead *fPrevCache;   ///< Cache that set before the TTreeCloner ctor for the 'from' TTree if any.
 
    enum ECloneMethod {
+// clang++ (-Wshadow) complains about shadowing TSystem::EAclicMode. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kDefault             = 0,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kSortBasketsByBranch = 1,
       kSortBasketsByOffset = 2,
       kSortBasketsByEntry  = 3
@@ -96,7 +104,15 @@ class TTreeCloner {
 
 public:
    enum EClonerOptions {
+// clang++ (-Wshadow) complains about shadowing kNone in GuiTypes.h. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kNone       = 0,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kNoWarnings = BIT(1),
       kIgnoreMissingTopLevel = BIT(2),
       kNoFileCache = BIT(3)
diff --git a/tree/treeplayer/inc/TTreeDrawArgsParser.h b/tree/treeplayer/inc/TTreeDrawArgsParser.h
index 317632a07ec83..f0d343575d8ec 100644
--- a/tree/treeplayer/inc/TTreeDrawArgsParser.h
+++ b/tree/treeplayer/inc/TTreeDrawArgsParser.h
@@ -30,7 +30,15 @@ class TTreeDrawArgsParser : public TObject {
 
 public:
    enum EOutputType {
+// clang++ (-Wshadow) complains about shadowing TQpSolverBase::ETerminationCode. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kUNKNOWN,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kEVENTLIST,
       kENTRYLIST,
       kPROFILE,