diff --git a/core/app/main/main.cpp b/core/app/main/main.cpp
--- a/core/app/main/main.cpp
+++ b/core/app/main/main.cpp
@@ -24,22 +24,6 @@
 
 #include "digikam_config.h"
 
-// ImageMagick includes
-
-#if defined(Q_CC_CLANG)
-#   pragma clang diagnostic push
-#   pragma clang diagnostic ignored "-Wkeyword-macro"
-#endif
-
-#ifdef HAVE_IMAGE_MAGICK
-#   include <Magick++.h>
-using namespace Magick;
-#endif
-
-#if defined(Q_CC_CLANG)
-#   pragma clang diagnostic pop
-#endif
-
 // Qt includes
 
 #include <QFile>
@@ -61,6 +45,22 @@
 #include <ksharedconfig.h>
 #include <kconfiggroup.h>
 
+// ImageMagick includes
+
+#if defined(Q_CC_CLANG)
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wkeyword-macro"
+#endif
+
+#ifdef HAVE_IMAGE_MAGICK
+#   include <Magick++.h>
+using namespace Magick;
+#endif
+
+#if defined(Q_CC_CLANG)
+#   pragma clang diagnostic pop
+#endif
+
 // Local includes
 
 #include "digikam_debug.h"
diff --git a/core/dplugins/dimg/imagemagick/dimgimagemagickplugin.cpp b/core/dplugins/dimg/imagemagick/dimgimagemagickplugin.cpp
--- a/core/dplugins/dimg/imagemagick/dimgimagemagickplugin.cpp
+++ b/core/dplugins/dimg/imagemagick/dimgimagemagickplugin.cpp
@@ -22,6 +22,14 @@
 
 #include "dimgimagemagickplugin.h"
 
+// Qt includes
+
+#include <QMimeDatabase>
+
+// KDE includes
+
+#include <klocalizedstring.h>
+
 // Image Magick includes
 
 #if defined(Q_CC_CLANG)
@@ -42,14 +50,6 @@
 #   pragma clang diagnostic pop
 #endif
 
-// Qt includes
-
-#include <QMimeDatabase>
-
-// KDE includes
-
-#include <klocalizedstring.h>
-
 // Local includes
 
 #include "digikam_debug.h"
diff --git a/core/showfoto/main/main.cpp b/core/showfoto/main/main.cpp
--- a/core/showfoto/main/main.cpp
+++ b/core/showfoto/main/main.cpp
@@ -25,22 +25,6 @@
 
 #include "digikam_config.h"
 
-// ImageMagick includes
-
-#if defined(Q_CC_CLANG)
-#   pragma clang diagnostic push
-#   pragma clang diagnostic ignored "-Wkeyword-macro"
-#endif
-
-#ifdef HAVE_IMAGE_MAGICK
-#   include <Magick++.h>
-using namespace Magick;
-#endif
-
-#if defined(Q_CC_CLANG)
-#   pragma clang diagnostic pop
-#endif
-
 // Qt includes
 
 #include <QDir>
@@ -57,6 +41,22 @@
 #include <kconfiggroup.h>
 #include <kaboutdata.h>
 
+// ImageMagick includes
+
+#if defined(Q_CC_CLANG)
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wkeyword-macro"
+#endif
+
+#ifdef HAVE_IMAGE_MAGICK
+#   include <Magick++.h>
+using namespace Magick;
+#endif
+
+#if defined(Q_CC_CLANG)
+#   pragma clang diagnostic pop
+#endif
+
 // Local includes
 
 #include "digikam_debug.h"
diff --git a/core/tests/dimg/magickloader.cpp b/core/tests/dimg/magickloader.cpp
--- a/core/tests/dimg/magickloader.cpp
+++ b/core/tests/dimg/magickloader.cpp
@@ -20,17 +20,6 @@
  *
  * ============================================================ */
 
-// ImageMagick includes
-
-#include <Magick++.h>
-
-#if MagickLibVersion < 0x700
-#   include <magick/magick.h>
-#endif
-
-using namespace Magick;
-using namespace MagickCore;
-
 // Qt includes
 
 #include <QImage>
@@ -45,6 +34,17 @@
 #include <QFileDialog>
 #include <QMimeDatabase>
 
+// ImageMagick includes
+
+#include <Magick++.h>
+
+#if MagickLibVersion < 0x700
+#   include <magick/magick.h>
+#endif
+
+using namespace Magick;
+using namespace MagickCore;
+
 /** Convert from QImage to IM::Image
  */
 /*Image* toImage(QImage* const qimage)