diff --git a/src/libcalamares/Settings.cpp b/src/libcalamares/Settings.cpp
index 710846a2c..00f17c2b2 100644
--- a/src/libcalamares/Settings.cpp
+++ b/src/libcalamares/Settings.cpp
@@ -27,8 +27,6 @@
 #include <QFile>
 #include <QPair>
 
-#include <yaml-cpp/yaml.h>
-
 static bool
 hasValue( const YAML::Node& v )
 {
diff --git a/src/libcalamares/utils/YamlUtils.cpp b/src/libcalamares/utils/YamlUtils.cpp
index b9b3425e6..b60978919 100644
--- a/src/libcalamares/utils/YamlUtils.cpp
+++ b/src/libcalamares/utils/YamlUtils.cpp
@@ -20,8 +20,6 @@
 
 #include "utils/Logger.h"
 
-#include <yaml-cpp/yaml.h>
-
 #include <QByteArray>
 #include <QFile>
 #include <QFileInfo>
diff --git a/src/libcalamares/utils/YamlUtils.h b/src/libcalamares/utils/YamlUtils.h
index 0fa48e270..68268efdf 100644
--- a/src/libcalamares/utils/YamlUtils.h
+++ b/src/libcalamares/utils/YamlUtils.h
@@ -26,11 +26,21 @@
 class QByteArray;
 class QFileInfo;
 
-namespace YAML
-{
-class Node;
-class Exception;
-}
+// The yaml-cpp headers are not C++11 warning-proof, especially
+// with picky compilers like Clang 8. Since we use Clang for the
+// find-all-the-warnings case, switch those warnings off for
+// the we-can't-change-them system headers.
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+
+#include <yaml-cpp/yaml.h>
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
 
 /// @brief Appends all te elements of @p node to the string list @p v
 void operator>>( const YAML::Node& node, QStringList& v );
diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp
index e31130520..1838105d7 100644
--- a/src/libcalamaresui/Branding.cpp
+++ b/src/libcalamaresui/Branding.cpp
@@ -32,9 +32,6 @@
 #include <QPixmap>
 #include <QVariantMap>
 
-#include <yaml-cpp/yaml.h>
-
-
 namespace Calamares
 {
 
diff --git a/src/libcalamaresui/modulesystem/Module.cpp b/src/libcalamaresui/modulesystem/Module.cpp
index 73a026fb9..97833edb2 100644
--- a/src/libcalamaresui/modulesystem/Module.cpp
+++ b/src/libcalamaresui/modulesystem/Module.cpp
@@ -36,8 +36,6 @@
 #include "PythonQtViewModule.h"
 #endif
 
-#include <yaml-cpp/yaml.h>
-
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp
index b8dbc4ded..d2aa3f5c8 100644
--- a/src/libcalamaresui/modulesystem/ModuleManager.cpp
+++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp
@@ -28,8 +28,6 @@
 #include "utils/Logger.h"
 #include "utils/YamlUtils.h"
 
-#include <yaml-cpp/yaml.h>
-
 #include <QApplication>
 #include <QDir>
 #include <QTimer>
diff --git a/src/modules/contextualprocess/Tests.cpp b/src/modules/contextualprocess/Tests.cpp
index 89fb1922c..055e35c53 100644
--- a/src/modules/contextualprocess/Tests.cpp
+++ b/src/modules/contextualprocess/Tests.cpp
@@ -22,8 +22,6 @@
 #include "utils/CommandList.h"
 #include "utils/YamlUtils.h"
 
-#include <yaml-cpp/yaml.h>
-
 #include <QtTest/QtTest>
 
 #include <QFileInfo>
diff --git a/src/modules/fsresizer/Tests.cpp b/src/modules/fsresizer/Tests.cpp
index 0da5d9dab..3c204327a 100644
--- a/src/modules/fsresizer/Tests.cpp
+++ b/src/modules/fsresizer/Tests.cpp
@@ -25,8 +25,6 @@
 #include "utils/Logger.h"
 #include "utils/YamlUtils.h"
 
-#include <yaml-cpp/yaml.h>
-
 #include <QtTest/QtTest>
 
 #include <QFileInfo>
diff --git a/src/modules/locale/GeoIPJSON.cpp b/src/modules/locale/GeoIPJSON.cpp
index b4daf2084..d6a309af7 100644
--- a/src/modules/locale/GeoIPJSON.cpp
+++ b/src/modules/locale/GeoIPJSON.cpp
@@ -25,8 +25,6 @@
 
 #include <QByteArray>
 
-#include <yaml-cpp/yaml.h>
-
 GeoIPJSON::GeoIPJSON(const QString& attribute)
     : GeoIP( attribute.isEmpty() ? QStringLiteral( "time_zone" ) : attribute )
 {
diff --git a/src/modules/locale/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp
index a7dc432f8..b78365dc2 100644
--- a/src/modules/locale/LocaleViewStep.cpp
+++ b/src/modules/locale/LocaleViewStep.cpp
@@ -42,8 +42,6 @@
 #include <QNetworkReply>
 #include <QtConcurrent/QtConcurrentRun>
 
-#include <yaml-cpp/yaml.h>
-
 
 CALAMARES_PLUGIN_FACTORY_DEFINITION( LocaleViewStepFactory, registerPlugin<LocaleViewStep>(); )
 
diff --git a/src/modules/netinstall/NetInstallPage.cpp b/src/modules/netinstall/NetInstallPage.cpp
index 5b7f55be3..607251488 100644
--- a/src/modules/netinstall/NetInstallPage.cpp
+++ b/src/modules/netinstall/NetInstallPage.cpp
@@ -36,8 +36,6 @@
 
 #include <QHeaderView>
 
-#include <yaml-cpp/yaml.h>
-
 using CalamaresUtils::yamlToVariant;
 
 NetInstallPage::NetInstallPage( QWidget* parent )
diff --git a/src/modules/netinstall/PackageModel.h b/src/modules/netinstall/PackageModel.h
index f3ae567ce..f84b2779d 100644
--- a/src/modules/netinstall/PackageModel.h
+++ b/src/modules/netinstall/PackageModel.h
@@ -27,7 +27,10 @@
 #include <QObject>
 #include <QString>
 
-#include <yaml-cpp/yaml.h>
+namespace YAML
+{
+    class Node;
+}
 
 class PackageModel : public QAbstractItemModel
 {
diff --git a/src/modules/shellprocess/Tests.cpp b/src/modules/shellprocess/Tests.cpp
index 4928e28dd..3672586f0 100644
--- a/src/modules/shellprocess/Tests.cpp
+++ b/src/modules/shellprocess/Tests.cpp
@@ -26,8 +26,6 @@
 #include "utils/Logger.h"
 #include "utils/YamlUtils.h"
 
-#include <yaml-cpp/yaml.h>
-
 #include <QtTest/QtTest>
 
 #include <QFileInfo>
diff --git a/src/modules/test_conf.cpp b/src/modules/test_conf.cpp
index ca6b72cc7..d0746421f 100644
--- a/src/modules/test_conf.cpp
+++ b/src/modules/test_conf.cpp
@@ -21,13 +21,13 @@
  * shipped with each module for correctness -- well, for parseability.
  */
 
+#include "utils/YamlUtils.h"
+
 #include <unistd.h>
 #include <stdlib.h>
 
 #include <iostream>
 
-#include <yaml-cpp/yaml.h>
-
 #include <QFile>
 #include <QByteArray>