diff --git a/src/storage/StorageState.cxx b/src/storage/StorageState.cxx
index eea57fa26..d6a63601e 100644
--- a/src/storage/StorageState.cxx
+++ b/src/storage/StorageState.cxx
@@ -33,9 +33,16 @@
 #include "Instance.hxx"
 #include "Log.hxx"
 
-#include <set>
+#ifdef __clang__
+/* ignore -Wcomma due to strange code in boost/array.hpp (in Boost
+   1.72) */
+#pragma GCC diagnostic ignored "-Wcomma"
+#endif
+
 #include <boost/crc.hpp>
 
+#include <set>
+
 #define MOUNT_STATE_BEGIN        "mount_begin"
 #define MOUNT_STATE_END          "mount_end"
 #define MOUNT_STATE_STORAGE_URI  "uri: "