diff --git a/Device/IO/ZipUtil.cpp b/Device/IO/ZipUtil.cpp
index ab69c7929f7a4a3696f5ed2d9633d000dd019385..d30352e82aab50b31609cdf8fd2069715f9be365 100644
--- a/Device/IO/ZipUtil.cpp
+++ b/Device/IO/ZipUtil.cpp
@@ -15,11 +15,14 @@
 #include "Device/IO/ZipUtil.h"
 #include "Base/Util/PathUtil.h"
 #include "Base/Util/StringUtil.h"
+#include <fstream>
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-copy"
 #include <boost/iostreams/copy.hpp>
 #include <boost/iostreams/filter/bzip2.hpp>
 #include <boost/iostreams/filter/gzip.hpp>
 #include <boost/iostreams/filtering_stream.hpp>
-#include <fstream>
+#pragma clang diagnostic pop
 
 namespace {
 
diff --git a/cmake/BornAgain/MacOS.cmake b/cmake/BornAgain/MacOS.cmake
index 7ad2a0023e17632c01f064fe1172c646d0a07746..8699840bedccff76b4ccb7132fe5618c15f68179 100644
--- a/cmake/BornAgain/MacOS.cmake
+++ b/cmake/BornAgain/MacOS.cmake
@@ -56,12 +56,16 @@ string(APPEND CMAKE_CXX_FLAGS " -m64 -I${CMAKE_SOURCE_DIR}/Wrap")
 
 if(CMAKE_COMPILER_IS_GNUCXX)
     message(STATUS "Found GNU compiler collection")
-    execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND ${CMAKE_CXX_COMPILER}
+        -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 
     string(APPEND CMAKE_CXX_FLAGS " -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common")
-    set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
+    set(CINT_CXX_DEFINITIONS
+        "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO\
+ -DG__OSFDLL -DG__STD_EXCEPTION")
 
-    string(APPEND CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS " -flat_namespace -single_module -undefined dynamic_lookup")
+    string(APPEND CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS
+        " -flat_namespace -undefined dynamic_lookup")
 
     # Select flags.
     set(CMAKE_CXX_FLAGS_RELEASE        "-O2")
@@ -75,11 +79,13 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 
 elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang OR ${CMAKE_CXX_COMPILER_ID} STREQUAL AppleClang)
     message(STATUS "Found LLVM compiler collection")
-    execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND ${CMAKE_CXX_COMPILER}
+        -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 
     string(APPEND CMAKE_CXX_FLAGS " -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common")
 
-    string(APPEND CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS " -flat_namespace -single_module -undefined dynamic_lookup")
+    string(APPEND CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS
+        " -flat_namespace -undefined dynamic_lookup")
 
     # Select flags.
     set(CMAKE_CXX_FLAGS_RELEASE        "-O2")
diff --git a/devtools/checks/check-scg-cpp-style.py b/devtools/checks/check-scg-cpp-style.py
index 451e60c04e0aacbd3a833cf75801de163a1cbf36..3f9795aed3e6afeb38298214418699b00028dd62 100755
--- a/devtools/checks/check-scg-cpp-style.py
+++ b/devtools/checks/check-scg-cpp-style.py
@@ -76,8 +76,8 @@ def check_block(fn, t, name, errs):
 
     if len(matches) > 1:
 
-        # tolerate multiple #include blocks if they are separated by some #if construct
-        if name == "include" and re.search('#include.*#if.*#include', t, re.DOTALL):
+        # tolerate multiple #include blocks if they are separated by some #if or #pragma
+        if name == "include" and re.search('#include.*#(if|pragma).*#include', t, re.DOTALL):
             return
 
         errs.append(f"several {name} blocks in file {fn}")