diff --git a/core/libs/rawengine/drawdecoder_p.h b/core/libs/rawengine/drawdecoder_p.h
index 4079c82d04..291a00c693 100644
--- a/core/libs/rawengine/drawdecoder_p.h
+++ b/core/libs/rawengine/drawdecoder_p.h
@@ -1,107 +1,110 @@
 /* ============================================================
  *
  * This file is a part of digiKam project
  * https://www.digikam.org
  *
  * Date        : 2008-10-09
  * Description : internal private container for DRawDecoder
  *
  * Copyright (C) 2008-2019 by Gilles Caulier <caulier dot gilles at gmail dot com>
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
  * Public License as published by the Free Software Foundation;
  * either version 2, or (at your option)
  * any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * ============================================================ */
 
 #ifndef DIGIKAM_DRAW_DECODER_PRIVATE_H
 #define DIGIKAM_DRAW_DECODER_PRIVATE_H
 
 // Qt includes
 
 #include <QByteArray>
 
-// Pragma directives to reduce warnings from LibRaw header files.
+// Pragma directives to reduce warnings from LibRaw and LCMS2 headers
 #if !defined(Q_OS_DARWIN) && defined(Q_CC_GNU)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#   pragma GCC diagnostic push
+#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
 #if defined(Q_OS_DARWIN) && defined(Q_CC_CLANG)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#   pragma clang diagnostic ignored "-Wundef"
+#   pragma clang diagnostic ignored "-Wdeprecated-register"
+#   pragma clang diagnostic ignored "-Wmacro-redefined"
 #endif
 
 // LibRaw includes
 
 #include <libraw.h>
 
 // Restore warnings
 #if !defined(Q_OS_DARWIN) && defined(Q_CC_GNU)
-#pragma GCC diagnostic pop
+#   pragma GCC diagnostic pop
 #endif
 
 #if defined(Q_OS_DARWIN) && defined(Q_CC_CLANG)
-#pragma clang diagnostic pop
+#   pragma clang diagnostic pop
 #endif
 
 // Local includes
 
 #include "drawinfo.h"
 #include "drawdecoder.h"
 
 namespace Digikam
 {
 
 extern "C"
 {
     int callbackForLibRaw(void* data, enum LibRaw_progress p, int iteration, int expected);
 }
 
 class Q_DECL_HIDDEN DRawDecoder::Private
 {
 
 public:
 
     explicit Private(DRawDecoder* const p);
     ~Private();
 
 public:
 
     int    progressCallback(enum LibRaw_progress p, int iteration, int expected);
 
     void   setProgress(double value);
     double progressValue() const;
 
     bool   loadFromLibraw(const QString& filePath, QByteArray& imageData,
                           int& width, int& height, int& rgbmax);
 
 public:
 
     static void createPPMHeader(QByteArray& imgData, libraw_processed_image_t* const img);
 
     static void fillIndentifyInfo(LibRaw* const raw, DRawInfo& identify);
 
     static bool loadEmbeddedPreview(QByteArray&, LibRaw* const raw);
 
     static bool loadHalfPreview(QImage&, LibRaw* const raw);
 
 private:
 
     double       m_progress;
 
     DRawDecoder* m_parent;
 
     friend class DRawDecoder;
 };
 
 } // namespace Digikam
 
 #endif // DIGIKAM_DRAW_DECODER_PRIVATE_H